diff options
726 files changed, 3394 insertions, 13354 deletions
diff --git a/examples/uml/nested-packages/main.cpp b/examples/uml/nested-packages/main.cpp index 28d104db..0a235745 100644 --- a/examples/uml/nested-packages/main.cpp +++ b/examples/uml/nested-packages/main.cpp @@ -57,11 +57,11 @@ int main () model->addPackagedElement(package); model->addOwnedType(primitiveType); - qDebug() << "model->ownedElements()->size():" << model->ownedElements()->size(); - qDebug() << "model->members()->size():" << model->members()->size(); - qDebug() << "model->ownedMembers()->size():" << model->ownedMembers()->size(); - qDebug() << "model->ownedRules()->size():" << model->ownedRules()->size(); - qDebug() << "model->packagedElements()->size():" << model->packagedElements()->size(); + qDebug() << "model->ownedElements()->size():" << model->ownedElements().size(); + qDebug() << "model->members()->size():" << model->members().size(); + qDebug() << "model->ownedMembers()->size():" << model->ownedMembers().size(); + qDebug() << "model->ownedRules()->size():" << model->ownedRules().size(); + qDebug() << "model->packagedElements()->size():" << model->packagedElements().size(); qDebug(); qDebug() << "package->qualifiedName():" << package->qualifiedName(); qDebug() << "package->nestingPackage() ?" << ((package->nestingPackage() == 0) ? "Nao":"Sim"); @@ -76,11 +76,11 @@ int main () model->addPackagedElement(package); qDebug() << "REMOVED"; - qDebug() << "model->ownedElements()->size():" << model->ownedElements()->size(); - qDebug() << "model->members()->size():" << model->members()->size(); - qDebug() << "model->ownedMembers()->size():" << model->ownedMembers()->size(); - qDebug() << "model->ownedRules()->size():" << model->ownedRules()->size(); - qDebug() << "model->packagedElements()->size():" << model->packagedElements()->size(); + qDebug() << "model->ownedElements()->size():" << model->ownedElements().size(); + qDebug() << "model->members()->size():" << model->members().size(); + qDebug() << "model->ownedMembers()->size():" << model->ownedMembers().size(); + qDebug() << "model->ownedRules()->size():" << model->ownedRules().size(); + qDebug() << "model->packagedElements()->size():" << model->packagedElements().size(); qDebug(); qDebug() << "package->qualifiedName():" << package->qualifiedName(); qDebug() << "package->nestingPackage() ?" << ((package->nestingPackage() == 0) ? "Nao":"Sim"); @@ -89,13 +89,13 @@ int main () qDebug() << "primitiveType->qualifiedName():" << primitiveType->qualifiedName(); qDebug() << "directionIn->qualifiedName():" << directionIn->qualifiedName(); - QScopedPointer<QPackageList> nestedPackages (model->nestedPackages()); + QScopedPointer<QPackageList> nestedPackages (&model->nestedPackages()); qDebug() << "model->nestedPackages()->size():" << nestedPackages->size(); - QScopedPointer<QStereotypeList> ownedStereotypes (model->ownedStereotypes()); + QScopedPointer<QStereotypeList> ownedStereotypes (&model->ownedStereotypes()); qDebug() << "model->ownedStereotypes()->size():" << ownedStereotypes->size(); - QScopedPointer<QTypeList> ownedTypes (model->ownedTypes()); + QScopedPointer<QTypeList> ownedTypes (&model->ownedTypes()); qDebug() << "model->ownedTypes()->size():" << ownedTypes->size(); checkProperties(model); @@ -105,19 +105,19 @@ int main () QWrappedObjectPointer<QComponentRealization> cr = new QComponentRealization; cr->setAbstraction(c1); qDebug(); - qDebug() << "cr->suppliers()->size():" << cr->suppliers()->size(); - qDebug() << "c1->realizations()->size():" << c1->realizations()->size(); - qDebug() << "c2->realizations()->size():" << c2->realizations()->size(); + qDebug() << "cr->suppliers()->size():" << cr->suppliers().size(); + qDebug() << "c1->realizations()->size():" << c1->realizations().size(); + qDebug() << "c2->realizations()->size():" << c2->realizations().size(); cr->setAbstraction(c2); qDebug(); - qDebug() << "cr->suppliers()->size():" << cr->suppliers()->size(); - qDebug() << "c1->realizations()->size():" << c1->realizations()->size(); - qDebug() << "c2->realizations()->size():" << c2->realizations()->size(); + qDebug() << "cr->suppliers()->size():" << cr->suppliers().size(); + qDebug() << "c1->realizations()->size():" << c1->realizations().size(); + qDebug() << "c2->realizations()->size():" << c2->realizations().size(); cr->setAbstraction(0); qDebug(); - qDebug() << "cr->suppliers()->size():" << cr->suppliers()->size(); - qDebug() << "c1->realizations()->size():" << c1->realizations()->size(); - qDebug() << "c2->realizations()->size():" << c2->realizations()->size(); + qDebug() << "cr->suppliers()->size():" << cr->suppliers().size(); + qDebug() << "c1->realizations()->size():" << c1->realizations().size(); + qDebug() << "c2->realizations()->size():" << c2->realizations().size(); cr->setAbstraction(c1); package->addOwnedType(c1); package->addOwnedType(c2); diff --git a/examples/uml/profiles/main.cpp b/examples/uml/profiles/main.cpp index b8e1b8ca..573b4a55 100644 --- a/examples/uml/profiles/main.cpp +++ b/examples/uml/profiles/main.cpp @@ -37,7 +37,7 @@ int main () profile->addPackagedElement(stereotype); // Show profile's owned stereotypes - QScopedPointer<QStereotypeList> ownedStereotypes (profile->ownedStereotypes()); + QScopedPointer<QStereotypeList> ownedStereotypes (&profile->ownedStereotypes()); qDebug() << "Owned stereotypes:"; foreach (QStereotype *ownedStereotype, *ownedStereotypes) qDebug() << " " << ownedStereotype->name(); @@ -52,7 +52,7 @@ int main () // Create UML meta-model element import QWrappedObjectPointer<QElementImport> elementImport = new QElementImport; - elementImport->setImportedElement(umlModel->packagedElements()->toList().first()); + elementImport->setImportedElement(umlModel->packagedElements().toList().first()); // Add meta-class reference to profile profile->addMetaclassReference(elementImport); @@ -60,12 +60,12 @@ int main () // Show profile's data qDebug() << "Profile members:"; - foreach (QNamedElement *namedElement, *profile->members()) + foreach (QNamedElement *namedElement, profile->members()) qDebug() << " " << namedElement->name(); qDebug() << "Profile owned members:"; - foreach (QNamedElement *namedElement, *profile->ownedMembers()) + foreach (QNamedElement *namedElement, profile->ownedMembers()) qDebug() << " " << namedElement->name(); - QScopedPointer<QPackageableElementList> importedMembers (profile->importedMembers()); + QScopedPointer<QPackageableElementList> importedMembers (&profile->importedMembers()); qDebug() << "Profile imported members:"; foreach (QPackageableElement *importedMember, *importedMembers) qDebug() << " " << importedMember->name(); diff --git a/scripts/normative-xmi/MOF-merged.qtxmi.gz b/scripts/normative-xmi/MOF-merged.qtxmi.gz Binary files differindex cdce74c2..869e5aeb 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 3952e921..12477f6c 100644 --- a/scripts/normative-xmi/MOF-merged.xmi.gz +++ b/scripts/normative-xmi/MOF-merged.xmi.gz diff --git a/scripts/normative-xmi/MOF.qtxmi.gz b/scripts/normative-xmi/MOF.qtxmi.gz Binary files differdeleted file mode 100644 index 65b2c646..00000000 --- a/scripts/normative-xmi/MOF.qtxmi.gz +++ /dev/null diff --git a/scripts/normative-xmi/MOF.xmi.gz b/scripts/normative-xmi/MOF.xmi.gz Binary files differdeleted file mode 100644 index 5f2293e9..00000000 --- a/scripts/normative-xmi/MOF.xmi.gz +++ /dev/null diff --git a/scripts/normative-xmi/UML.qtxmi.gz b/scripts/normative-xmi/UML.qtxmi.gz Binary files differindex 4400c005..8d0d0425 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 495e3f16..c087c2bf 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 77841de5..a40801b9 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" }; @@ -160,9 +160,12 @@ declare function qtxmi:modifiedTypeFromNamespacedProperty ($property as node(), concat ("const ", $type) else $type - let $type := if ($collection and ($element/@xmi:type = "uml:Class" or $property/upperValue/@value != "1")) then - concat ($type, " *") - else if ($collection and $element/@xmi:type != "uml:Class" and ($property/@direction = "inout" or $property/@direction = "out")) then + let $type := if ($collection and $element/@xmi:type = "uml:Class") then + if ($property/upperValue/@value != "1") then + concat ($type, " &") + else + concat ($type, " *") + else if ($element/@xmi:type != "uml:Class" and ($property/@direction = "inout" or $property/@direction = "out")) then concat ($type, " &") else $type @@ -236,7 +239,7 @@ declare function qtxmi:subsettedBy($property as node()) as xs:string { { for $namespace in distinct-values((doc($xmiFile)//packagedElement[@xmi:type="uml:Package"] | doc($xmiFile)//uml:Package)/@xmi:id) return -<namespace path="{replace(replace(concat(qtxmi:mappedBaseNamespace($xmiFile), $namespace), "-", "/"), "::", "/")}"> +<namespace path="{replace(replace(replace(concat(qtxmi:mappedBaseNamespace($xmiFile), $namespace), "-", "/"), "::", "/"), "/$", "")}"> { for $class in doc($xmiFile)//*[@xmi:id=$namespace]/packagedElement[@xmi:type="uml:Class"] let $namespace := concat(replace(concat(qtxmi:mappedBaseNamespace($xmiFile), $namespace), "-", "::"), "::") @@ -299,9 +302,9 @@ return { for $attribute in $class/ownedAttribute let $unqualifiedType := qtxmi:modifiedTypeFromNamespacedProperty($attribute, $namespace, xs:boolean("true")) - let $unqualifiedType := if (ends-with($unqualifiedType, "*")) then $unqualifiedType else concat($unqualifiedType, " ") + let $unqualifiedType := if (ends-with($unqualifiedType, "*") or ends-with($unqualifiedType, "&")) then $unqualifiedType else concat($unqualifiedType, " ") let $singleUnqualifiedType := qtxmi:modifiedTypeFromNamespacedProperty($attribute, $namespace, xs:boolean("false")) - let $singleUnqualifiedType := if (ends-with($singleUnqualifiedType, "*")) then $singleUnqualifiedType else concat($singleUnqualifiedType, " ") + let $singleUnqualifiedType := if (ends-with($singleUnqualifiedType, "*") or ends-with($singleUnqualifiedType, "&")) then $singleUnqualifiedType else concat($singleUnqualifiedType, " ") let $isDerived := if (not($attribute/@isDerived) or $attribute/@isDerived = "false") then "false" else "true" let $isDerivedUnion := if (not($attribute/@isDerivedUnion) or $attribute/@isDerivedUnion = "false") then "false" else "true" let $isReadOnly := if (not($attribute/@isReadOnly) or $attribute/@isReadOnly = "false") then "false" else "true" @@ -341,9 +344,9 @@ return { for $attribute in $class/ownedAttribute let $unqualifiedType := qtxmi:modifiedTypeFromNamespacedProperty($attribute, $namespace, xs:boolean("true")) - let $unqualifiedType := if (ends-with($unqualifiedType, "*")) then $unqualifiedType else concat($unqualifiedType, " ") + let $unqualifiedType := if (ends-with($unqualifiedType, "*") or ends-with($unqualifiedType, "&")) then $unqualifiedType else concat($unqualifiedType, " ") let $singleUnqualifiedType := qtxmi:modifiedTypeFromNamespacedProperty($attribute, $namespace, xs:boolean("false")) - let $singleUnqualifiedType := if (ends-with($singleUnqualifiedType, "*")) then $singleUnqualifiedType else concat($singleUnqualifiedType, " ") + let $singleUnqualifiedType := if (ends-with($singleUnqualifiedType, "*") or ends-with($singleUnqualifiedType, "&")) then $singleUnqualifiedType else concat($singleUnqualifiedType, " ") let $isDerived := if (not($attribute/@isDerived) or $attribute/@isDerived = "false") then "false" else "true" let $isDerivedUnion := if (not($attribute/@isDerivedUnion) or $attribute/@isDerivedUnion = "false") then "false" else "true" let $isReadOnly := if (not($attribute/@isReadOnly) or $attribute/@isReadOnly = "false") then "false" else "true" @@ -387,7 +390,7 @@ return qtxmi:modifiedTypeFromNamespacedProperty($operation/ownedParameter[@direction = "return"], $namespace, xs:boolean("true")) else "void" - let $return := if (ends-with($return, "*")) then $return else concat($return, " ") + let $return := if (ends-with($return, "*") or ends-with($return, "&")) then $return else concat($return, " ") where empty($class/ownedAttribute[@name = $operation/@name]) return <operation return="{$return}" name="{qtxmi:mappedFunctionName($operation/@name)}" constness="{$constness}"> diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp index ef635854..ba418929 100644 --- a/scripts/templates/class.cpp +++ b/scripts/templates/class.cpp @@ -167,7 +167,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- ELSE %] Q_D(${class.name}); [%- IF attribute.accessor.0.return.search('<') %] - if ([% IF loop.count == 2 %]![% END %]d->${attribute.accessor.0.name}->contains(${accessor.parameter.0.name})) { + if ([% IF loop.count == 2 %]![% END %]d->${attribute.accessor.0.name}.contains(${accessor.parameter.0.name})) { [%- ELSE %] if (d->${attribute.accessor.0.name} != ${accessor.parameter.0.name}) { [%- END %] @@ -180,14 +180,14 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'true') -%] [%- END -%] [%- IF accessor.name.search('^add') %] - d->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); + d->${attribute.accessor.0.name}.[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(this)); [%- END %] [%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'false') -%] [%- END -%] [%- IF accessor.name.search('^remove') %] - d->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); + d->${attribute.accessor.0.name}.[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] @@ -203,10 +203,10 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- END %] [%- IF loop.first %] - [%- IF accessor.return.search('\*') %] + [%- IF accessor.return.search('\*$') %] return 0; // change to your derived return [%- ELSIF accessor.return != 'void ' %] - return ${accessor.return.remove(' $')}(); // change here to your derived return + return [% IF accessor.return.search('&') %]*(new [% END %]${accessor.return.remove(' $').remove('^const ').remove(' &$')}[% IF accessor.return.search('&') %])[% ELSE %]()[% END %]; // change here to your derived return [%- END -%] [%- ELSE %] [%- IF attribute.accessor.0.return.search('<') %] @@ -277,7 +277,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- ELSE %] Q_D(${class.name}); [%- IF associationend.accessor.0.return.search('<') %] - if ([% IF loop.count == 2 %]![% END %]d->${associationend.accessor.0.name}->contains(${accessor.parameter.0.name})) { + if ([% IF loop.count == 2 %]![% END %]d->${associationend.accessor.0.name}.contains(${accessor.parameter.0.name})) { [%- ELSE %] if (d->${associationend.accessor.0.name} != ${accessor.parameter.0.name}) { [%- END %] @@ -292,7 +292,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'true') %] [%- END -%] [%- IF accessor.name.search('^add') %] - d->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); + d->${associationend.accessor.0.name}.[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(this)); [%- END %] @@ -300,7 +300,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'false') -%] [%- END -%] [%- IF accessor.name.search('^remove') %] - d->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); + d->${associationend.accessor.0.name}.[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] @@ -316,10 +316,10 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces [%- END %] [%- IF loop.first %] - [%- IF accessor.return.search('\*') %] + [%- IF accessor.return.search('\*$') %] return 0; // change here to your derived return [%- ELSIF accessor.return != 'void ' %] - return ${accessor.return.remove(' $')}(); // change here to your derived return + return [% IF accessor.return.search('&') %]*(new [% END %]${accessor.return.remove(' $').remove('^const ').remove(' &$')}[% IF accessor.return.search('&') %])[% ELSE %]()[% END %]; // change here to your derived return [%- END -%] [%- ELSE %] [%- IF associationend.accessor.0.return.search('<') %] @@ -444,16 +444,7 @@ ${class.name}Private::${class.name}Private() [%- found = 'false' -%] [%- FOREACH attribute IN class.attribute.values -%] [%- IF attribute.isDerived == 'false' or attribute.isDerivedUnion == 'true' -%] -[%- IF attribute.accessor.0.return.search('<') -%] -[%- IF found == 'true' -%] -, -[% ELSE -%] - : - [%- found = 'true' %] -[% END -%] - ${attribute.accessor.0.name}(new ${attribute.accessor.0.return.remove(' \*$').remove('^const ')}) -[%- ELSE -%] -[%- IF attribute.accessor.0.return.search('\*') -%] +[%- IF attribute.accessor.0.return.search('\*$') -%] [%- IF found == 'true' -%] , [% ELSE -%] @@ -474,19 +465,9 @@ ${class.name}Private::${class.name}Private() [%- END -%] [%- END -%] [%- END -%] -[%- END -%] [%- FOREACH associationend IN class.associationend.values %] [%- IF associationend.isDerived == 'false' or associationend.isDerivedUnion == 'true' -%] -[%- IF associationend.accessor.0.return.search('<') -%] -[%- IF found == 'true' -%] -, -[% ELSE -%] - : - [%- found = 'true' %] -[% END -%] - ${associationend.accessor.0.name}(new ${associationend.accessor.0.return.remove(' \*$').remove('^const ')}) -[%- ELSE -%] -[%- IF associationend.accessor.0.return.search('\*') -%] +[%- IF associationend.accessor.0.return.search('\*$') -%] [%- IF found == 'true' -%] , [% ELSE -%] @@ -506,7 +487,6 @@ ${class.name}Private::${class.name}Private() [%- END -%] [%- END -%] [%- END -%] -[%- END -%] [%- END %] { } @@ -514,15 +494,25 @@ ${class.name}Private::${class.name}Private() ${class.name}Private::~${class.name}Private() { [% FOREACH attribute IN class.attribute.values -%] -[%- IF ((attribute.isDerived == 'false' or attribute.isDerivedUnion == 'true') and attribute.accessor.0.return.search('<')) or (attribute.accessor.0.return.search('\*$') and attribute.aggregation == 'composite' and attribute.subsettedProperty == '') -%] +[%- IF (attribute.isDerived == 'false' or attribute.isDerivedUnion == 'true') and attribute.aggregation == 'composite' and attribute.subsettedProperty == '' -%] + [%- IF attribute.accessor.0.return.search('\*$') -%] delete ${attribute.accessor.0.name}; + [%- ELSIF attribute.accessor.0.return.search('\&$') -%] + qDeleteAll(${attribute.accessor.0.name}); + + [%- END -%] [%- END -%] [%- END -%] [%- FOREACH associationend IN class.associationend.values -%] -[%- IF ((associationend.isDerived == 'false' or associationend.isDerivedUnion == 'true') and associationend.accessor.0.return.search('<')) or (associationend.accessor.0.return.search('\*$') and associationend.aggregation == 'composite' and associationend.subsettedProperty == '') -%] +[%- IF (associationend.isDerived == 'false' or associationend.isDerivedUnion == 'true') and associationend.aggregation == 'composite' and associationend.subsettedProperty == '' -%] + [%- IF associationend.accessor.0.return.search('\*$') -%] delete ${associationend.accessor.0.name}; + [%- ELSIF associationend.accessor.0.return.search('\&$') -%] + qDeleteAll(${associationend.accessor.0.name}); + + [%- END -%] [%- END -%] [%- END -%] } @@ -537,7 +527,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- IF attribute.isDerived == 'false' or attribute.isDerivedUnion == 'true' %] [%- IF attribute.accessor.0.return.search('<') %] - if ([% IF loop.count == 2 %]![% END %]this->${attribute.accessor.0.name}->contains(${accessor.parameter.0.name})) { + if ([% IF loop.count == 2 %]![% END %]this->${attribute.accessor.0.name}.contains(${accessor.parameter.0.name})) { [%- ELSE %] if (this->${attribute.accessor.0.name} != ${accessor.parameter.0.name}) { [%- END %] @@ -547,7 +537,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'true') -%] [%- END -%] [%- IF accessor.name.search('^add') %] - this->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); + this->${attribute.accessor.0.name}.[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] Q_Q(${class.name}); qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(q)); @@ -555,7 +545,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'false') -%] [%- END -%] [%- IF accessor.name.search('^remove') %] - this->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); + this->${attribute.accessor.0.name}.[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %] qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] @@ -603,7 +593,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- IF associationend.isDerived == 'false' or associationend.isDerivedUnion == 'true' %] [%- IF associationend.accessor.0.return.search('<') %] - if ([% IF loop.count == 2 %]![% END %]this->${associationend.accessor.0.name}->contains(${accessor.parameter.0.name})) { + if ([% IF loop.count == 2 %]![% END %]this->${associationend.accessor.0.name}.contains(${accessor.parameter.0.name})) { [%- ELSE %] if (this->${associationend.accessor.0.name} != ${accessor.parameter.0.name}) { [%- END -%] @@ -618,7 +608,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'true') %] [%- END -%] [%- IF accessor.name.search('^add') %] - this->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); + this->${associationend.accessor.0.name}.[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] Q_Q(${class.name}); qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(q)); @@ -627,7 +617,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I [%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'false') -%] [%- END -%] [%- IF accessor.name.search('^remove') %] - this->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); + this->${associationend.accessor.0.name}.[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name}); [%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %] qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0); [%- END %] @@ -725,42 +715,16 @@ ${operation.return}${class.name}::${operation.name}([%- FOREACH parameter IN ope [%- FOREACH parameter IN operation.parameter %] Q_UNUSED(${parameter.name}); [%- END %] - [%- IF operation.return.search('\*') %] + [%- IF operation.return.search('\*$') %] return 0; // change here to your derived return [%- ELSIF operation.return != 'void ' %] - return ${operation.return.remove(' $')}(); // change here to your derived return + return [% IF operation.return.search('&') %]*(new [% END %]${operation.return.remove(' $').remove('^const ').remove(' &$')}[% IF operation.return.search('&') %])[% ELSE %]()[% END %]; // change here to your derived return [%- END %] } [% END -%] -void ${class.name}::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *>("QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *> *>("const QSet<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *> *>("const QList<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *> *"); - qRegisterMetaType<${class.name} *>("${class.name} *"); - qRegisterMetaType<const QSet<${class.name} *> *>("const QSet<${class.name} *> *"); - qRegisterMetaType<const QList<${class.name} *> *>("const QList<${class.name} *> *"); - -[% FOREACH forwarddecl IN class.forwarddecl -%] -[%- IF forwarddecl.content != class.name -%] - qRegisterMetaType<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${forwarddecl.content}) *>("QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${forwarddecl.content}) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${forwarddecl.content}) *> *>("const QSet<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${forwarddecl.content}) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${forwarddecl.content}) *> *>("const QList<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${forwarddecl.content}) *> *"); - qRegisterMetaType<${forwarddecl.content} *>("${forwarddecl.content} *"); - qRegisterMetaType<const QSet<${forwarddecl.content} *> *>("const QSet<${forwarddecl.content} *> *"); - qRegisterMetaType<const QList<${forwarddecl.content} *> *>("const QList<${forwarddecl.content} *> *"); - -[% END -%] -[%- END -%] - [% IF class.superclass.size == 1 %]${class.superclass.0.name.split('/').last}[% ELSE %]QWrappedObject[% END %]::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - [%- found = 'false' -%] [%- IF class.item('attribute') %] [%- FOREACH attribute IN class.attribute.values -%] diff --git a/scripts/templates/class.h b/scripts/templates/class.h index f6c28732..04ac48d3 100644 --- a/scripts/templates/class.h +++ b/scripts/templates/class.h @@ -56,7 +56,7 @@ [%- found = 'true' -%] [%- END -%] [%- IF attribute.isReadOnly == 'true' or attribute.accessor.size == 3 %] - 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}[% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) + 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 %]) [%- 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 %]) [%- END -%] @@ -72,7 +72,7 @@ [%- found = 'true' -%] [%- END -%] [%- IF associationend.isReadOnly == 'true' or associationend.accessor.size == 3 %] - 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}[% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) + 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 %]) [%- 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 %]) [%- END -%] @@ -355,7 +355,6 @@ public: [%- END -%] [%- END -%] [%- END %] - virtual void registerMetaTypes() const; [%- friendClasses = [] -%] [%- FOREACH friendClass IN classes.values -%] [%- FOREACH associationend IN friendClass.associationend.values -%] @@ -392,10 +391,6 @@ private: QT_END_NAMESPACE_${namespace.replace('/', '_').upper} -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_${namespace.split('/').0.upper}(${class.name}) *> *) - QT_END_HEADER #endif // ${namespace.replace('/', '_').upper}_${class.name.upper}_H diff --git a/scripts/templates/class_p.h b/scripts/templates/class_p.h index a64cd762..2b2b62f9 100644 --- a/scripts/templates/class_p.h +++ b/scripts/templates/class_p.h @@ -125,12 +125,12 @@ public: [%- FOREACH attribute IN class.attribute.values %] [%- IF (attribute.isDerived == 'false' or attribute.isDerivedUnion == 'true') %] - ${attribute.accessor.0.return.remove('^const ')}${attribute.accessor.0.name}; + ${attribute.accessor.0.return.remove('^const ').remove('&$')}${attribute.accessor.0.name}; [%- END -%] [%- END -%] [%- FOREACH associationend IN class.associationend.values %] [%- IF (associationend.isDerived == 'false' or associationend.isDerivedUnion == 'true') %] - ${associationend.accessor.0.return.remove('^const ')}${associationend.accessor.0.name}; + ${associationend.accessor.0.return.remove('^const ').remove('&$')}${associationend.accessor.0.name}; [%- END -%] [%- END -%] [%- IF class.item('attribute') -%] diff --git a/src/mof/qargument.cpp b/src/mof/qargument.cpp index 778b5f09..054cd348 100644 --- a/src/mof/qargument.cpp +++ b/src/mof/qargument.cpp @@ -110,28 +110,6 @@ void QArgument::setValue(QMofObject *value) } } -void QArgument::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *>("QT_PREPEND_NAMESPACE_QTMOF(QArgument) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<QArgument *>("QArgument *"); - qRegisterMetaType<const QSet<QArgument *> *>("const QSet<QArgument *> *"); - qRegisterMetaType<const QList<QArgument *> *>("const QList<QArgument *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qargument.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qargument.h b/src/mof/qargument.h index 98f92ee3..27ac6d8d 100644 --- a/src/mof/qargument.h +++ b/src/mof/qargument.h @@ -80,7 +80,6 @@ public: Q_INVOKABLE void setName(QString name); Q_INVOKABLE QMofObject *value() const; Q_INVOKABLE void setValue(QMofObject *value); - virtual void registerMetaTypes() const; protected: explicit QArgument(QArgumentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QArgument) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *) - QT_END_HEADER #endif // QTMOF_QARGUMENT_H diff --git a/src/mof/qassociation.cpp b/src/mof/qassociation.cpp index 3ec560b2..0805bd66 100644 --- a/src/mof/qassociation.cpp +++ b/src/mof/qassociation.cpp @@ -48,18 +48,12 @@ QT_BEGIN_NAMESPACE_QTMOF QAssociationPrivate::QAssociationPrivate() : - isDerived(false), - navigableOwnedEnds(new QSet<QProperty *>), - ownedEnds(new QList<QProperty *>), - memberEnds(new QList<QProperty *>) + isDerived(false) { } QAssociationPrivate::~QAssociationPrivate() { - delete navigableOwnedEnds; - delete ownedEnds; - delete memberEnds; } /*! @@ -95,7 +89,7 @@ QAssociation::~QAssociation() /*! The Elements owned by this element. */ -const QSet<QElement *> *QAssociation::ownedElements() const +const QSet<QElement *> &QAssociation::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -111,7 +105,7 @@ QElement *QAssociation::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QAssociation::ownedComments() const +const QSet<QComment *> &QAssociation::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -133,7 +127,7 @@ void QAssociation::removeOwnedComment(QComment *ownedComment) /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QAssociation::relatedElements() const +const QSet<QElement *> &QAssociation::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -243,7 +237,7 @@ void QAssociation::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const +const QSet<QRedefinableElement *> &QAssociation::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -251,7 +245,7 @@ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QAssociation::redefinitionContexts() const +const QSet<QClassifier *> &QAssociation::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -263,7 +257,7 @@ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QAssociation::packageImports() const +const QSet<QPackageImport *> &QAssociation::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -281,7 +275,7 @@ void QAssociation::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QAssociation::members() const +const QSet<QNamedElement *> &QAssociation::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -289,7 +283,7 @@ const QSet<QNamedElement *> *QAssociation::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QAssociation::importedMembers() const +const QSet<QPackageableElement *> &QAssociation::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -297,7 +291,7 @@ const QSet<QPackageableElement *> *QAssociation::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QAssociation::elementImports() const +const QSet<QElementImport *> &QAssociation::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -315,7 +309,7 @@ void QAssociation::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QAssociation::ownedRules() const +const QSet<QConstraint *> &QAssociation::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -333,7 +327,7 @@ void QAssociation::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QAssociation::ownedMembers() const +const QSet<QNamedElement *> &QAssociation::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -385,7 +379,7 @@ void QAssociation::unsetFinalSpecialization() /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QAssociation::attributes() const +const QSet<QProperty *> &QAssociation::attributes() const { return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } @@ -393,7 +387,7 @@ const QSet<QProperty *> *QAssociation::attributes() const /*! Specifies each feature defined in the classifier. */ -const QSet<QFeature *> *QAssociation::features() const +const QSet<QFeature *> &QAssociation::features() const { return (qwrappedobject_cast<const QClassifier *>(this))->features(); } @@ -401,7 +395,7 @@ const QSet<QFeature *> *QAssociation::features() const /*! Specifies the general Classifiers for this Classifier. */ -const QSet<QClassifier *> *QAssociation::generals() const +const QSet<QClassifier *> &QAssociation::generals() const { return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } @@ -419,7 +413,7 @@ void QAssociation::removeGeneral(QClassifier *general) /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QAssociation::redefinedClassifiers() const +const QSet<QClassifier *> &QAssociation::redefinedClassifiers() const { return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } @@ -437,7 +431,7 @@ void QAssociation::removeRedefinedClassifier(QClassifier *redefinedClassifier) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QAssociation::inheritedMembers() const +const QSet<QNamedElement *> &QAssociation::inheritedMembers() const { return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } @@ -445,7 +439,7 @@ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QAssociation::generalizations() const +const QSet<QGeneralization *> &QAssociation::generalizations() const { return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } @@ -497,19 +491,19 @@ void QAssociation::unsetDerived() /*! References the classifiers that are used as types of the ends of the association. */ -const QList<QType *> *QAssociation::endTypes() const +const QList<QType *> &QAssociation::endTypes() const { // This is a read-only derived association end qWarning("QAssociation::endTypes: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QList<QType *>); // change here to your derived return } /*! The navigable ends that are owned by the association itself. */ -const QSet<QProperty *> *QAssociation::navigableOwnedEnds() const +const QSet<QProperty *> &QAssociation::navigableOwnedEnds() const { // This is a read-write association end @@ -522,8 +516,8 @@ void QAssociation::addNavigableOwnedEnd(QProperty *navigableOwnedEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->navigableOwnedEnds->contains(navigableOwnedEnd)) { - d->navigableOwnedEnds->insert(navigableOwnedEnd); + if (!d->navigableOwnedEnds.contains(navigableOwnedEnd)) { + d->navigableOwnedEnds.insert(navigableOwnedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->addOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); @@ -535,8 +529,8 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) // This is a read-write association end Q_D(QAssociation); - if (d->navigableOwnedEnds->contains(navigableOwnedEnd)) { - d->navigableOwnedEnds->remove(navigableOwnedEnd); + if (d->navigableOwnedEnds.contains(navigableOwnedEnd)) { + d->navigableOwnedEnds.remove(navigableOwnedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->removeOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); @@ -546,7 +540,7 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) /*! The ends that are owned by the association itself. */ -const QList<QProperty *> *QAssociation::ownedEnds() const +const QList<QProperty *> &QAssociation::ownedEnds() const { // This is a read-write association end @@ -559,8 +553,8 @@ void QAssociation::addOwnedEnd(QProperty *ownedEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->ownedEnds->contains(ownedEnd)) { - d->ownedEnds->append(ownedEnd); + if (!d->ownedEnds.contains(ownedEnd)) { + d->ownedEnds.append(ownedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); @@ -577,8 +571,8 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) // This is a read-write association end Q_D(QAssociation); - if (d->ownedEnds->contains(ownedEnd)) { - d->ownedEnds->removeAll(ownedEnd); + if (d->ownedEnds.contains(ownedEnd)) { + d->ownedEnds.removeAll(ownedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); @@ -593,7 +587,7 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) /*! Each end represents participation of instances of the classifier connected to the end in links of the association. */ -const QList<QProperty *> *QAssociation::memberEnds() const +const QList<QProperty *> &QAssociation::memberEnds() const { // This is a read-write association end @@ -606,8 +600,8 @@ void QAssociation::addMemberEnd(QProperty *memberEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->memberEnds->contains(memberEnd)) { - d->memberEnds->append(memberEnd); + if (!d->memberEnds.contains(memberEnd)) { + d->memberEnds.append(memberEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); @@ -622,8 +616,8 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) // This is a read-write association end Q_D(QAssociation); - if (d->memberEnds->contains(memberEnd)) { - d->memberEnds->removeAll(memberEnd); + if (d->memberEnds.contains(memberEnd)) { + d->memberEnds.removeAll(memberEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); @@ -633,35 +627,6 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) } } -void QAssociation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qassociation.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qassociation.h b/src/mof/qassociation.h index d630295a..49ec5469 100644 --- a/src/mof/qassociation.h +++ b/src/mof/qassociation.h @@ -70,10 +70,10 @@ class Q_MOF_EXPORT QAssociation : public QWrappedObject Q_OBJECT Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) - Q_PROPERTY(const QList<QType *> * endTypes READ endTypes STORED false) - Q_PROPERTY(const QSet<QProperty *> * navigableOwnedEnds READ navigableOwnedEnds) - Q_PROPERTY(const QList<QProperty *> * ownedEnds READ ownedEnds) - Q_PROPERTY(const QList<QProperty *> * memberEnds READ memberEnds) + 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_DISABLE_COPY(QAssociation) Q_DECLARE_PRIVATE(QAssociation) @@ -83,14 +83,14 @@ public: virtual ~QAssociation(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; @@ -115,22 +115,22 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QClassifier Q_INVOKABLE bool isAbstract() const; @@ -141,16 +141,16 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from aggregated QClassifier - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); @@ -160,17 +160,16 @@ public: Q_INVOKABLE void unsetDerived(); // Association ends from QAssociation - Q_INVOKABLE const QList<QType *> *endTypes() const; - Q_INVOKABLE const QSet<QProperty *> *navigableOwnedEnds() const; + Q_INVOKABLE const QList<QType *> &endTypes() const; + Q_INVOKABLE const QSet<QProperty *> &navigableOwnedEnds() const; Q_INVOKABLE void addNavigableOwnedEnd(QProperty *navigableOwnedEnd); Q_INVOKABLE void removeNavigableOwnedEnd(QProperty *navigableOwnedEnd); - Q_INVOKABLE const QList<QProperty *> *ownedEnds() const; + Q_INVOKABLE const QList<QProperty *> &ownedEnds() const; Q_INVOKABLE void addOwnedEnd(QProperty *ownedEnd); Q_INVOKABLE void removeOwnedEnd(QProperty *ownedEnd); - Q_INVOKABLE const QList<QProperty *> *memberEnds() const; + Q_INVOKABLE const QList<QProperty *> &memberEnds() const; Q_INVOKABLE void addMemberEnd(QProperty *memberEnd); Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd); - virtual void registerMetaTypes() const; protected: explicit QAssociation(QAssociationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -182,10 +181,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *) - QT_END_HEADER #endif // QTMOF_QASSOCIATION_H diff --git a/src/mof/qassociation_p.h b/src/mof/qassociation_p.h index 599ac8ff..7a0e2458 100644 --- a/src/mof/qassociation_p.h +++ b/src/mof/qassociation_p.h @@ -73,9 +73,9 @@ public: virtual ~QAssociationPrivate(); bool isDerived; - QSet<QProperty *> *navigableOwnedEnds; - QList<QProperty *> *ownedEnds; - QList<QProperty *> *memberEnds; + QSet<QProperty *> navigableOwnedEnds; + QList<QProperty *> ownedEnds; + QList<QProperty *> memberEnds; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qbehavioralfeature.cpp b/src/mof/qbehavioralfeature.cpp index 2cf88f54..230c3155 100644 --- a/src/mof/qbehavioralfeature.cpp +++ b/src/mof/qbehavioralfeature.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() : - raisedExceptions(new QSet<QType *>), - ownedParameters(new QList<QParameter *>) +QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() { } QBehavioralFeaturePrivate::~QBehavioralFeaturePrivate() { - delete raisedExceptions; - delete ownedParameters; } /*! @@ -93,7 +89,7 @@ QBehavioralFeature::~QBehavioralFeature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QBehavioralFeature::ownedElements() const +const QSet<QElement *> &QBehavioralFeature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -109,7 +105,7 @@ QElement *QBehavioralFeature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QBehavioralFeature::ownedComments() const +const QSet<QComment *> &QBehavioralFeature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -203,7 +199,7 @@ void QBehavioralFeature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const +const QSet<QRedefinableElement *> &QBehavioralFeature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -211,7 +207,7 @@ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const +const QSet<QClassifier *> &QBehavioralFeature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -245,7 +241,7 @@ void QBehavioralFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const +const QSet<QClassifier *> &QBehavioralFeature::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -257,7 +253,7 @@ const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QBehavioralFeature::packageImports() const +const QSet<QPackageImport *> &QBehavioralFeature::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -275,7 +271,7 @@ void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QBehavioralFeature::members() const +const QSet<QNamedElement *> &QBehavioralFeature::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -283,7 +279,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const +const QSet<QPackageableElement *> &QBehavioralFeature::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -291,7 +287,7 @@ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QBehavioralFeature::elementImports() const +const QSet<QElementImport *> &QBehavioralFeature::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -309,7 +305,7 @@ void QBehavioralFeature::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QBehavioralFeature::ownedRules() const +const QSet<QConstraint *> &QBehavioralFeature::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -327,7 +323,7 @@ void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const +const QSet<QNamedElement *> &QBehavioralFeature::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -339,7 +335,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const /*! References the Types representing exceptions that may be raised during an invocation of this feature. */ -const QSet<QType *> *QBehavioralFeature::raisedExceptions() const +const QSet<QType *> &QBehavioralFeature::raisedExceptions() const { // This is a read-write association end @@ -352,8 +348,8 @@ void QBehavioralFeature::addRaisedException(QType *raisedException) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->insert(raisedException); + if (!d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.insert(raisedException); } } @@ -362,15 +358,15 @@ void QBehavioralFeature::removeRaisedException(QType *raisedException) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->remove(raisedException); + if (d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.remove(raisedException); } } /*! Specifies the ordered set of formal parameters of this BehavioralFeature. */ -const QList<QParameter *> *QBehavioralFeature::ownedParameters() const +const QList<QParameter *> &QBehavioralFeature::ownedParameters() const { // This is a read-write association end @@ -383,8 +379,8 @@ void QBehavioralFeature::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -396,8 +392,8 @@ void QBehavioralFeature::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -416,42 +412,6 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa return bool(); // change here to your derived return } -void QBehavioralFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *"); - qRegisterMetaType<QBehavioralFeature *>("QBehavioralFeature *"); - qRegisterMetaType<const QSet<QBehavioralFeature *> *>("const QSet<QBehavioralFeature *> *"); - qRegisterMetaType<const QList<QBehavioralFeature *> *>("const QList<QBehavioralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *>("QT_PREPEND_NAMESPACE_QTMOF(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qbehavioralfeature.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qbehavioralfeature.h b/src/mof/qbehavioralfeature.h index f5ce0292..dd79d78c 100644 --- a/src/mof/qbehavioralfeature.h +++ b/src/mof/qbehavioralfeature.h @@ -70,8 +70,8 @@ class Q_MOF_EXPORT QBehavioralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QType *> * raisedExceptions READ raisedExceptions) - Q_PROPERTY(const QList<QParameter *> * ownedParameters READ ownedParameters) + Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) + Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) Q_DISABLE_COPY(QBehavioralFeature) Q_DECLARE_PRIVATE(QBehavioralFeature) @@ -81,9 +81,9 @@ public: virtual ~QBehavioralFeature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,8 +103,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -112,33 +112,32 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from QBehavioralFeature - Q_INVOKABLE const QSet<QType *> *raisedExceptions() const; + Q_INVOKABLE const QSet<QType *> &raisedExceptions() const; Q_INVOKABLE void addRaisedException(QType *raisedException); Q_INVOKABLE void removeRaisedException(QType *raisedException); - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); // Operations Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; - virtual void registerMetaTypes() const; protected: explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -150,10 +149,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *) - QT_END_HEADER #endif // QTMOF_QBEHAVIORALFEATURE_H diff --git a/src/mof/qbehavioralfeature_p.h b/src/mof/qbehavioralfeature_p.h index b8181aaa..fa1db620 100644 --- a/src/mof/qbehavioralfeature_p.h +++ b/src/mof/qbehavioralfeature_p.h @@ -72,8 +72,8 @@ public: explicit QBehavioralFeaturePrivate(); virtual ~QBehavioralFeaturePrivate(); - QSet<QType *> *raisedExceptions; - QList<QParameter *> *ownedParameters; + QSet<QType *> raisedExceptions; + QList<QParameter *> ownedParameters; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qclass.cpp b/src/mof/qclass.cpp index 77ab7959..75cfe0f1 100644 --- a/src/mof/qclass.cpp +++ b/src/mof/qclass.cpp @@ -49,18 +49,12 @@ QT_BEGIN_NAMESPACE_QTMOF QClassPrivate::QClassPrivate() : - isAbstract(false), - nestedClassifiers(new QList<QClassifier *>), - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>) + isAbstract(false) { } QClassPrivate::~QClassPrivate() { - delete nestedClassifiers; - delete ownedOperations; - delete ownedAttributes; } /*! @@ -122,7 +116,7 @@ void QClass::unsetAbstract() /*! References all the Classifiers that are defined (nested) within the Class. */ -const QList<QClassifier *> *QClass::nestedClassifiers() const +const QList<QClassifier *> &QClass::nestedClassifiers() const { // This is a read-write association end @@ -135,8 +129,8 @@ void QClass::addNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QClass); - if (!d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->append(nestedClassifier); + if (!d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.append(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -148,8 +142,8 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QClass); - if (d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->removeAll(nestedClassifier); + if (d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.removeAll(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -159,7 +153,7 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) /*! The operations owned by the class. */ -const QList<QOperation *> *QClass::ownedOperations() const +const QList<QOperation *> &QClass::ownedOperations() const { // This is a read-write association end @@ -172,8 +166,8 @@ void QClass::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QClass); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -189,8 +183,8 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QClass); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -204,7 +198,7 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) /*! The attributes (i.e. the properties) owned by the class. */ -const QList<QProperty *> *QClass::ownedAttributes() const +const QList<QProperty *> &QClass::ownedAttributes() const { // This is a read-write association end @@ -217,8 +211,8 @@ void QClass::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QClass); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -234,8 +228,8 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QClass); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -249,13 +243,13 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) /*! This gives the superclasses of a class. */ -const QSet<QClass *> *QClass::superClasses() const +const QSet<QClass *> &QClass::superClasses() const { // This is a read-write derived association end qWarning("QClass::superClasses: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QClass *>); // change here to your derived return } void QClass::addSuperClass(QClass *superClass) @@ -285,48 +279,12 @@ void QClass::removeSuperClass(QClass *superClass) /*! The inherit operation is overridden to exclude redefined properties. */ -const QSet<QNamedElement *> *QClass::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QClass::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QClass::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return -} - -void QClass::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QNamedElement *>); // change here to your derived return } #include "moc_qclass.cpp" diff --git a/src/mof/qclass.h b/src/mof/qclass.h index 8f0407cf..8540743e 100644 --- a/src/mof/qclass.h +++ b/src/mof/qclass.h @@ -68,10 +68,10 @@ class Q_MOF_EXPORT QClass : public QClassifier Q_OBJECT Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(const QList<QClassifier *> * nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) - Q_PROPERTY(const QSet<QClass *> * superClasses READ superClasses STORED false) + 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_DISABLE_COPY(QClass) Q_DECLARE_PRIVATE(QClass) @@ -86,22 +86,21 @@ public: Q_INVOKABLE void unsetAbstract(); // Association ends from QClass - Q_INVOKABLE const QList<QClassifier *> *nestedClassifiers() const; + Q_INVOKABLE const QList<QClassifier *> &nestedClassifiers() const; Q_INVOKABLE void addNestedClassifier(QClassifier *nestedClassifier); Q_INVOKABLE void removeNestedClassifier(QClassifier *nestedClassifier); - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - Q_INVOKABLE const QSet<QClass *> *superClasses() const; + Q_INVOKABLE const QSet<QClass *> &superClasses() const; Q_INVOKABLE void addSuperClass(QClass *superClass); Q_INVOKABLE void removeSuperClass(QClass *superClass); // Operations - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; protected: explicit QClass(QClassPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -109,10 +108,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QClass) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *) - QT_END_HEADER #endif // QTMOF_QCLASS_H diff --git a/src/mof/qclass_p.h b/src/mof/qclass_p.h index f070bb5d..bf959ead 100644 --- a/src/mof/qclass_p.h +++ b/src/mof/qclass_p.h @@ -71,9 +71,9 @@ public: virtual ~QClassPrivate(); bool isAbstract; - QList<QClassifier *> *nestedClassifiers; - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; + QList<QClassifier *> nestedClassifiers; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qclassifier.cpp b/src/mof/qclassifier.cpp index d340c429..5c8999e0 100644 --- a/src/mof/qclassifier.cpp +++ b/src/mof/qclassifier.cpp @@ -53,28 +53,20 @@ QT_BEGIN_NAMESPACE_QTMOF QClassifierPrivate::QClassifierPrivate() : isAbstract(false), - isFinalSpecialization(false), - attributes(new QSet<QProperty *>), - features(new QSet<QFeature *>), - redefinedClassifiers(new QSet<QClassifier *>), - generalizations(new QSet<QGeneralization *>) + isFinalSpecialization(false) { } QClassifierPrivate::~QClassifierPrivate() { - delete attributes; - delete features; - delete redefinedClassifiers; - delete generalizations; } void QClassifierPrivate::addAttribute(QProperty *attribute) { // This is a read-only derived-union association end - if (!this->attributes->contains(attribute)) { - this->attributes->insert(attribute); + if (!this->attributes.contains(attribute)) { + this->attributes.insert(attribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(this))->addFeature(qwrappedobject_cast<QFeature *>(attribute)); @@ -85,8 +77,8 @@ void QClassifierPrivate::removeAttribute(QProperty *attribute) { // This is a read-only derived-union association end - if (this->attributes->contains(attribute)) { - this->attributes->remove(attribute); + if (this->attributes.contains(attribute)) { + this->attributes.remove(attribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(this))->removeFeature(qwrappedobject_cast<QFeature *>(attribute)); @@ -97,8 +89,8 @@ void QClassifierPrivate::addFeature(QFeature *feature) { // This is a read-only derived-union association end - if (!this->features->contains(feature)) { - this->features->insert(feature); + if (!this->features.contains(feature)) { + this->features.insert(feature); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(feature)); @@ -113,8 +105,8 @@ void QClassifierPrivate::removeFeature(QFeature *feature) { // This is a read-only derived-union association end - if (this->features->contains(feature)) { - this->features->remove(feature); + if (this->features.contains(feature)) { + this->features.remove(feature); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(feature)); @@ -161,7 +153,7 @@ QClassifier::~QClassifier() /*! The Elements owned by this element. */ -const QSet<QElement *> *QClassifier::ownedElements() const +const QSet<QElement *> &QClassifier::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -177,7 +169,7 @@ QElement *QClassifier::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QClassifier::ownedComments() const +const QSet<QComment *> &QClassifier::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -297,7 +289,7 @@ void QClassifier::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const +const QSet<QRedefinableElement *> &QClassifier::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -305,7 +297,7 @@ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QClassifier::redefinitionContexts() const +const QSet<QClassifier *> &QClassifier::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -317,7 +309,7 @@ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QClassifier::packageImports() const +const QSet<QPackageImport *> &QClassifier::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -335,7 +327,7 @@ void QClassifier::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QClassifier::members() const +const QSet<QNamedElement *> &QClassifier::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -343,7 +335,7 @@ const QSet<QNamedElement *> *QClassifier::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QClassifier::importedMembers() const +const QSet<QPackageableElement *> &QClassifier::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -351,7 +343,7 @@ const QSet<QPackageableElement *> *QClassifier::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QClassifier::elementImports() const +const QSet<QElementImport *> &QClassifier::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -369,7 +361,7 @@ void QClassifier::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QClassifier::ownedRules() const +const QSet<QConstraint *> &QClassifier::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -387,7 +379,7 @@ void QClassifier::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QClassifier::ownedMembers() const +const QSet<QNamedElement *> &QClassifier::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -455,7 +447,7 @@ void QClassifier::unsetFinalSpecialization() /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QClassifier::attributes() const +const QSet<QProperty *> &QClassifier::attributes() const { // This is a read-only derived-union association end @@ -466,7 +458,7 @@ const QSet<QProperty *> *QClassifier::attributes() const /*! Specifies each feature defined in the classifier. */ -const QSet<QFeature *> *QClassifier::features() const +const QSet<QFeature *> &QClassifier::features() const { // This is a read-only derived-union association end @@ -477,13 +469,13 @@ const QSet<QFeature *> *QClassifier::features() const /*! Specifies the general Classifiers for this Classifier. */ -const QSet<QClassifier *> *QClassifier::generals() const +const QSet<QClassifier *> &QClassifier::generals() const { // This is a read-write derived association end qWarning("QClassifier::generals: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QClassifier *>); // change here to your derived return } void QClassifier::addGeneral(QClassifier *general) @@ -513,7 +505,7 @@ void QClassifier::removeGeneral(QClassifier *general) /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QClassifier::redefinedClassifiers() const +const QSet<QClassifier *> &QClassifier::redefinedClassifiers() const { // This is a read-write association end @@ -526,8 +518,8 @@ void QClassifier::addRedefinedClassifier(QClassifier *redefinedClassifier) // This is a read-write association end Q_D(QClassifier); - if (!d->redefinedClassifiers->contains(redefinedClassifier)) { - d->redefinedClassifiers->insert(redefinedClassifier); + if (!d->redefinedClassifiers.contains(redefinedClassifier)) { + d->redefinedClassifiers.insert(redefinedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); @@ -539,8 +531,8 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) // This is a read-write association end Q_D(QClassifier); - if (d->redefinedClassifiers->contains(redefinedClassifier)) { - d->redefinedClassifiers->remove(redefinedClassifier); + if (d->redefinedClassifiers.contains(redefinedClassifier)) { + d->redefinedClassifiers.remove(redefinedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); @@ -550,19 +542,19 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QClassifier::inheritedMembers() const +const QSet<QNamedElement *> &QClassifier::inheritedMembers() const { // This is a read-only derived association end qWarning("QClassifier::inheritedMembers: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QClassifier::generalizations() const +const QSet<QGeneralization *> &QClassifier::generalizations() const { // This is a read-write association end @@ -575,8 +567,8 @@ void QClassifier::addGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QClassifier); - if (!d->generalizations->contains(generalization)) { - d->generalizations->insert(generalization); + if (!d->generalizations.contains(generalization)) { + d->generalizations.insert(generalization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalization)); @@ -591,8 +583,8 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QClassifier); - if (d->generalizations->contains(generalization)) { - d->generalizations->remove(generalization); + if (d->generalizations.contains(generalization)) { + d->generalizations.remove(generalization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalization)); @@ -605,21 +597,21 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) /*! The query allFeatures() gives all of the features in the namespace of the classifier. In general, through mechanisms such as inheritance, this will be a larger set than feature. */ -const QSet<QFeature *> *QClassifier::allFeatures() const +const QSet<QFeature *> &QClassifier::allFeatures() const { qWarning("QClassifier::allFeatures: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QFeature *>); // change here to your derived return } /*! The query allParents() gives all of the direct and indirect ancestors of a generalized Classifier. */ -const QSet<QClassifier *> *QClassifier::allParents() const +const QSet<QClassifier *> &QClassifier::allParents() const { qWarning("QClassifier::allParents: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QClassifier *>); // change here to your derived return } /*! @@ -647,23 +639,23 @@ bool QClassifier::hasVisibilityOf(const QNamedElement *n) const /*! The query inherit() defines how to inherit a set of elements. Here the operation is defined to inherit them all. It is intended to be redefined in circumstances where inheritance is affected by redefinition. */ -const QSet<QNamedElement *> *QClassifier::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QClassifier::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QClassifier::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! The query inheritableMembers() gives all of the members of a classifier that may be inherited in one of its descendants, subject to whatever visibility restrictions apply. */ -const QSet<QNamedElement *> *QClassifier::inheritableMembers(const QClassifier *c) const +const QSet<QNamedElement *> &QClassifier::inheritableMembers(const QClassifier *c) const { qWarning("QClassifier::inheritableMembers: operation to be implemented"); Q_UNUSED(c); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! @@ -680,54 +672,11 @@ bool QClassifier::maySpecializeType(const QClassifier *c) const /*! The query parents() gives all of the immediate ancestors of a generalized Classifier. */ -const QSet<QClassifier *> *QClassifier::parents() const +const QSet<QClassifier *> &QClassifier::parents() const { qWarning("QClassifier::parents: operation to be implemented"); - return 0; // change here to your derived return -} - -void QClassifier::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<QFeature *>("QFeature *"); - qRegisterMetaType<const QSet<QFeature *> *>("const QSet<QFeature *> *"); - qRegisterMetaType<const QList<QFeature *> *>("const QList<QFeature *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QClassifier *>); // change here to your derived return } #include "moc_qclassifier.cpp" diff --git a/src/mof/qclassifier.h b/src/mof/qclassifier.h index 211c8eae..e6ca857a 100644 --- a/src/mof/qclassifier.h +++ b/src/mof/qclassifier.h @@ -73,12 +73,12 @@ class Q_MOF_EXPORT QClassifier : public QWrappedObject Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(const QSet<QProperty *> * attributes READ attributes) - Q_PROPERTY(const QSet<QFeature *> * features READ features) - Q_PROPERTY(const QSet<QClassifier *> * generals READ generals STORED false) - Q_PROPERTY(const QSet<QClassifier *> * redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(const QSet<QNamedElement *> * inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(const QSet<QGeneralization *> * generalizations READ generalizations) + 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_DISABLE_COPY(QClassifier) Q_DECLARE_PRIVATE(QClassifier) @@ -88,9 +88,9 @@ public: virtual ~QClassifier(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -117,22 +117,22 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from QClassifier Q_INVOKABLE bool isAbstract() const; @@ -143,29 +143,28 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from QClassifier - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); // Operations - Q_INVOKABLE const QSet<QFeature *> *allFeatures() const; - Q_INVOKABLE const QSet<QClassifier *> *allParents() const; + Q_INVOKABLE const QSet<QFeature *> &allFeatures() const; + Q_INVOKABLE const QSet<QClassifier *> &allParents() const; Q_INVOKABLE bool conformsTo(const QClassifier *other) const; Q_INVOKABLE bool hasVisibilityOf(const QNamedElement *n) const; - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - Q_INVOKABLE const QSet<QNamedElement *> *inheritableMembers(const QClassifier *c) const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritableMembers(const QClassifier *c) const; Q_INVOKABLE bool maySpecializeType(const QClassifier *c) const; - Q_INVOKABLE const QSet<QClassifier *> *parents() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QClassifier *> &parents() const; // Classes which access read-only opposite properties should be friend friend class QFeaturePrivate; @@ -181,10 +180,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *) - QT_END_HEADER #endif // QTMOF_QCLASSIFIER_H diff --git a/src/mof/qclassifier_p.h b/src/mof/qclassifier_p.h index f9860274..5b48f9fe 100644 --- a/src/mof/qclassifier_p.h +++ b/src/mof/qclassifier_p.h @@ -76,10 +76,10 @@ public: bool isAbstract; bool isFinalSpecialization; - QSet<QProperty *> *attributes; - QSet<QFeature *> *features; - QSet<QClassifier *> *redefinedClassifiers; - QSet<QGeneralization *> *generalizations; + QSet<QProperty *> attributes; + QSet<QFeature *> features; + QSet<QClassifier *> redefinedClassifiers; + QSet<QGeneralization *> generalizations; // Internal functions for read-only subsetted association ends void addAttribute(QProperty *attribute); diff --git a/src/mof/qcomment.cpp b/src/mof/qcomment.cpp index 24b759eb..742b3cdd 100644 --- a/src/mof/qcomment.cpp +++ b/src/mof/qcomment.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QCommentPrivate::QCommentPrivate() : - annotatedElements(new QSet<QElement *>) +QCommentPrivate::QCommentPrivate() { } QCommentPrivate::~QCommentPrivate() { - delete annotatedElements; } /*! @@ -108,7 +106,7 @@ void QComment::setBody(QString body) /*! References the Element(s) being commented. */ -const QSet<QElement *> *QComment::annotatedElements() const +const QSet<QElement *> &QComment::annotatedElements() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QComment::addAnnotatedElement(QElement *annotatedElement) // This is a read-write association end Q_D(QComment); - if (!d->annotatedElements->contains(annotatedElement)) { - d->annotatedElements->insert(annotatedElement); + if (!d->annotatedElements.contains(annotatedElement)) { + d->annotatedElements.insert(annotatedElement); } } @@ -131,26 +129,11 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement) // This is a read-write association end Q_D(QComment); - if (d->annotatedElements->contains(annotatedElement)) { - d->annotatedElements->remove(annotatedElement); + if (d->annotatedElements.contains(annotatedElement)) { + d->annotatedElements.remove(annotatedElement); } } -void QComment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QComment) *>("QT_PREPEND_NAMESPACE_QTMOF(QComment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<QComment *>("QComment *"); - qRegisterMetaType<const QSet<QComment *> *>("const QSet<QComment *> *"); - qRegisterMetaType<const QList<QComment *> *>("const QList<QComment *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcomment.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qcomment.h b/src/mof/qcomment.h index f01b3f34..9f3b44de 100644 --- a/src/mof/qcomment.h +++ b/src/mof/qcomment.h @@ -63,7 +63,7 @@ class Q_MOF_EXPORT QComment : public QElement Q_OBJECT Q_PROPERTY(QString body READ body WRITE setBody) - Q_PROPERTY(const QSet<QElement *> * annotatedElements READ annotatedElements) + Q_PROPERTY(QSet<QElement *> annotatedElements READ annotatedElements) Q_DISABLE_COPY(QComment) Q_DECLARE_PRIVATE(QComment) @@ -77,10 +77,9 @@ public: Q_INVOKABLE void setBody(QString body); // Association ends from QComment - Q_INVOKABLE const QSet<QElement *> *annotatedElements() const; + Q_INVOKABLE const QSet<QElement *> &annotatedElements() const; Q_INVOKABLE void addAnnotatedElement(QElement *annotatedElement); Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement); - virtual void registerMetaTypes() const; protected: explicit QComment(QCommentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QComment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *) - QT_END_HEADER #endif // QTMOF_QCOMMENT_H diff --git a/src/mof/qcomment_p.h b/src/mof/qcomment_p.h index 0b545da1..16bcb9a6 100644 --- a/src/mof/qcomment_p.h +++ b/src/mof/qcomment_p.h @@ -66,7 +66,7 @@ public: virtual ~QCommentPrivate(); QString body; - QSet<QElement *> *annotatedElements; + QSet<QElement *> annotatedElements; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qconstraint.cpp b/src/mof/qconstraint.cpp index 21d39216..2582d05e 100644 --- a/src/mof/qconstraint.cpp +++ b/src/mof/qconstraint.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTMOF QConstraintPrivate::QConstraintPrivate() : context(0), - specification(0), - constrainedElements(new QList<QElement *>) + specification(0) { } QConstraintPrivate::~QConstraintPrivate() { - delete constrainedElements; } /*! @@ -150,7 +148,7 @@ void QConstraint::setSpecification(QValueSpecification *specification) /*! The ordered set of Elements referenced by this Constraint. */ -const QList<QElement *> *QConstraint::constrainedElements() const +const QList<QElement *> &QConstraint::constrainedElements() const { // This is a read-write association end @@ -163,8 +161,8 @@ void QConstraint::addConstrainedElement(QElement *constrainedElement) // This is a read-write association end Q_D(QConstraint); - if (!d->constrainedElements->contains(constrainedElement)) { - d->constrainedElements->append(constrainedElement); + if (!d->constrainedElements.contains(constrainedElement)) { + d->constrainedElements.append(constrainedElement); } } @@ -173,47 +171,11 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement) // This is a read-write association end Q_D(QConstraint); - if (d->constrainedElements->contains(constrainedElement)) { - d->constrainedElements->removeAll(constrainedElement); + if (d->constrainedElements.contains(constrainedElement)) { + d->constrainedElements.removeAll(constrainedElement); } } -void QConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *>("QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconstraint.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qconstraint.h b/src/mof/qconstraint.h index e4185e4a..bcc59af2 100644 --- a/src/mof/qconstraint.h +++ b/src/mof/qconstraint.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QConstraint : public QPackageableElement Q_PROPERTY(QNamespace * context READ context WRITE setContext) Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QList<QElement *> * constrainedElements READ constrainedElements) + Q_PROPERTY(QList<QElement *> constrainedElements READ constrainedElements) Q_DISABLE_COPY(QConstraint) Q_DECLARE_PRIVATE(QConstraint) @@ -82,10 +82,9 @@ public: Q_INVOKABLE void setContext(QNamespace *context); Q_INVOKABLE QValueSpecification *specification() const; Q_INVOKABLE void setSpecification(QValueSpecification *specification); - Q_INVOKABLE const QList<QElement *> *constrainedElements() const; + Q_INVOKABLE const QList<QElement *> &constrainedElements() const; Q_INVOKABLE void addConstrainedElement(QElement *constrainedElement); Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement); - virtual void registerMetaTypes() const; protected: explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *) - QT_END_HEADER #endif // QTMOF_QCONSTRAINT_H diff --git a/src/mof/qconstraint_p.h b/src/mof/qconstraint_p.h index d23761e2..c5595ed9 100644 --- a/src/mof/qconstraint_p.h +++ b/src/mof/qconstraint_p.h @@ -71,7 +71,7 @@ public: QNamespace *context; QValueSpecification *specification; - QList<QElement *> *constrainedElements; + QList<QElement *> constrainedElements; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdatatype.cpp b/src/mof/qdatatype.cpp index 941f21d8..75b8a1d0 100644 --- a/src/mof/qdatatype.cpp +++ b/src/mof/qdatatype.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QDataTypePrivate::QDataTypePrivate() : - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>) +QDataTypePrivate::QDataTypePrivate() { } QDataTypePrivate::~QDataTypePrivate() { - delete ownedOperations; - delete ownedAttributes; } /*! @@ -89,7 +85,7 @@ QDataType::~QDataType() /*! The Operations owned by the DataType. */ -const QList<QOperation *> *QDataType::ownedOperations() const +const QList<QOperation *> &QDataType::ownedOperations() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QDataType::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QDataType); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -119,8 +115,8 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QDataType); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -134,7 +130,7 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) /*! The Attributes owned by the DataType. */ -const QList<QProperty *> *QDataType::ownedAttributes() const +const QList<QProperty *> &QDataType::ownedAttributes() const { // This is a read-write association end @@ -147,8 +143,8 @@ void QDataType::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QDataType); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -164,8 +160,8 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QDataType); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -179,48 +175,12 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) /*! The inherit operation is overridden to exclude redefined properties. */ -const QSet<QNamedElement *> *QDataType::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QDataType::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QDataType::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return -} - -void QDataType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QNamedElement *>); // change here to your derived return } #include "moc_qdatatype.cpp" diff --git a/src/mof/qdatatype.h b/src/mof/qdatatype.h index c9619ea6..d6f5cb74 100644 --- a/src/mof/qdatatype.h +++ b/src/mof/qdatatype.h @@ -67,8 +67,8 @@ class Q_MOF_EXPORT QDataType : public QClassifier { Q_OBJECT - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QDataType) Q_DECLARE_PRIVATE(QDataType) @@ -78,16 +78,15 @@ public: virtual ~QDataType(); // Association ends from QDataType - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); // Operations - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; protected: explicit QDataType(QDataTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QDataType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *) - QT_END_HEADER #endif // QTMOF_QDATATYPE_H diff --git a/src/mof/qdatatype_p.h b/src/mof/qdatatype_p.h index 1329854a..89281cfa 100644 --- a/src/mof/qdatatype_p.h +++ b/src/mof/qdatatype_p.h @@ -70,8 +70,8 @@ public: explicit QDataTypePrivate(); virtual ~QDataTypePrivate(); - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdirectedrelationship.cpp b/src/mof/qdirectedrelationship.cpp index ccf76c10..d9628964 100644 --- a/src/mof/qdirectedrelationship.cpp +++ b/src/mof/qdirectedrelationship.cpp @@ -46,24 +46,20 @@ QT_BEGIN_NAMESPACE_QTMOF -QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() : - sources(new QSet<QElement *>), - targets(new QSet<QElement *>) +QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() { } QDirectedRelationshipPrivate::~QDirectedRelationshipPrivate() { - delete sources; - delete targets; } void QDirectedRelationshipPrivate::addSource(QElement *source) { // This is a read-only derived-union association end - if (!this->sources->contains(source)) { - this->sources->insert(source); + if (!this->sources.contains(source)) { + this->sources.insert(source); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(source)); @@ -74,8 +70,8 @@ void QDirectedRelationshipPrivate::removeSource(QElement *source) { // This is a read-only derived-union association end - if (this->sources->contains(source)) { - this->sources->remove(source); + if (this->sources.contains(source)) { + this->sources.remove(source); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(source)); @@ -86,8 +82,8 @@ void QDirectedRelationshipPrivate::addTarget(QElement *target) { // This is a read-only derived-union association end - if (!this->targets->contains(target)) { - this->targets->insert(target); + if (!this->targets.contains(target)) { + this->targets.insert(target); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(target)); @@ -98,8 +94,8 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) { // This is a read-only derived-union association end - if (this->targets->contains(target)) { - this->targets->remove(target); + if (this->targets.contains(target)) { + this->targets.remove(target); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(target)); @@ -135,7 +131,7 @@ QDirectedRelationship::~QDirectedRelationship() /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QDirectedRelationship::sources() const +const QSet<QElement *> &QDirectedRelationship::sources() const { // This is a read-only derived-union association end @@ -146,7 +142,7 @@ const QSet<QElement *> *QDirectedRelationship::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QDirectedRelationship::targets() const +const QSet<QElement *> &QDirectedRelationship::targets() const { // This is a read-only derived-union association end @@ -154,28 +150,6 @@ const QSet<QElement *> *QDirectedRelationship::targets() const return d->targets; } -void QDirectedRelationship::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *>("QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *"); - qRegisterMetaType<QDirectedRelationship *>("QDirectedRelationship *"); - qRegisterMetaType<const QSet<QDirectedRelationship *> *>("const QSet<QDirectedRelationship *> *"); - qRegisterMetaType<const QList<QDirectedRelationship *> *>("const QList<QDirectedRelationship *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdirectedrelationship.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdirectedrelationship.h b/src/mof/qdirectedrelationship.h index 7c9b390e..8416167b 100644 --- a/src/mof/qdirectedrelationship.h +++ b/src/mof/qdirectedrelationship.h @@ -64,8 +64,8 @@ class Q_MOF_EXPORT QDirectedRelationship : public QRelationship { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * sources READ sources) - Q_PROPERTY(const QSet<QElement *> * targets READ targets) + Q_PROPERTY(QSet<QElement *> sources READ sources) + Q_PROPERTY(QSet<QElement *> targets READ targets) Q_DISABLE_COPY(QDirectedRelationship) Q_DECLARE_PRIVATE(QDirectedRelationship) @@ -75,9 +75,8 @@ public: virtual ~QDirectedRelationship(); // Association ends from QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; protected: explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *) - QT_END_HEADER #endif // QTMOF_QDIRECTEDRELATIONSHIP_H diff --git a/src/mof/qdirectedrelationship_p.h b/src/mof/qdirectedrelationship_p.h index ca8392ea..b0a2ddbc 100644 --- a/src/mof/qdirectedrelationship_p.h +++ b/src/mof/qdirectedrelationship_p.h @@ -66,8 +66,8 @@ public: explicit QDirectedRelationshipPrivate(); virtual ~QDirectedRelationshipPrivate(); - QSet<QElement *> *sources; - QSet<QElement *> *targets; + QSet<QElement *> sources; + QSet<QElement *> targets; // Internal functions for read-only subsetted association ends void addSource(QElement *source); diff --git a/src/mof/qelement.cpp b/src/mof/qelement.cpp index a188727c..d3a31f04 100644 --- a/src/mof/qelement.cpp +++ b/src/mof/qelement.cpp @@ -48,24 +48,21 @@ QT_BEGIN_NAMESPACE_QTMOF QElementPrivate::QElementPrivate() : - ownedElements(new QSet<QElement *>), - owner(0), - ownedComments(new QSet<QComment *>) + owner(0) { } QElementPrivate::~QElementPrivate() { - delete ownedElements; - delete ownedComments; + qDeleteAll(ownedElements); } void QElementPrivate::addOwnedElement(QElement *ownedElement) { // This is a read-only derived-union association end - if (!this->ownedElements->contains(ownedElement)) { - this->ownedElements->insert(ownedElement); + if (!this->ownedElements.contains(ownedElement)) { + this->ownedElements.insert(ownedElement); Q_Q(QElement); qTopLevelWrapper(ownedElement)->setParent(qTopLevelWrapper(q)); @@ -78,8 +75,8 @@ void QElementPrivate::removeOwnedElement(QElement *ownedElement) { // This is a read-only derived-union association end - if (this->ownedElements->contains(ownedElement)) { - this->ownedElements->remove(ownedElement); + if (this->ownedElements.contains(ownedElement)) { + this->ownedElements.remove(ownedElement); qTopLevelWrapper(ownedElement)->setParent(0); // Adjust opposite property @@ -134,7 +131,7 @@ QElement::~QElement() /*! The Elements owned by this element. */ -const QSet<QElement *> *QElement::ownedElements() const +const QSet<QElement *> &QElement::ownedElements() const { // This is a read-only derived-union association end @@ -156,7 +153,7 @@ QElement *QElement::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QElement::ownedComments() const +const QSet<QComment *> &QElement::ownedComments() const { // This is a read-write association end @@ -169,8 +166,8 @@ void QElement::addOwnedComment(QComment *ownedComment) // This is a read-write association end Q_D(QElement); - if (!d->ownedComments->contains(ownedComment)) { - d->ownedComments->insert(ownedComment); + if (!d->ownedComments.contains(ownedComment)) { + d->ownedComments.insert(ownedComment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); @@ -182,8 +179,8 @@ void QElement::removeOwnedComment(QComment *ownedComment) // This is a read-write association end Q_D(QElement); - if (d->ownedComments->contains(ownedComment)) { - d->ownedComments->remove(ownedComment); + if (d->ownedComments.contains(ownedComment)) { + d->ownedComments.remove(ownedComment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); @@ -193,11 +190,11 @@ void QElement::removeOwnedComment(QComment *ownedComment) /*! The query allOwnedElements() gives all of the direct and indirect owned elements of an element. */ -const QSet<QElement *> *QElement::allOwnedElements() const +const QSet<QElement *> &QElement::allOwnedElements() const { qWarning("QElement::allOwnedElements: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QElement *>); // change here to your derived return } /*! @@ -238,35 +235,6 @@ void QElement::delete_() qWarning("QElement::delete_: operation to be implemented"); } -void QElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QComment) *>("QT_PREPEND_NAMESPACE_QTMOF(QComment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<QComment *>("QComment *"); - qRegisterMetaType<const QSet<QComment *> *>("const QSet<QComment *> *"); - qRegisterMetaType<const QList<QComment *> *>("const QList<QComment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qelement.h b/src/mof/qelement.h index e06e826b..52fc49a8 100644 --- a/src/mof/qelement.h +++ b/src/mof/qelement.h @@ -65,9 +65,9 @@ class Q_MOF_EXPORT QElement : public QMofObject { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * ownedElements READ ownedElements) + Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(const QSet<QComment *> * ownedComments READ ownedComments) + Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) Q_DISABLE_COPY(QElement) Q_DECLARE_PRIVATE(QElement) @@ -77,20 +77,19 @@ public: virtual ~QElement(); // Association ends from QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Operations - Q_INVOKABLE const QSet<QElement *> *allOwnedElements() const; + Q_INVOKABLE const QSet<QElement *> &allOwnedElements() const; Q_INVOKABLE bool mustBeOwned() const; Q_INVOKABLE QClass *getMetaClass() const; Q_INVOKABLE QElement *container() const; Q_INVOKABLE bool isInstanceOfType(const QClass *type, bool includesSubtypes) const; Q_INVOKABLE void delete_(); - virtual void registerMetaTypes() const; protected: explicit QElement(QElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *) - QT_END_HEADER #endif // QTMOF_QELEMENT_H diff --git a/src/mof/qelement_p.h b/src/mof/qelement_p.h index 2c894cab..f565b16b 100644 --- a/src/mof/qelement_p.h +++ b/src/mof/qelement_p.h @@ -68,9 +68,9 @@ public: explicit QElementPrivate(); virtual ~QElementPrivate(); - QSet<QElement *> *ownedElements; + QSet<QElement *> ownedElements; QElement *owner; - QSet<QComment *> *ownedComments; + QSet<QComment *> ownedComments; // Internal functions for read-only subsetted association ends void addOwnedElement(QElement *ownedElement); diff --git a/src/mof/qelementimport.cpp b/src/mof/qelementimport.cpp index b36af236..0eb22615 100644 --- a/src/mof/qelementimport.cpp +++ b/src/mof/qelementimport.cpp @@ -212,35 +212,6 @@ QString QElementImport::getName() const return QString(); // change here to your derived return } -void QElementImport::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qelementimport.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qelementimport.h b/src/mof/qelementimport.h index ce14b6d4..fff3b290 100644 --- a/src/mof/qelementimport.h +++ b/src/mof/qelementimport.h @@ -95,7 +95,6 @@ public: // Operations Q_INVOKABLE QString getName() const; - virtual void registerMetaTypes() const; protected: explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -103,10 +102,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *) - QT_END_HEADER #endif // QTMOF_QELEMENTIMPORT_H diff --git a/src/mof/qenumeration.cpp b/src/mof/qenumeration.cpp index 7a1c3322..30455559 100644 --- a/src/mof/qenumeration.cpp +++ b/src/mof/qenumeration.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QEnumerationPrivate::QEnumerationPrivate() : - ownedLiterals(new QList<QEnumerationLiteral *>) +QEnumerationPrivate::QEnumerationPrivate() { } QEnumerationPrivate::~QEnumerationPrivate() { - delete ownedLiterals; } /*! @@ -85,7 +83,7 @@ QEnumeration::~QEnumeration() /*! The ordered set of literals for this Enumeration. */ -const QList<QEnumerationLiteral *> *QEnumeration::ownedLiterals() const +const QList<QEnumerationLiteral *> &QEnumeration::ownedLiterals() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QEnumeration::addOwnedLiteral(QEnumerationLiteral *ownedLiteral) // This is a read-write association end Q_D(QEnumeration); - if (!d->ownedLiterals->contains(ownedLiteral)) { - d->ownedLiterals->append(ownedLiteral); + if (!d->ownedLiterals.contains(ownedLiteral)) { + d->ownedLiterals.append(ownedLiteral); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); @@ -114,8 +112,8 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) // This is a read-write association end Q_D(QEnumeration); - if (d->ownedLiterals->contains(ownedLiteral)) { - d->ownedLiterals->removeAll(ownedLiteral); + if (d->ownedLiterals.contains(ownedLiteral)) { + d->ownedLiterals.removeAll(ownedLiteral); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); @@ -125,28 +123,6 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) } } -void QEnumeration::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<QEnumeration *>("QEnumeration *"); - qRegisterMetaType<const QSet<QEnumeration *> *>("const QSet<QEnumeration *> *"); - qRegisterMetaType<const QList<QEnumeration *> *>("const QList<QEnumeration *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *"); - qRegisterMetaType<const QSet<QEnumerationLiteral *> *>("const QSet<QEnumerationLiteral *> *"); - qRegisterMetaType<const QList<QEnumerationLiteral *> *>("const QList<QEnumerationLiteral *> *"); - - QDataType::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qenumeration.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumeration.h b/src/mof/qenumeration.h index ecfd86ed..ad81bd64 100644 --- a/src/mof/qenumeration.h +++ b/src/mof/qenumeration.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QEnumeration : public QDataType { Q_OBJECT - Q_PROPERTY(const QList<QEnumerationLiteral *> * ownedLiterals READ ownedLiterals) + Q_PROPERTY(QList<QEnumerationLiteral *> ownedLiterals READ ownedLiterals) Q_DISABLE_COPY(QEnumeration) Q_DECLARE_PRIVATE(QEnumeration) @@ -74,10 +74,9 @@ public: virtual ~QEnumeration(); // Association ends from QEnumeration - Q_INVOKABLE const QList<QEnumerationLiteral *> *ownedLiterals() const; + Q_INVOKABLE const QList<QEnumerationLiteral *> &ownedLiterals() const; Q_INVOKABLE void addOwnedLiteral(QEnumerationLiteral *ownedLiteral); Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral); - virtual void registerMetaTypes() const; protected: explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *) - QT_END_HEADER #endif // QTMOF_QENUMERATION_H diff --git a/src/mof/qenumeration_p.h b/src/mof/qenumeration_p.h index c882c68d..228804d4 100644 --- a/src/mof/qenumeration_p.h +++ b/src/mof/qenumeration_p.h @@ -67,7 +67,7 @@ public: explicit QEnumerationPrivate(); virtual ~QEnumerationPrivate(); - QList<QEnumerationLiteral *> *ownedLiterals; + QList<QEnumerationLiteral *> ownedLiterals; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumerationliteral.cpp b/src/mof/qenumerationliteral.cpp index abed2d9c..13a10720 100644 --- a/src/mof/qenumerationliteral.cpp +++ b/src/mof/qenumerationliteral.cpp @@ -125,28 +125,6 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) } } -void QEnumerationLiteral::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *"); - qRegisterMetaType<const QSet<QEnumerationLiteral *> *>("const QSet<QEnumerationLiteral *> *"); - qRegisterMetaType<const QList<QEnumerationLiteral *> *>("const QList<QEnumerationLiteral *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<QEnumeration *>("QEnumeration *"); - qRegisterMetaType<const QSet<QEnumeration *> *>("const QSet<QEnumeration *> *"); - qRegisterMetaType<const QList<QEnumeration *> *>("const QList<QEnumeration *> *"); - - QInstanceSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qenumerationliteral.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumerationliteral.h b/src/mof/qenumerationliteral.h index 8e7e3abe..70f32416 100644 --- a/src/mof/qenumerationliteral.h +++ b/src/mof/qenumerationliteral.h @@ -75,7 +75,6 @@ public: Q_INVOKABLE QEnumeration *classifier() const; Q_INVOKABLE QEnumeration *enumeration() const; Q_INVOKABLE void setEnumeration(QEnumeration *enumeration); - virtual void registerMetaTypes() const; protected: explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *) - QT_END_HEADER #endif // QTMOF_QENUMERATIONLITERAL_H diff --git a/src/mof/qexception.cpp b/src/mof/qexception.cpp index e026926d..67810cd0 100644 --- a/src/mof/qexception.cpp +++ b/src/mof/qexception.cpp @@ -129,28 +129,6 @@ void QException::setObjectInError(QElement *objectInError) } } -void QException::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QException) *>("QT_PREPEND_NAMESPACE_QTMOF(QException) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *"); - qRegisterMetaType<QException *>("QException *"); - qRegisterMetaType<const QSet<QException *> *>("const QSet<QException *> *"); - qRegisterMetaType<const QList<QException *> *>("const QList<QException *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexception.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qexception.h b/src/mof/qexception.h index cf4d5bcb..a4d83977 100644 --- a/src/mof/qexception.h +++ b/src/mof/qexception.h @@ -83,7 +83,6 @@ public: Q_INVOKABLE void setElementInError(QElement *elementInError); Q_INVOKABLE QElement *objectInError() const; Q_INVOKABLE void setObjectInError(QElement *objectInError); - virtual void registerMetaTypes() const; protected: explicit QException(QExceptionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QException) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *) - QT_END_HEADER #endif // QTMOF_QEXCEPTION_H diff --git a/src/mof/qexpression.cpp b/src/mof/qexpression.cpp index c2d4b255..4cd8f9da 100644 --- a/src/mof/qexpression.cpp +++ b/src/mof/qexpression.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QExpressionPrivate::QExpressionPrivate() : - operands(new QList<QValueSpecification *>) +QExpressionPrivate::QExpressionPrivate() { } QExpressionPrivate::~QExpressionPrivate() { - delete operands; } /*! @@ -108,7 +106,7 @@ void QExpression::setSymbol(QString symbol) /*! Specifies a sequence of operands. */ -const QList<QValueSpecification *> *QExpression::operands() const +const QList<QValueSpecification *> &QExpression::operands() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QExpression::addOperand(QValueSpecification *operand) // This is a read-write association end Q_D(QExpression); - if (!d->operands->contains(operand)) { - d->operands->append(operand); + if (!d->operands.contains(operand)) { + d->operands.append(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); @@ -134,29 +132,14 @@ void QExpression::removeOperand(QValueSpecification *operand) // This is a read-write association end Q_D(QExpression); - if (d->operands->contains(operand)) { - d->operands->removeAll(operand); + if (d->operands.contains(operand)) { + d->operands.removeAll(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } -void QExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *>("QT_PREPEND_NAMESPACE_QTMOF(QExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *"); - qRegisterMetaType<QExpression *>("QExpression *"); - qRegisterMetaType<const QSet<QExpression *> *>("const QSet<QExpression *> *"); - qRegisterMetaType<const QList<QExpression *> *>("const QList<QExpression *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexpression.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qexpression.h b/src/mof/qexpression.h index eb9c128c..49bca05b 100644 --- a/src/mof/qexpression.h +++ b/src/mof/qexpression.h @@ -63,7 +63,7 @@ class Q_MOF_EXPORT QExpression : public QValueSpecification Q_OBJECT Q_PROPERTY(QString symbol READ symbol WRITE setSymbol) - Q_PROPERTY(const QList<QValueSpecification *> * operands READ operands) + Q_PROPERTY(QList<QValueSpecification *> operands READ operands) Q_DISABLE_COPY(QExpression) Q_DECLARE_PRIVATE(QExpression) @@ -77,10 +77,9 @@ public: Q_INVOKABLE void setSymbol(QString symbol); // Association ends from QExpression - Q_INVOKABLE const QList<QValueSpecification *> *operands() const; + Q_INVOKABLE const QList<QValueSpecification *> &operands() const; Q_INVOKABLE void addOperand(QValueSpecification *operand); Q_INVOKABLE void removeOperand(QValueSpecification *operand); - virtual void registerMetaTypes() const; protected: explicit QExpression(QExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *) - QT_END_HEADER #endif // QTMOF_QEXPRESSION_H diff --git a/src/mof/qexpression_p.h b/src/mof/qexpression_p.h index 21d7d97f..2de91824 100644 --- a/src/mof/qexpression_p.h +++ b/src/mof/qexpression_p.h @@ -66,7 +66,7 @@ public: virtual ~QExpressionPrivate(); QString symbol; - QList<QValueSpecification *> *operands; + QList<QValueSpecification *> operands; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qextent.cpp b/src/mof/qextent.cpp index e2bd60b0..01d18c88 100644 --- a/src/mof/qextent.cpp +++ b/src/mof/qextent.cpp @@ -87,31 +87,31 @@ QReflectiveSequence *QExtent::elements() const return 0; // change here to your derived return } -const QSet<QElement *> *QExtent::elementsOfType(const QClass *type, bool includesSubtypes) const +const QSet<QElement *> &QExtent::elementsOfType(const QClass *type, bool includesSubtypes) const { qWarning("QExtent::elementsOfType: operation to be implemented"); Q_UNUSED(type); Q_UNUSED(includesSubtypes); - return 0; // change here to your derived return + return *(new QSet<QElement *>); // change here to your derived return } -const QSet<QLink *> *QExtent::linksOfType(const QAssociation *type) const +const QSet<QLink *> &QExtent::linksOfType(const QAssociation *type) const { qWarning("QExtent::linksOfType: operation to be implemented"); Q_UNUSED(type); - return 0; // change here to your derived return + return *(new QSet<QLink *>); // change here to your derived return } -const QSet<QElement *> *QExtent::linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const +const QSet<QElement *> &QExtent::linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const { qWarning("QExtent::linkedElements: operation to be implemented"); Q_UNUSED(association); Q_UNUSED(endElement); Q_UNUSED(end1ToEnd2Direction); - return 0; // change here to your derived return + return *(new QSet<QElement *>); // change here to your derived return } bool QExtent::linkExists(const QAssociation *association, const QElement *firstElement, const QElement *secondElement) const @@ -124,56 +124,6 @@ bool QExtent::linkExists(const QAssociation *association, const QElement *firstE return bool(); // change here to your derived return } -void QExtent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *>("QT_PREPEND_NAMESPACE_QTMOF(QExtent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *"); - qRegisterMetaType<QExtent *>("QExtent *"); - qRegisterMetaType<const QSet<QExtent *> *>("const QSet<QExtent *> *"); - qRegisterMetaType<const QList<QExtent *> *>("const QList<QExtent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLink) *>("QT_PREPEND_NAMESPACE_QTMOF(QLink) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<QLink *>("QLink *"); - qRegisterMetaType<const QSet<QLink *> *>("const QSet<QLink *> *"); - qRegisterMetaType<const QList<QLink *> *>("const QList<QLink *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *>("QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<QReflectiveSequence *>("QReflectiveSequence *"); - qRegisterMetaType<const QSet<QReflectiveSequence *> *>("const QSet<QReflectiveSequence *> *"); - qRegisterMetaType<const QList<QReflectiveSequence *> *>("const QList<QReflectiveSequence *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qextent.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qextent.h b/src/mof/qextent.h index 6fc07b8f..22c9fd4a 100644 --- a/src/mof/qextent.h +++ b/src/mof/qextent.h @@ -78,11 +78,10 @@ public: // Operations Q_INVOKABLE bool useContainment() const; Q_INVOKABLE QReflectiveSequence *elements() const; - Q_INVOKABLE const QSet<QElement *> *elementsOfType(const QClass *type, bool includesSubtypes) const; - Q_INVOKABLE const QSet<QLink *> *linksOfType(const QAssociation *type) const; - Q_INVOKABLE const QSet<QElement *> *linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const; + Q_INVOKABLE const QSet<QElement *> &elementsOfType(const QClass *type, bool includesSubtypes) const; + Q_INVOKABLE const QSet<QLink *> &linksOfType(const QAssociation *type) const; + Q_INVOKABLE const QSet<QElement *> &linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const; Q_INVOKABLE bool linkExists(const QAssociation *association, const QElement *firstElement, const QElement *secondElement) const; - virtual void registerMetaTypes() const; protected: explicit QExtent(QExtentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QExtent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *) - QT_END_HEADER #endif // QTMOF_QEXTENT_H diff --git a/src/mof/qfactory.cpp b/src/mof/qfactory.cpp index 52508339..9ace8713 100644 --- a/src/mof/qfactory.cpp +++ b/src/mof/qfactory.cpp @@ -124,7 +124,7 @@ QElement *QFactory::create(const QClass *metaClass) return 0; // change here to your derived return } -QElement *QFactory::createElement(const QClass *class_, const QSet<QArgument *> *arguments) +QElement *QFactory::createElement(const QClass *class_, const QSet<QArgument *> &arguments) { qWarning("QFactory::createElement: operation to be implemented"); Q_UNUSED(class_); @@ -143,70 +143,6 @@ QLink *QFactory::createLink(const QAssociation *association, const QElement *fir return 0; // change here to your derived return } -void QFactory::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *>("QT_PREPEND_NAMESPACE_QTMOF(QFactory) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *"); - qRegisterMetaType<QFactory *>("QFactory *"); - qRegisterMetaType<const QSet<QFactory *> *>("const QSet<QFactory *> *"); - qRegisterMetaType<const QList<QFactory *> *>("const QList<QFactory *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLink) *>("QT_PREPEND_NAMESPACE_QTMOF(QLink) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<QLink *>("QLink *"); - qRegisterMetaType<const QSet<QLink *> *>("const QSet<QLink *> *"); - qRegisterMetaType<const QList<QLink *> *>("const QList<QLink *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *>("QT_PREPEND_NAMESPACE_QTMOF(QArgument) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<QArgument *>("QArgument *"); - qRegisterMetaType<const QSet<QArgument *> *>("const QSet<QArgument *> *"); - qRegisterMetaType<const QList<QArgument *> *>("const QList<QArgument *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfactory.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qfactory.h b/src/mof/qfactory.h index e7ad0a48..796fe47b 100644 --- a/src/mof/qfactory.h +++ b/src/mof/qfactory.h @@ -88,9 +88,8 @@ public: Q_INVOKABLE QMofObject *createFromString(const QDataType *dataType, QString string); Q_INVOKABLE QString convertToString(const QDataType *dataType, const QMofObject *object); Q_INVOKABLE QElement *create(const QClass *metaClass); - Q_INVOKABLE QElement *createElement(const QClass *class_, const QSet<QArgument *> *arguments); + Q_INVOKABLE QElement *createElement(const QClass *class_, const QSet<QArgument *> &arguments); Q_INVOKABLE QLink *createLink(const QAssociation *association, const QElement *firstElement, const QElement *secondElement); - virtual void registerMetaTypes() const; protected: explicit QFactory(QFactoryPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QFactory) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *) - QT_END_HEADER #endif // QTMOF_QFACTORY_H diff --git a/src/mof/qfeature.cpp b/src/mof/qfeature.cpp index 5f4123fe..527d36b8 100644 --- a/src/mof/qfeature.cpp +++ b/src/mof/qfeature.cpp @@ -49,22 +49,20 @@ QT_BEGIN_NAMESPACE_QTMOF QFeaturePrivate::QFeaturePrivate() : - isStatic(false), - featuringClassifiers(new QSet<QClassifier *>) + isStatic(false) { } QFeaturePrivate::~QFeaturePrivate() { - delete featuringClassifiers; } void QFeaturePrivate::addFeaturingClassifier(QClassifier *featuringClassifier) { // This is a read-only derived-union association end - if (!this->featuringClassifiers->contains(featuringClassifier)) { - this->featuringClassifiers->insert(featuringClassifier); + if (!this->featuringClassifiers.contains(featuringClassifier)) { + this->featuringClassifiers.insert(featuringClassifier); // Adjust opposite property Q_Q(QFeature); @@ -76,8 +74,8 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier { // This is a read-only derived-union association end - if (this->featuringClassifiers->contains(featuringClassifier)) { - this->featuringClassifiers->remove(featuringClassifier); + if (this->featuringClassifiers.contains(featuringClassifier)) { + this->featuringClassifiers.remove(featuringClassifier); // Adjust opposite property Q_Q(QFeature); @@ -145,7 +143,7 @@ void QFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QFeature::featuringClassifiers() const +const QSet<QClassifier *> &QFeature::featuringClassifiers() const { // This is a read-only derived-union association end @@ -153,28 +151,6 @@ const QSet<QClassifier *> *QFeature::featuringClassifiers() const return d->featuringClassifiers; } -void QFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<QFeature *>("QFeature *"); - qRegisterMetaType<const QSet<QFeature *> *>("const QSet<QFeature *> *"); - qRegisterMetaType<const QList<QFeature *> *>("const QList<QFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QRedefinableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfeature.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qfeature.h b/src/mof/qfeature.h index b6a6aef4..402a8cdb 100644 --- a/src/mof/qfeature.h +++ b/src/mof/qfeature.h @@ -65,7 +65,7 @@ class Q_MOF_EXPORT QFeature : public QRedefinableElement Q_OBJECT Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(const QSet<QClassifier *> * featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) Q_DECLARE_PRIVATE(QFeature) @@ -80,8 +80,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Classes which access read-only opposite properties should be friend friend class QClassifierPrivate; @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *) - QT_END_HEADER #endif // QTMOF_QFEATURE_H diff --git a/src/mof/qfeature_p.h b/src/mof/qfeature_p.h index 03d37965..05c448c5 100644 --- a/src/mof/qfeature_p.h +++ b/src/mof/qfeature_p.h @@ -67,7 +67,7 @@ public: virtual ~QFeaturePrivate(); bool isStatic; - QSet<QClassifier *> *featuringClassifiers; + QSet<QClassifier *> featuringClassifiers; // Internal functions for read-only subsetted association ends void addFeaturingClassifier(QClassifier *featuringClassifier); diff --git a/src/mof/qgeneralization.cpp b/src/mof/qgeneralization.cpp index eeee4323..de5bf522 100644 --- a/src/mof/qgeneralization.cpp +++ b/src/mof/qgeneralization.cpp @@ -180,28 +180,6 @@ void QGeneralization::setGeneral(QClassifier *general) } } -void QGeneralization::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qgeneralization.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qgeneralization.h b/src/mof/qgeneralization.h index 9cb22c93..a936c5d0 100644 --- a/src/mof/qgeneralization.h +++ b/src/mof/qgeneralization.h @@ -82,7 +82,6 @@ public: Q_INVOKABLE void setSpecific(QClassifier *specific); Q_INVOKABLE QClassifier *general() const; Q_INVOKABLE void setGeneral(QClassifier *general); - virtual void registerMetaTypes() const; protected: explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *) - QT_END_HEADER #endif // QTMOF_QGENERALIZATION_H diff --git a/src/mof/qinstancespecification.cpp b/src/mof/qinstancespecification.cpp index fb49cf6a..54b567d9 100644 --- a/src/mof/qinstancespecification.cpp +++ b/src/mof/qinstancespecification.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTMOF QInstanceSpecificationPrivate::QInstanceSpecificationPrivate() : - classifiers(new QSet<QClassifier *>), - specification(0), - slots_(new QSet<QSlot *>) + specification(0) { } QInstanceSpecificationPrivate::~QInstanceSpecificationPrivate() { - delete classifiers; - delete slots_; } /*! @@ -90,7 +86,7 @@ QInstanceSpecification::~QInstanceSpecification() /*! The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them. */ -const QSet<QClassifier *> *QInstanceSpecification::classifiers() const +const QSet<QClassifier *> &QInstanceSpecification::classifiers() const { // This is a read-write association end @@ -103,8 +99,8 @@ void QInstanceSpecification::addClassifier(QClassifier *classifier) // This is a read-write association end Q_D(QInstanceSpecification); - if (!d->classifiers->contains(classifier)) { - d->classifiers->insert(classifier); + if (!d->classifiers.contains(classifier)) { + d->classifiers.insert(classifier); } } @@ -113,8 +109,8 @@ void QInstanceSpecification::removeClassifier(QClassifier *classifier) // This is a read-write association end Q_D(QInstanceSpecification); - if (d->classifiers->contains(classifier)) { - d->classifiers->remove(classifier); + if (d->classifiers.contains(classifier)) { + d->classifiers.remove(classifier); } } @@ -150,7 +146,7 @@ void QInstanceSpecification::setSpecification(QValueSpecification *specification /*! 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. */ -const QSet<QSlot *> *QInstanceSpecification::slots_() const +const QSet<QSlot *> &QInstanceSpecification::slots_() const { // This is a read-write association end @@ -163,8 +159,8 @@ void QInstanceSpecification::addSlot_(QSlot *slot_) // This is a read-write association end Q_D(QInstanceSpecification); - if (!d->slots_->contains(slot_)) { - d->slots_->insert(slot_); + if (!d->slots_.contains(slot_)) { + d->slots_.insert(slot_); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(slot_)); @@ -179,8 +175,8 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) // This is a read-write association end Q_D(QInstanceSpecification); - if (d->slots_->contains(slot_)) { - d->slots_->remove(slot_); + if (d->slots_.contains(slot_)) { + d->slots_.remove(slot_); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(slot_)); @@ -190,42 +186,6 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) } } -void QInstanceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *>("QT_PREPEND_NAMESPACE_QTMOF(QSlot) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<QSlot *>("QSlot *"); - qRegisterMetaType<const QSet<QSlot *> *>("const QSet<QSlot *> *"); - qRegisterMetaType<const QList<QSlot *> *>("const QList<QSlot *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinstancespecification.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancespecification.h b/src/mof/qinstancespecification.h index 1bb59263..c9205f15 100644 --- a/src/mof/qinstancespecification.h +++ b/src/mof/qinstancespecification.h @@ -66,9 +66,9 @@ class Q_MOF_EXPORT QInstanceSpecification : public QPackageableElement { Q_OBJECT - Q_PROPERTY(const QSet<QClassifier *> * classifiers READ classifiers) + Q_PROPERTY(QSet<QClassifier *> classifiers READ classifiers) Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QSet<QSlot *> * slots_ READ slots_) + Q_PROPERTY(QSet<QSlot *> slots_ READ slots_) Q_DISABLE_COPY(QInstanceSpecification) Q_DECLARE_PRIVATE(QInstanceSpecification) @@ -78,15 +78,14 @@ public: virtual ~QInstanceSpecification(); // Association ends from QInstanceSpecification - Q_INVOKABLE const QSet<QClassifier *> *classifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &classifiers() const; Q_INVOKABLE void addClassifier(QClassifier *classifier); Q_INVOKABLE void removeClassifier(QClassifier *classifier); Q_INVOKABLE QValueSpecification *specification() const; Q_INVOKABLE void setSpecification(QValueSpecification *specification); - Q_INVOKABLE const QSet<QSlot *> *slots_() const; + Q_INVOKABLE const QSet<QSlot *> &slots_() const; Q_INVOKABLE void addSlot_(QSlot *slot_); Q_INVOKABLE void removeSlot_(QSlot *slot_); - virtual void registerMetaTypes() const; protected: explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *) - QT_END_HEADER #endif // QTMOF_QINSTANCESPECIFICATION_H diff --git a/src/mof/qinstancespecification_p.h b/src/mof/qinstancespecification_p.h index a63f578f..4866d520 100644 --- a/src/mof/qinstancespecification_p.h +++ b/src/mof/qinstancespecification_p.h @@ -69,9 +69,9 @@ public: explicit QInstanceSpecificationPrivate(); virtual ~QInstanceSpecificationPrivate(); - QSet<QClassifier *> *classifiers; + QSet<QClassifier *> classifiers; QValueSpecification *specification; - QSet<QSlot *> *slots_; + QSet<QSlot *> slots_; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancevalue.cpp b/src/mof/qinstancevalue.cpp index 43853f49..e94267f3 100644 --- a/src/mof/qinstancevalue.cpp +++ b/src/mof/qinstancevalue.cpp @@ -102,28 +102,6 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance) } } -void QInstanceValue::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *"); - qRegisterMetaType<QInstanceValue *>("QInstanceValue *"); - qRegisterMetaType<const QSet<QInstanceValue *> *>("const QSet<QInstanceValue *> *"); - qRegisterMetaType<const QList<QInstanceValue *> *>("const QList<QInstanceValue *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinstancevalue.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancevalue.h b/src/mof/qinstancevalue.h index c220cf80..2289283e 100644 --- a/src/mof/qinstancevalue.h +++ b/src/mof/qinstancevalue.h @@ -73,7 +73,6 @@ public: // Association ends from QInstanceValue Q_INVOKABLE QInstanceSpecification *instance() const; Q_INVOKABLE void setInstance(QInstanceSpecification *instance); - virtual void registerMetaTypes() const; protected: explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *) - QT_END_HEADER #endif // QTMOF_QINSTANCEVALUE_H diff --git a/src/mof/qlink.cpp b/src/mof/qlink.cpp index 09f56dc9..4b848285 100644 --- a/src/mof/qlink.cpp +++ b/src/mof/qlink.cpp @@ -144,35 +144,6 @@ void QLink::delete_() qWarning("QLink::delete_: operation to be implemented"); } -void QLink::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLink) *>("QT_PREPEND_NAMESPACE_QTMOF(QLink) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<QLink *>("QLink *"); - qRegisterMetaType<const QSet<QLink *> *>("const QSet<QLink *> *"); - qRegisterMetaType<const QList<QLink *> *>("const QList<QLink *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlink.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qlink.h b/src/mof/qlink.h index 88aeda31..3781d2fa 100644 --- a/src/mof/qlink.h +++ b/src/mof/qlink.h @@ -84,7 +84,6 @@ public: // Operations Q_INVOKABLE bool equals(const QLink *otherLink) const; Q_INVOKABLE void delete_(); - virtual void registerMetaTypes() const; protected: explicit QLink(QLinkPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLink) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *) - QT_END_HEADER #endif // QTMOF_QLINK_H diff --git a/src/mof/qliteralboolean.cpp b/src/mof/qliteralboolean.cpp index bc592eda..935b996a 100644 --- a/src/mof/qliteralboolean.cpp +++ b/src/mof/qliteralboolean.cpp @@ -125,21 +125,6 @@ bool QLiteralBoolean::isComputable() const return bool(); // change here to your derived return } -void QLiteralBoolean::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *"); - qRegisterMetaType<QLiteralBoolean *>("QLiteralBoolean *"); - qRegisterMetaType<const QSet<QLiteralBoolean *> *>("const QSet<QLiteralBoolean *> *"); - qRegisterMetaType<const QList<QLiteralBoolean *> *>("const QList<QLiteralBoolean *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralboolean.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralboolean.h b/src/mof/qliteralboolean.h index 7c3488b4..1165a5a5 100644 --- a/src/mof/qliteralboolean.h +++ b/src/mof/qliteralboolean.h @@ -75,7 +75,6 @@ public: // Operations Q_INVOKABLE bool booleanValue() const; Q_INVOKABLE bool isComputable() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALBOOLEAN_H diff --git a/src/mof/qliteralinteger.cpp b/src/mof/qliteralinteger.cpp index 58679729..f2ffb352 100644 --- a/src/mof/qliteralinteger.cpp +++ b/src/mof/qliteralinteger.cpp @@ -119,21 +119,6 @@ bool QLiteralInteger::isComputable() const return bool(); // change here to your derived return } -void QLiteralInteger::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *"); - qRegisterMetaType<QLiteralInteger *>("QLiteralInteger *"); - qRegisterMetaType<const QSet<QLiteralInteger *> *>("const QSet<QLiteralInteger *> *"); - qRegisterMetaType<const QList<QLiteralInteger *> *>("const QList<QLiteralInteger *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralinteger.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralinteger.h b/src/mof/qliteralinteger.h index 24febb76..702eab2e 100644 --- a/src/mof/qliteralinteger.h +++ b/src/mof/qliteralinteger.h @@ -74,7 +74,6 @@ public: // Operations Q_INVOKABLE qint32 integerValue() const; Q_INVOKABLE bool isComputable() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALINTEGER_H diff --git a/src/mof/qliteralnull.cpp b/src/mof/qliteralnull.cpp index ca5512c1..9a87fb94 100644 --- a/src/mof/qliteralnull.cpp +++ b/src/mof/qliteralnull.cpp @@ -94,21 +94,6 @@ bool QLiteralNull::isNull() const return bool(); // change here to your derived return } -void QLiteralNull::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *"); - qRegisterMetaType<QLiteralNull *>("QLiteralNull *"); - qRegisterMetaType<const QSet<QLiteralNull *> *>("const QSet<QLiteralNull *> *"); - qRegisterMetaType<const QList<QLiteralNull *> *>("const QList<QLiteralNull *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralnull.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralnull.h b/src/mof/qliteralnull.h index befdb85d..8c9e2c84 100644 --- a/src/mof/qliteralnull.h +++ b/src/mof/qliteralnull.h @@ -68,7 +68,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE bool isNull() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -76,10 +75,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALNULL_H diff --git a/src/mof/qliteralreal.cpp b/src/mof/qliteralreal.cpp index 8bf8a49d..3214abf8 100644 --- a/src/mof/qliteralreal.cpp +++ b/src/mof/qliteralreal.cpp @@ -116,21 +116,6 @@ qreal QLiteralReal::realValue() const return qreal(); // change here to your derived return } -void QLiteralReal::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *"); - qRegisterMetaType<QLiteralReal *>("QLiteralReal *"); - qRegisterMetaType<const QSet<QLiteralReal *> *>("const QSet<QLiteralReal *> *"); - qRegisterMetaType<const QList<QLiteralReal *> *>("const QList<QLiteralReal *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralreal.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralreal.h b/src/mof/qliteralreal.h index 14908778..35a70639 100644 --- a/src/mof/qliteralreal.h +++ b/src/mof/qliteralreal.h @@ -74,7 +74,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE qreal realValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALREAL_H diff --git a/src/mof/qliteralspecification.cpp b/src/mof/qliteralspecification.cpp index 365ff023..98d5227f 100644 --- a/src/mof/qliteralspecification.cpp +++ b/src/mof/qliteralspecification.cpp @@ -74,21 +74,6 @@ QLiteralSpecification::~QLiteralSpecification() { } -void QLiteralSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *"); - qRegisterMetaType<QLiteralSpecification *>("QLiteralSpecification *"); - qRegisterMetaType<const QSet<QLiteralSpecification *> *>("const QSet<QLiteralSpecification *> *"); - qRegisterMetaType<const QList<QLiteralSpecification *> *>("const QList<QLiteralSpecification *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralspecification.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralspecification.h b/src/mof/qliteralspecification.h index 2c194da2..d54c7ebe 100644 --- a/src/mof/qliteralspecification.h +++ b/src/mof/qliteralspecification.h @@ -64,7 +64,6 @@ class Q_MOF_EXPORT QLiteralSpecification : public QValueSpecification public: Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralSpecification(); - virtual void registerMetaTypes() const; protected: explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALSPECIFICATION_H diff --git a/src/mof/qliteralstring.cpp b/src/mof/qliteralstring.cpp index 31cc05ca..2813c0aa 100644 --- a/src/mof/qliteralstring.cpp +++ b/src/mof/qliteralstring.cpp @@ -119,21 +119,6 @@ QString QLiteralString::stringValue() const return QString(); // change here to your derived return } -void QLiteralString::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *"); - qRegisterMetaType<QLiteralString *>("QLiteralString *"); - qRegisterMetaType<const QSet<QLiteralString *> *>("const QSet<QLiteralString *> *"); - qRegisterMetaType<const QList<QLiteralString *> *>("const QList<QLiteralString *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralstring.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralstring.h b/src/mof/qliteralstring.h index 1b5419ee..e051625e 100644 --- a/src/mof/qliteralstring.h +++ b/src/mof/qliteralstring.h @@ -77,7 +77,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE QString stringValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALSTRING_H diff --git a/src/mof/qliteralunlimitednatural.cpp b/src/mof/qliteralunlimitednatural.cpp index 736e8788..bbd99e19 100644 --- a/src/mof/qliteralunlimitednatural.cpp +++ b/src/mof/qliteralunlimitednatural.cpp @@ -125,21 +125,6 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const return qint32(); // change here to your derived return } -void QLiteralUnlimitedNatural::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *"); - qRegisterMetaType<QLiteralUnlimitedNatural *>("QLiteralUnlimitedNatural *"); - qRegisterMetaType<const QSet<QLiteralUnlimitedNatural *> *>("const QSet<QLiteralUnlimitedNatural *> *"); - qRegisterMetaType<const QList<QLiteralUnlimitedNatural *> *>("const QList<QLiteralUnlimitedNatural *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralunlimitednatural.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralunlimitednatural.h b/src/mof/qliteralunlimitednatural.h index cb09447a..ee42b5c0 100644 --- a/src/mof/qliteralunlimitednatural.h +++ b/src/mof/qliteralunlimitednatural.h @@ -75,7 +75,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE qint32 unlimitedValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALUNLIMITEDNATURAL_H diff --git a/src/mof/qmofobject.cpp b/src/mof/qmofobject.cpp index bee08bdb..d6c06746 100644 --- a/src/mof/qmofobject.cpp +++ b/src/mof/qmofobject.cpp @@ -108,7 +108,7 @@ void QMofObject::unset(const QProperty *property) Q_UNUSED(property); } -QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> *arguments) +QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> &arguments) { qWarning("QMofObject::invoke: operation to be implemented"); Q_UNUSED(op); @@ -117,42 +117,6 @@ QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> *ar return 0; // change here to your derived return } -void QMofObject::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *>("QT_PREPEND_NAMESPACE_QTMOF(QArgument) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<QArgument *>("QArgument *"); - qRegisterMetaType<const QSet<QArgument *> *>("const QSet<QArgument *> *"); - qRegisterMetaType<const QList<QArgument *> *>("const QList<QArgument *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmofobject.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qmofobject.h b/src/mof/qmofobject.h index 95dcbb3e..026cb97f 100644 --- a/src/mof/qmofobject.h +++ b/src/mof/qmofobject.h @@ -80,8 +80,7 @@ public: Q_INVOKABLE void set(const QProperty *property, const QMofObject *value); Q_INVOKABLE bool isSet(const QProperty *property) const; Q_INVOKABLE void unset(const QProperty *property); - Q_INVOKABLE QMofObject *invoke(const QOperation *op, const QSet<QArgument *> *arguments); - virtual void registerMetaTypes() const; + Q_INVOKABLE QMofObject *invoke(const QOperation *op, const QSet<QArgument *> &arguments); protected: explicit QMofObject(QMofObjectPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *) - QT_END_HEADER #endif // QTMOF_QMOFOBJECT_H diff --git a/src/mof/qmultiplicityelement.cpp b/src/mof/qmultiplicityelement.cpp index bf75038c..8695d62a 100644 --- a/src/mof/qmultiplicityelement.cpp +++ b/src/mof/qmultiplicityelement.cpp @@ -303,28 +303,6 @@ qint32 QMultiplicityElement::upperBound() const return qint32(); // change here to your derived return } -void QMultiplicityElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *"); - qRegisterMetaType<QMultiplicityElement *>("QMultiplicityElement *"); - qRegisterMetaType<const QSet<QMultiplicityElement *> *>("const QSet<QMultiplicityElement *> *"); - qRegisterMetaType<const QList<QMultiplicityElement *> *>("const QList<QMultiplicityElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmultiplicityelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qmultiplicityelement.h b/src/mof/qmultiplicityelement.h index 74147c0a..abef6a85 100644 --- a/src/mof/qmultiplicityelement.h +++ b/src/mof/qmultiplicityelement.h @@ -100,7 +100,6 @@ public: Q_INVOKABLE bool isMultivalued() const; Q_INVOKABLE qint32 lowerBound() const; Q_INVOKABLE qint32 upperBound() const; - virtual void registerMetaTypes() const; protected: explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -108,10 +107,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *) - QT_END_HEADER #endif // QTMOF_QMULTIPLICITYELEMENT_H diff --git a/src/mof/qnamedelement.cpp b/src/mof/qnamedelement.cpp index 781a7f7d..2cf07a73 100644 --- a/src/mof/qnamedelement.cpp +++ b/src/mof/qnamedelement.cpp @@ -176,11 +176,11 @@ QNamespace *QNamedElement::namespace_() const /*! The query allNamespaces() gives the sequence of namespaces in which the NamedElement is nested, working outwards. */ -const QList<QNamespace *> *QNamedElement::allNamespaces() const +const QList<QNamespace *> &QNamedElement::allNamespaces() const { qWarning("QNamedElement::allNamespaces: operation to be implemented"); - return 0; // change here to your derived return + return *(new QList<QNamespace *>); // change here to your derived return } /*! @@ -205,28 +205,6 @@ QString QNamedElement::separator() const return QString(); // change here to your derived return } -void QNamedElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnamedelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qnamedelement.h b/src/mof/qnamedelement.h index 9b815ecf..26d95d1a 100644 --- a/src/mof/qnamedelement.h +++ b/src/mof/qnamedelement.h @@ -91,10 +91,9 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Operations - Q_INVOKABLE const QList<QNamespace *> *allNamespaces() const; + Q_INVOKABLE const QList<QNamespace *> &allNamespaces() const; Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; Q_INVOKABLE QString separator() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QNamespacePrivate; @@ -105,10 +104,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *) - QT_END_HEADER #endif // QTMOF_QNAMEDELEMENT_H diff --git a/src/mof/qnamespace.cpp b/src/mof/qnamespace.cpp index ecab6b1c..64d9ebeb 100644 --- a/src/mof/qnamespace.cpp +++ b/src/mof/qnamespace.cpp @@ -51,30 +51,20 @@ QT_BEGIN_NAMESPACE_QTMOF -QNamespacePrivate::QNamespacePrivate() : - packageImports(new QSet<QPackageImport *>), - members(new QSet<QNamedElement *>), - elementImports(new QSet<QElementImport *>), - ownedRules(new QSet<QConstraint *>), - ownedMembers(new QSet<QNamedElement *>) +QNamespacePrivate::QNamespacePrivate() { } QNamespacePrivate::~QNamespacePrivate() { - delete packageImports; - delete members; - delete elementImports; - delete ownedRules; - delete ownedMembers; } void QNamespacePrivate::addMember(QNamedElement *member) { // This is a read-only derived-union association end - if (!this->members->contains(member)) { - this->members->insert(member); + if (!this->members.contains(member)) { + this->members.insert(member); } } @@ -82,8 +72,8 @@ void QNamespacePrivate::removeMember(QNamedElement *member) { // This is a read-only derived-union association end - if (this->members->contains(member)) { - this->members->remove(member); + if (this->members.contains(member)) { + this->members.remove(member); } } @@ -91,8 +81,8 @@ void QNamespacePrivate::addOwnedMember(QNamedElement *ownedMember) { // This is a read-only derived-union association end - if (!this->ownedMembers->contains(ownedMember)) { - this->ownedMembers->insert(ownedMember); + if (!this->ownedMembers.contains(ownedMember)) { + this->ownedMembers.insert(ownedMember); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); @@ -108,8 +98,8 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) { // This is a read-only derived-union association end - if (this->ownedMembers->contains(ownedMember)) { - this->ownedMembers->remove(ownedMember); + if (this->ownedMembers.contains(ownedMember)) { + this->ownedMembers.remove(ownedMember); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); @@ -149,7 +139,7 @@ QNamespace::~QNamespace() /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QNamespace::packageImports() const +const QSet<QPackageImport *> &QNamespace::packageImports() const { // This is a read-write association end @@ -162,8 +152,8 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) // This is a read-write association end Q_D(QNamespace); - if (!d->packageImports->contains(packageImport)) { - d->packageImports->insert(packageImport); + if (!d->packageImports.contains(packageImport)) { + d->packageImports.insert(packageImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); @@ -178,8 +168,8 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) // This is a read-write association end Q_D(QNamespace); - if (d->packageImports->contains(packageImport)) { - d->packageImports->remove(packageImport); + if (d->packageImports.contains(packageImport)) { + d->packageImports.remove(packageImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); @@ -192,7 +182,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QNamespace::members() const +const QSet<QNamedElement *> &QNamespace::members() const { // This is a read-only derived-union association end @@ -203,19 +193,19 @@ const QSet<QNamedElement *> *QNamespace::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QNamespace::importedMembers() const +const QSet<QPackageableElement *> &QNamespace::importedMembers() const { // This is a read-only derived association end qWarning("QNamespace::importedMembers: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QNamespace::elementImports() const +const QSet<QElementImport *> &QNamespace::elementImports() const { // This is a read-write association end @@ -228,8 +218,8 @@ void QNamespace::addElementImport(QElementImport *elementImport) // This is a read-write association end Q_D(QNamespace); - if (!d->elementImports->contains(elementImport)) { - d->elementImports->insert(elementImport); + if (!d->elementImports.contains(elementImport)) { + d->elementImports.insert(elementImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); @@ -244,8 +234,8 @@ void QNamespace::removeElementImport(QElementImport *elementImport) // This is a read-write association end Q_D(QNamespace); - if (d->elementImports->contains(elementImport)) { - d->elementImports->remove(elementImport); + if (d->elementImports.contains(elementImport)) { + d->elementImports.remove(elementImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); @@ -258,7 +248,7 @@ void QNamespace::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QNamespace::ownedRules() const +const QSet<QConstraint *> &QNamespace::ownedRules() const { // This is a read-write association end @@ -271,8 +261,8 @@ void QNamespace::addOwnedRule(QConstraint *ownedRule) // This is a read-write association end Q_D(QNamespace); - if (!d->ownedRules->contains(ownedRule)) { - d->ownedRules->insert(ownedRule); + if (!d->ownedRules.contains(ownedRule)) { + d->ownedRules.insert(ownedRule); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); @@ -287,8 +277,8 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) // This is a read-write association end Q_D(QNamespace); - if (d->ownedRules->contains(ownedRule)) { - d->ownedRules->remove(ownedRule); + if (d->ownedRules.contains(ownedRule)) { + d->ownedRules.remove(ownedRule); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); @@ -301,7 +291,7 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QNamespace::ownedMembers() const +const QSet<QNamedElement *> &QNamespace::ownedMembers() const { // This is a read-only derived-union association end @@ -312,34 +302,34 @@ const QSet<QNamedElement *> *QNamespace::ownedMembers() const /*! The query excludeCollisions() excludes from a set of PackageableElements any that would not be distinguishable from each other in this namespace. */ -const QSet<QPackageableElement *> *QNamespace::excludeCollisions(const QPackageableElement *imps) const +const QSet<QPackageableElement *> &QNamespace::excludeCollisions(const QPackageableElement *imps) const { qWarning("QNamespace::excludeCollisions: operation to be implemented"); Q_UNUSED(imps); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! The query getNamesOfMember() gives a set of all of the names that a member would have in a Namespace. In general a member can have multiple names in a Namespace if it is imported more than once with different aliases. The query takes account of importing. It gives back the set of names that an element would have in an importing namespace, either because it is owned, or if not owned then imported individually, or if not individually then from a package. */ -const QSet<QString> *QNamespace::getNamesOfMember(const QNamedElement *element) const +const QSet<QString> QNamespace::getNamesOfMember(const QNamedElement *element) const { qWarning("QNamespace::getNamesOfMember: operation to be implemented"); Q_UNUSED(element); - return 0; // change here to your derived return + return QSet<QString>(); // change here to your derived return } /*! The query importMembers() defines which of a set of PackageableElements are actually imported into the namespace. This excludes hidden ones, i.e., those which have names that conflict with names of owned members, and also excludes elements which would have the same name when imported. */ -const QSet<QPackageableElement *> *QNamespace::importMembers(const QPackageableElement *imps) const +const QSet<QPackageableElement *> &QNamespace::importMembers(const QPackageableElement *imps) const { qWarning("QNamespace::importMembers: operation to be implemented"); Q_UNUSED(imps); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! @@ -352,49 +342,6 @@ bool QNamespace::membersAreDistinguishable() const return bool(); // change here to your derived return } -void QNamespace::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *>("QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnamespace.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qnamespace.h b/src/mof/qnamespace.h index fb47db38..27f28fc1 100644 --- a/src/mof/qnamespace.h +++ b/src/mof/qnamespace.h @@ -68,12 +68,12 @@ class Q_MOF_EXPORT QNamespace : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QPackageImport *> * packageImports READ packageImports) - Q_PROPERTY(const QSet<QNamedElement *> * members READ members) - Q_PROPERTY(const QSet<QPackageableElement *> * importedMembers READ importedMembers STORED false) - Q_PROPERTY(const QSet<QElementImport *> * elementImports READ elementImports) - Q_PROPERTY(const QSet<QConstraint *> * ownedRules READ ownedRules) - Q_PROPERTY(const QSet<QNamedElement *> * ownedMembers READ ownedMembers) + 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_DISABLE_COPY(QNamespace) Q_DECLARE_PRIVATE(QNamespace) @@ -83,25 +83,24 @@ public: virtual ~QNamespace(); // Association ends from QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Operations - Q_INVOKABLE const QSet<QPackageableElement *> *excludeCollisions(const QPackageableElement *imps) const; - Q_INVOKABLE const QSet<QString> *getNamesOfMember(const QNamedElement *element) const; - Q_INVOKABLE const QSet<QPackageableElement *> *importMembers(const QPackageableElement *imps) const; + Q_INVOKABLE const QSet<QPackageableElement *> &excludeCollisions(const QPackageableElement *imps) const; + Q_INVOKABLE const QSet<QString> getNamesOfMember(const QNamedElement *element) const; + Q_INVOKABLE const QSet<QPackageableElement *> &importMembers(const QPackageableElement *imps) const; Q_INVOKABLE bool membersAreDistinguishable() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QNamedElementPrivate; @@ -112,10 +111,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *) - QT_END_HEADER #endif // QTMOF_QNAMESPACE_H diff --git a/src/mof/qnamespace_p.h b/src/mof/qnamespace_p.h index fca5fffa..b9266712 100644 --- a/src/mof/qnamespace_p.h +++ b/src/mof/qnamespace_p.h @@ -70,11 +70,11 @@ public: explicit QNamespacePrivate(); virtual ~QNamespacePrivate(); - QSet<QPackageImport *> *packageImports; - QSet<QNamedElement *> *members; - QSet<QElementImport *> *elementImports; - QSet<QConstraint *> *ownedRules; - QSet<QNamedElement *> *ownedMembers; + QSet<QPackageImport *> packageImports; + QSet<QNamedElement *> members; + QSet<QElementImport *> elementImports; + QSet<QConstraint *> ownedRules; + QSet<QNamedElement *> ownedMembers; // Internal functions for read-only subsetted association ends void addMember(QNamedElement *member); diff --git a/src/mof/qopaqueexpression.cpp b/src/mof/qopaqueexpression.cpp index c0f9664b..58aa0906 100644 --- a/src/mof/qopaqueexpression.cpp +++ b/src/mof/qopaqueexpression.cpp @@ -44,16 +44,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() : - bodies(new QList<QString>), - languages(new QList<QString>) +QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() { } QOpaqueExpressionPrivate::~QOpaqueExpressionPrivate() { - delete bodies; - delete languages; } /*! @@ -85,7 +81,7 @@ QOpaqueExpression::~QOpaqueExpression() /*! The text of the expression, possibly in multiple languages. */ -const QList<QString> *QOpaqueExpression::bodies() const +const QList<QString> QOpaqueExpression::bodies() const { // This is a read-write attribute @@ -98,8 +94,8 @@ void QOpaqueExpression::addBody(QString body) // This is a read-write attribute Q_D(QOpaqueExpression); - if (!d->bodies->contains(body)) { - d->bodies->append(body); + if (!d->bodies.contains(body)) { + d->bodies.append(body); } } @@ -108,15 +104,15 @@ void QOpaqueExpression::removeBody(QString body) // This is a read-write attribute Q_D(QOpaqueExpression); - if (d->bodies->contains(body)) { - d->bodies->removeAll(body); + if (d->bodies.contains(body)) { + d->bodies.removeAll(body); } } /*! 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. */ -const QList<QString> *QOpaqueExpression::languages() const +const QList<QString> QOpaqueExpression::languages() const { // This is a read-write attribute @@ -129,8 +125,8 @@ void QOpaqueExpression::addLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueExpression); - if (!d->languages->contains(language)) { - d->languages->append(language); + if (!d->languages.contains(language)) { + d->languages.append(language); } } @@ -139,8 +135,8 @@ void QOpaqueExpression::removeLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueExpression); - if (d->languages->contains(language)) { - d->languages->removeAll(language); + if (d->languages.contains(language)) { + d->languages.removeAll(language); } } @@ -184,21 +180,6 @@ qint32 QOpaqueExpression::value() const return qint32(); // change here to your derived return } -void QOpaqueExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *>("QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *"); - qRegisterMetaType<QOpaqueExpression *>("QOpaqueExpression *"); - qRegisterMetaType<const QSet<QOpaqueExpression *> *>("const QSet<QOpaqueExpression *> *"); - qRegisterMetaType<const QList<QOpaqueExpression *> *>("const QList<QOpaqueExpression *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qopaqueexpression.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qopaqueexpression.h b/src/mof/qopaqueexpression.h index e97fe8a7..21fe39d2 100644 --- a/src/mof/qopaqueexpression.h +++ b/src/mof/qopaqueexpression.h @@ -62,8 +62,8 @@ class Q_MOF_EXPORT QOpaqueExpression : public QValueSpecification { Q_OBJECT - Q_PROPERTY(const QList<QString> * bodies READ bodies) - Q_PROPERTY(const QList<QString> * languages READ languages) + Q_PROPERTY(QList<QString> bodies READ bodies) + Q_PROPERTY(QList<QString> languages READ languages) Q_DISABLE_COPY(QOpaqueExpression) Q_DECLARE_PRIVATE(QOpaqueExpression) @@ -73,10 +73,10 @@ public: virtual ~QOpaqueExpression(); // Attributes from QOpaqueExpression - Q_INVOKABLE const QList<QString> *bodies() const; + Q_INVOKABLE const QList<QString> bodies() const; Q_INVOKABLE void addBody(QString body); Q_INVOKABLE void removeBody(QString body); - Q_INVOKABLE const QList<QString> *languages() const; + Q_INVOKABLE const QList<QString> languages() const; Q_INVOKABLE void addLanguage(QString language); Q_INVOKABLE void removeLanguage(QString language); @@ -85,7 +85,6 @@ public: Q_INVOKABLE bool isNonNegative() const; Q_INVOKABLE bool isPositive() const; Q_INVOKABLE qint32 value() const; - virtual void registerMetaTypes() const; protected: explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *) - QT_END_HEADER #endif // QTMOF_QOPAQUEEXPRESSION_H diff --git a/src/mof/qopaqueexpression_p.h b/src/mof/qopaqueexpression_p.h index 283218cc..320be715 100644 --- a/src/mof/qopaqueexpression_p.h +++ b/src/mof/qopaqueexpression_p.h @@ -65,8 +65,8 @@ public: explicit QOpaqueExpressionPrivate(); virtual ~QOpaqueExpressionPrivate(); - QList<QString> *bodies; - QList<QString> *languages; + QList<QString> bodies; + QList<QString> languages; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qoperation.cpp b/src/mof/qoperation.cpp index 682488c2..b9135e17 100644 --- a/src/mof/qoperation.cpp +++ b/src/mof/qoperation.cpp @@ -53,24 +53,15 @@ QT_BEGIN_NAMESPACE_QTMOF QOperationPrivate::QOperationPrivate() : isQuery(false), - ownedParameters(new QList<QParameter *>), bodyCondition(0), - redefinedOperations(new QSet<QOperation *>), - postconditions(new QSet<QConstraint *>), datatype(0), - preconditions(new QSet<QConstraint *>), - class_(0), - raisedExceptions(new QSet<QType *>) + class_(0) { } QOperationPrivate::~QOperationPrivate() { - delete ownedParameters; - delete redefinedOperations; - delete postconditions; - delete preconditions; - delete raisedExceptions; + qDeleteAll(ownedParameters); } /*! @@ -180,7 +171,7 @@ bool QOperation::isOrdered() const /*! Specifies the parameters owned by this Operation. */ -const QList<QParameter *> *QOperation::ownedParameters() const +const QList<QParameter *> &QOperation::ownedParameters() const { // This is a read-write association end @@ -193,8 +184,8 @@ void QOperation::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QOperation); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); qTopLevelWrapper(ownedParameter)->setParent(qTopLevelWrapper(this)); // Adjust opposite property @@ -207,8 +198,8 @@ void QOperation::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QOperation); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); qTopLevelWrapper(ownedParameter)->setParent(0); // Adjust opposite property @@ -248,7 +239,7 @@ void QOperation::setBodyCondition(QConstraint *bodyCondition) /*! References the Operations that are redefined by this Operation. */ -const QSet<QOperation *> *QOperation::redefinedOperations() const +const QSet<QOperation *> &QOperation::redefinedOperations() const { // This is a read-write association end @@ -261,8 +252,8 @@ void QOperation::addRedefinedOperation(QOperation *redefinedOperation) // This is a read-write association end Q_D(QOperation); - if (!d->redefinedOperations->contains(redefinedOperation)) { - d->redefinedOperations->insert(redefinedOperation); + if (!d->redefinedOperations.contains(redefinedOperation)) { + d->redefinedOperations.insert(redefinedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); @@ -274,8 +265,8 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) // This is a read-write association end Q_D(QOperation); - if (d->redefinedOperations->contains(redefinedOperation)) { - d->redefinedOperations->remove(redefinedOperation); + if (d->redefinedOperations.contains(redefinedOperation)) { + d->redefinedOperations.remove(redefinedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); @@ -285,7 +276,7 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) /*! An optional set of Constraints specifying the state of the system when the Operation is completed. */ -const QSet<QConstraint *> *QOperation::postconditions() const +const QSet<QConstraint *> &QOperation::postconditions() const { // This is a read-write association end @@ -298,8 +289,8 @@ void QOperation::addPostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QOperation); - if (!d->postconditions->contains(postcondition)) { - d->postconditions->insert(postcondition); + if (!d->postconditions.contains(postcondition)) { + d->postconditions.insert(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -311,8 +302,8 @@ void QOperation::removePostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QOperation); - if (d->postconditions->contains(postcondition)) { - d->postconditions->remove(postcondition); + if (d->postconditions.contains(postcondition)) { + d->postconditions.remove(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -376,7 +367,7 @@ QType *QOperation::type() const /*! An optional set of Constraints on the state of the system when the Operation is invoked. */ -const QSet<QConstraint *> *QOperation::preconditions() const +const QSet<QConstraint *> &QOperation::preconditions() const { // This is a read-write association end @@ -389,8 +380,8 @@ void QOperation::addPrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QOperation); - if (!d->preconditions->contains(precondition)) { - d->preconditions->insert(precondition); + if (!d->preconditions.contains(precondition)) { + d->preconditions.insert(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -402,8 +393,8 @@ void QOperation::removePrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QOperation); - if (d->preconditions->contains(precondition)) { - d->preconditions->remove(precondition); + if (d->preconditions.contains(precondition)) { + d->preconditions.remove(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -455,7 +446,7 @@ void QOperation::setClass_(QClass *class_) /*! References the Types representing exceptions that may be raised during an invocation of this operation. */ -const QSet<QType *> *QOperation::raisedExceptions() const +const QSet<QType *> &QOperation::raisedExceptions() const { // This is a read-write association end @@ -468,8 +459,8 @@ void QOperation::addRaisedException(QType *raisedException) // This is a read-write association end Q_D(QOperation); - if (!d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->insert(raisedException); + if (!d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.insert(raisedException); } } @@ -478,8 +469,8 @@ void QOperation::removeRaisedException(QType *raisedException) // This is a read-write association end Q_D(QOperation); - if (d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->remove(raisedException); + if (d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.remove(raisedException); } } @@ -497,68 +488,11 @@ bool QOperation::isConsistentWith(const QRedefinableElement *redefinee) const /*! The query returnResult() returns the set containing the return parameter of the Operation if one exists, otherwise, it returns an empty set */ -const QSet<QParameter *> *QOperation::returnResult() const +const QSet<QParameter *> &QOperation::returnResult() const { qWarning("QOperation::returnResult: operation to be implemented"); - return 0; // change here to your derived return -} - -void QOperation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *>("QT_PREPEND_NAMESPACE_QTMOF(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *>("QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - QBehavioralFeature::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QParameter *>); // change here to your derived return } #include "moc_qoperation.cpp" diff --git a/src/mof/qoperation.h b/src/mof/qoperation.h index 644cb35a..177f5c40 100644 --- a/src/mof/qoperation.h +++ b/src/mof/qoperation.h @@ -75,15 +75,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(const QList<QParameter *> * ownedParameters READ ownedParameters) + Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) Q_PROPERTY(QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) - Q_PROPERTY(const QSet<QOperation *> * redefinedOperations READ redefinedOperations) - Q_PROPERTY(const QSet<QConstraint *> * postconditions READ postconditions) + 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(const QSet<QConstraint *> * preconditions READ preconditions) + Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(const QSet<QType *> * raisedExceptions READ raisedExceptions) + Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) Q_DISABLE_COPY(QOperation) Q_DECLARE_PRIVATE(QOperation) @@ -102,33 +102,32 @@ public: Q_INVOKABLE bool isOrdered() const; // Association ends from QOperation - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE QConstraint *bodyCondition() const; Q_INVOKABLE void setBodyCondition(QConstraint *bodyCondition); - Q_INVOKABLE const QSet<QOperation *> *redefinedOperations() const; + Q_INVOKABLE const QSet<QOperation *> &redefinedOperations() const; Q_INVOKABLE void addRedefinedOperation(QOperation *redefinedOperation); Q_INVOKABLE void removeRedefinedOperation(QOperation *redefinedOperation); - Q_INVOKABLE const QSet<QConstraint *> *postconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &postconditions() const; Q_INVOKABLE void addPostcondition(QConstraint *postcondition); Q_INVOKABLE void removePostcondition(QConstraint *postcondition); Q_INVOKABLE QDataType *datatype() const; Q_INVOKABLE void setDatatype(QDataType *datatype); Q_INVOKABLE QType *type() const; - Q_INVOKABLE const QSet<QConstraint *> *preconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &preconditions() const; Q_INVOKABLE void addPrecondition(QConstraint *precondition); Q_INVOKABLE void removePrecondition(QConstraint *precondition); Q_INVOKABLE QClass *class_() const; Q_INVOKABLE void setClass_(QClass *class_); - Q_INVOKABLE const QSet<QType *> *raisedExceptions() const; + Q_INVOKABLE const QSet<QType *> &raisedExceptions() const; Q_INVOKABLE void addRaisedException(QType *raisedException); Q_INVOKABLE void removeRaisedException(QType *raisedException); // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; - Q_INVOKABLE const QSet<QParameter *> *returnResult() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QParameter *> &returnResult() const; protected: explicit QOperation(QOperationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -136,10 +135,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QOperation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *) - QT_END_HEADER #endif // QTMOF_QOPERATION_H diff --git a/src/mof/qoperation_p.h b/src/mof/qoperation_p.h index e855674f..ebd3cafd 100644 --- a/src/mof/qoperation_p.h +++ b/src/mof/qoperation_p.h @@ -74,14 +74,14 @@ public: virtual ~QOperationPrivate(); bool isQuery; - QList<QParameter *> *ownedParameters; + QList<QParameter *> ownedParameters; QConstraint *bodyCondition; - QSet<QOperation *> *redefinedOperations; - QSet<QConstraint *> *postconditions; + QSet<QOperation *> redefinedOperations; + QSet<QConstraint *> postconditions; QDataType *datatype; - QSet<QConstraint *> *preconditions; + QSet<QConstraint *> preconditions; QClass *class_; - QSet<QType *> *raisedExceptions; + QSet<QType *> raisedExceptions; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackage.cpp b/src/mof/qpackage.cpp index d967ea17..108365de 100644 --- a/src/mof/qpackage.cpp +++ b/src/mof/qpackage.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTMOF QPackagePrivate::QPackagePrivate() : - packagedElements(new QSet<QPackageableElement *>), - nestingPackage(0), - packageMerges(new QSet<QPackageMerge *>) + nestingPackage(0) { } QPackagePrivate::~QPackagePrivate() { - delete packagedElements; - delete packageMerges; } /*! @@ -94,7 +90,7 @@ QPackage::~QPackage() /*! The Elements owned by this element. */ -const QSet<QElement *> *QPackage::ownedElements() const +const QSet<QElement *> &QPackage::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -110,7 +106,7 @@ QElement *QPackage::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QPackage::ownedComments() const +const QSet<QComment *> &QPackage::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -169,7 +165,7 @@ QNamespace *QPackage::namespace_() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QPackage::packageImports() const +const QSet<QPackageImport *> &QPackage::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -187,7 +183,7 @@ void QPackage::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QPackage::members() const +const QSet<QNamedElement *> &QPackage::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -195,7 +191,7 @@ const QSet<QNamedElement *> *QPackage::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QPackage::importedMembers() const +const QSet<QPackageableElement *> &QPackage::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -203,7 +199,7 @@ const QSet<QPackageableElement *> *QPackage::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QPackage::elementImports() const +const QSet<QElementImport *> &QPackage::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -221,7 +217,7 @@ void QPackage::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QPackage::ownedRules() const +const QSet<QConstraint *> &QPackage::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -239,7 +235,7 @@ void QPackage::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QPackage::ownedMembers() const +const QSet<QNamedElement *> &QPackage::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -298,13 +294,13 @@ void QPackage::setURI(QString URI) /*! References the packaged elements that are Types. */ -const QSet<QType *> *QPackage::ownedTypes() const +const QSet<QType *> &QPackage::ownedTypes() const { // This is a read-write derived association end qWarning("QPackage::ownedTypes: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QType *>); // change here to your derived return } void QPackage::addOwnedType(QType *ownedType) @@ -346,7 +342,7 @@ void QPackage::removeOwnedType(QType *ownedType) /*! Specifies the packageable elements that are owned by this Package. */ -const QSet<QPackageableElement *> *QPackage::packagedElements() const +const QSet<QPackageableElement *> &QPackage::packagedElements() const { // This is a read-write association end @@ -359,8 +355,8 @@ void QPackage::addPackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QPackage); - if (!d->packagedElements->contains(packagedElement)) { - d->packagedElements->insert(packagedElement); + if (!d->packagedElements.contains(packagedElement)) { + d->packagedElements.insert(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -372,8 +368,8 @@ void QPackage::removePackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QPackage); - if (d->packagedElements->contains(packagedElement)) { - d->packagedElements->remove(packagedElement); + if (d->packagedElements.contains(packagedElement)) { + d->packagedElements.remove(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -415,7 +411,7 @@ void QPackage::setNestingPackage(QPackage *nestingPackage) /*! References the PackageMerges that are owned by this Package. */ -const QSet<QPackageMerge *> *QPackage::packageMerges() const +const QSet<QPackageMerge *> &QPackage::packageMerges() const { // This is a read-write association end @@ -428,8 +424,8 @@ void QPackage::addPackageMerge(QPackageMerge *packageMerge) // This is a read-write association end Q_D(QPackage); - if (!d->packageMerges->contains(packageMerge)) { - d->packageMerges->insert(packageMerge); + if (!d->packageMerges.contains(packageMerge)) { + d->packageMerges.insert(packageMerge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); @@ -444,8 +440,8 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) // This is a read-write association end Q_D(QPackage); - if (d->packageMerges->contains(packageMerge)) { - d->packageMerges->remove(packageMerge); + if (d->packageMerges.contains(packageMerge)) { + d->packageMerges.remove(packageMerge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); @@ -458,13 +454,13 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) /*! References the packaged elements that are Packages. */ -const QSet<QPackage *> *QPackage::nestedPackages() const +const QSet<QPackage *> &QPackage::nestedPackages() const { // This is a read-write derived association end qWarning("QPackage::nestedPackages: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QPackage *>); // change here to your derived return } void QPackage::addNestedPackage(QPackage *nestedPackage) @@ -527,47 +523,11 @@ bool QPackage::mustBeOwned() const /*! The query visibleMembers() defines which members of a Package can be accessed outside it. */ -const QSet<QPackageableElement *> *QPackage::visibleMembers() const +const QSet<QPackageableElement *> &QPackage::visibleMembers() const { qWarning("QPackage::visibleMembers: operation to be implemented"); - return 0; // change here to your derived return -} - -void QPackage::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<QPackageMerge *>("QPackageMerge *"); - qRegisterMetaType<const QSet<QPackageMerge *> *>("const QSet<QPackageMerge *> *"); - qRegisterMetaType<const QList<QPackageMerge *> *>("const QList<QPackageMerge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QPackageableElement *>); // change here to your derived return } // Overriden methods for subsetted properties diff --git a/src/mof/qpackage.h b/src/mof/qpackage.h index 2545bd02..de5c9ad7 100644 --- a/src/mof/qpackage.h +++ b/src/mof/qpackage.h @@ -74,11 +74,11 @@ class Q_MOF_EXPORT QPackage : public QWrappedObject Q_OBJECT Q_PROPERTY(QString URI READ URI WRITE setURI) - Q_PROPERTY(const QSet<QType *> * ownedTypes READ ownedTypes STORED false) - Q_PROPERTY(const QSet<QPackageableElement *> * packagedElements READ packagedElements) + 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(const QSet<QPackageMerge *> * packageMerges READ packageMerges) - Q_PROPERTY(const QSet<QPackage *> * nestedPackages READ nestedPackages STORED false) + Q_PROPERTY(QSet<QPackageMerge *> packageMerges READ packageMerges) + Q_PROPERTY(QSet<QPackage *> nestedPackages READ nestedPackages STORED false) Q_DISABLE_COPY(QPackage) Q_DECLARE_PRIVATE(QPackage) @@ -88,9 +88,9 @@ public: virtual ~QPackage(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,18 +103,18 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QPackageableElement Q_INVOKABLE QtMof::VisibilityKind visibility() const; @@ -126,32 +126,31 @@ public: Q_INVOKABLE void setURI(QString URI); // Association ends from QPackage - Q_INVOKABLE const QSet<QType *> *ownedTypes() const; + Q_INVOKABLE const QSet<QType *> &ownedTypes() const; Q_INVOKABLE void addOwnedType(QType *ownedType); Q_INVOKABLE void removeOwnedType(QType *ownedType); - Q_INVOKABLE const QSet<QPackageableElement *> *packagedElements() const; + Q_INVOKABLE const QSet<QPackageableElement *> &packagedElements() const; Q_INVOKABLE void addPackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE void removePackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE QPackage *nestingPackage() const; Q_INVOKABLE void setNestingPackage(QPackage *nestingPackage); - Q_INVOKABLE const QSet<QPackageMerge *> *packageMerges() const; + Q_INVOKABLE const QSet<QPackageMerge *> &packageMerges() const; Q_INVOKABLE void addPackageMerge(QPackageMerge *packageMerge); Q_INVOKABLE void removePackageMerge(QPackageMerge *packageMerge); - Q_INVOKABLE const QSet<QPackage *> *nestedPackages() const; + Q_INVOKABLE const QSet<QPackage *> &nestedPackages() const; Q_INVOKABLE void addNestedPackage(QPackage *nestedPackage); Q_INVOKABLE void removeNestedPackage(QPackage *nestedPackage); // Operations Q_INVOKABLE bool makesVisible(const QNamedElement *el) const; Q_INVOKABLE bool mustBeOwned() const; - Q_INVOKABLE const QSet<QPackageableElement *> *visibleMembers() const; + Q_INVOKABLE const QSet<QPackageableElement *> &visibleMembers() const; // Overriden methods for subsetted properties Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QType> ownedType); Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType); Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); - virtual void registerMetaTypes() const; protected: explicit QPackage(QPackagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -163,10 +162,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackage) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGE_H diff --git a/src/mof/qpackage_p.h b/src/mof/qpackage_p.h index ee0f5ef6..225194a6 100644 --- a/src/mof/qpackage_p.h +++ b/src/mof/qpackage_p.h @@ -74,9 +74,9 @@ public: virtual ~QPackagePrivate(); QString URI; - QSet<QPackageableElement *> *packagedElements; + QSet<QPackageableElement *> packagedElements; QPackage *nestingPackage; - QSet<QPackageMerge *> *packageMerges; + QSet<QPackageMerge *> packageMerges; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageableelement.cpp b/src/mof/qpackageableelement.cpp index 6318d047..b51fc137 100644 --- a/src/mof/qpackageableelement.cpp +++ b/src/mof/qpackageableelement.cpp @@ -105,21 +105,6 @@ void QPackageableElement::unsetVisibility() setVisibility(QtMof::VisibilityPublic); } -void QPackageableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackageableelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageableelement.h b/src/mof/qpackageableelement.h index a6893ac0..01744ddf 100644 --- a/src/mof/qpackageableelement.h +++ b/src/mof/qpackageableelement.h @@ -74,7 +74,6 @@ public: Q_INVOKABLE QtMof::VisibilityKind visibility() const; Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); - virtual void registerMetaTypes() const; protected: explicit QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGEABLEELEMENT_H diff --git a/src/mof/qpackageimport.cpp b/src/mof/qpackageimport.cpp index 7181dcba..2f8fc91e 100644 --- a/src/mof/qpackageimport.cpp +++ b/src/mof/qpackageimport.cpp @@ -181,35 +181,6 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) } } -void QPackageImport::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackageimport.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageimport.h b/src/mof/qpackageimport.h index eacf34fd..528a1a5c 100644 --- a/src/mof/qpackageimport.h +++ b/src/mof/qpackageimport.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void setImportingNamespace(QNamespace *importingNamespace); Q_INVOKABLE QPackage *importedPackage() const; Q_INVOKABLE void setImportedPackage(QPackage *importedPackage); - virtual void registerMetaTypes() const; protected: explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGEIMPORT_H diff --git a/src/mof/qpackagemerge.cpp b/src/mof/qpackagemerge.cpp index 2ce87e6c..05a76a43 100644 --- a/src/mof/qpackagemerge.cpp +++ b/src/mof/qpackagemerge.cpp @@ -149,28 +149,6 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) } } -void QPackageMerge::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<QPackageMerge *>("QPackageMerge *"); - qRegisterMetaType<const QSet<QPackageMerge *> *>("const QSet<QPackageMerge *> *"); - qRegisterMetaType<const QList<QPackageMerge *> *>("const QList<QPackageMerge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackagemerge.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackagemerge.h b/src/mof/qpackagemerge.h index 214a1538..5a82eaf9 100644 --- a/src/mof/qpackagemerge.h +++ b/src/mof/qpackagemerge.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setMergedPackage(QPackage *mergedPackage); Q_INVOKABLE QPackage *receivingPackage() const; Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage); - virtual void registerMetaTypes() const; protected: explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGEMERGE_H diff --git a/src/mof/qparameter.cpp b/src/mof/qparameter.cpp index 8359acf0..ace4d73e 100644 --- a/src/mof/qparameter.cpp +++ b/src/mof/qparameter.cpp @@ -91,7 +91,7 @@ QParameter::~QParameter() /*! The Elements owned by this element. */ -const QSet<QElement *> *QParameter::ownedElements() const +const QSet<QElement *> &QParameter::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -107,7 +107,7 @@ QElement *QParameter::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QParameter::ownedComments() const +const QSet<QComment *> &QParameter::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -397,35 +397,6 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue) } } -void QParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *>("QT_PREPEND_NAMESPACE_QTMOF(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qparameter.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qparameter.h b/src/mof/qparameter.h index 78749e15..f93e97e7 100644 --- a/src/mof/qparameter.h +++ b/src/mof/qparameter.h @@ -84,9 +84,9 @@ public: virtual ~QParameter(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -134,7 +134,6 @@ public: Q_INVOKABLE void setOperation(QOperation *operation); Q_INVOKABLE QValueSpecification *defaultValue() const; Q_INVOKABLE void setDefaultValue(QValueSpecification *defaultValue); - virtual void registerMetaTypes() const; protected: explicit QParameter(QParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -146,10 +145,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *) - QT_END_HEADER #endif // QTMOF_QPARAMETER_H diff --git a/src/mof/qprimitivetype.cpp b/src/mof/qprimitivetype.cpp index ad6ff9de..e6e3c3d4 100644 --- a/src/mof/qprimitivetype.cpp +++ b/src/mof/qprimitivetype.cpp @@ -74,21 +74,6 @@ QPrimitiveType::~QPrimitiveType() { } -void QPrimitiveType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *>("QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *"); - qRegisterMetaType<QPrimitiveType *>("QPrimitiveType *"); - qRegisterMetaType<const QSet<QPrimitiveType *> *>("const QSet<QPrimitiveType *> *"); - qRegisterMetaType<const QList<QPrimitiveType *> *>("const QList<QPrimitiveType *> *"); - - QDataType::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprimitivetype.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qprimitivetype.h b/src/mof/qprimitivetype.h index f9de07da..9779e887 100644 --- a/src/mof/qprimitivetype.h +++ b/src/mof/qprimitivetype.h @@ -64,7 +64,6 @@ class Q_MOF_EXPORT QPrimitiveType : public QDataType public: Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPrimitiveType(); - virtual void registerMetaTypes() const; protected: explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *) - QT_END_HEADER #endif // QTMOF_QPRIMITIVETYPE_H diff --git a/src/mof/qproperty.cpp b/src/mof/qproperty.cpp index 00ba419e..72a2181a 100644 --- a/src/mof/qproperty.cpp +++ b/src/mof/qproperty.cpp @@ -57,20 +57,16 @@ QPropertyPrivate::QPropertyPrivate() : isID(false), isDerivedUnion(false), aggregation(QtMof::AggregationNone), - subsettedProperties(new QSet<QProperty *>), owningAssociation(0), defaultValue(0), class_(0), datatype(0), - redefinedProperties(new QSet<QProperty *>), association(0) { } QPropertyPrivate::~QPropertyPrivate() { - delete subsettedProperties; - delete redefinedProperties; } /*! @@ -284,7 +280,7 @@ void QProperty::unsetAggregation() /*! References the properties of which this property is constrained to be a subset. */ -const QSet<QProperty *> *QProperty::subsettedProperties() const +const QSet<QProperty *> &QProperty::subsettedProperties() const { // This is a read-write association end @@ -297,8 +293,8 @@ void QProperty::addSubsettedProperty(QProperty *subsettedProperty) // This is a read-write association end Q_D(QProperty); - if (!d->subsettedProperties->contains(subsettedProperty)) { - d->subsettedProperties->insert(subsettedProperty); + if (!d->subsettedProperties.contains(subsettedProperty)) { + d->subsettedProperties.insert(subsettedProperty); } } @@ -307,8 +303,8 @@ void QProperty::removeSubsettedProperty(QProperty *subsettedProperty) // This is a read-write association end Q_D(QProperty); - if (d->subsettedProperties->contains(subsettedProperty)) { - d->subsettedProperties->remove(subsettedProperty); + if (d->subsettedProperties.contains(subsettedProperty)) { + d->subsettedProperties.remove(subsettedProperty); } } @@ -495,7 +491,7 @@ void QProperty::setDatatype(QDataType *datatype) /*! References the properties that are redefined by this property. */ -const QSet<QProperty *> *QProperty::redefinedProperties() const +const QSet<QProperty *> &QProperty::redefinedProperties() const { // This is a read-write association end @@ -508,8 +504,8 @@ void QProperty::addRedefinedProperty(QProperty *redefinedProperty) // This is a read-write association end Q_D(QProperty); - if (!d->redefinedProperties->contains(redefinedProperty)) { - d->redefinedProperties->insert(redefinedProperty); + if (!d->redefinedProperties.contains(redefinedProperty)) { + d->redefinedProperties.insert(redefinedProperty); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); @@ -521,8 +517,8 @@ void QProperty::removeRedefinedProperty(QProperty *redefinedProperty) // This is a read-write association end Q_D(QProperty); - if (d->redefinedProperties->contains(redefinedProperty)) { - d->redefinedProperties->remove(redefinedProperty); + if (d->redefinedProperties.contains(redefinedProperty)) { + d->redefinedProperties.remove(redefinedProperty); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); @@ -593,68 +589,11 @@ bool QProperty::isNavigable() const /*! The query subsettingContext() gives the context for subsetting a property. It consists, in the case of an attribute, of the corresponding classifier, and in the case of an association end, all of the classifiers at the other ends. */ -const QSet<QType *> *QProperty::subsettingContext() const +const QSet<QType *> &QProperty::subsettingContext() const { qWarning("QProperty::subsettingContext: operation to be implemented"); - return 0; // change here to your derived return -} - -void QProperty::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - QStructuralFeature::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QType *>); // change here to your derived return } #include "moc_qproperty.cpp" diff --git a/src/mof/qproperty.h b/src/mof/qproperty.h index eafd6e8f..8646138d 100644 --- a/src/mof/qproperty.h +++ b/src/mof/qproperty.h @@ -80,13 +80,13 @@ class Q_MOF_EXPORT QProperty : public QStructuralFeature 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(const QSet<QProperty *> * subsettedProperties READ subsettedProperties) + 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(const QSet<QProperty *> * redefinedProperties READ redefinedProperties) + Q_PROPERTY(QSet<QProperty *> redefinedProperties READ redefinedProperties) Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) Q_DISABLE_COPY(QProperty) @@ -118,7 +118,7 @@ public: Q_INVOKABLE void unsetAggregation(); // Association ends from QProperty - Q_INVOKABLE const QSet<QProperty *> *subsettedProperties() const; + Q_INVOKABLE const QSet<QProperty *> &subsettedProperties() const; Q_INVOKABLE void addSubsettedProperty(QProperty *subsettedProperty); Q_INVOKABLE void removeSubsettedProperty(QProperty *subsettedProperty); Q_INVOKABLE QAssociation *owningAssociation() const; @@ -131,7 +131,7 @@ public: Q_INVOKABLE void setOpposite(QProperty *opposite); Q_INVOKABLE QDataType *datatype() const; Q_INVOKABLE void setDatatype(QDataType *datatype); - Q_INVOKABLE const QSet<QProperty *> *redefinedProperties() const; + Q_INVOKABLE const QSet<QProperty *> &redefinedProperties() const; Q_INVOKABLE void addRedefinedProperty(QProperty *redefinedProperty); Q_INVOKABLE void removeRedefinedProperty(QProperty *redefinedProperty); Q_INVOKABLE QAssociation *association() const; @@ -141,8 +141,7 @@ public: Q_INVOKABLE bool isAttribute(const QProperty *p) const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isNavigable() const; - Q_INVOKABLE const QSet<QType *> *subsettingContext() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QType *> &subsettingContext() const; protected: explicit QProperty(QPropertyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -150,10 +149,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QProperty) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *) - QT_END_HEADER #endif // QTMOF_QPROPERTY_H diff --git a/src/mof/qproperty_p.h b/src/mof/qproperty_p.h index 999bd3c1..f7332a8b 100644 --- a/src/mof/qproperty_p.h +++ b/src/mof/qproperty_p.h @@ -81,12 +81,12 @@ public: bool isID; bool isDerivedUnion; QtMof::AggregationKind aggregation; - QSet<QProperty *> *subsettedProperties; + QSet<QProperty *> subsettedProperties; QAssociation *owningAssociation; QValueSpecification *defaultValue; QClass *class_; QDataType *datatype; - QSet<QProperty *> *redefinedProperties; + QSet<QProperty *> redefinedProperties; QAssociation *association; }; diff --git a/src/mof/qredefinableelement.cpp b/src/mof/qredefinableelement.cpp index 554b19b6..3731f007 100644 --- a/src/mof/qredefinableelement.cpp +++ b/src/mof/qredefinableelement.cpp @@ -47,24 +47,20 @@ QT_BEGIN_NAMESPACE_QTMOF QRedefinableElementPrivate::QRedefinableElementPrivate() : - isLeaf(false), - redefinedElements(new QSet<QRedefinableElement *>), - redefinitionContexts(new QSet<QClassifier *>) + isLeaf(false) { } QRedefinableElementPrivate::~QRedefinableElementPrivate() { - delete redefinedElements; - delete redefinitionContexts; } void QRedefinableElementPrivate::addRedefinedElement(QRedefinableElement *redefinedElement) { // This is a read-only derived-union association end - if (!this->redefinedElements->contains(redefinedElement)) { - this->redefinedElements->insert(redefinedElement); + if (!this->redefinedElements.contains(redefinedElement)) { + this->redefinedElements.insert(redefinedElement); } } @@ -72,8 +68,8 @@ void QRedefinableElementPrivate::removeRedefinedElement(QRedefinableElement *red { // This is a read-only derived-union association end - if (this->redefinedElements->contains(redefinedElement)) { - this->redefinedElements->remove(redefinedElement); + if (this->redefinedElements.contains(redefinedElement)) { + this->redefinedElements.remove(redefinedElement); } } @@ -81,8 +77,8 @@ void QRedefinableElementPrivate::addRedefinitionContext(QClassifier *redefinitio { // This is a read-only derived-union association end - if (!this->redefinitionContexts->contains(redefinitionContext)) { - this->redefinitionContexts->insert(redefinitionContext); + if (!this->redefinitionContexts.contains(redefinitionContext)) { + this->redefinitionContexts.insert(redefinitionContext); } } @@ -90,8 +86,8 @@ void QRedefinableElementPrivate::removeRedefinitionContext(QClassifier *redefini { // This is a read-only derived-union association end - if (this->redefinitionContexts->contains(redefinitionContext)) { - this->redefinitionContexts->remove(redefinitionContext); + if (this->redefinitionContexts.contains(redefinitionContext)) { + this->redefinitionContexts.remove(redefinitionContext); } } @@ -154,7 +150,7 @@ void QRedefinableElement::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QRedefinableElement::redefinedElements() const +const QSet<QRedefinableElement *> &QRedefinableElement::redefinedElements() const { // This is a read-only derived-union association end @@ -165,7 +161,7 @@ const QSet<QRedefinableElement *> *QRedefinableElement::redefinedElements() cons /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QRedefinableElement::redefinitionContexts() const +const QSet<QClassifier *> &QRedefinableElement::redefinitionContexts() const { // This is a read-only derived-union association end @@ -195,28 +191,6 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement * return bool(); // change here to your derived return } -void QRedefinableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qredefinableelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qredefinableelement.h b/src/mof/qredefinableelement.h index e9a2af75..7ac9566e 100644 --- a/src/mof/qredefinableelement.h +++ b/src/mof/qredefinableelement.h @@ -65,8 +65,8 @@ class Q_MOF_EXPORT QRedefinableElement : public QNamedElement Q_OBJECT Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(const QSet<QRedefinableElement *> * redefinedElements READ redefinedElements) - Q_PROPERTY(const QSet<QClassifier *> * redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) Q_DISABLE_COPY(QRedefinableElement) Q_DECLARE_PRIVATE(QRedefinableElement) @@ -81,13 +81,12 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const; - virtual void registerMetaTypes() const; protected: explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *) - QT_END_HEADER #endif // QTMOF_QREDEFINABLEELEMENT_H diff --git a/src/mof/qredefinableelement_p.h b/src/mof/qredefinableelement_p.h index 2824ffce..47f90dc9 100644 --- a/src/mof/qredefinableelement_p.h +++ b/src/mof/qredefinableelement_p.h @@ -68,8 +68,8 @@ public: virtual ~QRedefinableElementPrivate(); bool isLeaf; - QSet<QRedefinableElement *> *redefinedElements; - QSet<QClassifier *> *redefinitionContexts; + QSet<QRedefinableElement *> redefinedElements; + QSet<QClassifier *> redefinitionContexts; // Internal functions for read-only subsetted association ends void addRedefinedElement(QRedefinableElement *redefinedElement); diff --git a/src/mof/qreflectivecollection.cpp b/src/mof/qreflectivecollection.cpp index 3b58718d..1852e064 100644 --- a/src/mof/qreflectivecollection.cpp +++ b/src/mof/qreflectivecollection.cpp @@ -103,21 +103,6 @@ qint32 QReflectiveCollection::size() const return qint32(); // change here to your derived return } -void QReflectiveCollection::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *>("QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *"); - qRegisterMetaType<QReflectiveCollection *>("QReflectiveCollection *"); - qRegisterMetaType<const QSet<QReflectiveCollection *> *>("const QSet<QReflectiveCollection *> *"); - qRegisterMetaType<const QList<QReflectiveCollection *> *>("const QList<QReflectiveCollection *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreflectivecollection.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qreflectivecollection.h b/src/mof/qreflectivecollection.h index 6a2ffe77..8347a33e 100644 --- a/src/mof/qreflectivecollection.h +++ b/src/mof/qreflectivecollection.h @@ -71,7 +71,6 @@ public: Q_INVOKABLE void clear(); Q_INVOKABLE bool remove(const QMofObject *object); Q_INVOKABLE qint32 size() const; - virtual void registerMetaTypes() const; protected: explicit QReflectiveCollection(QReflectiveCollectionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -79,10 +78,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *) - QT_END_HEADER #endif // QTMOF_QREFLECTIVECOLLECTION_H diff --git a/src/mof/qreflectivesequence.cpp b/src/mof/qreflectivesequence.cpp index 072b231e..b3c1ab00 100644 --- a/src/mof/qreflectivesequence.cpp +++ b/src/mof/qreflectivesequence.cpp @@ -101,28 +101,6 @@ QMofObject *QReflectiveSequence::set(qint32 index, const QMofObject *object) return 0; // change here to your derived return } -void QReflectiveSequence::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *>("QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<QReflectiveSequence *>("QReflectiveSequence *"); - qRegisterMetaType<const QSet<QReflectiveSequence *> *>("const QSet<QReflectiveSequence *> *"); - qRegisterMetaType<const QList<QReflectiveSequence *> *>("const QList<QReflectiveSequence *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - QReflectiveCollection::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreflectivesequence.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qreflectivesequence.h b/src/mof/qreflectivesequence.h index b3c7e7cf..aa6c728e 100644 --- a/src/mof/qreflectivesequence.h +++ b/src/mof/qreflectivesequence.h @@ -73,7 +73,6 @@ public: Q_INVOKABLE QMofObject *get(qint32 index) const; Q_INVOKABLE QMofObject *remove(qint32 index); Q_INVOKABLE QMofObject *set(qint32 index, const QMofObject *object); - virtual void registerMetaTypes() const; protected: explicit QReflectiveSequence(QReflectiveSequencePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *) - QT_END_HEADER #endif // QTMOF_QREFLECTIVESEQUENCE_H diff --git a/src/mof/qrelationship.cpp b/src/mof/qrelationship.cpp index 7c815636..bfa8a1ce 100644 --- a/src/mof/qrelationship.cpp +++ b/src/mof/qrelationship.cpp @@ -44,22 +44,20 @@ QT_BEGIN_NAMESPACE_QTMOF -QRelationshipPrivate::QRelationshipPrivate() : - relatedElements(new QSet<QElement *>) +QRelationshipPrivate::QRelationshipPrivate() { } QRelationshipPrivate::~QRelationshipPrivate() { - delete relatedElements; } void QRelationshipPrivate::addRelatedElement(QElement *relatedElement) { // This is a read-only derived-union association end - if (!this->relatedElements->contains(relatedElement)) { - this->relatedElements->insert(relatedElement); + if (!this->relatedElements.contains(relatedElement)) { + this->relatedElements.insert(relatedElement); } } @@ -67,8 +65,8 @@ void QRelationshipPrivate::removeRelatedElement(QElement *relatedElement) { // This is a read-only derived-union association end - if (this->relatedElements->contains(relatedElement)) { - this->relatedElements->remove(relatedElement); + if (this->relatedElements.contains(relatedElement)) { + this->relatedElements.remove(relatedElement); } } @@ -101,7 +99,7 @@ QRelationship::~QRelationship() /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QRelationship::relatedElements() const +const QSet<QElement *> &QRelationship::relatedElements() const { // This is a read-only derived-union association end @@ -109,21 +107,6 @@ const QSet<QElement *> *QRelationship::relatedElements() const return d->relatedElements; } -void QRelationship::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *>("QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *"); - qRegisterMetaType<QRelationship *>("QRelationship *"); - qRegisterMetaType<const QSet<QRelationship *> *>("const QSet<QRelationship *> *"); - qRegisterMetaType<const QList<QRelationship *> *>("const QList<QRelationship *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qrelationship.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qrelationship.h b/src/mof/qrelationship.h index 25736c40..fbb5ddf6 100644 --- a/src/mof/qrelationship.h +++ b/src/mof/qrelationship.h @@ -61,7 +61,7 @@ class Q_MOF_EXPORT QRelationship : public QElement { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * relatedElements READ relatedElements) + Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) Q_DISABLE_COPY(QRelationship) Q_DECLARE_PRIVATE(QRelationship) @@ -71,8 +71,7 @@ public: virtual ~QRelationship(); // Association ends from QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; protected: explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -80,10 +79,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *) - QT_END_HEADER #endif // QTMOF_QRELATIONSHIP_H diff --git a/src/mof/qrelationship_p.h b/src/mof/qrelationship_p.h index d79be502..e4e79647 100644 --- a/src/mof/qrelationship_p.h +++ b/src/mof/qrelationship_p.h @@ -63,7 +63,7 @@ public: explicit QRelationshipPrivate(); virtual ~QRelationshipPrivate(); - QSet<QElement *> *relatedElements; + QSet<QElement *> relatedElements; // Internal functions for read-only subsetted association ends void addRelatedElement(QElement *relatedElement); diff --git a/src/mof/qslot.cpp b/src/mof/qslot.cpp index e89e37cb..c043347c 100644 --- a/src/mof/qslot.cpp +++ b/src/mof/qslot.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE_QTMOF QSlotPrivate::QSlotPrivate() : - values(new QList<QValueSpecification *>), definingFeature(0), owningInstance(0) { @@ -57,7 +56,6 @@ QSlotPrivate::QSlotPrivate() : QSlotPrivate::~QSlotPrivate() { - delete values; } /*! @@ -89,7 +87,7 @@ QSlot::~QSlot() /*! The value or values corresponding to the defining feature for the owning instance specification. */ -const QList<QValueSpecification *> *QSlot::values() const +const QList<QValueSpecification *> &QSlot::values() const { // This is a read-write association end @@ -102,8 +100,8 @@ void QSlot::addValue(QValueSpecification *value) // This is a read-write association end Q_D(QSlot); - if (!d->values->contains(value)) { - d->values->append(value); + if (!d->values.contains(value)) { + d->values.append(value); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); @@ -115,8 +113,8 @@ void QSlot::removeValue(QValueSpecification *value) // This is a read-write association end Q_D(QSlot); - if (d->values->contains(value)) { - d->values->removeAll(value); + if (d->values.contains(value)) { + d->values.removeAll(value); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(value)); @@ -176,42 +174,6 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) } } -void QSlot::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *>("QT_PREPEND_NAMESPACE_QTMOF(QSlot) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<QSlot *>("QSlot *"); - qRegisterMetaType<const QSet<QSlot *> *>("const QSet<QSlot *> *"); - qRegisterMetaType<const QList<QSlot *> *>("const QList<QSlot *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qslot.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qslot.h b/src/mof/qslot.h index 0a689aef..5ebb8112 100644 --- a/src/mof/qslot.h +++ b/src/mof/qslot.h @@ -66,7 +66,7 @@ class Q_MOF_EXPORT QSlot : public QElement { Q_OBJECT - Q_PROPERTY(const QList<QValueSpecification *> * values READ values) + Q_PROPERTY(QList<QValueSpecification *> values READ values) Q_PROPERTY(QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) Q_PROPERTY(QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) @@ -78,14 +78,13 @@ public: virtual ~QSlot(); // Association ends from QSlot - Q_INVOKABLE const QList<QValueSpecification *> *values() const; + Q_INVOKABLE const QList<QValueSpecification *> &values() const; Q_INVOKABLE void addValue(QValueSpecification *value); Q_INVOKABLE void removeValue(QValueSpecification *value); Q_INVOKABLE QStructuralFeature *definingFeature() const; Q_INVOKABLE void setDefiningFeature(QStructuralFeature *definingFeature); Q_INVOKABLE QInstanceSpecification *owningInstance() const; Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance); - virtual void registerMetaTypes() const; protected: explicit QSlot(QSlotPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QSlot) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *) - QT_END_HEADER #endif // QTMOF_QSLOT_H diff --git a/src/mof/qslot_p.h b/src/mof/qslot_p.h index 4fb0b82a..8324066e 100644 --- a/src/mof/qslot_p.h +++ b/src/mof/qslot_p.h @@ -69,7 +69,7 @@ public: explicit QSlotPrivate(); virtual ~QSlotPrivate(); - QList<QValueSpecification *> *values; + QList<QValueSpecification *> values; QStructuralFeature *definingFeature; QInstanceSpecification *owningInstance; }; diff --git a/src/mof/qstructuralfeature.cpp b/src/mof/qstructuralfeature.cpp index 8d40f1c1..f0d0e0f7 100644 --- a/src/mof/qstructuralfeature.cpp +++ b/src/mof/qstructuralfeature.cpp @@ -88,7 +88,7 @@ QStructuralFeature::~QStructuralFeature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QStructuralFeature::ownedElements() const +const QSet<QElement *> &QStructuralFeature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -104,7 +104,7 @@ QElement *QStructuralFeature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QStructuralFeature::ownedComments() const +const QSet<QComment *> &QStructuralFeature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -198,7 +198,7 @@ void QStructuralFeature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const +const QSet<QRedefinableElement *> &QStructuralFeature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -206,7 +206,7 @@ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const +const QSet<QClassifier *> &QStructuralFeature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -240,7 +240,7 @@ void QStructuralFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QStructuralFeature::featuringClassifiers() const +const QSet<QClassifier *> &QStructuralFeature::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -393,21 +393,6 @@ void QStructuralFeature::unsetReadOnly() setReadOnly(false); } -void QStructuralFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstructuralfeature.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qstructuralfeature.h b/src/mof/qstructuralfeature.h index 5298b8e3..8549602e 100644 --- a/src/mof/qstructuralfeature.h +++ b/src/mof/qstructuralfeature.h @@ -72,9 +72,9 @@ public: virtual ~QStructuralFeature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -94,8 +94,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -103,7 +103,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Association ends from aggregated QTypedElement Q_INVOKABLE QType *type() const; @@ -132,7 +132,6 @@ public: Q_INVOKABLE bool isReadOnly() const; Q_INVOKABLE void setReadOnly(bool isReadOnly); Q_INVOKABLE void unsetReadOnly(); - virtual void registerMetaTypes() const; protected: explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -145,10 +144,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *) - QT_END_HEADER #endif // QTMOF_QSTRUCTURALFEATURE_H diff --git a/src/mof/qtag.cpp b/src/mof/qtag.cpp index 202b323d..245185d5 100644 --- a/src/mof/qtag.cpp +++ b/src/mof/qtag.cpp @@ -45,14 +45,12 @@ QT_BEGIN_NAMESPACE_QTMOF QTagPrivate::QTagPrivate() : - elements(new QSet<QElement *>), tagOwner(0) { } QTagPrivate::~QTagPrivate() { - delete elements; } @@ -74,7 +72,7 @@ QTag::~QTag() // ATTRIBUTES FROM QTag // --------------------------------------------------------------- -const QSet<QElement *> *QTag::elements() const +const QSet<QElement *> &QTag::elements() const { // This is a read-write attribute @@ -87,8 +85,8 @@ void QTag::addElement(QElement *element) // This is a read-write attribute Q_D(QTag); - if (!d->elements->contains(element)) { - d->elements->insert(element); + if (!d->elements.contains(element)) { + d->elements.insert(element); } } @@ -97,8 +95,8 @@ void QTag::removeElement(QElement *element) // This is a read-write attribute Q_D(QTag); - if (d->elements->contains(element)) { - d->elements->remove(element); + if (d->elements.contains(element)) { + d->elements.remove(element); } } @@ -156,21 +154,6 @@ void QTag::setTagOwner(QElement *tagOwner) } } -void QTag::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QTag) *>("QT_PREPEND_NAMESPACE_QTMOF(QTag) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *"); - qRegisterMetaType<QTag *>("QTag *"); - qRegisterMetaType<const QSet<QTag *> *>("const QSet<QTag *> *"); - qRegisterMetaType<const QList<QTag *> *>("const QList<QTag *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtag.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtag.h b/src/mof/qtag.h index 3de11402..9258d7c4 100644 --- a/src/mof/qtag.h +++ b/src/mof/qtag.h @@ -62,7 +62,7 @@ class Q_MOF_EXPORT QTag : public QElement { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * elements READ elements) + Q_PROPERTY(QSet<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) @@ -75,7 +75,7 @@ public: virtual ~QTag(); // Attributes from QTag - Q_INVOKABLE const QSet<QElement *> *elements() const; + Q_INVOKABLE const QSet<QElement *> &elements() const; Q_INVOKABLE void addElement(QElement *element); Q_INVOKABLE void removeElement(QElement *element); Q_INVOKABLE QString value() const; @@ -84,7 +84,6 @@ public: Q_INVOKABLE void setName(QString name); Q_INVOKABLE QElement *tagOwner() const; Q_INVOKABLE void setTagOwner(QElement *tagOwner); - virtual void registerMetaTypes() const; protected: explicit QTag(QTagPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QTag) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *) - QT_END_HEADER #endif // QTMOF_QTAG_H diff --git a/src/mof/qtag_p.h b/src/mof/qtag_p.h index d5bbb019..11251f8b 100644 --- a/src/mof/qtag_p.h +++ b/src/mof/qtag_p.h @@ -65,7 +65,7 @@ public: explicit QTagPrivate(); virtual ~QTagPrivate(); - QSet<QElement *> *elements; + QSet<QElement *> elements; QString value; QString name; QElement *tagOwner; diff --git a/src/mof/qtype.cpp b/src/mof/qtype.cpp index d827e6cc..77d8040c 100644 --- a/src/mof/qtype.cpp +++ b/src/mof/qtype.cpp @@ -133,35 +133,6 @@ bool QType::isInstance(const QMofObject *object) const return bool(); // change here to your derived return } -void QType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtype.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtype.h b/src/mof/qtype.h index 981cfe16..82607ca6 100644 --- a/src/mof/qtype.h +++ b/src/mof/qtype.h @@ -78,7 +78,6 @@ public: // Operations Q_INVOKABLE bool conformsTo(const QType *other) const; Q_INVOKABLE bool isInstance(const QMofObject *object) const; - virtual void registerMetaTypes() const; protected: explicit QType(QTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -86,10 +85,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *) - QT_END_HEADER #endif // QTMOF_QTYPE_H diff --git a/src/mof/qtypedelement.cpp b/src/mof/qtypedelement.cpp index 4573a200..b4f06a8c 100644 --- a/src/mof/qtypedelement.cpp +++ b/src/mof/qtypedelement.cpp @@ -102,28 +102,6 @@ void QTypedElement::setType(QType *type) } } -void QTypedElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *"); - qRegisterMetaType<QTypedElement *>("QTypedElement *"); - qRegisterMetaType<const QSet<QTypedElement *> *>("const QSet<QTypedElement *> *"); - qRegisterMetaType<const QList<QTypedElement *> *>("const QList<QTypedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtypedelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtypedelement.h b/src/mof/qtypedelement.h index 4a5530fc..9091bad2 100644 --- a/src/mof/qtypedelement.h +++ b/src/mof/qtypedelement.h @@ -73,7 +73,6 @@ public: // Association ends from QTypedElement Q_INVOKABLE QType *type() const; Q_INVOKABLE void setType(QType *type); - virtual void registerMetaTypes() const; protected: explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *) - QT_END_HEADER #endif // QTMOF_QTYPEDELEMENT_H diff --git a/src/mof/quriextent.cpp b/src/mof/quriextent.cpp index 55cb60a6..768e9e8e 100644 --- a/src/mof/quriextent.cpp +++ b/src/mof/quriextent.cpp @@ -92,28 +92,6 @@ QElement *QURIExtent::element(QString uri) const return 0; // change here to your derived return } -void QURIExtent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *>("QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *"); - qRegisterMetaType<QURIExtent *>("QURIExtent *"); - qRegisterMetaType<const QSet<QURIExtent *> *>("const QSet<QURIExtent *> *"); - qRegisterMetaType<const QList<QURIExtent *> *>("const QList<QURIExtent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QExtent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_quriextent.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/quriextent.h b/src/mof/quriextent.h index db594093..9575c226 100644 --- a/src/mof/quriextent.h +++ b/src/mof/quriextent.h @@ -75,7 +75,6 @@ public: Q_INVOKABLE QString contextURI() const; Q_INVOKABLE QString uri(const QElement *object) const; Q_INVOKABLE QElement *element(QString uri) const; - virtual void registerMetaTypes() const; protected: explicit QURIExtent(QURIExtentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *) - QT_END_HEADER #endif // QTMOF_QURIEXTENT_H diff --git a/src/mof/qvaluespecification.cpp b/src/mof/qvaluespecification.cpp index 74ccb96d..80cb582d 100644 --- a/src/mof/qvaluespecification.cpp +++ b/src/mof/qvaluespecification.cpp @@ -85,7 +85,7 @@ QValueSpecification::~QValueSpecification() /*! The Elements owned by this element. */ -const QSet<QElement *> *QValueSpecification::ownedElements() const +const QSet<QElement *> &QValueSpecification::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -101,7 +101,7 @@ QElement *QValueSpecification::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QValueSpecification::ownedComments() const +const QSet<QComment *> &QValueSpecification::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -262,21 +262,6 @@ qint32 QValueSpecification::unlimitedValue() const return qint32(); // change here to your derived return } -void QValueSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvaluespecification.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qvaluespecification.h b/src/mof/qvaluespecification.h index 8f89356d..a49c8c8d 100644 --- a/src/mof/qvaluespecification.h +++ b/src/mof/qvaluespecification.h @@ -72,9 +72,9 @@ public: virtual ~QValueSpecification(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,7 +103,6 @@ public: Q_INVOKABLE qreal realValue(); Q_INVOKABLE QString stringValue() const; Q_INVOKABLE qint32 unlimitedValue() const; - virtual void registerMetaTypes() const; protected: explicit QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -115,10 +114,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *) - QT_END_HEADER #endif // QTMOF_QVALUESPECIFICATION_H diff --git a/src/uml/qabstraction.cpp b/src/uml/qabstraction.cpp index 01a2a536..74f29dd2 100644 --- a/src/uml/qabstraction.cpp +++ b/src/uml/qabstraction.cpp @@ -110,28 +110,6 @@ void QAbstraction::setMapping(QOpaqueExpression *mapping) } } -void QAbstraction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *>("QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *> *"); - qRegisterMetaType<QAbstraction *>("QAbstraction *"); - qRegisterMetaType<const QSet<QAbstraction *> *>("const QSet<QAbstraction *> *"); - qRegisterMetaType<const QList<QAbstraction *> *>("const QList<QAbstraction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *"); - qRegisterMetaType<QOpaqueExpression *>("QOpaqueExpression *"); - qRegisterMetaType<const QSet<QOpaqueExpression *> *>("const QSet<QOpaqueExpression *> *"); - qRegisterMetaType<const QList<QOpaqueExpression *> *>("const QList<QOpaqueExpression *> *"); - - QDependency::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qabstraction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qabstraction.h b/src/uml/qabstraction.h index 9040b20d..a038e8f1 100644 --- a/src/uml/qabstraction.h +++ b/src/uml/qabstraction.h @@ -73,7 +73,6 @@ public: // Association ends from QAbstraction Q_INVOKABLE QOpaqueExpression *mapping() const; Q_INVOKABLE void setMapping(QOpaqueExpression *mapping); - virtual void registerMetaTypes() const; protected: explicit QAbstraction(QAbstractionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAbstraction) *> *) - QT_END_HEADER #endif // QTUML_QABSTRACTION_H diff --git a/src/uml/qacceptcallaction.cpp b/src/uml/qacceptcallaction.cpp index f2a14b5a..a4955226 100644 --- a/src/uml/qacceptcallaction.cpp +++ b/src/uml/qacceptcallaction.cpp @@ -110,28 +110,6 @@ void QAcceptCallAction::setReturnInformation(QOutputPin *returnInformation) } } -void QAcceptCallAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *> *"); - qRegisterMetaType<QAcceptCallAction *>("QAcceptCallAction *"); - qRegisterMetaType<const QSet<QAcceptCallAction *> *>("const QSet<QAcceptCallAction *> *"); - qRegisterMetaType<const QList<QAcceptCallAction *> *>("const QList<QAcceptCallAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAcceptEventAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qacceptcallaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qacceptcallaction.h b/src/uml/qacceptcallaction.h index 9e222d35..35404044 100644 --- a/src/uml/qacceptcallaction.h +++ b/src/uml/qacceptcallaction.h @@ -73,7 +73,6 @@ public: // Association ends from QAcceptCallAction Q_INVOKABLE QOutputPin *returnInformation() const; Q_INVOKABLE void setReturnInformation(QOutputPin *returnInformation); - virtual void registerMetaTypes() const; protected: explicit QAcceptCallAction(QAcceptCallActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAcceptCallAction) *> *) - QT_END_HEADER #endif // QTUML_QACCEPTCALLACTION_H diff --git a/src/uml/qaccepteventaction.cpp b/src/uml/qaccepteventaction.cpp index 89088cf3..9fe40bf0 100644 --- a/src/uml/qaccepteventaction.cpp +++ b/src/uml/qaccepteventaction.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QAcceptEventActionPrivate::QAcceptEventActionPrivate() : - isUnmarshall(false), - triggers(new QSet<QTrigger *>), - results(new QSet<QOutputPin *>) + isUnmarshall(false) { } QAcceptEventActionPrivate::~QAcceptEventActionPrivate() { - delete triggers; - delete results; } /*! @@ -119,7 +115,7 @@ void QAcceptEventAction::unsetUnmarshall() /*! 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. */ -const QSet<QTrigger *> *QAcceptEventAction::triggers() const +const QSet<QTrigger *> &QAcceptEventAction::triggers() const { // This is a read-write association end @@ -132,8 +128,8 @@ void QAcceptEventAction::addTrigger(QTrigger *trigger) // This is a read-write association end Q_D(QAcceptEventAction); - if (!d->triggers->contains(trigger)) { - d->triggers->insert(trigger); + if (!d->triggers.contains(trigger)) { + d->triggers.insert(trigger); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(trigger)); @@ -145,8 +141,8 @@ void QAcceptEventAction::removeTrigger(QTrigger *trigger) // This is a read-write association end Q_D(QAcceptEventAction); - if (d->triggers->contains(trigger)) { - d->triggers->remove(trigger); + if (d->triggers.contains(trigger)) { + d->triggers.remove(trigger); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(trigger)); @@ -156,7 +152,7 @@ void QAcceptEventAction::removeTrigger(QTrigger *trigger) /*! Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved. */ -const QSet<QOutputPin *> *QAcceptEventAction::results() const +const QSet<QOutputPin *> &QAcceptEventAction::results() const { // This is a read-write association end @@ -169,8 +165,8 @@ void QAcceptEventAction::addResult(QOutputPin *result) // This is a read-write association end Q_D(QAcceptEventAction); - if (!d->results->contains(result)) { - d->results->insert(result); + if (!d->results.contains(result)) { + d->results.insert(result); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); @@ -182,43 +178,14 @@ void QAcceptEventAction::removeResult(QOutputPin *result) // This is a read-write association end Q_D(QAcceptEventAction); - if (d->results->contains(result)) { - d->results->remove(result); + if (d->results.contains(result)) { + d->results.remove(result); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(result)); } } -void QAcceptEventAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *> *"); - qRegisterMetaType<QAcceptEventAction *>("QAcceptEventAction *"); - qRegisterMetaType<const QSet<QAcceptEventAction *> *>("const QSet<QAcceptEventAction *> *"); - qRegisterMetaType<const QList<QAcceptEventAction *> *>("const QList<QAcceptEventAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *>("QT_PREPEND_NAMESPACE_QTUML(QTrigger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<QTrigger *>("QTrigger *"); - qRegisterMetaType<const QSet<QTrigger *> *>("const QSet<QTrigger *> *"); - qRegisterMetaType<const QList<QTrigger *> *>("const QList<QTrigger *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qaccepteventaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaccepteventaction.h b/src/uml/qaccepteventaction.h index a2af2d63..fc8f60bc 100644 --- a/src/uml/qaccepteventaction.h +++ b/src/uml/qaccepteventaction.h @@ -66,8 +66,8 @@ class Q_UML_EXPORT QAcceptEventAction : public QAction Q_OBJECT Q_PROPERTY(bool isUnmarshall READ isUnmarshall WRITE setUnmarshall RESET unsetUnmarshall) - Q_PROPERTY(const QSet<QTrigger *> * triggers READ triggers) - Q_PROPERTY(const QSet<QOutputPin *> * results READ results) + Q_PROPERTY(QSet<QTrigger *> triggers READ triggers) + Q_PROPERTY(QSet<QOutputPin *> results READ results) Q_DISABLE_COPY(QAcceptEventAction) Q_DECLARE_PRIVATE(QAcceptEventAction) @@ -82,13 +82,12 @@ public: Q_INVOKABLE void unsetUnmarshall(); // Association ends from QAcceptEventAction - Q_INVOKABLE const QSet<QTrigger *> *triggers() const; + Q_INVOKABLE const QSet<QTrigger *> &triggers() const; Q_INVOKABLE void addTrigger(QTrigger *trigger); Q_INVOKABLE void removeTrigger(QTrigger *trigger); - Q_INVOKABLE const QSet<QOutputPin *> *results() const; + Q_INVOKABLE const QSet<QOutputPin *> &results() const; Q_INVOKABLE void addResult(QOutputPin *result); Q_INVOKABLE void removeResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QAcceptEventAction(QAcceptEventActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -96,10 +95,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAcceptEventAction) *> *) - QT_END_HEADER #endif // QTUML_QACCEPTEVENTACTION_H diff --git a/src/uml/qaccepteventaction_p.h b/src/uml/qaccepteventaction_p.h index bc3532ba..ca5a7c45 100644 --- a/src/uml/qaccepteventaction_p.h +++ b/src/uml/qaccepteventaction_p.h @@ -69,8 +69,8 @@ public: virtual ~QAcceptEventActionPrivate(); bool isUnmarshall; - QSet<QTrigger *> *triggers; - QSet<QOutputPin *> *results; + QSet<QTrigger *> triggers; + QSet<QOutputPin *> results; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaction.cpp b/src/uml/qaction.cpp index 371bf6d8..9d69b956 100644 --- a/src/uml/qaction.cpp +++ b/src/uml/qaction.cpp @@ -50,28 +50,20 @@ QT_BEGIN_NAMESPACE_QTUML QActionPrivate::QActionPrivate() : - isLocallyReentrant(false), - localPostconditions(new QSet<QConstraint *>), - localPreconditions(new QSet<QConstraint *>), - inputs(new QList<QInputPin *>), - outputs(new QList<QOutputPin *>) + isLocallyReentrant(false) { } QActionPrivate::~QActionPrivate() { - delete localPostconditions; - delete localPreconditions; - delete inputs; - delete outputs; } void QActionPrivate::addInput(QInputPin *input) { // This is a read-only derived-union association end - if (!this->inputs->contains(input)) { - this->inputs->append(input); + if (!this->inputs.contains(input)) { + this->inputs.append(input); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(input)); @@ -82,8 +74,8 @@ void QActionPrivate::removeInput(QInputPin *input) { // This is a read-only derived-union association end - if (this->inputs->contains(input)) { - this->inputs->removeAll(input); + if (this->inputs.contains(input)) { + this->inputs.removeAll(input); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(input)); @@ -94,8 +86,8 @@ void QActionPrivate::addOutput(QOutputPin *output) { // This is a read-only derived-union association end - if (!this->outputs->contains(output)) { - this->outputs->append(output); + if (!this->outputs.contains(output)) { + this->outputs.append(output); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(output)); @@ -106,8 +98,8 @@ void QActionPrivate::removeOutput(QOutputPin *output) { // This is a read-only derived-union association end - if (this->outputs->contains(output)) { - this->outputs->removeAll(output); + if (this->outputs.contains(output)) { + this->outputs.removeAll(output); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(output)); @@ -185,7 +177,7 @@ QClassifier *QAction::context() const /*! Constraint that must be satisfied when executed is completed. */ -const QSet<QConstraint *> *QAction::localPostconditions() const +const QSet<QConstraint *> &QAction::localPostconditions() const { // This is a read-write association end @@ -198,8 +190,8 @@ void QAction::addLocalPostcondition(QConstraint *localPostcondition) // This is a read-write association end Q_D(QAction); - if (!d->localPostconditions->contains(localPostcondition)) { - d->localPostconditions->insert(localPostcondition); + if (!d->localPostconditions.contains(localPostcondition)) { + d->localPostconditions.insert(localPostcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(localPostcondition)); @@ -211,8 +203,8 @@ void QAction::removeLocalPostcondition(QConstraint *localPostcondition) // This is a read-write association end Q_D(QAction); - if (d->localPostconditions->contains(localPostcondition)) { - d->localPostconditions->remove(localPostcondition); + if (d->localPostconditions.contains(localPostcondition)) { + d->localPostconditions.remove(localPostcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(localPostcondition)); @@ -222,7 +214,7 @@ void QAction::removeLocalPostcondition(QConstraint *localPostcondition) /*! Constraint that must be satisfied when execution is started. */ -const QSet<QConstraint *> *QAction::localPreconditions() const +const QSet<QConstraint *> &QAction::localPreconditions() const { // This is a read-write association end @@ -235,8 +227,8 @@ void QAction::addLocalPrecondition(QConstraint *localPrecondition) // This is a read-write association end Q_D(QAction); - if (!d->localPreconditions->contains(localPrecondition)) { - d->localPreconditions->insert(localPrecondition); + if (!d->localPreconditions.contains(localPrecondition)) { + d->localPreconditions.insert(localPrecondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(localPrecondition)); @@ -248,8 +240,8 @@ void QAction::removeLocalPrecondition(QConstraint *localPrecondition) // This is a read-write association end Q_D(QAction); - if (d->localPreconditions->contains(localPrecondition)) { - d->localPreconditions->remove(localPrecondition); + if (d->localPreconditions.contains(localPrecondition)) { + d->localPreconditions.remove(localPrecondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(localPrecondition)); @@ -259,7 +251,7 @@ void QAction::removeLocalPrecondition(QConstraint *localPrecondition) /*! The ordered set of input pins connected to the Action. These are among the total set of inputs. */ -const QList<QInputPin *> *QAction::inputs() const +const QList<QInputPin *> &QAction::inputs() const { // This is a read-only derived-union association end @@ -270,7 +262,7 @@ const QList<QInputPin *> *QAction::inputs() const /*! The ordered set of output pins connected to the Action. The action places its results onto pins in this set. */ -const QList<QOutputPin *> *QAction::outputs() const +const QList<QOutputPin *> &QAction::outputs() const { // This is a read-only derived-union association end @@ -278,49 +270,6 @@ const QList<QOutputPin *> *QAction::outputs() const return d->outputs; } -void QAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<QAction *>("QAction *"); - qRegisterMetaType<const QSet<QAction *> *>("const QSet<QAction *> *"); - qRegisterMetaType<const QList<QAction *> *>("const QList<QAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QExecutableNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaction.h b/src/uml/qaction.h index 9ec48ea1..7875824c 100644 --- a/src/uml/qaction.h +++ b/src/uml/qaction.h @@ -70,10 +70,10 @@ class Q_UML_EXPORT QAction : public QExecutableNode Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant) Q_PROPERTY(QClassifier * context READ context STORED false) - Q_PROPERTY(const QSet<QConstraint *> * localPostconditions READ localPostconditions) - Q_PROPERTY(const QSet<QConstraint *> * localPreconditions READ localPreconditions) - Q_PROPERTY(const QList<QInputPin *> * inputs READ inputs) - Q_PROPERTY(const QList<QOutputPin *> * outputs READ outputs) + 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_DISABLE_COPY(QAction) Q_DECLARE_PRIVATE(QAction) @@ -89,15 +89,14 @@ public: // Association ends from QAction Q_INVOKABLE QClassifier *context() const; - Q_INVOKABLE const QSet<QConstraint *> *localPostconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &localPostconditions() const; Q_INVOKABLE void addLocalPostcondition(QConstraint *localPostcondition); Q_INVOKABLE void removeLocalPostcondition(QConstraint *localPostcondition); - Q_INVOKABLE const QSet<QConstraint *> *localPreconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &localPreconditions() const; Q_INVOKABLE void addLocalPrecondition(QConstraint *localPrecondition); Q_INVOKABLE void removeLocalPrecondition(QConstraint *localPrecondition); - Q_INVOKABLE const QList<QInputPin *> *inputs() const; - Q_INVOKABLE const QList<QOutputPin *> *outputs() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QList<QInputPin *> &inputs() const; + Q_INVOKABLE const QList<QOutputPin *> &outputs() const; protected: explicit QAction(QActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -105,10 +104,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *) - QT_END_HEADER #endif // QTUML_QACTION_H diff --git a/src/uml/qaction_p.h b/src/uml/qaction_p.h index 9a7fac96..5fb36ca6 100644 --- a/src/uml/qaction_p.h +++ b/src/uml/qaction_p.h @@ -71,10 +71,10 @@ public: virtual ~QActionPrivate(); bool isLocallyReentrant; - QSet<QConstraint *> *localPostconditions; - QSet<QConstraint *> *localPreconditions; - QList<QInputPin *> *inputs; - QList<QOutputPin *> *outputs; + QSet<QConstraint *> localPostconditions; + QSet<QConstraint *> localPreconditions; + QList<QInputPin *> inputs; + QList<QOutputPin *> outputs; // Internal functions for read-only subsetted association ends void addInput(QInputPin *input); diff --git a/src/uml/qactionexecutionspecification.cpp b/src/uml/qactionexecutionspecification.cpp index 092f2d14..86df3d2e 100644 --- a/src/uml/qactionexecutionspecification.cpp +++ b/src/uml/qactionexecutionspecification.cpp @@ -102,28 +102,6 @@ void QActionExecutionSpecification::setAction(QAction *action) } } -void QActionExecutionSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *> *"); - qRegisterMetaType<QActionExecutionSpecification *>("QActionExecutionSpecification *"); - qRegisterMetaType<const QSet<QActionExecutionSpecification *> *>("const QSet<QActionExecutionSpecification *> *"); - qRegisterMetaType<const QList<QActionExecutionSpecification *> *>("const QList<QActionExecutionSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<QAction *>("QAction *"); - qRegisterMetaType<const QSet<QAction *> *>("const QSet<QAction *> *"); - qRegisterMetaType<const QList<QAction *> *>("const QList<QAction *> *"); - - QExecutionSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactionexecutionspecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactionexecutionspecification.h b/src/uml/qactionexecutionspecification.h index d9c5059b..f6cc70ba 100644 --- a/src/uml/qactionexecutionspecification.h +++ b/src/uml/qactionexecutionspecification.h @@ -73,7 +73,6 @@ public: // Association ends from QActionExecutionSpecification Q_INVOKABLE QAction *action() const; Q_INVOKABLE void setAction(QAction *action); - virtual void registerMetaTypes() const; protected: explicit QActionExecutionSpecification(QActionExecutionSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActionExecutionSpecification) *> *) - QT_END_HEADER #endif // QTUML_QACTIONEXECUTIONSPECIFICATION_H diff --git a/src/uml/qactioninputpin.cpp b/src/uml/qactioninputpin.cpp index 3cd3a57b..cdec825c 100644 --- a/src/uml/qactioninputpin.cpp +++ b/src/uml/qactioninputpin.cpp @@ -110,28 +110,6 @@ void QActionInputPin::setFromAction(QAction *fromAction) } } -void QActionInputPin::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *> *"); - qRegisterMetaType<QActionInputPin *>("QActionInputPin *"); - qRegisterMetaType<const QSet<QActionInputPin *> *>("const QSet<QActionInputPin *> *"); - qRegisterMetaType<const QList<QActionInputPin *> *>("const QList<QActionInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<QAction *>("QAction *"); - qRegisterMetaType<const QSet<QAction *> *>("const QSet<QAction *> *"); - qRegisterMetaType<const QList<QAction *> *>("const QList<QAction *> *"); - - QInputPin::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactioninputpin.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactioninputpin.h b/src/uml/qactioninputpin.h index a239270e..ad0c0a6c 100644 --- a/src/uml/qactioninputpin.h +++ b/src/uml/qactioninputpin.h @@ -73,7 +73,6 @@ public: // Association ends from QActionInputPin Q_INVOKABLE QAction *fromAction() const; Q_INVOKABLE void setFromAction(QAction *fromAction); - virtual void registerMetaTypes() const; protected: explicit QActionInputPin(QActionInputPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActionInputPin) *> *) - QT_END_HEADER #endif // QTUML_QACTIONINPUTPIN_H diff --git a/src/uml/qactivity.cpp b/src/uml/qactivity.cpp index 4c57a2de..16fabf46 100644 --- a/src/uml/qactivity.cpp +++ b/src/uml/qactivity.cpp @@ -53,24 +53,12 @@ QT_BEGIN_NAMESPACE_QTUML QActivityPrivate::QActivityPrivate() : isReadOnly(false), - isSingleExecution(false), - partitions(new QSet<QActivityPartition *>), - nodes(new QSet<QActivityNode *>), - variables(new QSet<QVariable *>), - structuredNodes(new QSet<QStructuredActivityNode *>), - groups(new QSet<QActivityGroup *>), - edges(new QSet<QActivityEdge *>) + isSingleExecution(false) { } QActivityPrivate::~QActivityPrivate() { - delete partitions; - delete nodes; - delete variables; - delete structuredNodes; - delete groups; - delete edges; } /*! @@ -158,7 +146,7 @@ void QActivity::unsetSingleExecution() /*! Top-level partitions in the activity. */ -const QSet<QActivityPartition *> *QActivity::partitions() const +const QSet<QActivityPartition *> &QActivity::partitions() const { // This is a read-write association end @@ -171,8 +159,8 @@ void QActivity::addPartition(QActivityPartition *partition) // This is a read-write association end Q_D(QActivity); - if (!d->partitions->contains(partition)) { - d->partitions->insert(partition); + if (!d->partitions.contains(partition)) { + d->partitions.insert(partition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivity *>(this))->addGroup(qwrappedobject_cast<QActivityGroup *>(partition)); @@ -184,8 +172,8 @@ void QActivity::removePartition(QActivityPartition *partition) // This is a read-write association end Q_D(QActivity); - if (d->partitions->contains(partition)) { - d->partitions->remove(partition); + if (d->partitions.contains(partition)) { + d->partitions.remove(partition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivity *>(this))->removeGroup(qwrappedobject_cast<QActivityGroup *>(partition)); @@ -195,7 +183,7 @@ void QActivity::removePartition(QActivityPartition *partition) /*! Nodes coordinated by the activity. */ -const QSet<QActivityNode *> *QActivity::nodes() const +const QSet<QActivityNode *> &QActivity::nodes() const { // This is a read-write association end @@ -208,8 +196,8 @@ void QActivity::addNode(QActivityNode *node) // This is a read-write association end Q_D(QActivity); - if (!d->nodes->contains(node)) { - d->nodes->insert(node); + if (!d->nodes.contains(node)) { + d->nodes.insert(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(node)); @@ -224,8 +212,8 @@ void QActivity::removeNode(QActivityNode *node) // This is a read-write association end Q_D(QActivity); - if (d->nodes->contains(node)) { - d->nodes->remove(node); + if (d->nodes.contains(node)) { + d->nodes.remove(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(node)); @@ -238,7 +226,7 @@ void QActivity::removeNode(QActivityNode *node) /*! Top-level variables in the activity. */ -const QSet<QVariable *> *QActivity::variables() const +const QSet<QVariable *> &QActivity::variables() const { // This is a read-write association end @@ -251,8 +239,8 @@ void QActivity::addVariable(QVariable *variable) // This is a read-write association end Q_D(QActivity); - if (!d->variables->contains(variable)) { - d->variables->insert(variable); + if (!d->variables.contains(variable)) { + d->variables.insert(variable); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); @@ -267,8 +255,8 @@ void QActivity::removeVariable(QVariable *variable) // This is a read-write association end Q_D(QActivity); - if (d->variables->contains(variable)) { - d->variables->remove(variable); + if (d->variables.contains(variable)) { + d->variables.remove(variable); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); @@ -281,7 +269,7 @@ void QActivity::removeVariable(QVariable *variable) /*! Top-level structured nodes in the activity. */ -const QSet<QStructuredActivityNode *> *QActivity::structuredNodes() const +const QSet<QStructuredActivityNode *> &QActivity::structuredNodes() const { // This is a read-write association end @@ -294,8 +282,8 @@ void QActivity::addStructuredNode(QStructuredActivityNode *structuredNode) // This is a read-write association end Q_D(QActivity); - if (!d->structuredNodes->contains(structuredNode)) { - d->structuredNodes->insert(structuredNode); + if (!d->structuredNodes.contains(structuredNode)) { + d->structuredNodes.insert(structuredNode); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivity *>(this))->addGroup(qwrappedobject_cast<QActivityGroup *>(structuredNode)); @@ -311,8 +299,8 @@ void QActivity::removeStructuredNode(QStructuredActivityNode *structuredNode) // This is a read-write association end Q_D(QActivity); - if (d->structuredNodes->contains(structuredNode)) { - d->structuredNodes->remove(structuredNode); + if (d->structuredNodes.contains(structuredNode)) { + d->structuredNodes.remove(structuredNode); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivity *>(this))->removeGroup(qwrappedobject_cast<QActivityGroup *>(structuredNode)); @@ -326,7 +314,7 @@ void QActivity::removeStructuredNode(QStructuredActivityNode *structuredNode) /*! Top-level groups in the activity. */ -const QSet<QActivityGroup *> *QActivity::groups() const +const QSet<QActivityGroup *> &QActivity::groups() const { // This is a read-write association end @@ -339,8 +327,8 @@ void QActivity::addGroup(QActivityGroup *group) // This is a read-write association end Q_D(QActivity); - if (!d->groups->contains(group)) { - d->groups->insert(group); + if (!d->groups.contains(group)) { + d->groups.insert(group); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(group)); @@ -355,8 +343,8 @@ void QActivity::removeGroup(QActivityGroup *group) // This is a read-write association end Q_D(QActivity); - if (d->groups->contains(group)) { - d->groups->remove(group); + if (d->groups.contains(group)) { + d->groups.remove(group); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(group)); @@ -369,7 +357,7 @@ void QActivity::removeGroup(QActivityGroup *group) /*! Edges expressing flow between nodes of the activity. */ -const QSet<QActivityEdge *> *QActivity::edges() const +const QSet<QActivityEdge *> &QActivity::edges() const { // This is a read-write association end @@ -382,8 +370,8 @@ void QActivity::addEdge(QActivityEdge *edge) // This is a read-write association end Q_D(QActivity); - if (!d->edges->contains(edge)) { - d->edges->insert(edge); + if (!d->edges.contains(edge)) { + d->edges.insert(edge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(edge)); @@ -398,8 +386,8 @@ void QActivity::removeEdge(QActivityEdge *edge) // This is a read-write association end Q_D(QActivity); - if (d->edges->contains(edge)) { - d->edges->remove(edge); + if (d->edges.contains(edge)) { + d->edges.remove(edge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(edge)); @@ -409,63 +397,6 @@ void QActivity::removeEdge(QActivityEdge *edge) } } -void QActivity::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivity) *>("QT_PREPEND_NAMESPACE_QTUML(QActivity) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<QActivity *>("QActivity *"); - qRegisterMetaType<const QSet<QActivity *> *>("const QSet<QActivity *> *"); - qRegisterMetaType<const QList<QActivity *> *>("const QList<QActivity *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *"); - qRegisterMetaType<const QSet<QStructuredActivityNode *> *>("const QSet<QStructuredActivityNode *> *"); - qRegisterMetaType<const QList<QStructuredActivityNode *> *>("const QList<QStructuredActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVariable) *>("QT_PREPEND_NAMESPACE_QTUML(QVariable) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<QVariable *>("QVariable *"); - qRegisterMetaType<const QSet<QVariable *> *>("const QSet<QVariable *> *"); - qRegisterMetaType<const QList<QVariable *> *>("const QList<QVariable *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<QActivityPartition *>("QActivityPartition *"); - qRegisterMetaType<const QSet<QActivityPartition *> *>("const QSet<QActivityPartition *> *"); - qRegisterMetaType<const QList<QActivityPartition *> *>("const QList<QActivityPartition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<QActivityGroup *>("QActivityGroup *"); - qRegisterMetaType<const QSet<QActivityGroup *> *>("const QSet<QActivityGroup *> *"); - qRegisterMetaType<const QList<QActivityGroup *> *>("const QList<QActivityGroup *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - QBehavior::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QActivity::addGroup(QWrappedObjectPointer<QActivityPartition> partition) diff --git a/src/uml/qactivity.h b/src/uml/qactivity.h index 98d574e4..a66cf72e 100644 --- a/src/uml/qactivity.h +++ b/src/uml/qactivity.h @@ -74,12 +74,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(const QSet<QActivityPartition *> * partitions READ partitions) - Q_PROPERTY(const QSet<QActivityNode *> * nodes READ nodes) - Q_PROPERTY(const QSet<QVariable *> * variables READ variables) - Q_PROPERTY(const QSet<QStructuredActivityNode *> * structuredNodes READ structuredNodes) - Q_PROPERTY(const QSet<QActivityGroup *> * groups READ groups) - Q_PROPERTY(const QSet<QActivityEdge *> * edges READ edges) + 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_DISABLE_COPY(QActivity) Q_DECLARE_PRIVATE(QActivity) @@ -97,22 +97,22 @@ public: Q_INVOKABLE void unsetSingleExecution(); // Association ends from QActivity - Q_INVOKABLE const QSet<QActivityPartition *> *partitions() const; + Q_INVOKABLE const QSet<QActivityPartition *> &partitions() const; Q_INVOKABLE void addPartition(QActivityPartition *partition); Q_INVOKABLE void removePartition(QActivityPartition *partition); - Q_INVOKABLE const QSet<QActivityNode *> *nodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &nodes() const; Q_INVOKABLE void addNode(QActivityNode *node); Q_INVOKABLE void removeNode(QActivityNode *node); - Q_INVOKABLE const QSet<QVariable *> *variables() const; + Q_INVOKABLE const QSet<QVariable *> &variables() const; Q_INVOKABLE void addVariable(QVariable *variable); Q_INVOKABLE void removeVariable(QVariable *variable); - Q_INVOKABLE const QSet<QStructuredActivityNode *> *structuredNodes() const; + Q_INVOKABLE const QSet<QStructuredActivityNode *> &structuredNodes() const; Q_INVOKABLE void addStructuredNode(QStructuredActivityNode *structuredNode); Q_INVOKABLE void removeStructuredNode(QStructuredActivityNode *structuredNode); - Q_INVOKABLE const QSet<QActivityGroup *> *groups() const; + Q_INVOKABLE const QSet<QActivityGroup *> &groups() const; Q_INVOKABLE void addGroup(QActivityGroup *group); Q_INVOKABLE void removeGroup(QActivityGroup *group); - Q_INVOKABLE const QSet<QActivityEdge *> *edges() const; + Q_INVOKABLE const QSet<QActivityEdge *> &edges() const; Q_INVOKABLE void addEdge(QActivityEdge *edge); Q_INVOKABLE void removeEdge(QActivityEdge *edge); @@ -123,7 +123,6 @@ public: Q_INVOKABLE void removeGroup(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); Q_INVOKABLE void addNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); Q_INVOKABLE void removeNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode); - virtual void registerMetaTypes() const; protected: explicit QActivity(QActivityPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -131,10 +130,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivity) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITY_H diff --git a/src/uml/qactivity_p.h b/src/uml/qactivity_p.h index acfdd4b5..9042d6b2 100644 --- a/src/uml/qactivity_p.h +++ b/src/uml/qactivity_p.h @@ -74,12 +74,12 @@ public: bool isReadOnly; bool isSingleExecution; - QSet<QActivityPartition *> *partitions; - QSet<QActivityNode *> *nodes; - QSet<QVariable *> *variables; - QSet<QStructuredActivityNode *> *structuredNodes; - QSet<QActivityGroup *> *groups; - QSet<QActivityEdge *> *edges; + QSet<QActivityPartition *> partitions; + QSet<QActivityNode *> nodes; + QSet<QVariable *> variables; + QSet<QStructuredActivityNode *> structuredNodes; + QSet<QActivityGroup *> groups; + QSet<QActivityEdge *> edges; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityedge.cpp b/src/uml/qactivityedge.cpp index 570e2711..a0b6cdd8 100644 --- a/src/uml/qactivityedge.cpp +++ b/src/uml/qactivityedge.cpp @@ -56,10 +56,7 @@ QT_BEGIN_NAMESPACE_QTUML QActivityEdgePrivate::QActivityEdgePrivate() : source(0), - redefinedEdges(new QSet<QActivityEdge *>), - inGroup(new QSet<QActivityGroup *>), guard(0), - inPartition(new QSet<QActivityPartition *>), activity(0), interrupts(0), weight(0), @@ -70,17 +67,14 @@ QActivityEdgePrivate::QActivityEdgePrivate() : QActivityEdgePrivate::~QActivityEdgePrivate() { - delete redefinedEdges; - delete inGroup; - delete inPartition; } void QActivityEdgePrivate::addInGroup(QActivityGroup *inGroup) { // This is a read-only derived-union association end - if (!this->inGroup->contains(inGroup)) { - this->inGroup->insert(inGroup); + if (!this->inGroup.contains(inGroup)) { + this->inGroup.insert(inGroup); // Adjust opposite property Q_Q(QActivityEdge); @@ -92,8 +86,8 @@ void QActivityEdgePrivate::removeInGroup(QActivityGroup *inGroup) { // This is a read-only derived-union association end - if (this->inGroup->contains(inGroup)) { - this->inGroup->remove(inGroup); + if (this->inGroup.contains(inGroup)) { + this->inGroup.remove(inGroup); // Adjust opposite property Q_Q(QActivityEdge); @@ -160,7 +154,7 @@ void QActivityEdge::setSource(QActivityNode *source) /*! Inherited edges replaced by this edge in a specialization of the activity. */ -const QSet<QActivityEdge *> *QActivityEdge::redefinedEdges() const +const QSet<QActivityEdge *> &QActivityEdge::redefinedEdges() const { // This is a read-write association end @@ -173,8 +167,8 @@ void QActivityEdge::addRedefinedEdge(QActivityEdge *redefinedEdge) // This is a read-write association end Q_D(QActivityEdge); - if (!d->redefinedEdges->contains(redefinedEdge)) { - d->redefinedEdges->insert(redefinedEdge); + if (!d->redefinedEdges.contains(redefinedEdge)) { + d->redefinedEdges.insert(redefinedEdge); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedEdge)); @@ -186,8 +180,8 @@ void QActivityEdge::removeRedefinedEdge(QActivityEdge *redefinedEdge) // This is a read-write association end Q_D(QActivityEdge); - if (d->redefinedEdges->contains(redefinedEdge)) { - d->redefinedEdges->remove(redefinedEdge); + if (d->redefinedEdges.contains(redefinedEdge)) { + d->redefinedEdges.remove(redefinedEdge); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedEdge)); @@ -197,7 +191,7 @@ void QActivityEdge::removeRedefinedEdge(QActivityEdge *redefinedEdge) /*! Groups containing the edge. */ -const QSet<QActivityGroup *> *QActivityEdge::inGroup() const +const QSet<QActivityGroup *> &QActivityEdge::inGroup() const { // This is a read-only derived-union association end @@ -237,7 +231,7 @@ void QActivityEdge::setGuard(QValueSpecification *guard) /*! Partitions containing the edge. */ -const QSet<QActivityPartition *> *QActivityEdge::inPartition() const +const QSet<QActivityPartition *> &QActivityEdge::inPartition() const { // This is a read-write association end @@ -250,8 +244,8 @@ void QActivityEdge::addInPartition(QActivityPartition *inPartition) // This is a read-write association end Q_D(QActivityEdge); - if (!d->inPartition->contains(inPartition)) { - d->inPartition->insert(inPartition); + if (!d->inPartition.contains(inPartition)) { + d->inPartition.insert(inPartition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityEdgePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); @@ -266,8 +260,8 @@ void QActivityEdge::removeInPartition(QActivityPartition *inPartition) // This is a read-write association end Q_D(QActivityEdge); - if (d->inPartition->contains(inPartition)) { - d->inPartition->remove(inPartition); + if (d->inPartition.contains(inPartition)) { + d->inPartition.remove(inPartition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityEdgePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); @@ -435,70 +429,6 @@ void QActivityEdge::setTarget(QActivityNode *target) } } -void QActivityEdge::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *"); - qRegisterMetaType<QInterruptibleActivityRegion *>("QInterruptibleActivityRegion *"); - qRegisterMetaType<const QSet<QInterruptibleActivityRegion *> *>("const QSet<QInterruptibleActivityRegion *> *"); - qRegisterMetaType<const QList<QInterruptibleActivityRegion *> *>("const QList<QInterruptibleActivityRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *"); - qRegisterMetaType<const QSet<QStructuredActivityNode *> *>("const QSet<QStructuredActivityNode *> *"); - qRegisterMetaType<const QList<QStructuredActivityNode *> *>("const QList<QStructuredActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<QActivityPartition *>("QActivityPartition *"); - qRegisterMetaType<const QSet<QActivityPartition *> *>("const QSet<QActivityPartition *> *"); - qRegisterMetaType<const QList<QActivityPartition *> *>("const QList<QActivityPartition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivity) *>("QT_PREPEND_NAMESPACE_QTUML(QActivity) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<QActivity *>("QActivity *"); - qRegisterMetaType<const QSet<QActivity *> *>("const QSet<QActivity *> *"); - qRegisterMetaType<const QList<QActivity *> *>("const QList<QActivity *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<QActivityGroup *>("QActivityGroup *"); - qRegisterMetaType<const QSet<QActivityGroup *> *>("const QSet<QActivityGroup *> *"); - qRegisterMetaType<const QList<QActivityGroup *> *>("const QList<QActivityGroup *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QRedefinableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactivityedge.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityedge.h b/src/uml/qactivityedge.h index e4f73271..0164905a 100644 --- a/src/uml/qactivityedge.h +++ b/src/uml/qactivityedge.h @@ -71,10 +71,10 @@ class Q_UML_EXPORT QActivityEdge : public QRedefinableElement Q_OBJECT Q_PROPERTY(QActivityNode * source READ source WRITE setSource) - Q_PROPERTY(const QSet<QActivityEdge *> * redefinedEdges READ redefinedEdges) - Q_PROPERTY(const QSet<QActivityGroup *> * inGroup READ inGroup) + Q_PROPERTY(QSet<QActivityEdge *> redefinedEdges READ redefinedEdges) + Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) Q_PROPERTY(QValueSpecification * guard READ guard WRITE setGuard) - Q_PROPERTY(const QSet<QActivityPartition *> * inPartition READ inPartition) + 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) @@ -91,13 +91,13 @@ public: // Association ends from QActivityEdge Q_INVOKABLE QActivityNode *source() const; Q_INVOKABLE void setSource(QActivityNode *source); - Q_INVOKABLE const QSet<QActivityEdge *> *redefinedEdges() const; + Q_INVOKABLE const QSet<QActivityEdge *> &redefinedEdges() const; Q_INVOKABLE void addRedefinedEdge(QActivityEdge *redefinedEdge); Q_INVOKABLE void removeRedefinedEdge(QActivityEdge *redefinedEdge); - Q_INVOKABLE const QSet<QActivityGroup *> *inGroup() const; + Q_INVOKABLE const QSet<QActivityGroup *> &inGroup() const; Q_INVOKABLE QValueSpecification *guard() const; Q_INVOKABLE void setGuard(QValueSpecification *guard); - Q_INVOKABLE const QSet<QActivityPartition *> *inPartition() const; + Q_INVOKABLE const QSet<QActivityPartition *> &inPartition() const; Q_INVOKABLE void addInPartition(QActivityPartition *inPartition); Q_INVOKABLE void removeInPartition(QActivityPartition *inPartition); Q_INVOKABLE QActivity *activity() const; @@ -110,7 +110,6 @@ public: Q_INVOKABLE void setInStructuredNode(QStructuredActivityNode *inStructuredNode); Q_INVOKABLE QActivityNode *target() const; Q_INVOKABLE void setTarget(QActivityNode *target); - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QActivityGroupPrivate; @@ -121,10 +120,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYEDGE_H diff --git a/src/uml/qactivityedge_p.h b/src/uml/qactivityedge_p.h index 677b6fb9..d8142d3f 100644 --- a/src/uml/qactivityedge_p.h +++ b/src/uml/qactivityedge_p.h @@ -74,10 +74,10 @@ public: virtual ~QActivityEdgePrivate(); QActivityNode *source; - QSet<QActivityEdge *> *redefinedEdges; - QSet<QActivityGroup *> *inGroup; + QSet<QActivityEdge *> redefinedEdges; + QSet<QActivityGroup *> inGroup; QValueSpecification *guard; - QSet<QActivityPartition *> *inPartition; + QSet<QActivityPartition *> inPartition; QActivity *activity; QInterruptibleActivityRegion *interrupts; QValueSpecification *weight; diff --git a/src/uml/qactivityfinalnode.cpp b/src/uml/qactivityfinalnode.cpp index 3063191d..51ca959f 100644 --- a/src/uml/qactivityfinalnode.cpp +++ b/src/uml/qactivityfinalnode.cpp @@ -74,21 +74,6 @@ QActivityFinalNode::~QActivityFinalNode() { } -void QActivityFinalNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *> *"); - qRegisterMetaType<QActivityFinalNode *>("QActivityFinalNode *"); - qRegisterMetaType<const QSet<QActivityFinalNode *> *>("const QSet<QActivityFinalNode *> *"); - qRegisterMetaType<const QList<QActivityFinalNode *> *>("const QList<QActivityFinalNode *> *"); - - QFinalNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactivityfinalnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityfinalnode.h b/src/uml/qactivityfinalnode.h index dd415b87..4f69ed03 100644 --- a/src/uml/qactivityfinalnode.h +++ b/src/uml/qactivityfinalnode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QActivityFinalNode : public QFinalNode public: Q_INVOKABLE explicit QActivityFinalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActivityFinalNode(); - virtual void registerMetaTypes() const; protected: explicit QActivityFinalNode(QActivityFinalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityFinalNode) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYFINALNODE_H diff --git a/src/uml/qactivitygroup.cpp b/src/uml/qactivitygroup.cpp index 06376635..5f717aa7 100644 --- a/src/uml/qactivitygroup.cpp +++ b/src/uml/qactivitygroup.cpp @@ -53,26 +53,20 @@ QT_BEGIN_NAMESPACE_QTUML QActivityGroupPrivate::QActivityGroupPrivate() : inActivity(0), - containedNodes(new QSet<QActivityNode *>), - subgroups(new QSet<QActivityGroup *>), - containedEdges(new QSet<QActivityEdge *>), superGroup(0) { } QActivityGroupPrivate::~QActivityGroupPrivate() { - delete containedNodes; - delete subgroups; - delete containedEdges; } void QActivityGroupPrivate::addContainedNode(QActivityNode *containedNode) { // This is a read-only derived-union association end - if (!this->containedNodes->contains(containedNode)) { - this->containedNodes->insert(containedNode); + if (!this->containedNodes.contains(containedNode)) { + this->containedNodes.insert(containedNode); // Adjust opposite property Q_Q(QActivityGroup); @@ -84,8 +78,8 @@ void QActivityGroupPrivate::removeContainedNode(QActivityNode *containedNode) { // This is a read-only derived-union association end - if (this->containedNodes->contains(containedNode)) { - this->containedNodes->remove(containedNode); + if (this->containedNodes.contains(containedNode)) { + this->containedNodes.remove(containedNode); // Adjust opposite property Q_Q(QActivityGroup); @@ -98,8 +92,8 @@ void QActivityGroupPrivate::addSubgroup(QActivityGroup *subgroup) { // This is a read-only derived-union association end - if (!this->subgroups->contains(subgroup)) { - this->subgroups->insert(subgroup); + if (!this->subgroups.contains(subgroup)) { + this->subgroups.insert(subgroup); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(subgroup)); @@ -114,8 +108,8 @@ void QActivityGroupPrivate::removeSubgroup(QActivityGroup *subgroup) { // This is a read-only derived-union association end - if (this->subgroups->contains(subgroup)) { - this->subgroups->remove(subgroup); + if (this->subgroups.contains(subgroup)) { + this->subgroups.remove(subgroup); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(subgroup)); @@ -129,8 +123,8 @@ void QActivityGroupPrivate::addContainedEdge(QActivityEdge *containedEdge) { // This is a read-only derived-union association end - if (!this->containedEdges->contains(containedEdge)) { - this->containedEdges->insert(containedEdge); + if (!this->containedEdges.contains(containedEdge)) { + this->containedEdges.insert(containedEdge); // Adjust opposite property Q_Q(QActivityGroup); @@ -142,8 +136,8 @@ void QActivityGroupPrivate::removeContainedEdge(QActivityEdge *containedEdge) { // This is a read-only derived-union association end - if (this->containedEdges->contains(containedEdge)) { - this->containedEdges->remove(containedEdge); + if (this->containedEdges.contains(containedEdge)) { + this->containedEdges.remove(containedEdge); // Adjust opposite property Q_Q(QActivityGroup); @@ -234,7 +228,7 @@ void QActivityGroup::setInActivity(QActivity *inActivity) /*! Nodes immediately contained in the group. */ -const QSet<QActivityNode *> *QActivityGroup::containedNodes() const +const QSet<QActivityNode *> &QActivityGroup::containedNodes() const { // This is a read-only derived-union association end @@ -245,7 +239,7 @@ const QSet<QActivityNode *> *QActivityGroup::containedNodes() const /*! Groups immediately contained in the group. */ -const QSet<QActivityGroup *> *QActivityGroup::subgroups() const +const QSet<QActivityGroup *> &QActivityGroup::subgroups() const { // This is a read-only derived-union association end @@ -256,7 +250,7 @@ const QSet<QActivityGroup *> *QActivityGroup::subgroups() const /*! Edges immediately contained in the group. */ -const QSet<QActivityEdge *> *QActivityGroup::containedEdges() const +const QSet<QActivityEdge *> &QActivityGroup::containedEdges() const { // This is a read-only derived-union association end @@ -275,42 +269,6 @@ QActivityGroup *QActivityGroup::superGroup() const return d->superGroup; } -void QActivityGroup::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<QActivityGroup *>("QActivityGroup *"); - qRegisterMetaType<const QSet<QActivityGroup *> *>("const QSet<QActivityGroup *> *"); - qRegisterMetaType<const QList<QActivityGroup *> *>("const QList<QActivityGroup *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivity) *>("QT_PREPEND_NAMESPACE_QTUML(QActivity) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<QActivity *>("QActivity *"); - qRegisterMetaType<const QSet<QActivity *> *>("const QSet<QActivity *> *"); - qRegisterMetaType<const QList<QActivity *> *>("const QList<QActivity *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactivitygroup.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivitygroup.h b/src/uml/qactivitygroup.h index e3eb465e..b51fdc6b 100644 --- a/src/uml/qactivitygroup.h +++ b/src/uml/qactivitygroup.h @@ -67,9 +67,9 @@ class Q_UML_EXPORT QActivityGroup : public QNamedElement Q_OBJECT Q_PROPERTY(QActivity * inActivity READ inActivity WRITE setInActivity) - Q_PROPERTY(const QSet<QActivityNode *> * containedNodes READ containedNodes) - Q_PROPERTY(const QSet<QActivityGroup *> * subgroups READ subgroups) - Q_PROPERTY(const QSet<QActivityEdge *> * containedEdges READ containedEdges) + 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_DISABLE_COPY(QActivityGroup) @@ -82,11 +82,10 @@ public: // Association ends from QActivityGroup Q_INVOKABLE QActivity *inActivity() const; Q_INVOKABLE void setInActivity(QActivity *inActivity); - Q_INVOKABLE const QSet<QActivityNode *> *containedNodes() const; - Q_INVOKABLE const QSet<QActivityGroup *> *subgroups() const; - Q_INVOKABLE const QSet<QActivityEdge *> *containedEdges() const; + Q_INVOKABLE const QSet<QActivityNode *> &containedNodes() const; + Q_INVOKABLE const QSet<QActivityGroup *> &subgroups() const; + Q_INVOKABLE const QSet<QActivityEdge *> &containedEdges() const; Q_INVOKABLE QActivityGroup *superGroup() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QActivityEdgePrivate; @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYGROUP_H diff --git a/src/uml/qactivitygroup_p.h b/src/uml/qactivitygroup_p.h index 34d839e6..0f02eb12 100644 --- a/src/uml/qactivitygroup_p.h +++ b/src/uml/qactivitygroup_p.h @@ -70,9 +70,9 @@ public: virtual ~QActivityGroupPrivate(); QActivity *inActivity; - QSet<QActivityNode *> *containedNodes; - QSet<QActivityGroup *> *subgroups; - QSet<QActivityEdge *> *containedEdges; + QSet<QActivityNode *> containedNodes; + QSet<QActivityGroup *> subgroups; + QSet<QActivityEdge *> containedEdges; QActivityGroup *superGroup; // Internal functions for read-only subsetted association ends diff --git a/src/uml/qactivitynode.cpp b/src/uml/qactivitynode.cpp index e0006e7e..f2cbebc3 100644 --- a/src/uml/qactivitynode.cpp +++ b/src/uml/qactivitynode.cpp @@ -54,33 +54,21 @@ QT_BEGIN_NAMESPACE_QTUML QActivityNodePrivate::QActivityNodePrivate() : - redefinedNodes(new QSet<QActivityNode *>), - incomings(new QSet<QActivityEdge *>), activity(0), - inGroup(new QSet<QActivityGroup *>), - inStructuredNode(0), - inPartition(new QSet<QActivityPartition *>), - inInterruptibleRegion(new QSet<QInterruptibleActivityRegion *>), - outgoings(new QSet<QActivityEdge *>) + inStructuredNode(0) { } QActivityNodePrivate::~QActivityNodePrivate() { - delete redefinedNodes; - delete incomings; - delete inGroup; - delete inPartition; - delete inInterruptibleRegion; - delete outgoings; } void QActivityNodePrivate::addInGroup(QActivityGroup *inGroup) { // This is a read-only derived-union association end - if (!this->inGroup->contains(inGroup)) { - this->inGroup->insert(inGroup); + if (!this->inGroup.contains(inGroup)) { + this->inGroup.insert(inGroup); // Adjust opposite property Q_Q(QActivityNode); @@ -92,8 +80,8 @@ void QActivityNodePrivate::removeInGroup(QActivityGroup *inGroup) { // This is a read-only derived-union association end - if (this->inGroup->contains(inGroup)) { - this->inGroup->remove(inGroup); + if (this->inGroup.contains(inGroup)) { + this->inGroup.remove(inGroup); // Adjust opposite property Q_Q(QActivityNode); @@ -131,7 +119,7 @@ QActivityNode::~QActivityNode() /*! Inherited nodes replaced by this node in a specialization of the activity. */ -const QSet<QActivityNode *> *QActivityNode::redefinedNodes() const +const QSet<QActivityNode *> &QActivityNode::redefinedNodes() const { // This is a read-write association end @@ -144,8 +132,8 @@ void QActivityNode::addRedefinedNode(QActivityNode *redefinedNode) // This is a read-write association end Q_D(QActivityNode); - if (!d->redefinedNodes->contains(redefinedNode)) { - d->redefinedNodes->insert(redefinedNode); + if (!d->redefinedNodes.contains(redefinedNode)) { + d->redefinedNodes.insert(redefinedNode); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedNode)); @@ -157,8 +145,8 @@ void QActivityNode::removeRedefinedNode(QActivityNode *redefinedNode) // This is a read-write association end Q_D(QActivityNode); - if (d->redefinedNodes->contains(redefinedNode)) { - d->redefinedNodes->remove(redefinedNode); + if (d->redefinedNodes.contains(redefinedNode)) { + d->redefinedNodes.remove(redefinedNode); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedNode)); @@ -168,7 +156,7 @@ void QActivityNode::removeRedefinedNode(QActivityNode *redefinedNode) /*! Edges that have the node as target. */ -const QSet<QActivityEdge *> *QActivityNode::incomings() const +const QSet<QActivityEdge *> &QActivityNode::incomings() const { // This is a read-write association end @@ -181,8 +169,8 @@ void QActivityNode::addIncoming(QActivityEdge *incoming) // This is a read-write association end Q_D(QActivityNode); - if (!d->incomings->contains(incoming)) { - d->incomings->insert(incoming); + if (!d->incomings.contains(incoming)) { + d->incomings.insert(incoming); // Adjust opposite property incoming->setTarget(this); @@ -194,8 +182,8 @@ void QActivityNode::removeIncoming(QActivityEdge *incoming) // This is a read-write association end Q_D(QActivityNode); - if (d->incomings->contains(incoming)) { - d->incomings->remove(incoming); + if (d->incomings.contains(incoming)) { + d->incomings.remove(incoming); // Adjust opposite property incoming->setTarget(0); @@ -237,7 +225,7 @@ void QActivityNode::setActivity(QActivity *activity) /*! Groups containing the node. */ -const QSet<QActivityGroup *> *QActivityNode::inGroup() const +const QSet<QActivityGroup *> &QActivityNode::inGroup() const { // This is a read-only derived-union association end @@ -286,7 +274,7 @@ void QActivityNode::setInStructuredNode(QStructuredActivityNode *inStructuredNod /*! Partitions containing the node. */ -const QSet<QActivityPartition *> *QActivityNode::inPartition() const +const QSet<QActivityPartition *> &QActivityNode::inPartition() const { // This is a read-write association end @@ -299,8 +287,8 @@ void QActivityNode::addInPartition(QActivityPartition *inPartition) // This is a read-write association end Q_D(QActivityNode); - if (!d->inPartition->contains(inPartition)) { - d->inPartition->insert(inPartition); + if (!d->inPartition.contains(inPartition)) { + d->inPartition.insert(inPartition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityNodePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); @@ -315,8 +303,8 @@ void QActivityNode::removeInPartition(QActivityPartition *inPartition) // This is a read-write association end Q_D(QActivityNode); - if (d->inPartition->contains(inPartition)) { - d->inPartition->remove(inPartition); + if (d->inPartition.contains(inPartition)) { + d->inPartition.remove(inPartition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(inPartition)); @@ -330,7 +318,7 @@ void QActivityNode::removeInPartition(QActivityPartition *inPartition) /*! Interruptible regions containing the node. */ -const QSet<QInterruptibleActivityRegion *> *QActivityNode::inInterruptibleRegion() const +const QSet<QInterruptibleActivityRegion *> &QActivityNode::inInterruptibleRegion() const { // This is a read-write association end @@ -343,8 +331,8 @@ void QActivityNode::addInInterruptibleRegion(QInterruptibleActivityRegion *inInt // This is a read-write association end Q_D(QActivityNode); - if (!d->inInterruptibleRegion->contains(inInterruptibleRegion)) { - d->inInterruptibleRegion->insert(inInterruptibleRegion); + if (!d->inInterruptibleRegion.contains(inInterruptibleRegion)) { + d->inInterruptibleRegion.insert(inInterruptibleRegion); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityNodePrivate *>(d))->addInGroup(qwrappedobject_cast<QActivityGroup *>(inInterruptibleRegion)); @@ -359,8 +347,8 @@ void QActivityNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *in // This is a read-write association end Q_D(QActivityNode); - if (d->inInterruptibleRegion->contains(inInterruptibleRegion)) { - d->inInterruptibleRegion->remove(inInterruptibleRegion); + if (d->inInterruptibleRegion.contains(inInterruptibleRegion)) { + d->inInterruptibleRegion.remove(inInterruptibleRegion); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityNodePrivate *>(d))->removeInGroup(qwrappedobject_cast<QActivityGroup *>(inInterruptibleRegion)); @@ -374,7 +362,7 @@ void QActivityNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *in /*! Edges that have the node as source. */ -const QSet<QActivityEdge *> *QActivityNode::outgoings() const +const QSet<QActivityEdge *> &QActivityNode::outgoings() const { // This is a read-write association end @@ -387,8 +375,8 @@ void QActivityNode::addOutgoing(QActivityEdge *outgoing) // This is a read-write association end Q_D(QActivityNode); - if (!d->outgoings->contains(outgoing)) { - d->outgoings->insert(outgoing); + if (!d->outgoings.contains(outgoing)) { + d->outgoings.insert(outgoing); // Adjust opposite property outgoing->setSource(this); @@ -400,71 +388,14 @@ void QActivityNode::removeOutgoing(QActivityEdge *outgoing) // This is a read-write association end Q_D(QActivityNode); - if (d->outgoings->contains(outgoing)) { - d->outgoings->remove(outgoing); + if (d->outgoings.contains(outgoing)) { + d->outgoings.remove(outgoing); // Adjust opposite property outgoing->setSource(0); } } -void QActivityNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *"); - qRegisterMetaType<const QSet<QStructuredActivityNode *> *>("const QSet<QStructuredActivityNode *> *"); - qRegisterMetaType<const QList<QStructuredActivityNode *> *>("const QList<QStructuredActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<QActivityPartition *>("QActivityPartition *"); - qRegisterMetaType<const QSet<QActivityPartition *> *>("const QSet<QActivityPartition *> *"); - qRegisterMetaType<const QList<QActivityPartition *> *>("const QList<QActivityPartition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *"); - qRegisterMetaType<QActivityGroup *>("QActivityGroup *"); - qRegisterMetaType<const QSet<QActivityGroup *> *>("const QSet<QActivityGroup *> *"); - qRegisterMetaType<const QList<QActivityGroup *> *>("const QList<QActivityGroup *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivity) *>("QT_PREPEND_NAMESPACE_QTUML(QActivity) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<QActivity *>("QActivity *"); - qRegisterMetaType<const QSet<QActivity *> *>("const QSet<QActivity *> *"); - qRegisterMetaType<const QList<QActivity *> *>("const QList<QActivity *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *"); - qRegisterMetaType<QInterruptibleActivityRegion *>("QInterruptibleActivityRegion *"); - qRegisterMetaType<const QSet<QInterruptibleActivityRegion *> *>("const QSet<QInterruptibleActivityRegion *> *"); - qRegisterMetaType<const QList<QInterruptibleActivityRegion *> *>("const QList<QInterruptibleActivityRegion *> *"); - - QRedefinableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactivitynode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivitynode.h b/src/uml/qactivitynode.h index 954c48b3..bd053b17 100644 --- a/src/uml/qactivitynode.h +++ b/src/uml/qactivitynode.h @@ -69,14 +69,14 @@ class Q_UML_EXPORT QActivityNode : public QRedefinableElement { Q_OBJECT - Q_PROPERTY(const QSet<QActivityNode *> * redefinedNodes READ redefinedNodes) - Q_PROPERTY(const QSet<QActivityEdge *> * incomings READ incomings) + Q_PROPERTY(QSet<QActivityNode *> redefinedNodes READ redefinedNodes) + Q_PROPERTY(QSet<QActivityEdge *> incomings READ incomings) Q_PROPERTY(QActivity * activity READ activity WRITE setActivity) - Q_PROPERTY(const QSet<QActivityGroup *> * inGroup READ inGroup) + Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) Q_PROPERTY(QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) - Q_PROPERTY(const QSet<QActivityPartition *> * inPartition READ inPartition) - Q_PROPERTY(const QSet<QInterruptibleActivityRegion *> * inInterruptibleRegion READ inInterruptibleRegion) - Q_PROPERTY(const QSet<QActivityEdge *> * outgoings READ outgoings) + Q_PROPERTY(QSet<QActivityPartition *> inPartition READ inPartition) + Q_PROPERTY(QSet<QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) + Q_PROPERTY(QSet<QActivityEdge *> outgoings READ outgoings) Q_DISABLE_COPY(QActivityNode) Q_DECLARE_PRIVATE(QActivityNode) @@ -86,27 +86,26 @@ public: virtual ~QActivityNode(); // Association ends from QActivityNode - Q_INVOKABLE const QSet<QActivityNode *> *redefinedNodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &redefinedNodes() const; Q_INVOKABLE void addRedefinedNode(QActivityNode *redefinedNode); Q_INVOKABLE void removeRedefinedNode(QActivityNode *redefinedNode); - Q_INVOKABLE const QSet<QActivityEdge *> *incomings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &incomings() const; Q_INVOKABLE void addIncoming(QActivityEdge *incoming); Q_INVOKABLE void removeIncoming(QActivityEdge *incoming); Q_INVOKABLE QActivity *activity() const; Q_INVOKABLE void setActivity(QActivity *activity); - Q_INVOKABLE const QSet<QActivityGroup *> *inGroup() const; + Q_INVOKABLE const QSet<QActivityGroup *> &inGroup() const; Q_INVOKABLE QStructuredActivityNode *inStructuredNode() const; Q_INVOKABLE void setInStructuredNode(QStructuredActivityNode *inStructuredNode); - Q_INVOKABLE const QSet<QActivityPartition *> *inPartition() const; + Q_INVOKABLE const QSet<QActivityPartition *> &inPartition() const; Q_INVOKABLE void addInPartition(QActivityPartition *inPartition); Q_INVOKABLE void removeInPartition(QActivityPartition *inPartition); - Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> *inInterruptibleRegion() const; + Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> &inInterruptibleRegion() const; Q_INVOKABLE void addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); Q_INVOKABLE void removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); - Q_INVOKABLE const QSet<QActivityEdge *> *outgoings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &outgoings() const; Q_INVOKABLE void addOutgoing(QActivityEdge *outgoing); Q_INVOKABLE void removeOutgoing(QActivityEdge *outgoing); - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QActivityGroupPrivate; @@ -117,10 +116,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYNODE_H diff --git a/src/uml/qactivitynode_p.h b/src/uml/qactivitynode_p.h index b7fe8aaa..f4e41b8d 100644 --- a/src/uml/qactivitynode_p.h +++ b/src/uml/qactivitynode_p.h @@ -72,14 +72,14 @@ public: explicit QActivityNodePrivate(); virtual ~QActivityNodePrivate(); - QSet<QActivityNode *> *redefinedNodes; - QSet<QActivityEdge *> *incomings; + QSet<QActivityNode *> redefinedNodes; + QSet<QActivityEdge *> incomings; QActivity *activity; - QSet<QActivityGroup *> *inGroup; + QSet<QActivityGroup *> inGroup; QStructuredActivityNode *inStructuredNode; - QSet<QActivityPartition *> *inPartition; - QSet<QInterruptibleActivityRegion *> *inInterruptibleRegion; - QSet<QActivityEdge *> *outgoings; + QSet<QActivityPartition *> inPartition; + QSet<QInterruptibleActivityRegion *> inInterruptibleRegion; + QSet<QActivityEdge *> outgoings; // Internal functions for read-only subsetted association ends void addInGroup(QActivityGroup *inGroup); diff --git a/src/uml/qactivityparameternode.cpp b/src/uml/qactivityparameternode.cpp index 2b123851..92a32fc2 100644 --- a/src/uml/qactivityparameternode.cpp +++ b/src/uml/qactivityparameternode.cpp @@ -102,28 +102,6 @@ void QActivityParameterNode::setParameter(QParameter *parameter) } } -void QActivityParameterNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *> *"); - qRegisterMetaType<QActivityParameterNode *>("QActivityParameterNode *"); - qRegisterMetaType<const QSet<QActivityParameterNode *> *>("const QSet<QActivityParameterNode *> *"); - qRegisterMetaType<const QList<QActivityParameterNode *> *>("const QList<QActivityParameterNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - QObjectNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactivityparameternode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivityparameternode.h b/src/uml/qactivityparameternode.h index 016ca9b2..380c0852 100644 --- a/src/uml/qactivityparameternode.h +++ b/src/uml/qactivityparameternode.h @@ -73,7 +73,6 @@ public: // Association ends from QActivityParameterNode Q_INVOKABLE QParameter *parameter() const; Q_INVOKABLE void setParameter(QParameter *parameter); - virtual void registerMetaTypes() const; protected: explicit QActivityParameterNode(QActivityParameterNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityParameterNode) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYPARAMETERNODE_H diff --git a/src/uml/qactivitypartition.cpp b/src/uml/qactivitypartition.cpp index b04ef47e..93bb30e5 100644 --- a/src/uml/qactivitypartition.cpp +++ b/src/uml/qactivitypartition.cpp @@ -52,18 +52,12 @@ QActivityPartitionPrivate::QActivityPartitionPrivate() : isDimension(false), isExternal(false), represents(0), - subpartitions(new QSet<QActivityPartition *>), - superPartition(0), - nodes(new QSet<QActivityNode *>), - edges(new QSet<QActivityEdge *>) + superPartition(0) { } QActivityPartitionPrivate::~QActivityPartitionPrivate() { - delete subpartitions; - delete nodes; - delete edges; } /*! @@ -172,7 +166,7 @@ void QActivityPartition::setRepresents(QElement *represents) /*! Partitions immediately contained in the partition. */ -const QSet<QActivityPartition *> *QActivityPartition::subpartitions() const +const QSet<QActivityPartition *> &QActivityPartition::subpartitions() const { // This is a read-write association end @@ -185,8 +179,8 @@ void QActivityPartition::addSubpartition(QActivityPartition *subpartition) // This is a read-write association end Q_D(QActivityPartition); - if (!d->subpartitions->contains(subpartition)) { - d->subpartitions->insert(subpartition); + if (!d->subpartitions.contains(subpartition)) { + d->subpartitions.insert(subpartition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addSubgroup(qwrappedobject_cast<QActivityGroup *>(subpartition)); @@ -201,8 +195,8 @@ void QActivityPartition::removeSubpartition(QActivityPartition *subpartition) // This is a read-write association end Q_D(QActivityPartition); - if (d->subpartitions->contains(subpartition)) { - d->subpartitions->remove(subpartition); + if (d->subpartitions.contains(subpartition)) { + d->subpartitions.remove(subpartition); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeSubgroup(qwrappedobject_cast<QActivityGroup *>(subpartition)); @@ -247,7 +241,7 @@ void QActivityPartition::setSuperPartition(QActivityPartition *superPartition) /*! Nodes immediately contained in the group. */ -const QSet<QActivityNode *> *QActivityPartition::nodes() const +const QSet<QActivityNode *> &QActivityPartition::nodes() const { // This is a read-write association end @@ -260,8 +254,8 @@ void QActivityPartition::addNode(QActivityNode *node) // This is a read-write association end Q_D(QActivityPartition); - if (!d->nodes->contains(node)) { - d->nodes->insert(node); + if (!d->nodes.contains(node)) { + d->nodes.insert(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qwrappedobject_cast<QActivityNode *>(node)); @@ -276,8 +270,8 @@ void QActivityPartition::removeNode(QActivityNode *node) // This is a read-write association end Q_D(QActivityPartition); - if (d->nodes->contains(node)) { - d->nodes->remove(node); + if (d->nodes.contains(node)) { + d->nodes.remove(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qwrappedobject_cast<QActivityNode *>(node)); @@ -291,7 +285,7 @@ void QActivityPartition::removeNode(QActivityNode *node) /*! Edges immediately contained in the group. */ -const QSet<QActivityEdge *> *QActivityPartition::edges() const +const QSet<QActivityEdge *> &QActivityPartition::edges() const { // This is a read-write association end @@ -304,8 +298,8 @@ void QActivityPartition::addEdge(QActivityEdge *edge) // This is a read-write association end Q_D(QActivityPartition); - if (!d->edges->contains(edge)) { - d->edges->insert(edge); + if (!d->edges.contains(edge)) { + d->edges.insert(edge); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); @@ -320,8 +314,8 @@ void QActivityPartition::removeEdge(QActivityEdge *edge) // This is a read-write association end Q_D(QActivityPartition); - if (d->edges->contains(edge)) { - d->edges->remove(edge); + if (d->edges.contains(edge)) { + d->edges.remove(edge); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); @@ -332,42 +326,6 @@ void QActivityPartition::removeEdge(QActivityEdge *edge) } } -void QActivityPartition::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *"); - qRegisterMetaType<QActivityPartition *>("QActivityPartition *"); - qRegisterMetaType<const QSet<QActivityPartition *> *>("const QSet<QActivityPartition *> *"); - qRegisterMetaType<const QList<QActivityPartition *> *>("const QList<QActivityPartition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElement) *>("QT_PREPEND_NAMESPACE_QTUML(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - QActivityGroup::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactivitypartition.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactivitypartition.h b/src/uml/qactivitypartition.h index d0af9255..53c5e692 100644 --- a/src/uml/qactivitypartition.h +++ b/src/uml/qactivitypartition.h @@ -69,10 +69,10 @@ 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(const QSet<QActivityPartition *> * subpartitions READ subpartitions) + Q_PROPERTY(QSet<QActivityPartition *> subpartitions READ subpartitions) Q_PROPERTY(QActivityPartition * superPartition READ superPartition WRITE setSuperPartition) - Q_PROPERTY(const QSet<QActivityNode *> * nodes READ nodes) - Q_PROPERTY(const QSet<QActivityEdge *> * edges READ edges) + Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) + Q_PROPERTY(QSet<QActivityEdge *> edges READ edges) Q_DISABLE_COPY(QActivityPartition) Q_DECLARE_PRIVATE(QActivityPartition) @@ -92,18 +92,17 @@ public: // Association ends from QActivityPartition Q_INVOKABLE QElement *represents() const; Q_INVOKABLE void setRepresents(QElement *represents); - Q_INVOKABLE const QSet<QActivityPartition *> *subpartitions() const; + Q_INVOKABLE const QSet<QActivityPartition *> &subpartitions() const; Q_INVOKABLE void addSubpartition(QActivityPartition *subpartition); Q_INVOKABLE void removeSubpartition(QActivityPartition *subpartition); Q_INVOKABLE QActivityPartition *superPartition() const; Q_INVOKABLE void setSuperPartition(QActivityPartition *superPartition); - Q_INVOKABLE const QSet<QActivityNode *> *nodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &nodes() const; Q_INVOKABLE void addNode(QActivityNode *node); Q_INVOKABLE void removeNode(QActivityNode *node); - Q_INVOKABLE const QSet<QActivityEdge *> *edges() const; + Q_INVOKABLE const QSet<QActivityEdge *> &edges() const; Q_INVOKABLE void addEdge(QActivityEdge *edge); Q_INVOKABLE void removeEdge(QActivityEdge *edge); - virtual void registerMetaTypes() const; protected: explicit QActivityPartition(QActivityPartitionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -111,10 +110,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityPartition) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYPARTITION_H diff --git a/src/uml/qactivitypartition_p.h b/src/uml/qactivitypartition_p.h index 8efe85be..2e945adf 100644 --- a/src/uml/qactivitypartition_p.h +++ b/src/uml/qactivitypartition_p.h @@ -72,10 +72,10 @@ public: bool isDimension; bool isExternal; QElement *represents; - QSet<QActivityPartition *> *subpartitions; + QSet<QActivityPartition *> subpartitions; QActivityPartition *superPartition; - QSet<QActivityNode *> *nodes; - QSet<QActivityEdge *> *edges; + QSet<QActivityNode *> nodes; + QSet<QActivityEdge *> edges; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactor.cpp b/src/uml/qactor.cpp index a58bf032..d30918c6 100644 --- a/src/uml/qactor.cpp +++ b/src/uml/qactor.cpp @@ -74,21 +74,6 @@ QActor::~QActor() { } -void QActor::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActor) *>("QT_PREPEND_NAMESPACE_QTUML(QActor) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActor) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActor) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActor) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActor) *> *"); - qRegisterMetaType<QActor *>("QActor *"); - qRegisterMetaType<const QSet<QActor *> *>("const QSet<QActor *> *"); - qRegisterMetaType<const QList<QActor *> *>("const QList<QActor *> *"); - - QBehavioredClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qactor.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qactor.h b/src/uml/qactor.h index 85f257ef..ab2a02db 100644 --- a/src/uml/qactor.h +++ b/src/uml/qactor.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QActor : public QBehavioredClassifier public: Q_INVOKABLE explicit QActor(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QActor(); - virtual void registerMetaTypes() const; protected: explicit QActor(QActorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActor) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActor) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActor) *> *) - QT_END_HEADER #endif // QTUML_QACTOR_H diff --git a/src/uml/qaddstructuralfeaturevalueaction.cpp b/src/uml/qaddstructuralfeaturevalueaction.cpp index 04c69913..0e2ba710 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.cpp +++ b/src/uml/qaddstructuralfeaturevalueaction.cpp @@ -141,28 +141,6 @@ void QAddStructuralFeatureValueAction::setInsertAt(QInputPin *insertAt) } } -void QAddStructuralFeatureValueAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *> *"); - qRegisterMetaType<QAddStructuralFeatureValueAction *>("QAddStructuralFeatureValueAction *"); - qRegisterMetaType<const QSet<QAddStructuralFeatureValueAction *> *>("const QSet<QAddStructuralFeatureValueAction *> *"); - qRegisterMetaType<const QList<QAddStructuralFeatureValueAction *> *>("const QList<QAddStructuralFeatureValueAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QWriteStructuralFeatureAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qaddstructuralfeaturevalueaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaddstructuralfeaturevalueaction.h b/src/uml/qaddstructuralfeaturevalueaction.h index 21f723e5..9a0e9584 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.h +++ b/src/uml/qaddstructuralfeaturevalueaction.h @@ -79,7 +79,6 @@ public: // Association ends from QAddStructuralFeatureValueAction Q_INVOKABLE QInputPin *insertAt() const; Q_INVOKABLE void setInsertAt(QInputPin *insertAt); - virtual void registerMetaTypes() const; protected: explicit QAddStructuralFeatureValueAction(QAddStructuralFeatureValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAddStructuralFeatureValueAction) *> *) - QT_END_HEADER #endif // QTUML_QADDSTRUCTURALFEATUREVALUEACTION_H diff --git a/src/uml/qaddvariablevalueaction.cpp b/src/uml/qaddvariablevalueaction.cpp index 373d9703..fb0743d3 100644 --- a/src/uml/qaddvariablevalueaction.cpp +++ b/src/uml/qaddvariablevalueaction.cpp @@ -141,28 +141,6 @@ void QAddVariableValueAction::setInsertAt(QInputPin *insertAt) } } -void QAddVariableValueAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *> *"); - qRegisterMetaType<QAddVariableValueAction *>("QAddVariableValueAction *"); - qRegisterMetaType<const QSet<QAddVariableValueAction *> *>("const QSet<QAddVariableValueAction *> *"); - qRegisterMetaType<const QList<QAddVariableValueAction *> *>("const QList<QAddVariableValueAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QWriteVariableAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qaddvariablevalueaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qaddvariablevalueaction.h b/src/uml/qaddvariablevalueaction.h index 46a6aec0..4a292e5e 100644 --- a/src/uml/qaddvariablevalueaction.h +++ b/src/uml/qaddvariablevalueaction.h @@ -79,7 +79,6 @@ public: // Association ends from QAddVariableValueAction Q_INVOKABLE QInputPin *insertAt() const; Q_INVOKABLE void setInsertAt(QInputPin *insertAt); - virtual void registerMetaTypes() const; protected: explicit QAddVariableValueAction(QAddVariableValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAddVariableValueAction) *> *) - QT_END_HEADER #endif // QTUML_QADDVARIABLEVALUEACTION_H diff --git a/src/uml/qanyreceiveevent.cpp b/src/uml/qanyreceiveevent.cpp index 439af108..b0dd0a9b 100644 --- a/src/uml/qanyreceiveevent.cpp +++ b/src/uml/qanyreceiveevent.cpp @@ -74,21 +74,6 @@ QAnyReceiveEvent::~QAnyReceiveEvent() { } -void QAnyReceiveEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *> *"); - qRegisterMetaType<QAnyReceiveEvent *>("QAnyReceiveEvent *"); - qRegisterMetaType<const QSet<QAnyReceiveEvent *> *>("const QSet<QAnyReceiveEvent *> *"); - qRegisterMetaType<const QList<QAnyReceiveEvent *> *>("const QList<QAnyReceiveEvent *> *"); - - QMessageEvent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qanyreceiveevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qanyreceiveevent.h b/src/uml/qanyreceiveevent.h index f23f4a0c..8e91d5f5 100644 --- a/src/uml/qanyreceiveevent.h +++ b/src/uml/qanyreceiveevent.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QAnyReceiveEvent : public QMessageEvent public: Q_INVOKABLE explicit QAnyReceiveEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAnyReceiveEvent(); - virtual void registerMetaTypes() const; protected: explicit QAnyReceiveEvent(QAnyReceiveEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAnyReceiveEvent) *> *) - QT_END_HEADER #endif // QTUML_QANYRECEIVEEVENT_H diff --git a/src/uml/qartifact.cpp b/src/uml/qartifact.cpp index f0d4d653..131b854e 100644 --- a/src/uml/qartifact.cpp +++ b/src/uml/qartifact.cpp @@ -48,20 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML -QArtifactPrivate::QArtifactPrivate() : - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>), - manifestations(new QSet<QManifestation *>), - nestedArtifacts(new QSet<QArtifact *>) +QArtifactPrivate::QArtifactPrivate() { } QArtifactPrivate::~QArtifactPrivate() { - delete ownedOperations; - delete ownedAttributes; - delete manifestations; - delete nestedArtifacts; } /*! @@ -97,7 +89,7 @@ QArtifact::~QArtifact() /*! The Elements owned by this element. */ -const QSet<QElement *> *QArtifact::ownedElements() const +const QSet<QElement *> &QArtifact::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -113,7 +105,7 @@ QElement *QArtifact::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QArtifact::ownedComments() const +const QSet<QComment *> &QArtifact::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -181,7 +173,7 @@ QNamespace *QArtifact::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QArtifact::clientDependencies() const +const QSet<QDependency *> &QArtifact::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -203,7 +195,7 @@ void QArtifact::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QArtifact::packageImports() const +const QSet<QPackageImport *> &QArtifact::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -221,7 +213,7 @@ void QArtifact::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QArtifact::members() const +const QSet<QNamedElement *> &QArtifact::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -229,7 +221,7 @@ const QSet<QNamedElement *> *QArtifact::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QArtifact::importedMembers() const +const QSet<QPackageableElement *> &QArtifact::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -237,7 +229,7 @@ const QSet<QPackageableElement *> *QArtifact::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QArtifact::elementImports() const +const QSet<QElementImport *> &QArtifact::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -255,7 +247,7 @@ void QArtifact::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QArtifact::ownedRules() const +const QSet<QConstraint *> &QArtifact::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -273,7 +265,7 @@ void QArtifact::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QArtifact::ownedMembers() const +const QSet<QNamedElement *> &QArtifact::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -363,7 +355,7 @@ void QArtifact::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QArtifact::redefinedElements() const +const QSet<QRedefinableElement *> &QArtifact::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -371,7 +363,7 @@ const QSet<QRedefinableElement *> *QArtifact::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QArtifact::redefinitionContexts() const +const QSet<QClassifier *> &QArtifact::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -383,7 +375,7 @@ const QSet<QClassifier *> *QArtifact::redefinitionContexts() const /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QArtifact::templateBindings() const +const QSet<QTemplateBinding *> &QArtifact::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -445,7 +437,7 @@ void QArtifact::unsetFinalSpecialization() /*! References the use cases owned by this classifier. */ -const QSet<QUseCase *> *QArtifact::ownedUseCases() const +const QSet<QUseCase *> &QArtifact::ownedUseCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } @@ -463,7 +455,7 @@ void QArtifact::removeOwnedUseCase(QUseCase *ownedUseCase) /*! Designates the GeneralizationSet of which the associated Classifier is a power type. */ -const QSet<QGeneralizationSet *> *QArtifact::powertypeExtents() const +const QSet<QGeneralizationSet *> &QArtifact::powertypeExtents() const { return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } @@ -481,7 +473,7 @@ void QArtifact::removePowertypeExtent(QGeneralizationSet *powertypeExtent) /*! The set of use cases for which this Classifier is the subject. */ -const QSet<QUseCase *> *QArtifact::useCases() const +const QSet<QUseCase *> &QArtifact::useCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } @@ -512,7 +504,7 @@ void QArtifact::setTemplateParameter(QClassifierTemplateParameter *templateParam /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QArtifact::redefinedClassifiers() const +const QSet<QClassifier *> &QArtifact::redefinedClassifiers() const { return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } @@ -543,7 +535,7 @@ void QArtifact::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTe /*! References the collaboration uses owned by the classifier. */ -const QSet<QCollaborationUse *> *QArtifact::collaborationUses() const +const QSet<QCollaborationUse *> &QArtifact::collaborationUses() const { return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } @@ -561,7 +553,7 @@ void QArtifact::removeCollaborationUse(QCollaborationUse *collaborationUse) /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QArtifact::attributes() const +const QSet<QProperty *> &QArtifact::attributes() const { return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } @@ -569,7 +561,7 @@ const QSet<QProperty *> *QArtifact::attributes() const /*! 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. */ -const QSet<QFeature *> *QArtifact::features() const +const QSet<QFeature *> &QArtifact::features() const { return (qwrappedobject_cast<const QClassifier *>(this))->features(); } @@ -577,7 +569,7 @@ const QSet<QFeature *> *QArtifact::features() const /*! Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship. */ -const QSet<QClassifier *> *QArtifact::generals() const +const QSet<QClassifier *> &QArtifact::generals() const { return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } @@ -608,7 +600,7 @@ void QArtifact::setRepresentation(QCollaborationUse *representation) /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QArtifact::generalizations() const +const QSet<QGeneralization *> &QArtifact::generalizations() const { return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } @@ -626,7 +618,7 @@ void QArtifact::removeGeneralization(QGeneralization *generalization) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QArtifact::inheritedMembers() const +const QSet<QNamedElement *> &QArtifact::inheritedMembers() const { return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } @@ -634,7 +626,7 @@ const QSet<QNamedElement *> *QArtifact::inheritedMembers() const /*! References the substitutions that are owned by this Classifier. */ -const QSet<QSubstitution *> *QArtifact::substitutions() const +const QSet<QSubstitution *> &QArtifact::substitutions() const { return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } @@ -681,7 +673,7 @@ void QArtifact::setFileName(QString fileName) /*! The Operations defined for the Artifact. The association is a specialization of the ownedMember association. */ -const QList<QOperation *> *QArtifact::ownedOperations() const +const QList<QOperation *> &QArtifact::ownedOperations() const { // This is a read-write association end @@ -694,8 +686,8 @@ void QArtifact::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QArtifact); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -708,8 +700,8 @@ void QArtifact::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QArtifact); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -720,7 +712,7 @@ void QArtifact::removeOwnedOperation(QOperation *ownedOperation) /*! The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association. */ -const QList<QProperty *> *QArtifact::ownedAttributes() const +const QList<QProperty *> &QArtifact::ownedAttributes() const { // This is a read-write association end @@ -733,8 +725,8 @@ void QArtifact::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QArtifact); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -747,8 +739,8 @@ void QArtifact::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QArtifact); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -759,7 +751,7 @@ void QArtifact::removeOwnedAttribute(QProperty *ownedAttribute) /*! 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. */ -const QSet<QManifestation *> *QArtifact::manifestations() const +const QSet<QManifestation *> &QArtifact::manifestations() const { // This is a read-write association end @@ -772,8 +764,8 @@ void QArtifact::addManifestation(QManifestation *manifestation) // This is a read-write association end Q_D(QArtifact); - if (!d->manifestations->contains(manifestation)) { - d->manifestations->insert(manifestation); + if (!d->manifestations.contains(manifestation)) { + d->manifestations.insert(manifestation); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(manifestation)); @@ -786,8 +778,8 @@ void QArtifact::removeManifestation(QManifestation *manifestation) // This is a read-write association end Q_D(QArtifact); - if (d->manifestations->contains(manifestation)) { - d->manifestations->remove(manifestation); + if (d->manifestations.contains(manifestation)) { + d->manifestations.remove(manifestation); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(manifestation)); @@ -798,7 +790,7 @@ void QArtifact::removeManifestation(QManifestation *manifestation) /*! The Artifacts that are defined (nested) within the Artifact. The association is a specialization of the ownedMember association from Namespace to NamedElement. */ -const QSet<QArtifact *> *QArtifact::nestedArtifacts() const +const QSet<QArtifact *> &QArtifact::nestedArtifacts() const { // This is a read-write association end @@ -811,8 +803,8 @@ void QArtifact::addNestedArtifact(QArtifact *nestedArtifact) // This is a read-write association end Q_D(QArtifact); - if (!d->nestedArtifacts->contains(nestedArtifact)) { - d->nestedArtifacts->insert(nestedArtifact); + if (!d->nestedArtifacts.contains(nestedArtifact)) { + d->nestedArtifacts.insert(nestedArtifact); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedArtifact)); @@ -824,50 +816,14 @@ void QArtifact::removeNestedArtifact(QArtifact *nestedArtifact) // This is a read-write association end Q_D(QArtifact); - if (d->nestedArtifacts->contains(nestedArtifact)) { - d->nestedArtifacts->remove(nestedArtifact); + if (d->nestedArtifacts.contains(nestedArtifact)) { + d->nestedArtifacts.remove(nestedArtifact); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedArtifact)); } } -void QArtifact::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *>("QT_PREPEND_NAMESPACE_QTUML(QArtifact) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *> *"); - qRegisterMetaType<QArtifact *>("QArtifact *"); - qRegisterMetaType<const QSet<QArtifact *> *>("const QSet<QArtifact *> *"); - qRegisterMetaType<const QList<QArtifact *> *>("const QList<QArtifact *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *>("QT_PREPEND_NAMESPACE_QTUML(QManifestation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *"); - qRegisterMetaType<QManifestation *>("QManifestation *"); - qRegisterMetaType<const QSet<QManifestation *> *>("const QSet<QManifestation *> *"); - qRegisterMetaType<const QList<QManifestation *> *>("const QList<QManifestation *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QArtifact::addClientDependency(QWrappedObjectPointer<QManifestation> manifestation) diff --git a/src/uml/qartifact.h b/src/uml/qartifact.h index a0cd78fd..80dbca3c 100644 --- a/src/uml/qartifact.h +++ b/src/uml/qartifact.h @@ -75,10 +75,10 @@ class Q_UML_EXPORT QArtifact : public QWrappedObject Q_OBJECT Q_PROPERTY(QString fileName READ fileName WRITE setFileName) - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) - Q_PROPERTY(const QSet<QManifestation *> * manifestations READ manifestations) - Q_PROPERTY(const QSet<QArtifact *> * nestedArtifacts READ nestedArtifacts) + 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_DISABLE_COPY(QArtifact) Q_DECLARE_PRIVATE(QArtifact) @@ -88,9 +88,9 @@ public: virtual ~QArtifact(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,23 +103,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -140,11 +140,11 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QTemplateableElement - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -157,37 +157,37 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from aggregated QClassifier - Q_INVOKABLE const QSet<QUseCase *> *ownedUseCases() const; + Q_INVOKABLE const QSet<QUseCase *> &ownedUseCases() const; Q_INVOKABLE void addOwnedUseCase(QUseCase *ownedUseCase); Q_INVOKABLE void removeOwnedUseCase(QUseCase *ownedUseCase); - Q_INVOKABLE const QSet<QGeneralizationSet *> *powertypeExtents() const; + Q_INVOKABLE const QSet<QGeneralizationSet *> &powertypeExtents() const; Q_INVOKABLE void addPowertypeExtent(QGeneralizationSet *powertypeExtent); Q_INVOKABLE void removePowertypeExtent(QGeneralizationSet *powertypeExtent); - Q_INVOKABLE const QSet<QUseCase *> *useCases() const; + Q_INVOKABLE const QSet<QUseCase *> &useCases() const; Q_INVOKABLE void addUseCase(QUseCase *useCase); Q_INVOKABLE void removeUseCase(QUseCase *useCase); Q_INVOKABLE QClassifierTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QClassifierTemplateParameter *templateParameter); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE QRedefinableTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QCollaborationUse *> *collaborationUses() const; + Q_INVOKABLE const QSet<QCollaborationUse *> &collaborationUses() const; Q_INVOKABLE void addCollaborationUse(QCollaborationUse *collaborationUse); Q_INVOKABLE void removeCollaborationUse(QCollaborationUse *collaborationUse); - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); Q_INVOKABLE QCollaborationUse *representation() const; Q_INVOKABLE void setRepresentation(QCollaborationUse *representation); - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QSubstitution *> *substitutions() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QSubstitution *> &substitutions() const; Q_INVOKABLE void addSubstitution(QSubstitution *substitution); Q_INVOKABLE void removeSubstitution(QSubstitution *substitution); @@ -196,23 +196,22 @@ public: Q_INVOKABLE void setFileName(QString fileName); // Association ends from QArtifact - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - Q_INVOKABLE const QSet<QManifestation *> *manifestations() const; + Q_INVOKABLE const QSet<QManifestation *> &manifestations() const; Q_INVOKABLE void addManifestation(QManifestation *manifestation); Q_INVOKABLE void removeManifestation(QManifestation *manifestation); - Q_INVOKABLE const QSet<QArtifact *> *nestedArtifacts() const; + Q_INVOKABLE const QSet<QArtifact *> &nestedArtifacts() const; Q_INVOKABLE void addNestedArtifact(QArtifact *nestedArtifact); Q_INVOKABLE void removeNestedArtifact(QArtifact *nestedArtifact); // Overriden methods for subsetted properties Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QManifestation> manifestation); Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QManifestation> manifestation); - virtual void registerMetaTypes() const; protected: explicit QArtifact(QArtifactPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -224,10 +223,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QArtifact) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QArtifact) *> *) - QT_END_HEADER #endif // QTUML_QARTIFACT_H diff --git a/src/uml/qartifact_p.h b/src/uml/qartifact_p.h index b56d2448..4746a307 100644 --- a/src/uml/qartifact_p.h +++ b/src/uml/qartifact_p.h @@ -75,10 +75,10 @@ public: virtual ~QArtifactPrivate(); QString fileName; - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; - QSet<QManifestation *> *manifestations; - QSet<QArtifact *> *nestedArtifacts; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; + QSet<QManifestation *> manifestations; + QSet<QArtifact *> nestedArtifacts; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qassociation.cpp b/src/uml/qassociation.cpp index 9570ffaf..81d3e194 100644 --- a/src/uml/qassociation.cpp +++ b/src/uml/qassociation.cpp @@ -48,18 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QAssociationPrivate::QAssociationPrivate() : - isDerived(false), - navigableOwnedEnds(new QSet<QProperty *>), - ownedEnds(new QList<QProperty *>), - memberEnds(new QList<QProperty *>) + isDerived(false) { } QAssociationPrivate::~QAssociationPrivate() { - delete navigableOwnedEnds; - delete ownedEnds; - delete memberEnds; } /*! @@ -95,7 +89,7 @@ QAssociation::~QAssociation() /*! The Elements owned by this element. */ -const QSet<QElement *> *QAssociation::ownedElements() const +const QSet<QElement *> &QAssociation::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -111,7 +105,7 @@ QElement *QAssociation::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QAssociation::ownedComments() const +const QSet<QComment *> &QAssociation::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -179,7 +173,7 @@ QNamespace *QAssociation::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QAssociation::clientDependencies() const +const QSet<QDependency *> &QAssociation::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -201,7 +195,7 @@ void QAssociation::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QAssociation::packageImports() const +const QSet<QPackageImport *> &QAssociation::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -219,7 +213,7 @@ void QAssociation::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QAssociation::members() const +const QSet<QNamedElement *> &QAssociation::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -227,7 +221,7 @@ const QSet<QNamedElement *> *QAssociation::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QAssociation::importedMembers() const +const QSet<QPackageableElement *> &QAssociation::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -235,7 +229,7 @@ const QSet<QPackageableElement *> *QAssociation::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QAssociation::elementImports() const +const QSet<QElementImport *> &QAssociation::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -253,7 +247,7 @@ void QAssociation::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QAssociation::ownedRules() const +const QSet<QConstraint *> &QAssociation::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -271,7 +265,7 @@ void QAssociation::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QAssociation::ownedMembers() const +const QSet<QNamedElement *> &QAssociation::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -361,7 +355,7 @@ void QAssociation::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const +const QSet<QRedefinableElement *> &QAssociation::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -369,7 +363,7 @@ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QAssociation::redefinitionContexts() const +const QSet<QClassifier *> &QAssociation::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -381,7 +375,7 @@ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QAssociation::templateBindings() const +const QSet<QTemplateBinding *> &QAssociation::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -443,7 +437,7 @@ void QAssociation::unsetFinalSpecialization() /*! References the use cases owned by this classifier. */ -const QSet<QUseCase *> *QAssociation::ownedUseCases() const +const QSet<QUseCase *> &QAssociation::ownedUseCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } @@ -461,7 +455,7 @@ void QAssociation::removeOwnedUseCase(QUseCase *ownedUseCase) /*! Designates the GeneralizationSet of which the associated Classifier is a power type. */ -const QSet<QGeneralizationSet *> *QAssociation::powertypeExtents() const +const QSet<QGeneralizationSet *> &QAssociation::powertypeExtents() const { return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } @@ -479,7 +473,7 @@ void QAssociation::removePowertypeExtent(QGeneralizationSet *powertypeExtent) /*! The set of use cases for which this Classifier is the subject. */ -const QSet<QUseCase *> *QAssociation::useCases() const +const QSet<QUseCase *> &QAssociation::useCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } @@ -510,7 +504,7 @@ void QAssociation::setTemplateParameter(QClassifierTemplateParameter *templatePa /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QAssociation::redefinedClassifiers() const +const QSet<QClassifier *> &QAssociation::redefinedClassifiers() const { return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } @@ -541,7 +535,7 @@ void QAssociation::setOwnedTemplateSignature(QRedefinableTemplateSignature *owne /*! References the collaboration uses owned by the classifier. */ -const QSet<QCollaborationUse *> *QAssociation::collaborationUses() const +const QSet<QCollaborationUse *> &QAssociation::collaborationUses() const { return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } @@ -559,7 +553,7 @@ void QAssociation::removeCollaborationUse(QCollaborationUse *collaborationUse) /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QAssociation::attributes() const +const QSet<QProperty *> &QAssociation::attributes() const { return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } @@ -567,7 +561,7 @@ const QSet<QProperty *> *QAssociation::attributes() const /*! 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. */ -const QSet<QFeature *> *QAssociation::features() const +const QSet<QFeature *> &QAssociation::features() const { return (qwrappedobject_cast<const QClassifier *>(this))->features(); } @@ -575,7 +569,7 @@ const QSet<QFeature *> *QAssociation::features() const /*! Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship. */ -const QSet<QClassifier *> *QAssociation::generals() const +const QSet<QClassifier *> &QAssociation::generals() const { return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } @@ -606,7 +600,7 @@ void QAssociation::setRepresentation(QCollaborationUse *representation) /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QAssociation::generalizations() const +const QSet<QGeneralization *> &QAssociation::generalizations() const { return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } @@ -624,7 +618,7 @@ void QAssociation::removeGeneralization(QGeneralization *generalization) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QAssociation::inheritedMembers() const +const QSet<QNamedElement *> &QAssociation::inheritedMembers() const { return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } @@ -632,7 +626,7 @@ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const /*! References the substitutions that are owned by this Classifier. */ -const QSet<QSubstitution *> *QAssociation::substitutions() const +const QSet<QSubstitution *> &QAssociation::substitutions() const { return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } @@ -654,7 +648,7 @@ void QAssociation::removeSubstitution(QSubstitution *substitution) /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QAssociation::relatedElements() const +const QSet<QElement *> &QAssociation::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -696,19 +690,19 @@ void QAssociation::unsetDerived() /*! References the classifiers that are used as types of the ends of the association. */ -const QList<QType *> *QAssociation::endTypes() const +const QList<QType *> &QAssociation::endTypes() const { // This is a read-only derived association end qWarning("QAssociation::endTypes: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QList<QType *>); // change here to your derived return } /*! The navigable ends that are owned by the association itself. */ -const QSet<QProperty *> *QAssociation::navigableOwnedEnds() const +const QSet<QProperty *> &QAssociation::navigableOwnedEnds() const { // This is a read-write association end @@ -721,8 +715,8 @@ void QAssociation::addNavigableOwnedEnd(QProperty *navigableOwnedEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->navigableOwnedEnds->contains(navigableOwnedEnd)) { - d->navigableOwnedEnds->insert(navigableOwnedEnd); + if (!d->navigableOwnedEnds.contains(navigableOwnedEnd)) { + d->navigableOwnedEnds.insert(navigableOwnedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->addOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); @@ -734,8 +728,8 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) // This is a read-write association end Q_D(QAssociation); - if (d->navigableOwnedEnds->contains(navigableOwnedEnd)) { - d->navigableOwnedEnds->remove(navigableOwnedEnd); + if (d->navigableOwnedEnds.contains(navigableOwnedEnd)) { + d->navigableOwnedEnds.remove(navigableOwnedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->removeOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); @@ -745,7 +739,7 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) /*! The ends that are owned by the association itself. */ -const QList<QProperty *> *QAssociation::ownedEnds() const +const QList<QProperty *> &QAssociation::ownedEnds() const { // This is a read-write association end @@ -758,8 +752,8 @@ void QAssociation::addOwnedEnd(QProperty *ownedEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->ownedEnds->contains(ownedEnd)) { - d->ownedEnds->append(ownedEnd); + if (!d->ownedEnds.contains(ownedEnd)) { + d->ownedEnds.append(ownedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->addMemberEnd(qwrappedobject_cast<QProperty *>(ownedEnd)); @@ -776,8 +770,8 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) // This is a read-write association end Q_D(QAssociation); - if (d->ownedEnds->contains(ownedEnd)) { - d->ownedEnds->removeAll(ownedEnd); + if (d->ownedEnds.contains(ownedEnd)) { + d->ownedEnds.removeAll(ownedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->removeMemberEnd(qwrappedobject_cast<QProperty *>(ownedEnd)); @@ -792,7 +786,7 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) /*! Each end represents participation of instances of the classifier connected to the end in links of the association. */ -const QList<QProperty *> *QAssociation::memberEnds() const +const QList<QProperty *> &QAssociation::memberEnds() const { // This is a read-write association end @@ -805,8 +799,8 @@ void QAssociation::addMemberEnd(QProperty *memberEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->memberEnds->contains(memberEnd)) { - d->memberEnds->append(memberEnd); + if (!d->memberEnds.contains(memberEnd)) { + d->memberEnds.append(memberEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); @@ -821,8 +815,8 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) // This is a read-write association end Q_D(QAssociation); - if (d->memberEnds->contains(memberEnd)) { - d->memberEnds->removeAll(memberEnd); + if (d->memberEnds.contains(memberEnd)) { + d->memberEnds.removeAll(memberEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); @@ -832,35 +826,6 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) } } -void QAssociation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *>("QT_PREPEND_NAMESPACE_QTUML(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qassociation.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qassociation.h b/src/uml/qassociation.h index 84c55afa..c29f3a9a 100644 --- a/src/uml/qassociation.h +++ b/src/uml/qassociation.h @@ -70,10 +70,10 @@ class Q_UML_EXPORT QAssociation : public QWrappedObject Q_OBJECT Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) - Q_PROPERTY(const QList<QType *> * endTypes READ endTypes STORED false) - Q_PROPERTY(const QSet<QProperty *> * navigableOwnedEnds READ navigableOwnedEnds) - Q_PROPERTY(const QList<QProperty *> * ownedEnds READ ownedEnds) - Q_PROPERTY(const QList<QProperty *> * memberEnds READ memberEnds) + 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_DISABLE_COPY(QAssociation) Q_DECLARE_PRIVATE(QAssociation) @@ -83,9 +83,9 @@ public: virtual ~QAssociation(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -98,23 +98,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -135,11 +135,11 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QTemplateableElement - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -152,42 +152,42 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from aggregated QClassifier - Q_INVOKABLE const QSet<QUseCase *> *ownedUseCases() const; + Q_INVOKABLE const QSet<QUseCase *> &ownedUseCases() const; Q_INVOKABLE void addOwnedUseCase(QUseCase *ownedUseCase); Q_INVOKABLE void removeOwnedUseCase(QUseCase *ownedUseCase); - Q_INVOKABLE const QSet<QGeneralizationSet *> *powertypeExtents() const; + Q_INVOKABLE const QSet<QGeneralizationSet *> &powertypeExtents() const; Q_INVOKABLE void addPowertypeExtent(QGeneralizationSet *powertypeExtent); Q_INVOKABLE void removePowertypeExtent(QGeneralizationSet *powertypeExtent); - Q_INVOKABLE const QSet<QUseCase *> *useCases() const; + Q_INVOKABLE const QSet<QUseCase *> &useCases() const; Q_INVOKABLE void addUseCase(QUseCase *useCase); Q_INVOKABLE void removeUseCase(QUseCase *useCase); Q_INVOKABLE QClassifierTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QClassifierTemplateParameter *templateParameter); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE QRedefinableTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QCollaborationUse *> *collaborationUses() const; + Q_INVOKABLE const QSet<QCollaborationUse *> &collaborationUses() const; Q_INVOKABLE void addCollaborationUse(QCollaborationUse *collaborationUse); Q_INVOKABLE void removeCollaborationUse(QCollaborationUse *collaborationUse); - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); Q_INVOKABLE QCollaborationUse *representation() const; Q_INVOKABLE void setRepresentation(QCollaborationUse *representation); - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QSubstitution *> *substitutions() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QSubstitution *> &substitutions() const; Q_INVOKABLE void addSubstitution(QSubstitution *substitution); Q_INVOKABLE void removeSubstitution(QSubstitution *substitution); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Attributes from QAssociation Q_INVOKABLE bool isDerived() const; @@ -195,17 +195,16 @@ public: Q_INVOKABLE void unsetDerived(); // Association ends from QAssociation - Q_INVOKABLE const QList<QType *> *endTypes() const; - Q_INVOKABLE const QSet<QProperty *> *navigableOwnedEnds() const; + Q_INVOKABLE const QList<QType *> &endTypes() const; + Q_INVOKABLE const QSet<QProperty *> &navigableOwnedEnds() const; Q_INVOKABLE void addNavigableOwnedEnd(QProperty *navigableOwnedEnd); Q_INVOKABLE void removeNavigableOwnedEnd(QProperty *navigableOwnedEnd); - Q_INVOKABLE const QList<QProperty *> *ownedEnds() const; + Q_INVOKABLE const QList<QProperty *> &ownedEnds() const; Q_INVOKABLE void addOwnedEnd(QProperty *ownedEnd); Q_INVOKABLE void removeOwnedEnd(QProperty *ownedEnd); - Q_INVOKABLE const QList<QProperty *> *memberEnds() const; + Q_INVOKABLE const QList<QProperty *> &memberEnds() const; Q_INVOKABLE void addMemberEnd(QProperty *memberEnd); Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd); - virtual void registerMetaTypes() const; protected: explicit QAssociation(QAssociationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -217,10 +216,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAssociation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *) - QT_END_HEADER #endif // QTUML_QASSOCIATION_H diff --git a/src/uml/qassociation_p.h b/src/uml/qassociation_p.h index d0a29c68..4d5eb3ce 100644 --- a/src/uml/qassociation_p.h +++ b/src/uml/qassociation_p.h @@ -73,9 +73,9 @@ public: virtual ~QAssociationPrivate(); bool isDerived; - QSet<QProperty *> *navigableOwnedEnds; - QList<QProperty *> *ownedEnds; - QList<QProperty *> *memberEnds; + QSet<QProperty *> navigableOwnedEnds; + QList<QProperty *> ownedEnds; + QList<QProperty *> memberEnds; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qassociationclass.cpp b/src/uml/qassociationclass.cpp index 73ee9cef..35f4d7c5 100644 --- a/src/uml/qassociationclass.cpp +++ b/src/uml/qassociationclass.cpp @@ -78,21 +78,6 @@ QAssociationClass::~QAssociationClass() { } -void QAssociationClass::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *>("QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *> *"); - qRegisterMetaType<QAssociationClass *>("QAssociationClass *"); - qRegisterMetaType<const QSet<QAssociationClass *> *>("const QSet<QAssociationClass *> *"); - qRegisterMetaType<const QList<QAssociationClass *> *>("const QList<QAssociationClass *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qassociationclass.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qassociationclass.h b/src/uml/qassociationclass.h index 429208b0..63319e79 100644 --- a/src/uml/qassociationclass.h +++ b/src/uml/qassociationclass.h @@ -67,7 +67,6 @@ class Q_UML_EXPORT QAssociationClass : public QWrappedObject public: Q_INVOKABLE explicit QAssociationClass(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QAssociationClass(); - virtual void registerMetaTypes() const; protected: explicit QAssociationClass(QAssociationClassPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -79,10 +78,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociationClass) *> *) - QT_END_HEADER #endif // QTUML_QASSOCIATIONCLASS_H diff --git a/src/uml/qbehavior.cpp b/src/uml/qbehavior.cpp index dedb64ba..d6a7aae5 100644 --- a/src/uml/qbehavior.cpp +++ b/src/uml/qbehavior.cpp @@ -52,22 +52,12 @@ QT_BEGIN_NAMESPACE_QTUML QBehaviorPrivate::QBehaviorPrivate() : isReentrant(true), - specification(0), - postconditions(new QSet<QConstraint *>), - preconditions(new QSet<QConstraint *>), - redefinedBehaviors(new QSet<QBehavior *>), - ownedParameters(new QList<QParameter *>), - ownedParameterSets(new QSet<QParameterSet *>) + specification(0) { } QBehaviorPrivate::~QBehaviorPrivate() { - delete postconditions; - delete preconditions; - delete redefinedBehaviors; - delete ownedParameters; - delete ownedParameterSets; } /*! @@ -158,7 +148,7 @@ void QBehavior::setSpecification(QBehavioralFeature *specification) /*! 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. */ -const QSet<QConstraint *> *QBehavior::postconditions() const +const QSet<QConstraint *> &QBehavior::postconditions() const { // This is a read-write association end @@ -171,8 +161,8 @@ void QBehavior::addPostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QBehavior); - if (!d->postconditions->contains(postcondition)) { - d->postconditions->insert(postcondition); + if (!d->postconditions.contains(postcondition)) { + d->postconditions.insert(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -184,8 +174,8 @@ void QBehavior::removePostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QBehavior); - if (d->postconditions->contains(postcondition)) { - d->postconditions->remove(postcondition); + if (d->postconditions.contains(postcondition)) { + d->postconditions.remove(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -195,7 +185,7 @@ void QBehavior::removePostcondition(QConstraint *postcondition) /*! An optional set of Constraints specifying what must be fulfilled when the behavior is invoked. */ -const QSet<QConstraint *> *QBehavior::preconditions() const +const QSet<QConstraint *> &QBehavior::preconditions() const { // This is a read-write association end @@ -208,8 +198,8 @@ void QBehavior::addPrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QBehavior); - if (!d->preconditions->contains(precondition)) { - d->preconditions->insert(precondition); + if (!d->preconditions.contains(precondition)) { + d->preconditions.insert(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -221,8 +211,8 @@ void QBehavior::removePrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QBehavior); - if (d->preconditions->contains(precondition)) { - d->preconditions->remove(precondition); + if (d->preconditions.contains(precondition)) { + d->preconditions.remove(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -232,7 +222,7 @@ void QBehavior::removePrecondition(QConstraint *precondition) /*! 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. */ -const QSet<QBehavior *> *QBehavior::redefinedBehaviors() const +const QSet<QBehavior *> &QBehavior::redefinedBehaviors() const { // This is a read-write association end @@ -245,8 +235,8 @@ void QBehavior::addRedefinedBehavior(QBehavior *redefinedBehavior) // This is a read-write association end Q_D(QBehavior); - if (!d->redefinedBehaviors->contains(redefinedBehavior)) { - d->redefinedBehaviors->insert(redefinedBehavior); + if (!d->redefinedBehaviors.contains(redefinedBehavior)) { + d->redefinedBehaviors.insert(redefinedBehavior); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedBehavior)); @@ -258,8 +248,8 @@ void QBehavior::removeRedefinedBehavior(QBehavior *redefinedBehavior) // This is a read-write association end Q_D(QBehavior); - if (d->redefinedBehaviors->contains(redefinedBehavior)) { - d->redefinedBehaviors->remove(redefinedBehavior); + if (d->redefinedBehaviors.contains(redefinedBehavior)) { + d->redefinedBehaviors.remove(redefinedBehavior); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedBehavior)); @@ -269,7 +259,7 @@ void QBehavior::removeRedefinedBehavior(QBehavior *redefinedBehavior) /*! 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. */ -const QList<QParameter *> *QBehavior::ownedParameters() const +const QList<QParameter *> &QBehavior::ownedParameters() const { // This is a read-write association end @@ -282,8 +272,8 @@ void QBehavior::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavior); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -295,8 +285,8 @@ void QBehavior::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavior); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -306,7 +296,7 @@ void QBehavior::removeOwnedParameter(QParameter *ownedParameter) /*! The ParameterSets owned by this Behavior. */ -const QSet<QParameterSet *> *QBehavior::ownedParameterSets() const +const QSet<QParameterSet *> &QBehavior::ownedParameterSets() const { // This is a read-write association end @@ -319,8 +309,8 @@ void QBehavior::addOwnedParameterSet(QParameterSet *ownedParameterSet) // This is a read-write association end Q_D(QBehavior); - if (!d->ownedParameterSets->contains(ownedParameterSet)) { - d->ownedParameterSets->insert(ownedParameterSet); + if (!d->ownedParameterSets.contains(ownedParameterSet)) { + d->ownedParameterSets.insert(ownedParameterSet); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); @@ -332,8 +322,8 @@ void QBehavior::removeOwnedParameterSet(QParameterSet *ownedParameterSet) // This is a read-write association end Q_D(QBehavior); - if (d->ownedParameterSets->contains(ownedParameterSet)) { - d->ownedParameterSets->remove(ownedParameterSet); + if (d->ownedParameterSets.contains(ownedParameterSet)) { + d->ownedParameterSets.remove(ownedParameterSet); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); @@ -352,56 +342,6 @@ QBehavioredClassifier *QBehavior::context() const return 0; // change here to your derived return } -void QBehavior::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *"); - qRegisterMetaType<QBehavioralFeature *>("QBehavioralFeature *"); - qRegisterMetaType<const QSet<QBehavioralFeature *> *>("const QSet<QBehavioralFeature *> *"); - qRegisterMetaType<const QList<QBehavioralFeature *> *>("const QList<QBehavioralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *"); - qRegisterMetaType<QBehavioredClassifier *>("QBehavioredClassifier *"); - qRegisterMetaType<const QSet<QBehavioredClassifier *> *>("const QSet<QBehavioredClassifier *> *"); - qRegisterMetaType<const QList<QBehavioredClassifier *> *>("const QList<QBehavioredClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<QParameterSet *>("QParameterSet *"); - qRegisterMetaType<const QSet<QParameterSet *> *>("const QSet<QParameterSet *> *"); - qRegisterMetaType<const QList<QParameterSet *> *>("const QList<QParameterSet *> *"); - - QClass::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QBehavior::addRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior) diff --git a/src/uml/qbehavior.h b/src/uml/qbehavior.h index e8def425..7270c556 100644 --- a/src/uml/qbehavior.h +++ b/src/uml/qbehavior.h @@ -74,11 +74,11 @@ class Q_UML_EXPORT QBehavior : public QClass Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant) Q_PROPERTY(QBehavioralFeature * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QSet<QConstraint *> * postconditions READ postconditions) - Q_PROPERTY(const QSet<QConstraint *> * preconditions READ preconditions) - Q_PROPERTY(const QSet<QBehavior *> * redefinedBehaviors READ redefinedBehaviors) - Q_PROPERTY(const QList<QParameter *> * ownedParameters READ ownedParameters) - Q_PROPERTY(const QSet<QParameterSet *> * ownedParameterSets READ ownedParameterSets) + 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_DISABLE_COPY(QBehavior) @@ -96,19 +96,19 @@ public: // Association ends from QBehavior Q_INVOKABLE QBehavioralFeature *specification() const; Q_INVOKABLE void setSpecification(QBehavioralFeature *specification); - Q_INVOKABLE const QSet<QConstraint *> *postconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &postconditions() const; Q_INVOKABLE void addPostcondition(QConstraint *postcondition); Q_INVOKABLE void removePostcondition(QConstraint *postcondition); - Q_INVOKABLE const QSet<QConstraint *> *preconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &preconditions() const; Q_INVOKABLE void addPrecondition(QConstraint *precondition); Q_INVOKABLE void removePrecondition(QConstraint *precondition); - Q_INVOKABLE const QSet<QBehavior *> *redefinedBehaviors() const; + Q_INVOKABLE const QSet<QBehavior *> &redefinedBehaviors() const; Q_INVOKABLE void addRedefinedBehavior(QBehavior *redefinedBehavior); Q_INVOKABLE void removeRedefinedBehavior(QBehavior *redefinedBehavior); - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); - Q_INVOKABLE const QSet<QParameterSet *> *ownedParameterSets() const; + Q_INVOKABLE const QSet<QParameterSet *> &ownedParameterSets() const; Q_INVOKABLE void addOwnedParameterSet(QParameterSet *ownedParameterSet); Q_INVOKABLE void removeOwnedParameterSet(QParameterSet *ownedParameterSet); Q_INVOKABLE QBehavioredClassifier *context() const; @@ -116,7 +116,6 @@ public: // Overriden methods for subsetted properties Q_INVOKABLE void addRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior); Q_INVOKABLE void removeRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior); - virtual void registerMetaTypes() const; protected: explicit QBehavior(QBehaviorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -124,10 +123,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QBehavior) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *) - QT_END_HEADER #endif // QTUML_QBEHAVIOR_H diff --git a/src/uml/qbehavior_p.h b/src/uml/qbehavior_p.h index 7459eab1..00c13a5a 100644 --- a/src/uml/qbehavior_p.h +++ b/src/uml/qbehavior_p.h @@ -74,11 +74,11 @@ public: bool isReentrant; QBehavioralFeature *specification; - QSet<QConstraint *> *postconditions; - QSet<QConstraint *> *preconditions; - QSet<QBehavior *> *redefinedBehaviors; - QList<QParameter *> *ownedParameters; - QSet<QParameterSet *> *ownedParameterSets; + QSet<QConstraint *> postconditions; + QSet<QConstraint *> preconditions; + QSet<QBehavior *> redefinedBehaviors; + QList<QParameter *> ownedParameters; + QSet<QParameterSet *> ownedParameterSets; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbehavioralfeature.cpp b/src/uml/qbehavioralfeature.cpp index 0a3b8512..04548a62 100644 --- a/src/uml/qbehavioralfeature.cpp +++ b/src/uml/qbehavioralfeature.cpp @@ -52,20 +52,12 @@ QT_BEGIN_NAMESPACE_QTUML QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() : concurrency(QtUml::CallConcurrencySequential), - isAbstract(false), - raisedExceptions(new QSet<QType *>), - ownedParameters(new QList<QParameter *>), - ownedParameterSets(new QSet<QParameterSet *>), - methods(new QSet<QBehavior *>) + isAbstract(false) { } QBehavioralFeaturePrivate::~QBehavioralFeaturePrivate() { - delete raisedExceptions; - delete ownedParameters; - delete ownedParameterSets; - delete methods; } /*! @@ -101,7 +93,7 @@ QBehavioralFeature::~QBehavioralFeature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QBehavioralFeature::ownedElements() const +const QSet<QElement *> &QBehavioralFeature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -117,7 +109,7 @@ QElement *QBehavioralFeature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QBehavioralFeature::ownedComments() const +const QSet<QComment *> &QBehavioralFeature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -198,7 +190,7 @@ QNamespace *QBehavioralFeature::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QBehavioralFeature::clientDependencies() const +const QSet<QDependency *> &QBehavioralFeature::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -220,7 +212,7 @@ void QBehavioralFeature::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QBehavioralFeature::packageImports() const +const QSet<QPackageImport *> &QBehavioralFeature::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -238,7 +230,7 @@ void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QBehavioralFeature::members() const +const QSet<QNamedElement *> &QBehavioralFeature::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -246,7 +238,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const +const QSet<QPackageableElement *> &QBehavioralFeature::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -254,7 +246,7 @@ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QBehavioralFeature::elementImports() const +const QSet<QElementImport *> &QBehavioralFeature::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -272,7 +264,7 @@ void QBehavioralFeature::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QBehavioralFeature::ownedRules() const +const QSet<QConstraint *> &QBehavioralFeature::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -290,7 +282,7 @@ void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const +const QSet<QNamedElement *> &QBehavioralFeature::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -324,7 +316,7 @@ void QBehavioralFeature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const +const QSet<QRedefinableElement *> &QBehavioralFeature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -332,7 +324,7 @@ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const +const QSet<QClassifier *> &QBehavioralFeature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -366,7 +358,7 @@ void QBehavioralFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const +const QSet<QClassifier *> &QBehavioralFeature::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -434,7 +426,7 @@ void QBehavioralFeature::unsetAbstract() /*! References the Types representing exceptions that may be raised during an invocation of this feature. */ -const QSet<QType *> *QBehavioralFeature::raisedExceptions() const +const QSet<QType *> &QBehavioralFeature::raisedExceptions() const { // This is a read-write association end @@ -447,8 +439,8 @@ void QBehavioralFeature::addRaisedException(QType *raisedException) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->insert(raisedException); + if (!d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.insert(raisedException); } } @@ -457,15 +449,15 @@ void QBehavioralFeature::removeRaisedException(QType *raisedException) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->remove(raisedException); + if (d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.remove(raisedException); } } /*! Specifies the ordered set of formal parameters of this BehavioralFeature. */ -const QList<QParameter *> *QBehavioralFeature::ownedParameters() const +const QList<QParameter *> &QBehavioralFeature::ownedParameters() const { // This is a read-write association end @@ -478,8 +470,8 @@ void QBehavioralFeature::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -491,8 +483,8 @@ void QBehavioralFeature::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -502,7 +494,7 @@ void QBehavioralFeature::removeOwnedParameter(QParameter *ownedParameter) /*! The ParameterSets owned by this BehavioralFeature. */ -const QSet<QParameterSet *> *QBehavioralFeature::ownedParameterSets() const +const QSet<QParameterSet *> &QBehavioralFeature::ownedParameterSets() const { // This is a read-write association end @@ -515,8 +507,8 @@ void QBehavioralFeature::addOwnedParameterSet(QParameterSet *ownedParameterSet) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->ownedParameterSets->contains(ownedParameterSet)) { - d->ownedParameterSets->insert(ownedParameterSet); + if (!d->ownedParameterSets.contains(ownedParameterSet)) { + d->ownedParameterSets.insert(ownedParameterSet); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); @@ -528,8 +520,8 @@ void QBehavioralFeature::removeOwnedParameterSet(QParameterSet *ownedParameterSe // This is a read-write association end Q_D(QBehavioralFeature); - if (d->ownedParameterSets->contains(ownedParameterSet)) { - d->ownedParameterSets->remove(ownedParameterSet); + if (d->ownedParameterSets.contains(ownedParameterSet)) { + d->ownedParameterSets.remove(ownedParameterSet); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameterSet)); @@ -539,7 +531,7 @@ void QBehavioralFeature::removeOwnedParameterSet(QParameterSet *ownedParameterSe /*! 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). */ -const QSet<QBehavior *> *QBehavioralFeature::methods() const +const QSet<QBehavior *> &QBehavioralFeature::methods() const { // This is a read-write association end @@ -552,8 +544,8 @@ void QBehavioralFeature::addMethod(QBehavior *method) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->methods->contains(method)) { - d->methods->insert(method); + if (!d->methods.contains(method)) { + d->methods.insert(method); // Adjust opposite property method->setSpecification(this); @@ -565,8 +557,8 @@ void QBehavioralFeature::removeMethod(QBehavior *method) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->methods->contains(method)) { - d->methods->remove(method); + if (d->methods.contains(method)) { + d->methods.remove(method); // Adjust opposite property method->setSpecification(0); @@ -585,56 +577,6 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa return bool(); // change here to your derived return } -void QBehavioralFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *"); - qRegisterMetaType<QBehavioralFeature *>("QBehavioralFeature *"); - qRegisterMetaType<const QSet<QBehavioralFeature *> *>("const QSet<QBehavioralFeature *> *"); - qRegisterMetaType<const QList<QBehavioralFeature *> *>("const QList<QBehavioralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<QParameterSet *>("QParameterSet *"); - qRegisterMetaType<const QSet<QParameterSet *> *>("const QSet<QParameterSet *> *"); - qRegisterMetaType<const QList<QParameterSet *> *>("const QList<QParameterSet *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qbehavioralfeature.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbehavioralfeature.h b/src/uml/qbehavioralfeature.h index d8dcbb31..dce98aad 100644 --- a/src/uml/qbehavioralfeature.h +++ b/src/uml/qbehavioralfeature.h @@ -77,10 +77,10 @@ class Q_UML_EXPORT QBehavioralFeature : public QWrappedObject Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(const QSet<QType *> * raisedExceptions READ raisedExceptions) - Q_PROPERTY(const QList<QParameter *> * ownedParameters READ ownedParameters) - Q_PROPERTY(const QSet<QParameterSet *> * ownedParameterSets READ ownedParameterSets) - Q_PROPERTY(const QSet<QBehavior *> * methods READ methods) + 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_DISABLE_COPY(QBehavioralFeature) Q_DECLARE_PRIVATE(QBehavioralFeature) @@ -90,9 +90,9 @@ public: virtual ~QBehavioralFeature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -107,23 +107,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QRedefinableElement Q_INVOKABLE bool isLeaf() const; @@ -131,8 +131,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -140,7 +140,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Attributes from QBehavioralFeature Q_INVOKABLE QtUml::CallConcurrencyKind concurrency() const; @@ -151,22 +151,21 @@ public: Q_INVOKABLE void unsetAbstract(); // Association ends from QBehavioralFeature - Q_INVOKABLE const QSet<QType *> *raisedExceptions() const; + Q_INVOKABLE const QSet<QType *> &raisedExceptions() const; Q_INVOKABLE void addRaisedException(QType *raisedException); Q_INVOKABLE void removeRaisedException(QType *raisedException); - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); - Q_INVOKABLE const QSet<QParameterSet *> *ownedParameterSets() const; + Q_INVOKABLE const QSet<QParameterSet *> &ownedParameterSets() const; Q_INVOKABLE void addOwnedParameterSet(QParameterSet *ownedParameterSet); Q_INVOKABLE void removeOwnedParameterSet(QParameterSet *ownedParameterSet); - Q_INVOKABLE const QSet<QBehavior *> *methods() const; + Q_INVOKABLE const QSet<QBehavior *> &methods() const; Q_INVOKABLE void addMethod(QBehavior *method); Q_INVOKABLE void removeMethod(QBehavior *method); // Operations Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; - virtual void registerMetaTypes() const; protected: explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -178,10 +177,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioralFeature) *> *) - QT_END_HEADER #endif // QTUML_QBEHAVIORALFEATURE_H diff --git a/src/uml/qbehavioralfeature_p.h b/src/uml/qbehavioralfeature_p.h index 328f1776..b9f28a7d 100644 --- a/src/uml/qbehavioralfeature_p.h +++ b/src/uml/qbehavioralfeature_p.h @@ -79,10 +79,10 @@ public: QtUml::CallConcurrencyKind concurrency; bool isAbstract; - QSet<QType *> *raisedExceptions; - QList<QParameter *> *ownedParameters; - QSet<QParameterSet *> *ownedParameterSets; - QSet<QBehavior *> *methods; + QSet<QType *> raisedExceptions; + QList<QParameter *> ownedParameters; + QSet<QParameterSet *> ownedParameterSets; + QSet<QBehavior *> methods; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbehavioredclassifier.cpp b/src/uml/qbehavioredclassifier.cpp index 36f7c03f..67b33d14 100644 --- a/src/uml/qbehavioredclassifier.cpp +++ b/src/uml/qbehavioredclassifier.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QBehavioredClassifierPrivate::QBehavioredClassifierPrivate() : - ownedBehaviors(new QSet<QBehavior *>), - interfaceRealizations(new QSet<QInterfaceRealization *>), classifierBehavior(0) { } QBehavioredClassifierPrivate::~QBehavioredClassifierPrivate() { - delete ownedBehaviors; - delete interfaceRealizations; } /*! @@ -89,7 +85,7 @@ QBehavioredClassifier::~QBehavioredClassifier() /*! References behavior specifications owned by a classifier. */ -const QSet<QBehavior *> *QBehavioredClassifier::ownedBehaviors() const +const QSet<QBehavior *> &QBehavioredClassifier::ownedBehaviors() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QBehavioredClassifier::addOwnedBehavior(QBehavior *ownedBehavior) // This is a read-write association end Q_D(QBehavioredClassifier); - if (!d->ownedBehaviors->contains(ownedBehavior)) { - d->ownedBehaviors->insert(ownedBehavior); + if (!d->ownedBehaviors.contains(ownedBehavior)) { + d->ownedBehaviors.insert(ownedBehavior); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedBehavior)); @@ -115,8 +111,8 @@ void QBehavioredClassifier::removeOwnedBehavior(QBehavior *ownedBehavior) // This is a read-write association end Q_D(QBehavioredClassifier); - if (d->ownedBehaviors->contains(ownedBehavior)) { - d->ownedBehaviors->remove(ownedBehavior); + if (d->ownedBehaviors.contains(ownedBehavior)) { + d->ownedBehaviors.remove(ownedBehavior); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedBehavior)); @@ -126,7 +122,7 @@ void QBehavioredClassifier::removeOwnedBehavior(QBehavior *ownedBehavior) /*! The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation. */ -const QSet<QInterfaceRealization *> *QBehavioredClassifier::interfaceRealizations() const +const QSet<QInterfaceRealization *> &QBehavioredClassifier::interfaceRealizations() const { // This is a read-write association end @@ -139,8 +135,8 @@ void QBehavioredClassifier::addInterfaceRealization(QInterfaceRealization *inter // This is a read-write association end Q_D(QBehavioredClassifier); - if (!d->interfaceRealizations->contains(interfaceRealization)) { - d->interfaceRealizations->insert(interfaceRealization); + if (!d->interfaceRealizations.contains(interfaceRealization)) { + d->interfaceRealizations.insert(interfaceRealization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(interfaceRealization)); @@ -156,8 +152,8 @@ void QBehavioredClassifier::removeInterfaceRealization(QInterfaceRealization *in // This is a read-write association end Q_D(QBehavioredClassifier); - if (d->interfaceRealizations->contains(interfaceRealization)) { - d->interfaceRealizations->remove(interfaceRealization); + if (d->interfaceRealizations.contains(interfaceRealization)) { + d->interfaceRealizations.remove(interfaceRealization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(interfaceRealization)); @@ -197,35 +193,6 @@ void QBehavioredClassifier::setClassifierBehavior(QBehavior *classifierBehavior) } } -void QBehavioredClassifier::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *"); - qRegisterMetaType<QBehavioredClassifier *>("QBehavioredClassifier *"); - qRegisterMetaType<const QSet<QBehavioredClassifier *> *>("const QSet<QBehavioredClassifier *> *"); - qRegisterMetaType<const QList<QBehavioredClassifier *> *>("const QList<QBehavioredClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *>("QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *"); - qRegisterMetaType<QInterfaceRealization *>("QInterfaceRealization *"); - qRegisterMetaType<const QSet<QInterfaceRealization *> *>("const QSet<QInterfaceRealization *> *"); - qRegisterMetaType<const QList<QInterfaceRealization *> *>("const QList<QInterfaceRealization *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QBehavioredClassifier::addClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization) diff --git a/src/uml/qbehavioredclassifier.h b/src/uml/qbehavioredclassifier.h index 9a3a0ed2..6f01580a 100644 --- a/src/uml/qbehavioredclassifier.h +++ b/src/uml/qbehavioredclassifier.h @@ -68,8 +68,8 @@ class Q_UML_EXPORT QBehavioredClassifier : public QClassifier { Q_OBJECT - Q_PROPERTY(const QSet<QBehavior *> * ownedBehaviors READ ownedBehaviors) - Q_PROPERTY(const QSet<QInterfaceRealization *> * interfaceRealizations READ interfaceRealizations) + Q_PROPERTY(QSet<QBehavior *> ownedBehaviors READ ownedBehaviors) + Q_PROPERTY(QSet<QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) Q_PROPERTY(QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) Q_DISABLE_COPY(QBehavioredClassifier) @@ -80,10 +80,10 @@ public: virtual ~QBehavioredClassifier(); // Association ends from QBehavioredClassifier - Q_INVOKABLE const QSet<QBehavior *> *ownedBehaviors() const; + Q_INVOKABLE const QSet<QBehavior *> &ownedBehaviors() const; Q_INVOKABLE void addOwnedBehavior(QBehavior *ownedBehavior); Q_INVOKABLE void removeOwnedBehavior(QBehavior *ownedBehavior); - Q_INVOKABLE const QSet<QInterfaceRealization *> *interfaceRealizations() const; + Q_INVOKABLE const QSet<QInterfaceRealization *> &interfaceRealizations() const; Q_INVOKABLE void addInterfaceRealization(QInterfaceRealization *interfaceRealization); Q_INVOKABLE void removeInterfaceRealization(QInterfaceRealization *interfaceRealization); Q_INVOKABLE QBehavior *classifierBehavior() const; @@ -92,7 +92,6 @@ public: // Overriden methods for subsetted properties Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization); Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization); - virtual void registerMetaTypes() const; protected: explicit QBehavioredClassifier(QBehavioredClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -100,10 +99,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *) - QT_END_HEADER #endif // QTUML_QBEHAVIOREDCLASSIFIER_H diff --git a/src/uml/qbehavioredclassifier_p.h b/src/uml/qbehavioredclassifier_p.h index 2d588c96..c6d9ae43 100644 --- a/src/uml/qbehavioredclassifier_p.h +++ b/src/uml/qbehavioredclassifier_p.h @@ -67,8 +67,8 @@ public: explicit QBehavioredClassifierPrivate(); virtual ~QBehavioredClassifierPrivate(); - QSet<QBehavior *> *ownedBehaviors; - QSet<QInterfaceRealization *> *interfaceRealizations; + QSet<QBehavior *> ownedBehaviors; + QSet<QInterfaceRealization *> interfaceRealizations; QBehavior *classifierBehavior; }; diff --git a/src/uml/qbehaviorexecutionspecification.cpp b/src/uml/qbehaviorexecutionspecification.cpp index 0b516004..4a821a7f 100644 --- a/src/uml/qbehaviorexecutionspecification.cpp +++ b/src/uml/qbehaviorexecutionspecification.cpp @@ -102,28 +102,6 @@ void QBehaviorExecutionSpecification::setBehavior(QBehavior *behavior) } } -void QBehaviorExecutionSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *> *"); - qRegisterMetaType<QBehaviorExecutionSpecification *>("QBehaviorExecutionSpecification *"); - qRegisterMetaType<const QSet<QBehaviorExecutionSpecification *> *>("const QSet<QBehaviorExecutionSpecification *> *"); - qRegisterMetaType<const QList<QBehaviorExecutionSpecification *> *>("const QList<QBehaviorExecutionSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - QExecutionSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qbehaviorexecutionspecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbehaviorexecutionspecification.h b/src/uml/qbehaviorexecutionspecification.h index ff07b9de..d30c385c 100644 --- a/src/uml/qbehaviorexecutionspecification.h +++ b/src/uml/qbehaviorexecutionspecification.h @@ -73,7 +73,6 @@ public: // Association ends from QBehaviorExecutionSpecification Q_INVOKABLE QBehavior *behavior() const; Q_INVOKABLE void setBehavior(QBehavior *behavior); - virtual void registerMetaTypes() const; protected: explicit QBehaviorExecutionSpecification(QBehaviorExecutionSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QBehaviorExecutionSpecification) *> *) - QT_END_HEADER #endif // QTUML_QBEHAVIOREXECUTIONSPECIFICATION_H diff --git a/src/uml/qbroadcastsignalaction.cpp b/src/uml/qbroadcastsignalaction.cpp index a177c23f..c8b4ab08 100644 --- a/src/uml/qbroadcastsignalaction.cpp +++ b/src/uml/qbroadcastsignalaction.cpp @@ -102,28 +102,6 @@ void QBroadcastSignalAction::setSignal(QSignal *signal) } } -void QBroadcastSignalAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *>("QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *> *"); - qRegisterMetaType<QBroadcastSignalAction *>("QBroadcastSignalAction *"); - qRegisterMetaType<const QSet<QBroadcastSignalAction *> *>("const QSet<QBroadcastSignalAction *> *"); - qRegisterMetaType<const QList<QBroadcastSignalAction *> *>("const QList<QBroadcastSignalAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSignal) *>("QT_PREPEND_NAMESPACE_QTUML(QSignal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<QSignal *>("QSignal *"); - qRegisterMetaType<const QSet<QSignal *> *>("const QSet<QSignal *> *"); - qRegisterMetaType<const QList<QSignal *> *>("const QList<QSignal *> *"); - - QInvocationAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qbroadcastsignalaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qbroadcastsignalaction.h b/src/uml/qbroadcastsignalaction.h index 401bc8ce..e36517d1 100644 --- a/src/uml/qbroadcastsignalaction.h +++ b/src/uml/qbroadcastsignalaction.h @@ -73,7 +73,6 @@ public: // Association ends from QBroadcastSignalAction Q_INVOKABLE QSignal *signal() const; Q_INVOKABLE void setSignal(QSignal *signal); - virtual void registerMetaTypes() const; protected: explicit QBroadcastSignalAction(QBroadcastSignalActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QBroadcastSignalAction) *> *) - QT_END_HEADER #endif // QTUML_QBROADCASTSIGNALACTION_H diff --git a/src/uml/qcallaction.cpp b/src/uml/qcallaction.cpp index d26cd13d..80d36c51 100644 --- a/src/uml/qcallaction.cpp +++ b/src/uml/qcallaction.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML QCallActionPrivate::QCallActionPrivate() : - isSynchronous(true), - results(new QList<QOutputPin *>) + isSynchronous(true) { } QCallActionPrivate::~QCallActionPrivate() { - delete results; } /*! @@ -116,7 +114,7 @@ void QCallAction::unsetSynchronous() /*! A list of output pins where the results of performing the invocation are placed. */ -const QList<QOutputPin *> *QCallAction::results() const +const QList<QOutputPin *> &QCallAction::results() const { // This is a read-write association end @@ -129,8 +127,8 @@ void QCallAction::addResult(QOutputPin *result) // This is a read-write association end Q_D(QCallAction); - if (!d->results->contains(result)) { - d->results->append(result); + if (!d->results.contains(result)) { + d->results.append(result); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); @@ -142,36 +140,14 @@ void QCallAction::removeResult(QOutputPin *result) // This is a read-write association end Q_D(QCallAction); - if (d->results->contains(result)) { - d->results->removeAll(result); + if (d->results.contains(result)) { + d->results.removeAll(result); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(result)); } } -void QCallAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *>("QT_PREPEND_NAMESPACE_QTUML(QCallAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *> *"); - qRegisterMetaType<QCallAction *>("QCallAction *"); - qRegisterMetaType<const QSet<QCallAction *> *>("const QSet<QCallAction *> *"); - qRegisterMetaType<const QList<QCallAction *> *>("const QList<QCallAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QInvocationAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcallaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallaction.h b/src/uml/qcallaction.h index cc464608..e0e1f3aa 100644 --- a/src/uml/qcallaction.h +++ b/src/uml/qcallaction.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QCallAction : public QInvocationAction Q_OBJECT Q_PROPERTY(bool isSynchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous) - Q_PROPERTY(const QList<QOutputPin *> * results READ results) + Q_PROPERTY(QList<QOutputPin *> results READ results) Q_DISABLE_COPY(QCallAction) Q_DECLARE_PRIVATE(QCallAction) @@ -80,10 +80,9 @@ public: Q_INVOKABLE void unsetSynchronous(); // Association ends from QCallAction - Q_INVOKABLE const QList<QOutputPin *> *results() const; + Q_INVOKABLE const QList<QOutputPin *> &results() const; Q_INVOKABLE void addResult(QOutputPin *result); Q_INVOKABLE void removeResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QCallAction(QCallActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCallAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCallAction) *> *) - QT_END_HEADER #endif // QTUML_QCALLACTION_H diff --git a/src/uml/qcallaction_p.h b/src/uml/qcallaction_p.h index e1df4a99..7d284cce 100644 --- a/src/uml/qcallaction_p.h +++ b/src/uml/qcallaction_p.h @@ -67,7 +67,7 @@ public: virtual ~QCallActionPrivate(); bool isSynchronous; - QList<QOutputPin *> *results; + QList<QOutputPin *> results; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallbehavioraction.cpp b/src/uml/qcallbehavioraction.cpp index d8d3bc65..b61e852c 100644 --- a/src/uml/qcallbehavioraction.cpp +++ b/src/uml/qcallbehavioraction.cpp @@ -102,28 +102,6 @@ void QCallBehaviorAction::setBehavior(QBehavior *behavior) } } -void QCallBehaviorAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *>("QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *> *"); - qRegisterMetaType<QCallBehaviorAction *>("QCallBehaviorAction *"); - qRegisterMetaType<const QSet<QCallBehaviorAction *> *>("const QSet<QCallBehaviorAction *> *"); - qRegisterMetaType<const QList<QCallBehaviorAction *> *>("const QList<QCallBehaviorAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - QCallAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcallbehavioraction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallbehavioraction.h b/src/uml/qcallbehavioraction.h index 126425e5..b0e170f6 100644 --- a/src/uml/qcallbehavioraction.h +++ b/src/uml/qcallbehavioraction.h @@ -73,7 +73,6 @@ public: // Association ends from QCallBehaviorAction Q_INVOKABLE QBehavior *behavior() const; Q_INVOKABLE void setBehavior(QBehavior *behavior); - virtual void registerMetaTypes() const; protected: explicit QCallBehaviorAction(QCallBehaviorActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCallBehaviorAction) *> *) - QT_END_HEADER #endif // QTUML_QCALLBEHAVIORACTION_H diff --git a/src/uml/qcallevent.cpp b/src/uml/qcallevent.cpp index 0594d14b..84df102f 100644 --- a/src/uml/qcallevent.cpp +++ b/src/uml/qcallevent.cpp @@ -102,28 +102,6 @@ void QCallEvent::setOperation(QOperation *operation) } } -void QCallEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *> *"); - qRegisterMetaType<QCallEvent *>("QCallEvent *"); - qRegisterMetaType<const QSet<QCallEvent *> *>("const QSet<QCallEvent *> *"); - qRegisterMetaType<const QList<QCallEvent *> *>("const QList<QCallEvent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QMessageEvent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcallevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcallevent.h b/src/uml/qcallevent.h index 719486a3..8e342dde 100644 --- a/src/uml/qcallevent.h +++ b/src/uml/qcallevent.h @@ -73,7 +73,6 @@ public: // Association ends from QCallEvent Q_INVOKABLE QOperation *operation() const; Q_INVOKABLE void setOperation(QOperation *operation); - virtual void registerMetaTypes() const; protected: explicit QCallEvent(QCallEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCallEvent) *> *) - QT_END_HEADER #endif // QTUML_QCALLEVENT_H diff --git a/src/uml/qcalloperationaction.cpp b/src/uml/qcalloperationaction.cpp index 596f0ffd..9595bf95 100644 --- a/src/uml/qcalloperationaction.cpp +++ b/src/uml/qcalloperationaction.cpp @@ -133,35 +133,6 @@ void QCallOperationAction::setTarget(QInputPin *target) } } -void QCallOperationAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *>("QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *> *"); - qRegisterMetaType<QCallOperationAction *>("QCallOperationAction *"); - qRegisterMetaType<const QSet<QCallOperationAction *> *>("const QSet<QCallOperationAction *> *"); - qRegisterMetaType<const QList<QCallOperationAction *> *>("const QList<QCallOperationAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QCallAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcalloperationaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcalloperationaction.h b/src/uml/qcalloperationaction.h index dbbe3c7d..5e96b65e 100644 --- a/src/uml/qcalloperationaction.h +++ b/src/uml/qcalloperationaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setOperation(QOperation *operation); Q_INVOKABLE QInputPin *target() const; Q_INVOKABLE void setTarget(QInputPin *target); - virtual void registerMetaTypes() const; protected: explicit QCallOperationAction(QCallOperationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCallOperationAction) *> *) - QT_END_HEADER #endif // QTUML_QCALLOPERATIONACTION_H diff --git a/src/uml/qcentralbuffernode.cpp b/src/uml/qcentralbuffernode.cpp index 2d6bab89..bdef1925 100644 --- a/src/uml/qcentralbuffernode.cpp +++ b/src/uml/qcentralbuffernode.cpp @@ -74,21 +74,6 @@ QCentralBufferNode::~QCentralBufferNode() { } -void QCentralBufferNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *>("QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *> *"); - qRegisterMetaType<QCentralBufferNode *>("QCentralBufferNode *"); - qRegisterMetaType<const QSet<QCentralBufferNode *> *>("const QSet<QCentralBufferNode *> *"); - qRegisterMetaType<const QList<QCentralBufferNode *> *>("const QList<QCentralBufferNode *> *"); - - QObjectNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcentralbuffernode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcentralbuffernode.h b/src/uml/qcentralbuffernode.h index 117deed1..80aed266 100644 --- a/src/uml/qcentralbuffernode.h +++ b/src/uml/qcentralbuffernode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QCentralBufferNode : public QObjectNode public: Q_INVOKABLE explicit QCentralBufferNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCentralBufferNode(); - virtual void registerMetaTypes() const; protected: explicit QCentralBufferNode(QCentralBufferNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCentralBufferNode) *> *) - QT_END_HEADER #endif // QTUML_QCENTRALBUFFERNODE_H diff --git a/src/uml/qchangeevent.cpp b/src/uml/qchangeevent.cpp index 29914275..b5110076 100644 --- a/src/uml/qchangeevent.cpp +++ b/src/uml/qchangeevent.cpp @@ -110,28 +110,6 @@ void QChangeEvent::setChangeExpression(QValueSpecification *changeExpression) } } -void QChangeEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *> *"); - qRegisterMetaType<QChangeEvent *>("QChangeEvent *"); - qRegisterMetaType<const QSet<QChangeEvent *> *>("const QSet<QChangeEvent *> *"); - qRegisterMetaType<const QList<QChangeEvent *> *>("const QList<QChangeEvent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QEvent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qchangeevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qchangeevent.h b/src/uml/qchangeevent.h index ac016c53..091a5a74 100644 --- a/src/uml/qchangeevent.h +++ b/src/uml/qchangeevent.h @@ -73,7 +73,6 @@ public: // Association ends from QChangeEvent Q_INVOKABLE QValueSpecification *changeExpression() const; Q_INVOKABLE void setChangeExpression(QValueSpecification *changeExpression); - virtual void registerMetaTypes() const; protected: explicit QChangeEvent(QChangeEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QChangeEvent) *> *) - QT_END_HEADER #endif // QTUML_QCHANGEEVENT_H diff --git a/src/uml/qclass.cpp b/src/uml/qclass.cpp index d9d0dc02..2554cbc7 100644 --- a/src/uml/qclass.cpp +++ b/src/uml/qclass.cpp @@ -55,20 +55,12 @@ QT_BEGIN_NAMESPACE_QTUML QClassPrivate::QClassPrivate() : isAbstract(false), - isActive(false), - nestedClassifiers(new QList<QClassifier *>), - ownedReceptions(new QSet<QReception *>), - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>) + isActive(false) { } QClassPrivate::~QClassPrivate() { - delete nestedClassifiers; - delete ownedReceptions; - delete ownedOperations; - delete ownedAttributes; } void QClassPrivate::addExtension(QExtension *extension) @@ -135,7 +127,7 @@ QClass::~QClass() /*! The Elements owned by this element. */ -const QSet<QElement *> *QClass::ownedElements() const +const QSet<QElement *> &QClass::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -151,7 +143,7 @@ QElement *QClass::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QClass::ownedComments() const +const QSet<QComment *> &QClass::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -219,7 +211,7 @@ QNamespace *QClass::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QClass::clientDependencies() const +const QSet<QDependency *> &QClass::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -241,7 +233,7 @@ void QClass::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QClass::packageImports() const +const QSet<QPackageImport *> &QClass::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -259,7 +251,7 @@ void QClass::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QClass::members() const +const QSet<QNamedElement *> &QClass::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -267,7 +259,7 @@ const QSet<QNamedElement *> *QClass::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QClass::importedMembers() const +const QSet<QPackageableElement *> &QClass::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -275,7 +267,7 @@ const QSet<QPackageableElement *> *QClass::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QClass::elementImports() const +const QSet<QElementImport *> &QClass::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -293,7 +285,7 @@ void QClass::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QClass::ownedRules() const +const QSet<QConstraint *> &QClass::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -311,7 +303,7 @@ void QClass::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QClass::ownedMembers() const +const QSet<QNamedElement *> &QClass::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -401,7 +393,7 @@ void QClass::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QClass::redefinedElements() const +const QSet<QRedefinableElement *> &QClass::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -409,7 +401,7 @@ const QSet<QRedefinableElement *> *QClass::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QClass::redefinitionContexts() const +const QSet<QClassifier *> &QClass::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -421,7 +413,7 @@ const QSet<QClassifier *> *QClass::redefinitionContexts() const /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QClass::templateBindings() const +const QSet<QTemplateBinding *> &QClass::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -465,7 +457,7 @@ void QClass::unsetFinalSpecialization() /*! References the use cases owned by this classifier. */ -const QSet<QUseCase *> *QClass::ownedUseCases() const +const QSet<QUseCase *> &QClass::ownedUseCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } @@ -483,7 +475,7 @@ void QClass::removeOwnedUseCase(QUseCase *ownedUseCase) /*! Designates the GeneralizationSet of which the associated Classifier is a power type. */ -const QSet<QGeneralizationSet *> *QClass::powertypeExtents() const +const QSet<QGeneralizationSet *> &QClass::powertypeExtents() const { return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } @@ -501,7 +493,7 @@ void QClass::removePowertypeExtent(QGeneralizationSet *powertypeExtent) /*! The set of use cases for which this Classifier is the subject. */ -const QSet<QUseCase *> *QClass::useCases() const +const QSet<QUseCase *> &QClass::useCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } @@ -532,7 +524,7 @@ void QClass::setTemplateParameter(QClassifierTemplateParameter *templateParamete /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QClass::redefinedClassifiers() const +const QSet<QClassifier *> &QClass::redefinedClassifiers() const { return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } @@ -563,7 +555,7 @@ void QClass::setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTempl /*! References the collaboration uses owned by the classifier. */ -const QSet<QCollaborationUse *> *QClass::collaborationUses() const +const QSet<QCollaborationUse *> &QClass::collaborationUses() const { return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } @@ -581,7 +573,7 @@ void QClass::removeCollaborationUse(QCollaborationUse *collaborationUse) /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QClass::attributes() const +const QSet<QProperty *> &QClass::attributes() const { return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } @@ -589,7 +581,7 @@ const QSet<QProperty *> *QClass::attributes() const /*! 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. */ -const QSet<QFeature *> *QClass::features() const +const QSet<QFeature *> &QClass::features() const { return (qwrappedobject_cast<const QClassifier *>(this))->features(); } @@ -610,7 +602,7 @@ void QClass::setRepresentation(QCollaborationUse *representation) /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QClass::generalizations() const +const QSet<QGeneralization *> &QClass::generalizations() const { return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } @@ -628,7 +620,7 @@ void QClass::removeGeneralization(QGeneralization *generalization) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QClass::inheritedMembers() const +const QSet<QNamedElement *> &QClass::inheritedMembers() const { return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } @@ -636,7 +628,7 @@ const QSet<QNamedElement *> *QClass::inheritedMembers() const /*! References the substitutions that are owned by this Classifier. */ -const QSet<QSubstitution *> *QClass::substitutions() const +const QSet<QSubstitution *> &QClass::substitutions() const { return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } @@ -658,7 +650,7 @@ void QClass::removeSubstitution(QSubstitution *substitution) /*! References the roles that instances may play in this classifier. */ -const QSet<QConnectableElement *> *QClass::roles() const +const QSet<QConnectableElement *> &QClass::roles() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->roles(); } @@ -666,7 +658,7 @@ const QSet<QConnectableElement *> *QClass::roles() const /*! References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true. */ -const QSet<QProperty *> *QClass::parts() const +const QSet<QProperty *> &QClass::parts() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->parts(); } @@ -674,7 +666,7 @@ const QSet<QProperty *> *QClass::parts() const /*! References the connectors owned by the classifier. */ -const QSet<QConnector *> *QClass::ownedConnectors() const +const QSet<QConnector *> &QClass::ownedConnectors() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->ownedConnectors(); } @@ -696,7 +688,7 @@ void QClass::removeOwnedConnector(QConnector *ownedConnector) /*! References a set of ports that an encapsulated classifier owns. */ -const QSet<QPort *> *QClass::ownedPorts() const +const QSet<QPort *> &QClass::ownedPorts() const { return (qwrappedobject_cast<const QEncapsulatedClassifier *>(this))->ownedPorts(); } @@ -708,7 +700,7 @@ const QSet<QPort *> *QClass::ownedPorts() const /*! References behavior specifications owned by a classifier. */ -const QSet<QBehavior *> *QClass::ownedBehaviors() const +const QSet<QBehavior *> &QClass::ownedBehaviors() const { return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->ownedBehaviors(); } @@ -726,7 +718,7 @@ void QClass::removeOwnedBehavior(QBehavior *ownedBehavior) /*! The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation. */ -const QSet<QInterfaceRealization *> *QClass::interfaceRealizations() const +const QSet<QInterfaceRealization *> &QClass::interfaceRealizations() const { return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->interfaceRealizations(); } @@ -817,7 +809,7 @@ void QClass::unsetActive() /*! References all the Classifiers that are defined (nested) within the Class. */ -const QList<QClassifier *> *QClass::nestedClassifiers() const +const QList<QClassifier *> &QClass::nestedClassifiers() const { // This is a read-write association end @@ -830,8 +822,8 @@ void QClass::addNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QClass); - if (!d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->append(nestedClassifier); + if (!d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.append(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -843,8 +835,8 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QClass); - if (d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->removeAll(nestedClassifier); + if (d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.removeAll(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -854,7 +846,7 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) /*! Receptions that objects of this class are willing to accept. */ -const QSet<QReception *> *QClass::ownedReceptions() const +const QSet<QReception *> &QClass::ownedReceptions() const { // This is a read-write association end @@ -867,8 +859,8 @@ void QClass::addOwnedReception(QReception *ownedReception) // This is a read-write association end Q_D(QClass); - if (!d->ownedReceptions->contains(ownedReception)) { - d->ownedReceptions->insert(ownedReception); + if (!d->ownedReceptions.contains(ownedReception)) { + d->ownedReceptions.insert(ownedReception); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedReception)); @@ -881,8 +873,8 @@ void QClass::removeOwnedReception(QReception *ownedReception) // This is a read-write association end Q_D(QClass); - if (d->ownedReceptions->contains(ownedReception)) { - d->ownedReceptions->remove(ownedReception); + if (d->ownedReceptions.contains(ownedReception)) { + d->ownedReceptions.remove(ownedReception); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedReception)); @@ -893,19 +885,19 @@ void QClass::removeOwnedReception(QReception *ownedReception) /*! References the Extensions that specify additional properties of the metaclass. The property is derived from the extensions whose memberEnds are typed by the Class. */ -const QSet<QExtension *> *QClass::extensions() const +const QSet<QExtension *> &QClass::extensions() const { // This is a read-only derived association end qWarning("QClass::extensions: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QExtension *>); // change here to your derived return } /*! The operations owned by the class. */ -const QList<QOperation *> *QClass::ownedOperations() const +const QList<QOperation *> &QClass::ownedOperations() const { // This is a read-write association end @@ -918,8 +910,8 @@ void QClass::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QClass); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -935,8 +927,8 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QClass); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -950,7 +942,7 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) /*! The attributes (i.e. the properties) owned by the class. */ -const QList<QProperty *> *QClass::ownedAttributes() const +const QList<QProperty *> &QClass::ownedAttributes() const { // This is a read-write association end @@ -963,8 +955,8 @@ void QClass::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QClass); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -980,8 +972,8 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QClass); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -995,13 +987,13 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) /*! This gives the superclasses of a class. */ -const QSet<QClass *> *QClass::superClasses() const +const QSet<QClass *> &QClass::superClasses() const { // This is a read-write derived association end qWarning("QClass::superClasses: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QClass *>); // change here to your derived return } void QClass::addSuperClass(QClass *superClass) @@ -1031,69 +1023,12 @@ void QClass::removeSuperClass(QClass *superClass) /*! The inherit operation is overridden to exclude redefined properties. */ -const QSet<QNamedElement *> *QClass::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QClass::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QClass::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return -} - -void QClass::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClass) *>("QT_PREPEND_NAMESPACE_QTUML(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReception) *>("QT_PREPEND_NAMESPACE_QTUML(QReception) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *"); - qRegisterMetaType<QReception *>("QReception *"); - qRegisterMetaType<const QSet<QReception *> *>("const QSet<QReception *> *"); - qRegisterMetaType<const QList<QReception *> *>("const QList<QReception *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtension) *>("QT_PREPEND_NAMESPACE_QTUML(QExtension) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *"); - qRegisterMetaType<QExtension *>("QExtension *"); - qRegisterMetaType<const QSet<QExtension *> *>("const QSet<QExtension *> *"); - qRegisterMetaType<const QList<QExtension *> *>("const QList<QExtension *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QNamedElement *>); // change here to your derived return } #include "moc_qclass.cpp" diff --git a/src/uml/qclass.h b/src/uml/qclass.h index c2a37128..15d5a3f6 100644 --- a/src/uml/qclass.h +++ b/src/uml/qclass.h @@ -75,12 +75,12 @@ class Q_UML_EXPORT QClass : public QWrappedObject Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive) - Q_PROPERTY(const QList<QClassifier *> * nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(const QSet<QReception *> * ownedReceptions READ ownedReceptions) - Q_PROPERTY(const QSet<QExtension *> * extensions READ extensions STORED false) - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) - Q_PROPERTY(const QSet<QClass *> * superClasses READ superClasses STORED false) + 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_DISABLE_COPY(QClass) Q_DECLARE_PRIVATE(QClass) @@ -90,9 +90,9 @@ public: virtual ~QClass(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -105,23 +105,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -142,11 +142,11 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QTemplateableElement - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -156,52 +156,52 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from aggregated QClassifier - Q_INVOKABLE const QSet<QUseCase *> *ownedUseCases() const; + Q_INVOKABLE const QSet<QUseCase *> &ownedUseCases() const; Q_INVOKABLE void addOwnedUseCase(QUseCase *ownedUseCase); Q_INVOKABLE void removeOwnedUseCase(QUseCase *ownedUseCase); - Q_INVOKABLE const QSet<QGeneralizationSet *> *powertypeExtents() const; + Q_INVOKABLE const QSet<QGeneralizationSet *> &powertypeExtents() const; Q_INVOKABLE void addPowertypeExtent(QGeneralizationSet *powertypeExtent); Q_INVOKABLE void removePowertypeExtent(QGeneralizationSet *powertypeExtent); - Q_INVOKABLE const QSet<QUseCase *> *useCases() const; + Q_INVOKABLE const QSet<QUseCase *> &useCases() const; Q_INVOKABLE void addUseCase(QUseCase *useCase); Q_INVOKABLE void removeUseCase(QUseCase *useCase); Q_INVOKABLE QClassifierTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QClassifierTemplateParameter *templateParameter); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE QRedefinableTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QCollaborationUse *> *collaborationUses() const; + Q_INVOKABLE const QSet<QCollaborationUse *> &collaborationUses() const; Q_INVOKABLE void addCollaborationUse(QCollaborationUse *collaborationUse); Q_INVOKABLE void removeCollaborationUse(QCollaborationUse *collaborationUse); - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; Q_INVOKABLE QCollaborationUse *representation() const; Q_INVOKABLE void setRepresentation(QCollaborationUse *representation); - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QSubstitution *> *substitutions() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QSubstitution *> &substitutions() const; Q_INVOKABLE void addSubstitution(QSubstitution *substitution); Q_INVOKABLE void removeSubstitution(QSubstitution *substitution); // Association ends from aggregated QStructuredClassifier - Q_INVOKABLE const QSet<QConnectableElement *> *roles() const; - Q_INVOKABLE const QSet<QProperty *> *parts() const; - Q_INVOKABLE const QSet<QConnector *> *ownedConnectors() const; + Q_INVOKABLE const QSet<QConnectableElement *> &roles() const; + Q_INVOKABLE const QSet<QProperty *> &parts() const; + Q_INVOKABLE const QSet<QConnector *> &ownedConnectors() const; Q_INVOKABLE void addOwnedConnector(QConnector *ownedConnector); Q_INVOKABLE void removeOwnedConnector(QConnector *ownedConnector); // Association ends from aggregated QEncapsulatedClassifier - Q_INVOKABLE const QSet<QPort *> *ownedPorts() const; + Q_INVOKABLE const QSet<QPort *> &ownedPorts() const; // Association ends from aggregated QBehavioredClassifier - Q_INVOKABLE const QSet<QBehavior *> *ownedBehaviors() const; + Q_INVOKABLE const QSet<QBehavior *> &ownedBehaviors() const; Q_INVOKABLE void addOwnedBehavior(QBehavior *ownedBehavior); Q_INVOKABLE void removeOwnedBehavior(QBehavior *ownedBehavior); - Q_INVOKABLE const QSet<QInterfaceRealization *> *interfaceRealizations() const; + Q_INVOKABLE const QSet<QInterfaceRealization *> &interfaceRealizations() const; Q_INVOKABLE void addInterfaceRealization(QInterfaceRealization *interfaceRealization); Q_INVOKABLE void removeInterfaceRealization(QInterfaceRealization *interfaceRealization); Q_INVOKABLE QBehavior *classifierBehavior() const; @@ -216,26 +216,25 @@ public: Q_INVOKABLE void unsetActive(); // Association ends from QClass - Q_INVOKABLE const QList<QClassifier *> *nestedClassifiers() const; + Q_INVOKABLE const QList<QClassifier *> &nestedClassifiers() const; Q_INVOKABLE void addNestedClassifier(QClassifier *nestedClassifier); Q_INVOKABLE void removeNestedClassifier(QClassifier *nestedClassifier); - Q_INVOKABLE const QSet<QReception *> *ownedReceptions() const; + Q_INVOKABLE const QSet<QReception *> &ownedReceptions() const; Q_INVOKABLE void addOwnedReception(QReception *ownedReception); Q_INVOKABLE void removeOwnedReception(QReception *ownedReception); - Q_INVOKABLE const QSet<QExtension *> *extensions() const; - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QSet<QExtension *> &extensions() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - Q_INVOKABLE const QSet<QClass *> *superClasses() const; + Q_INVOKABLE const QSet<QClass *> &superClasses() const; Q_INVOKABLE void addSuperClass(QClass *superClass); Q_INVOKABLE void removeSuperClass(QClass *superClass); // Operations - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; // Classes which access read-only opposite properties should be friend friend class QExtensionPrivate; @@ -250,10 +249,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClass) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *) - QT_END_HEADER #endif // QTUML_QCLASS_H diff --git a/src/uml/qclass_p.h b/src/uml/qclass_p.h index 2aeef6d4..ff3fdf68 100644 --- a/src/uml/qclass_p.h +++ b/src/uml/qclass_p.h @@ -78,10 +78,10 @@ public: bool isAbstract; bool isActive; - QList<QClassifier *> *nestedClassifiers; - QSet<QReception *> *ownedReceptions; - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; + QList<QClassifier *> nestedClassifiers; + QSet<QReception *> ownedReceptions; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; // Internal functions for read-only subsetted association ends void addExtension(QExtension *extension); diff --git a/src/uml/qclassifier.cpp b/src/uml/qclassifier.cpp index 1c481939..12bc0535 100644 --- a/src/uml/qclassifier.cpp +++ b/src/uml/qclassifier.cpp @@ -60,41 +60,23 @@ QT_BEGIN_NAMESPACE_QTUML QClassifierPrivate::QClassifierPrivate() : isAbstract(false), isFinalSpecialization(false), - ownedUseCases(new QSet<QUseCase *>), - powertypeExtents(new QSet<QGeneralizationSet *>), - useCases(new QSet<QUseCase *>), templateParameter(0), - redefinedClassifiers(new QSet<QClassifier *>), ownedTemplateSignature(0), - collaborationUses(new QSet<QCollaborationUse *>), - attributes(new QSet<QProperty *>), - features(new QSet<QFeature *>), - representation(0), - generalizations(new QSet<QGeneralization *>), - substitutions(new QSet<QSubstitution *>) + representation(0) { } QClassifierPrivate::~QClassifierPrivate() { - delete ownedUseCases; - delete powertypeExtents; - delete useCases; - delete redefinedClassifiers; delete ownedTemplateSignature; - delete collaborationUses; - delete attributes; - delete features; - delete generalizations; - delete substitutions; } void QClassifierPrivate::addAttribute(QProperty *attribute) { // This is a read-only derived-union association end - if (!this->attributes->contains(attribute)) { - this->attributes->insert(attribute); + if (!this->attributes.contains(attribute)) { + this->attributes.insert(attribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(this))->addFeature(qwrappedobject_cast<QFeature *>(attribute)); @@ -105,8 +87,8 @@ void QClassifierPrivate::removeAttribute(QProperty *attribute) { // This is a read-only derived-union association end - if (this->attributes->contains(attribute)) { - this->attributes->remove(attribute); + if (this->attributes.contains(attribute)) { + this->attributes.remove(attribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(this))->removeFeature(qwrappedobject_cast<QFeature *>(attribute)); @@ -117,8 +99,8 @@ void QClassifierPrivate::addFeature(QFeature *feature) { // This is a read-only derived-union association end - if (!this->features->contains(feature)) { - this->features->insert(feature); + if (!this->features.contains(feature)) { + this->features.insert(feature); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(feature)); @@ -133,8 +115,8 @@ void QClassifierPrivate::removeFeature(QFeature *feature) { // This is a read-only derived-union association end - if (this->features->contains(feature)) { - this->features->remove(feature); + if (this->features.contains(feature)) { + this->features.remove(feature); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(feature)); @@ -183,7 +165,7 @@ QClassifier::~QClassifier() /*! The Elements owned by this element. */ -const QSet<QElement *> *QClassifier::ownedElements() const +const QSet<QElement *> &QClassifier::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -199,7 +181,7 @@ QElement *QClassifier::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QClassifier::ownedComments() const +const QSet<QComment *> &QClassifier::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -267,7 +249,7 @@ QNamespace *QClassifier::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QClassifier::clientDependencies() const +const QSet<QDependency *> &QClassifier::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -289,7 +271,7 @@ void QClassifier::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QClassifier::packageImports() const +const QSet<QPackageImport *> &QClassifier::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -307,7 +289,7 @@ void QClassifier::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QClassifier::members() const +const QSet<QNamedElement *> &QClassifier::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -315,7 +297,7 @@ const QSet<QNamedElement *> *QClassifier::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QClassifier::importedMembers() const +const QSet<QPackageableElement *> &QClassifier::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -323,7 +305,7 @@ const QSet<QPackageableElement *> *QClassifier::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QClassifier::elementImports() const +const QSet<QElementImport *> &QClassifier::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -341,7 +323,7 @@ void QClassifier::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QClassifier::ownedRules() const +const QSet<QConstraint *> &QClassifier::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -359,7 +341,7 @@ void QClassifier::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QClassifier::ownedMembers() const +const QSet<QNamedElement *> &QClassifier::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -449,7 +431,7 @@ void QClassifier::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const +const QSet<QRedefinableElement *> &QClassifier::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -457,7 +439,7 @@ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QClassifier::redefinitionContexts() const +const QSet<QClassifier *> &QClassifier::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -469,7 +451,7 @@ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QClassifier::templateBindings() const +const QSet<QTemplateBinding *> &QClassifier::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -547,7 +529,7 @@ void QClassifier::unsetFinalSpecialization() /*! References the use cases owned by this classifier. */ -const QSet<QUseCase *> *QClassifier::ownedUseCases() const +const QSet<QUseCase *> &QClassifier::ownedUseCases() const { // This is a read-write association end @@ -560,8 +542,8 @@ void QClassifier::addOwnedUseCase(QUseCase *ownedUseCase) // This is a read-write association end Q_D(QClassifier); - if (!d->ownedUseCases->contains(ownedUseCase)) { - d->ownedUseCases->insert(ownedUseCase); + if (!d->ownedUseCases.contains(ownedUseCase)) { + d->ownedUseCases.insert(ownedUseCase); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedUseCase)); @@ -573,8 +555,8 @@ void QClassifier::removeOwnedUseCase(QUseCase *ownedUseCase) // This is a read-write association end Q_D(QClassifier); - if (d->ownedUseCases->contains(ownedUseCase)) { - d->ownedUseCases->remove(ownedUseCase); + if (d->ownedUseCases.contains(ownedUseCase)) { + d->ownedUseCases.remove(ownedUseCase); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedUseCase)); @@ -584,7 +566,7 @@ void QClassifier::removeOwnedUseCase(QUseCase *ownedUseCase) /*! Designates the GeneralizationSet of which the associated Classifier is a power type. */ -const QSet<QGeneralizationSet *> *QClassifier::powertypeExtents() const +const QSet<QGeneralizationSet *> &QClassifier::powertypeExtents() const { // This is a read-write association end @@ -597,8 +579,8 @@ void QClassifier::addPowertypeExtent(QGeneralizationSet *powertypeExtent) // This is a read-write association end Q_D(QClassifier); - if (!d->powertypeExtents->contains(powertypeExtent)) { - d->powertypeExtents->insert(powertypeExtent); + if (!d->powertypeExtents.contains(powertypeExtent)) { + d->powertypeExtents.insert(powertypeExtent); // Adjust opposite property powertypeExtent->setPowertype(this); @@ -610,8 +592,8 @@ void QClassifier::removePowertypeExtent(QGeneralizationSet *powertypeExtent) // This is a read-write association end Q_D(QClassifier); - if (d->powertypeExtents->contains(powertypeExtent)) { - d->powertypeExtents->remove(powertypeExtent); + if (d->powertypeExtents.contains(powertypeExtent)) { + d->powertypeExtents.remove(powertypeExtent); // Adjust opposite property powertypeExtent->setPowertype(0); @@ -621,7 +603,7 @@ void QClassifier::removePowertypeExtent(QGeneralizationSet *powertypeExtent) /*! The set of use cases for which this Classifier is the subject. */ -const QSet<QUseCase *> *QClassifier::useCases() const +const QSet<QUseCase *> &QClassifier::useCases() const { // This is a read-write association end @@ -634,8 +616,8 @@ void QClassifier::addUseCase(QUseCase *useCase) // This is a read-write association end Q_D(QClassifier); - if (!d->useCases->contains(useCase)) { - d->useCases->insert(useCase); + if (!d->useCases.contains(useCase)) { + d->useCases.insert(useCase); // Adjust opposite property useCase->addSubject(this); @@ -647,8 +629,8 @@ void QClassifier::removeUseCase(QUseCase *useCase) // This is a read-write association end Q_D(QClassifier); - if (d->useCases->contains(useCase)) { - d->useCases->remove(useCase); + if (d->useCases.contains(useCase)) { + d->useCases.remove(useCase); // Adjust opposite property if (useCase) @@ -685,7 +667,7 @@ void QClassifier::setTemplateParameter(QClassifierTemplateParameter *templatePar /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QClassifier::redefinedClassifiers() const +const QSet<QClassifier *> &QClassifier::redefinedClassifiers() const { // This is a read-write association end @@ -698,8 +680,8 @@ void QClassifier::addRedefinedClassifier(QClassifier *redefinedClassifier) // This is a read-write association end Q_D(QClassifier); - if (!d->redefinedClassifiers->contains(redefinedClassifier)) { - d->redefinedClassifiers->insert(redefinedClassifier); + if (!d->redefinedClassifiers.contains(redefinedClassifier)) { + d->redefinedClassifiers.insert(redefinedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); @@ -711,8 +693,8 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) // This is a read-write association end Q_D(QClassifier); - if (d->redefinedClassifiers->contains(redefinedClassifier)) { - d->redefinedClassifiers->remove(redefinedClassifier); + if (d->redefinedClassifiers.contains(redefinedClassifier)) { + d->redefinedClassifiers.remove(redefinedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); @@ -748,7 +730,7 @@ void QClassifier::setOwnedTemplateSignature(QRedefinableTemplateSignature *owned /*! References the collaboration uses owned by the classifier. */ -const QSet<QCollaborationUse *> *QClassifier::collaborationUses() const +const QSet<QCollaborationUse *> &QClassifier::collaborationUses() const { // This is a read-write association end @@ -761,8 +743,8 @@ void QClassifier::addCollaborationUse(QCollaborationUse *collaborationUse) // This is a read-write association end Q_D(QClassifier); - if (!d->collaborationUses->contains(collaborationUse)) { - d->collaborationUses->insert(collaborationUse); + if (!d->collaborationUses.contains(collaborationUse)) { + d->collaborationUses.insert(collaborationUse); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(collaborationUse)); @@ -774,8 +756,8 @@ void QClassifier::removeCollaborationUse(QCollaborationUse *collaborationUse) // This is a read-write association end Q_D(QClassifier); - if (d->collaborationUses->contains(collaborationUse)) { - d->collaborationUses->remove(collaborationUse); + if (d->collaborationUses.contains(collaborationUse)) { + d->collaborationUses.remove(collaborationUse); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(collaborationUse)); @@ -785,7 +767,7 @@ void QClassifier::removeCollaborationUse(QCollaborationUse *collaborationUse) /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QClassifier::attributes() const +const QSet<QProperty *> &QClassifier::attributes() const { // This is a read-only derived-union association end @@ -796,7 +778,7 @@ const QSet<QProperty *> *QClassifier::attributes() const /*! 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. */ -const QSet<QFeature *> *QClassifier::features() const +const QSet<QFeature *> &QClassifier::features() const { // This is a read-only derived-union association end @@ -807,13 +789,13 @@ const QSet<QFeature *> *QClassifier::features() const /*! Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship. */ -const QSet<QClassifier *> *QClassifier::generals() const +const QSet<QClassifier *> &QClassifier::generals() const { // This is a read-write derived association end qWarning("QClassifier::generals: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QClassifier *>); // change here to your derived return } void QClassifier::addGeneral(QClassifier *general) @@ -872,7 +854,7 @@ void QClassifier::setRepresentation(QCollaborationUse *representation) /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QClassifier::generalizations() const +const QSet<QGeneralization *> &QClassifier::generalizations() const { // This is a read-write association end @@ -885,8 +867,8 @@ void QClassifier::addGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QClassifier); - if (!d->generalizations->contains(generalization)) { - d->generalizations->insert(generalization); + if (!d->generalizations.contains(generalization)) { + d->generalizations.insert(generalization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalization)); @@ -901,8 +883,8 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QClassifier); - if (d->generalizations->contains(generalization)) { - d->generalizations->remove(generalization); + if (d->generalizations.contains(generalization)) { + d->generalizations.remove(generalization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalization)); @@ -915,19 +897,19 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QClassifier::inheritedMembers() const +const QSet<QNamedElement *> &QClassifier::inheritedMembers() const { // This is a read-only derived association end qWarning("QClassifier::inheritedMembers: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! References the substitutions that are owned by this Classifier. */ -const QSet<QSubstitution *> *QClassifier::substitutions() const +const QSet<QSubstitution *> &QClassifier::substitutions() const { // This is a read-write association end @@ -940,8 +922,8 @@ void QClassifier::addSubstitution(QSubstitution *substitution) // This is a read-write association end Q_D(QClassifier); - if (!d->substitutions->contains(substitution)) { - d->substitutions->insert(substitution); + if (!d->substitutions.contains(substitution)) { + d->substitutions.insert(substitution); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(substitution)); @@ -957,8 +939,8 @@ void QClassifier::removeSubstitution(QSubstitution *substitution) // This is a read-write association end Q_D(QClassifier); - if (d->substitutions->contains(substitution)) { - d->substitutions->remove(substitution); + if (d->substitutions.contains(substitution)) { + d->substitutions.remove(substitution); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(substitution)); @@ -972,21 +954,21 @@ void QClassifier::removeSubstitution(QSubstitution *substitution) /*! The query allFeatures() gives all of the features in the namespace of the classifier. In general, through mechanisms such as inheritance, this will be a larger set than feature. */ -const QSet<QFeature *> *QClassifier::allFeatures() const +const QSet<QFeature *> &QClassifier::allFeatures() const { qWarning("QClassifier::allFeatures: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QFeature *>); // change here to your derived return } /*! The query allParents() gives all of the direct and indirect ancestors of a generalized Classifier. */ -const QSet<QClassifier *> *QClassifier::allParents() const +const QSet<QClassifier *> &QClassifier::allParents() const { qWarning("QClassifier::allParents: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QClassifier *>); // change here to your derived return } /*! @@ -1014,23 +996,23 @@ bool QClassifier::hasVisibilityOf(const QNamedElement *n) const /*! The inherit operation is overridden to exclude redefined properties.The query inherit() defines how to inherit a set of elements. Here the operation is defined to inherit them all. It is intended to be redefined in circumstances where inheritance is affected by redefinition. */ -const QSet<QNamedElement *> *QClassifier::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QClassifier::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QClassifier::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! The query inheritableMembers() gives all of the members of a classifier that may be inherited in one of its descendants, subject to whatever visibility restrictions apply. */ -const QSet<QNamedElement *> *QClassifier::inheritableMembers(const QClassifier *c) const +const QSet<QNamedElement *> &QClassifier::inheritableMembers(const QClassifier *c) const { qWarning("QClassifier::inheritableMembers: operation to be implemented"); Q_UNUSED(c); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! @@ -1057,96 +1039,11 @@ bool QClassifier::maySpecializeType(const QClassifier *c) const /*! The query parents() gives all of the immediate ancestors of a generalized Classifier. */ -const QSet<QClassifier *> *QClassifier::parents() const +const QSet<QClassifier *> &QClassifier::parents() const { qWarning("QClassifier::parents: operation to be implemented"); - return 0; // change here to your derived return -} - -void QClassifier::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *>("QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *"); - qRegisterMetaType<QRedefinableTemplateSignature *>("QRedefinableTemplateSignature *"); - qRegisterMetaType<const QSet<QRedefinableTemplateSignature *> *>("const QSet<QRedefinableTemplateSignature *> *"); - qRegisterMetaType<const QList<QRedefinableTemplateSignature *> *>("const QList<QRedefinableTemplateSignature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *"); - qRegisterMetaType<QClassifierTemplateParameter *>("QClassifierTemplateParameter *"); - qRegisterMetaType<const QSet<QClassifierTemplateParameter *> *>("const QSet<QClassifierTemplateParameter *> *"); - qRegisterMetaType<const QList<QClassifierTemplateParameter *> *>("const QList<QClassifierTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *>("QT_PREPEND_NAMESPACE_QTUML(QUseCase) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<QUseCase *>("QUseCase *"); - qRegisterMetaType<const QSet<QUseCase *> *>("const QSet<QUseCase *> *"); - qRegisterMetaType<const QList<QUseCase *> *>("const QList<QUseCase *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *>("QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *"); - qRegisterMetaType<QSubstitution *>("QSubstitution *"); - qRegisterMetaType<const QSet<QSubstitution *> *>("const QSet<QSubstitution *> *"); - qRegisterMetaType<const QList<QSubstitution *> *>("const QList<QSubstitution *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *"); - qRegisterMetaType<QGeneralizationSet *>("QGeneralizationSet *"); - qRegisterMetaType<const QSet<QGeneralizationSet *> *>("const QSet<QGeneralizationSet *> *"); - qRegisterMetaType<const QList<QGeneralizationSet *> *>("const QList<QGeneralizationSet *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *>("QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *"); - qRegisterMetaType<QCollaborationUse *>("QCollaborationUse *"); - qRegisterMetaType<const QSet<QCollaborationUse *> *>("const QSet<QCollaborationUse *> *"); - qRegisterMetaType<const QList<QCollaborationUse *> *>("const QList<QCollaborationUse *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *"); - qRegisterMetaType<QFeature *>("QFeature *"); - qRegisterMetaType<const QSet<QFeature *> *>("const QSet<QFeature *> *"); - qRegisterMetaType<const QList<QFeature *> *>("const QList<QFeature *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QClassifier *>); // change here to your derived return } // Overriden methods for subsetted properties diff --git a/src/uml/qclassifier.h b/src/uml/qclassifier.h index 250c2542..b724fbf1 100644 --- a/src/uml/qclassifier.h +++ b/src/uml/qclassifier.h @@ -83,20 +83,20 @@ class Q_UML_EXPORT QClassifier : public QWrappedObject Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(const QSet<QUseCase *> * ownedUseCases READ ownedUseCases) - Q_PROPERTY(const QSet<QGeneralizationSet *> * powertypeExtents READ powertypeExtents) - Q_PROPERTY(const QSet<QUseCase *> * useCases READ useCases) + 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(const QSet<QClassifier *> * redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) Q_PROPERTY(QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(const QSet<QCollaborationUse *> * collaborationUses READ collaborationUses) - Q_PROPERTY(const QSet<QProperty *> * attributes READ attributes) - Q_PROPERTY(const QSet<QFeature *> * features READ features) - Q_PROPERTY(const QSet<QClassifier *> * generals READ generals STORED false) + 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(const QSet<QGeneralization *> * generalizations READ generalizations) - Q_PROPERTY(const QSet<QNamedElement *> * inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(const QSet<QSubstitution *> * substitutions READ substitutions) + Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QSubstitution *> substitutions READ substitutions) Q_DISABLE_COPY(QClassifier) Q_DECLARE_PRIVATE(QClassifier) @@ -106,9 +106,9 @@ public: virtual ~QClassifier(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -121,23 +121,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -158,11 +158,11 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QTemplateableElement - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -175,55 +175,54 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from QClassifier - Q_INVOKABLE const QSet<QUseCase *> *ownedUseCases() const; + Q_INVOKABLE const QSet<QUseCase *> &ownedUseCases() const; Q_INVOKABLE void addOwnedUseCase(QUseCase *ownedUseCase); Q_INVOKABLE void removeOwnedUseCase(QUseCase *ownedUseCase); - Q_INVOKABLE const QSet<QGeneralizationSet *> *powertypeExtents() const; + Q_INVOKABLE const QSet<QGeneralizationSet *> &powertypeExtents() const; Q_INVOKABLE void addPowertypeExtent(QGeneralizationSet *powertypeExtent); Q_INVOKABLE void removePowertypeExtent(QGeneralizationSet *powertypeExtent); - Q_INVOKABLE const QSet<QUseCase *> *useCases() const; + Q_INVOKABLE const QSet<QUseCase *> &useCases() const; Q_INVOKABLE void addUseCase(QUseCase *useCase); Q_INVOKABLE void removeUseCase(QUseCase *useCase); Q_INVOKABLE QClassifierTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QClassifierTemplateParameter *templateParameter); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE QRedefinableTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QCollaborationUse *> *collaborationUses() const; + Q_INVOKABLE const QSet<QCollaborationUse *> &collaborationUses() const; Q_INVOKABLE void addCollaborationUse(QCollaborationUse *collaborationUse); Q_INVOKABLE void removeCollaborationUse(QCollaborationUse *collaborationUse); - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); Q_INVOKABLE QCollaborationUse *representation() const; Q_INVOKABLE void setRepresentation(QCollaborationUse *representation); - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QSubstitution *> *substitutions() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QSubstitution *> &substitutions() const; Q_INVOKABLE void addSubstitution(QSubstitution *substitution); Q_INVOKABLE void removeSubstitution(QSubstitution *substitution); // Operations - Q_INVOKABLE const QSet<QFeature *> *allFeatures() const; - Q_INVOKABLE const QSet<QClassifier *> *allParents() const; + Q_INVOKABLE const QSet<QFeature *> &allFeatures() const; + Q_INVOKABLE const QSet<QClassifier *> &allParents() const; Q_INVOKABLE bool conformsTo(const QClassifier *other) const; Q_INVOKABLE bool hasVisibilityOf(const QNamedElement *n) const; - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - Q_INVOKABLE const QSet<QNamedElement *> *inheritableMembers(const QClassifier *c) const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritableMembers(const QClassifier *c) const; Q_INVOKABLE bool isTemplate() const; Q_INVOKABLE bool maySpecializeType(const QClassifier *c) const; - Q_INVOKABLE const QSet<QClassifier *> *parents() const; + Q_INVOKABLE const QSet<QClassifier *> &parents() const; // Overriden methods for subsetted properties Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QSubstitution> substitution); Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QSubstitution> substitution); - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QFeaturePrivate; @@ -240,10 +239,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClassifier) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *) - QT_END_HEADER #endif // QTUML_QCLASSIFIER_H diff --git a/src/uml/qclassifier_p.h b/src/uml/qclassifier_p.h index e2496f1a..c1dc8e2d 100644 --- a/src/uml/qclassifier_p.h +++ b/src/uml/qclassifier_p.h @@ -83,18 +83,18 @@ public: bool isAbstract; bool isFinalSpecialization; - QSet<QUseCase *> *ownedUseCases; - QSet<QGeneralizationSet *> *powertypeExtents; - QSet<QUseCase *> *useCases; + QSet<QUseCase *> ownedUseCases; + QSet<QGeneralizationSet *> powertypeExtents; + QSet<QUseCase *> useCases; QClassifierTemplateParameter *templateParameter; - QSet<QClassifier *> *redefinedClassifiers; + QSet<QClassifier *> redefinedClassifiers; QRedefinableTemplateSignature *ownedTemplateSignature; - QSet<QCollaborationUse *> *collaborationUses; - QSet<QProperty *> *attributes; - QSet<QFeature *> *features; + QSet<QCollaborationUse *> collaborationUses; + QSet<QProperty *> attributes; + QSet<QFeature *> features; QCollaborationUse *representation; - QSet<QGeneralization *> *generalizations; - QSet<QSubstitution *> *substitutions; + QSet<QGeneralization *> generalizations; + QSet<QSubstitution *> substitutions; // Internal functions for read-only subsetted association ends void addAttribute(QProperty *attribute); diff --git a/src/uml/qclassifiertemplateparameter.cpp b/src/uml/qclassifiertemplateparameter.cpp index 0205e38d..ce37dc78 100644 --- a/src/uml/qclassifiertemplateparameter.cpp +++ b/src/uml/qclassifiertemplateparameter.cpp @@ -48,14 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QClassifierTemplateParameterPrivate::QClassifierTemplateParameterPrivate() : allowSubstitutable(true), - parameteredElement(0), - constrainingClassifiers(new QSet<QClassifier *>) + parameteredElement(0) { } QClassifierTemplateParameterPrivate::~QClassifierTemplateParameterPrivate() { - delete constrainingClassifiers; } /*! @@ -143,7 +141,7 @@ void QClassifierTemplateParameter::setParameteredElement(QClassifier *parametere /*! 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. */ -const QSet<QClassifier *> *QClassifierTemplateParameter::constrainingClassifiers() const +const QSet<QClassifier *> &QClassifierTemplateParameter::constrainingClassifiers() const { // This is a read-write association end @@ -156,8 +154,8 @@ void QClassifierTemplateParameter::addConstrainingClassifier(QClassifier *constr // This is a read-write association end Q_D(QClassifierTemplateParameter); - if (!d->constrainingClassifiers->contains(constrainingClassifier)) { - d->constrainingClassifiers->insert(constrainingClassifier); + if (!d->constrainingClassifiers.contains(constrainingClassifier)) { + d->constrainingClassifiers.insert(constrainingClassifier); } } @@ -166,33 +164,11 @@ void QClassifierTemplateParameter::removeConstrainingClassifier(QClassifier *con // This is a read-write association end Q_D(QClassifierTemplateParameter); - if (d->constrainingClassifiers->contains(constrainingClassifier)) { - d->constrainingClassifiers->remove(constrainingClassifier); + if (d->constrainingClassifiers.contains(constrainingClassifier)) { + d->constrainingClassifiers.remove(constrainingClassifier); } } -void QClassifierTemplateParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *"); - qRegisterMetaType<QClassifierTemplateParameter *>("QClassifierTemplateParameter *"); - qRegisterMetaType<const QSet<QClassifierTemplateParameter *> *>("const QSet<QClassifierTemplateParameter *> *"); - qRegisterMetaType<const QList<QClassifierTemplateParameter *> *>("const QList<QClassifierTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QTemplateParameter::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qclassifiertemplateparameter.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclassifiertemplateparameter.h b/src/uml/qclassifiertemplateparameter.h index d43e8bff..9762d989 100644 --- a/src/uml/qclassifiertemplateparameter.h +++ b/src/uml/qclassifiertemplateparameter.h @@ -66,7 +66,7 @@ class Q_UML_EXPORT QClassifierTemplateParameter : public QTemplateParameter Q_PROPERTY(bool allowSubstitutable READ allowSubstitutable WRITE setAllowSubstitutable RESET unsetAllowSubstitutable) Q_PROPERTY(QClassifier * parameteredElement READ parameteredElement WRITE setParameteredElement) - Q_PROPERTY(const QSet<QClassifier *> * constrainingClassifiers READ constrainingClassifiers) + Q_PROPERTY(QSet<QClassifier *> constrainingClassifiers READ constrainingClassifiers) Q_DISABLE_COPY(QClassifierTemplateParameter) Q_DECLARE_PRIVATE(QClassifierTemplateParameter) @@ -83,10 +83,9 @@ public: // Association ends from QClassifierTemplateParameter Q_INVOKABLE QClassifier *parameteredElement() const; Q_INVOKABLE void setParameteredElement(QClassifier *parameteredElement); - Q_INVOKABLE const QSet<QClassifier *> *constrainingClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &constrainingClassifiers() const; Q_INVOKABLE void addConstrainingClassifier(QClassifier *constrainingClassifier); Q_INVOKABLE void removeConstrainingClassifier(QClassifier *constrainingClassifier); - virtual void registerMetaTypes() const; protected: explicit QClassifierTemplateParameter(QClassifierTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifierTemplateParameter) *> *) - QT_END_HEADER #endif // QTUML_QCLASSIFIERTEMPLATEPARAMETER_H diff --git a/src/uml/qclassifiertemplateparameter_p.h b/src/uml/qclassifiertemplateparameter_p.h index 9c1c623f..0304246e 100644 --- a/src/uml/qclassifiertemplateparameter_p.h +++ b/src/uml/qclassifiertemplateparameter_p.h @@ -69,7 +69,7 @@ public: bool allowSubstitutable; QClassifier *parameteredElement; - QSet<QClassifier *> *constrainingClassifiers; + QSet<QClassifier *> constrainingClassifiers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclause.cpp b/src/uml/qclause.cpp index c528171f..a74b18ca 100644 --- a/src/uml/qclause.cpp +++ b/src/uml/qclause.cpp @@ -48,22 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QClausePrivate::QClausePrivate() : - successorClauses(new QSet<QClause *>), - decider(0), - predecessorClauses(new QSet<QClause *>), - bodyOutputs(new QList<QOutputPin *>), - bodies(new QSet<QExecutableNode *>), - tests(new QSet<QExecutableNode *>) + decider(0) { } QClausePrivate::~QClausePrivate() { - delete successorClauses; - delete predecessorClauses; - delete bodyOutputs; - delete bodies; - delete tests; } /*! @@ -95,7 +85,7 @@ QClause::~QClause() /*! A set of clauses which may not be tested unless the current clause tests false. */ -const QSet<QClause *> *QClause::successorClauses() const +const QSet<QClause *> &QClause::successorClauses() const { // This is a read-write association end @@ -108,8 +98,8 @@ void QClause::addSuccessorClause(QClause *successorClause) // This is a read-write association end Q_D(QClause); - if (!d->successorClauses->contains(successorClause)) { - d->successorClauses->insert(successorClause); + if (!d->successorClauses.contains(successorClause)) { + d->successorClauses.insert(successorClause); // Adjust opposite property successorClause->addPredecessorClause(this); @@ -121,8 +111,8 @@ void QClause::removeSuccessorClause(QClause *successorClause) // This is a read-write association end Q_D(QClause); - if (d->successorClauses->contains(successorClause)) { - d->successorClauses->remove(successorClause); + if (d->successorClauses.contains(successorClause)) { + d->successorClauses.remove(successorClause); // Adjust opposite property if (successorClause) @@ -154,7 +144,7 @@ void QClause::setDecider(QOutputPin *decider) /*! A set of clauses whose tests must all evaluate false before the current clause can be tested. */ -const QSet<QClause *> *QClause::predecessorClauses() const +const QSet<QClause *> &QClause::predecessorClauses() const { // This is a read-write association end @@ -167,8 +157,8 @@ void QClause::addPredecessorClause(QClause *predecessorClause) // This is a read-write association end Q_D(QClause); - if (!d->predecessorClauses->contains(predecessorClause)) { - d->predecessorClauses->insert(predecessorClause); + if (!d->predecessorClauses.contains(predecessorClause)) { + d->predecessorClauses.insert(predecessorClause); // Adjust opposite property predecessorClause->addSuccessorClause(this); @@ -180,8 +170,8 @@ void QClause::removePredecessorClause(QClause *predecessorClause) // This is a read-write association end Q_D(QClause); - if (d->predecessorClauses->contains(predecessorClause)) { - d->predecessorClauses->remove(predecessorClause); + if (d->predecessorClauses.contains(predecessorClause)) { + d->predecessorClauses.remove(predecessorClause); // Adjust opposite property if (predecessorClause) @@ -192,7 +182,7 @@ void QClause::removePredecessorClause(QClause *predecessorClause) /*! 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. */ -const QList<QOutputPin *> *QClause::bodyOutputs() const +const QList<QOutputPin *> &QClause::bodyOutputs() const { // This is a read-write association end @@ -205,8 +195,8 @@ void QClause::addBodyOutput(QOutputPin *bodyOutput) // This is a read-write association end Q_D(QClause); - if (!d->bodyOutputs->contains(bodyOutput)) { - d->bodyOutputs->append(bodyOutput); + if (!d->bodyOutputs.contains(bodyOutput)) { + d->bodyOutputs.append(bodyOutput); } } @@ -215,15 +205,15 @@ void QClause::removeBodyOutput(QOutputPin *bodyOutput) // This is a read-write association end Q_D(QClause); - if (d->bodyOutputs->contains(bodyOutput)) { - d->bodyOutputs->removeAll(bodyOutput); + if (d->bodyOutputs.contains(bodyOutput)) { + d->bodyOutputs.removeAll(bodyOutput); } } /*! 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. */ -const QSet<QExecutableNode *> *QClause::bodies() const +const QSet<QExecutableNode *> &QClause::bodies() const { // This is a read-write association end @@ -236,8 +226,8 @@ void QClause::addBody(QExecutableNode *body) // This is a read-write association end Q_D(QClause); - if (!d->bodies->contains(body)) { - d->bodies->insert(body); + if (!d->bodies.contains(body)) { + d->bodies.insert(body); } } @@ -246,15 +236,15 @@ void QClause::removeBody(QExecutableNode *body) // This is a read-write association end Q_D(QClause); - if (d->bodies->contains(body)) { - d->bodies->remove(body); + if (d->bodies.contains(body)) { + d->bodies.remove(body); } } /*! A nested activity fragment with a designated output pin that specifies the result of the test. */ -const QSet<QExecutableNode *> *QClause::tests() const +const QSet<QExecutableNode *> &QClause::tests() const { // This is a read-write association end @@ -267,8 +257,8 @@ void QClause::addTest(QExecutableNode *test) // This is a read-write association end Q_D(QClause); - if (!d->tests->contains(test)) { - d->tests->insert(test); + if (!d->tests.contains(test)) { + d->tests.insert(test); } } @@ -277,40 +267,11 @@ void QClause::removeTest(QExecutableNode *test) // This is a read-write association end Q_D(QClause); - if (d->tests->contains(test)) { - d->tests->remove(test); + if (d->tests.contains(test)) { + d->tests.remove(test); } } -void QClause::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClause) *>("QT_PREPEND_NAMESPACE_QTUML(QClause) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *"); - qRegisterMetaType<QClause *>("QClause *"); - qRegisterMetaType<const QSet<QClause *> *>("const QSet<QClause *> *"); - qRegisterMetaType<const QList<QClause *> *>("const QList<QClause *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<QExecutableNode *>("QExecutableNode *"); - qRegisterMetaType<const QSet<QExecutableNode *> *>("const QSet<QExecutableNode *> *"); - qRegisterMetaType<const QList<QExecutableNode *> *>("const QList<QExecutableNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qclause.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclause.h b/src/uml/qclause.h index aebfdef7..b651ba1b 100644 --- a/src/uml/qclause.h +++ b/src/uml/qclause.h @@ -66,12 +66,12 @@ class Q_UML_EXPORT QClause : public QElement { Q_OBJECT - Q_PROPERTY(const QSet<QClause *> * successorClauses READ successorClauses) + Q_PROPERTY(QSet<QClause *> successorClauses READ successorClauses) Q_PROPERTY(QOutputPin * decider READ decider WRITE setDecider) - Q_PROPERTY(const QSet<QClause *> * predecessorClauses READ predecessorClauses) - Q_PROPERTY(const QList<QOutputPin *> * bodyOutputs READ bodyOutputs) - Q_PROPERTY(const QSet<QExecutableNode *> * bodies READ bodies) - Q_PROPERTY(const QSet<QExecutableNode *> * tests READ tests) + 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_DISABLE_COPY(QClause) Q_DECLARE_PRIVATE(QClause) @@ -81,24 +81,23 @@ public: virtual ~QClause(); // Association ends from QClause - Q_INVOKABLE const QSet<QClause *> *successorClauses() const; + Q_INVOKABLE const QSet<QClause *> &successorClauses() const; Q_INVOKABLE void addSuccessorClause(QClause *successorClause); Q_INVOKABLE void removeSuccessorClause(QClause *successorClause); Q_INVOKABLE QOutputPin *decider() const; Q_INVOKABLE void setDecider(QOutputPin *decider); - Q_INVOKABLE const QSet<QClause *> *predecessorClauses() const; + Q_INVOKABLE const QSet<QClause *> &predecessorClauses() const; Q_INVOKABLE void addPredecessorClause(QClause *predecessorClause); Q_INVOKABLE void removePredecessorClause(QClause *predecessorClause); - Q_INVOKABLE const QList<QOutputPin *> *bodyOutputs() const; + Q_INVOKABLE const QList<QOutputPin *> &bodyOutputs() const; Q_INVOKABLE void addBodyOutput(QOutputPin *bodyOutput); Q_INVOKABLE void removeBodyOutput(QOutputPin *bodyOutput); - Q_INVOKABLE const QSet<QExecutableNode *> *bodies() const; + Q_INVOKABLE const QSet<QExecutableNode *> &bodies() const; Q_INVOKABLE void addBody(QExecutableNode *body); Q_INVOKABLE void removeBody(QExecutableNode *body); - Q_INVOKABLE const QSet<QExecutableNode *> *tests() const; + Q_INVOKABLE const QSet<QExecutableNode *> &tests() const; Q_INVOKABLE void addTest(QExecutableNode *test); Q_INVOKABLE void removeTest(QExecutableNode *test); - virtual void registerMetaTypes() const; protected: explicit QClause(QClausePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -106,10 +105,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClause) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *) - QT_END_HEADER #endif // QTUML_QCLAUSE_H diff --git a/src/uml/qclause_p.h b/src/uml/qclause_p.h index 1f700b31..2ac2677d 100644 --- a/src/uml/qclause_p.h +++ b/src/uml/qclause_p.h @@ -69,12 +69,12 @@ public: explicit QClausePrivate(); virtual ~QClausePrivate(); - QSet<QClause *> *successorClauses; + QSet<QClause *> successorClauses; QOutputPin *decider; - QSet<QClause *> *predecessorClauses; - QList<QOutputPin *> *bodyOutputs; - QSet<QExecutableNode *> *bodies; - QSet<QExecutableNode *> *tests; + QSet<QClause *> predecessorClauses; + QList<QOutputPin *> bodyOutputs; + QSet<QExecutableNode *> bodies; + QSet<QExecutableNode *> tests; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearassociationaction.cpp b/src/uml/qclearassociationaction.cpp index fe9ef2b0..dbae4c02 100644 --- a/src/uml/qclearassociationaction.cpp +++ b/src/uml/qclearassociationaction.cpp @@ -133,35 +133,6 @@ void QClearAssociationAction::setAssociation(QAssociation *association) } } -void QClearAssociationAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *>("QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *> *"); - qRegisterMetaType<QClearAssociationAction *>("QClearAssociationAction *"); - qRegisterMetaType<const QSet<QClearAssociationAction *> *>("const QSet<QClearAssociationAction *> *"); - qRegisterMetaType<const QList<QClearAssociationAction *> *>("const QList<QClearAssociationAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *>("QT_PREPEND_NAMESPACE_QTUML(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qclearassociationaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearassociationaction.h b/src/uml/qclearassociationaction.h index 234e84ed..df3a5935 100644 --- a/src/uml/qclearassociationaction.h +++ b/src/uml/qclearassociationaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setObject(QInputPin *object); Q_INVOKABLE QAssociation *association() const; Q_INVOKABLE void setAssociation(QAssociation *association); - virtual void registerMetaTypes() const; protected: explicit QClearAssociationAction(QClearAssociationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClearAssociationAction) *> *) - QT_END_HEADER #endif // QTUML_QCLEARASSOCIATIONACTION_H diff --git a/src/uml/qclearstructuralfeatureaction.cpp b/src/uml/qclearstructuralfeatureaction.cpp index 4d77b379..0b4b77c2 100644 --- a/src/uml/qclearstructuralfeatureaction.cpp +++ b/src/uml/qclearstructuralfeatureaction.cpp @@ -110,28 +110,6 @@ void QClearStructuralFeatureAction::setResult(QOutputPin *result) } } -void QClearStructuralFeatureAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *>("QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *> *"); - qRegisterMetaType<QClearStructuralFeatureAction *>("QClearStructuralFeatureAction *"); - qRegisterMetaType<const QSet<QClearStructuralFeatureAction *> *>("const QSet<QClearStructuralFeatureAction *> *"); - qRegisterMetaType<const QList<QClearStructuralFeatureAction *> *>("const QList<QClearStructuralFeatureAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QStructuralFeatureAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qclearstructuralfeatureaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearstructuralfeatureaction.h b/src/uml/qclearstructuralfeatureaction.h index 112cb082..c320113d 100644 --- a/src/uml/qclearstructuralfeatureaction.h +++ b/src/uml/qclearstructuralfeatureaction.h @@ -73,7 +73,6 @@ public: // Association ends from QClearStructuralFeatureAction Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QClearStructuralFeatureAction(QClearStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClearStructuralFeatureAction) *> *) - QT_END_HEADER #endif // QTUML_QCLEARSTRUCTURALFEATUREACTION_H diff --git a/src/uml/qclearvariableaction.cpp b/src/uml/qclearvariableaction.cpp index e4c5d46c..3ec3bab0 100644 --- a/src/uml/qclearvariableaction.cpp +++ b/src/uml/qclearvariableaction.cpp @@ -74,21 +74,6 @@ QClearVariableAction::~QClearVariableAction() { } -void QClearVariableAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *>("QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *> *"); - qRegisterMetaType<QClearVariableAction *>("QClearVariableAction *"); - qRegisterMetaType<const QSet<QClearVariableAction *> *>("const QSet<QClearVariableAction *> *"); - qRegisterMetaType<const QList<QClearVariableAction *> *>("const QList<QClearVariableAction *> *"); - - QVariableAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qclearvariableaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qclearvariableaction.h b/src/uml/qclearvariableaction.h index dadf0275..4feed1db 100644 --- a/src/uml/qclearvariableaction.h +++ b/src/uml/qclearvariableaction.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QClearVariableAction : public QVariableAction public: Q_INVOKABLE explicit QClearVariableAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QClearVariableAction(); - virtual void registerMetaTypes() const; protected: explicit QClearVariableAction(QClearVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QClearVariableAction) *> *) - QT_END_HEADER #endif // QTUML_QCLEARVARIABLEACTION_H diff --git a/src/uml/qcollaboration.cpp b/src/uml/qcollaboration.cpp index 5fe54cba..55048344 100644 --- a/src/uml/qcollaboration.cpp +++ b/src/uml/qcollaboration.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QCollaborationPrivate::QCollaborationPrivate() : - collaborationRoles(new QSet<QConnectableElement *>) +QCollaborationPrivate::QCollaborationPrivate() { } QCollaborationPrivate::~QCollaborationPrivate() { - delete collaborationRoles; } /*! @@ -89,7 +87,7 @@ QCollaboration::~QCollaboration() /*! The Elements owned by this element. */ -const QSet<QElement *> *QCollaboration::ownedElements() const +const QSet<QElement *> &QCollaboration::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -105,7 +103,7 @@ QElement *QCollaboration::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QCollaboration::ownedComments() const +const QSet<QComment *> &QCollaboration::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -173,7 +171,7 @@ QNamespace *QCollaboration::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QCollaboration::clientDependencies() const +const QSet<QDependency *> &QCollaboration::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -195,7 +193,7 @@ void QCollaboration::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QCollaboration::packageImports() const +const QSet<QPackageImport *> &QCollaboration::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -213,7 +211,7 @@ void QCollaboration::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QCollaboration::members() const +const QSet<QNamedElement *> &QCollaboration::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -221,7 +219,7 @@ const QSet<QNamedElement *> *QCollaboration::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QCollaboration::importedMembers() const +const QSet<QPackageableElement *> &QCollaboration::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -229,7 +227,7 @@ const QSet<QPackageableElement *> *QCollaboration::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QCollaboration::elementImports() const +const QSet<QElementImport *> &QCollaboration::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -247,7 +245,7 @@ void QCollaboration::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QCollaboration::ownedRules() const +const QSet<QConstraint *> &QCollaboration::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -265,7 +263,7 @@ void QCollaboration::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QCollaboration::ownedMembers() const +const QSet<QNamedElement *> &QCollaboration::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -355,7 +353,7 @@ void QCollaboration::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QCollaboration::redefinedElements() const +const QSet<QRedefinableElement *> &QCollaboration::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -363,7 +361,7 @@ const QSet<QRedefinableElement *> *QCollaboration::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QCollaboration::redefinitionContexts() const +const QSet<QClassifier *> &QCollaboration::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -375,7 +373,7 @@ const QSet<QClassifier *> *QCollaboration::redefinitionContexts() const /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QCollaboration::templateBindings() const +const QSet<QTemplateBinding *> &QCollaboration::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -437,7 +435,7 @@ void QCollaboration::unsetFinalSpecialization() /*! References the use cases owned by this classifier. */ -const QSet<QUseCase *> *QCollaboration::ownedUseCases() const +const QSet<QUseCase *> &QCollaboration::ownedUseCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->ownedUseCases(); } @@ -455,7 +453,7 @@ void QCollaboration::removeOwnedUseCase(QUseCase *ownedUseCase) /*! Designates the GeneralizationSet of which the associated Classifier is a power type. */ -const QSet<QGeneralizationSet *> *QCollaboration::powertypeExtents() const +const QSet<QGeneralizationSet *> &QCollaboration::powertypeExtents() const { return (qwrappedobject_cast<const QClassifier *>(this))->powertypeExtents(); } @@ -473,7 +471,7 @@ void QCollaboration::removePowertypeExtent(QGeneralizationSet *powertypeExtent) /*! The set of use cases for which this Classifier is the subject. */ -const QSet<QUseCase *> *QCollaboration::useCases() const +const QSet<QUseCase *> &QCollaboration::useCases() const { return (qwrappedobject_cast<const QClassifier *>(this))->useCases(); } @@ -504,7 +502,7 @@ void QCollaboration::setTemplateParameter(QClassifierTemplateParameter *template /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QCollaboration::redefinedClassifiers() const +const QSet<QClassifier *> &QCollaboration::redefinedClassifiers() const { return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } @@ -535,7 +533,7 @@ void QCollaboration::setOwnedTemplateSignature(QRedefinableTemplateSignature *ow /*! References the collaboration uses owned by the classifier. */ -const QSet<QCollaborationUse *> *QCollaboration::collaborationUses() const +const QSet<QCollaborationUse *> &QCollaboration::collaborationUses() const { return (qwrappedobject_cast<const QClassifier *>(this))->collaborationUses(); } @@ -553,7 +551,7 @@ void QCollaboration::removeCollaborationUse(QCollaborationUse *collaborationUse) /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QCollaboration::attributes() const +const QSet<QProperty *> &QCollaboration::attributes() const { return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } @@ -561,7 +559,7 @@ const QSet<QProperty *> *QCollaboration::attributes() const /*! 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. */ -const QSet<QFeature *> *QCollaboration::features() const +const QSet<QFeature *> &QCollaboration::features() const { return (qwrappedobject_cast<const QClassifier *>(this))->features(); } @@ -569,7 +567,7 @@ const QSet<QFeature *> *QCollaboration::features() const /*! Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship. */ -const QSet<QClassifier *> *QCollaboration::generals() const +const QSet<QClassifier *> &QCollaboration::generals() const { return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } @@ -600,7 +598,7 @@ void QCollaboration::setRepresentation(QCollaborationUse *representation) /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QCollaboration::generalizations() const +const QSet<QGeneralization *> &QCollaboration::generalizations() const { return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } @@ -618,7 +616,7 @@ void QCollaboration::removeGeneralization(QGeneralization *generalization) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QCollaboration::inheritedMembers() const +const QSet<QNamedElement *> &QCollaboration::inheritedMembers() const { return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } @@ -626,7 +624,7 @@ const QSet<QNamedElement *> *QCollaboration::inheritedMembers() const /*! References the substitutions that are owned by this Classifier. */ -const QSet<QSubstitution *> *QCollaboration::substitutions() const +const QSet<QSubstitution *> &QCollaboration::substitutions() const { return (qwrappedobject_cast<const QClassifier *>(this))->substitutions(); } @@ -648,7 +646,7 @@ void QCollaboration::removeSubstitution(QSubstitution *substitution) /*! References the roles that instances may play in this classifier. */ -const QSet<QConnectableElement *> *QCollaboration::roles() const +const QSet<QConnectableElement *> &QCollaboration::roles() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->roles(); } @@ -656,7 +654,7 @@ const QSet<QConnectableElement *> *QCollaboration::roles() const /*! References the properties owned by the classifier. */ -const QList<QProperty *> *QCollaboration::ownedAttributes() const +const QList<QProperty *> &QCollaboration::ownedAttributes() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->ownedAttributes(); } @@ -674,7 +672,7 @@ void QCollaboration::removeOwnedAttribute(QProperty *ownedAttribute) /*! References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true. */ -const QSet<QProperty *> *QCollaboration::parts() const +const QSet<QProperty *> &QCollaboration::parts() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->parts(); } @@ -682,7 +680,7 @@ const QSet<QProperty *> *QCollaboration::parts() const /*! References the connectors owned by the classifier. */ -const QSet<QConnector *> *QCollaboration::ownedConnectors() const +const QSet<QConnector *> &QCollaboration::ownedConnectors() const { return (qwrappedobject_cast<const QStructuredClassifier *>(this))->ownedConnectors(); } @@ -704,7 +702,7 @@ void QCollaboration::removeOwnedConnector(QConnector *ownedConnector) /*! References behavior specifications owned by a classifier. */ -const QSet<QBehavior *> *QCollaboration::ownedBehaviors() const +const QSet<QBehavior *> &QCollaboration::ownedBehaviors() const { return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->ownedBehaviors(); } @@ -722,7 +720,7 @@ void QCollaboration::removeOwnedBehavior(QBehavior *ownedBehavior) /*! The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation. */ -const QSet<QInterfaceRealization *> *QCollaboration::interfaceRealizations() const +const QSet<QInterfaceRealization *> &QCollaboration::interfaceRealizations() const { return (qwrappedobject_cast<const QBehavioredClassifier *>(this))->interfaceRealizations(); } @@ -757,7 +755,7 @@ void QCollaboration::setClassifierBehavior(QBehavior *classifierBehavior) /*! References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration. */ -const QSet<QConnectableElement *> *QCollaboration::collaborationRoles() const +const QSet<QConnectableElement *> &QCollaboration::collaborationRoles() const { // This is a read-write association end @@ -770,8 +768,8 @@ void QCollaboration::addCollaborationRole(QConnectableElement *collaborationRole // This is a read-write association end Q_D(QCollaboration); - if (!d->collaborationRoles->contains(collaborationRole)) { - d->collaborationRoles->insert(collaborationRole); + if (!d->collaborationRoles.contains(collaborationRole)) { + d->collaborationRoles.insert(collaborationRole); // Adjust subsetted property(ies) (qwrappedobject_cast<QStructuredClassifierPrivate *>(d))->addRole(qwrappedobject_cast<QConnectableElement *>(collaborationRole)); @@ -783,36 +781,14 @@ void QCollaboration::removeCollaborationRole(QConnectableElement *collaborationR // This is a read-write association end Q_D(QCollaboration); - if (d->collaborationRoles->contains(collaborationRole)) { - d->collaborationRoles->remove(collaborationRole); + if (d->collaborationRoles.contains(collaborationRole)) { + d->collaborationRoles.remove(collaborationRole); // Adjust subsetted property(ies) (qwrappedobject_cast<QStructuredClassifierPrivate *>(d))->removeRole(qwrappedobject_cast<QConnectableElement *>(collaborationRole)); } } -void QCollaboration::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *>("QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *"); - qRegisterMetaType<QCollaboration *>("QCollaboration *"); - qRegisterMetaType<const QSet<QCollaboration *> *>("const QSet<QCollaboration *> *"); - qRegisterMetaType<const QList<QCollaboration *> *>("const QList<QCollaboration *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<QConnectableElement *>("QConnectableElement *"); - qRegisterMetaType<const QSet<QConnectableElement *> *>("const QSet<QConnectableElement *> *"); - qRegisterMetaType<const QList<QConnectableElement *> *>("const QList<QConnectableElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcollaboration.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcollaboration.h b/src/uml/qcollaboration.h index aef7ccbc..6fd5d4b0 100644 --- a/src/uml/qcollaboration.h +++ b/src/uml/qcollaboration.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QCollaboration : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QConnectableElement *> * collaborationRoles READ collaborationRoles) + Q_PROPERTY(QSet<QConnectableElement *> collaborationRoles READ collaborationRoles) Q_DISABLE_COPY(QCollaboration) Q_DECLARE_PRIVATE(QCollaboration) @@ -77,9 +77,9 @@ public: virtual ~QCollaboration(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -92,23 +92,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -129,11 +129,11 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QTemplateableElement - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -146,65 +146,64 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from aggregated QClassifier - Q_INVOKABLE const QSet<QUseCase *> *ownedUseCases() const; + Q_INVOKABLE const QSet<QUseCase *> &ownedUseCases() const; Q_INVOKABLE void addOwnedUseCase(QUseCase *ownedUseCase); Q_INVOKABLE void removeOwnedUseCase(QUseCase *ownedUseCase); - Q_INVOKABLE const QSet<QGeneralizationSet *> *powertypeExtents() const; + Q_INVOKABLE const QSet<QGeneralizationSet *> &powertypeExtents() const; Q_INVOKABLE void addPowertypeExtent(QGeneralizationSet *powertypeExtent); Q_INVOKABLE void removePowertypeExtent(QGeneralizationSet *powertypeExtent); - Q_INVOKABLE const QSet<QUseCase *> *useCases() const; + Q_INVOKABLE const QSet<QUseCase *> &useCases() const; Q_INVOKABLE void addUseCase(QUseCase *useCase); Q_INVOKABLE void removeUseCase(QUseCase *useCase); Q_INVOKABLE QClassifierTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QClassifierTemplateParameter *templateParameter); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE QRedefinableTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QRedefinableTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QCollaborationUse *> *collaborationUses() const; + Q_INVOKABLE const QSet<QCollaborationUse *> &collaborationUses() const; Q_INVOKABLE void addCollaborationUse(QCollaborationUse *collaborationUse); Q_INVOKABLE void removeCollaborationUse(QCollaborationUse *collaborationUse); - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); Q_INVOKABLE QCollaborationUse *representation() const; Q_INVOKABLE void setRepresentation(QCollaborationUse *representation); - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QSubstitution *> *substitutions() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QSubstitution *> &substitutions() const; Q_INVOKABLE void addSubstitution(QSubstitution *substitution); Q_INVOKABLE void removeSubstitution(QSubstitution *substitution); // Association ends from aggregated QStructuredClassifier - Q_INVOKABLE const QSet<QConnectableElement *> *roles() const; - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QSet<QConnectableElement *> &roles() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - Q_INVOKABLE const QSet<QProperty *> *parts() const; - Q_INVOKABLE const QSet<QConnector *> *ownedConnectors() const; + Q_INVOKABLE const QSet<QProperty *> &parts() const; + Q_INVOKABLE const QSet<QConnector *> &ownedConnectors() const; Q_INVOKABLE void addOwnedConnector(QConnector *ownedConnector); Q_INVOKABLE void removeOwnedConnector(QConnector *ownedConnector); // Association ends from aggregated QBehavioredClassifier - Q_INVOKABLE const QSet<QBehavior *> *ownedBehaviors() const; + Q_INVOKABLE const QSet<QBehavior *> &ownedBehaviors() const; Q_INVOKABLE void addOwnedBehavior(QBehavior *ownedBehavior); Q_INVOKABLE void removeOwnedBehavior(QBehavior *ownedBehavior); - Q_INVOKABLE const QSet<QInterfaceRealization *> *interfaceRealizations() const; + Q_INVOKABLE const QSet<QInterfaceRealization *> &interfaceRealizations() const; Q_INVOKABLE void addInterfaceRealization(QInterfaceRealization *interfaceRealization); Q_INVOKABLE void removeInterfaceRealization(QInterfaceRealization *interfaceRealization); Q_INVOKABLE QBehavior *classifierBehavior() const; Q_INVOKABLE void setClassifierBehavior(QBehavior *classifierBehavior); // Association ends from QCollaboration - Q_INVOKABLE const QSet<QConnectableElement *> *collaborationRoles() const; + Q_INVOKABLE const QSet<QConnectableElement *> &collaborationRoles() const; Q_INVOKABLE void addCollaborationRole(QConnectableElement *collaborationRole); Q_INVOKABLE void removeCollaborationRole(QConnectableElement *collaborationRole); - virtual void registerMetaTypes() const; protected: explicit QCollaboration(QCollaborationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -216,10 +215,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *) - QT_END_HEADER #endif // QTUML_QCOLLABORATION_H diff --git a/src/uml/qcollaboration_p.h b/src/uml/qcollaboration_p.h index ba367f32..b127b7de 100644 --- a/src/uml/qcollaboration_p.h +++ b/src/uml/qcollaboration_p.h @@ -70,7 +70,7 @@ public: explicit QCollaborationPrivate(); virtual ~QCollaborationPrivate(); - QSet<QConnectableElement *> *collaborationRoles; + QSet<QConnectableElement *> collaborationRoles; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcollaborationuse.cpp b/src/uml/qcollaborationuse.cpp index daa67066..4638a12d 100644 --- a/src/uml/qcollaborationuse.cpp +++ b/src/uml/qcollaborationuse.cpp @@ -48,14 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QCollaborationUsePrivate::QCollaborationUsePrivate() : - type(0), - roleBindings(new QSet<QDependency *>) + type(0) { } QCollaborationUsePrivate::~QCollaborationUsePrivate() { - delete roleBindings; } /*! @@ -108,7 +106,7 @@ void QCollaborationUse::setType(QCollaboration *type) /*! 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). */ -const QSet<QDependency *> *QCollaborationUse::roleBindings() const +const QSet<QDependency *> &QCollaborationUse::roleBindings() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QCollaborationUse::addRoleBinding(QDependency *roleBinding) // This is a read-write association end Q_D(QCollaborationUse); - if (!d->roleBindings->contains(roleBinding)) { - d->roleBindings->insert(roleBinding); + if (!d->roleBindings.contains(roleBinding)) { + d->roleBindings.insert(roleBinding); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(roleBinding)); @@ -134,43 +132,14 @@ void QCollaborationUse::removeRoleBinding(QDependency *roleBinding) // This is a read-write association end Q_D(QCollaborationUse); - if (d->roleBindings->contains(roleBinding)) { - d->roleBindings->remove(roleBinding); + if (d->roleBindings.contains(roleBinding)) { + d->roleBindings.remove(roleBinding); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(roleBinding)); } } -void QCollaborationUse::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *>("QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *"); - qRegisterMetaType<QCollaborationUse *>("QCollaborationUse *"); - qRegisterMetaType<const QSet<QCollaborationUse *> *>("const QSet<QCollaborationUse *> *"); - qRegisterMetaType<const QList<QCollaborationUse *> *>("const QList<QCollaborationUse *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDependency) *>("QT_PREPEND_NAMESPACE_QTUML(QDependency) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *"); - qRegisterMetaType<QDependency *>("QDependency *"); - qRegisterMetaType<const QSet<QDependency *> *>("const QSet<QDependency *> *"); - qRegisterMetaType<const QList<QDependency *> *>("const QList<QDependency *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *>("QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaboration) *> *"); - qRegisterMetaType<QCollaboration *>("QCollaboration *"); - qRegisterMetaType<const QSet<QCollaboration *> *>("const QSet<QCollaboration *> *"); - qRegisterMetaType<const QList<QCollaboration *> *>("const QList<QCollaboration *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcollaborationuse.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcollaborationuse.h b/src/uml/qcollaborationuse.h index b69645d3..dc79320a 100644 --- a/src/uml/qcollaborationuse.h +++ b/src/uml/qcollaborationuse.h @@ -66,7 +66,7 @@ class Q_UML_EXPORT QCollaborationUse : public QNamedElement Q_OBJECT Q_PROPERTY(QCollaboration * type READ type WRITE setType) - Q_PROPERTY(const QSet<QDependency *> * roleBindings READ roleBindings) + Q_PROPERTY(QSet<QDependency *> roleBindings READ roleBindings) Q_DISABLE_COPY(QCollaborationUse) Q_DECLARE_PRIVATE(QCollaborationUse) @@ -78,10 +78,9 @@ public: // Association ends from QCollaborationUse Q_INVOKABLE QCollaboration *type() const; Q_INVOKABLE void setType(QCollaboration *type); - Q_INVOKABLE const QSet<QDependency *> *roleBindings() const; + Q_INVOKABLE const QSet<QDependency *> &roleBindings() const; Q_INVOKABLE void addRoleBinding(QDependency *roleBinding); Q_INVOKABLE void removeRoleBinding(QDependency *roleBinding); - virtual void registerMetaTypes() const; protected: explicit QCollaborationUse(QCollaborationUsePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCollaborationUse) *> *) - QT_END_HEADER #endif // QTUML_QCOLLABORATIONUSE_H diff --git a/src/uml/qcollaborationuse_p.h b/src/uml/qcollaborationuse_p.h index 0b607b31..76bd34d6 100644 --- a/src/uml/qcollaborationuse_p.h +++ b/src/uml/qcollaborationuse_p.h @@ -69,7 +69,7 @@ public: virtual ~QCollaborationUsePrivate(); QCollaboration *type; - QSet<QDependency *> *roleBindings; + QSet<QDependency *> roleBindings; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcombinedfragment.cpp b/src/uml/qcombinedfragment.cpp index a8debcf9..5af1f40f 100644 --- a/src/uml/qcombinedfragment.cpp +++ b/src/uml/qcombinedfragment.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QCombinedFragmentPrivate::QCombinedFragmentPrivate() : - interactionOperator(QtUml::InteractionOperatorSeq), - cfragmentGates(new QSet<QGate *>), - operands(new QList<QInteractionOperand *>) + interactionOperator(QtUml::InteractionOperatorSeq) { } QCombinedFragmentPrivate::~QCombinedFragmentPrivate() { - delete cfragmentGates; - delete operands; } /*! @@ -119,7 +115,7 @@ void QCombinedFragment::unsetInteractionOperator() /*! Specifies the gates that form the interface between this CombinedFragment and its surroundings */ -const QSet<QGate *> *QCombinedFragment::cfragmentGates() const +const QSet<QGate *> &QCombinedFragment::cfragmentGates() const { // This is a read-write association end @@ -132,8 +128,8 @@ void QCombinedFragment::addCfragmentGate(QGate *cfragmentGate) // This is a read-write association end Q_D(QCombinedFragment); - if (!d->cfragmentGates->contains(cfragmentGate)) { - d->cfragmentGates->insert(cfragmentGate); + if (!d->cfragmentGates.contains(cfragmentGate)) { + d->cfragmentGates.insert(cfragmentGate); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(cfragmentGate)); @@ -145,8 +141,8 @@ void QCombinedFragment::removeCfragmentGate(QGate *cfragmentGate) // This is a read-write association end Q_D(QCombinedFragment); - if (d->cfragmentGates->contains(cfragmentGate)) { - d->cfragmentGates->remove(cfragmentGate); + if (d->cfragmentGates.contains(cfragmentGate)) { + d->cfragmentGates.remove(cfragmentGate); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(cfragmentGate)); @@ -156,7 +152,7 @@ void QCombinedFragment::removeCfragmentGate(QGate *cfragmentGate) /*! The set of operands of the combined fragment. */ -const QList<QInteractionOperand *> *QCombinedFragment::operands() const +const QList<QInteractionOperand *> &QCombinedFragment::operands() const { // This is a read-write association end @@ -169,8 +165,8 @@ void QCombinedFragment::addOperand(QInteractionOperand *operand) // This is a read-write association end Q_D(QCombinedFragment); - if (!d->operands->contains(operand)) { - d->operands->append(operand); + if (!d->operands.contains(operand)) { + d->operands.append(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); @@ -182,43 +178,14 @@ void QCombinedFragment::removeOperand(QInteractionOperand *operand) // This is a read-write association end Q_D(QCombinedFragment); - if (d->operands->contains(operand)) { - d->operands->removeAll(operand); + if (d->operands.contains(operand)) { + d->operands.removeAll(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } -void QCombinedFragment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *>("QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *> *"); - qRegisterMetaType<QCombinedFragment *>("QCombinedFragment *"); - qRegisterMetaType<const QSet<QCombinedFragment *> *>("const QSet<QCombinedFragment *> *"); - qRegisterMetaType<const QList<QCombinedFragment *> *>("const QList<QCombinedFragment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGate) *>("QT_PREPEND_NAMESPACE_QTUML(QGate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<QGate *>("QGate *"); - qRegisterMetaType<const QSet<QGate *> *>("const QSet<QGate *> *"); - qRegisterMetaType<const QList<QGate *> *>("const QList<QGate *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *"); - qRegisterMetaType<QInteractionOperand *>("QInteractionOperand *"); - qRegisterMetaType<const QSet<QInteractionOperand *> *>("const QSet<QInteractionOperand *> *"); - qRegisterMetaType<const QList<QInteractionOperand *> *>("const QList<QInteractionOperand *> *"); - - QInteractionFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcombinedfragment.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcombinedfragment.h b/src/uml/qcombinedfragment.h index 6692ee52..4477a22a 100644 --- a/src/uml/qcombinedfragment.h +++ b/src/uml/qcombinedfragment.h @@ -70,8 +70,8 @@ class Q_UML_EXPORT QCombinedFragment : public QInteractionFragment Q_OBJECT Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator WRITE setInteractionOperator RESET unsetInteractionOperator) - Q_PROPERTY(const QSet<QGate *> * cfragmentGates READ cfragmentGates) - Q_PROPERTY(const QList<QInteractionOperand *> * operands READ operands) + Q_PROPERTY(QSet<QGate *> cfragmentGates READ cfragmentGates) + Q_PROPERTY(QList<QInteractionOperand *> operands READ operands) Q_DISABLE_COPY(QCombinedFragment) Q_DECLARE_PRIVATE(QCombinedFragment) @@ -86,13 +86,12 @@ public: Q_INVOKABLE void unsetInteractionOperator(); // Association ends from QCombinedFragment - Q_INVOKABLE const QSet<QGate *> *cfragmentGates() const; + Q_INVOKABLE const QSet<QGate *> &cfragmentGates() const; Q_INVOKABLE void addCfragmentGate(QGate *cfragmentGate); Q_INVOKABLE void removeCfragmentGate(QGate *cfragmentGate); - Q_INVOKABLE const QList<QInteractionOperand *> *operands() const; + Q_INVOKABLE const QList<QInteractionOperand *> &operands() const; Q_INVOKABLE void addOperand(QInteractionOperand *operand); Q_INVOKABLE void removeOperand(QInteractionOperand *operand); - virtual void registerMetaTypes() const; protected: explicit QCombinedFragment(QCombinedFragmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -100,10 +99,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCombinedFragment) *> *) - QT_END_HEADER #endif // QTUML_QCOMBINEDFRAGMENT_H diff --git a/src/uml/qcombinedfragment_p.h b/src/uml/qcombinedfragment_p.h index 88341635..fdb4627a 100644 --- a/src/uml/qcombinedfragment_p.h +++ b/src/uml/qcombinedfragment_p.h @@ -73,8 +73,8 @@ public: virtual ~QCombinedFragmentPrivate(); QtUml::InteractionOperatorKind interactionOperator; - QSet<QGate *> *cfragmentGates; - QList<QInteractionOperand *> *operands; + QSet<QGate *> cfragmentGates; + QList<QInteractionOperand *> operands; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcomment.cpp b/src/uml/qcomment.cpp index 43a859f2..f962c08b 100644 --- a/src/uml/qcomment.cpp +++ b/src/uml/qcomment.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTUML -QCommentPrivate::QCommentPrivate() : - annotatedElements(new QSet<QElement *>) +QCommentPrivate::QCommentPrivate() { } QCommentPrivate::~QCommentPrivate() { - delete annotatedElements; } /*! @@ -108,7 +106,7 @@ void QComment::setBody(QString body) /*! References the Element(s) being commented. */ -const QSet<QElement *> *QComment::annotatedElements() const +const QSet<QElement *> &QComment::annotatedElements() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QComment::addAnnotatedElement(QElement *annotatedElement) // This is a read-write association end Q_D(QComment); - if (!d->annotatedElements->contains(annotatedElement)) { - d->annotatedElements->insert(annotatedElement); + if (!d->annotatedElements.contains(annotatedElement)) { + d->annotatedElements.insert(annotatedElement); } } @@ -131,26 +129,11 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement) // This is a read-write association end Q_D(QComment); - if (d->annotatedElements->contains(annotatedElement)) { - d->annotatedElements->remove(annotatedElement); + if (d->annotatedElements.contains(annotatedElement)) { + d->annotatedElements.remove(annotatedElement); } } -void QComment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QComment) *>("QT_PREPEND_NAMESPACE_QTUML(QComment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *"); - qRegisterMetaType<QComment *>("QComment *"); - qRegisterMetaType<const QSet<QComment *> *>("const QSet<QComment *> *"); - qRegisterMetaType<const QList<QComment *> *>("const QList<QComment *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcomment.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcomment.h b/src/uml/qcomment.h index 20ad56d6..9e017d9d 100644 --- a/src/uml/qcomment.h +++ b/src/uml/qcomment.h @@ -63,7 +63,7 @@ class Q_UML_EXPORT QComment : public QElement Q_OBJECT Q_PROPERTY(QString body READ body WRITE setBody) - Q_PROPERTY(const QSet<QElement *> * annotatedElements READ annotatedElements) + Q_PROPERTY(QSet<QElement *> annotatedElements READ annotatedElements) Q_DISABLE_COPY(QComment) Q_DECLARE_PRIVATE(QComment) @@ -77,10 +77,9 @@ public: Q_INVOKABLE void setBody(QString body); // Association ends from QComment - Q_INVOKABLE const QSet<QElement *> *annotatedElements() const; + Q_INVOKABLE const QSet<QElement *> &annotatedElements() const; Q_INVOKABLE void addAnnotatedElement(QElement *annotatedElement); Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement); - virtual void registerMetaTypes() const; protected: explicit QComment(QCommentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QComment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *) - QT_END_HEADER #endif // QTUML_QCOMMENT_H diff --git a/src/uml/qcomment_p.h b/src/uml/qcomment_p.h index 8c92e781..6ea08f3b 100644 --- a/src/uml/qcomment_p.h +++ b/src/uml/qcomment_p.h @@ -66,7 +66,7 @@ public: virtual ~QCommentPrivate(); QString body; - QSet<QElement *> *annotatedElements; + QSet<QElement *> annotatedElements; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcommunicationpath.cpp b/src/uml/qcommunicationpath.cpp index 371e7a30..544ae15a 100644 --- a/src/uml/qcommunicationpath.cpp +++ b/src/uml/qcommunicationpath.cpp @@ -74,21 +74,6 @@ QCommunicationPath::~QCommunicationPath() { } -void QCommunicationPath::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *>("QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *> *"); - qRegisterMetaType<QCommunicationPath *>("QCommunicationPath *"); - qRegisterMetaType<const QSet<QCommunicationPath *> *>("const QSet<QCommunicationPath *> *"); - qRegisterMetaType<const QList<QCommunicationPath *> *>("const QList<QCommunicationPath *> *"); - - QAssociation::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcommunicationpath.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcommunicationpath.h b/src/uml/qcommunicationpath.h index 8d1bdfdb..dc425fff 100644 --- a/src/uml/qcommunicationpath.h +++ b/src/uml/qcommunicationpath.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QCommunicationPath : public QAssociation public: Q_INVOKABLE explicit QCommunicationPath(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QCommunicationPath(); - virtual void registerMetaTypes() const; protected: explicit QCommunicationPath(QCommunicationPathPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCommunicationPath) *> *) - QT_END_HEADER #endif // QTUML_QCOMMUNICATIONPATH_H diff --git a/src/uml/qcomponent.cpp b/src/uml/qcomponent.cpp index 0fc26402..7017edcf 100644 --- a/src/uml/qcomponent.cpp +++ b/src/uml/qcomponent.cpp @@ -50,16 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QComponentPrivate::QComponentPrivate() : - isIndirectlyInstantiated(true), - realizations(new QSet<QComponentRealization *>), - packagedElements(new QSet<QPackageableElement *>) + isIndirectlyInstantiated(true) { } QComponentPrivate::~QComponentPrivate() { - delete realizations; - delete packagedElements; } /*! @@ -121,7 +117,7 @@ void QComponent::unsetIndirectlyInstantiated() /*! 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. */ -const QSet<QComponentRealization *> *QComponent::realizations() const +const QSet<QComponentRealization *> &QComponent::realizations() const { // This is a read-write association end @@ -134,8 +130,8 @@ void QComponent::addRealization(QComponentRealization *realization) // This is a read-write association end Q_D(QComponent); - if (!d->realizations->contains(realization)) { - d->realizations->insert(realization); + if (!d->realizations.contains(realization)) { + d->realizations.insert(realization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(realization)); @@ -150,8 +146,8 @@ void QComponent::removeRealization(QComponentRealization *realization) // This is a read-write association end Q_D(QComponent); - if (d->realizations->contains(realization)) { - d->realizations->remove(realization); + if (d->realizations.contains(realization)) { + d->realizations.remove(realization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(realization)); @@ -164,31 +160,31 @@ void QComponent::removeRealization(QComponentRealization *realization) /*! 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. */ -const QSet<QInterface *> *QComponent::required() const +const QSet<QInterface *> &QComponent::required() const { // This is a read-only derived association end qWarning("QComponent::required: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QInterface *>); // change here to your derived return } /*! 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. */ -const QSet<QInterface *> *QComponent::provided() const +const QSet<QInterface *> &QComponent::provided() const { // This is a read-only derived association end qWarning("QComponent::provided: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QInterface *>); // change here to your derived return } /*! 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. */ -const QSet<QPackageableElement *> *QComponent::packagedElements() const +const QSet<QPackageableElement *> &QComponent::packagedElements() const { // This is a read-write association end @@ -201,8 +197,8 @@ void QComponent::addPackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QComponent); - if (!d->packagedElements->contains(packagedElement)) { - d->packagedElements->insert(packagedElement); + if (!d->packagedElements.contains(packagedElement)) { + d->packagedElements.insert(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -214,8 +210,8 @@ void QComponent::removePackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QComponent); - if (d->packagedElements->contains(packagedElement)) { - d->packagedElements->remove(packagedElement); + if (d->packagedElements.contains(packagedElement)) { + d->packagedElements.remove(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -225,66 +221,23 @@ void QComponent::removePackagedElement(QPackageableElement *packagedElement) /*! Utility returning the set of realized interfaces of a component. */ -const QSet<QInterface *> *QComponent::realizedInterfaces(const QClassifier *classifier) const +const QSet<QInterface *> &QComponent::realizedInterfaces(const QClassifier *classifier) const { qWarning("QComponent::realizedInterfaces: operation to be implemented"); Q_UNUSED(classifier); - return 0; // change here to your derived return + return *(new QSet<QInterface *>); // change here to your derived return } /*! Utility returning the set of used interfaces of a component. */ -const QSet<QInterface *> *QComponent::usedInterfaces(const QClassifier *classifier) const +const QSet<QInterface *> &QComponent::usedInterfaces(const QClassifier *classifier) const { qWarning("QComponent::usedInterfaces: operation to be implemented"); Q_UNUSED(classifier); - return 0; // change here to your derived return -} - -void QComponent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QComponent) *>("QT_PREPEND_NAMESPACE_QTUML(QComponent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *"); - qRegisterMetaType<QComponent *>("QComponent *"); - qRegisterMetaType<const QSet<QComponent *> *>("const QSet<QComponent *> *"); - qRegisterMetaType<const QList<QComponent *> *>("const QList<QComponent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *>("QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *"); - qRegisterMetaType<QComponentRealization *>("QComponentRealization *"); - qRegisterMetaType<const QSet<QComponentRealization *> *>("const QSet<QComponentRealization *> *"); - qRegisterMetaType<const QList<QComponentRealization *> *>("const QList<QComponentRealization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterface) *>("QT_PREPEND_NAMESPACE_QTUML(QInterface) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<QInterface *>("QInterface *"); - qRegisterMetaType<const QSet<QInterface *> *>("const QSet<QInterface *> *"); - qRegisterMetaType<const QList<QInterface *> *>("const QList<QInterface *> *"); - - QClass::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QInterface *>); // change here to your derived return } #include "moc_qcomponent.cpp" diff --git a/src/uml/qcomponent.h b/src/uml/qcomponent.h index d3cd4983..b7484440 100644 --- a/src/uml/qcomponent.h +++ b/src/uml/qcomponent.h @@ -68,10 +68,10 @@ class Q_UML_EXPORT QComponent : public QClass Q_OBJECT Q_PROPERTY(bool isIndirectlyInstantiated READ isIndirectlyInstantiated WRITE setIndirectlyInstantiated RESET unsetIndirectlyInstantiated) - Q_PROPERTY(const QSet<QComponentRealization *> * realizations READ realizations) - Q_PROPERTY(const QSet<QInterface *> * required READ required STORED false) - Q_PROPERTY(const QSet<QInterface *> * provided READ provided STORED false) - Q_PROPERTY(const QSet<QPackageableElement *> * packagedElements READ packagedElements) + 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_DISABLE_COPY(QComponent) Q_DECLARE_PRIVATE(QComponent) @@ -86,19 +86,18 @@ public: Q_INVOKABLE void unsetIndirectlyInstantiated(); // Association ends from QComponent - Q_INVOKABLE const QSet<QComponentRealization *> *realizations() const; + Q_INVOKABLE const QSet<QComponentRealization *> &realizations() const; Q_INVOKABLE void addRealization(QComponentRealization *realization); Q_INVOKABLE void removeRealization(QComponentRealization *realization); - Q_INVOKABLE const QSet<QInterface *> *required() const; - Q_INVOKABLE const QSet<QInterface *> *provided() const; - Q_INVOKABLE const QSet<QPackageableElement *> *packagedElements() const; + Q_INVOKABLE const QSet<QInterface *> &required() const; + Q_INVOKABLE const QSet<QInterface *> &provided() const; + Q_INVOKABLE const QSet<QPackageableElement *> &packagedElements() const; Q_INVOKABLE void addPackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE void removePackagedElement(QPackageableElement *packagedElement); // Operations - Q_INVOKABLE const QSet<QInterface *> *realizedInterfaces(const QClassifier *classifier) const; - Q_INVOKABLE const QSet<QInterface *> *usedInterfaces(const QClassifier *classifier) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QInterface *> &realizedInterfaces(const QClassifier *classifier) const; + Q_INVOKABLE const QSet<QInterface *> &usedInterfaces(const QClassifier *classifier) const; protected: explicit QComponent(QComponentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -106,10 +105,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QComponent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *) - QT_END_HEADER #endif // QTUML_QCOMPONENT_H diff --git a/src/uml/qcomponent_p.h b/src/uml/qcomponent_p.h index 523dbf48..5225ebbb 100644 --- a/src/uml/qcomponent_p.h +++ b/src/uml/qcomponent_p.h @@ -71,8 +71,8 @@ public: virtual ~QComponentPrivate(); bool isIndirectlyInstantiated; - QSet<QComponentRealization *> *realizations; - QSet<QPackageableElement *> *packagedElements; + QSet<QComponentRealization *> realizations; + QSet<QPackageableElement *> packagedElements; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcomponentrealization.cpp b/src/uml/qcomponentrealization.cpp index af3eb8a8..59eb630d 100644 --- a/src/uml/qcomponentrealization.cpp +++ b/src/uml/qcomponentrealization.cpp @@ -48,14 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QComponentRealizationPrivate::QComponentRealizationPrivate() : - abstraction(0), - realizingClassifiers(new QSet<QClassifier *>) + abstraction(0) { } QComponentRealizationPrivate::~QComponentRealizationPrivate() { - delete realizingClassifiers; } /*! @@ -125,7 +123,7 @@ void QComponentRealization::setAbstraction(QComponent *abstraction) /*! The classifiers that are involved in the implementation of the Component that owns this Realization. */ -const QSet<QClassifier *> *QComponentRealization::realizingClassifiers() const +const QSet<QClassifier *> &QComponentRealization::realizingClassifiers() const { // This is a read-write association end @@ -138,8 +136,8 @@ void QComponentRealization::addRealizingClassifier(QClassifier *realizingClassif // This is a read-write association end Q_D(QComponentRealization); - if (!d->realizingClassifiers->contains(realizingClassifier)) { - d->realizingClassifiers->insert(realizingClassifier); + if (!d->realizingClassifiers.contains(realizingClassifier)) { + d->realizingClassifiers.insert(realizingClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QDependency *>(this))->addClient(qwrappedobject_cast<QNamedElement *>(realizingClassifier)); @@ -151,43 +149,14 @@ void QComponentRealization::removeRealizingClassifier(QClassifier *realizingClas // This is a read-write association end Q_D(QComponentRealization); - if (d->realizingClassifiers->contains(realizingClassifier)) { - d->realizingClassifiers->remove(realizingClassifier); + if (d->realizingClassifiers.contains(realizingClassifier)) { + d->realizingClassifiers.remove(realizingClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QDependency *>(this))->removeClient(qwrappedobject_cast<QNamedElement *>(realizingClassifier)); } } -void QComponentRealization::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *>("QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *"); - qRegisterMetaType<QComponentRealization *>("QComponentRealization *"); - qRegisterMetaType<const QSet<QComponentRealization *> *>("const QSet<QComponentRealization *> *"); - qRegisterMetaType<const QList<QComponentRealization *> *>("const QList<QComponentRealization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QComponent) *>("QT_PREPEND_NAMESPACE_QTUML(QComponent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QComponent) *> *"); - qRegisterMetaType<QComponent *>("QComponent *"); - qRegisterMetaType<const QSet<QComponent *> *>("const QSet<QComponent *> *"); - qRegisterMetaType<const QList<QComponent *> *>("const QList<QComponent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QRealization::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QComponentRealization::addSupplier(QWrappedObjectPointer<QComponent> abstraction) diff --git a/src/uml/qcomponentrealization.h b/src/uml/qcomponentrealization.h index 7fa21d59..b65b5a87 100644 --- a/src/uml/qcomponentrealization.h +++ b/src/uml/qcomponentrealization.h @@ -69,7 +69,7 @@ class Q_UML_EXPORT QComponentRealization : public QRealization Q_OBJECT Q_PROPERTY(QComponent * abstraction READ abstraction WRITE setAbstraction) - Q_PROPERTY(const QSet<QClassifier *> * realizingClassifiers READ realizingClassifiers) + Q_PROPERTY(QSet<QClassifier *> realizingClassifiers READ realizingClassifiers) Q_DISABLE_COPY(QComponentRealization) Q_DECLARE_PRIVATE(QComponentRealization) @@ -81,7 +81,7 @@ public: // Association ends from QComponentRealization Q_INVOKABLE QComponent *abstraction() const; Q_INVOKABLE void setAbstraction(QComponent *abstraction); - Q_INVOKABLE const QSet<QClassifier *> *realizingClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &realizingClassifiers() const; Q_INVOKABLE void addRealizingClassifier(QClassifier *realizingClassifier); Q_INVOKABLE void removeRealizingClassifier(QClassifier *realizingClassifier); @@ -90,7 +90,6 @@ public: Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QComponent> abstraction); Q_INVOKABLE void addClient(QWrappedObjectPointer<QClassifier> realizingClassifier); Q_INVOKABLE void removeClient(QWrappedObjectPointer<QClassifier> realizingClassifier); - virtual void registerMetaTypes() const; protected: explicit QComponentRealization(QComponentRealizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QComponentRealization) *> *) - QT_END_HEADER #endif // QTUML_QCOMPONENTREALIZATION_H diff --git a/src/uml/qcomponentrealization_p.h b/src/uml/qcomponentrealization_p.h index e1c80f9e..e1749610 100644 --- a/src/uml/qcomponentrealization_p.h +++ b/src/uml/qcomponentrealization_p.h @@ -69,7 +69,7 @@ public: virtual ~QComponentRealizationPrivate(); QComponent *abstraction; - QSet<QClassifier *> *realizingClassifiers; + QSet<QClassifier *> realizingClassifiers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconditionalnode.cpp b/src/uml/qconditionalnode.cpp index 06d6e75c..3a4a96de 100644 --- a/src/uml/qconditionalnode.cpp +++ b/src/uml/qconditionalnode.cpp @@ -49,16 +49,13 @@ QT_BEGIN_NAMESPACE_QTUML QConditionalNodePrivate::QConditionalNodePrivate() : isAssured(false), - isDeterminate(false), - clauses(new QSet<QClause *>), - results(new QList<QOutputPin *>) + isDeterminate(false) { } QConditionalNodePrivate::~QConditionalNodePrivate() { - delete clauses; - delete results; + qDeleteAll(results); } /*! @@ -146,7 +143,7 @@ void QConditionalNode::unsetDeterminate() /*! Set of clauses composing the conditional. */ -const QSet<QClause *> *QConditionalNode::clauses() const +const QSet<QClause *> &QConditionalNode::clauses() const { // This is a read-write association end @@ -159,8 +156,8 @@ void QConditionalNode::addClause(QClause *clause) // This is a read-write association end Q_D(QConditionalNode); - if (!d->clauses->contains(clause)) { - d->clauses->insert(clause); + if (!d->clauses.contains(clause)) { + d->clauses.insert(clause); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(clause)); @@ -172,8 +169,8 @@ void QConditionalNode::removeClause(QClause *clause) // This is a read-write association end Q_D(QConditionalNode); - if (d->clauses->contains(clause)) { - d->clauses->remove(clause); + if (d->clauses.contains(clause)) { + d->clauses.remove(clause); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(clause)); @@ -183,7 +180,7 @@ void QConditionalNode::removeClause(QClause *clause) /*! A list of output pins that constitute the data flow outputs of the conditional. */ -const QList<QOutputPin *> *QConditionalNode::results() const +const QList<QOutputPin *> &QConditionalNode::results() const { // This is a read-write association end @@ -196,8 +193,8 @@ void QConditionalNode::addResult(QOutputPin *result) // This is a read-write association end Q_D(QConditionalNode); - if (!d->results->contains(result)) { - d->results->append(result); + if (!d->results.contains(result)) { + d->results.append(result); qTopLevelWrapper(result)->setParent(qTopLevelWrapper(this)); } } @@ -207,41 +204,12 @@ void QConditionalNode::removeResult(QOutputPin *result) // This is a read-write association end Q_D(QConditionalNode); - if (d->results->contains(result)) { - d->results->removeAll(result); + if (d->results.contains(result)) { + d->results.removeAll(result); qTopLevelWrapper(result)->setParent(0); } } -void QConditionalNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *>("QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *> *"); - qRegisterMetaType<QConditionalNode *>("QConditionalNode *"); - qRegisterMetaType<const QSet<QConditionalNode *> *>("const QSet<QConditionalNode *> *"); - qRegisterMetaType<const QList<QConditionalNode *> *>("const QList<QConditionalNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClause) *>("QT_PREPEND_NAMESPACE_QTUML(QClause) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClause) *> *"); - qRegisterMetaType<QClause *>("QClause *"); - qRegisterMetaType<const QSet<QClause *> *>("const QSet<QClause *> *"); - qRegisterMetaType<const QList<QClause *> *>("const QList<QClause *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QStructuredActivityNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconditionalnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconditionalnode.h b/src/uml/qconditionalnode.h index 6ed3b0eb..513a097b 100644 --- a/src/uml/qconditionalnode.h +++ b/src/uml/qconditionalnode.h @@ -68,8 +68,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(const QSet<QClause *> * clauses READ clauses) - Q_PROPERTY(const QList<QOutputPin *> * results READ results) + Q_PROPERTY(QSet<QClause *> clauses READ clauses) + Q_PROPERTY(QList<QOutputPin *> results READ results) Q_DISABLE_COPY(QConditionalNode) Q_DECLARE_PRIVATE(QConditionalNode) @@ -87,13 +87,12 @@ public: Q_INVOKABLE void unsetDeterminate(); // Association ends from QConditionalNode - Q_INVOKABLE const QSet<QClause *> *clauses() const; + Q_INVOKABLE const QSet<QClause *> &clauses() const; Q_INVOKABLE void addClause(QClause *clause); Q_INVOKABLE void removeClause(QClause *clause); - Q_INVOKABLE const QList<QOutputPin *> *results() const; + Q_INVOKABLE const QList<QOutputPin *> &results() const; Q_INVOKABLE void addResult(QOutputPin *result); Q_INVOKABLE void removeResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QConditionalNode(QConditionalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -101,10 +100,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConditionalNode) *> *) - QT_END_HEADER #endif // QTUML_QCONDITIONALNODE_H diff --git a/src/uml/qconditionalnode_p.h b/src/uml/qconditionalnode_p.h index e3fd9f66..49fd47da 100644 --- a/src/uml/qconditionalnode_p.h +++ b/src/uml/qconditionalnode_p.h @@ -71,8 +71,8 @@ public: bool isAssured; bool isDeterminate; - QSet<QClause *> *clauses; - QList<QOutputPin *> *results; + QSet<QClause *> clauses; + QList<QOutputPin *> results; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectableelement.cpp b/src/uml/qconnectableelement.cpp index 62c4fb05..828b8387 100644 --- a/src/uml/qconnectableelement.cpp +++ b/src/uml/qconnectableelement.cpp @@ -120,7 +120,7 @@ QConnectableElement::~QConnectableElement() /*! The Elements owned by this element. */ -const QSet<QElement *> *QConnectableElement::ownedElements() const +const QSet<QElement *> &QConnectableElement::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -136,7 +136,7 @@ QElement *QConnectableElement::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QConnectableElement::ownedComments() const +const QSet<QComment *> &QConnectableElement::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -217,7 +217,7 @@ QNamespace *QConnectableElement::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QConnectableElement::clientDependencies() const +const QSet<QDependency *> &QConnectableElement::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -273,13 +273,13 @@ void QConnectableElement::setOwningTemplateParameter(QTemplateParameter *owningT /*! Denotes a set of connector ends that attaches to this connectable element. */ -const QList<QConnectorEnd *> *QConnectableElement::ends() const +const QList<QConnectorEnd *> &QConnectableElement::ends() const { // This is a read-only derived association end qWarning("QConnectableElement::ends: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QList<QConnectorEnd *>); // change here to your derived return } /*! @@ -308,35 +308,6 @@ void QConnectableElement::setTemplateParameter(QConnectableElementTemplateParame } } -void QConnectableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<QConnectableElement *>("QConnectableElement *"); - qRegisterMetaType<const QSet<QConnectableElement *> *>("const QSet<QConnectableElement *> *"); - qRegisterMetaType<const QList<QConnectableElement *> *>("const QList<QConnectableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *"); - qRegisterMetaType<QConnectorEnd *>("QConnectorEnd *"); - qRegisterMetaType<const QSet<QConnectorEnd *> *>("const QSet<QConnectorEnd *> *"); - qRegisterMetaType<const QList<QConnectorEnd *> *>("const QList<QConnectorEnd *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *"); - qRegisterMetaType<QConnectableElementTemplateParameter *>("QConnectableElementTemplateParameter *"); - qRegisterMetaType<const QSet<QConnectableElementTemplateParameter *> *>("const QSet<QConnectableElementTemplateParameter *> *"); - qRegisterMetaType<const QList<QConnectableElementTemplateParameter *> *>("const QList<QConnectableElementTemplateParameter *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconnectableelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectableelement.h b/src/uml/qconnectableelement.h index b3e81e12..11c1594c 100644 --- a/src/uml/qconnectableelement.h +++ b/src/uml/qconnectableelement.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QConnectableElement : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QList<QConnectorEnd *> * ends READ ends STORED false) + Q_PROPERTY(QList<QConnectorEnd *> ends READ ends STORED false) Q_PROPERTY(QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_DISABLE_COPY(QConnectableElement) @@ -79,9 +79,9 @@ public: virtual ~QConnectableElement(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -96,7 +96,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -109,10 +109,9 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Association ends from QConnectableElement - Q_INVOKABLE const QList<QConnectorEnd *> *ends() const; + Q_INVOKABLE const QList<QConnectorEnd *> &ends() const; Q_INVOKABLE QConnectableElementTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QConnectableElementTemplateParameter *templateParameter); - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QConnectorEnd; @@ -127,10 +126,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *) - QT_END_HEADER #endif // QTUML_QCONNECTABLEELEMENT_H diff --git a/src/uml/qconnectableelementtemplateparameter.cpp b/src/uml/qconnectableelementtemplateparameter.cpp index 6aa73a3a..4c84193d 100644 --- a/src/uml/qconnectableelementtemplateparameter.cpp +++ b/src/uml/qconnectableelementtemplateparameter.cpp @@ -107,28 +107,6 @@ void QConnectableElementTemplateParameter::setParameteredElement(QConnectableEle } } -void QConnectableElementTemplateParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *"); - qRegisterMetaType<QConnectableElementTemplateParameter *>("QConnectableElementTemplateParameter *"); - qRegisterMetaType<const QSet<QConnectableElementTemplateParameter *> *>("const QSet<QConnectableElementTemplateParameter *> *"); - qRegisterMetaType<const QList<QConnectableElementTemplateParameter *> *>("const QList<QConnectableElementTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<QConnectableElement *>("QConnectableElement *"); - qRegisterMetaType<const QSet<QConnectableElement *> *>("const QSet<QConnectableElement *> *"); - qRegisterMetaType<const QList<QConnectableElement *> *>("const QList<QConnectableElement *> *"); - - QTemplateParameter::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconnectableelementtemplateparameter.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectableelementtemplateparameter.h b/src/uml/qconnectableelementtemplateparameter.h index 45327d7e..7b2639fb 100644 --- a/src/uml/qconnectableelementtemplateparameter.h +++ b/src/uml/qconnectableelementtemplateparameter.h @@ -73,7 +73,6 @@ public: // Association ends from QConnectableElementTemplateParameter Q_INVOKABLE QConnectableElement *parameteredElement() const; Q_INVOKABLE void setParameteredElement(QConnectableElement *parameteredElement); - virtual void registerMetaTypes() const; protected: explicit QConnectableElementTemplateParameter(QConnectableElementTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElementTemplateParameter) *> *) - QT_END_HEADER #endif // QTUML_QCONNECTABLEELEMENTTEMPLATEPARAMETER_H diff --git a/src/uml/qconnectionpointreference.cpp b/src/uml/qconnectionpointreference.cpp index 700ca6b2..eded4a8f 100644 --- a/src/uml/qconnectionpointreference.cpp +++ b/src/uml/qconnectionpointreference.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QConnectionPointReferencePrivate::QConnectionPointReferencePrivate() : - exits(new QSet<QPseudostate *>), - state(0), - entries(new QSet<QPseudostate *>) + state(0) { } QConnectionPointReferencePrivate::~QConnectionPointReferencePrivate() { - delete exits; - delete entries; } /*! @@ -89,7 +85,7 @@ QConnectionPointReference::~QConnectionPointReference() /*! The exitPoints kind pseudo states corresponding to this connection point. */ -const QSet<QPseudostate *> *QConnectionPointReference::exits() const +const QSet<QPseudostate *> &QConnectionPointReference::exits() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QConnectionPointReference::addExit(QPseudostate *exit) // This is a read-write association end Q_D(QConnectionPointReference); - if (!d->exits->contains(exit)) { - d->exits->insert(exit); + if (!d->exits.contains(exit)) { + d->exits.insert(exit); } } @@ -112,8 +108,8 @@ void QConnectionPointReference::removeExit(QPseudostate *exit) // This is a read-write association end Q_D(QConnectionPointReference); - if (d->exits->contains(exit)) { - d->exits->remove(exit); + if (d->exits.contains(exit)) { + d->exits.remove(exit); } } @@ -152,7 +148,7 @@ void QConnectionPointReference::setState(QState *state) /*! The entryPoint kind pseudo states corresponding to this connection point. */ -const QSet<QPseudostate *> *QConnectionPointReference::entries() const +const QSet<QPseudostate *> &QConnectionPointReference::entries() const { // This is a read-write association end @@ -165,8 +161,8 @@ void QConnectionPointReference::addEntry(QPseudostate *entry) // This is a read-write association end Q_D(QConnectionPointReference); - if (!d->entries->contains(entry)) { - d->entries->insert(entry); + if (!d->entries.contains(entry)) { + d->entries.insert(entry); } } @@ -175,40 +171,11 @@ void QConnectionPointReference::removeEntry(QPseudostate *entry) // This is a read-write association end Q_D(QConnectionPointReference); - if (d->entries->contains(entry)) { - d->entries->remove(entry); + if (d->entries.contains(entry)) { + d->entries.remove(entry); } } -void QConnectionPointReference::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *"); - qRegisterMetaType<QConnectionPointReference *>("QConnectionPointReference *"); - qRegisterMetaType<const QSet<QConnectionPointReference *> *>("const QSet<QConnectionPointReference *> *"); - qRegisterMetaType<const QList<QConnectionPointReference *> *>("const QList<QConnectionPointReference *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *>("QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<QPseudostate *>("QPseudostate *"); - qRegisterMetaType<const QSet<QPseudostate *> *>("const QSet<QPseudostate *> *"); - qRegisterMetaType<const QList<QPseudostate *> *>("const QList<QPseudostate *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QState) *>("QT_PREPEND_NAMESPACE_QTUML(QState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<QState *>("QState *"); - qRegisterMetaType<const QSet<QState *> *>("const QSet<QState *> *"); - qRegisterMetaType<const QList<QState *> *>("const QList<QState *> *"); - - QVertex::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconnectionpointreference.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectionpointreference.h b/src/uml/qconnectionpointreference.h index 04b23b45..d879096d 100644 --- a/src/uml/qconnectionpointreference.h +++ b/src/uml/qconnectionpointreference.h @@ -65,9 +65,9 @@ class Q_UML_EXPORT QConnectionPointReference : public QVertex { Q_OBJECT - Q_PROPERTY(const QSet<QPseudostate *> * exits READ exits) + Q_PROPERTY(QSet<QPseudostate *> exits READ exits) Q_PROPERTY(QState * state READ state WRITE setState) - Q_PROPERTY(const QSet<QPseudostate *> * entries READ entries) + Q_PROPERTY(QSet<QPseudostate *> entries READ entries) Q_DISABLE_COPY(QConnectionPointReference) Q_DECLARE_PRIVATE(QConnectionPointReference) @@ -77,15 +77,14 @@ public: virtual ~QConnectionPointReference(); // Association ends from QConnectionPointReference - Q_INVOKABLE const QSet<QPseudostate *> *exits() const; + Q_INVOKABLE const QSet<QPseudostate *> &exits() const; Q_INVOKABLE void addExit(QPseudostate *exit); Q_INVOKABLE void removeExit(QPseudostate *exit); Q_INVOKABLE QState *state() const; Q_INVOKABLE void setState(QState *state); - Q_INVOKABLE const QSet<QPseudostate *> *entries() const; + Q_INVOKABLE const QSet<QPseudostate *> &entries() const; Q_INVOKABLE void addEntry(QPseudostate *entry); Q_INVOKABLE void removeEntry(QPseudostate *entry); - virtual void registerMetaTypes() const; protected: explicit QConnectionPointReference(QConnectionPointReferencePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *) - QT_END_HEADER #endif // QTUML_QCONNECTIONPOINTREFERENCE_H diff --git a/src/uml/qconnectionpointreference_p.h b/src/uml/qconnectionpointreference_p.h index 6d0c3a5a..1f7cb4fd 100644 --- a/src/uml/qconnectionpointreference_p.h +++ b/src/uml/qconnectionpointreference_p.h @@ -68,9 +68,9 @@ public: explicit QConnectionPointReferencePrivate(); virtual ~QConnectionPointReferencePrivate(); - QSet<QPseudostate *> *exits; + QSet<QPseudostate *> exits; QState *state; - QSet<QPseudostate *> *entries; + QSet<QPseudostate *> entries; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnector.cpp b/src/uml/qconnector.cpp index 25a9a97b..dd015c6a 100644 --- a/src/uml/qconnector.cpp +++ b/src/uml/qconnector.cpp @@ -49,18 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML QConnectorPrivate::QConnectorPrivate() : - redefinedConnectors(new QSet<QConnector *>), - contracts(new QSet<QBehavior *>), - type(0), - ends(new QList<QConnectorEnd *>) + type(0) { } QConnectorPrivate::~QConnectorPrivate() { - delete redefinedConnectors; - delete contracts; - delete ends; } /*! @@ -108,7 +102,7 @@ QtUml::ConnectorKind QConnector::kind() const /*! 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. */ -const QSet<QConnector *> *QConnector::redefinedConnectors() const +const QSet<QConnector *> &QConnector::redefinedConnectors() const { // This is a read-write association end @@ -121,8 +115,8 @@ void QConnector::addRedefinedConnector(QConnector *redefinedConnector) // This is a read-write association end Q_D(QConnector); - if (!d->redefinedConnectors->contains(redefinedConnector)) { - d->redefinedConnectors->insert(redefinedConnector); + if (!d->redefinedConnectors.contains(redefinedConnector)) { + d->redefinedConnectors.insert(redefinedConnector); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedConnector)); @@ -134,8 +128,8 @@ void QConnector::removeRedefinedConnector(QConnector *redefinedConnector) // This is a read-write association end Q_D(QConnector); - if (d->redefinedConnectors->contains(redefinedConnector)) { - d->redefinedConnectors->remove(redefinedConnector); + if (d->redefinedConnectors.contains(redefinedConnector)) { + d->redefinedConnectors.remove(redefinedConnector); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedConnector)); @@ -145,7 +139,7 @@ void QConnector::removeRedefinedConnector(QConnector *redefinedConnector) /*! The set of Behaviors that specify the valid interaction patterns across the connector. */ -const QSet<QBehavior *> *QConnector::contracts() const +const QSet<QBehavior *> &QConnector::contracts() const { // This is a read-write association end @@ -158,8 +152,8 @@ void QConnector::addContract(QBehavior *contract) // This is a read-write association end Q_D(QConnector); - if (!d->contracts->contains(contract)) { - d->contracts->insert(contract); + if (!d->contracts.contains(contract)) { + d->contracts.insert(contract); } } @@ -168,8 +162,8 @@ void QConnector::removeContract(QBehavior *contract) // This is a read-write association end Q_D(QConnector); - if (d->contracts->contains(contract)) { - d->contracts->remove(contract); + if (d->contracts.contains(contract)) { + d->contracts.remove(contract); } } @@ -197,7 +191,7 @@ void QConnector::setType(QAssociation *type) /*! 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. */ -const QList<QConnectorEnd *> *QConnector::ends() const +const QList<QConnectorEnd *> &QConnector::ends() const { // This is a read-write association end @@ -210,8 +204,8 @@ void QConnector::addEnd(QConnectorEnd *end) // This is a read-write association end Q_D(QConnector); - if (!d->ends->contains(end)) { - d->ends->append(end); + if (!d->ends.contains(end)) { + d->ends.append(end); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(end)); @@ -223,50 +217,14 @@ void QConnector::removeEnd(QConnectorEnd *end) // This is a read-write association end Q_D(QConnector); - if (d->ends->contains(end)) { - d->ends->removeAll(end); + if (d->ends.contains(end)) { + d->ends.removeAll(end); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(end)); } } -void QConnector::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnector) *>("QT_PREPEND_NAMESPACE_QTUML(QConnector) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<QConnector *>("QConnector *"); - qRegisterMetaType<const QSet<QConnector *> *>("const QSet<QConnector *> *"); - qRegisterMetaType<const QList<QConnector *> *>("const QList<QConnector *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *>("QT_PREPEND_NAMESPACE_QTUML(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *"); - qRegisterMetaType<QConnectorEnd *>("QConnectorEnd *"); - qRegisterMetaType<const QSet<QConnectorEnd *> *>("const QSet<QConnectorEnd *> *"); - qRegisterMetaType<const QList<QConnectorEnd *> *>("const QList<QConnectorEnd *> *"); - - QFeature::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconnector.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnector.h b/src/uml/qconnector.h index 96e2d38d..ba687a4f 100644 --- a/src/uml/qconnector.h +++ b/src/uml/qconnector.h @@ -71,10 +71,10 @@ class Q_UML_EXPORT QConnector : public QFeature Q_OBJECT Q_PROPERTY(QtUml::ConnectorKind kind READ kind STORED false) - Q_PROPERTY(const QSet<QConnector *> * redefinedConnectors READ redefinedConnectors) - Q_PROPERTY(const QSet<QBehavior *> * contracts READ contracts) + Q_PROPERTY(QSet<QConnector *> redefinedConnectors READ redefinedConnectors) + Q_PROPERTY(QSet<QBehavior *> contracts READ contracts) Q_PROPERTY(QAssociation * type READ type WRITE setType) - Q_PROPERTY(const QList<QConnectorEnd *> * ends READ ends) + Q_PROPERTY(QList<QConnectorEnd *> ends READ ends) Q_DISABLE_COPY(QConnector) Q_DECLARE_PRIVATE(QConnector) @@ -87,18 +87,17 @@ public: Q_INVOKABLE QtUml::ConnectorKind kind() const; // Association ends from QConnector - Q_INVOKABLE const QSet<QConnector *> *redefinedConnectors() const; + Q_INVOKABLE const QSet<QConnector *> &redefinedConnectors() const; Q_INVOKABLE void addRedefinedConnector(QConnector *redefinedConnector); Q_INVOKABLE void removeRedefinedConnector(QConnector *redefinedConnector); - Q_INVOKABLE const QSet<QBehavior *> *contracts() const; + Q_INVOKABLE const QSet<QBehavior *> &contracts() const; Q_INVOKABLE void addContract(QBehavior *contract); Q_INVOKABLE void removeContract(QBehavior *contract); Q_INVOKABLE QAssociation *type() const; Q_INVOKABLE void setType(QAssociation *type); - Q_INVOKABLE const QList<QConnectorEnd *> *ends() const; + Q_INVOKABLE const QList<QConnectorEnd *> &ends() const; Q_INVOKABLE void addEnd(QConnectorEnd *end); Q_INVOKABLE void removeEnd(QConnectorEnd *end); - virtual void registerMetaTypes() const; protected: explicit QConnector(QConnectorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -106,10 +105,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConnector) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *) - QT_END_HEADER #endif // QTUML_QCONNECTOR_H diff --git a/src/uml/qconnector_p.h b/src/uml/qconnector_p.h index a251117e..2a5ed439 100644 --- a/src/uml/qconnector_p.h +++ b/src/uml/qconnector_p.h @@ -73,10 +73,10 @@ public: explicit QConnectorPrivate(); virtual ~QConnectorPrivate(); - QSet<QConnector *> *redefinedConnectors; - QSet<QBehavior *> *contracts; + QSet<QConnector *> redefinedConnectors; + QSet<QBehavior *> contracts; QAssociation *type; - QList<QConnectorEnd *> *ends; + QList<QConnectorEnd *> ends; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectorend.cpp b/src/uml/qconnectorend.cpp index ab55f2fc..e487858f 100644 --- a/src/uml/qconnectorend.cpp +++ b/src/uml/qconnectorend.cpp @@ -147,35 +147,6 @@ QProperty *QConnectorEnd::definingEnd() const return 0; // change here to your derived return } -void QConnectorEnd::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *"); - qRegisterMetaType<QConnectorEnd *>("QConnectorEnd *"); - qRegisterMetaType<const QSet<QConnectorEnd *> *>("const QSet<QConnectorEnd *> *"); - qRegisterMetaType<const QList<QConnectorEnd *> *>("const QList<QConnectorEnd *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<QConnectableElement *>("QConnectableElement *"); - qRegisterMetaType<const QSet<QConnectableElement *> *>("const QSet<QConnectableElement *> *"); - qRegisterMetaType<const QList<QConnectableElement *> *>("const QList<QConnectableElement *> *"); - - QMultiplicityElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconnectorend.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconnectorend.h b/src/uml/qconnectorend.h index 11b3b805..82537312 100644 --- a/src/uml/qconnectorend.h +++ b/src/uml/qconnectorend.h @@ -79,7 +79,6 @@ public: Q_INVOKABLE QProperty *partWithPort() const; Q_INVOKABLE void setPartWithPort(QProperty *partWithPort); Q_INVOKABLE QProperty *definingEnd() const; - virtual void registerMetaTypes() const; protected: explicit QConnectorEnd(QConnectorEndPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectorEnd) *> *) - QT_END_HEADER #endif // QTUML_QCONNECTOREND_H diff --git a/src/uml/qconsiderignorefragment.cpp b/src/uml/qconsiderignorefragment.cpp index 62128aa7..1f91afd7 100644 --- a/src/uml/qconsiderignorefragment.cpp +++ b/src/uml/qconsiderignorefragment.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QConsiderIgnoreFragmentPrivate::QConsiderIgnoreFragmentPrivate() : - messages(new QSet<QNamedElement *>) +QConsiderIgnoreFragmentPrivate::QConsiderIgnoreFragmentPrivate() { } QConsiderIgnoreFragmentPrivate::~QConsiderIgnoreFragmentPrivate() { - delete messages; } /*! @@ -85,7 +83,7 @@ QConsiderIgnoreFragment::~QConsiderIgnoreFragment() /*! The set of messages that apply to this fragment */ -const QSet<QNamedElement *> *QConsiderIgnoreFragment::messages() const +const QSet<QNamedElement *> &QConsiderIgnoreFragment::messages() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QConsiderIgnoreFragment::addMessage(QNamedElement *message) // This is a read-write association end Q_D(QConsiderIgnoreFragment); - if (!d->messages->contains(message)) { - d->messages->insert(message); + if (!d->messages.contains(message)) { + d->messages.insert(message); } } @@ -108,33 +106,11 @@ void QConsiderIgnoreFragment::removeMessage(QNamedElement *message) // This is a read-write association end Q_D(QConsiderIgnoreFragment); - if (d->messages->contains(message)) { - d->messages->remove(message); + if (d->messages.contains(message)) { + d->messages.remove(message); } } -void QConsiderIgnoreFragment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *>("QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *> *"); - qRegisterMetaType<QConsiderIgnoreFragment *>("QConsiderIgnoreFragment *"); - qRegisterMetaType<const QSet<QConsiderIgnoreFragment *> *>("const QSet<QConsiderIgnoreFragment *> *"); - qRegisterMetaType<const QList<QConsiderIgnoreFragment *> *>("const QList<QConsiderIgnoreFragment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QCombinedFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconsiderignorefragment.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconsiderignorefragment.h b/src/uml/qconsiderignorefragment.h index 19d2c98c..f988a4d4 100644 --- a/src/uml/qconsiderignorefragment.h +++ b/src/uml/qconsiderignorefragment.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QConsiderIgnoreFragment : public QCombinedFragment { Q_OBJECT - Q_PROPERTY(const QSet<QNamedElement *> * messages READ messages) + Q_PROPERTY(QSet<QNamedElement *> messages READ messages) Q_DISABLE_COPY(QConsiderIgnoreFragment) Q_DECLARE_PRIVATE(QConsiderIgnoreFragment) @@ -74,10 +74,9 @@ public: virtual ~QConsiderIgnoreFragment(); // Association ends from QConsiderIgnoreFragment - Q_INVOKABLE const QSet<QNamedElement *> *messages() const; + Q_INVOKABLE const QSet<QNamedElement *> &messages() const; Q_INVOKABLE void addMessage(QNamedElement *message); Q_INVOKABLE void removeMessage(QNamedElement *message); - virtual void registerMetaTypes() const; protected: explicit QConsiderIgnoreFragment(QConsiderIgnoreFragmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConsiderIgnoreFragment) *> *) - QT_END_HEADER #endif // QTUML_QCONSIDERIGNOREFRAGMENT_H diff --git a/src/uml/qconsiderignorefragment_p.h b/src/uml/qconsiderignorefragment_p.h index d80a6cb6..177ba29a 100644 --- a/src/uml/qconsiderignorefragment_p.h +++ b/src/uml/qconsiderignorefragment_p.h @@ -67,7 +67,7 @@ public: explicit QConsiderIgnoreFragmentPrivate(); virtual ~QConsiderIgnoreFragmentPrivate(); - QSet<QNamedElement *> *messages; + QSet<QNamedElement *> messages; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconstraint.cpp b/src/uml/qconstraint.cpp index c8c89099..70caf125 100644 --- a/src/uml/qconstraint.cpp +++ b/src/uml/qconstraint.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QConstraintPrivate::QConstraintPrivate() : context(0), - specification(0), - constrainedElements(new QList<QElement *>) + specification(0) { } QConstraintPrivate::~QConstraintPrivate() { - delete constrainedElements; } /*! @@ -150,7 +148,7 @@ void QConstraint::setSpecification(QValueSpecification *specification) /*! The ordered set of Elements referenced by this Constraint. */ -const QList<QElement *> *QConstraint::constrainedElements() const +const QList<QElement *> &QConstraint::constrainedElements() const { // This is a read-write association end @@ -163,8 +161,8 @@ void QConstraint::addConstrainedElement(QElement *constrainedElement) // This is a read-write association end Q_D(QConstraint); - if (!d->constrainedElements->contains(constrainedElement)) { - d->constrainedElements->append(constrainedElement); + if (!d->constrainedElements.contains(constrainedElement)) { + d->constrainedElements.append(constrainedElement); } } @@ -173,47 +171,11 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement) // This is a read-write association end Q_D(QConstraint); - if (d->constrainedElements->contains(constrainedElement)) { - d->constrainedElements->removeAll(constrainedElement); + if (d->constrainedElements.contains(constrainedElement)) { + d->constrainedElements.removeAll(constrainedElement); } } -void QConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElement) *>("QT_PREPEND_NAMESPACE_QTUML(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *>("QT_PREPEND_NAMESPACE_QTUML(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconstraint.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qconstraint.h b/src/uml/qconstraint.h index 0a39c081..0362f9d1 100644 --- a/src/uml/qconstraint.h +++ b/src/uml/qconstraint.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QConstraint : public QPackageableElement Q_PROPERTY(QNamespace * context READ context WRITE setContext) Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QList<QElement *> * constrainedElements READ constrainedElements) + Q_PROPERTY(QList<QElement *> constrainedElements READ constrainedElements) Q_DISABLE_COPY(QConstraint) Q_DECLARE_PRIVATE(QConstraint) @@ -82,10 +82,9 @@ public: Q_INVOKABLE void setContext(QNamespace *context); Q_INVOKABLE QValueSpecification *specification() const; Q_INVOKABLE void setSpecification(QValueSpecification *specification); - Q_INVOKABLE const QList<QElement *> *constrainedElements() const; + Q_INVOKABLE const QList<QElement *> &constrainedElements() const; Q_INVOKABLE void addConstrainedElement(QElement *constrainedElement); Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement); - virtual void registerMetaTypes() const; protected: explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *) - QT_END_HEADER #endif // QTUML_QCONSTRAINT_H diff --git a/src/uml/qconstraint_p.h b/src/uml/qconstraint_p.h index 30aea01a..e710dc30 100644 --- a/src/uml/qconstraint_p.h +++ b/src/uml/qconstraint_p.h @@ -71,7 +71,7 @@ public: QNamespace *context; QValueSpecification *specification; - QList<QElement *> *constrainedElements; + QList<QElement *> constrainedElements; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontinuation.cpp b/src/uml/qcontinuation.cpp index 93db10bd..8bb82d9f 100644 --- a/src/uml/qcontinuation.cpp +++ b/src/uml/qcontinuation.cpp @@ -105,21 +105,6 @@ void QContinuation::unsetSetting() setSetting(true); } -void QContinuation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *>("QT_PREPEND_NAMESPACE_QTUML(QContinuation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *> *"); - qRegisterMetaType<QContinuation *>("QContinuation *"); - qRegisterMetaType<const QSet<QContinuation *> *>("const QSet<QContinuation *> *"); - qRegisterMetaType<const QList<QContinuation *> *>("const QList<QContinuation *> *"); - - QInteractionFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcontinuation.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontinuation.h b/src/uml/qcontinuation.h index 1eb56fac..82551e61 100644 --- a/src/uml/qcontinuation.h +++ b/src/uml/qcontinuation.h @@ -71,7 +71,6 @@ public: Q_INVOKABLE bool setting() const; Q_INVOKABLE void setSetting(bool setting); Q_INVOKABLE void unsetSetting(); - virtual void registerMetaTypes() const; protected: explicit QContinuation(QContinuationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -79,10 +78,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QContinuation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QContinuation) *> *) - QT_END_HEADER #endif // QTUML_QCONTINUATION_H diff --git a/src/uml/qcontrolflow.cpp b/src/uml/qcontrolflow.cpp index 89597138..8cb049ce 100644 --- a/src/uml/qcontrolflow.cpp +++ b/src/uml/qcontrolflow.cpp @@ -74,21 +74,6 @@ QControlFlow::~QControlFlow() { } -void QControlFlow::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *>("QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *> *"); - qRegisterMetaType<QControlFlow *>("QControlFlow *"); - qRegisterMetaType<const QSet<QControlFlow *> *>("const QSet<QControlFlow *> *"); - qRegisterMetaType<const QList<QControlFlow *> *>("const QList<QControlFlow *> *"); - - QActivityEdge::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcontrolflow.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontrolflow.h b/src/uml/qcontrolflow.h index 768bdbfb..47b63fbc 100644 --- a/src/uml/qcontrolflow.h +++ b/src/uml/qcontrolflow.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QControlFlow : public QActivityEdge public: Q_INVOKABLE explicit QControlFlow(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QControlFlow(); - virtual void registerMetaTypes() const; protected: explicit QControlFlow(QControlFlowPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QControlFlow) *> *) - QT_END_HEADER #endif // QTUML_QCONTROLFLOW_H diff --git a/src/uml/qcontrolnode.cpp b/src/uml/qcontrolnode.cpp index 8126206e..d7e92379 100644 --- a/src/uml/qcontrolnode.cpp +++ b/src/uml/qcontrolnode.cpp @@ -74,21 +74,6 @@ QControlNode::~QControlNode() { } -void QControlNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *>("QT_PREPEND_NAMESPACE_QTUML(QControlNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *> *"); - qRegisterMetaType<QControlNode *>("QControlNode *"); - qRegisterMetaType<const QSet<QControlNode *> *>("const QSet<QControlNode *> *"); - qRegisterMetaType<const QList<QControlNode *> *>("const QList<QControlNode *> *"); - - QActivityNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcontrolnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcontrolnode.h b/src/uml/qcontrolnode.h index fc4788a6..728bfe30 100644 --- a/src/uml/qcontrolnode.h +++ b/src/uml/qcontrolnode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QControlNode : public QActivityNode public: Q_INVOKABLE explicit QControlNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QControlNode(); - virtual void registerMetaTypes() const; protected: explicit QControlNode(QControlNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QControlNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QControlNode) *> *) - QT_END_HEADER #endif // QTUML_QCONTROLNODE_H diff --git a/src/uml/qcreatelinkaction.cpp b/src/uml/qcreatelinkaction.cpp index 202de7bd..d5271be7 100644 --- a/src/uml/qcreatelinkaction.cpp +++ b/src/uml/qcreatelinkaction.cpp @@ -46,14 +46,13 @@ QT_BEGIN_NAMESPACE_QTUML -QCreateLinkActionPrivate::QCreateLinkActionPrivate() : - endData(new QSet<QLinkEndCreationData *>) +QCreateLinkActionPrivate::QCreateLinkActionPrivate() { } QCreateLinkActionPrivate::~QCreateLinkActionPrivate() { - delete endData; + qDeleteAll(endData); } /*! @@ -85,7 +84,7 @@ QCreateLinkAction::~QCreateLinkAction() /*! Specifies ends of association and inputs. */ -const QSet<QLinkEndCreationData *> *QCreateLinkAction::endData() const +const QSet<QLinkEndCreationData *> &QCreateLinkAction::endData() const { // This is a read-write association end @@ -98,8 +97,8 @@ void QCreateLinkAction::addEndData(QLinkEndCreationData *endData) // This is a read-write association end Q_D(QCreateLinkAction); - if (!d->endData->contains(endData)) { - d->endData->insert(endData); + if (!d->endData.contains(endData)) { + d->endData.insert(endData); qTopLevelWrapper(endData)->setParent(qTopLevelWrapper(this)); } } @@ -109,34 +108,12 @@ void QCreateLinkAction::removeEndData(QLinkEndCreationData *endData) // This is a read-write association end Q_D(QCreateLinkAction); - if (d->endData->contains(endData)) { - d->endData->remove(endData); + if (d->endData.contains(endData)) { + d->endData.remove(endData); qTopLevelWrapper(endData)->setParent(0); } } -void QCreateLinkAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *>("QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *> *"); - qRegisterMetaType<QCreateLinkAction *>("QCreateLinkAction *"); - qRegisterMetaType<const QSet<QCreateLinkAction *> *>("const QSet<QCreateLinkAction *> *"); - qRegisterMetaType<const QList<QCreateLinkAction *> *>("const QList<QCreateLinkAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *"); - qRegisterMetaType<QLinkEndCreationData *>("QLinkEndCreationData *"); - qRegisterMetaType<const QSet<QLinkEndCreationData *> *>("const QSet<QLinkEndCreationData *> *"); - qRegisterMetaType<const QList<QLinkEndCreationData *> *>("const QList<QLinkEndCreationData *> *"); - - QWriteLinkAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcreatelinkaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreatelinkaction.h b/src/uml/qcreatelinkaction.h index 5ccc838d..f764667d 100644 --- a/src/uml/qcreatelinkaction.h +++ b/src/uml/qcreatelinkaction.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QCreateLinkAction : public QWriteLinkAction { Q_OBJECT - Q_PROPERTY(const QSet<QLinkEndCreationData *> * endData READ endData) + Q_PROPERTY(QSet<QLinkEndCreationData *> endData READ endData) Q_DISABLE_COPY(QCreateLinkAction) Q_DECLARE_PRIVATE(QCreateLinkAction) @@ -74,10 +74,9 @@ public: virtual ~QCreateLinkAction(); // Association ends from QCreateLinkAction - Q_INVOKABLE const QSet<QLinkEndCreationData *> *endData() const; + Q_INVOKABLE const QSet<QLinkEndCreationData *> &endData() const; Q_INVOKABLE void addEndData(QLinkEndCreationData *endData); Q_INVOKABLE void removeEndData(QLinkEndCreationData *endData); - virtual void registerMetaTypes() const; protected: explicit QCreateLinkAction(QCreateLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkAction) *> *) - QT_END_HEADER #endif // QTUML_QCREATELINKACTION_H diff --git a/src/uml/qcreatelinkaction_p.h b/src/uml/qcreatelinkaction_p.h index b734466e..d16e2219 100644 --- a/src/uml/qcreatelinkaction_p.h +++ b/src/uml/qcreatelinkaction_p.h @@ -67,7 +67,7 @@ public: explicit QCreateLinkActionPrivate(); virtual ~QCreateLinkActionPrivate(); - QSet<QLinkEndCreationData *> *endData; + QSet<QLinkEndCreationData *> endData; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreatelinkobjectaction.cpp b/src/uml/qcreatelinkobjectaction.cpp index d3cce96b..c0752e81 100644 --- a/src/uml/qcreatelinkobjectaction.cpp +++ b/src/uml/qcreatelinkobjectaction.cpp @@ -110,28 +110,6 @@ void QCreateLinkObjectAction::setResult(QOutputPin *result) } } -void QCreateLinkObjectAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *>("QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *> *"); - qRegisterMetaType<QCreateLinkObjectAction *>("QCreateLinkObjectAction *"); - qRegisterMetaType<const QSet<QCreateLinkObjectAction *> *>("const QSet<QCreateLinkObjectAction *> *"); - qRegisterMetaType<const QList<QCreateLinkObjectAction *> *>("const QList<QCreateLinkObjectAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QCreateLinkAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcreatelinkobjectaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreatelinkobjectaction.h b/src/uml/qcreatelinkobjectaction.h index 8f982aa4..b8263060 100644 --- a/src/uml/qcreatelinkobjectaction.h +++ b/src/uml/qcreatelinkobjectaction.h @@ -73,7 +73,6 @@ public: // Association ends from QCreateLinkObjectAction Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QCreateLinkObjectAction(QCreateLinkObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateLinkObjectAction) *> *) - QT_END_HEADER #endif // QTUML_QCREATELINKOBJECTACTION_H diff --git a/src/uml/qcreateobjectaction.cpp b/src/uml/qcreateobjectaction.cpp index 7b8529cf..e16e9a19 100644 --- a/src/uml/qcreateobjectaction.cpp +++ b/src/uml/qcreateobjectaction.cpp @@ -133,35 +133,6 @@ void QCreateObjectAction::setResult(QOutputPin *result) } } -void QCreateObjectAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *>("QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *> *"); - qRegisterMetaType<QCreateObjectAction *>("QCreateObjectAction *"); - qRegisterMetaType<const QSet<QCreateObjectAction *> *>("const QSet<QCreateObjectAction *> *"); - qRegisterMetaType<const QList<QCreateObjectAction *> *>("const QList<QCreateObjectAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcreateobjectaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qcreateobjectaction.h b/src/uml/qcreateobjectaction.h index ca7e1213..031a9417 100644 --- a/src/uml/qcreateobjectaction.h +++ b/src/uml/qcreateobjectaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setClassifier(QClassifier *classifier); Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QCreateObjectAction(QCreateObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QCreateObjectAction) *> *) - QT_END_HEADER #endif // QTUML_QCREATEOBJECTACTION_H diff --git a/src/uml/qdatastorenode.cpp b/src/uml/qdatastorenode.cpp index 2283d6f7..09dab2e3 100644 --- a/src/uml/qdatastorenode.cpp +++ b/src/uml/qdatastorenode.cpp @@ -74,21 +74,6 @@ QDataStoreNode::~QDataStoreNode() { } -void QDataStoreNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *>("QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *> *"); - qRegisterMetaType<QDataStoreNode *>("QDataStoreNode *"); - qRegisterMetaType<const QSet<QDataStoreNode *> *>("const QSet<QDataStoreNode *> *"); - qRegisterMetaType<const QList<QDataStoreNode *> *>("const QList<QDataStoreNode *> *"); - - QCentralBufferNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdatastorenode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdatastorenode.h b/src/uml/qdatastorenode.h index 5ca78b87..2f0ed256 100644 --- a/src/uml/qdatastorenode.h +++ b/src/uml/qdatastorenode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QDataStoreNode : public QCentralBufferNode public: Q_INVOKABLE explicit QDataStoreNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDataStoreNode(); - virtual void registerMetaTypes() const; protected: explicit QDataStoreNode(QDataStoreNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDataStoreNode) *> *) - QT_END_HEADER #endif // QTUML_QDATASTORENODE_H diff --git a/src/uml/qdatatype.cpp b/src/uml/qdatatype.cpp index f770ca69..fec8347d 100644 --- a/src/uml/qdatatype.cpp +++ b/src/uml/qdatatype.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML -QDataTypePrivate::QDataTypePrivate() : - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>) +QDataTypePrivate::QDataTypePrivate() { } QDataTypePrivate::~QDataTypePrivate() { - delete ownedOperations; - delete ownedAttributes; } /*! @@ -89,7 +85,7 @@ QDataType::~QDataType() /*! The Operations owned by the DataType. */ -const QList<QOperation *> *QDataType::ownedOperations() const +const QList<QOperation *> &QDataType::ownedOperations() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QDataType::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QDataType); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -119,8 +115,8 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QDataType); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -134,7 +130,7 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) /*! The Attributes owned by the DataType. */ -const QList<QProperty *> *QDataType::ownedAttributes() const +const QList<QProperty *> &QDataType::ownedAttributes() const { // This is a read-write association end @@ -147,8 +143,8 @@ void QDataType::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QDataType); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -164,8 +160,8 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QDataType); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -179,48 +175,12 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) /*! The inherit operation is overridden to exclude redefined properties. */ -const QSet<QNamedElement *> *QDataType::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QDataType::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QDataType::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return -} - -void QDataType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDataType) *>("QT_PREPEND_NAMESPACE_QTUML(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QNamedElement *>); // change here to your derived return } #include "moc_qdatatype.cpp" diff --git a/src/uml/qdatatype.h b/src/uml/qdatatype.h index af4f4b02..c824839a 100644 --- a/src/uml/qdatatype.h +++ b/src/uml/qdatatype.h @@ -67,8 +67,8 @@ class Q_UML_EXPORT QDataType : public QClassifier { Q_OBJECT - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QDataType) Q_DECLARE_PRIVATE(QDataType) @@ -78,16 +78,15 @@ public: virtual ~QDataType(); // Association ends from QDataType - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); // Operations - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; protected: explicit QDataType(QDataTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDataType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *) - QT_END_HEADER #endif // QTUML_QDATATYPE_H diff --git a/src/uml/qdatatype_p.h b/src/uml/qdatatype_p.h index 570b7414..0da22458 100644 --- a/src/uml/qdatatype_p.h +++ b/src/uml/qdatatype_p.h @@ -70,8 +70,8 @@ public: explicit QDataTypePrivate(); virtual ~QDataTypePrivate(); - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdecisionnode.cpp b/src/uml/qdecisionnode.cpp index f07bc404..4e4cd5fb 100644 --- a/src/uml/qdecisionnode.cpp +++ b/src/uml/qdecisionnode.cpp @@ -125,35 +125,6 @@ void QDecisionNode::setDecisionInput(QBehavior *decisionInput) } } -void QDecisionNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *>("QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *> *"); - qRegisterMetaType<QDecisionNode *>("QDecisionNode *"); - qRegisterMetaType<const QSet<QDecisionNode *> *>("const QSet<QDecisionNode *> *"); - qRegisterMetaType<const QList<QDecisionNode *> *>("const QList<QDecisionNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *>("QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *"); - qRegisterMetaType<QObjectFlow *>("QObjectFlow *"); - qRegisterMetaType<const QSet<QObjectFlow *> *>("const QSet<QObjectFlow *> *"); - qRegisterMetaType<const QList<QObjectFlow *> *>("const QList<QObjectFlow *> *"); - - QControlNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdecisionnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdecisionnode.h b/src/uml/qdecisionnode.h index e939b1e4..a4d5e86a 100644 --- a/src/uml/qdecisionnode.h +++ b/src/uml/qdecisionnode.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setDecisionInputFlow(QObjectFlow *decisionInputFlow); Q_INVOKABLE QBehavior *decisionInput() const; Q_INVOKABLE void setDecisionInput(QBehavior *decisionInput); - virtual void registerMetaTypes() const; protected: explicit QDecisionNode(QDecisionNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDecisionNode) *> *) - QT_END_HEADER #endif // QTUML_QDECISIONNODE_H diff --git a/src/uml/qdependency.cpp b/src/uml/qdependency.cpp index d3861629..8fe9a6e5 100644 --- a/src/uml/qdependency.cpp +++ b/src/uml/qdependency.cpp @@ -46,16 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QDependencyPrivate::QDependencyPrivate() : - clients(new QSet<QNamedElement *>), - suppliers(new QSet<QNamedElement *>) +QDependencyPrivate::QDependencyPrivate() { } QDependencyPrivate::~QDependencyPrivate() { - delete clients; - delete suppliers; } /*! @@ -91,7 +87,7 @@ QDependency::~QDependency() /*! The Elements owned by this element. */ -const QSet<QElement *> *QDependency::ownedElements() const +const QSet<QElement *> &QDependency::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -107,7 +103,7 @@ QElement *QDependency::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QDependency::ownedComments() const +const QSet<QComment *> &QDependency::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -205,7 +201,7 @@ QNamespace *QDependency::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QDependency::clientDependencies() const +const QSet<QDependency *> &QDependency::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -249,7 +245,7 @@ void QDependency::unsetVisibility() /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QDependency::relatedElements() const +const QSet<QElement *> &QDependency::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -261,7 +257,7 @@ const QSet<QElement *> *QDependency::relatedElements() const /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QDependency::sources() const +const QSet<QElement *> &QDependency::sources() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } @@ -269,7 +265,7 @@ const QSet<QElement *> *QDependency::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QDependency::targets() const +const QSet<QElement *> &QDependency::targets() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } @@ -281,7 +277,7 @@ const QSet<QElement *> *QDependency::targets() const /*! 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. */ -const QSet<QNamedElement *> *QDependency::clients() const +const QSet<QNamedElement *> &QDependency::clients() const { // This is a read-write association end @@ -294,8 +290,8 @@ void QDependency::addClient(QNamedElement *client) // This is a read-write association end Q_D(QDependency); - if (!d->clients->contains(client)) { - d->clients->insert(client); + if (!d->clients.contains(client)) { + d->clients.insert(client); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(client)); @@ -310,8 +306,8 @@ void QDependency::removeClient(QNamedElement *client) // This is a read-write association end Q_D(QDependency); - if (d->clients->contains(client)) { - d->clients->remove(client); + if (d->clients.contains(client)) { + d->clients.remove(client); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(client)); @@ -325,7 +321,7 @@ void QDependency::removeClient(QNamedElement *client) /*! 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. */ -const QSet<QNamedElement *> *QDependency::suppliers() const +const QSet<QNamedElement *> &QDependency::suppliers() const { // This is a read-write association end @@ -338,8 +334,8 @@ void QDependency::addSupplier(QNamedElement *supplier) // This is a read-write association end Q_D(QDependency); - if (!d->suppliers->contains(supplier)) { - d->suppliers->insert(supplier); + if (!d->suppliers.contains(supplier)) { + d->suppliers.insert(supplier); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(supplier)); @@ -351,36 +347,14 @@ void QDependency::removeSupplier(QNamedElement *supplier) // This is a read-write association end Q_D(QDependency); - if (d->suppliers->contains(supplier)) { - d->suppliers->remove(supplier); + if (d->suppliers.contains(supplier)) { + d->suppliers.remove(supplier); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(supplier)); } } -void QDependency::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDependency) *>("QT_PREPEND_NAMESPACE_QTUML(QDependency) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *"); - qRegisterMetaType<QDependency *>("QDependency *"); - qRegisterMetaType<const QSet<QDependency *> *>("const QSet<QDependency *> *"); - qRegisterMetaType<const QList<QDependency *> *>("const QList<QDependency *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdependency.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdependency.h b/src/uml/qdependency.h index 0f40d30d..837a237b 100644 --- a/src/uml/qdependency.h +++ b/src/uml/qdependency.h @@ -67,8 +67,8 @@ class Q_UML_EXPORT QDependency : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QNamedElement *> * clients READ clients) - Q_PROPERTY(const QSet<QNamedElement *> * suppliers READ suppliers) + Q_PROPERTY(QSet<QNamedElement *> clients READ clients) + Q_PROPERTY(QSet<QNamedElement *> suppliers READ suppliers) Q_DISABLE_COPY(QDependency) Q_DECLARE_PRIVATE(QDependency) @@ -78,9 +78,9 @@ public: virtual ~QDependency(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -99,7 +99,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -109,20 +109,19 @@ public: Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Association ends from aggregated QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; // Association ends from QDependency - Q_INVOKABLE const QSet<QNamedElement *> *clients() const; + Q_INVOKABLE const QSet<QNamedElement *> &clients() const; Q_INVOKABLE void addClient(QNamedElement *client); Q_INVOKABLE void removeClient(QNamedElement *client); - Q_INVOKABLE const QSet<QNamedElement *> *suppliers() const; + Q_INVOKABLE const QSet<QNamedElement *> &suppliers() const; Q_INVOKABLE void addSupplier(QNamedElement *supplier); Q_INVOKABLE void removeSupplier(QNamedElement *supplier); - virtual void registerMetaTypes() const; protected: explicit QDependency(QDependencyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -134,10 +133,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDependency) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *) - QT_END_HEADER #endif // QTUML_QDEPENDENCY_H diff --git a/src/uml/qdependency_p.h b/src/uml/qdependency_p.h index 1ac5d562..dd55da13 100644 --- a/src/uml/qdependency_p.h +++ b/src/uml/qdependency_p.h @@ -70,8 +70,8 @@ public: explicit QDependencyPrivate(); virtual ~QDependencyPrivate(); - QSet<QNamedElement *> *clients; - QSet<QNamedElement *> *suppliers; + QSet<QNamedElement *> clients; + QSet<QNamedElement *> suppliers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeployedartifact.cpp b/src/uml/qdeployedartifact.cpp index 34715e2a..5fb51f42 100644 --- a/src/uml/qdeployedartifact.cpp +++ b/src/uml/qdeployedartifact.cpp @@ -74,21 +74,6 @@ QDeployedArtifact::~QDeployedArtifact() { } -void QDeployedArtifact::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *>("QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *"); - qRegisterMetaType<QDeployedArtifact *>("QDeployedArtifact *"); - qRegisterMetaType<const QSet<QDeployedArtifact *> *>("const QSet<QDeployedArtifact *> *"); - qRegisterMetaType<const QList<QDeployedArtifact *> *>("const QList<QDeployedArtifact *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdeployedartifact.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeployedartifact.h b/src/uml/qdeployedartifact.h index f8cd9415..036ebb03 100644 --- a/src/uml/qdeployedartifact.h +++ b/src/uml/qdeployedartifact.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QDeployedArtifact : public QNamedElement public: Q_INVOKABLE explicit QDeployedArtifact(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDeployedArtifact(); - virtual void registerMetaTypes() const; protected: explicit QDeployedArtifact(QDeployedArtifactPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *) - QT_END_HEADER #endif // QTUML_QDEPLOYEDARTIFACT_H diff --git a/src/uml/qdeployment.cpp b/src/uml/qdeployment.cpp index ee5fcdb3..ef70d3d7 100644 --- a/src/uml/qdeployment.cpp +++ b/src/uml/qdeployment.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML QDeploymentPrivate::QDeploymentPrivate() : - location(0), - configurations(new QSet<QDeploymentSpecification *>), - deployedArtifacts(new QSet<QDeployedArtifact *>) + location(0) { } QDeploymentPrivate::~QDeploymentPrivate() { - delete configurations; - delete deployedArtifacts; } /*! @@ -128,7 +124,7 @@ void QDeployment::setLocation(QDeploymentTarget *location) /*! The specification of properties that parameterize the deployment and execution of one or more Artifacts. */ -const QSet<QDeploymentSpecification *> *QDeployment::configurations() const +const QSet<QDeploymentSpecification *> &QDeployment::configurations() const { // This is a read-write association end @@ -141,8 +137,8 @@ void QDeployment::addConfiguration(QDeploymentSpecification *configuration) // This is a read-write association end Q_D(QDeployment); - if (!d->configurations->contains(configuration)) { - d->configurations->insert(configuration); + if (!d->configurations.contains(configuration)) { + d->configurations.insert(configuration); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(configuration)); @@ -157,8 +153,8 @@ void QDeployment::removeConfiguration(QDeploymentSpecification *configuration) // This is a read-write association end Q_D(QDeployment); - if (d->configurations->contains(configuration)) { - d->configurations->remove(configuration); + if (d->configurations.contains(configuration)) { + d->configurations.remove(configuration); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(configuration)); @@ -171,7 +167,7 @@ void QDeployment::removeConfiguration(QDeploymentSpecification *configuration) /*! The Artifacts that are deployed onto a Node. This association specializes the supplier association. */ -const QSet<QDeployedArtifact *> *QDeployment::deployedArtifacts() const +const QSet<QDeployedArtifact *> &QDeployment::deployedArtifacts() const { // This is a read-write association end @@ -184,8 +180,8 @@ void QDeployment::addDeployedArtifact(QDeployedArtifact *deployedArtifact) // This is a read-write association end Q_D(QDeployment); - if (!d->deployedArtifacts->contains(deployedArtifact)) { - d->deployedArtifacts->insert(deployedArtifact); + if (!d->deployedArtifacts.contains(deployedArtifact)) { + d->deployedArtifacts.insert(deployedArtifact); // Adjust subsetted property(ies) (qwrappedobject_cast<QDependency *>(this))->addSupplier(qwrappedobject_cast<QNamedElement *>(deployedArtifact)); @@ -197,50 +193,14 @@ void QDeployment::removeDeployedArtifact(QDeployedArtifact *deployedArtifact) // This is a read-write association end Q_D(QDeployment); - if (d->deployedArtifacts->contains(deployedArtifact)) { - d->deployedArtifacts->remove(deployedArtifact); + if (d->deployedArtifacts.contains(deployedArtifact)) { + d->deployedArtifacts.remove(deployedArtifact); // Adjust subsetted property(ies) (qwrappedobject_cast<QDependency *>(this))->removeSupplier(qwrappedobject_cast<QNamedElement *>(deployedArtifact)); } } -void QDeployment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *>("QT_PREPEND_NAMESPACE_QTUML(QDeployment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *"); - qRegisterMetaType<QDeployment *>("QDeployment *"); - qRegisterMetaType<const QSet<QDeployment *> *>("const QSet<QDeployment *> *"); - qRegisterMetaType<const QList<QDeployment *> *>("const QList<QDeployment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *"); - qRegisterMetaType<QDeploymentSpecification *>("QDeploymentSpecification *"); - qRegisterMetaType<const QSet<QDeploymentSpecification *> *>("const QSet<QDeploymentSpecification *> *"); - qRegisterMetaType<const QList<QDeploymentSpecification *> *>("const QList<QDeploymentSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *>("QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployedArtifact) *> *"); - qRegisterMetaType<QDeployedArtifact *>("QDeployedArtifact *"); - qRegisterMetaType<const QSet<QDeployedArtifact *> *>("const QSet<QDeployedArtifact *> *"); - qRegisterMetaType<const QList<QDeployedArtifact *> *>("const QList<QDeployedArtifact *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *>("QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *"); - qRegisterMetaType<QDeploymentTarget *>("QDeploymentTarget *"); - qRegisterMetaType<const QSet<QDeploymentTarget *> *>("const QSet<QDeploymentTarget *> *"); - qRegisterMetaType<const QList<QDeploymentTarget *> *>("const QList<QDeploymentTarget *> *"); - - QDependency::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QDeployment::addClient(QWrappedObjectPointer<QDeploymentTarget> location) diff --git a/src/uml/qdeployment.h b/src/uml/qdeployment.h index 3a7d6a4b..cfa05c48 100644 --- a/src/uml/qdeployment.h +++ b/src/uml/qdeployment.h @@ -70,8 +70,8 @@ class Q_UML_EXPORT QDeployment : public QDependency Q_OBJECT Q_PROPERTY(QDeploymentTarget * location READ location WRITE setLocation) - Q_PROPERTY(const QSet<QDeploymentSpecification *> * configurations READ configurations) - Q_PROPERTY(const QSet<QDeployedArtifact *> * deployedArtifacts READ deployedArtifacts) + Q_PROPERTY(QSet<QDeploymentSpecification *> configurations READ configurations) + Q_PROPERTY(QSet<QDeployedArtifact *> deployedArtifacts READ deployedArtifacts) Q_DISABLE_COPY(QDeployment) Q_DECLARE_PRIVATE(QDeployment) @@ -83,10 +83,10 @@ public: // Association ends from QDeployment Q_INVOKABLE QDeploymentTarget *location() const; Q_INVOKABLE void setLocation(QDeploymentTarget *location); - Q_INVOKABLE const QSet<QDeploymentSpecification *> *configurations() const; + Q_INVOKABLE const QSet<QDeploymentSpecification *> &configurations() const; Q_INVOKABLE void addConfiguration(QDeploymentSpecification *configuration); Q_INVOKABLE void removeConfiguration(QDeploymentSpecification *configuration); - Q_INVOKABLE const QSet<QDeployedArtifact *> *deployedArtifacts() const; + Q_INVOKABLE const QSet<QDeployedArtifact *> &deployedArtifacts() const; Q_INVOKABLE void addDeployedArtifact(QDeployedArtifact *deployedArtifact); Q_INVOKABLE void removeDeployedArtifact(QDeployedArtifact *deployedArtifact); @@ -95,7 +95,6 @@ public: Q_INVOKABLE void removeClient(QWrappedObjectPointer<QDeploymentTarget> location); Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact); Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact); - virtual void registerMetaTypes() const; protected: explicit QDeployment(QDeploymentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -103,10 +102,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDeployment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *) - QT_END_HEADER #endif // QTUML_QDEPLOYMENT_H diff --git a/src/uml/qdeployment_p.h b/src/uml/qdeployment_p.h index ec7b44d0..e1646f20 100644 --- a/src/uml/qdeployment_p.h +++ b/src/uml/qdeployment_p.h @@ -70,8 +70,8 @@ public: virtual ~QDeploymentPrivate(); QDeploymentTarget *location; - QSet<QDeploymentSpecification *> *configurations; - QSet<QDeployedArtifact *> *deployedArtifacts; + QSet<QDeploymentSpecification *> configurations; + QSet<QDeployedArtifact *> deployedArtifacts; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeploymentspecification.cpp b/src/uml/qdeploymentspecification.cpp index 97314b26..e99de56a 100644 --- a/src/uml/qdeploymentspecification.cpp +++ b/src/uml/qdeploymentspecification.cpp @@ -159,28 +159,6 @@ void QDeploymentSpecification::setDeployment(QDeployment *deployment) } } -void QDeploymentSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *"); - qRegisterMetaType<QDeploymentSpecification *>("QDeploymentSpecification *"); - qRegisterMetaType<const QSet<QDeploymentSpecification *> *>("const QSet<QDeploymentSpecification *> *"); - qRegisterMetaType<const QList<QDeploymentSpecification *> *>("const QList<QDeploymentSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *>("QT_PREPEND_NAMESPACE_QTUML(QDeployment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *"); - qRegisterMetaType<QDeployment *>("QDeployment *"); - qRegisterMetaType<const QSet<QDeployment *> *>("const QSet<QDeployment *> *"); - qRegisterMetaType<const QList<QDeployment *> *>("const QList<QDeployment *> *"); - - QArtifact::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdeploymentspecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdeploymentspecification.h b/src/uml/qdeploymentspecification.h index e0b1232e..4a30287c 100644 --- a/src/uml/qdeploymentspecification.h +++ b/src/uml/qdeploymentspecification.h @@ -84,7 +84,6 @@ public: // Association ends from QDeploymentSpecification Q_INVOKABLE QDeployment *deployment() const; Q_INVOKABLE void setDeployment(QDeployment *deployment); - virtual void registerMetaTypes() const; protected: explicit QDeploymentSpecification(QDeploymentSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentSpecification) *> *) - QT_END_HEADER #endif // QTUML_QDEPLOYMENTSPECIFICATION_H diff --git a/src/uml/qdeploymenttarget.cpp b/src/uml/qdeploymenttarget.cpp index 581a491c..3606e5ba 100644 --- a/src/uml/qdeploymenttarget.cpp +++ b/src/uml/qdeploymenttarget.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML -QDeploymentTargetPrivate::QDeploymentTargetPrivate() : - deployments(new QSet<QDeployment *>) +QDeploymentTargetPrivate::QDeploymentTargetPrivate() { } QDeploymentTargetPrivate::~QDeploymentTargetPrivate() { - delete deployments; } /*! @@ -86,19 +84,19 @@ QDeploymentTarget::~QDeploymentTarget() /*! The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget. */ -const QSet<QPackageableElement *> *QDeploymentTarget::deployedElements() const +const QSet<QPackageableElement *> &QDeploymentTarget::deployedElements() const { // This is a read-only derived association end qWarning("QDeploymentTarget::deployedElements: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! The set of Deployments for a DeploymentTarget. */ -const QSet<QDeployment *> *QDeploymentTarget::deployments() const +const QSet<QDeployment *> &QDeploymentTarget::deployments() const { // This is a read-write association end @@ -111,8 +109,8 @@ void QDeploymentTarget::addDeployment(QDeployment *deployment) // This is a read-write association end Q_D(QDeploymentTarget); - if (!d->deployments->contains(deployment)) { - d->deployments->insert(deployment); + if (!d->deployments.contains(deployment)) { + d->deployments.insert(deployment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(deployment)); @@ -128,8 +126,8 @@ void QDeploymentTarget::removeDeployment(QDeployment *deployment) // This is a read-write association end Q_D(QDeploymentTarget); - if (d->deployments->contains(deployment)) { - d->deployments->remove(deployment); + if (d->deployments.contains(deployment)) { + d->deployments.remove(deployment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(deployment)); @@ -140,35 +138,6 @@ void QDeploymentTarget::removeDeployment(QDeployment *deployment) } } -void QDeploymentTarget::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *>("QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *"); - qRegisterMetaType<QDeploymentTarget *>("QDeploymentTarget *"); - qRegisterMetaType<const QSet<QDeploymentTarget *> *>("const QSet<QDeploymentTarget *> *"); - qRegisterMetaType<const QList<QDeploymentTarget *> *>("const QList<QDeploymentTarget *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *>("QT_PREPEND_NAMESPACE_QTUML(QDeployment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDeployment) *> *"); - qRegisterMetaType<QDeployment *>("QDeployment *"); - qRegisterMetaType<const QSet<QDeployment *> *>("const QSet<QDeployment *> *"); - qRegisterMetaType<const QList<QDeployment *> *>("const QList<QDeployment *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QDeploymentTarget::addClientDependency(QWrappedObjectPointer<QDeployment> deployment) diff --git a/src/uml/qdeploymenttarget.h b/src/uml/qdeploymenttarget.h index 60e70359..03284e6c 100644 --- a/src/uml/qdeploymenttarget.h +++ b/src/uml/qdeploymenttarget.h @@ -68,8 +68,8 @@ class Q_UML_EXPORT QDeploymentTarget : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QPackageableElement *> * deployedElements READ deployedElements STORED false) - Q_PROPERTY(const QSet<QDeployment *> * deployments READ deployments) + Q_PROPERTY(QSet<QPackageableElement *> deployedElements READ deployedElements STORED false) + Q_PROPERTY(QSet<QDeployment *> deployments READ deployments) Q_DISABLE_COPY(QDeploymentTarget) Q_DECLARE_PRIVATE(QDeploymentTarget) @@ -79,15 +79,14 @@ public: virtual ~QDeploymentTarget(); // Association ends from QDeploymentTarget - Q_INVOKABLE const QSet<QPackageableElement *> *deployedElements() const; - Q_INVOKABLE const QSet<QDeployment *> *deployments() const; + Q_INVOKABLE const QSet<QPackageableElement *> &deployedElements() const; + Q_INVOKABLE const QSet<QDeployment *> &deployments() const; Q_INVOKABLE void addDeployment(QDeployment *deployment); Q_INVOKABLE void removeDeployment(QDeployment *deployment); // Overriden methods for subsetted properties Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QDeployment> deployment); Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QDeployment> deployment); - virtual void registerMetaTypes() const; protected: explicit QDeploymentTarget(QDeploymentTargetPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDeploymentTarget) *> *) - QT_END_HEADER #endif // QTUML_QDEPLOYMENTTARGET_H diff --git a/src/uml/qdeploymenttarget_p.h b/src/uml/qdeploymenttarget_p.h index 518cf4a9..fd2bc815 100644 --- a/src/uml/qdeploymenttarget_p.h +++ b/src/uml/qdeploymenttarget_p.h @@ -67,7 +67,7 @@ public: explicit QDeploymentTargetPrivate(); virtual ~QDeploymentTargetPrivate(); - QSet<QDeployment *> *deployments; + QSet<QDeployment *> deployments; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestroylinkaction.cpp b/src/uml/qdestroylinkaction.cpp index 47fa1c30..7c850775 100644 --- a/src/uml/qdestroylinkaction.cpp +++ b/src/uml/qdestroylinkaction.cpp @@ -46,14 +46,13 @@ QT_BEGIN_NAMESPACE_QTUML -QDestroyLinkActionPrivate::QDestroyLinkActionPrivate() : - endData(new QSet<QLinkEndDestructionData *>) +QDestroyLinkActionPrivate::QDestroyLinkActionPrivate() { } QDestroyLinkActionPrivate::~QDestroyLinkActionPrivate() { - delete endData; + qDeleteAll(endData); } /*! @@ -85,7 +84,7 @@ QDestroyLinkAction::~QDestroyLinkAction() /*! Specifies ends of association and inputs. */ -const QSet<QLinkEndDestructionData *> *QDestroyLinkAction::endData() const +const QSet<QLinkEndDestructionData *> &QDestroyLinkAction::endData() const { // This is a read-write association end @@ -98,8 +97,8 @@ void QDestroyLinkAction::addEndData(QLinkEndDestructionData *endData) // This is a read-write association end Q_D(QDestroyLinkAction); - if (!d->endData->contains(endData)) { - d->endData->insert(endData); + if (!d->endData.contains(endData)) { + d->endData.insert(endData); qTopLevelWrapper(endData)->setParent(qTopLevelWrapper(this)); } } @@ -109,34 +108,12 @@ void QDestroyLinkAction::removeEndData(QLinkEndDestructionData *endData) // This is a read-write association end Q_D(QDestroyLinkAction); - if (d->endData->contains(endData)) { - d->endData->remove(endData); + if (d->endData.contains(endData)) { + d->endData.remove(endData); qTopLevelWrapper(endData)->setParent(0); } } -void QDestroyLinkAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *>("QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *> *"); - qRegisterMetaType<QDestroyLinkAction *>("QDestroyLinkAction *"); - qRegisterMetaType<const QSet<QDestroyLinkAction *> *>("const QSet<QDestroyLinkAction *> *"); - qRegisterMetaType<const QList<QDestroyLinkAction *> *>("const QList<QDestroyLinkAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *"); - qRegisterMetaType<QLinkEndDestructionData *>("QLinkEndDestructionData *"); - qRegisterMetaType<const QSet<QLinkEndDestructionData *> *>("const QSet<QLinkEndDestructionData *> *"); - qRegisterMetaType<const QList<QLinkEndDestructionData *> *>("const QList<QLinkEndDestructionData *> *"); - - QWriteLinkAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdestroylinkaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestroylinkaction.h b/src/uml/qdestroylinkaction.h index 42610b98..1de4497f 100644 --- a/src/uml/qdestroylinkaction.h +++ b/src/uml/qdestroylinkaction.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QDestroyLinkAction : public QWriteLinkAction { Q_OBJECT - Q_PROPERTY(const QSet<QLinkEndDestructionData *> * endData READ endData) + Q_PROPERTY(QSet<QLinkEndDestructionData *> endData READ endData) Q_DISABLE_COPY(QDestroyLinkAction) Q_DECLARE_PRIVATE(QDestroyLinkAction) @@ -74,10 +74,9 @@ public: virtual ~QDestroyLinkAction(); // Association ends from QDestroyLinkAction - Q_INVOKABLE const QSet<QLinkEndDestructionData *> *endData() const; + Q_INVOKABLE const QSet<QLinkEndDestructionData *> &endData() const; Q_INVOKABLE void addEndData(QLinkEndDestructionData *endData); Q_INVOKABLE void removeEndData(QLinkEndDestructionData *endData); - virtual void registerMetaTypes() const; protected: explicit QDestroyLinkAction(QDestroyLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDestroyLinkAction) *> *) - QT_END_HEADER #endif // QTUML_QDESTROYLINKACTION_H diff --git a/src/uml/qdestroylinkaction_p.h b/src/uml/qdestroylinkaction_p.h index 2380ebc0..97677114 100644 --- a/src/uml/qdestroylinkaction_p.h +++ b/src/uml/qdestroylinkaction_p.h @@ -67,7 +67,7 @@ public: explicit QDestroyLinkActionPrivate(); virtual ~QDestroyLinkActionPrivate(); - QSet<QLinkEndDestructionData *> *endData; + QSet<QLinkEndDestructionData *> endData; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestroyobjectaction.cpp b/src/uml/qdestroyobjectaction.cpp index f3505ee2..81b003d9 100644 --- a/src/uml/qdestroyobjectaction.cpp +++ b/src/uml/qdestroyobjectaction.cpp @@ -168,28 +168,6 @@ void QDestroyObjectAction::setTarget(QInputPin *target) } } -void QDestroyObjectAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *>("QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *> *"); - qRegisterMetaType<QDestroyObjectAction *>("QDestroyObjectAction *"); - qRegisterMetaType<const QSet<QDestroyObjectAction *> *>("const QSet<QDestroyObjectAction *> *"); - qRegisterMetaType<const QList<QDestroyObjectAction *> *>("const QList<QDestroyObjectAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdestroyobjectaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestroyobjectaction.h b/src/uml/qdestroyobjectaction.h index 10044283..90d7cea5 100644 --- a/src/uml/qdestroyobjectaction.h +++ b/src/uml/qdestroyobjectaction.h @@ -83,7 +83,6 @@ public: // Association ends from QDestroyObjectAction Q_INVOKABLE QInputPin *target() const; Q_INVOKABLE void setTarget(QInputPin *target); - virtual void registerMetaTypes() const; protected: explicit QDestroyObjectAction(QDestroyObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDestroyObjectAction) *> *) - QT_END_HEADER #endif // QTUML_QDESTROYOBJECTACTION_H diff --git a/src/uml/qdestructionoccurrencespecification.cpp b/src/uml/qdestructionoccurrencespecification.cpp index f112634f..ef58db3e 100644 --- a/src/uml/qdestructionoccurrencespecification.cpp +++ b/src/uml/qdestructionoccurrencespecification.cpp @@ -74,21 +74,6 @@ QDestructionOccurrenceSpecification::~QDestructionOccurrenceSpecification() { } -void QDestructionOccurrenceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *> *"); - qRegisterMetaType<QDestructionOccurrenceSpecification *>("QDestructionOccurrenceSpecification *"); - qRegisterMetaType<const QSet<QDestructionOccurrenceSpecification *> *>("const QSet<QDestructionOccurrenceSpecification *> *"); - qRegisterMetaType<const QList<QDestructionOccurrenceSpecification *> *>("const QList<QDestructionOccurrenceSpecification *> *"); - - QMessageOccurrenceSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdestructionoccurrencespecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdestructionoccurrencespecification.h b/src/uml/qdestructionoccurrencespecification.h index f79f7978..6231c414 100644 --- a/src/uml/qdestructionoccurrencespecification.h +++ b/src/uml/qdestructionoccurrencespecification.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QDestructionOccurrenceSpecification : public QMessageOccurren public: Q_INVOKABLE explicit QDestructionOccurrenceSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDestructionOccurrenceSpecification(); - virtual void registerMetaTypes() const; protected: explicit QDestructionOccurrenceSpecification(QDestructionOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDestructionOccurrenceSpecification) *> *) - QT_END_HEADER #endif // QTUML_QDESTRUCTIONOCCURRENCESPECIFICATION_H diff --git a/src/uml/qdevice.cpp b/src/uml/qdevice.cpp index a47026d2..9e3bf300 100644 --- a/src/uml/qdevice.cpp +++ b/src/uml/qdevice.cpp @@ -74,21 +74,6 @@ QDevice::~QDevice() { } -void QDevice::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDevice) *>("QT_PREPEND_NAMESPACE_QTUML(QDevice) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDevice) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDevice) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDevice) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDevice) *> *"); - qRegisterMetaType<QDevice *>("QDevice *"); - qRegisterMetaType<const QSet<QDevice *> *>("const QSet<QDevice *> *"); - qRegisterMetaType<const QList<QDevice *> *>("const QList<QDevice *> *"); - - QNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdevice.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdevice.h b/src/uml/qdevice.h index f3013a7a..b9a7b671 100644 --- a/src/uml/qdevice.h +++ b/src/uml/qdevice.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QDevice : public QNode public: Q_INVOKABLE explicit QDevice(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QDevice(); - virtual void registerMetaTypes() const; protected: explicit QDevice(QDevicePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDevice) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDevice) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDevice) *> *) - QT_END_HEADER #endif // QTUML_QDEVICE_H diff --git a/src/uml/qdirectedrelationship.cpp b/src/uml/qdirectedrelationship.cpp index f01c3909..f1695de7 100644 --- a/src/uml/qdirectedrelationship.cpp +++ b/src/uml/qdirectedrelationship.cpp @@ -46,24 +46,20 @@ QT_BEGIN_NAMESPACE_QTUML -QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() : - sources(new QSet<QElement *>), - targets(new QSet<QElement *>) +QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() { } QDirectedRelationshipPrivate::~QDirectedRelationshipPrivate() { - delete sources; - delete targets; } void QDirectedRelationshipPrivate::addSource(QElement *source) { // This is a read-only derived-union association end - if (!this->sources->contains(source)) { - this->sources->insert(source); + if (!this->sources.contains(source)) { + this->sources.insert(source); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(source)); @@ -74,8 +70,8 @@ void QDirectedRelationshipPrivate::removeSource(QElement *source) { // This is a read-only derived-union association end - if (this->sources->contains(source)) { - this->sources->remove(source); + if (this->sources.contains(source)) { + this->sources.remove(source); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(source)); @@ -86,8 +82,8 @@ void QDirectedRelationshipPrivate::addTarget(QElement *target) { // This is a read-only derived-union association end - if (!this->targets->contains(target)) { - this->targets->insert(target); + if (!this->targets.contains(target)) { + this->targets.insert(target); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(target)); @@ -98,8 +94,8 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) { // This is a read-only derived-union association end - if (this->targets->contains(target)) { - this->targets->remove(target); + if (this->targets.contains(target)) { + this->targets.remove(target); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(target)); @@ -135,7 +131,7 @@ QDirectedRelationship::~QDirectedRelationship() /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QDirectedRelationship::sources() const +const QSet<QElement *> &QDirectedRelationship::sources() const { // This is a read-only derived-union association end @@ -146,7 +142,7 @@ const QSet<QElement *> *QDirectedRelationship::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QDirectedRelationship::targets() const +const QSet<QElement *> &QDirectedRelationship::targets() const { // This is a read-only derived-union association end @@ -154,28 +150,6 @@ const QSet<QElement *> *QDirectedRelationship::targets() const return d->targets; } -void QDirectedRelationship::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *>("QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *> *"); - qRegisterMetaType<QDirectedRelationship *>("QDirectedRelationship *"); - qRegisterMetaType<const QSet<QDirectedRelationship *> *>("const QSet<QDirectedRelationship *> *"); - qRegisterMetaType<const QList<QDirectedRelationship *> *>("const QList<QDirectedRelationship *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElement) *>("QT_PREPEND_NAMESPACE_QTUML(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdirectedrelationship.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdirectedrelationship.h b/src/uml/qdirectedrelationship.h index e2c53844..9d8aa6f7 100644 --- a/src/uml/qdirectedrelationship.h +++ b/src/uml/qdirectedrelationship.h @@ -64,8 +64,8 @@ class Q_UML_EXPORT QDirectedRelationship : public QRelationship { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * sources READ sources) - Q_PROPERTY(const QSet<QElement *> * targets READ targets) + Q_PROPERTY(QSet<QElement *> sources READ sources) + Q_PROPERTY(QSet<QElement *> targets READ targets) Q_DISABLE_COPY(QDirectedRelationship) Q_DECLARE_PRIVATE(QDirectedRelationship) @@ -75,9 +75,8 @@ public: virtual ~QDirectedRelationship(); // Association ends from QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; protected: explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDirectedRelationship) *> *) - QT_END_HEADER #endif // QTUML_QDIRECTEDRELATIONSHIP_H diff --git a/src/uml/qdirectedrelationship_p.h b/src/uml/qdirectedrelationship_p.h index 15744f5d..4dc4b21c 100644 --- a/src/uml/qdirectedrelationship_p.h +++ b/src/uml/qdirectedrelationship_p.h @@ -66,8 +66,8 @@ public: explicit QDirectedRelationshipPrivate(); virtual ~QDirectedRelationshipPrivate(); - QSet<QElement *> *sources; - QSet<QElement *> *targets; + QSet<QElement *> sources; + QSet<QElement *> targets; // Internal functions for read-only subsetted association ends void addSource(QElement *source); diff --git a/src/uml/qduration.cpp b/src/uml/qduration.cpp index ef5c81e0..4e1a5fc3 100644 --- a/src/uml/qduration.cpp +++ b/src/uml/qduration.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML QDurationPrivate::QDurationPrivate() : - expr(0), - observations(new QSet<QObservation *>) + expr(0) { } QDurationPrivate::~QDurationPrivate() { - delete observations; } /*! @@ -115,7 +113,7 @@ void QDuration::setExpr(QValueSpecification *expr) /*! Refers to the time and duration observations that are involved in expr. */ -const QSet<QObservation *> *QDuration::observations() const +const QSet<QObservation *> &QDuration::observations() const { // This is a read-write association end @@ -128,8 +126,8 @@ void QDuration::addObservation(QObservation *observation) // This is a read-write association end Q_D(QDuration); - if (!d->observations->contains(observation)) { - d->observations->insert(observation); + if (!d->observations.contains(observation)) { + d->observations.insert(observation); } } @@ -138,33 +136,11 @@ void QDuration::removeObservation(QObservation *observation) // This is a read-write association end Q_D(QDuration); - if (d->observations->contains(observation)) { - d->observations->remove(observation); + if (d->observations.contains(observation)) { + d->observations.remove(observation); } } -void QDuration::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDuration) *>("QT_PREPEND_NAMESPACE_QTUML(QDuration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *"); - qRegisterMetaType<QDuration *>("QDuration *"); - qRegisterMetaType<const QSet<QDuration *> *>("const QSet<QDuration *> *"); - qRegisterMetaType<const QList<QDuration *> *>("const QList<QDuration *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObservation) *>("QT_PREPEND_NAMESPACE_QTUML(QObservation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *"); - qRegisterMetaType<QObservation *>("QObservation *"); - qRegisterMetaType<const QSet<QObservation *> *>("const QSet<QObservation *> *"); - qRegisterMetaType<const QList<QObservation *> *>("const QList<QObservation *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qduration.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qduration.h b/src/uml/qduration.h index 1fd72f3a..a95747be 100644 --- a/src/uml/qduration.h +++ b/src/uml/qduration.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QDuration : public QValueSpecification Q_OBJECT Q_PROPERTY(QValueSpecification * expr READ expr WRITE setExpr) - Q_PROPERTY(const QSet<QObservation *> * observations READ observations) + Q_PROPERTY(QSet<QObservation *> observations READ observations) Q_DISABLE_COPY(QDuration) Q_DECLARE_PRIVATE(QDuration) @@ -77,10 +77,9 @@ public: // Association ends from QDuration Q_INVOKABLE QValueSpecification *expr() const; Q_INVOKABLE void setExpr(QValueSpecification *expr); - Q_INVOKABLE const QSet<QObservation *> *observations() const; + Q_INVOKABLE const QSet<QObservation *> &observations() const; Q_INVOKABLE void addObservation(QObservation *observation); Q_INVOKABLE void removeObservation(QObservation *observation); - virtual void registerMetaTypes() const; protected: explicit QDuration(QDurationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDuration) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *) - QT_END_HEADER #endif // QTUML_QDURATION_H diff --git a/src/uml/qduration_p.h b/src/uml/qduration_p.h index 7e19250b..2f6bf522 100644 --- a/src/uml/qduration_p.h +++ b/src/uml/qduration_p.h @@ -68,7 +68,7 @@ public: virtual ~QDurationPrivate(); QValueSpecification *expr; - QSet<QObservation *> *observations; + QSet<QObservation *> observations; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationconstraint.cpp b/src/uml/qdurationconstraint.cpp index cdb1c69f..39eef2d2 100644 --- a/src/uml/qdurationconstraint.cpp +++ b/src/uml/qdurationconstraint.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML QDurationConstraintPrivate::QDurationConstraintPrivate() : - firstEvents(new QSet<bool>), specification(0) { } QDurationConstraintPrivate::~QDurationConstraintPrivate() { - delete firstEvents; delete specification; } @@ -87,7 +85,7 @@ QDurationConstraint::~QDurationConstraint() /*! 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. */ -const QSet<bool> *QDurationConstraint::firstEvents() const +const QSet<bool> QDurationConstraint::firstEvents() const { // This is a read-write attribute @@ -100,8 +98,8 @@ void QDurationConstraint::addFirstEvent(bool firstEvent) // This is a read-write attribute Q_D(QDurationConstraint); - if (!d->firstEvents->contains(firstEvent)) { - d->firstEvents->insert(firstEvent); + if (!d->firstEvents.contains(firstEvent)) { + d->firstEvents.insert(firstEvent); } } @@ -110,8 +108,8 @@ void QDurationConstraint::removeFirstEvent(bool firstEvent) // This is a read-write attribute Q_D(QDurationConstraint); - if (d->firstEvents->contains(firstEvent)) { - d->firstEvents->remove(firstEvent); + if (d->firstEvents.contains(firstEvent)) { + d->firstEvents.remove(firstEvent); } } @@ -140,28 +138,6 @@ void QDurationConstraint::setSpecification(QDurationInterval *specification) } } -void QDurationConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *> *"); - qRegisterMetaType<QDurationConstraint *>("QDurationConstraint *"); - qRegisterMetaType<const QSet<QDurationConstraint *> *>("const QSet<QDurationConstraint *> *"); - qRegisterMetaType<const QList<QDurationConstraint *> *>("const QList<QDurationConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *>("QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *"); - qRegisterMetaType<QDurationInterval *>("QDurationInterval *"); - qRegisterMetaType<const QSet<QDurationInterval *> *>("const QSet<QDurationInterval *> *"); - qRegisterMetaType<const QList<QDurationInterval *> *>("const QList<QDurationInterval *> *"); - - QIntervalConstraint::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdurationconstraint.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationconstraint.h b/src/uml/qdurationconstraint.h index 8a69917f..7f2c36d3 100644 --- a/src/uml/qdurationconstraint.h +++ b/src/uml/qdurationconstraint.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QDurationConstraint : public QIntervalConstraint { Q_OBJECT - Q_PROPERTY(const QSet<bool> * firstEvents READ firstEvents) + Q_PROPERTY(QSet<bool> firstEvents READ firstEvents) Q_PROPERTY(QDurationInterval * specification READ specification WRITE setSpecification) Q_DISABLE_COPY(QDurationConstraint) @@ -75,14 +75,13 @@ public: virtual ~QDurationConstraint(); // Attributes from QDurationConstraint - Q_INVOKABLE const QSet<bool> *firstEvents() const; + Q_INVOKABLE const QSet<bool> firstEvents() const; Q_INVOKABLE void addFirstEvent(bool firstEvent); Q_INVOKABLE void removeFirstEvent(bool firstEvent); // Association ends from QDurationConstraint Q_INVOKABLE QDurationInterval *specification() const; Q_INVOKABLE void setSpecification(QDurationInterval *specification); - virtual void registerMetaTypes() const; protected: explicit QDurationConstraint(QDurationConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationConstraint) *> *) - QT_END_HEADER #endif // QTUML_QDURATIONCONSTRAINT_H diff --git a/src/uml/qdurationconstraint_p.h b/src/uml/qdurationconstraint_p.h index 5c7a9b48..c22dde53 100644 --- a/src/uml/qdurationconstraint_p.h +++ b/src/uml/qdurationconstraint_p.h @@ -67,7 +67,7 @@ public: explicit QDurationConstraintPrivate(); virtual ~QDurationConstraintPrivate(); - QSet<bool> *firstEvents; + QSet<bool> firstEvents; QDurationInterval *specification; }; diff --git a/src/uml/qdurationinterval.cpp b/src/uml/qdurationinterval.cpp index 30739282..78d068b1 100644 --- a/src/uml/qdurationinterval.cpp +++ b/src/uml/qdurationinterval.cpp @@ -124,28 +124,6 @@ void QDurationInterval::setMin(QDuration *min) } } -void QDurationInterval::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *>("QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *"); - qRegisterMetaType<QDurationInterval *>("QDurationInterval *"); - qRegisterMetaType<const QSet<QDurationInterval *> *>("const QSet<QDurationInterval *> *"); - qRegisterMetaType<const QList<QDurationInterval *> *>("const QList<QDurationInterval *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDuration) *>("QT_PREPEND_NAMESPACE_QTUML(QDuration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDuration) *> *"); - qRegisterMetaType<QDuration *>("QDuration *"); - qRegisterMetaType<const QSet<QDuration *> *>("const QSet<QDuration *> *"); - qRegisterMetaType<const QList<QDuration *> *>("const QList<QDuration *> *"); - - QInterval::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdurationinterval.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationinterval.h b/src/uml/qdurationinterval.h index 4137b7a6..0a61ea04 100644 --- a/src/uml/qdurationinterval.h +++ b/src/uml/qdurationinterval.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setMax(QDuration *max); Q_INVOKABLE QDuration *min() const; Q_INVOKABLE void setMin(QDuration *min); - virtual void registerMetaTypes() const; protected: explicit QDurationInterval(QDurationIntervalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationInterval) *> *) - QT_END_HEADER #endif // QTUML_QDURATIONINTERVAL_H diff --git a/src/uml/qdurationobservation.cpp b/src/uml/qdurationobservation.cpp index 8fe4f06b..ff42ce10 100644 --- a/src/uml/qdurationobservation.cpp +++ b/src/uml/qdurationobservation.cpp @@ -46,16 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QDurationObservationPrivate::QDurationObservationPrivate() : - firstEvents(new QSet<bool>), - events(new QSet<QNamedElement *>) +QDurationObservationPrivate::QDurationObservationPrivate() { } QDurationObservationPrivate::~QDurationObservationPrivate() { - delete firstEvents; - delete events; } /*! @@ -87,7 +83,7 @@ QDurationObservation::~QDurationObservation() /*! 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. */ -const QSet<bool> *QDurationObservation::firstEvents() const +const QSet<bool> QDurationObservation::firstEvents() const { // This is a read-write attribute @@ -100,8 +96,8 @@ void QDurationObservation::addFirstEvent(bool firstEvent) // This is a read-write attribute Q_D(QDurationObservation); - if (!d->firstEvents->contains(firstEvent)) { - d->firstEvents->insert(firstEvent); + if (!d->firstEvents.contains(firstEvent)) { + d->firstEvents.insert(firstEvent); } } @@ -110,8 +106,8 @@ void QDurationObservation::removeFirstEvent(bool firstEvent) // This is a read-write attribute Q_D(QDurationObservation); - if (d->firstEvents->contains(firstEvent)) { - d->firstEvents->remove(firstEvent); + if (d->firstEvents.contains(firstEvent)) { + d->firstEvents.remove(firstEvent); } } @@ -122,7 +118,7 @@ void QDurationObservation::removeFirstEvent(bool firstEvent) /*! The observation is determined by the entering or exiting of the event element during execution. */ -const QSet<QNamedElement *> *QDurationObservation::events() const +const QSet<QNamedElement *> &QDurationObservation::events() const { // This is a read-write association end @@ -135,8 +131,8 @@ void QDurationObservation::addEvent(QNamedElement *event) // This is a read-write association end Q_D(QDurationObservation); - if (!d->events->contains(event)) { - d->events->insert(event); + if (!d->events.contains(event)) { + d->events.insert(event); } } @@ -145,33 +141,11 @@ void QDurationObservation::removeEvent(QNamedElement *event) // This is a read-write association end Q_D(QDurationObservation); - if (d->events->contains(event)) { - d->events->remove(event); + if (d->events.contains(event)) { + d->events.remove(event); } } -void QDurationObservation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *>("QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *> *"); - qRegisterMetaType<QDurationObservation *>("QDurationObservation *"); - qRegisterMetaType<const QSet<QDurationObservation *> *>("const QSet<QDurationObservation *> *"); - qRegisterMetaType<const QList<QDurationObservation *> *>("const QList<QDurationObservation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QObservation::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdurationobservation.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qdurationobservation.h b/src/uml/qdurationobservation.h index c47aa924..b13c4895 100644 --- a/src/uml/qdurationobservation.h +++ b/src/uml/qdurationobservation.h @@ -64,8 +64,8 @@ class Q_UML_EXPORT QDurationObservation : public QObservation { Q_OBJECT - Q_PROPERTY(const QSet<bool> * firstEvents READ firstEvents) - Q_PROPERTY(const QSet<QNamedElement *> * events READ events) + Q_PROPERTY(QSet<bool> firstEvents READ firstEvents) + Q_PROPERTY(QSet<QNamedElement *> events READ events) Q_DISABLE_COPY(QDurationObservation) Q_DECLARE_PRIVATE(QDurationObservation) @@ -75,15 +75,14 @@ public: virtual ~QDurationObservation(); // Attributes from QDurationObservation - Q_INVOKABLE const QSet<bool> *firstEvents() const; + Q_INVOKABLE const QSet<bool> firstEvents() const; Q_INVOKABLE void addFirstEvent(bool firstEvent); Q_INVOKABLE void removeFirstEvent(bool firstEvent); // Association ends from QDurationObservation - Q_INVOKABLE const QSet<QNamedElement *> *events() const; + Q_INVOKABLE const QSet<QNamedElement *> &events() const; Q_INVOKABLE void addEvent(QNamedElement *event); Q_INVOKABLE void removeEvent(QNamedElement *event); - virtual void registerMetaTypes() const; protected: explicit QDurationObservation(QDurationObservationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QDurationObservation) *> *) - QT_END_HEADER #endif // QTUML_QDURATIONOBSERVATION_H diff --git a/src/uml/qdurationobservation_p.h b/src/uml/qdurationobservation_p.h index 315eb7e1..9ef3ecc5 100644 --- a/src/uml/qdurationobservation_p.h +++ b/src/uml/qdurationobservation_p.h @@ -67,8 +67,8 @@ public: explicit QDurationObservationPrivate(); virtual ~QDurationObservationPrivate(); - QSet<bool> *firstEvents; - QSet<QNamedElement *> *events; + QSet<bool> firstEvents; + QSet<QNamedElement *> events; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qelement.cpp b/src/uml/qelement.cpp index eec261da..f9d06df3 100644 --- a/src/uml/qelement.cpp +++ b/src/uml/qelement.cpp @@ -47,24 +47,21 @@ QT_BEGIN_NAMESPACE_QTUML QElementPrivate::QElementPrivate() : - ownedElements(new QSet<QElement *>), - owner(0), - ownedComments(new QSet<QComment *>) + owner(0) { } QElementPrivate::~QElementPrivate() { - delete ownedElements; - delete ownedComments; + qDeleteAll(ownedElements); } void QElementPrivate::addOwnedElement(QElement *ownedElement) { // This is a read-only derived-union association end - if (!this->ownedElements->contains(ownedElement)) { - this->ownedElements->insert(ownedElement); + if (!this->ownedElements.contains(ownedElement)) { + this->ownedElements.insert(ownedElement); Q_Q(QElement); qTopLevelWrapper(ownedElement)->setParent(qTopLevelWrapper(q)); @@ -77,8 +74,8 @@ void QElementPrivate::removeOwnedElement(QElement *ownedElement) { // This is a read-only derived-union association end - if (this->ownedElements->contains(ownedElement)) { - this->ownedElements->remove(ownedElement); + if (this->ownedElements.contains(ownedElement)) { + this->ownedElements.remove(ownedElement); qTopLevelWrapper(ownedElement)->setParent(0); // Adjust opposite property @@ -133,7 +130,7 @@ QElement::~QElement() /*! The Elements owned by this element. */ -const QSet<QElement *> *QElement::ownedElements() const +const QSet<QElement *> &QElement::ownedElements() const { // This is a read-only derived-union association end @@ -155,7 +152,7 @@ QElement *QElement::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QElement::ownedComments() const +const QSet<QComment *> &QElement::ownedComments() const { // This is a read-write association end @@ -168,8 +165,8 @@ void QElement::addOwnedComment(QComment *ownedComment) // This is a read-write association end Q_D(QElement); - if (!d->ownedComments->contains(ownedComment)) { - d->ownedComments->insert(ownedComment); + if (!d->ownedComments.contains(ownedComment)) { + d->ownedComments.insert(ownedComment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); @@ -181,8 +178,8 @@ void QElement::removeOwnedComment(QComment *ownedComment) // This is a read-write association end Q_D(QElement); - if (d->ownedComments->contains(ownedComment)) { - d->ownedComments->remove(ownedComment); + if (d->ownedComments.contains(ownedComment)) { + d->ownedComments.remove(ownedComment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); @@ -193,11 +190,11 @@ void QElement::removeOwnedComment(QComment *ownedComment) The query allOwnedElements() gives all of the direct and indirect owned elements of an element. It is the caller's responsibility to delete the returned set. */ -const QSet<QElement *> *QElement::allOwnedElements() const +const QSet<QElement *> &QElement::allOwnedElements() const { QSet<QElement *> *allOwnedElements_ = new QSet<QElement *>; allOwnedElements(allOwnedElements_); - return allOwnedElements_; + return *allOwnedElements_; } /*! @@ -208,33 +205,11 @@ bool QElement::mustBeOwned() const return true; } -void QElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElement) *>("QT_PREPEND_NAMESPACE_QTUML(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QComment) *>("QT_PREPEND_NAMESPACE_QTUML(QComment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QComment) *> *"); - qRegisterMetaType<QComment *>("QComment *"); - qRegisterMetaType<const QSet<QComment *> *>("const QSet<QComment *> *"); - qRegisterMetaType<const QList<QComment *> *>("const QList<QComment *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - void QElement::allOwnedElements(QSet<QElement *> *allOwnedElements_) const { Q_D(const QElement); - allOwnedElements_->unite(*d->ownedElements); - foreach (QElement *element, *d->ownedElements) + allOwnedElements_->unite(d->ownedElements); + foreach (QElement *element, d->ownedElements) element->allOwnedElements(allOwnedElements_); } diff --git a/src/uml/qelement.h b/src/uml/qelement.h index eb30adeb..e7d75ebc 100644 --- a/src/uml/qelement.h +++ b/src/uml/qelement.h @@ -65,9 +65,9 @@ class Q_UML_EXPORT QElement : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * ownedElements READ ownedElements) + Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(const QSet<QComment *> * ownedComments READ ownedComments) + Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) Q_DISABLE_COPY(QElement) Q_DECLARE_PRIVATE(QElement) @@ -77,16 +77,15 @@ public: virtual ~QElement(); // Association ends from QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Operations - Q_INVOKABLE const QSet<QElement *> *allOwnedElements() const; + Q_INVOKABLE const QSet<QElement *> &allOwnedElements() const; Q_INVOKABLE bool mustBeOwned() const; - virtual void registerMetaTypes() const; protected: explicit QElement(QElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -97,10 +96,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QElement) *> *) - QT_END_HEADER #endif // QTUML_QELEMENT_H diff --git a/src/uml/qelement_p.h b/src/uml/qelement_p.h index 0de2591e..ea53ac5d 100644 --- a/src/uml/qelement_p.h +++ b/src/uml/qelement_p.h @@ -68,9 +68,9 @@ public: explicit QElementPrivate(); virtual ~QElementPrivate(); - QSet<QElement *> *ownedElements; + QSet<QElement *> ownedElements; QElement *owner; - QSet<QComment *> *ownedComments; + QSet<QComment *> ownedComments; // Internal functions for read-only subsetted association ends void addOwnedElement(QElement *ownedElement); diff --git a/src/uml/qelementimport.cpp b/src/uml/qelementimport.cpp index cb5e6dd3..c666b934 100644 --- a/src/uml/qelementimport.cpp +++ b/src/uml/qelementimport.cpp @@ -212,35 +212,6 @@ QString QElementImport::getName() const return QString(); // change here to your derived return } -void QElementImport::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *>("QT_PREPEND_NAMESPACE_QTUML(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *>("QT_PREPEND_NAMESPACE_QTUML(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qelementimport.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qelementimport.h b/src/uml/qelementimport.h index 1e8e6372..77eca1cc 100644 --- a/src/uml/qelementimport.h +++ b/src/uml/qelementimport.h @@ -95,7 +95,6 @@ public: // Operations Q_INVOKABLE QString getName() const; - virtual void registerMetaTypes() const; protected: explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -103,10 +102,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QElementImport) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *) - QT_END_HEADER #endif // QTUML_QELEMENTIMPORT_H diff --git a/src/uml/qencapsulatedclassifier.cpp b/src/uml/qencapsulatedclassifier.cpp index 62f0d273..b7a686c6 100644 --- a/src/uml/qencapsulatedclassifier.cpp +++ b/src/uml/qencapsulatedclassifier.cpp @@ -83,35 +83,13 @@ QEncapsulatedClassifier::~QEncapsulatedClassifier() /*! References a set of ports that an encapsulated classifier owns. */ -const QSet<QPort *> *QEncapsulatedClassifier::ownedPorts() const +const QSet<QPort *> &QEncapsulatedClassifier::ownedPorts() const { // This is a read-only derived association end qWarning("QEncapsulatedClassifier::ownedPorts: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return -} - -void QEncapsulatedClassifier::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *> *"); - qRegisterMetaType<QEncapsulatedClassifier *>("QEncapsulatedClassifier *"); - qRegisterMetaType<const QSet<QEncapsulatedClassifier *> *>("const QSet<QEncapsulatedClassifier *> *"); - qRegisterMetaType<const QList<QEncapsulatedClassifier *> *>("const QList<QEncapsulatedClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPort) *>("QT_PREPEND_NAMESPACE_QTUML(QPort) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<QPort *>("QPort *"); - qRegisterMetaType<const QSet<QPort *> *>("const QSet<QPort *> *"); - qRegisterMetaType<const QList<QPort *> *>("const QList<QPort *> *"); - - QStructuredClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QPort *>); // change here to your derived return } #include "moc_qencapsulatedclassifier.cpp" diff --git a/src/uml/qencapsulatedclassifier.h b/src/uml/qencapsulatedclassifier.h index 2d473bf9..3b3988d5 100644 --- a/src/uml/qencapsulatedclassifier.h +++ b/src/uml/qencapsulatedclassifier.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QEncapsulatedClassifier : public QStructuredClassifier { Q_OBJECT - Q_PROPERTY(const QSet<QPort *> * ownedPorts READ ownedPorts STORED false) + Q_PROPERTY(QSet<QPort *> ownedPorts READ ownedPorts STORED false) Q_DISABLE_COPY(QEncapsulatedClassifier) Q_DECLARE_PRIVATE(QEncapsulatedClassifier) @@ -74,8 +74,7 @@ public: virtual ~QEncapsulatedClassifier(); // Association ends from QEncapsulatedClassifier - Q_INVOKABLE const QSet<QPort *> *ownedPorts() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QPort *> &ownedPorts() const; protected: explicit QEncapsulatedClassifier(QEncapsulatedClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QEncapsulatedClassifier) *> *) - QT_END_HEADER #endif // QTUML_QENCAPSULATEDCLASSIFIER_H diff --git a/src/uml/qenumeration.cpp b/src/uml/qenumeration.cpp index 97aed789..72a9ece5 100644 --- a/src/uml/qenumeration.cpp +++ b/src/uml/qenumeration.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QEnumerationPrivate::QEnumerationPrivate() : - ownedLiterals(new QList<QEnumerationLiteral *>) +QEnumerationPrivate::QEnumerationPrivate() { } QEnumerationPrivate::~QEnumerationPrivate() { - delete ownedLiterals; } /*! @@ -85,7 +83,7 @@ QEnumeration::~QEnumeration() /*! The ordered set of literals for this Enumeration. */ -const QList<QEnumerationLiteral *> *QEnumeration::ownedLiterals() const +const QList<QEnumerationLiteral *> &QEnumeration::ownedLiterals() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QEnumeration::addOwnedLiteral(QEnumerationLiteral *ownedLiteral) // This is a read-write association end Q_D(QEnumeration); - if (!d->ownedLiterals->contains(ownedLiteral)) { - d->ownedLiterals->append(ownedLiteral); + if (!d->ownedLiterals.contains(ownedLiteral)) { + d->ownedLiterals.append(ownedLiteral); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); @@ -114,8 +112,8 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) // This is a read-write association end Q_D(QEnumeration); - if (d->ownedLiterals->contains(ownedLiteral)) { - d->ownedLiterals->removeAll(ownedLiteral); + if (d->ownedLiterals.contains(ownedLiteral)) { + d->ownedLiterals.removeAll(ownedLiteral); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); @@ -125,28 +123,6 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) } } -void QEnumeration::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *>("QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *"); - qRegisterMetaType<QEnumeration *>("QEnumeration *"); - qRegisterMetaType<const QSet<QEnumeration *> *>("const QSet<QEnumeration *> *"); - qRegisterMetaType<const QList<QEnumeration *> *>("const QList<QEnumeration *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *>("QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *"); - qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *"); - qRegisterMetaType<const QSet<QEnumerationLiteral *> *>("const QSet<QEnumerationLiteral *> *"); - qRegisterMetaType<const QList<QEnumerationLiteral *> *>("const QList<QEnumerationLiteral *> *"); - - QDataType::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qenumeration.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qenumeration.h b/src/uml/qenumeration.h index 6007db80..bf362cd7 100644 --- a/src/uml/qenumeration.h +++ b/src/uml/qenumeration.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QEnumeration : public QDataType { Q_OBJECT - Q_PROPERTY(const QList<QEnumerationLiteral *> * ownedLiterals READ ownedLiterals) + Q_PROPERTY(QList<QEnumerationLiteral *> ownedLiterals READ ownedLiterals) Q_DISABLE_COPY(QEnumeration) Q_DECLARE_PRIVATE(QEnumeration) @@ -74,10 +74,9 @@ public: virtual ~QEnumeration(); // Association ends from QEnumeration - Q_INVOKABLE const QList<QEnumerationLiteral *> *ownedLiterals() const; + Q_INVOKABLE const QList<QEnumerationLiteral *> &ownedLiterals() const; Q_INVOKABLE void addOwnedLiteral(QEnumerationLiteral *ownedLiteral); Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral); - virtual void registerMetaTypes() const; protected: explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *) - QT_END_HEADER #endif // QTUML_QENUMERATION_H diff --git a/src/uml/qenumeration_p.h b/src/uml/qenumeration_p.h index 02473c0c..252c82eb 100644 --- a/src/uml/qenumeration_p.h +++ b/src/uml/qenumeration_p.h @@ -67,7 +67,7 @@ public: explicit QEnumerationPrivate(); virtual ~QEnumerationPrivate(); - QList<QEnumerationLiteral *> *ownedLiterals; + QList<QEnumerationLiteral *> ownedLiterals; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qenumerationliteral.cpp b/src/uml/qenumerationliteral.cpp index eeca9344..8321fcdf 100644 --- a/src/uml/qenumerationliteral.cpp +++ b/src/uml/qenumerationliteral.cpp @@ -125,28 +125,6 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) } } -void QEnumerationLiteral::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *>("QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *"); - qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *"); - qRegisterMetaType<const QSet<QEnumerationLiteral *> *>("const QSet<QEnumerationLiteral *> *"); - qRegisterMetaType<const QList<QEnumerationLiteral *> *>("const QList<QEnumerationLiteral *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *>("QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumeration) *> *"); - qRegisterMetaType<QEnumeration *>("QEnumeration *"); - qRegisterMetaType<const QSet<QEnumeration *> *>("const QSet<QEnumeration *> *"); - qRegisterMetaType<const QList<QEnumeration *> *>("const QList<QEnumeration *> *"); - - QInstanceSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qenumerationliteral.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qenumerationliteral.h b/src/uml/qenumerationliteral.h index c29eba9b..52fb8d4b 100644 --- a/src/uml/qenumerationliteral.h +++ b/src/uml/qenumerationliteral.h @@ -75,7 +75,6 @@ public: Q_INVOKABLE QEnumeration *classifier() const; Q_INVOKABLE QEnumeration *enumeration() const; Q_INVOKABLE void setEnumeration(QEnumeration *enumeration); - virtual void registerMetaTypes() const; protected: explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QEnumerationLiteral) *> *) - QT_END_HEADER #endif // QTUML_QENUMERATIONLITERAL_H diff --git a/src/uml/qevent.cpp b/src/uml/qevent.cpp index afa1f8b3..5cd6fc99 100644 --- a/src/uml/qevent.cpp +++ b/src/uml/qevent.cpp @@ -74,21 +74,6 @@ QEvent::~QEvent() { } -void QEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *"); - qRegisterMetaType<QEvent *>("QEvent *"); - qRegisterMetaType<const QSet<QEvent *> *>("const QSet<QEvent *> *"); - qRegisterMetaType<const QList<QEvent *> *>("const QList<QEvent *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qevent.h b/src/uml/qevent.h index 3f2b9bc7..2e3aa37f 100644 --- a/src/uml/qevent.h +++ b/src/uml/qevent.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QEvent : public QPackageableElement public: Q_INVOKABLE explicit QEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QEvent(); - virtual void registerMetaTypes() const; protected: explicit QEvent(QEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *) - QT_END_HEADER #endif // QTUML_QEVENT_H diff --git a/src/uml/qexceptionhandler.cpp b/src/uml/qexceptionhandler.cpp index f34c1d6b..c322e4c9 100644 --- a/src/uml/qexceptionhandler.cpp +++ b/src/uml/qexceptionhandler.cpp @@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE_QTUML QExceptionHandlerPrivate::QExceptionHandlerPrivate() : handlerBody(0), - exceptionTypes(new QSet<QClassifier *>), protectedNode(0), exceptionInput(0) { @@ -58,7 +57,6 @@ QExceptionHandlerPrivate::QExceptionHandlerPrivate() : QExceptionHandlerPrivate::~QExceptionHandlerPrivate() { - delete exceptionTypes; } /*! @@ -111,7 +109,7 @@ void QExceptionHandler::setHandlerBody(QExecutableNode *handlerBody) /*! 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. */ -const QSet<QClassifier *> *QExceptionHandler::exceptionTypes() const +const QSet<QClassifier *> &QExceptionHandler::exceptionTypes() const { // This is a read-write association end @@ -124,8 +122,8 @@ void QExceptionHandler::addExceptionType(QClassifier *exceptionType) // This is a read-write association end Q_D(QExceptionHandler); - if (!d->exceptionTypes->contains(exceptionType)) { - d->exceptionTypes->insert(exceptionType); + if (!d->exceptionTypes.contains(exceptionType)) { + d->exceptionTypes.insert(exceptionType); } } @@ -134,8 +132,8 @@ void QExceptionHandler::removeExceptionType(QClassifier *exceptionType) // This is a read-write association end Q_D(QExceptionHandler); - if (d->exceptionTypes->contains(exceptionType)) { - d->exceptionTypes->remove(exceptionType); + if (d->exceptionTypes.contains(exceptionType)) { + d->exceptionTypes.remove(exceptionType); } } @@ -192,42 +190,6 @@ void QExceptionHandler::setExceptionInput(QObjectNode *exceptionInput) } } -void QExceptionHandler::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *>("QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *"); - qRegisterMetaType<QExceptionHandler *>("QExceptionHandler *"); - qRegisterMetaType<const QSet<QExceptionHandler *> *>("const QSet<QExceptionHandler *> *"); - qRegisterMetaType<const QList<QExceptionHandler *> *>("const QList<QExceptionHandler *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *>("QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *"); - qRegisterMetaType<QObjectNode *>("QObjectNode *"); - qRegisterMetaType<const QSet<QObjectNode *> *>("const QSet<QObjectNode *> *"); - qRegisterMetaType<const QList<QObjectNode *> *>("const QList<QObjectNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<QExecutableNode *>("QExecutableNode *"); - qRegisterMetaType<const QSet<QExecutableNode *> *>("const QSet<QExecutableNode *> *"); - qRegisterMetaType<const QList<QExecutableNode *> *>("const QList<QExecutableNode *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexceptionhandler.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexceptionhandler.h b/src/uml/qexceptionhandler.h index 5e671e1b..6d577291 100644 --- a/src/uml/qexceptionhandler.h +++ b/src/uml/qexceptionhandler.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QExceptionHandler : public QElement Q_OBJECT Q_PROPERTY(QExecutableNode * handlerBody READ handlerBody WRITE setHandlerBody) - Q_PROPERTY(const QSet<QClassifier *> * exceptionTypes READ exceptionTypes) + Q_PROPERTY(QSet<QClassifier *> exceptionTypes READ exceptionTypes) Q_PROPERTY(QExecutableNode * protectedNode READ protectedNode WRITE setProtectedNode) Q_PROPERTY(QObjectNode * exceptionInput READ exceptionInput WRITE setExceptionInput) @@ -81,14 +81,13 @@ public: // Association ends from QExceptionHandler Q_INVOKABLE QExecutableNode *handlerBody() const; Q_INVOKABLE void setHandlerBody(QExecutableNode *handlerBody); - Q_INVOKABLE const QSet<QClassifier *> *exceptionTypes() const; + Q_INVOKABLE const QSet<QClassifier *> &exceptionTypes() const; Q_INVOKABLE void addExceptionType(QClassifier *exceptionType); Q_INVOKABLE void removeExceptionType(QClassifier *exceptionType); Q_INVOKABLE QExecutableNode *protectedNode() const; Q_INVOKABLE void setProtectedNode(QExecutableNode *protectedNode); Q_INVOKABLE QObjectNode *exceptionInput() const; Q_INVOKABLE void setExceptionInput(QObjectNode *exceptionInput); - virtual void registerMetaTypes() const; protected: explicit QExceptionHandler(QExceptionHandlerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -96,10 +95,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *) - QT_END_HEADER #endif // QTUML_QEXCEPTIONHANDLER_H diff --git a/src/uml/qexceptionhandler_p.h b/src/uml/qexceptionhandler_p.h index 9ae48026..f4ac8f9b 100644 --- a/src/uml/qexceptionhandler_p.h +++ b/src/uml/qexceptionhandler_p.h @@ -70,7 +70,7 @@ public: virtual ~QExceptionHandlerPrivate(); QExecutableNode *handlerBody; - QSet<QClassifier *> *exceptionTypes; + QSet<QClassifier *> exceptionTypes; QExecutableNode *protectedNode; QObjectNode *exceptionInput; }; diff --git a/src/uml/qexecutablenode.cpp b/src/uml/qexecutablenode.cpp index e1f79ffe..2581adc1 100644 --- a/src/uml/qexecutablenode.cpp +++ b/src/uml/qexecutablenode.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QExecutableNodePrivate::QExecutableNodePrivate() : - handlers(new QSet<QExceptionHandler *>) +QExecutableNodePrivate::QExecutableNodePrivate() { } QExecutableNodePrivate::~QExecutableNodePrivate() { - delete handlers; } /*! @@ -85,7 +83,7 @@ QExecutableNode::~QExecutableNode() /*! A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node. */ -const QSet<QExceptionHandler *> *QExecutableNode::handlers() const +const QSet<QExceptionHandler *> &QExecutableNode::handlers() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QExecutableNode::addHandler(QExceptionHandler *handler) // This is a read-write association end Q_D(QExecutableNode); - if (!d->handlers->contains(handler)) { - d->handlers->insert(handler); + if (!d->handlers.contains(handler)) { + d->handlers.insert(handler); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(handler)); @@ -114,8 +112,8 @@ void QExecutableNode::removeHandler(QExceptionHandler *handler) // This is a read-write association end Q_D(QExecutableNode); - if (d->handlers->contains(handler)) { - d->handlers->remove(handler); + if (d->handlers.contains(handler)) { + d->handlers.remove(handler); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(handler)); @@ -125,28 +123,6 @@ void QExecutableNode::removeHandler(QExceptionHandler *handler) } } -void QExecutableNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<QExecutableNode *>("QExecutableNode *"); - qRegisterMetaType<const QSet<QExecutableNode *> *>("const QSet<QExecutableNode *> *"); - qRegisterMetaType<const QList<QExecutableNode *> *>("const QList<QExecutableNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *>("QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExceptionHandler) *> *"); - qRegisterMetaType<QExceptionHandler *>("QExceptionHandler *"); - qRegisterMetaType<const QSet<QExceptionHandler *> *>("const QSet<QExceptionHandler *> *"); - qRegisterMetaType<const QList<QExceptionHandler *> *>("const QList<QExceptionHandler *> *"); - - QActivityNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexecutablenode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutablenode.h b/src/uml/qexecutablenode.h index 1e10b86b..a71178d0 100644 --- a/src/uml/qexecutablenode.h +++ b/src/uml/qexecutablenode.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QExecutableNode : public QActivityNode { Q_OBJECT - Q_PROPERTY(const QSet<QExceptionHandler *> * handlers READ handlers) + Q_PROPERTY(QSet<QExceptionHandler *> handlers READ handlers) Q_DISABLE_COPY(QExecutableNode) Q_DECLARE_PRIVATE(QExecutableNode) @@ -74,10 +74,9 @@ public: virtual ~QExecutableNode(); // Association ends from QExecutableNode - Q_INVOKABLE const QSet<QExceptionHandler *> *handlers() const; + Q_INVOKABLE const QSet<QExceptionHandler *> &handlers() const; Q_INVOKABLE void addHandler(QExceptionHandler *handler); Q_INVOKABLE void removeHandler(QExceptionHandler *handler); - virtual void registerMetaTypes() const; protected: explicit QExecutableNode(QExecutableNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *) - QT_END_HEADER #endif // QTUML_QEXECUTABLENODE_H diff --git a/src/uml/qexecutablenode_p.h b/src/uml/qexecutablenode_p.h index fd3dac17..5d48c1ca 100644 --- a/src/uml/qexecutablenode_p.h +++ b/src/uml/qexecutablenode_p.h @@ -66,7 +66,7 @@ public: explicit QExecutableNodePrivate(); virtual ~QExecutableNodePrivate(); - QSet<QExceptionHandler *> *handlers; + QSet<QExceptionHandler *> handlers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionenvironment.cpp b/src/uml/qexecutionenvironment.cpp index d94b57f2..eba3013b 100644 --- a/src/uml/qexecutionenvironment.cpp +++ b/src/uml/qexecutionenvironment.cpp @@ -74,21 +74,6 @@ QExecutionEnvironment::~QExecutionEnvironment() { } -void QExecutionEnvironment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *> *"); - qRegisterMetaType<QExecutionEnvironment *>("QExecutionEnvironment *"); - qRegisterMetaType<const QSet<QExecutionEnvironment *> *>("const QSet<QExecutionEnvironment *> *"); - qRegisterMetaType<const QList<QExecutionEnvironment *> *>("const QList<QExecutionEnvironment *> *"); - - QNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexecutionenvironment.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionenvironment.h b/src/uml/qexecutionenvironment.h index 992957fe..d98d8310 100644 --- a/src/uml/qexecutionenvironment.h +++ b/src/uml/qexecutionenvironment.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QExecutionEnvironment : public QNode public: Q_INVOKABLE explicit QExecutionEnvironment(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QExecutionEnvironment(); - virtual void registerMetaTypes() const; protected: explicit QExecutionEnvironment(QExecutionEnvironmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionEnvironment) *> *) - QT_END_HEADER #endif // QTUML_QEXECUTIONENVIRONMENT_H diff --git a/src/uml/qexecutionoccurrencespecification.cpp b/src/uml/qexecutionoccurrencespecification.cpp index 642b5573..9d1b7c77 100644 --- a/src/uml/qexecutionoccurrencespecification.cpp +++ b/src/uml/qexecutionoccurrencespecification.cpp @@ -102,28 +102,6 @@ void QExecutionOccurrenceSpecification::setExecution(QExecutionSpecification *ex } } -void QExecutionOccurrenceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *> *"); - qRegisterMetaType<QExecutionOccurrenceSpecification *>("QExecutionOccurrenceSpecification *"); - qRegisterMetaType<const QSet<QExecutionOccurrenceSpecification *> *>("const QSet<QExecutionOccurrenceSpecification *> *"); - qRegisterMetaType<const QList<QExecutionOccurrenceSpecification *> *>("const QList<QExecutionOccurrenceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *"); - qRegisterMetaType<QExecutionSpecification *>("QExecutionSpecification *"); - qRegisterMetaType<const QSet<QExecutionSpecification *> *>("const QSet<QExecutionSpecification *> *"); - qRegisterMetaType<const QList<QExecutionSpecification *> *>("const QList<QExecutionSpecification *> *"); - - QOccurrenceSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexecutionoccurrencespecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionoccurrencespecification.h b/src/uml/qexecutionoccurrencespecification.h index 7f6952c5..1b7e95f9 100644 --- a/src/uml/qexecutionoccurrencespecification.h +++ b/src/uml/qexecutionoccurrencespecification.h @@ -73,7 +73,6 @@ public: // Association ends from QExecutionOccurrenceSpecification Q_INVOKABLE QExecutionSpecification *execution() const; Q_INVOKABLE void setExecution(QExecutionSpecification *execution); - virtual void registerMetaTypes() const; protected: explicit QExecutionOccurrenceSpecification(QExecutionOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionOccurrenceSpecification) *> *) - QT_END_HEADER #endif // QTUML_QEXECUTIONOCCURRENCESPECIFICATION_H diff --git a/src/uml/qexecutionspecification.cpp b/src/uml/qexecutionspecification.cpp index ff46a97f..c9f8574e 100644 --- a/src/uml/qexecutionspecification.cpp +++ b/src/uml/qexecutionspecification.cpp @@ -124,28 +124,6 @@ void QExecutionSpecification::setFinish(QOccurrenceSpecification *finish) } } -void QExecutionSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *"); - qRegisterMetaType<QExecutionSpecification *>("QExecutionSpecification *"); - qRegisterMetaType<const QSet<QExecutionSpecification *> *>("const QSet<QExecutionSpecification *> *"); - qRegisterMetaType<const QList<QExecutionSpecification *> *>("const QList<QExecutionSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *"); - qRegisterMetaType<QOccurrenceSpecification *>("QOccurrenceSpecification *"); - qRegisterMetaType<const QSet<QOccurrenceSpecification *> *>("const QSet<QOccurrenceSpecification *> *"); - qRegisterMetaType<const QList<QOccurrenceSpecification *> *>("const QList<QOccurrenceSpecification *> *"); - - QInteractionFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexecutionspecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexecutionspecification.h b/src/uml/qexecutionspecification.h index f0bccc19..1b8882e0 100644 --- a/src/uml/qexecutionspecification.h +++ b/src/uml/qexecutionspecification.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setStart(QOccurrenceSpecification *start); Q_INVOKABLE QOccurrenceSpecification *finish() const; Q_INVOKABLE void setFinish(QOccurrenceSpecification *finish); - virtual void registerMetaTypes() const; protected: explicit QExecutionSpecification(QExecutionSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutionSpecification) *> *) - QT_END_HEADER #endif // QTUML_QEXECUTIONSPECIFICATION_H diff --git a/src/uml/qexpansionnode.cpp b/src/uml/qexpansionnode.cpp index 8dbf56bf..88f69d7f 100644 --- a/src/uml/qexpansionnode.cpp +++ b/src/uml/qexpansionnode.cpp @@ -140,28 +140,6 @@ void QExpansionNode::setRegionAsInput(QExpansionRegion *regionAsInput) } } -void QExpansionNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *"); - qRegisterMetaType<QExpansionNode *>("QExpansionNode *"); - qRegisterMetaType<const QSet<QExpansionNode *> *>("const QSet<QExpansionNode *> *"); - qRegisterMetaType<const QList<QExpansionNode *> *>("const QList<QExpansionNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *"); - qRegisterMetaType<QExpansionRegion *>("QExpansionRegion *"); - qRegisterMetaType<const QSet<QExpansionRegion *> *>("const QSet<QExpansionRegion *> *"); - qRegisterMetaType<const QList<QExpansionRegion *> *>("const QList<QExpansionRegion *> *"); - - QObjectNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexpansionnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpansionnode.h b/src/uml/qexpansionnode.h index 2da1c547..51db32b4 100644 --- a/src/uml/qexpansionnode.h +++ b/src/uml/qexpansionnode.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setRegionAsOutput(QExpansionRegion *regionAsOutput); Q_INVOKABLE QExpansionRegion *regionAsInput() const; Q_INVOKABLE void setRegionAsInput(QExpansionRegion *regionAsInput); - virtual void registerMetaTypes() const; protected: explicit QExpansionNode(QExpansionNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *) - QT_END_HEADER #endif // QTUML_QEXPANSIONNODE_H diff --git a/src/uml/qexpansionregion.cpp b/src/uml/qexpansionregion.cpp index 9a3ada93..54d7b4ec 100644 --- a/src/uml/qexpansionregion.cpp +++ b/src/uml/qexpansionregion.cpp @@ -47,16 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML QExpansionRegionPrivate::QExpansionRegionPrivate() : - mode(QtUml::ExpansionIterative), - inputElements(new QSet<QExpansionNode *>), - outputElements(new QSet<QExpansionNode *>) + mode(QtUml::ExpansionIterative) { } QExpansionRegionPrivate::~QExpansionRegionPrivate() { - delete inputElements; - delete outputElements; } /*! @@ -118,7 +114,7 @@ void QExpansionRegion::unsetMode() /*! An object node that holds a separate element of the input collection during each of the multiple executions of the region. */ -const QSet<QExpansionNode *> *QExpansionRegion::inputElements() const +const QSet<QExpansionNode *> &QExpansionRegion::inputElements() const { // This is a read-write association end @@ -131,8 +127,8 @@ void QExpansionRegion::addInputElement(QExpansionNode *inputElement) // This is a read-write association end Q_D(QExpansionRegion); - if (!d->inputElements->contains(inputElement)) { - d->inputElements->insert(inputElement); + if (!d->inputElements.contains(inputElement)) { + d->inputElements.insert(inputElement); // Adjust opposite property inputElement->setRegionAsInput(this); @@ -144,8 +140,8 @@ void QExpansionRegion::removeInputElement(QExpansionNode *inputElement) // This is a read-write association end Q_D(QExpansionRegion); - if (d->inputElements->contains(inputElement)) { - d->inputElements->remove(inputElement); + if (d->inputElements.contains(inputElement)) { + d->inputElements.remove(inputElement); // Adjust opposite property inputElement->setRegionAsInput(0); @@ -155,7 +151,7 @@ void QExpansionRegion::removeInputElement(QExpansionNode *inputElement) /*! 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. */ -const QSet<QExpansionNode *> *QExpansionRegion::outputElements() const +const QSet<QExpansionNode *> &QExpansionRegion::outputElements() const { // This is a read-write association end @@ -168,8 +164,8 @@ void QExpansionRegion::addOutputElement(QExpansionNode *outputElement) // This is a read-write association end Q_D(QExpansionRegion); - if (!d->outputElements->contains(outputElement)) { - d->outputElements->insert(outputElement); + if (!d->outputElements.contains(outputElement)) { + d->outputElements.insert(outputElement); // Adjust opposite property outputElement->setRegionAsOutput(this); @@ -181,36 +177,14 @@ void QExpansionRegion::removeOutputElement(QExpansionNode *outputElement) // This is a read-write association end Q_D(QExpansionRegion); - if (d->outputElements->contains(outputElement)) { - d->outputElements->remove(outputElement); + if (d->outputElements.contains(outputElement)) { + d->outputElements.remove(outputElement); // Adjust opposite property outputElement->setRegionAsOutput(0); } } -void QExpansionRegion::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *"); - qRegisterMetaType<QExpansionRegion *>("QExpansionRegion *"); - qRegisterMetaType<const QSet<QExpansionRegion *> *>("const QSet<QExpansionRegion *> *"); - qRegisterMetaType<const QList<QExpansionRegion *> *>("const QList<QExpansionRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionNode) *> *"); - qRegisterMetaType<QExpansionNode *>("QExpansionNode *"); - qRegisterMetaType<const QSet<QExpansionNode *> *>("const QSet<QExpansionNode *> *"); - qRegisterMetaType<const QList<QExpansionNode *> *>("const QList<QExpansionNode *> *"); - - QStructuredActivityNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexpansionregion.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpansionregion.h b/src/uml/qexpansionregion.h index 723ee9e2..3a82b984 100644 --- a/src/uml/qexpansionregion.h +++ b/src/uml/qexpansionregion.h @@ -68,8 +68,8 @@ class Q_UML_EXPORT QExpansionRegion : public QStructuredActivityNode Q_OBJECT Q_PROPERTY(QtUml::ExpansionKind mode READ mode WRITE setMode RESET unsetMode) - Q_PROPERTY(const QSet<QExpansionNode *> * inputElements READ inputElements) - Q_PROPERTY(const QSet<QExpansionNode *> * outputElements READ outputElements) + Q_PROPERTY(QSet<QExpansionNode *> inputElements READ inputElements) + Q_PROPERTY(QSet<QExpansionNode *> outputElements READ outputElements) Q_DISABLE_COPY(QExpansionRegion) Q_DECLARE_PRIVATE(QExpansionRegion) @@ -84,13 +84,12 @@ public: Q_INVOKABLE void unsetMode(); // Association ends from QExpansionRegion - Q_INVOKABLE const QSet<QExpansionNode *> *inputElements() const; + Q_INVOKABLE const QSet<QExpansionNode *> &inputElements() const; Q_INVOKABLE void addInputElement(QExpansionNode *inputElement); Q_INVOKABLE void removeInputElement(QExpansionNode *inputElement); - Q_INVOKABLE const QSet<QExpansionNode *> *outputElements() const; + Q_INVOKABLE const QSet<QExpansionNode *> &outputElements() const; Q_INVOKABLE void addOutputElement(QExpansionNode *outputElement); Q_INVOKABLE void removeOutputElement(QExpansionNode *outputElement); - virtual void registerMetaTypes() const; protected: explicit QExpansionRegion(QExpansionRegionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExpansionRegion) *> *) - QT_END_HEADER #endif // QTUML_QEXPANSIONREGION_H diff --git a/src/uml/qexpansionregion_p.h b/src/uml/qexpansionregion_p.h index 7252b338..8ae27c33 100644 --- a/src/uml/qexpansionregion_p.h +++ b/src/uml/qexpansionregion_p.h @@ -71,8 +71,8 @@ public: virtual ~QExpansionRegionPrivate(); QtUml::ExpansionKind mode; - QSet<QExpansionNode *> *inputElements; - QSet<QExpansionNode *> *outputElements; + QSet<QExpansionNode *> inputElements; + QSet<QExpansionNode *> outputElements; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpression.cpp b/src/uml/qexpression.cpp index b8871fb7..6f291bae 100644 --- a/src/uml/qexpression.cpp +++ b/src/uml/qexpression.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTUML -QExpressionPrivate::QExpressionPrivate() : - operands(new QList<QValueSpecification *>) +QExpressionPrivate::QExpressionPrivate() { } QExpressionPrivate::~QExpressionPrivate() { - delete operands; } /*! @@ -108,7 +106,7 @@ void QExpression::setSymbol(QString symbol) /*! Specifies a sequence of operands. */ -const QList<QValueSpecification *> *QExpression::operands() const +const QList<QValueSpecification *> &QExpression::operands() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QExpression::addOperand(QValueSpecification *operand) // This is a read-write association end Q_D(QExpression); - if (!d->operands->contains(operand)) { - d->operands->append(operand); + if (!d->operands.contains(operand)) { + d->operands.append(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); @@ -134,29 +132,14 @@ void QExpression::removeOperand(QValueSpecification *operand) // This is a read-write association end Q_D(QExpression); - if (d->operands->contains(operand)) { - d->operands->removeAll(operand); + if (d->operands.contains(operand)) { + d->operands.removeAll(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } -void QExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExpression) *> *"); - qRegisterMetaType<QExpression *>("QExpression *"); - qRegisterMetaType<const QSet<QExpression *> *>("const QSet<QExpression *> *"); - qRegisterMetaType<const QList<QExpression *> *>("const QList<QExpression *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexpression.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qexpression.h b/src/uml/qexpression.h index 202dc49b..d51dcda4 100644 --- a/src/uml/qexpression.h +++ b/src/uml/qexpression.h @@ -63,7 +63,7 @@ class Q_UML_EXPORT QExpression : public QValueSpecification Q_OBJECT Q_PROPERTY(QString symbol READ symbol WRITE setSymbol) - Q_PROPERTY(const QList<QValueSpecification *> * operands READ operands) + Q_PROPERTY(QList<QValueSpecification *> operands READ operands) Q_DISABLE_COPY(QExpression) Q_DECLARE_PRIVATE(QExpression) @@ -77,10 +77,9 @@ public: Q_INVOKABLE void setSymbol(QString symbol); // Association ends from QExpression - Q_INVOKABLE const QList<QValueSpecification *> *operands() const; + Q_INVOKABLE const QList<QValueSpecification *> &operands() const; Q_INVOKABLE void addOperand(QValueSpecification *operand); Q_INVOKABLE void removeOperand(QValueSpecification *operand); - virtual void registerMetaTypes() const; protected: explicit QExpression(QExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExpression) *> *) - QT_END_HEADER #endif // QTUML_QEXPRESSION_H diff --git a/src/uml/qexpression_p.h b/src/uml/qexpression_p.h index ff6e954d..708b0db2 100644 --- a/src/uml/qexpression_p.h +++ b/src/uml/qexpression_p.h @@ -66,7 +66,7 @@ public: virtual ~QExpressionPrivate(); QString symbol; - QList<QValueSpecification *> *operands; + QList<QValueSpecification *> operands; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextend.cpp b/src/uml/qextend.cpp index a42c9950..677c2809 100644 --- a/src/uml/qextend.cpp +++ b/src/uml/qextend.cpp @@ -51,14 +51,12 @@ QT_BEGIN_NAMESPACE_QTUML QExtendPrivate::QExtendPrivate() : extendedCase(0), extension(0), - extensionLocations(new QList<QExtensionPoint *>), condition(0) { } QExtendPrivate::~QExtendPrivate() { - delete extensionLocations; } /*! @@ -94,7 +92,7 @@ QExtend::~QExtend() /*! The Elements owned by this element. */ -const QSet<QElement *> *QExtend::ownedElements() const +const QSet<QElement *> &QExtend::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -110,7 +108,7 @@ QElement *QExtend::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QExtend::ownedComments() const +const QSet<QComment *> &QExtend::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -132,7 +130,7 @@ void QExtend::removeOwnedComment(QComment *ownedComment) /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QExtend::relatedElements() const +const QSet<QElement *> &QExtend::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -144,7 +142,7 @@ const QSet<QElement *> *QExtend::relatedElements() const /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QExtend::sources() const +const QSet<QElement *> &QExtend::sources() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } @@ -152,7 +150,7 @@ const QSet<QElement *> *QExtend::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QExtend::targets() const +const QSet<QElement *> &QExtend::targets() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } @@ -223,7 +221,7 @@ QNamespace *QExtend::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QExtend::clientDependencies() const +const QSet<QDependency *> &QExtend::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -312,7 +310,7 @@ void QExtend::setExtension(QUseCase *extension) /*! 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.) */ -const QList<QExtensionPoint *> *QExtend::extensionLocations() const +const QList<QExtensionPoint *> &QExtend::extensionLocations() const { // This is a read-write association end @@ -325,8 +323,8 @@ void QExtend::addExtensionLocation(QExtensionPoint *extensionLocation) // This is a read-write association end Q_D(QExtend); - if (!d->extensionLocations->contains(extensionLocation)) { - d->extensionLocations->append(extensionLocation); + if (!d->extensionLocations.contains(extensionLocation)) { + d->extensionLocations.append(extensionLocation); } } @@ -335,8 +333,8 @@ void QExtend::removeExtensionLocation(QExtensionPoint *extensionLocation) // This is a read-write association end Q_D(QExtend); - if (d->extensionLocations->contains(extensionLocation)) { - d->extensionLocations->removeAll(extensionLocation); + if (d->extensionLocations.contains(extensionLocation)) { + d->extensionLocations.removeAll(extensionLocation); } } @@ -369,42 +367,6 @@ void QExtend::setCondition(QConstraint *condition) } } -void QExtend::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtend) *>("QT_PREPEND_NAMESPACE_QTUML(QExtend) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *"); - qRegisterMetaType<QExtend *>("QExtend *"); - qRegisterMetaType<const QSet<QExtend *> *>("const QSet<QExtend *> *"); - qRegisterMetaType<const QList<QExtend *> *>("const QList<QExtend *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *>("QT_PREPEND_NAMESPACE_QTUML(QUseCase) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<QUseCase *>("QUseCase *"); - qRegisterMetaType<const QSet<QUseCase *> *>("const QSet<QUseCase *> *"); - qRegisterMetaType<const QList<QUseCase *> *>("const QList<QUseCase *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *>("QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *"); - qRegisterMetaType<QExtensionPoint *>("QExtensionPoint *"); - qRegisterMetaType<const QSet<QExtensionPoint *> *>("const QSet<QExtensionPoint *> *"); - qRegisterMetaType<const QList<QExtensionPoint *> *>("const QList<QExtensionPoint *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qextend.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextend.h b/src/uml/qextend.h index 685a160d..dd2655b8 100644 --- a/src/uml/qextend.h +++ b/src/uml/qextend.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QExtend : public QWrappedObject Q_PROPERTY(QUseCase * extendedCase READ extendedCase WRITE setExtendedCase) Q_PROPERTY(QUseCase * extension READ extension WRITE setExtension) - Q_PROPERTY(const QList<QExtensionPoint *> * extensionLocations READ extensionLocations) + Q_PROPERTY(QList<QExtensionPoint *> extensionLocations READ extensionLocations) Q_PROPERTY(QConstraint * condition READ condition WRITE setCondition) Q_DISABLE_COPY(QExtend) @@ -82,18 +82,18 @@ public: virtual ~QExtend(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Association ends from aggregated QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; @@ -106,7 +106,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -115,12 +115,11 @@ public: Q_INVOKABLE void setExtendedCase(QUseCase *extendedCase); Q_INVOKABLE QUseCase *extension() const; Q_INVOKABLE void setExtension(QUseCase *extension); - Q_INVOKABLE const QList<QExtensionPoint *> *extensionLocations() const; + Q_INVOKABLE const QList<QExtensionPoint *> &extensionLocations() const; Q_INVOKABLE void addExtensionLocation(QExtensionPoint *extensionLocation); Q_INVOKABLE void removeExtensionLocation(QExtensionPoint *extensionLocation); Q_INVOKABLE QConstraint *condition() const; Q_INVOKABLE void setCondition(QConstraint *condition); - virtual void registerMetaTypes() const; protected: explicit QExtend(QExtendPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -132,10 +131,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExtend) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *) - QT_END_HEADER #endif // QTUML_QEXTEND_H diff --git a/src/uml/qextend_p.h b/src/uml/qextend_p.h index d9d05000..eda05280 100644 --- a/src/uml/qextend_p.h +++ b/src/uml/qextend_p.h @@ -74,7 +74,7 @@ public: QUseCase *extendedCase; QUseCase *extension; - QList<QExtensionPoint *> *extensionLocations; + QList<QExtensionPoint *> extensionLocations; QConstraint *condition; }; diff --git a/src/uml/qextension.cpp b/src/uml/qextension.cpp index 84c48f5b..cef60311 100644 --- a/src/uml/qextension.cpp +++ b/src/uml/qextension.cpp @@ -166,42 +166,6 @@ QProperty *QExtension::metaclassEnd() const return 0; // change here to your derived return } -void QExtension::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtension) *>("QT_PREPEND_NAMESPACE_QTUML(QExtension) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *"); - qRegisterMetaType<QExtension *>("QExtension *"); - qRegisterMetaType<const QSet<QExtension *> *>("const QSet<QExtension *> *"); - qRegisterMetaType<const QList<QExtension *> *>("const QList<QExtension *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClass) *>("QT_PREPEND_NAMESPACE_QTUML(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *"); - qRegisterMetaType<QExtensionEnd *>("QExtensionEnd *"); - qRegisterMetaType<const QSet<QExtensionEnd *> *>("const QSet<QExtensionEnd *> *"); - qRegisterMetaType<const QList<QExtensionEnd *> *>("const QList<QExtensionEnd *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QAssociation::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qextension.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextension.h b/src/uml/qextension.h index da066163..32b4085c 100644 --- a/src/uml/qextension.h +++ b/src/uml/qextension.h @@ -84,7 +84,6 @@ public: // Operations Q_INVOKABLE QProperty *metaclassEnd() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QClassPrivate; @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExtension) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExtension) *> *) - QT_END_HEADER #endif // QTUML_QEXTENSION_H diff --git a/src/uml/qextensionend.cpp b/src/uml/qextensionend.cpp index e66a5a72..f1893f40 100644 --- a/src/uml/qextensionend.cpp +++ b/src/uml/qextensionend.cpp @@ -140,28 +140,6 @@ qint32 QExtensionEnd::lowerBound() const return qint32(); // change here to your derived return } -void QExtensionEnd::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *"); - qRegisterMetaType<QExtensionEnd *>("QExtensionEnd *"); - qRegisterMetaType<const QSet<QExtensionEnd *> *>("const QSet<QExtensionEnd *> *"); - qRegisterMetaType<const QList<QExtensionEnd *> *>("const QList<QExtensionEnd *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *>("QT_PREPEND_NAMESPACE_QTUML(QStereotype) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *"); - qRegisterMetaType<QStereotype *>("QStereotype *"); - qRegisterMetaType<const QSet<QStereotype *> *>("const QSet<QStereotype *> *"); - qRegisterMetaType<const QList<QStereotype *> *>("const QList<QStereotype *> *"); - - QProperty::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qextensionend.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextensionend.h b/src/uml/qextensionend.h index 8b00b075..dbf5fd00 100644 --- a/src/uml/qextensionend.h +++ b/src/uml/qextensionend.h @@ -81,7 +81,6 @@ public: // Operations Q_INVOKABLE qint32 lowerBound() const; - virtual void registerMetaTypes() const; protected: explicit QExtensionEnd(QExtensionEndPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionEnd) *> *) - QT_END_HEADER #endif // QTUML_QEXTENSIONEND_H diff --git a/src/uml/qextensionpoint.cpp b/src/uml/qextensionpoint.cpp index 419dbc85..73978570 100644 --- a/src/uml/qextensionpoint.cpp +++ b/src/uml/qextensionpoint.cpp @@ -113,28 +113,6 @@ void QExtensionPoint::setUseCase(QUseCase *useCase) } } -void QExtensionPoint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *>("QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *"); - qRegisterMetaType<QExtensionPoint *>("QExtensionPoint *"); - qRegisterMetaType<const QSet<QExtensionPoint *> *>("const QSet<QExtensionPoint *> *"); - qRegisterMetaType<const QList<QExtensionPoint *> *>("const QList<QExtensionPoint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *>("QT_PREPEND_NAMESPACE_QTUML(QUseCase) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<QUseCase *>("QUseCase *"); - qRegisterMetaType<const QSet<QUseCase *> *>("const QSet<QUseCase *> *"); - qRegisterMetaType<const QList<QUseCase *> *>("const QList<QUseCase *> *"); - - QRedefinableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qextensionpoint.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qextensionpoint.h b/src/uml/qextensionpoint.h index a06f46a3..931eb76c 100644 --- a/src/uml/qextensionpoint.h +++ b/src/uml/qextensionpoint.h @@ -73,7 +73,6 @@ public: // Association ends from QExtensionPoint Q_INVOKABLE QUseCase *useCase() const; Q_INVOKABLE void setUseCase(QUseCase *useCase); - virtual void registerMetaTypes() const; protected: explicit QExtensionPoint(QExtensionPointPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *) - QT_END_HEADER #endif // QTUML_QEXTENSIONPOINT_H diff --git a/src/uml/qfeature.cpp b/src/uml/qfeature.cpp index 7f547b82..53831e28 100644 --- a/src/uml/qfeature.cpp +++ b/src/uml/qfeature.cpp @@ -49,22 +49,20 @@ QT_BEGIN_NAMESPACE_QTUML QFeaturePrivate::QFeaturePrivate() : - isStatic(false), - featuringClassifiers(new QSet<QClassifier *>) + isStatic(false) { } QFeaturePrivate::~QFeaturePrivate() { - delete featuringClassifiers; } void QFeaturePrivate::addFeaturingClassifier(QClassifier *featuringClassifier) { // This is a read-only derived-union association end - if (!this->featuringClassifiers->contains(featuringClassifier)) { - this->featuringClassifiers->insert(featuringClassifier); + if (!this->featuringClassifiers.contains(featuringClassifier)) { + this->featuringClassifiers.insert(featuringClassifier); // Adjust opposite property Q_Q(QFeature); @@ -76,8 +74,8 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier { // This is a read-only derived-union association end - if (this->featuringClassifiers->contains(featuringClassifier)) { - this->featuringClassifiers->remove(featuringClassifier); + if (this->featuringClassifiers.contains(featuringClassifier)) { + this->featuringClassifiers.remove(featuringClassifier); // Adjust opposite property Q_Q(QFeature); @@ -145,7 +143,7 @@ void QFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QFeature::featuringClassifiers() const +const QSet<QClassifier *> &QFeature::featuringClassifiers() const { // This is a read-only derived-union association end @@ -153,28 +151,6 @@ const QSet<QClassifier *> *QFeature::featuringClassifiers() const return d->featuringClassifiers; } -void QFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *"); - qRegisterMetaType<QFeature *>("QFeature *"); - qRegisterMetaType<const QSet<QFeature *> *>("const QSet<QFeature *> *"); - qRegisterMetaType<const QList<QFeature *> *>("const QList<QFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QRedefinableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfeature.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfeature.h b/src/uml/qfeature.h index cc2b9ed0..f7994d6a 100644 --- a/src/uml/qfeature.h +++ b/src/uml/qfeature.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QFeature : public QRedefinableElement Q_OBJECT Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(const QSet<QClassifier *> * featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) Q_DECLARE_PRIVATE(QFeature) @@ -80,8 +80,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Classes which access read-only opposite properties should be friend friend class QClassifierPrivate; @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QFeature) *> *) - QT_END_HEADER #endif // QTUML_QFEATURE_H diff --git a/src/uml/qfeature_p.h b/src/uml/qfeature_p.h index 29491986..8cf7db8e 100644 --- a/src/uml/qfeature_p.h +++ b/src/uml/qfeature_p.h @@ -67,7 +67,7 @@ public: virtual ~QFeaturePrivate(); bool isStatic; - QSet<QClassifier *> *featuringClassifiers; + QSet<QClassifier *> featuringClassifiers; // Internal functions for read-only subsetted association ends void addFeaturingClassifier(QClassifier *featuringClassifier); diff --git a/src/uml/qfinalnode.cpp b/src/uml/qfinalnode.cpp index b8695524..fce1129e 100644 --- a/src/uml/qfinalnode.cpp +++ b/src/uml/qfinalnode.cpp @@ -74,21 +74,6 @@ QFinalNode::~QFinalNode() { } -void QFinalNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *>("QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *> *"); - qRegisterMetaType<QFinalNode *>("QFinalNode *"); - qRegisterMetaType<const QSet<QFinalNode *> *>("const QSet<QFinalNode *> *"); - qRegisterMetaType<const QList<QFinalNode *> *>("const QList<QFinalNode *> *"); - - QControlNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfinalnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfinalnode.h b/src/uml/qfinalnode.h index 73d794af..9c5dddad 100644 --- a/src/uml/qfinalnode.h +++ b/src/uml/qfinalnode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QFinalNode : public QControlNode public: Q_INVOKABLE explicit QFinalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFinalNode(); - virtual void registerMetaTypes() const; protected: explicit QFinalNode(QFinalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QFinalNode) *> *) - QT_END_HEADER #endif // QTUML_QFINALNODE_H diff --git a/src/uml/qfinalstate.cpp b/src/uml/qfinalstate.cpp index 6a5a0b63..9c47c6f6 100644 --- a/src/uml/qfinalstate.cpp +++ b/src/uml/qfinalstate.cpp @@ -74,21 +74,6 @@ QFinalState::~QFinalState() { } -void QFinalState::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *>("QT_PREPEND_NAMESPACE_QTUML(QFinalState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *> *"); - qRegisterMetaType<QFinalState *>("QFinalState *"); - qRegisterMetaType<const QSet<QFinalState *> *>("const QSet<QFinalState *> *"); - qRegisterMetaType<const QList<QFinalState *> *>("const QList<QFinalState *> *"); - - QState::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfinalstate.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfinalstate.h b/src/uml/qfinalstate.h index ff4bdc23..22661357 100644 --- a/src/uml/qfinalstate.h +++ b/src/uml/qfinalstate.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QFinalState : public QState public: Q_INVOKABLE explicit QFinalState(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFinalState(); - virtual void registerMetaTypes() const; protected: explicit QFinalState(QFinalStatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QFinalState) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QFinalState) *> *) - QT_END_HEADER #endif // QTUML_QFINALSTATE_H diff --git a/src/uml/qflowfinalnode.cpp b/src/uml/qflowfinalnode.cpp index ed383c96..1ee4b1f1 100644 --- a/src/uml/qflowfinalnode.cpp +++ b/src/uml/qflowfinalnode.cpp @@ -74,21 +74,6 @@ QFlowFinalNode::~QFlowFinalNode() { } -void QFlowFinalNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *>("QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *> *"); - qRegisterMetaType<QFlowFinalNode *>("QFlowFinalNode *"); - qRegisterMetaType<const QSet<QFlowFinalNode *> *>("const QSet<QFlowFinalNode *> *"); - qRegisterMetaType<const QList<QFlowFinalNode *> *>("const QList<QFlowFinalNode *> *"); - - QFinalNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qflowfinalnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qflowfinalnode.h b/src/uml/qflowfinalnode.h index 1def46bf..0853f97a 100644 --- a/src/uml/qflowfinalnode.h +++ b/src/uml/qflowfinalnode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QFlowFinalNode : public QFinalNode public: Q_INVOKABLE explicit QFlowFinalNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFlowFinalNode(); - virtual void registerMetaTypes() const; protected: explicit QFlowFinalNode(QFlowFinalNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QFlowFinalNode) *> *) - QT_END_HEADER #endif // QTUML_QFLOWFINALNODE_H diff --git a/src/uml/qforknode.cpp b/src/uml/qforknode.cpp index ca79f5e4..8f69d485 100644 --- a/src/uml/qforknode.cpp +++ b/src/uml/qforknode.cpp @@ -74,21 +74,6 @@ QForkNode::~QForkNode() { } -void QForkNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *>("QT_PREPEND_NAMESPACE_QTUML(QForkNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *> *"); - qRegisterMetaType<QForkNode *>("QForkNode *"); - qRegisterMetaType<const QSet<QForkNode *> *>("const QSet<QForkNode *> *"); - qRegisterMetaType<const QList<QForkNode *> *>("const QList<QForkNode *> *"); - - QControlNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qforknode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qforknode.h b/src/uml/qforknode.h index 8256535b..28b61dc8 100644 --- a/src/uml/qforknode.h +++ b/src/uml/qforknode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QForkNode : public QControlNode public: Q_INVOKABLE explicit QForkNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QForkNode(); - virtual void registerMetaTypes() const; protected: explicit QForkNode(QForkNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QForkNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QForkNode) *> *) - QT_END_HEADER #endif // QTUML_QFORKNODE_H diff --git a/src/uml/qfunctionbehavior.cpp b/src/uml/qfunctionbehavior.cpp index 03462e6a..6c00125a 100644 --- a/src/uml/qfunctionbehavior.cpp +++ b/src/uml/qfunctionbehavior.cpp @@ -74,21 +74,6 @@ QFunctionBehavior::~QFunctionBehavior() { } -void QFunctionBehavior::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *> *"); - qRegisterMetaType<QFunctionBehavior *>("QFunctionBehavior *"); - qRegisterMetaType<const QSet<QFunctionBehavior *> *>("const QSet<QFunctionBehavior *> *"); - qRegisterMetaType<const QList<QFunctionBehavior *> *>("const QList<QFunctionBehavior *> *"); - - QOpaqueBehavior::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfunctionbehavior.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qfunctionbehavior.h b/src/uml/qfunctionbehavior.h index 5c9c615d..db2030a6 100644 --- a/src/uml/qfunctionbehavior.h +++ b/src/uml/qfunctionbehavior.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QFunctionBehavior : public QOpaqueBehavior public: Q_INVOKABLE explicit QFunctionBehavior(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QFunctionBehavior(); - virtual void registerMetaTypes() const; protected: explicit QFunctionBehavior(QFunctionBehaviorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QFunctionBehavior) *> *) - QT_END_HEADER #endif // QTUML_QFUNCTIONBEHAVIOR_H diff --git a/src/uml/qgate.cpp b/src/uml/qgate.cpp index b3ff7e16..82341481 100644 --- a/src/uml/qgate.cpp +++ b/src/uml/qgate.cpp @@ -74,21 +74,6 @@ QGate::~QGate() { } -void QGate::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGate) *>("QT_PREPEND_NAMESPACE_QTUML(QGate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<QGate *>("QGate *"); - qRegisterMetaType<const QSet<QGate *> *>("const QSet<QGate *> *"); - qRegisterMetaType<const QList<QGate *> *>("const QList<QGate *> *"); - - QMessageEnd::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qgate.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgate.h b/src/uml/qgate.h index 43b1c489..0fb231e5 100644 --- a/src/uml/qgate.h +++ b/src/uml/qgate.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QGate : public QMessageEnd public: Q_INVOKABLE explicit QGate(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QGate(); - virtual void registerMetaTypes() const; protected: explicit QGate(QGatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QGate) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *) - QT_END_HEADER #endif // QTUML_QGATE_H diff --git a/src/uml/qgeneralization.cpp b/src/uml/qgeneralization.cpp index 7eb697ae..f86bea51 100644 --- a/src/uml/qgeneralization.cpp +++ b/src/uml/qgeneralization.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QGeneralizationPrivate::QGeneralizationPrivate() : isSubstitutable(true), specific(0), - generalizationSets(new QSet<QGeneralizationSet *>), general(0) { } QGeneralizationPrivate::~QGeneralizationPrivate() { - delete generalizationSets; } /*! @@ -157,7 +155,7 @@ void QGeneralization::setSpecific(QClassifier *specific) /*! Designates a set in which instances of Generalization is considered members. */ -const QSet<QGeneralizationSet *> *QGeneralization::generalizationSets() const +const QSet<QGeneralizationSet *> &QGeneralization::generalizationSets() const { // This is a read-write association end @@ -170,8 +168,8 @@ void QGeneralization::addGeneralizationSet(QGeneralizationSet *generalizationSet // This is a read-write association end Q_D(QGeneralization); - if (!d->generalizationSets->contains(generalizationSet)) { - d->generalizationSets->insert(generalizationSet); + if (!d->generalizationSets.contains(generalizationSet)) { + d->generalizationSets.insert(generalizationSet); // Adjust opposite property generalizationSet->addGeneralization(this); @@ -183,8 +181,8 @@ void QGeneralization::removeGeneralizationSet(QGeneralizationSet *generalization // This is a read-write association end Q_D(QGeneralization); - if (d->generalizationSets->contains(generalizationSet)) { - d->generalizationSets->remove(generalizationSet); + if (d->generalizationSets.contains(generalizationSet)) { + d->generalizationSets.remove(generalizationSet); // Adjust opposite property if (generalizationSet) @@ -221,35 +219,6 @@ void QGeneralization::setGeneral(QClassifier *general) } } -void QGeneralization::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *"); - qRegisterMetaType<QGeneralizationSet *>("QGeneralizationSet *"); - qRegisterMetaType<const QSet<QGeneralizationSet *> *>("const QSet<QGeneralizationSet *> *"); - qRegisterMetaType<const QList<QGeneralizationSet *> *>("const QList<QGeneralizationSet *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qgeneralization.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralization.h b/src/uml/qgeneralization.h index 8d5229b9..60c09137 100644 --- a/src/uml/qgeneralization.h +++ b/src/uml/qgeneralization.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QGeneralization : public QDirectedRelationship Q_PROPERTY(bool isSubstitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) Q_PROPERTY(QClassifier * specific READ specific WRITE setSpecific) - Q_PROPERTY(const QSet<QGeneralizationSet *> * generalizationSets READ generalizationSets) + Q_PROPERTY(QSet<QGeneralizationSet *> generalizationSets READ generalizationSets) Q_PROPERTY(QClassifier * general READ general WRITE setGeneral) Q_DISABLE_COPY(QGeneralization) @@ -85,12 +85,11 @@ public: // Association ends from QGeneralization Q_INVOKABLE QClassifier *specific() const; Q_INVOKABLE void setSpecific(QClassifier *specific); - Q_INVOKABLE const QSet<QGeneralizationSet *> *generalizationSets() const; + Q_INVOKABLE const QSet<QGeneralizationSet *> &generalizationSets() const; Q_INVOKABLE void addGeneralizationSet(QGeneralizationSet *generalizationSet); Q_INVOKABLE void removeGeneralizationSet(QGeneralizationSet *generalizationSet); Q_INVOKABLE QClassifier *general() const; Q_INVOKABLE void setGeneral(QClassifier *general); - virtual void registerMetaTypes() const; protected: explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *) - QT_END_HEADER #endif // QTUML_QGENERALIZATION_H diff --git a/src/uml/qgeneralization_p.h b/src/uml/qgeneralization_p.h index 28fe1157..95a8feaf 100644 --- a/src/uml/qgeneralization_p.h +++ b/src/uml/qgeneralization_p.h @@ -70,7 +70,7 @@ public: bool isSubstitutable; QClassifier *specific; - QSet<QGeneralizationSet *> *generalizationSets; + QSet<QGeneralizationSet *> generalizationSets; QClassifier *general; }; diff --git a/src/uml/qgeneralizationset.cpp b/src/uml/qgeneralizationset.cpp index f67fbeb7..ea820222 100644 --- a/src/uml/qgeneralizationset.cpp +++ b/src/uml/qgeneralizationset.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QGeneralizationSetPrivate::QGeneralizationSetPrivate() : isCovering(false), isDisjoint(false), - powertype(0), - generalizations(new QSet<QGeneralization *>) + powertype(0) { } QGeneralizationSetPrivate::~QGeneralizationSetPrivate() { - delete generalizations; } /*! @@ -174,7 +172,7 @@ void QGeneralizationSet::setPowertype(QClassifier *powertype) /*! Designates the instances of Generalization which are members of a given GeneralizationSet. */ -const QSet<QGeneralization *> *QGeneralizationSet::generalizations() const +const QSet<QGeneralization *> &QGeneralizationSet::generalizations() const { // This is a read-write association end @@ -187,8 +185,8 @@ void QGeneralizationSet::addGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QGeneralizationSet); - if (!d->generalizations->contains(generalization)) { - d->generalizations->insert(generalization); + if (!d->generalizations.contains(generalization)) { + d->generalizations.insert(generalization); // Adjust opposite property generalization->addGeneralizationSet(this); @@ -200,8 +198,8 @@ void QGeneralizationSet::removeGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QGeneralizationSet); - if (d->generalizations->contains(generalization)) { - d->generalizations->remove(generalization); + if (d->generalizations.contains(generalization)) { + d->generalizations.remove(generalization); // Adjust opposite property if (generalization) @@ -209,35 +207,6 @@ void QGeneralizationSet::removeGeneralization(QGeneralization *generalization) } } -void QGeneralizationSet::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *"); - qRegisterMetaType<QGeneralizationSet *>("QGeneralizationSet *"); - qRegisterMetaType<const QSet<QGeneralizationSet *> *>("const QSet<QGeneralizationSet *> *"); - qRegisterMetaType<const QList<QGeneralizationSet *> *>("const QList<QGeneralizationSet *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qgeneralizationset.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralizationset.h b/src/uml/qgeneralizationset.h index 9aa557ad..ea9ac290 100644 --- a/src/uml/qgeneralizationset.h +++ b/src/uml/qgeneralizationset.h @@ -68,7 +68,7 @@ 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(const QSet<QGeneralization *> * generalizations READ generalizations) + Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) Q_DISABLE_COPY(QGeneralizationSet) Q_DECLARE_PRIVATE(QGeneralizationSet) @@ -88,10 +88,9 @@ public: // Association ends from QGeneralizationSet Q_INVOKABLE QClassifier *powertype() const; Q_INVOKABLE void setPowertype(QClassifier *powertype); - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); - virtual void registerMetaTypes() const; protected: explicit QGeneralizationSet(QGeneralizationSetPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -99,10 +98,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralizationSet) *> *) - QT_END_HEADER #endif // QTUML_QGENERALIZATIONSET_H diff --git a/src/uml/qgeneralizationset_p.h b/src/uml/qgeneralizationset_p.h index fb70ae8f..70ab1efa 100644 --- a/src/uml/qgeneralizationset_p.h +++ b/src/uml/qgeneralizationset_p.h @@ -71,7 +71,7 @@ public: bool isCovering; bool isDisjoint; QClassifier *powertype; - QSet<QGeneralization *> *generalizations; + QSet<QGeneralization *> generalizations; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralordering.cpp b/src/uml/qgeneralordering.cpp index 67210c86..281268fb 100644 --- a/src/uml/qgeneralordering.cpp +++ b/src/uml/qgeneralordering.cpp @@ -140,28 +140,6 @@ void QGeneralOrdering::setAfter(QOccurrenceSpecification *after) } } -void QGeneralOrdering::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *"); - qRegisterMetaType<QGeneralOrdering *>("QGeneralOrdering *"); - qRegisterMetaType<const QSet<QGeneralOrdering *> *>("const QSet<QGeneralOrdering *> *"); - qRegisterMetaType<const QList<QGeneralOrdering *> *>("const QList<QGeneralOrdering *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *"); - qRegisterMetaType<QOccurrenceSpecification *>("QOccurrenceSpecification *"); - qRegisterMetaType<const QSet<QOccurrenceSpecification *> *>("const QSet<QOccurrenceSpecification *> *"); - qRegisterMetaType<const QList<QOccurrenceSpecification *> *>("const QList<QOccurrenceSpecification *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qgeneralordering.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qgeneralordering.h b/src/uml/qgeneralordering.h index 5ee49e2c..600ff9fd 100644 --- a/src/uml/qgeneralordering.h +++ b/src/uml/qgeneralordering.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setBefore(QOccurrenceSpecification *before); Q_INVOKABLE QOccurrenceSpecification *after() const; Q_INVOKABLE void setAfter(QOccurrenceSpecification *after); - virtual void registerMetaTypes() const; protected: explicit QGeneralOrdering(QGeneralOrderingPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *) - QT_END_HEADER #endif // QTUML_QGENERALORDERING_H diff --git a/src/uml/qimage.cpp b/src/uml/qimage.cpp index f7513a39..95249ee0 100644 --- a/src/uml/qimage.cpp +++ b/src/uml/qimage.cpp @@ -141,21 +141,6 @@ void QImage::setContent(QString content) } } -void QImage::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QImage) *>("QT_PREPEND_NAMESPACE_QTUML(QImage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *"); - qRegisterMetaType<QImage *>("QImage *"); - qRegisterMetaType<const QSet<QImage *> *>("const QSet<QImage *> *"); - qRegisterMetaType<const QList<QImage *> *>("const QList<QImage *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qimage.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qimage.h b/src/uml/qimage.h index 2d72fe16..512bf1e1 100644 --- a/src/uml/qimage.h +++ b/src/uml/qimage.h @@ -79,7 +79,6 @@ public: Q_INVOKABLE void setLocation(QString location); Q_INVOKABLE QString content() const; Q_INVOKABLE void setContent(QString content); - virtual void registerMetaTypes() const; protected: explicit QImage(QImagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QImage) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *) - QT_END_HEADER #endif // QTUML_QIMAGE_H diff --git a/src/uml/qinclude.cpp b/src/uml/qinclude.cpp index 6e6761f2..39a421c3 100644 --- a/src/uml/qinclude.cpp +++ b/src/uml/qinclude.cpp @@ -89,7 +89,7 @@ QInclude::~QInclude() /*! The Elements owned by this element. */ -const QSet<QElement *> *QInclude::ownedElements() const +const QSet<QElement *> &QInclude::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -105,7 +105,7 @@ QElement *QInclude::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QInclude::ownedComments() const +const QSet<QComment *> &QInclude::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -127,7 +127,7 @@ void QInclude::removeOwnedComment(QComment *ownedComment) /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QInclude::relatedElements() const +const QSet<QElement *> &QInclude::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -139,7 +139,7 @@ const QSet<QElement *> *QInclude::relatedElements() const /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QInclude::sources() const +const QSet<QElement *> &QInclude::sources() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } @@ -147,7 +147,7 @@ const QSet<QElement *> *QInclude::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QInclude::targets() const +const QSet<QElement *> &QInclude::targets() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } @@ -218,7 +218,7 @@ QNamespace *QInclude::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QInclude::clientDependencies() const +const QSet<QDependency *> &QInclude::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -304,28 +304,6 @@ void QInclude::setAddition(QUseCase *addition) } } -void QInclude::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInclude) *>("QT_PREPEND_NAMESPACE_QTUML(QInclude) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *"); - qRegisterMetaType<QInclude *>("QInclude *"); - qRegisterMetaType<const QSet<QInclude *> *>("const QSet<QInclude *> *"); - qRegisterMetaType<const QList<QInclude *> *>("const QList<QInclude *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *>("QT_PREPEND_NAMESPACE_QTUML(QUseCase) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<QUseCase *>("QUseCase *"); - qRegisterMetaType<const QSet<QUseCase *> *>("const QSet<QUseCase *> *"); - qRegisterMetaType<const QList<QUseCase *> *>("const QList<QUseCase *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinclude.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinclude.h b/src/uml/qinclude.h index 9deb0216..7fa96078 100644 --- a/src/uml/qinclude.h +++ b/src/uml/qinclude.h @@ -75,18 +75,18 @@ public: virtual ~QInclude(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Association ends from aggregated QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; @@ -99,7 +99,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -108,7 +108,6 @@ public: Q_INVOKABLE void setIncludingCase(QUseCase *includingCase); Q_INVOKABLE QUseCase *addition() const; Q_INVOKABLE void setAddition(QUseCase *addition); - virtual void registerMetaTypes() const; protected: explicit QInclude(QIncludePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -120,10 +119,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInclude) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *) - QT_END_HEADER #endif // QTUML_QINCLUDE_H diff --git a/src/uml/qinformationflow.cpp b/src/uml/qinformationflow.cpp index 8b53c7e0..aecbf582 100644 --- a/src/uml/qinformationflow.cpp +++ b/src/uml/qinformationflow.cpp @@ -51,26 +51,12 @@ QT_BEGIN_NAMESPACE_QTUML -QInformationFlowPrivate::QInformationFlowPrivate() : - informationTargets(new QSet<QNamedElement *>), - realizingConnectors(new QSet<QConnector *>), - conveyed(new QSet<QClassifier *>), - informationSources(new QSet<QNamedElement *>), - realizingMessages(new QSet<QMessage *>), - realizingActivityEdges(new QSet<QActivityEdge *>), - realizations(new QSet<QRelationship *>) +QInformationFlowPrivate::QInformationFlowPrivate() { } QInformationFlowPrivate::~QInformationFlowPrivate() { - delete informationTargets; - delete realizingConnectors; - delete conveyed; - delete informationSources; - delete realizingMessages; - delete realizingActivityEdges; - delete realizations; } /*! @@ -106,7 +92,7 @@ QInformationFlow::~QInformationFlow() /*! The Elements owned by this element. */ -const QSet<QElement *> *QInformationFlow::ownedElements() const +const QSet<QElement *> &QInformationFlow::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -122,7 +108,7 @@ QElement *QInformationFlow::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QInformationFlow::ownedComments() const +const QSet<QComment *> &QInformationFlow::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -144,7 +130,7 @@ void QInformationFlow::removeOwnedComment(QComment *ownedComment) /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QInformationFlow::relatedElements() const +const QSet<QElement *> &QInformationFlow::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -156,7 +142,7 @@ const QSet<QElement *> *QInformationFlow::relatedElements() const /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QInformationFlow::sources() const +const QSet<QElement *> &QInformationFlow::sources() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->sources(); } @@ -164,7 +150,7 @@ const QSet<QElement *> *QInformationFlow::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QInformationFlow::targets() const +const QSet<QElement *> &QInformationFlow::targets() const { return (qwrappedobject_cast<const QDirectedRelationship *>(this))->targets(); } @@ -252,7 +238,7 @@ QNamespace *QInformationFlow::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QInformationFlow::clientDependencies() const +const QSet<QDependency *> &QInformationFlow::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -296,7 +282,7 @@ void QInformationFlow::unsetVisibility() /*! Defines to which target the conveyed InformationItems are directed. */ -const QSet<QNamedElement *> *QInformationFlow::informationTargets() const +const QSet<QNamedElement *> &QInformationFlow::informationTargets() const { // This is a read-write association end @@ -309,8 +295,8 @@ void QInformationFlow::addInformationTarget(QNamedElement *informationTarget) // This is a read-write association end Q_D(QInformationFlow); - if (!d->informationTargets->contains(informationTarget)) { - d->informationTargets->insert(informationTarget); + if (!d->informationTargets.contains(informationTarget)) { + d->informationTargets.insert(informationTarget); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addTarget(qwrappedobject_cast<QElement *>(informationTarget)); @@ -322,8 +308,8 @@ void QInformationFlow::removeInformationTarget(QNamedElement *informationTarget) // This is a read-write association end Q_D(QInformationFlow); - if (d->informationTargets->contains(informationTarget)) { - d->informationTargets->remove(informationTarget); + if (d->informationTargets.contains(informationTarget)) { + d->informationTargets.remove(informationTarget); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeTarget(qwrappedobject_cast<QElement *>(informationTarget)); @@ -333,7 +319,7 @@ void QInformationFlow::removeInformationTarget(QNamedElement *informationTarget) /*! Determines which Connectors will realize the specified flow. */ -const QSet<QConnector *> *QInformationFlow::realizingConnectors() const +const QSet<QConnector *> &QInformationFlow::realizingConnectors() const { // This is a read-write association end @@ -346,8 +332,8 @@ void QInformationFlow::addRealizingConnector(QConnector *realizingConnector) // This is a read-write association end Q_D(QInformationFlow); - if (!d->realizingConnectors->contains(realizingConnector)) { - d->realizingConnectors->insert(realizingConnector); + if (!d->realizingConnectors.contains(realizingConnector)) { + d->realizingConnectors.insert(realizingConnector); } } @@ -356,15 +342,15 @@ void QInformationFlow::removeRealizingConnector(QConnector *realizingConnector) // This is a read-write association end Q_D(QInformationFlow); - if (d->realizingConnectors->contains(realizingConnector)) { - d->realizingConnectors->remove(realizingConnector); + if (d->realizingConnectors.contains(realizingConnector)) { + d->realizingConnectors.remove(realizingConnector); } } /*! Specifies the information items that may circulate on this information flow. */ -const QSet<QClassifier *> *QInformationFlow::conveyed() const +const QSet<QClassifier *> &QInformationFlow::conveyed() const { // This is a read-write association end @@ -377,8 +363,8 @@ void QInformationFlow::addConveyed(QClassifier *conveyed) // This is a read-write association end Q_D(QInformationFlow); - if (!d->conveyed->contains(conveyed)) { - d->conveyed->insert(conveyed); + if (!d->conveyed.contains(conveyed)) { + d->conveyed.insert(conveyed); } } @@ -387,15 +373,15 @@ void QInformationFlow::removeConveyed(QClassifier *conveyed) // This is a read-write association end Q_D(QInformationFlow); - if (d->conveyed->contains(conveyed)) { - d->conveyed->remove(conveyed); + if (d->conveyed.contains(conveyed)) { + d->conveyed.remove(conveyed); } } /*! Defines from which source the conveyed InformationItems are initiated. */ -const QSet<QNamedElement *> *QInformationFlow::informationSources() const +const QSet<QNamedElement *> &QInformationFlow::informationSources() const { // This is a read-write association end @@ -408,8 +394,8 @@ void QInformationFlow::addInformationSource(QNamedElement *informationSource) // This is a read-write association end Q_D(QInformationFlow); - if (!d->informationSources->contains(informationSource)) { - d->informationSources->insert(informationSource); + if (!d->informationSources.contains(informationSource)) { + d->informationSources.insert(informationSource); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->addSource(qwrappedobject_cast<QElement *>(informationSource)); @@ -421,8 +407,8 @@ void QInformationFlow::removeInformationSource(QNamedElement *informationSource) // This is a read-write association end Q_D(QInformationFlow); - if (d->informationSources->contains(informationSource)) { - d->informationSources->remove(informationSource); + if (d->informationSources.contains(informationSource)) { + d->informationSources.remove(informationSource); // Adjust subsetted property(ies) (qwrappedobject_cast<QDirectedRelationshipPrivate *>(d))->removeSource(qwrappedobject_cast<QElement *>(informationSource)); @@ -432,7 +418,7 @@ void QInformationFlow::removeInformationSource(QNamedElement *informationSource) /*! Determines which Messages will realize the specified flow. */ -const QSet<QMessage *> *QInformationFlow::realizingMessages() const +const QSet<QMessage *> &QInformationFlow::realizingMessages() const { // This is a read-write association end @@ -445,8 +431,8 @@ void QInformationFlow::addRealizingMessage(QMessage *realizingMessage) // This is a read-write association end Q_D(QInformationFlow); - if (!d->realizingMessages->contains(realizingMessage)) { - d->realizingMessages->insert(realizingMessage); + if (!d->realizingMessages.contains(realizingMessage)) { + d->realizingMessages.insert(realizingMessage); } } @@ -455,15 +441,15 @@ void QInformationFlow::removeRealizingMessage(QMessage *realizingMessage) // This is a read-write association end Q_D(QInformationFlow); - if (d->realizingMessages->contains(realizingMessage)) { - d->realizingMessages->remove(realizingMessage); + if (d->realizingMessages.contains(realizingMessage)) { + d->realizingMessages.remove(realizingMessage); } } /*! Determines which ActivityEdges will realize the specified flow. */ -const QSet<QActivityEdge *> *QInformationFlow::realizingActivityEdges() const +const QSet<QActivityEdge *> &QInformationFlow::realizingActivityEdges() const { // This is a read-write association end @@ -476,8 +462,8 @@ void QInformationFlow::addRealizingActivityEdge(QActivityEdge *realizingActivity // This is a read-write association end Q_D(QInformationFlow); - if (!d->realizingActivityEdges->contains(realizingActivityEdge)) { - d->realizingActivityEdges->insert(realizingActivityEdge); + if (!d->realizingActivityEdges.contains(realizingActivityEdge)) { + d->realizingActivityEdges.insert(realizingActivityEdge); } } @@ -486,15 +472,15 @@ void QInformationFlow::removeRealizingActivityEdge(QActivityEdge *realizingActiv // This is a read-write association end Q_D(QInformationFlow); - if (d->realizingActivityEdges->contains(realizingActivityEdge)) { - d->realizingActivityEdges->remove(realizingActivityEdge); + if (d->realizingActivityEdges.contains(realizingActivityEdge)) { + d->realizingActivityEdges.remove(realizingActivityEdge); } } /*! Determines which Relationship will realize the specified flow */ -const QSet<QRelationship *> *QInformationFlow::realizations() const +const QSet<QRelationship *> &QInformationFlow::realizations() const { // This is a read-write association end @@ -507,8 +493,8 @@ void QInformationFlow::addRealization(QRelationship *realization) // This is a read-write association end Q_D(QInformationFlow); - if (!d->realizations->contains(realization)) { - d->realizations->insert(realization); + if (!d->realizations.contains(realization)) { + d->realizations.insert(realization); } } @@ -517,68 +503,11 @@ void QInformationFlow::removeRealization(QRelationship *realization) // This is a read-write association end Q_D(QInformationFlow); - if (d->realizations->contains(realization)) { - d->realizations->remove(realization); + if (d->realizations.contains(realization)) { + d->realizations.remove(realization); } } -void QInformationFlow::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *>("QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *> *"); - qRegisterMetaType<QInformationFlow *>("QInformationFlow *"); - qRegisterMetaType<const QSet<QInformationFlow *> *>("const QSet<QInformationFlow *> *"); - qRegisterMetaType<const QList<QInformationFlow *> *>("const QList<QInformationFlow *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnector) *>("QT_PREPEND_NAMESPACE_QTUML(QConnector) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<QConnector *>("QConnector *"); - qRegisterMetaType<const QSet<QConnector *> *>("const QSet<QConnector *> *"); - qRegisterMetaType<const QList<QConnector *> *>("const QList<QConnector *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessage) *>("QT_PREPEND_NAMESPACE_QTUML(QMessage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<QMessage *>("QMessage *"); - qRegisterMetaType<const QSet<QMessage *> *>("const QSet<QMessage *> *"); - qRegisterMetaType<const QList<QMessage *> *>("const QList<QMessage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *>("QT_PREPEND_NAMESPACE_QTUML(QRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *"); - qRegisterMetaType<QRelationship *>("QRelationship *"); - qRegisterMetaType<const QSet<QRelationship *> *>("const QSet<QRelationship *> *"); - qRegisterMetaType<const QList<QRelationship *> *>("const QList<QRelationship *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinformationflow.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinformationflow.h b/src/uml/qinformationflow.h index cf5bba3b..51b53042 100644 --- a/src/uml/qinformationflow.h +++ b/src/uml/qinformationflow.h @@ -72,13 +72,13 @@ class Q_UML_EXPORT QInformationFlow : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QNamedElement *> * informationTargets READ informationTargets) - Q_PROPERTY(const QSet<QConnector *> * realizingConnectors READ realizingConnectors) - Q_PROPERTY(const QSet<QClassifier *> * conveyed READ conveyed) - Q_PROPERTY(const QSet<QNamedElement *> * informationSources READ informationSources) - Q_PROPERTY(const QSet<QMessage *> * realizingMessages READ realizingMessages) - Q_PROPERTY(const QSet<QActivityEdge *> * realizingActivityEdges READ realizingActivityEdges) - Q_PROPERTY(const QSet<QRelationship *> * realizations READ realizations) + 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_DISABLE_COPY(QInformationFlow) Q_DECLARE_PRIVATE(QInformationFlow) @@ -88,18 +88,18 @@ public: virtual ~QInformationFlow(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Association ends from aggregated QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -116,7 +116,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -126,28 +126,27 @@ public: Q_INVOKABLE void unsetVisibility(); // Association ends from QInformationFlow - Q_INVOKABLE const QSet<QNamedElement *> *informationTargets() const; + Q_INVOKABLE const QSet<QNamedElement *> &informationTargets() const; Q_INVOKABLE void addInformationTarget(QNamedElement *informationTarget); Q_INVOKABLE void removeInformationTarget(QNamedElement *informationTarget); - Q_INVOKABLE const QSet<QConnector *> *realizingConnectors() const; + Q_INVOKABLE const QSet<QConnector *> &realizingConnectors() const; Q_INVOKABLE void addRealizingConnector(QConnector *realizingConnector); Q_INVOKABLE void removeRealizingConnector(QConnector *realizingConnector); - Q_INVOKABLE const QSet<QClassifier *> *conveyed() const; + Q_INVOKABLE const QSet<QClassifier *> &conveyed() const; Q_INVOKABLE void addConveyed(QClassifier *conveyed); Q_INVOKABLE void removeConveyed(QClassifier *conveyed); - Q_INVOKABLE const QSet<QNamedElement *> *informationSources() const; + Q_INVOKABLE const QSet<QNamedElement *> &informationSources() const; Q_INVOKABLE void addInformationSource(QNamedElement *informationSource); Q_INVOKABLE void removeInformationSource(QNamedElement *informationSource); - Q_INVOKABLE const QSet<QMessage *> *realizingMessages() const; + Q_INVOKABLE const QSet<QMessage *> &realizingMessages() const; Q_INVOKABLE void addRealizingMessage(QMessage *realizingMessage); Q_INVOKABLE void removeRealizingMessage(QMessage *realizingMessage); - Q_INVOKABLE const QSet<QActivityEdge *> *realizingActivityEdges() const; + Q_INVOKABLE const QSet<QActivityEdge *> &realizingActivityEdges() const; Q_INVOKABLE void addRealizingActivityEdge(QActivityEdge *realizingActivityEdge); Q_INVOKABLE void removeRealizingActivityEdge(QActivityEdge *realizingActivityEdge); - Q_INVOKABLE const QSet<QRelationship *> *realizations() const; + Q_INVOKABLE const QSet<QRelationship *> &realizations() const; Q_INVOKABLE void addRealization(QRelationship *realization); Q_INVOKABLE void removeRealization(QRelationship *realization); - virtual void registerMetaTypes() const; protected: explicit QInformationFlow(QInformationFlowPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -159,10 +158,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInformationFlow) *> *) - QT_END_HEADER #endif // QTUML_QINFORMATIONFLOW_H diff --git a/src/uml/qinformationflow_p.h b/src/uml/qinformationflow_p.h index d3d9539e..d83da973 100644 --- a/src/uml/qinformationflow_p.h +++ b/src/uml/qinformationflow_p.h @@ -75,13 +75,13 @@ public: explicit QInformationFlowPrivate(); virtual ~QInformationFlowPrivate(); - QSet<QNamedElement *> *informationTargets; - QSet<QConnector *> *realizingConnectors; - QSet<QClassifier *> *conveyed; - QSet<QNamedElement *> *informationSources; - QSet<QMessage *> *realizingMessages; - QSet<QActivityEdge *> *realizingActivityEdges; - QSet<QRelationship *> *realizations; + QSet<QNamedElement *> informationTargets; + QSet<QConnector *> realizingConnectors; + QSet<QClassifier *> conveyed; + QSet<QNamedElement *> informationSources; + QSet<QMessage *> realizingMessages; + QSet<QActivityEdge *> realizingActivityEdges; + QSet<QRelationship *> realizations; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinformationitem.cpp b/src/uml/qinformationitem.cpp index 2988e21b..0ab8cf83 100644 --- a/src/uml/qinformationitem.cpp +++ b/src/uml/qinformationitem.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTUML -QInformationItemPrivate::QInformationItemPrivate() : - represented(new QSet<QClassifier *>) +QInformationItemPrivate::QInformationItemPrivate() { } QInformationItemPrivate::~QInformationItemPrivate() { - delete represented; } /*! @@ -83,7 +81,7 @@ QInformationItem::~QInformationItem() /*! Determines the classifiers that will specify the structure and nature of the information. An information item represents all its represented classifiers. */ -const QSet<QClassifier *> *QInformationItem::represented() const +const QSet<QClassifier *> &QInformationItem::represented() const { // This is a read-write association end @@ -96,8 +94,8 @@ void QInformationItem::addRepresented(QClassifier *represented) // This is a read-write association end Q_D(QInformationItem); - if (!d->represented->contains(represented)) { - d->represented->insert(represented); + if (!d->represented.contains(represented)) { + d->represented.insert(represented); } } @@ -106,26 +104,11 @@ void QInformationItem::removeRepresented(QClassifier *represented) // This is a read-write association end Q_D(QInformationItem); - if (d->represented->contains(represented)) { - d->represented->remove(represented); + if (d->represented.contains(represented)) { + d->represented.remove(represented); } } -void QInformationItem::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *>("QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *> *"); - qRegisterMetaType<QInformationItem *>("QInformationItem *"); - qRegisterMetaType<const QSet<QInformationItem *> *>("const QSet<QInformationItem *> *"); - qRegisterMetaType<const QList<QInformationItem *> *>("const QList<QInformationItem *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinformationitem.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinformationitem.h b/src/uml/qinformationitem.h index 8a67574b..0d610f88 100644 --- a/src/uml/qinformationitem.h +++ b/src/uml/qinformationitem.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QInformationItem : public QClassifier { Q_OBJECT - Q_PROPERTY(const QSet<QClassifier *> * represented READ represented) + Q_PROPERTY(QSet<QClassifier *> represented READ represented) Q_DISABLE_COPY(QInformationItem) Q_DECLARE_PRIVATE(QInformationItem) @@ -71,10 +71,9 @@ public: virtual ~QInformationItem(); // Association ends from QInformationItem - Q_INVOKABLE const QSet<QClassifier *> *represented() const; + Q_INVOKABLE const QSet<QClassifier *> &represented() const; Q_INVOKABLE void addRepresented(QClassifier *represented); Q_INVOKABLE void removeRepresented(QClassifier *represented); - virtual void registerMetaTypes() const; protected: explicit QInformationItem(QInformationItemPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInformationItem) *> *) - QT_END_HEADER #endif // QTUML_QINFORMATIONITEM_H diff --git a/src/uml/qinformationitem_p.h b/src/uml/qinformationitem_p.h index 5f648909..f94db967 100644 --- a/src/uml/qinformationitem_p.h +++ b/src/uml/qinformationitem_p.h @@ -64,7 +64,7 @@ public: explicit QInformationItemPrivate(); virtual ~QInformationItemPrivate(); - QSet<QClassifier *> *represented; + QSet<QClassifier *> represented; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinitialnode.cpp b/src/uml/qinitialnode.cpp index 494a4a55..7b92daa5 100644 --- a/src/uml/qinitialnode.cpp +++ b/src/uml/qinitialnode.cpp @@ -74,21 +74,6 @@ QInitialNode::~QInitialNode() { } -void QInitialNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *>("QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *> *"); - qRegisterMetaType<QInitialNode *>("QInitialNode *"); - qRegisterMetaType<const QSet<QInitialNode *> *>("const QSet<QInitialNode *> *"); - qRegisterMetaType<const QList<QInitialNode *> *>("const QList<QInitialNode *> *"); - - QControlNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinitialnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinitialnode.h b/src/uml/qinitialnode.h index bc1215a6..95d7e66e 100644 --- a/src/uml/qinitialnode.h +++ b/src/uml/qinitialnode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QInitialNode : public QControlNode public: Q_INVOKABLE explicit QInitialNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInitialNode(); - virtual void registerMetaTypes() const; protected: explicit QInitialNode(QInitialNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInitialNode) *> *) - QT_END_HEADER #endif // QTUML_QINITIALNODE_H diff --git a/src/uml/qinputpin.cpp b/src/uml/qinputpin.cpp index a52a8c79..b8f6e3be 100644 --- a/src/uml/qinputpin.cpp +++ b/src/uml/qinputpin.cpp @@ -74,21 +74,6 @@ QInputPin::~QInputPin() { } -void QInputPin::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QPin::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinputpin.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinputpin.h b/src/uml/qinputpin.h index 4b522773..9beb517f 100644 --- a/src/uml/qinputpin.h +++ b/src/uml/qinputpin.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QInputPin : public QPin public: Q_INVOKABLE explicit QInputPin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QInputPin(); - virtual void registerMetaTypes() const; protected: explicit QInputPin(QInputPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInputPin) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *) - QT_END_HEADER #endif // QTUML_QINPUTPIN_H diff --git a/src/uml/qinstancespecification.cpp b/src/uml/qinstancespecification.cpp index 6af442b0..b83ad219 100644 --- a/src/uml/qinstancespecification.cpp +++ b/src/uml/qinstancespecification.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML QInstanceSpecificationPrivate::QInstanceSpecificationPrivate() : - classifiers(new QSet<QClassifier *>), - specification(0), - slots_(new QSet<QSlot *>) + specification(0) { } QInstanceSpecificationPrivate::~QInstanceSpecificationPrivate() { - delete classifiers; - delete slots_; } /*! @@ -96,7 +92,7 @@ QInstanceSpecification::~QInstanceSpecification() /*! The Elements owned by this element. */ -const QSet<QElement *> *QInstanceSpecification::ownedElements() const +const QSet<QElement *> &QInstanceSpecification::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -112,7 +108,7 @@ QElement *QInstanceSpecification::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QInstanceSpecification::ownedComments() const +const QSet<QComment *> &QInstanceSpecification::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -180,7 +176,7 @@ QNamespace *QInstanceSpecification::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QInstanceSpecification::clientDependencies() const +const QSet<QDependency *> &QInstanceSpecification::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -254,7 +250,7 @@ void QInstanceSpecification::unsetVisibility() /*! The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget. */ -const QSet<QPackageableElement *> *QInstanceSpecification::deployedElements() const +const QSet<QPackageableElement *> &QInstanceSpecification::deployedElements() const { return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployedElements(); } @@ -262,7 +258,7 @@ const QSet<QPackageableElement *> *QInstanceSpecification::deployedElements() co /*! The set of Deployments for a DeploymentTarget. */ -const QSet<QDeployment *> *QInstanceSpecification::deployments() const +const QSet<QDeployment *> &QInstanceSpecification::deployments() const { return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployments(); } @@ -284,7 +280,7 @@ void QInstanceSpecification::removeDeployment(QDeployment *deployment) /*! The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them. */ -const QSet<QClassifier *> *QInstanceSpecification::classifiers() const +const QSet<QClassifier *> &QInstanceSpecification::classifiers() const { // This is a read-write association end @@ -297,8 +293,8 @@ void QInstanceSpecification::addClassifier(QClassifier *classifier) // This is a read-write association end Q_D(QInstanceSpecification); - if (!d->classifiers->contains(classifier)) { - d->classifiers->insert(classifier); + if (!d->classifiers.contains(classifier)) { + d->classifiers.insert(classifier); } } @@ -307,8 +303,8 @@ void QInstanceSpecification::removeClassifier(QClassifier *classifier) // This is a read-write association end Q_D(QInstanceSpecification); - if (d->classifiers->contains(classifier)) { - d->classifiers->remove(classifier); + if (d->classifiers.contains(classifier)) { + d->classifiers.remove(classifier); } } @@ -344,7 +340,7 @@ void QInstanceSpecification::setSpecification(QValueSpecification *specification /*! 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. */ -const QSet<QSlot *> *QInstanceSpecification::slots_() const +const QSet<QSlot *> &QInstanceSpecification::slots_() const { // This is a read-write association end @@ -357,8 +353,8 @@ void QInstanceSpecification::addSlot_(QSlot *slot_) // This is a read-write association end Q_D(QInstanceSpecification); - if (!d->slots_->contains(slot_)) { - d->slots_->insert(slot_); + if (!d->slots_.contains(slot_)) { + d->slots_.insert(slot_); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(slot_)); @@ -373,8 +369,8 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) // This is a read-write association end Q_D(QInstanceSpecification); - if (d->slots_->contains(slot_)) { - d->slots_->remove(slot_); + if (d->slots_.contains(slot_)) { + d->slots_.remove(slot_); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(slot_)); @@ -384,42 +380,6 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) } } -void QInstanceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSlot) *>("QT_PREPEND_NAMESPACE_QTUML(QSlot) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *"); - qRegisterMetaType<QSlot *>("QSlot *"); - qRegisterMetaType<const QSet<QSlot *> *>("const QSet<QSlot *> *"); - qRegisterMetaType<const QList<QSlot *> *>("const QList<QSlot *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinstancespecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinstancespecification.h b/src/uml/qinstancespecification.h index 14ec07ac..01c2fe1c 100644 --- a/src/uml/qinstancespecification.h +++ b/src/uml/qinstancespecification.h @@ -70,9 +70,9 @@ class Q_UML_EXPORT QInstanceSpecification : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QClassifier *> * classifiers READ classifiers) + Q_PROPERTY(QSet<QClassifier *> classifiers READ classifiers) Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QSet<QSlot *> * slots_ READ slots_) + Q_PROPERTY(QSet<QSlot *> slots_ READ slots_) Q_DISABLE_COPY(QInstanceSpecification) Q_DECLARE_PRIVATE(QInstanceSpecification) @@ -82,9 +82,9 @@ public: virtual ~QInstanceSpecification(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -97,7 +97,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -113,21 +113,20 @@ public: Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QDeploymentTarget - Q_INVOKABLE const QSet<QPackageableElement *> *deployedElements() const; - Q_INVOKABLE const QSet<QDeployment *> *deployments() const; + Q_INVOKABLE const QSet<QPackageableElement *> &deployedElements() const; + Q_INVOKABLE const QSet<QDeployment *> &deployments() const; Q_INVOKABLE void addDeployment(QDeployment *deployment); Q_INVOKABLE void removeDeployment(QDeployment *deployment); // Association ends from QInstanceSpecification - Q_INVOKABLE const QSet<QClassifier *> *classifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &classifiers() const; Q_INVOKABLE void addClassifier(QClassifier *classifier); Q_INVOKABLE void removeClassifier(QClassifier *classifier); Q_INVOKABLE QValueSpecification *specification() const; Q_INVOKABLE void setSpecification(QValueSpecification *specification); - Q_INVOKABLE const QSet<QSlot *> *slots_() const; + Q_INVOKABLE const QSet<QSlot *> &slots_() const; Q_INVOKABLE void addSlot_(QSlot *slot_); Q_INVOKABLE void removeSlot_(QSlot *slot_); - virtual void registerMetaTypes() const; protected: explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -140,10 +139,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *) - QT_END_HEADER #endif // QTUML_QINSTANCESPECIFICATION_H diff --git a/src/uml/qinstancespecification_p.h b/src/uml/qinstancespecification_p.h index 24ae0b57..24d20b1e 100644 --- a/src/uml/qinstancespecification_p.h +++ b/src/uml/qinstancespecification_p.h @@ -73,9 +73,9 @@ public: explicit QInstanceSpecificationPrivate(); virtual ~QInstanceSpecificationPrivate(); - QSet<QClassifier *> *classifiers; + QSet<QClassifier *> classifiers; QValueSpecification *specification; - QSet<QSlot *> *slots_; + QSet<QSlot *> slots_; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinstancevalue.cpp b/src/uml/qinstancevalue.cpp index c6d8427a..3c3b1e3c 100644 --- a/src/uml/qinstancevalue.cpp +++ b/src/uml/qinstancevalue.cpp @@ -102,28 +102,6 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance) } } -void QInstanceValue::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *>("QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *> *"); - qRegisterMetaType<QInstanceValue *>("QInstanceValue *"); - qRegisterMetaType<const QSet<QInstanceValue *> *>("const QSet<QInstanceValue *> *"); - qRegisterMetaType<const QList<QInstanceValue *> *>("const QList<QInstanceValue *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinstancevalue.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinstancevalue.h b/src/uml/qinstancevalue.h index ab2c3c3c..04b8f437 100644 --- a/src/uml/qinstancevalue.h +++ b/src/uml/qinstancevalue.h @@ -73,7 +73,6 @@ public: // Association ends from QInstanceValue Q_INVOKABLE QInstanceSpecification *instance() const; Q_INVOKABLE void setInstance(QInstanceSpecification *instance); - virtual void registerMetaTypes() const; protected: explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceValue) *> *) - QT_END_HEADER #endif // QTUML_QINSTANCEVALUE_H diff --git a/src/uml/qinteraction.cpp b/src/uml/qinteraction.cpp index 695299ae..a56f1982 100644 --- a/src/uml/qinteraction.cpp +++ b/src/uml/qinteraction.cpp @@ -49,22 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML -QInteractionPrivate::QInteractionPrivate() : - actions(new QSet<QAction *>), - messages(new QSet<QMessage *>), - formalGates(new QSet<QGate *>), - fragments(new QList<QInteractionFragment *>), - lifelines(new QSet<QLifeline *>) +QInteractionPrivate::QInteractionPrivate() { } QInteractionPrivate::~QInteractionPrivate() { - delete actions; - delete messages; - delete formalGates; - delete fragments; - delete lifelines; } /*! @@ -135,7 +125,7 @@ void QInteraction::setSpecification(QBehavioralFeature *specification) /*! 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. */ -const QSet<QConstraint *> *QInteraction::postconditions() const +const QSet<QConstraint *> &QInteraction::postconditions() const { return (qwrappedobject_cast<const QBehavior *>(this))->postconditions(); } @@ -153,7 +143,7 @@ void QInteraction::removePostcondition(QConstraint *postcondition) /*! An optional set of Constraints specifying what must be fulfilled when the behavior is invoked. */ -const QSet<QConstraint *> *QInteraction::preconditions() const +const QSet<QConstraint *> &QInteraction::preconditions() const { return (qwrappedobject_cast<const QBehavior *>(this))->preconditions(); } @@ -171,7 +161,7 @@ void QInteraction::removePrecondition(QConstraint *precondition) /*! 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. */ -const QSet<QBehavior *> *QInteraction::redefinedBehaviors() const +const QSet<QBehavior *> &QInteraction::redefinedBehaviors() const { return (qwrappedobject_cast<const QBehavior *>(this))->redefinedBehaviors(); } @@ -189,7 +179,7 @@ void QInteraction::removeRedefinedBehavior(QBehavior *redefinedBehavior) /*! 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. */ -const QList<QParameter *> *QInteraction::ownedParameters() const +const QList<QParameter *> &QInteraction::ownedParameters() const { return (qwrappedobject_cast<const QBehavior *>(this))->ownedParameters(); } @@ -207,7 +197,7 @@ void QInteraction::removeOwnedParameter(QParameter *ownedParameter) /*! The ParameterSets owned by this Behavior. */ -const QSet<QParameterSet *> *QInteraction::ownedParameterSets() const +const QSet<QParameterSet *> &QInteraction::ownedParameterSets() const { return (qwrappedobject_cast<const QBehavior *>(this))->ownedParameterSets(); } @@ -237,7 +227,7 @@ QBehavioredClassifier *QInteraction::context() const /*! The Elements owned by this element. */ -const QSet<QElement *> *QInteraction::ownedElements() const +const QSet<QElement *> &QInteraction::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -253,7 +243,7 @@ QElement *QInteraction::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QInteraction::ownedComments() const +const QSet<QComment *> &QInteraction::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -334,7 +324,7 @@ QNamespace *QInteraction::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QInteraction::clientDependencies() const +const QSet<QDependency *> &QInteraction::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -356,7 +346,7 @@ void QInteraction::removeClientDependency(QDependency *clientDependency) /*! The general ordering relationships contained in this fragment. */ -const QSet<QGeneralOrdering *> *QInteraction::generalOrderings() const +const QSet<QGeneralOrdering *> &QInteraction::generalOrderings() const { return (qwrappedobject_cast<const QInteractionFragment *>(this))->generalOrderings(); } @@ -387,7 +377,7 @@ void QInteraction::setEnclosingInteraction(QInteraction *enclosingInteraction) /*! References the Lifelines that the InteractionFragment involves. */ -const QSet<QLifeline *> *QInteraction::covered() const +const QSet<QLifeline *> &QInteraction::covered() const { return (qwrappedobject_cast<const QInteractionFragment *>(this))->covered(); } @@ -422,7 +412,7 @@ void QInteraction::setEnclosingOperand(QInteractionOperand *enclosingOperand) /*! Actions owned by the Interaction. */ -const QSet<QAction *> *QInteraction::actions() const +const QSet<QAction *> &QInteraction::actions() const { // This is a read-write association end @@ -435,8 +425,8 @@ void QInteraction::addAction(QAction *action) // This is a read-write association end Q_D(QInteraction); - if (!d->actions->contains(action)) { - d->actions->insert(action); + if (!d->actions.contains(action)) { + d->actions.insert(action); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(action)); @@ -448,8 +438,8 @@ void QInteraction::removeAction(QAction *action) // This is a read-write association end Q_D(QInteraction); - if (d->actions->contains(action)) { - d->actions->remove(action); + if (d->actions.contains(action)) { + d->actions.remove(action); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(action)); @@ -459,7 +449,7 @@ void QInteraction::removeAction(QAction *action) /*! The Messages contained in this Interaction. */ -const QSet<QMessage *> *QInteraction::messages() const +const QSet<QMessage *> &QInteraction::messages() const { // This is a read-write association end @@ -472,8 +462,8 @@ void QInteraction::addMessage(QMessage *message) // This is a read-write association end Q_D(QInteraction); - if (!d->messages->contains(message)) { - d->messages->insert(message); + if (!d->messages.contains(message)) { + d->messages.insert(message); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(message)); @@ -488,8 +478,8 @@ void QInteraction::removeMessage(QMessage *message) // This is a read-write association end Q_D(QInteraction); - if (d->messages->contains(message)) { - d->messages->remove(message); + if (d->messages.contains(message)) { + d->messages.remove(message); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(message)); @@ -502,7 +492,7 @@ void QInteraction::removeMessage(QMessage *message) /*! Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it. */ -const QSet<QGate *> *QInteraction::formalGates() const +const QSet<QGate *> &QInteraction::formalGates() const { // This is a read-write association end @@ -515,8 +505,8 @@ void QInteraction::addFormalGate(QGate *formalGate) // This is a read-write association end Q_D(QInteraction); - if (!d->formalGates->contains(formalGate)) { - d->formalGates->insert(formalGate); + if (!d->formalGates.contains(formalGate)) { + d->formalGates.insert(formalGate); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(formalGate)); @@ -528,8 +518,8 @@ void QInteraction::removeFormalGate(QGate *formalGate) // This is a read-write association end Q_D(QInteraction); - if (d->formalGates->contains(formalGate)) { - d->formalGates->remove(formalGate); + if (d->formalGates.contains(formalGate)) { + d->formalGates.remove(formalGate); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(formalGate)); @@ -539,7 +529,7 @@ void QInteraction::removeFormalGate(QGate *formalGate) /*! The ordered set of fragments in the Interaction. */ -const QList<QInteractionFragment *> *QInteraction::fragments() const +const QList<QInteractionFragment *> &QInteraction::fragments() const { // This is a read-write association end @@ -552,8 +542,8 @@ void QInteraction::addFragment(QInteractionFragment *fragment) // This is a read-write association end Q_D(QInteraction); - if (!d->fragments->contains(fragment)) { - d->fragments->append(fragment); + if (!d->fragments.contains(fragment)) { + d->fragments.append(fragment); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); @@ -568,8 +558,8 @@ void QInteraction::removeFragment(QInteractionFragment *fragment) // This is a read-write association end Q_D(QInteraction); - if (d->fragments->contains(fragment)) { - d->fragments->removeAll(fragment); + if (d->fragments.contains(fragment)) { + d->fragments.removeAll(fragment); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); @@ -582,7 +572,7 @@ void QInteraction::removeFragment(QInteractionFragment *fragment) /*! Specifies the participants in this Interaction. */ -const QSet<QLifeline *> *QInteraction::lifelines() const +const QSet<QLifeline *> &QInteraction::lifelines() const { // This is a read-write association end @@ -595,8 +585,8 @@ void QInteraction::addLifeline(QLifeline *lifeline) // This is a read-write association end Q_D(QInteraction); - if (!d->lifelines->contains(lifeline)) { - d->lifelines->insert(lifeline); + if (!d->lifelines.contains(lifeline)) { + d->lifelines.insert(lifeline); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(lifeline)); @@ -611,8 +601,8 @@ void QInteraction::removeLifeline(QLifeline *lifeline) // This is a read-write association end Q_D(QInteraction); - if (d->lifelines->contains(lifeline)) { - d->lifelines->remove(lifeline); + if (d->lifelines.contains(lifeline)) { + d->lifelines.remove(lifeline); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(lifeline)); @@ -622,49 +612,6 @@ void QInteraction::removeLifeline(QLifeline *lifeline) } } -void QInteraction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *>("QT_PREPEND_NAMESPACE_QTUML(QInteraction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<QInteraction *>("QInteraction *"); - qRegisterMetaType<const QSet<QInteraction *> *>("const QSet<QInteraction *> *"); - qRegisterMetaType<const QList<QInteraction *> *>("const QList<QInteraction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessage) *>("QT_PREPEND_NAMESPACE_QTUML(QMessage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<QMessage *>("QMessage *"); - qRegisterMetaType<const QSet<QMessage *> *>("const QSet<QMessage *> *"); - qRegisterMetaType<const QList<QMessage *> *>("const QList<QMessage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *>("QT_PREPEND_NAMESPACE_QTUML(QLifeline) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<QLifeline *>("QLifeline *"); - qRegisterMetaType<const QSet<QLifeline *> *>("const QSet<QLifeline *> *"); - qRegisterMetaType<const QList<QLifeline *> *>("const QList<QLifeline *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<QAction *>("QAction *"); - qRegisterMetaType<const QSet<QAction *> *>("const QSet<QAction *> *"); - qRegisterMetaType<const QList<QAction *> *>("const QList<QAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGate) *>("QT_PREPEND_NAMESPACE_QTUML(QGate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<QGate *>("QGate *"); - qRegisterMetaType<const QSet<QGate *> *>("const QSet<QGate *> *"); - qRegisterMetaType<const QList<QGate *> *>("const QList<QGate *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinteraction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteraction.h b/src/uml/qinteraction.h index 4c38c642..e855c7c3 100644 --- a/src/uml/qinteraction.h +++ b/src/uml/qinteraction.h @@ -71,11 +71,11 @@ class Q_UML_EXPORT QInteraction : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QAction *> * actions READ actions) - Q_PROPERTY(const QSet<QMessage *> * messages READ messages) - Q_PROPERTY(const QSet<QGate *> * formalGates READ formalGates) - Q_PROPERTY(const QList<QInteractionFragment *> * fragments READ fragments) - Q_PROPERTY(const QSet<QLifeline *> * lifelines READ lifelines) + 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_DISABLE_COPY(QInteraction) Q_DECLARE_PRIVATE(QInteraction) @@ -92,27 +92,27 @@ public: // Association ends from aggregated QBehavior Q_INVOKABLE QBehavioralFeature *specification() const; Q_INVOKABLE void setSpecification(QBehavioralFeature *specification); - Q_INVOKABLE const QSet<QConstraint *> *postconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &postconditions() const; Q_INVOKABLE void addPostcondition(QConstraint *postcondition); Q_INVOKABLE void removePostcondition(QConstraint *postcondition); - Q_INVOKABLE const QSet<QConstraint *> *preconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &preconditions() const; Q_INVOKABLE void addPrecondition(QConstraint *precondition); Q_INVOKABLE void removePrecondition(QConstraint *precondition); - Q_INVOKABLE const QSet<QBehavior *> *redefinedBehaviors() const; + Q_INVOKABLE const QSet<QBehavior *> &redefinedBehaviors() const; Q_INVOKABLE void addRedefinedBehavior(QBehavior *redefinedBehavior); Q_INVOKABLE void removeRedefinedBehavior(QBehavior *redefinedBehavior); - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); - Q_INVOKABLE const QSet<QParameterSet *> *ownedParameterSets() const; + Q_INVOKABLE const QSet<QParameterSet *> &ownedParameterSets() const; Q_INVOKABLE void addOwnedParameterSet(QParameterSet *ownedParameterSet); Q_INVOKABLE void removeOwnedParameterSet(QParameterSet *ownedParameterSet); Q_INVOKABLE QBehavioredClassifier *context() const; // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -127,39 +127,38 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QInteractionFragment - Q_INVOKABLE const QSet<QGeneralOrdering *> *generalOrderings() const; + Q_INVOKABLE const QSet<QGeneralOrdering *> &generalOrderings() const; Q_INVOKABLE void addGeneralOrdering(QGeneralOrdering *generalOrdering); Q_INVOKABLE void removeGeneralOrdering(QGeneralOrdering *generalOrdering); Q_INVOKABLE QInteraction *enclosingInteraction() const; Q_INVOKABLE void setEnclosingInteraction(QInteraction *enclosingInteraction); - Q_INVOKABLE const QSet<QLifeline *> *covered() const; + Q_INVOKABLE const QSet<QLifeline *> &covered() const; Q_INVOKABLE void addCovered(QLifeline *covered); Q_INVOKABLE void removeCovered(QLifeline *covered); Q_INVOKABLE QInteractionOperand *enclosingOperand() const; Q_INVOKABLE void setEnclosingOperand(QInteractionOperand *enclosingOperand); // Association ends from QInteraction - Q_INVOKABLE const QSet<QAction *> *actions() const; + Q_INVOKABLE const QSet<QAction *> &actions() const; Q_INVOKABLE void addAction(QAction *action); Q_INVOKABLE void removeAction(QAction *action); - Q_INVOKABLE const QSet<QMessage *> *messages() const; + Q_INVOKABLE const QSet<QMessage *> &messages() const; Q_INVOKABLE void addMessage(QMessage *message); Q_INVOKABLE void removeMessage(QMessage *message); - Q_INVOKABLE const QSet<QGate *> *formalGates() const; + Q_INVOKABLE const QSet<QGate *> &formalGates() const; Q_INVOKABLE void addFormalGate(QGate *formalGate); Q_INVOKABLE void removeFormalGate(QGate *formalGate); - Q_INVOKABLE const QList<QInteractionFragment *> *fragments() const; + Q_INVOKABLE const QList<QInteractionFragment *> &fragments() const; Q_INVOKABLE void addFragment(QInteractionFragment *fragment); Q_INVOKABLE void removeFragment(QInteractionFragment *fragment); - Q_INVOKABLE const QSet<QLifeline *> *lifelines() const; + Q_INVOKABLE const QSet<QLifeline *> &lifelines() const; Q_INVOKABLE void addLifeline(QLifeline *lifeline); Q_INVOKABLE void removeLifeline(QLifeline *lifeline); - virtual void registerMetaTypes() const; protected: explicit QInteraction(QInteractionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -171,10 +170,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInteraction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *) - QT_END_HEADER #endif // QTUML_QINTERACTION_H diff --git a/src/uml/qinteraction_p.h b/src/uml/qinteraction_p.h index a2c29d92..56fa651d 100644 --- a/src/uml/qinteraction_p.h +++ b/src/uml/qinteraction_p.h @@ -74,11 +74,11 @@ public: explicit QInteractionPrivate(); virtual ~QInteractionPrivate(); - QSet<QAction *> *actions; - QSet<QMessage *> *messages; - QSet<QGate *> *formalGates; - QList<QInteractionFragment *> *fragments; - QSet<QLifeline *> *lifelines; + QSet<QAction *> actions; + QSet<QMessage *> messages; + QSet<QGate *> formalGates; + QList<QInteractionFragment *> fragments; + QSet<QLifeline *> lifelines; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionconstraint.cpp b/src/uml/qinteractionconstraint.cpp index 124a741e..d9d82f5c 100644 --- a/src/uml/qinteractionconstraint.cpp +++ b/src/uml/qinteractionconstraint.cpp @@ -140,28 +140,6 @@ void QInteractionConstraint::setMinint(QValueSpecification *minint) } } -void QInteractionConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *"); - qRegisterMetaType<QInteractionConstraint *>("QInteractionConstraint *"); - qRegisterMetaType<const QSet<QInteractionConstraint *> *>("const QSet<QInteractionConstraint *> *"); - qRegisterMetaType<const QList<QInteractionConstraint *> *>("const QList<QInteractionConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QConstraint::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinteractionconstraint.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionconstraint.h b/src/uml/qinteractionconstraint.h index 88cd7f44..a27e4d2c 100644 --- a/src/uml/qinteractionconstraint.h +++ b/src/uml/qinteractionconstraint.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setMaxint(QValueSpecification *maxint); Q_INVOKABLE QValueSpecification *minint() const; Q_INVOKABLE void setMinint(QValueSpecification *minint); - virtual void registerMetaTypes() const; protected: explicit QInteractionConstraint(QInteractionConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *) - QT_END_HEADER #endif // QTUML_QINTERACTIONCONSTRAINT_H diff --git a/src/uml/qinteractionfragment.cpp b/src/uml/qinteractionfragment.cpp index c1e64f73..79e4cde3 100644 --- a/src/uml/qinteractionfragment.cpp +++ b/src/uml/qinteractionfragment.cpp @@ -50,17 +50,13 @@ QT_BEGIN_NAMESPACE_QTUML QInteractionFragmentPrivate::QInteractionFragmentPrivate() : - generalOrderings(new QSet<QGeneralOrdering *>), enclosingInteraction(0), - covered(new QSet<QLifeline *>), enclosingOperand(0) { } QInteractionFragmentPrivate::~QInteractionFragmentPrivate() { - delete generalOrderings; - delete covered; } /*! @@ -92,7 +88,7 @@ QInteractionFragment::~QInteractionFragment() /*! The general ordering relationships contained in this fragment. */ -const QSet<QGeneralOrdering *> *QInteractionFragment::generalOrderings() const +const QSet<QGeneralOrdering *> &QInteractionFragment::generalOrderings() const { // This is a read-write association end @@ -105,8 +101,8 @@ void QInteractionFragment::addGeneralOrdering(QGeneralOrdering *generalOrdering) // This is a read-write association end Q_D(QInteractionFragment); - if (!d->generalOrderings->contains(generalOrdering)) { - d->generalOrderings->insert(generalOrdering); + if (!d->generalOrderings.contains(generalOrdering)) { + d->generalOrderings.insert(generalOrdering); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalOrdering)); @@ -118,8 +114,8 @@ void QInteractionFragment::removeGeneralOrdering(QGeneralOrdering *generalOrderi // This is a read-write association end Q_D(QInteractionFragment); - if (d->generalOrderings->contains(generalOrdering)) { - d->generalOrderings->remove(generalOrdering); + if (d->generalOrderings.contains(generalOrdering)) { + d->generalOrderings.remove(generalOrdering); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalOrdering)); @@ -161,7 +157,7 @@ void QInteractionFragment::setEnclosingInteraction(QInteraction *enclosingIntera /*! References the Lifelines that the InteractionFragment involves. */ -const QSet<QLifeline *> *QInteractionFragment::covered() const +const QSet<QLifeline *> &QInteractionFragment::covered() const { // This is a read-write association end @@ -174,8 +170,8 @@ void QInteractionFragment::addCovered(QLifeline *covered) // This is a read-write association end Q_D(QInteractionFragment); - if (!d->covered->contains(covered)) { - d->covered->insert(covered); + if (!d->covered.contains(covered)) { + d->covered.insert(covered); // Adjust opposite property covered->addCoveredBy(this); @@ -187,8 +183,8 @@ void QInteractionFragment::removeCovered(QLifeline *covered) // This is a read-write association end Q_D(QInteractionFragment); - if (d->covered->contains(covered)) { - d->covered->remove(covered); + if (d->covered.contains(covered)) { + d->covered.remove(covered); // Adjust opposite property if (covered) @@ -228,49 +224,6 @@ void QInteractionFragment::setEnclosingOperand(QInteractionOperand *enclosingOpe } } -void QInteractionFragment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *"); - qRegisterMetaType<QInteractionFragment *>("QInteractionFragment *"); - qRegisterMetaType<const QSet<QInteractionFragment *> *>("const QSet<QInteractionFragment *> *"); - qRegisterMetaType<const QList<QInteractionFragment *> *>("const QList<QInteractionFragment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *"); - qRegisterMetaType<QGeneralOrdering *>("QGeneralOrdering *"); - qRegisterMetaType<const QSet<QGeneralOrdering *> *>("const QSet<QGeneralOrdering *> *"); - qRegisterMetaType<const QList<QGeneralOrdering *> *>("const QList<QGeneralOrdering *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *"); - qRegisterMetaType<QInteractionOperand *>("QInteractionOperand *"); - qRegisterMetaType<const QSet<QInteractionOperand *> *>("const QSet<QInteractionOperand *> *"); - qRegisterMetaType<const QList<QInteractionOperand *> *>("const QList<QInteractionOperand *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *>("QT_PREPEND_NAMESPACE_QTUML(QLifeline) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<QLifeline *>("QLifeline *"); - qRegisterMetaType<const QSet<QLifeline *> *>("const QSet<QLifeline *> *"); - qRegisterMetaType<const QList<QLifeline *> *>("const QList<QLifeline *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *>("QT_PREPEND_NAMESPACE_QTUML(QInteraction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<QInteraction *>("QInteraction *"); - qRegisterMetaType<const QSet<QInteraction *> *>("const QSet<QInteraction *> *"); - qRegisterMetaType<const QList<QInteraction *> *>("const QList<QInteraction *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinteractionfragment.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionfragment.h b/src/uml/qinteractionfragment.h index 1b3c4768..4748af3a 100644 --- a/src/uml/qinteractionfragment.h +++ b/src/uml/qinteractionfragment.h @@ -67,9 +67,9 @@ class Q_UML_EXPORT QInteractionFragment : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QGeneralOrdering *> * generalOrderings READ generalOrderings) + Q_PROPERTY(QSet<QGeneralOrdering *> generalOrderings READ generalOrderings) Q_PROPERTY(QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) - Q_PROPERTY(const QSet<QLifeline *> * covered READ covered) + Q_PROPERTY(QSet<QLifeline *> covered READ covered) Q_PROPERTY(QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) Q_DISABLE_COPY(QInteractionFragment) @@ -80,17 +80,16 @@ public: virtual ~QInteractionFragment(); // Association ends from QInteractionFragment - Q_INVOKABLE const QSet<QGeneralOrdering *> *generalOrderings() const; + Q_INVOKABLE const QSet<QGeneralOrdering *> &generalOrderings() const; Q_INVOKABLE void addGeneralOrdering(QGeneralOrdering *generalOrdering); Q_INVOKABLE void removeGeneralOrdering(QGeneralOrdering *generalOrdering); Q_INVOKABLE QInteraction *enclosingInteraction() const; Q_INVOKABLE void setEnclosingInteraction(QInteraction *enclosingInteraction); - Q_INVOKABLE const QSet<QLifeline *> *covered() const; + Q_INVOKABLE const QSet<QLifeline *> &covered() const; Q_INVOKABLE void addCovered(QLifeline *covered); Q_INVOKABLE void removeCovered(QLifeline *covered); Q_INVOKABLE QInteractionOperand *enclosingOperand() const; Q_INVOKABLE void setEnclosingOperand(QInteractionOperand *enclosingOperand); - virtual void registerMetaTypes() const; protected: explicit QInteractionFragment(QInteractionFragmentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *) - QT_END_HEADER #endif // QTUML_QINTERACTIONFRAGMENT_H diff --git a/src/uml/qinteractionfragment_p.h b/src/uml/qinteractionfragment_p.h index 86f07dbd..c9c2f29e 100644 --- a/src/uml/qinteractionfragment_p.h +++ b/src/uml/qinteractionfragment_p.h @@ -69,9 +69,9 @@ public: explicit QInteractionFragmentPrivate(); virtual ~QInteractionFragmentPrivate(); - QSet<QGeneralOrdering *> *generalOrderings; + QSet<QGeneralOrdering *> generalOrderings; QInteraction *enclosingInteraction; - QSet<QLifeline *> *covered; + QSet<QLifeline *> covered; QInteractionOperand *enclosingOperand; }; diff --git a/src/uml/qinteractionoperand.cpp b/src/uml/qinteractionoperand.cpp index 6dafd547..bf0daedb 100644 --- a/src/uml/qinteractionoperand.cpp +++ b/src/uml/qinteractionoperand.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML QInteractionOperandPrivate::QInteractionOperandPrivate() : - fragments(new QList<QInteractionFragment *>), guard(0) { } QInteractionOperandPrivate::~QInteractionOperandPrivate() { - delete fragments; } /*! @@ -90,7 +88,7 @@ QInteractionOperand::~QInteractionOperand() /*! The Elements owned by this element. */ -const QSet<QElement *> *QInteractionOperand::ownedElements() const +const QSet<QElement *> &QInteractionOperand::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -106,7 +104,7 @@ QElement *QInteractionOperand::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QInteractionOperand::ownedComments() const +const QSet<QComment *> &QInteractionOperand::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -187,7 +185,7 @@ QNamespace *QInteractionOperand::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QInteractionOperand::clientDependencies() const +const QSet<QDependency *> &QInteractionOperand::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -209,7 +207,7 @@ void QInteractionOperand::removeClientDependency(QDependency *clientDependency) /*! The general ordering relationships contained in this fragment. */ -const QSet<QGeneralOrdering *> *QInteractionOperand::generalOrderings() const +const QSet<QGeneralOrdering *> &QInteractionOperand::generalOrderings() const { return (qwrappedobject_cast<const QInteractionFragment *>(this))->generalOrderings(); } @@ -240,7 +238,7 @@ void QInteractionOperand::setEnclosingInteraction(QInteraction *enclosingInterac /*! References the Lifelines that the InteractionFragment involves. */ -const QSet<QLifeline *> *QInteractionOperand::covered() const +const QSet<QLifeline *> &QInteractionOperand::covered() const { return (qwrappedobject_cast<const QInteractionFragment *>(this))->covered(); } @@ -275,7 +273,7 @@ void QInteractionOperand::setEnclosingOperand(QInteractionOperand *enclosingOper /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QInteractionOperand::packageImports() const +const QSet<QPackageImport *> &QInteractionOperand::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -293,7 +291,7 @@ void QInteractionOperand::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QInteractionOperand::members() const +const QSet<QNamedElement *> &QInteractionOperand::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -301,7 +299,7 @@ const QSet<QNamedElement *> *QInteractionOperand::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QInteractionOperand::importedMembers() const +const QSet<QPackageableElement *> &QInteractionOperand::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -309,7 +307,7 @@ const QSet<QPackageableElement *> *QInteractionOperand::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QInteractionOperand::elementImports() const +const QSet<QElementImport *> &QInteractionOperand::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -327,7 +325,7 @@ void QInteractionOperand::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QInteractionOperand::ownedRules() const +const QSet<QConstraint *> &QInteractionOperand::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -345,7 +343,7 @@ void QInteractionOperand::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QInteractionOperand::ownedMembers() const +const QSet<QNamedElement *> &QInteractionOperand::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -357,7 +355,7 @@ const QSet<QNamedElement *> *QInteractionOperand::ownedMembers() const /*! The fragments of the operand. */ -const QList<QInteractionFragment *> *QInteractionOperand::fragments() const +const QList<QInteractionFragment *> &QInteractionOperand::fragments() const { // This is a read-write association end @@ -370,8 +368,8 @@ void QInteractionOperand::addFragment(QInteractionFragment *fragment) // This is a read-write association end Q_D(QInteractionOperand); - if (!d->fragments->contains(fragment)) { - d->fragments->append(fragment); + if (!d->fragments.contains(fragment)) { + d->fragments.append(fragment); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); @@ -386,8 +384,8 @@ void QInteractionOperand::removeFragment(QInteractionFragment *fragment) // This is a read-write association end Q_D(QInteractionOperand); - if (d->fragments->contains(fragment)) { - d->fragments->removeAll(fragment); + if (d->fragments.contains(fragment)) { + d->fragments.removeAll(fragment); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(fragment)); @@ -426,28 +424,6 @@ void QInteractionOperand::setGuard(QInteractionConstraint *guard) } } -void QInteractionOperand::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *"); - qRegisterMetaType<QInteractionOperand *>("QInteractionOperand *"); - qRegisterMetaType<const QSet<QInteractionOperand *> *>("const QSet<QInteractionOperand *> *"); - qRegisterMetaType<const QList<QInteractionOperand *> *>("const QList<QInteractionOperand *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionConstraint) *> *"); - qRegisterMetaType<QInteractionConstraint *>("QInteractionConstraint *"); - qRegisterMetaType<const QSet<QInteractionConstraint *> *>("const QSet<QInteractionConstraint *> *"); - qRegisterMetaType<const QList<QInteractionConstraint *> *>("const QList<QInteractionConstraint *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinteractionoperand.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionoperand.h b/src/uml/qinteractionoperand.h index 6faf5e63..261c8dc9 100644 --- a/src/uml/qinteractionoperand.h +++ b/src/uml/qinteractionoperand.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QInteractionOperand : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QList<QInteractionFragment *> * fragments READ fragments) + Q_PROPERTY(QList<QInteractionFragment *> fragments READ fragments) Q_PROPERTY(QInteractionConstraint * guard READ guard WRITE setGuard) Q_DISABLE_COPY(QInteractionOperand) @@ -78,9 +78,9 @@ public: virtual ~QInteractionOperand(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -95,43 +95,42 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QInteractionFragment - Q_INVOKABLE const QSet<QGeneralOrdering *> *generalOrderings() const; + Q_INVOKABLE const QSet<QGeneralOrdering *> &generalOrderings() const; Q_INVOKABLE void addGeneralOrdering(QGeneralOrdering *generalOrdering); Q_INVOKABLE void removeGeneralOrdering(QGeneralOrdering *generalOrdering); Q_INVOKABLE QInteraction *enclosingInteraction() const; Q_INVOKABLE void setEnclosingInteraction(QInteraction *enclosingInteraction); - Q_INVOKABLE const QSet<QLifeline *> *covered() const; + Q_INVOKABLE const QSet<QLifeline *> &covered() const; Q_INVOKABLE void addCovered(QLifeline *covered); Q_INVOKABLE void removeCovered(QLifeline *covered); Q_INVOKABLE QInteractionOperand *enclosingOperand() const; Q_INVOKABLE void setEnclosingOperand(QInteractionOperand *enclosingOperand); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from QInteractionOperand - Q_INVOKABLE const QList<QInteractionFragment *> *fragments() const; + Q_INVOKABLE const QList<QInteractionFragment *> &fragments() const; Q_INVOKABLE void addFragment(QInteractionFragment *fragment); Q_INVOKABLE void removeFragment(QInteractionFragment *fragment); Q_INVOKABLE QInteractionConstraint *guard() const; Q_INVOKABLE void setGuard(QInteractionConstraint *guard); - virtual void registerMetaTypes() const; protected: explicit QInteractionOperand(QInteractionOperandPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -143,10 +142,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionOperand) *> *) - QT_END_HEADER #endif // QTUML_QINTERACTIONOPERAND_H diff --git a/src/uml/qinteractionoperand_p.h b/src/uml/qinteractionoperand_p.h index d2ba0328..cc67edce 100644 --- a/src/uml/qinteractionoperand_p.h +++ b/src/uml/qinteractionoperand_p.h @@ -70,7 +70,7 @@ public: explicit QInteractionOperandPrivate(); virtual ~QInteractionOperandPrivate(); - QList<QInteractionFragment *> *fragments; + QList<QInteractionFragment *> fragments; QInteractionConstraint *guard; }; diff --git a/src/uml/qinteractionuse.cpp b/src/uml/qinteractionuse.cpp index 295c898f..3950f141 100644 --- a/src/uml/qinteractionuse.cpp +++ b/src/uml/qinteractionuse.cpp @@ -50,18 +50,14 @@ QT_BEGIN_NAMESPACE_QTUML QInteractionUsePrivate::QInteractionUsePrivate() : - actualGates(new QSet<QGate *>), returnValue(0), refersTo(0), - arguments(new QList<QValueSpecification *>), returnValueRecipient(0) { } QInteractionUsePrivate::~QInteractionUsePrivate() { - delete actualGates; - delete arguments; } /*! @@ -93,7 +89,7 @@ QInteractionUse::~QInteractionUse() /*! The actual gates of the InteractionUse */ -const QSet<QGate *> *QInteractionUse::actualGates() const +const QSet<QGate *> &QInteractionUse::actualGates() const { // This is a read-write association end @@ -106,8 +102,8 @@ void QInteractionUse::addActualGate(QGate *actualGate) // This is a read-write association end Q_D(QInteractionUse); - if (!d->actualGates->contains(actualGate)) { - d->actualGates->insert(actualGate); + if (!d->actualGates.contains(actualGate)) { + d->actualGates.insert(actualGate); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(actualGate)); @@ -119,8 +115,8 @@ void QInteractionUse::removeActualGate(QGate *actualGate) // This is a read-write association end Q_D(QInteractionUse); - if (d->actualGates->contains(actualGate)) { - d->actualGates->remove(actualGate); + if (d->actualGates.contains(actualGate)) { + d->actualGates.remove(actualGate); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(actualGate)); @@ -180,7 +176,7 @@ void QInteractionUse::setRefersTo(QInteraction *refersTo) /*! The actual arguments of the Interaction */ -const QList<QValueSpecification *> *QInteractionUse::arguments() const +const QList<QValueSpecification *> &QInteractionUse::arguments() const { // This is a read-write association end @@ -193,8 +189,8 @@ void QInteractionUse::addArgument(QValueSpecification *argument) // This is a read-write association end Q_D(QInteractionUse); - if (!d->arguments->contains(argument)) { - d->arguments->append(argument); + if (!d->arguments.contains(argument)) { + d->arguments.append(argument); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(argument)); @@ -206,8 +202,8 @@ void QInteractionUse::removeArgument(QValueSpecification *argument) // This is a read-write association end Q_D(QInteractionUse); - if (d->arguments->contains(argument)) { - d->arguments->removeAll(argument); + if (d->arguments.contains(argument)) { + d->arguments.removeAll(argument); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(argument)); @@ -235,49 +231,6 @@ void QInteractionUse::setReturnValueRecipient(QProperty *returnValueRecipient) } } -void QInteractionUse::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *> *"); - qRegisterMetaType<QInteractionUse *>("QInteractionUse *"); - qRegisterMetaType<const QSet<QInteractionUse *> *>("const QSet<QInteractionUse *> *"); - qRegisterMetaType<const QList<QInteractionUse *> *>("const QList<QInteractionUse *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *>("QT_PREPEND_NAMESPACE_QTUML(QInteraction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<QInteraction *>("QInteraction *"); - qRegisterMetaType<const QSet<QInteraction *> *>("const QSet<QInteraction *> *"); - qRegisterMetaType<const QList<QInteraction *> *>("const QList<QInteraction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGate) *>("QT_PREPEND_NAMESPACE_QTUML(QGate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGate) *> *"); - qRegisterMetaType<QGate *>("QGate *"); - qRegisterMetaType<const QSet<QGate *> *>("const QSet<QGate *> *"); - qRegisterMetaType<const QList<QGate *> *>("const QList<QGate *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QInteractionFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinteractionuse.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinteractionuse.h b/src/uml/qinteractionuse.h index cecd4a1f..0128442e 100644 --- a/src/uml/qinteractionuse.h +++ b/src/uml/qinteractionuse.h @@ -68,10 +68,10 @@ class Q_UML_EXPORT QInteractionUse : public QInteractionFragment { Q_OBJECT - Q_PROPERTY(const QSet<QGate *> * actualGates READ actualGates) + 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(const QList<QValueSpecification *> * arguments READ arguments) + Q_PROPERTY(QList<QValueSpecification *> arguments READ arguments) Q_PROPERTY(QProperty * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient) Q_DISABLE_COPY(QInteractionUse) @@ -82,19 +82,18 @@ public: virtual ~QInteractionUse(); // Association ends from QInteractionUse - Q_INVOKABLE const QSet<QGate *> *actualGates() const; + Q_INVOKABLE const QSet<QGate *> &actualGates() const; Q_INVOKABLE void addActualGate(QGate *actualGate); Q_INVOKABLE void removeActualGate(QGate *actualGate); Q_INVOKABLE QValueSpecification *returnValue() const; Q_INVOKABLE void setReturnValue(QValueSpecification *returnValue); Q_INVOKABLE QInteraction *refersTo() const; Q_INVOKABLE void setRefersTo(QInteraction *refersTo); - Q_INVOKABLE const QList<QValueSpecification *> *arguments() const; + Q_INVOKABLE const QList<QValueSpecification *> &arguments() const; Q_INVOKABLE void addArgument(QValueSpecification *argument); Q_INVOKABLE void removeArgument(QValueSpecification *argument); Q_INVOKABLE QProperty *returnValueRecipient() const; Q_INVOKABLE void setReturnValueRecipient(QProperty *returnValueRecipient); - virtual void registerMetaTypes() const; protected: explicit QInteractionUse(QInteractionUsePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -102,10 +101,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionUse) *> *) - QT_END_HEADER #endif // QTUML_QINTERACTIONUSE_H diff --git a/src/uml/qinteractionuse_p.h b/src/uml/qinteractionuse_p.h index 62e206b1..4050ea23 100644 --- a/src/uml/qinteractionuse_p.h +++ b/src/uml/qinteractionuse_p.h @@ -71,10 +71,10 @@ public: explicit QInteractionUsePrivate(); virtual ~QInteractionUsePrivate(); - QSet<QGate *> *actualGates; + QSet<QGate *> actualGates; QValueSpecification *returnValue; QInteraction *refersTo; - QList<QValueSpecification *> *arguments; + QList<QValueSpecification *> arguments; QProperty *returnValueRecipient; }; diff --git a/src/uml/qinterface.cpp b/src/uml/qinterface.cpp index 23c5796a..7b0a7ad4 100644 --- a/src/uml/qinterface.cpp +++ b/src/uml/qinterface.cpp @@ -50,22 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QInterfacePrivate::QInterfacePrivate() : - protocol(0), - redefinedInterfaces(new QSet<QInterface *>), - ownedReceptions(new QSet<QReception *>), - ownedOperations(new QList<QOperation *>), - nestedClassifiers(new QList<QClassifier *>), - ownedAttributes(new QList<QProperty *>) + protocol(0) { } QInterfacePrivate::~QInterfacePrivate() { - delete redefinedInterfaces; - delete ownedReceptions; - delete ownedOperations; - delete nestedClassifiers; - delete ownedAttributes; } /*! @@ -126,7 +116,7 @@ void QInterface::setProtocol(QProtocolStateMachine *protocol) /*! References all the Interfaces redefined by this Interface. */ -const QSet<QInterface *> *QInterface::redefinedInterfaces() const +const QSet<QInterface *> &QInterface::redefinedInterfaces() const { // This is a read-write association end @@ -139,8 +129,8 @@ void QInterface::addRedefinedInterface(QInterface *redefinedInterface) // This is a read-write association end Q_D(QInterface); - if (!d->redefinedInterfaces->contains(redefinedInterface)) { - d->redefinedInterfaces->insert(redefinedInterface); + if (!d->redefinedInterfaces.contains(redefinedInterface)) { + d->redefinedInterfaces.insert(redefinedInterface); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifier *>(this))->addRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedInterface)); @@ -152,8 +142,8 @@ void QInterface::removeRedefinedInterface(QInterface *redefinedInterface) // This is a read-write association end Q_D(QInterface); - if (d->redefinedInterfaces->contains(redefinedInterface)) { - d->redefinedInterfaces->remove(redefinedInterface); + if (d->redefinedInterfaces.contains(redefinedInterface)) { + d->redefinedInterfaces.remove(redefinedInterface); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifier *>(this))->removeRedefinedClassifier(qwrappedobject_cast<QClassifier *>(redefinedInterface)); @@ -163,7 +153,7 @@ void QInterface::removeRedefinedInterface(QInterface *redefinedInterface) /*! Receptions that objects providing this interface are willing to accept. */ -const QSet<QReception *> *QInterface::ownedReceptions() const +const QSet<QReception *> &QInterface::ownedReceptions() const { // This is a read-write association end @@ -176,8 +166,8 @@ void QInterface::addOwnedReception(QReception *ownedReception) // This is a read-write association end Q_D(QInterface); - if (!d->ownedReceptions->contains(ownedReception)) { - d->ownedReceptions->insert(ownedReception); + if (!d->ownedReceptions.contains(ownedReception)) { + d->ownedReceptions.insert(ownedReception); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedReception)); @@ -190,8 +180,8 @@ void QInterface::removeOwnedReception(QReception *ownedReception) // This is a read-write association end Q_D(QInterface); - if (d->ownedReceptions->contains(ownedReception)) { - d->ownedReceptions->remove(ownedReception); + if (d->ownedReceptions.contains(ownedReception)) { + d->ownedReceptions.remove(ownedReception); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedReception)); @@ -202,7 +192,7 @@ void QInterface::removeOwnedReception(QReception *ownedReception) /*! The operations owned by the class. */ -const QList<QOperation *> *QInterface::ownedOperations() const +const QList<QOperation *> &QInterface::ownedOperations() const { // This is a read-write association end @@ -215,8 +205,8 @@ void QInterface::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QInterface); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -232,8 +222,8 @@ void QInterface::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QInterface); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -247,7 +237,7 @@ void QInterface::removeOwnedOperation(QOperation *ownedOperation) /*! References all the Classifiers that are defined (nested) within the Class. */ -const QList<QClassifier *> *QInterface::nestedClassifiers() const +const QList<QClassifier *> &QInterface::nestedClassifiers() const { // This is a read-write association end @@ -260,8 +250,8 @@ void QInterface::addNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QInterface); - if (!d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->append(nestedClassifier); + if (!d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.append(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -273,8 +263,8 @@ void QInterface::removeNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QInterface); - if (d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->removeAll(nestedClassifier); + if (d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.removeAll(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -284,7 +274,7 @@ void QInterface::removeNestedClassifier(QClassifier *nestedClassifier) /*! The attributes (i.e. the properties) owned by the class. */ -const QList<QProperty *> *QInterface::ownedAttributes() const +const QList<QProperty *> &QInterface::ownedAttributes() const { // This is a read-write association end @@ -297,8 +287,8 @@ void QInterface::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QInterface); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -314,8 +304,8 @@ void QInterface::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QInterface); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -326,49 +316,6 @@ void QInterface::removeOwnedAttribute(QProperty *ownedAttribute) } } -void QInterface::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterface) *>("QT_PREPEND_NAMESPACE_QTUML(QInterface) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<QInterface *>("QInterface *"); - qRegisterMetaType<const QSet<QInterface *> *>("const QSet<QInterface *> *"); - qRegisterMetaType<const QList<QInterface *> *>("const QList<QInterface *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *"); - qRegisterMetaType<const QSet<QProtocolStateMachine *> *>("const QSet<QProtocolStateMachine *> *"); - qRegisterMetaType<const QList<QProtocolStateMachine *> *>("const QList<QProtocolStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReception) *>("QT_PREPEND_NAMESPACE_QTUML(QReception) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *"); - qRegisterMetaType<QReception *>("QReception *"); - qRegisterMetaType<const QSet<QReception *> *>("const QSet<QReception *> *"); - qRegisterMetaType<const QList<QReception *> *>("const QList<QReception *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QInterface::addRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface) diff --git a/src/uml/qinterface.h b/src/uml/qinterface.h index 45f024a7..c9ee4175 100644 --- a/src/uml/qinterface.h +++ b/src/uml/qinterface.h @@ -72,11 +72,11 @@ class Q_UML_EXPORT QInterface : public QClassifier Q_OBJECT Q_PROPERTY(QProtocolStateMachine * protocol READ protocol WRITE setProtocol) - Q_PROPERTY(const QSet<QInterface *> * redefinedInterfaces READ redefinedInterfaces) - Q_PROPERTY(const QSet<QReception *> * ownedReceptions READ ownedReceptions) - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QClassifier *> * nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) + 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_DISABLE_COPY(QInterface) Q_DECLARE_PRIVATE(QInterface) @@ -88,26 +88,25 @@ public: // Association ends from QInterface Q_INVOKABLE QProtocolStateMachine *protocol() const; Q_INVOKABLE void setProtocol(QProtocolStateMachine *protocol); - Q_INVOKABLE const QSet<QInterface *> *redefinedInterfaces() const; + Q_INVOKABLE const QSet<QInterface *> &redefinedInterfaces() const; Q_INVOKABLE void addRedefinedInterface(QInterface *redefinedInterface); Q_INVOKABLE void removeRedefinedInterface(QInterface *redefinedInterface); - Q_INVOKABLE const QSet<QReception *> *ownedReceptions() const; + Q_INVOKABLE const QSet<QReception *> &ownedReceptions() const; Q_INVOKABLE void addOwnedReception(QReception *ownedReception); Q_INVOKABLE void removeOwnedReception(QReception *ownedReception); - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QClassifier *> *nestedClassifiers() const; + Q_INVOKABLE const QList<QClassifier *> &nestedClassifiers() const; Q_INVOKABLE void addNestedClassifier(QClassifier *nestedClassifier); Q_INVOKABLE void removeNestedClassifier(QClassifier *nestedClassifier); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); // Overriden methods for subsetted properties Q_INVOKABLE void addRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface); Q_INVOKABLE void removeRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface); - virtual void registerMetaTypes() const; protected: explicit QInterface(QInterfacePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -115,10 +114,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInterface) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *) - QT_END_HEADER #endif // QTUML_QINTERFACE_H diff --git a/src/uml/qinterface_p.h b/src/uml/qinterface_p.h index e64bb3e1..c0c80a4b 100644 --- a/src/uml/qinterface_p.h +++ b/src/uml/qinterface_p.h @@ -72,11 +72,11 @@ public: virtual ~QInterfacePrivate(); QProtocolStateMachine *protocol; - QSet<QInterface *> *redefinedInterfaces; - QSet<QReception *> *ownedReceptions; - QList<QOperation *> *ownedOperations; - QList<QClassifier *> *nestedClassifiers; - QList<QProperty *> *ownedAttributes; + QSet<QInterface *> redefinedInterfaces; + QSet<QReception *> ownedReceptions; + QList<QOperation *> ownedOperations; + QList<QClassifier *> nestedClassifiers; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterfacerealization.cpp b/src/uml/qinterfacerealization.cpp index 489f1b66..315a3a85 100644 --- a/src/uml/qinterfacerealization.cpp +++ b/src/uml/qinterfacerealization.cpp @@ -150,35 +150,6 @@ void QInterfaceRealization::setContract(QInterface *contract) } } -void QInterfaceRealization::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *>("QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *"); - qRegisterMetaType<QInterfaceRealization *>("QInterfaceRealization *"); - qRegisterMetaType<const QSet<QInterfaceRealization *> *>("const QSet<QInterfaceRealization *> *"); - qRegisterMetaType<const QList<QInterfaceRealization *> *>("const QList<QInterfaceRealization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterface) *>("QT_PREPEND_NAMESPACE_QTUML(QInterface) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<QInterface *>("QInterface *"); - qRegisterMetaType<const QSet<QInterface *> *>("const QSet<QInterface *> *"); - qRegisterMetaType<const QList<QInterface *> *>("const QList<QInterface *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavioredClassifier) *> *"); - qRegisterMetaType<QBehavioredClassifier *>("QBehavioredClassifier *"); - qRegisterMetaType<const QSet<QBehavioredClassifier *> *>("const QSet<QBehavioredClassifier *> *"); - qRegisterMetaType<const QList<QBehavioredClassifier *> *>("const QList<QBehavioredClassifier *> *"); - - QRealization::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QInterfaceRealization::addClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier) diff --git a/src/uml/qinterfacerealization.h b/src/uml/qinterfacerealization.h index 7d95442e..6fcea10a 100644 --- a/src/uml/qinterfacerealization.h +++ b/src/uml/qinterfacerealization.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void removeClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier); Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QInterface> contract); Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QInterface> contract); - virtual void registerMetaTypes() const; protected: explicit QInterfaceRealization(QInterfaceRealizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInterfaceRealization) *> *) - QT_END_HEADER #endif // QTUML_QINTERFACEREALIZATION_H diff --git a/src/uml/qinterruptibleactivityregion.cpp b/src/uml/qinterruptibleactivityregion.cpp index 3538de9e..597f18e9 100644 --- a/src/uml/qinterruptibleactivityregion.cpp +++ b/src/uml/qinterruptibleactivityregion.cpp @@ -47,16 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML -QInterruptibleActivityRegionPrivate::QInterruptibleActivityRegionPrivate() : - interruptingEdges(new QSet<QActivityEdge *>), - nodes(new QSet<QActivityNode *>) +QInterruptibleActivityRegionPrivate::QInterruptibleActivityRegionPrivate() { } QInterruptibleActivityRegionPrivate::~QInterruptibleActivityRegionPrivate() { - delete interruptingEdges; - delete nodes; } /*! @@ -88,7 +84,7 @@ QInterruptibleActivityRegion::~QInterruptibleActivityRegion() /*! The edges leaving the region that will abort other tokens flowing in the region. */ -const QSet<QActivityEdge *> *QInterruptibleActivityRegion::interruptingEdges() const +const QSet<QActivityEdge *> &QInterruptibleActivityRegion::interruptingEdges() const { // This is a read-write association end @@ -101,8 +97,8 @@ void QInterruptibleActivityRegion::addInterruptingEdge(QActivityEdge *interrupti // This is a read-write association end Q_D(QInterruptibleActivityRegion); - if (!d->interruptingEdges->contains(interruptingEdge)) { - d->interruptingEdges->insert(interruptingEdge); + if (!d->interruptingEdges.contains(interruptingEdge)) { + d->interruptingEdges.insert(interruptingEdge); // Adjust opposite property interruptingEdge->setInterrupts(this); @@ -114,8 +110,8 @@ void QInterruptibleActivityRegion::removeInterruptingEdge(QActivityEdge *interru // This is a read-write association end Q_D(QInterruptibleActivityRegion); - if (d->interruptingEdges->contains(interruptingEdge)) { - d->interruptingEdges->remove(interruptingEdge); + if (d->interruptingEdges.contains(interruptingEdge)) { + d->interruptingEdges.remove(interruptingEdge); // Adjust opposite property interruptingEdge->setInterrupts(0); @@ -125,7 +121,7 @@ void QInterruptibleActivityRegion::removeInterruptingEdge(QActivityEdge *interru /*! Nodes immediately contained in the group. */ -const QSet<QActivityNode *> *QInterruptibleActivityRegion::nodes() const +const QSet<QActivityNode *> &QInterruptibleActivityRegion::nodes() const { // This is a read-write association end @@ -138,8 +134,8 @@ void QInterruptibleActivityRegion::addNode(QActivityNode *node) // This is a read-write association end Q_D(QInterruptibleActivityRegion); - if (!d->nodes->contains(node)) { - d->nodes->insert(node); + if (!d->nodes.contains(node)) { + d->nodes.insert(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qwrappedobject_cast<QActivityNode *>(node)); @@ -154,8 +150,8 @@ void QInterruptibleActivityRegion::removeNode(QActivityNode *node) // This is a read-write association end Q_D(QInterruptibleActivityRegion); - if (d->nodes->contains(node)) { - d->nodes->remove(node); + if (d->nodes.contains(node)) { + d->nodes.remove(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qwrappedobject_cast<QActivityNode *>(node)); @@ -166,35 +162,6 @@ void QInterruptibleActivityRegion::removeNode(QActivityNode *node) } } -void QInterruptibleActivityRegion::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *"); - qRegisterMetaType<QInterruptibleActivityRegion *>("QInterruptibleActivityRegion *"); - qRegisterMetaType<const QSet<QInterruptibleActivityRegion *> *>("const QSet<QInterruptibleActivityRegion *> *"); - qRegisterMetaType<const QList<QInterruptibleActivityRegion *> *>("const QList<QInterruptibleActivityRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - QActivityGroup::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinterruptibleactivityregion.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterruptibleactivityregion.h b/src/uml/qinterruptibleactivityregion.h index 37b82eaf..43dc6e82 100644 --- a/src/uml/qinterruptibleactivityregion.h +++ b/src/uml/qinterruptibleactivityregion.h @@ -65,8 +65,8 @@ class Q_UML_EXPORT QInterruptibleActivityRegion : public QActivityGroup { Q_OBJECT - Q_PROPERTY(const QSet<QActivityEdge *> * interruptingEdges READ interruptingEdges) - Q_PROPERTY(const QSet<QActivityNode *> * nodes READ nodes) + Q_PROPERTY(QSet<QActivityEdge *> interruptingEdges READ interruptingEdges) + Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) Q_DISABLE_COPY(QInterruptibleActivityRegion) Q_DECLARE_PRIVATE(QInterruptibleActivityRegion) @@ -76,13 +76,12 @@ public: virtual ~QInterruptibleActivityRegion(); // Association ends from QInterruptibleActivityRegion - Q_INVOKABLE const QSet<QActivityEdge *> *interruptingEdges() const; + Q_INVOKABLE const QSet<QActivityEdge *> &interruptingEdges() const; Q_INVOKABLE void addInterruptingEdge(QActivityEdge *interruptingEdge); Q_INVOKABLE void removeInterruptingEdge(QActivityEdge *interruptingEdge); - Q_INVOKABLE const QSet<QActivityNode *> *nodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &nodes() const; Q_INVOKABLE void addNode(QActivityNode *node); Q_INVOKABLE void removeNode(QActivityNode *node); - virtual void registerMetaTypes() const; protected: explicit QInterruptibleActivityRegion(QInterruptibleActivityRegionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInterruptibleActivityRegion) *> *) - QT_END_HEADER #endif // QTUML_QINTERRUPTIBLEACTIVITYREGION_H diff --git a/src/uml/qinterruptibleactivityregion_p.h b/src/uml/qinterruptibleactivityregion_p.h index 921b4544..cd494a57 100644 --- a/src/uml/qinterruptibleactivityregion_p.h +++ b/src/uml/qinterruptibleactivityregion_p.h @@ -68,8 +68,8 @@ public: explicit QInterruptibleActivityRegionPrivate(); virtual ~QInterruptibleActivityRegionPrivate(); - QSet<QActivityEdge *> *interruptingEdges; - QSet<QActivityNode *> *nodes; + QSet<QActivityEdge *> interruptingEdges; + QSet<QActivityNode *> nodes; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterval.cpp b/src/uml/qinterval.cpp index 5db49144..da2e08ca 100644 --- a/src/uml/qinterval.cpp +++ b/src/uml/qinterval.cpp @@ -122,21 +122,6 @@ void QInterval::setMax(QValueSpecification *max) } } -void QInterval::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterval) *>("QT_PREPEND_NAMESPACE_QTUML(QInterval) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *"); - qRegisterMetaType<QInterval *>("QInterval *"); - qRegisterMetaType<const QSet<QInterval *> *>("const QSet<QInterval *> *"); - qRegisterMetaType<const QList<QInterval *> *>("const QList<QInterval *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinterval.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinterval.h b/src/uml/qinterval.h index 96651826..07d8eb9f 100644 --- a/src/uml/qinterval.h +++ b/src/uml/qinterval.h @@ -73,7 +73,6 @@ public: Q_INVOKABLE void setMin(QValueSpecification *min); Q_INVOKABLE QValueSpecification *max() const; Q_INVOKABLE void setMax(QValueSpecification *max); - virtual void registerMetaTypes() const; protected: explicit QInterval(QIntervalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInterval) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *) - QT_END_HEADER #endif // QTUML_QINTERVAL_H diff --git a/src/uml/qintervalconstraint.cpp b/src/uml/qintervalconstraint.cpp index 2ddf21cb..a3789521 100644 --- a/src/uml/qintervalconstraint.cpp +++ b/src/uml/qintervalconstraint.cpp @@ -103,28 +103,6 @@ void QIntervalConstraint::setSpecification(QInterval *specification) } } -void QIntervalConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *> *"); - qRegisterMetaType<QIntervalConstraint *>("QIntervalConstraint *"); - qRegisterMetaType<const QSet<QIntervalConstraint *> *>("const QSet<QIntervalConstraint *> *"); - qRegisterMetaType<const QList<QIntervalConstraint *> *>("const QList<QIntervalConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterval) *>("QT_PREPEND_NAMESPACE_QTUML(QInterval) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterval) *> *"); - qRegisterMetaType<QInterval *>("QInterval *"); - qRegisterMetaType<const QSet<QInterval *> *>("const QSet<QInterval *> *"); - qRegisterMetaType<const QList<QInterval *> *>("const QList<QInterval *> *"); - - QConstraint::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qintervalconstraint.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qintervalconstraint.h b/src/uml/qintervalconstraint.h index 66611c7d..078964b7 100644 --- a/src/uml/qintervalconstraint.h +++ b/src/uml/qintervalconstraint.h @@ -73,7 +73,6 @@ public: // Association ends from QIntervalConstraint Q_INVOKABLE QInterval *specification() const; Q_INVOKABLE void setSpecification(QInterval *specification); - virtual void registerMetaTypes() const; protected: explicit QIntervalConstraint(QIntervalConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QIntervalConstraint) *> *) - QT_END_HEADER #endif // QTUML_QINTERVALCONSTRAINT_H diff --git a/src/uml/qinvocationaction.cpp b/src/uml/qinvocationaction.cpp index f5652a1c..721492bd 100644 --- a/src/uml/qinvocationaction.cpp +++ b/src/uml/qinvocationaction.cpp @@ -48,14 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QInvocationActionPrivate::QInvocationActionPrivate() : - arguments(new QList<QInputPin *>), onPort(0) { } QInvocationActionPrivate::~QInvocationActionPrivate() { - delete arguments; } /*! @@ -87,7 +85,7 @@ QInvocationAction::~QInvocationAction() /*! Specification of the ordered set of argument values that appears during execution. */ -const QList<QInputPin *> *QInvocationAction::arguments() const +const QList<QInputPin *> &QInvocationAction::arguments() const { // This is a read-write association end @@ -100,8 +98,8 @@ void QInvocationAction::addArgument(QInputPin *argument) // This is a read-write association end Q_D(QInvocationAction); - if (!d->arguments->contains(argument)) { - d->arguments->append(argument); + if (!d->arguments.contains(argument)) { + d->arguments.append(argument); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(argument)); @@ -113,8 +111,8 @@ void QInvocationAction::removeArgument(QInputPin *argument) // This is a read-write association end Q_D(QInvocationAction); - if (d->arguments->contains(argument)) { - d->arguments->removeAll(argument); + if (d->arguments.contains(argument)) { + d->arguments.removeAll(argument); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(argument)); @@ -142,35 +140,6 @@ void QInvocationAction::setOnPort(QPort *onPort) } } -void QInvocationAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *>("QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *> *"); - qRegisterMetaType<QInvocationAction *>("QInvocationAction *"); - qRegisterMetaType<const QSet<QInvocationAction *> *>("const QSet<QInvocationAction *> *"); - qRegisterMetaType<const QList<QInvocationAction *> *>("const QList<QInvocationAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPort) *>("QT_PREPEND_NAMESPACE_QTUML(QPort) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<QPort *>("QPort *"); - qRegisterMetaType<const QSet<QPort *> *>("const QSet<QPort *> *"); - qRegisterMetaType<const QList<QPort *> *>("const QList<QPort *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinvocationaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qinvocationaction.h b/src/uml/qinvocationaction.h index 5567386d..1bd85087 100644 --- a/src/uml/qinvocationaction.h +++ b/src/uml/qinvocationaction.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QInvocationAction : public QAction { Q_OBJECT - Q_PROPERTY(const QList<QInputPin *> * arguments READ arguments) + Q_PROPERTY(QList<QInputPin *> arguments READ arguments) Q_PROPERTY(QPort * onPort READ onPort WRITE setOnPort) Q_DISABLE_COPY(QInvocationAction) @@ -76,12 +76,11 @@ public: virtual ~QInvocationAction(); // Association ends from QInvocationAction - Q_INVOKABLE const QList<QInputPin *> *arguments() const; + Q_INVOKABLE const QList<QInputPin *> &arguments() const; Q_INVOKABLE void addArgument(QInputPin *argument); Q_INVOKABLE void removeArgument(QInputPin *argument); Q_INVOKABLE QPort *onPort() const; Q_INVOKABLE void setOnPort(QPort *onPort); - virtual void registerMetaTypes() const; protected: explicit QInvocationAction(QInvocationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QInvocationAction) *> *) - QT_END_HEADER #endif // QTUML_QINVOCATIONACTION_H diff --git a/src/uml/qinvocationaction_p.h b/src/uml/qinvocationaction_p.h index 71548ddb..483c90f7 100644 --- a/src/uml/qinvocationaction_p.h +++ b/src/uml/qinvocationaction_p.h @@ -67,7 +67,7 @@ public: explicit QInvocationActionPrivate(); virtual ~QInvocationActionPrivate(); - QList<QInputPin *> *arguments; + QList<QInputPin *> arguments; QPort *onPort; }; diff --git a/src/uml/qjoinnode.cpp b/src/uml/qjoinnode.cpp index 8b1531e5..300b59c4 100644 --- a/src/uml/qjoinnode.cpp +++ b/src/uml/qjoinnode.cpp @@ -141,28 +141,6 @@ void QJoinNode::setJoinSpec(QValueSpecification *joinSpec) } } -void QJoinNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *>("QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *> *"); - qRegisterMetaType<QJoinNode *>("QJoinNode *"); - qRegisterMetaType<const QSet<QJoinNode *> *>("const QSet<QJoinNode *> *"); - qRegisterMetaType<const QList<QJoinNode *> *>("const QList<QJoinNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QControlNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qjoinnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qjoinnode.h b/src/uml/qjoinnode.h index cd71b826..8c43de47 100644 --- a/src/uml/qjoinnode.h +++ b/src/uml/qjoinnode.h @@ -79,7 +79,6 @@ public: // Association ends from QJoinNode Q_INVOKABLE QValueSpecification *joinSpec() const; Q_INVOKABLE void setJoinSpec(QValueSpecification *joinSpec); - virtual void registerMetaTypes() const; protected: explicit QJoinNode(QJoinNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QJoinNode) *> *) - QT_END_HEADER #endif // QTUML_QJOINNODE_H diff --git a/src/uml/qlifeline.cpp b/src/uml/qlifeline.cpp index 4ef8b9be..4c94f7c4 100644 --- a/src/uml/qlifeline.cpp +++ b/src/uml/qlifeline.cpp @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE_QTUML QLifelinePrivate::QLifelinePrivate() : represents(0), decomposedAs(0), - coveredBy(new QSet<QInteractionFragment *>), interaction(0), selector(0) { @@ -61,7 +60,6 @@ QLifelinePrivate::QLifelinePrivate() : QLifelinePrivate::~QLifelinePrivate() { - delete coveredBy; } /*! @@ -135,7 +133,7 @@ void QLifeline::setDecomposedAs(QPartDecomposition *decomposedAs) /*! References the InteractionFragments in which this Lifeline takes part. */ -const QSet<QInteractionFragment *> *QLifeline::coveredBy() const +const QSet<QInteractionFragment *> &QLifeline::coveredBy() const { // This is a read-write association end @@ -148,8 +146,8 @@ void QLifeline::addCoveredBy(QInteractionFragment *coveredBy) // This is a read-write association end Q_D(QLifeline); - if (!d->coveredBy->contains(coveredBy)) { - d->coveredBy->insert(coveredBy); + if (!d->coveredBy.contains(coveredBy)) { + d->coveredBy.insert(coveredBy); // Adjust opposite property coveredBy->addCovered(this); @@ -161,8 +159,8 @@ void QLifeline::removeCoveredBy(QInteractionFragment *coveredBy) // This is a read-write association end Q_D(QLifeline); - if (d->coveredBy->contains(coveredBy)) { - d->coveredBy->remove(coveredBy); + if (d->coveredBy.contains(coveredBy)) { + d->coveredBy.remove(coveredBy); // Adjust opposite property if (coveredBy) @@ -231,56 +229,6 @@ void QLifeline::setSelector(QValueSpecification *selector) } } -void QLifeline::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *>("QT_PREPEND_NAMESPACE_QTUML(QLifeline) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<QLifeline *>("QLifeline *"); - qRegisterMetaType<const QSet<QLifeline *> *>("const QSet<QLifeline *> *"); - qRegisterMetaType<const QList<QLifeline *> *>("const QList<QLifeline *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<QConnectableElement *>("QConnectableElement *"); - qRegisterMetaType<const QSet<QConnectableElement *> *>("const QSet<QConnectableElement *> *"); - qRegisterMetaType<const QList<QConnectableElement *> *>("const QList<QConnectableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *>("QT_PREPEND_NAMESPACE_QTUML(QInteraction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<QInteraction *>("QInteraction *"); - qRegisterMetaType<const QSet<QInteraction *> *>("const QSet<QInteraction *> *"); - qRegisterMetaType<const QList<QInteraction *> *>("const QList<QInteraction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *>("QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteractionFragment) *> *"); - qRegisterMetaType<QInteractionFragment *>("QInteractionFragment *"); - qRegisterMetaType<const QSet<QInteractionFragment *> *>("const QSet<QInteractionFragment *> *"); - qRegisterMetaType<const QList<QInteractionFragment *> *>("const QList<QInteractionFragment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *>("QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *"); - qRegisterMetaType<QPartDecomposition *>("QPartDecomposition *"); - qRegisterMetaType<const QSet<QPartDecomposition *> *>("const QSet<QPartDecomposition *> *"); - qRegisterMetaType<const QList<QPartDecomposition *> *>("const QList<QPartDecomposition *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlifeline.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlifeline.h b/src/uml/qlifeline.h index 44fc783f..39afa086 100644 --- a/src/uml/qlifeline.h +++ b/src/uml/qlifeline.h @@ -70,7 +70,7 @@ class Q_UML_EXPORT QLifeline : public QNamedElement Q_PROPERTY(QConnectableElement * represents READ represents WRITE setRepresents) Q_PROPERTY(QPartDecomposition * decomposedAs READ decomposedAs WRITE setDecomposedAs) - Q_PROPERTY(const QSet<QInteractionFragment *> * coveredBy READ coveredBy) + Q_PROPERTY(QSet<QInteractionFragment *> coveredBy READ coveredBy) Q_PROPERTY(QInteraction * interaction READ interaction WRITE setInteraction) Q_PROPERTY(QValueSpecification * selector READ selector WRITE setSelector) @@ -86,14 +86,13 @@ public: Q_INVOKABLE void setRepresents(QConnectableElement *represents); Q_INVOKABLE QPartDecomposition *decomposedAs() const; Q_INVOKABLE void setDecomposedAs(QPartDecomposition *decomposedAs); - Q_INVOKABLE const QSet<QInteractionFragment *> *coveredBy() const; + Q_INVOKABLE const QSet<QInteractionFragment *> &coveredBy() const; Q_INVOKABLE void addCoveredBy(QInteractionFragment *coveredBy); Q_INVOKABLE void removeCoveredBy(QInteractionFragment *coveredBy); Q_INVOKABLE QInteraction *interaction() const; Q_INVOKABLE void setInteraction(QInteraction *interaction); Q_INVOKABLE QValueSpecification *selector() const; Q_INVOKABLE void setSelector(QValueSpecification *selector); - virtual void registerMetaTypes() const; protected: explicit QLifeline(QLifelinePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -101,10 +100,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLifeline) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *) - QT_END_HEADER #endif // QTUML_QLIFELINE_H diff --git a/src/uml/qlifeline_p.h b/src/uml/qlifeline_p.h index 60357821..a6d2663b 100644 --- a/src/uml/qlifeline_p.h +++ b/src/uml/qlifeline_p.h @@ -73,7 +73,7 @@ public: QConnectableElement *represents; QPartDecomposition *decomposedAs; - QSet<QInteractionFragment *> *coveredBy; + QSet<QInteractionFragment *> coveredBy; QInteraction *interaction; QValueSpecification *selector; }; diff --git a/src/uml/qlinkaction.cpp b/src/uml/qlinkaction.cpp index 13b56d78..27c5b4d8 100644 --- a/src/uml/qlinkaction.cpp +++ b/src/uml/qlinkaction.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML -QLinkActionPrivate::QLinkActionPrivate() : - inputValues(new QSet<QInputPin *>), - endData(new QSet<QLinkEndData *>) +QLinkActionPrivate::QLinkActionPrivate() { } QLinkActionPrivate::~QLinkActionPrivate() { - delete inputValues; - delete endData; } /*! @@ -89,7 +85,7 @@ QLinkAction::~QLinkAction() /*! Pins taking end objects and qualifier values as input. */ -const QSet<QInputPin *> *QLinkAction::inputValues() const +const QSet<QInputPin *> &QLinkAction::inputValues() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QLinkAction::addInputValue(QInputPin *inputValue) // This is a read-write association end Q_D(QLinkAction); - if (!d->inputValues->contains(inputValue)) { - d->inputValues->insert(inputValue); + if (!d->inputValues.contains(inputValue)) { + d->inputValues.insert(inputValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(inputValue)); @@ -115,8 +111,8 @@ void QLinkAction::removeInputValue(QInputPin *inputValue) // This is a read-write association end Q_D(QLinkAction); - if (d->inputValues->contains(inputValue)) { - d->inputValues->remove(inputValue); + if (d->inputValues.contains(inputValue)) { + d->inputValues.remove(inputValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(inputValue)); @@ -126,7 +122,7 @@ void QLinkAction::removeInputValue(QInputPin *inputValue) /*! Data identifying one end of a link by the objects on its ends and qualifiers. */ -const QSet<QLinkEndData *> *QLinkAction::endData() const +const QSet<QLinkEndData *> &QLinkAction::endData() const { // This is a read-write association end @@ -139,8 +135,8 @@ void QLinkAction::addEndData(QLinkEndData *endData) // This is a read-write association end Q_D(QLinkAction); - if (!d->endData->contains(endData)) { - d->endData->insert(endData); + if (!d->endData.contains(endData)) { + d->endData.insert(endData); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(endData)); @@ -152,8 +148,8 @@ void QLinkAction::removeEndData(QLinkEndData *endData) // This is a read-write association end Q_D(QLinkAction); - if (d->endData->contains(endData)) { - d->endData->remove(endData); + if (d->endData.contains(endData)) { + d->endData.remove(endData); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(endData)); @@ -170,42 +166,6 @@ QAssociation *QLinkAction::association() const return 0; // change here to your derived return } -void QLinkAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *> *"); - qRegisterMetaType<QLinkAction *>("QLinkAction *"); - qRegisterMetaType<const QSet<QLinkAction *> *>("const QSet<QLinkAction *> *"); - qRegisterMetaType<const QList<QLinkAction *> *>("const QList<QLinkAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *"); - qRegisterMetaType<QLinkEndData *>("QLinkEndData *"); - qRegisterMetaType<const QSet<QLinkEndData *> *>("const QSet<QLinkEndData *> *"); - qRegisterMetaType<const QList<QLinkEndData *> *>("const QList<QLinkEndData *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *>("QT_PREPEND_NAMESPACE_QTUML(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlinkaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkaction.h b/src/uml/qlinkaction.h index f1b9d3db..1a5f19b3 100644 --- a/src/uml/qlinkaction.h +++ b/src/uml/qlinkaction.h @@ -66,8 +66,8 @@ class Q_UML_EXPORT QLinkAction : public QAction { Q_OBJECT - Q_PROPERTY(const QSet<QInputPin *> * inputValues READ inputValues) - Q_PROPERTY(const QSet<QLinkEndData *> * endData READ endData) + Q_PROPERTY(QSet<QInputPin *> inputValues READ inputValues) + Q_PROPERTY(QSet<QLinkEndData *> endData READ endData) Q_DISABLE_COPY(QLinkAction) Q_DECLARE_PRIVATE(QLinkAction) @@ -77,16 +77,15 @@ public: virtual ~QLinkAction(); // Association ends from QLinkAction - Q_INVOKABLE const QSet<QInputPin *> *inputValues() const; + Q_INVOKABLE const QSet<QInputPin *> &inputValues() const; Q_INVOKABLE void addInputValue(QInputPin *inputValue); Q_INVOKABLE void removeInputValue(QInputPin *inputValue); - Q_INVOKABLE const QSet<QLinkEndData *> *endData() const; + Q_INVOKABLE const QSet<QLinkEndData *> &endData() const; Q_INVOKABLE void addEndData(QLinkEndData *endData); Q_INVOKABLE void removeEndData(QLinkEndData *endData); // Operations Q_INVOKABLE QAssociation *association() const; - virtual void registerMetaTypes() const; protected: explicit QLinkAction(QLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkAction) *> *) - QT_END_HEADER #endif // QTUML_QLINKACTION_H diff --git a/src/uml/qlinkaction_p.h b/src/uml/qlinkaction_p.h index 327a884e..2cd99467 100644 --- a/src/uml/qlinkaction_p.h +++ b/src/uml/qlinkaction_p.h @@ -68,8 +68,8 @@ public: explicit QLinkActionPrivate(); virtual ~QLinkActionPrivate(); - QSet<QInputPin *> *inputValues; - QSet<QLinkEndData *> *endData; + QSet<QInputPin *> inputValues; + QSet<QLinkEndData *> endData; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkendcreationdata.cpp b/src/uml/qlinkendcreationdata.cpp index 296ccbae..0f3a70b7 100644 --- a/src/uml/qlinkendcreationdata.cpp +++ b/src/uml/qlinkendcreationdata.cpp @@ -133,28 +133,6 @@ void QLinkEndCreationData::setInsertAt(QInputPin *insertAt) } } -void QLinkEndCreationData::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *"); - qRegisterMetaType<QLinkEndCreationData *>("QLinkEndCreationData *"); - qRegisterMetaType<const QSet<QLinkEndCreationData *> *>("const QSet<QLinkEndCreationData *> *"); - qRegisterMetaType<const QList<QLinkEndCreationData *> *>("const QList<QLinkEndCreationData *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QLinkEndData::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlinkendcreationdata.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkendcreationdata.h b/src/uml/qlinkendcreationdata.h index 9f3bd495..1eee8788 100644 --- a/src/uml/qlinkendcreationdata.h +++ b/src/uml/qlinkendcreationdata.h @@ -79,7 +79,6 @@ public: // Association ends from QLinkEndCreationData Q_INVOKABLE QInputPin *insertAt() const; Q_INVOKABLE void setInsertAt(QInputPin *insertAt); - virtual void registerMetaTypes() const; protected: explicit QLinkEndCreationData(QLinkEndCreationDataPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndCreationData) *> *) - QT_END_HEADER #endif // QTUML_QLINKENDCREATIONDATA_H diff --git a/src/uml/qlinkenddata.cpp b/src/uml/qlinkenddata.cpp index c0b1a4f5..865a8e08 100644 --- a/src/uml/qlinkenddata.cpp +++ b/src/uml/qlinkenddata.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QLinkEndDataPrivate::QLinkEndDataPrivate() : value(0), - end(0), - qualifiers(new QSet<QQualifierValue *>) + end(0) { } QLinkEndDataPrivate::~QLinkEndDataPrivate() { - delete qualifiers; } /*! @@ -131,7 +129,7 @@ void QLinkEndData::setEnd(QProperty *end) /*! List of qualifier values */ -const QSet<QQualifierValue *> *QLinkEndData::qualifiers() const +const QSet<QQualifierValue *> &QLinkEndData::qualifiers() const { // This is a read-write association end @@ -144,8 +142,8 @@ void QLinkEndData::addQualifier(QQualifierValue *qualifier) // This is a read-write association end Q_D(QLinkEndData); - if (!d->qualifiers->contains(qualifier)) { - d->qualifiers->insert(qualifier); + if (!d->qualifiers.contains(qualifier)) { + d->qualifiers.insert(qualifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); @@ -157,50 +155,14 @@ void QLinkEndData::removeQualifier(QQualifierValue *qualifier) // This is a read-write association end Q_D(QLinkEndData); - if (d->qualifiers->contains(qualifier)) { - d->qualifiers->remove(qualifier); + if (d->qualifiers.contains(qualifier)) { + d->qualifiers.remove(qualifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); } } -void QLinkEndData::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *"); - qRegisterMetaType<QLinkEndData *>("QLinkEndData *"); - qRegisterMetaType<const QSet<QLinkEndData *> *>("const QSet<QLinkEndData *> *"); - qRegisterMetaType<const QList<QLinkEndData *> *>("const QList<QLinkEndData *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *>("QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *"); - qRegisterMetaType<QQualifierValue *>("QQualifierValue *"); - qRegisterMetaType<const QSet<QQualifierValue *> *>("const QSet<QQualifierValue *> *"); - qRegisterMetaType<const QList<QQualifierValue *> *>("const QList<QQualifierValue *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlinkenddata.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkenddata.h b/src/uml/qlinkenddata.h index d97ac5e9..72ec9ba2 100644 --- a/src/uml/qlinkenddata.h +++ b/src/uml/qlinkenddata.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QLinkEndData : public QElement Q_PROPERTY(QInputPin * value READ value WRITE setValue) Q_PROPERTY(QProperty * end READ end WRITE setEnd) - Q_PROPERTY(const QSet<QQualifierValue *> * qualifiers READ qualifiers) + Q_PROPERTY(QSet<QQualifierValue *> qualifiers READ qualifiers) Q_DISABLE_COPY(QLinkEndData) Q_DECLARE_PRIVATE(QLinkEndData) @@ -82,10 +82,9 @@ public: Q_INVOKABLE void setValue(QInputPin *value); Q_INVOKABLE QProperty *end() const; Q_INVOKABLE void setEnd(QProperty *end); - Q_INVOKABLE const QSet<QQualifierValue *> *qualifiers() const; + Q_INVOKABLE const QSet<QQualifierValue *> &qualifiers() const; Q_INVOKABLE void addQualifier(QQualifierValue *qualifier); Q_INVOKABLE void removeQualifier(QQualifierValue *qualifier); - virtual void registerMetaTypes() const; protected: explicit QLinkEndData(QLinkEndDataPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndData) *> *) - QT_END_HEADER #endif // QTUML_QLINKENDDATA_H diff --git a/src/uml/qlinkenddata_p.h b/src/uml/qlinkenddata_p.h index 1f37dbe2..c5c8842f 100644 --- a/src/uml/qlinkenddata_p.h +++ b/src/uml/qlinkenddata_p.h @@ -71,7 +71,7 @@ public: QInputPin *value; QProperty *end; - QSet<QQualifierValue *> *qualifiers; + QSet<QQualifierValue *> qualifiers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkenddestructiondata.cpp b/src/uml/qlinkenddestructiondata.cpp index f12b6340..f7f8baa4 100644 --- a/src/uml/qlinkenddestructiondata.cpp +++ b/src/uml/qlinkenddestructiondata.cpp @@ -133,28 +133,6 @@ void QLinkEndDestructionData::setDestroyAt(QInputPin *destroyAt) } } -void QLinkEndDestructionData::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *>("QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *"); - qRegisterMetaType<QLinkEndDestructionData *>("QLinkEndDestructionData *"); - qRegisterMetaType<const QSet<QLinkEndDestructionData *> *>("const QSet<QLinkEndDestructionData *> *"); - qRegisterMetaType<const QList<QLinkEndDestructionData *> *>("const QList<QLinkEndDestructionData *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QLinkEndData::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlinkenddestructiondata.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qlinkenddestructiondata.h b/src/uml/qlinkenddestructiondata.h index 3e20a07c..3647feba 100644 --- a/src/uml/qlinkenddestructiondata.h +++ b/src/uml/qlinkenddestructiondata.h @@ -79,7 +79,6 @@ public: // Association ends from QLinkEndDestructionData Q_INVOKABLE QInputPin *destroyAt() const; Q_INVOKABLE void setDestroyAt(QInputPin *destroyAt); - virtual void registerMetaTypes() const; protected: explicit QLinkEndDestructionData(QLinkEndDestructionDataPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLinkEndDestructionData) *> *) - QT_END_HEADER #endif // QTUML_QLINKENDDESTRUCTIONDATA_H diff --git a/src/uml/qliteralboolean.cpp b/src/uml/qliteralboolean.cpp index ed99a387..00686f63 100644 --- a/src/uml/qliteralboolean.cpp +++ b/src/uml/qliteralboolean.cpp @@ -125,21 +125,6 @@ bool QLiteralBoolean::isComputable() const return bool(); // change here to your derived return } -void QLiteralBoolean::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *> *"); - qRegisterMetaType<QLiteralBoolean *>("QLiteralBoolean *"); - qRegisterMetaType<const QSet<QLiteralBoolean *> *>("const QSet<QLiteralBoolean *> *"); - qRegisterMetaType<const QList<QLiteralBoolean *> *>("const QList<QLiteralBoolean *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralboolean.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralboolean.h b/src/uml/qliteralboolean.h index f651a39e..912f4e70 100644 --- a/src/uml/qliteralboolean.h +++ b/src/uml/qliteralboolean.h @@ -75,7 +75,6 @@ public: // Operations Q_INVOKABLE bool booleanValue() const; Q_INVOKABLE bool isComputable() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralBoolean) *> *) - QT_END_HEADER #endif // QTUML_QLITERALBOOLEAN_H diff --git a/src/uml/qliteralinteger.cpp b/src/uml/qliteralinteger.cpp index aba923f7..c53312e2 100644 --- a/src/uml/qliteralinteger.cpp +++ b/src/uml/qliteralinteger.cpp @@ -119,21 +119,6 @@ bool QLiteralInteger::isComputable() const return bool(); // change here to your derived return } -void QLiteralInteger::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *> *"); - qRegisterMetaType<QLiteralInteger *>("QLiteralInteger *"); - qRegisterMetaType<const QSet<QLiteralInteger *> *>("const QSet<QLiteralInteger *> *"); - qRegisterMetaType<const QList<QLiteralInteger *> *>("const QList<QLiteralInteger *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralinteger.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralinteger.h b/src/uml/qliteralinteger.h index 22f96fa3..5dbe3583 100644 --- a/src/uml/qliteralinteger.h +++ b/src/uml/qliteralinteger.h @@ -74,7 +74,6 @@ public: // Operations Q_INVOKABLE qint32 integerValue() const; Q_INVOKABLE bool isComputable() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralInteger) *> *) - QT_END_HEADER #endif // QTUML_QLITERALINTEGER_H diff --git a/src/uml/qliteralnull.cpp b/src/uml/qliteralnull.cpp index 5abb6f08..98e0714c 100644 --- a/src/uml/qliteralnull.cpp +++ b/src/uml/qliteralnull.cpp @@ -94,21 +94,6 @@ bool QLiteralNull::isNull() const return bool(); // change here to your derived return } -void QLiteralNull::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *> *"); - qRegisterMetaType<QLiteralNull *>("QLiteralNull *"); - qRegisterMetaType<const QSet<QLiteralNull *> *>("const QSet<QLiteralNull *> *"); - qRegisterMetaType<const QList<QLiteralNull *> *>("const QList<QLiteralNull *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralnull.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralnull.h b/src/uml/qliteralnull.h index 831fee29..63f65874 100644 --- a/src/uml/qliteralnull.h +++ b/src/uml/qliteralnull.h @@ -68,7 +68,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE bool isNull() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -76,10 +75,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralNull) *> *) - QT_END_HEADER #endif // QTUML_QLITERALNULL_H diff --git a/src/uml/qliteralreal.cpp b/src/uml/qliteralreal.cpp index 7bc15188..8c33c868 100644 --- a/src/uml/qliteralreal.cpp +++ b/src/uml/qliteralreal.cpp @@ -116,21 +116,6 @@ qreal QLiteralReal::realValue() const return qreal(); // change here to your derived return } -void QLiteralReal::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *> *"); - qRegisterMetaType<QLiteralReal *>("QLiteralReal *"); - qRegisterMetaType<const QSet<QLiteralReal *> *>("const QSet<QLiteralReal *> *"); - qRegisterMetaType<const QList<QLiteralReal *> *>("const QList<QLiteralReal *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralreal.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralreal.h b/src/uml/qliteralreal.h index a6150cb9..c8c042c6 100644 --- a/src/uml/qliteralreal.h +++ b/src/uml/qliteralreal.h @@ -74,7 +74,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE qreal realValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralReal) *> *) - QT_END_HEADER #endif // QTUML_QLITERALREAL_H diff --git a/src/uml/qliteralspecification.cpp b/src/uml/qliteralspecification.cpp index 4eccb567..f2528b48 100644 --- a/src/uml/qliteralspecification.cpp +++ b/src/uml/qliteralspecification.cpp @@ -74,21 +74,6 @@ QLiteralSpecification::~QLiteralSpecification() { } -void QLiteralSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *> *"); - qRegisterMetaType<QLiteralSpecification *>("QLiteralSpecification *"); - qRegisterMetaType<const QSet<QLiteralSpecification *> *>("const QSet<QLiteralSpecification *> *"); - qRegisterMetaType<const QList<QLiteralSpecification *> *>("const QList<QLiteralSpecification *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralspecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralspecification.h b/src/uml/qliteralspecification.h index 4af633dd..36477c3c 100644 --- a/src/uml/qliteralspecification.h +++ b/src/uml/qliteralspecification.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QLiteralSpecification : public QValueSpecification public: Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralSpecification(); - virtual void registerMetaTypes() const; protected: explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralSpecification) *> *) - QT_END_HEADER #endif // QTUML_QLITERALSPECIFICATION_H diff --git a/src/uml/qliteralstring.cpp b/src/uml/qliteralstring.cpp index e0398e19..8df5a41b 100644 --- a/src/uml/qliteralstring.cpp +++ b/src/uml/qliteralstring.cpp @@ -119,21 +119,6 @@ QString QLiteralString::stringValue() const return QString(); // change here to your derived return } -void QLiteralString::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *> *"); - qRegisterMetaType<QLiteralString *>("QLiteralString *"); - qRegisterMetaType<const QSet<QLiteralString *> *>("const QSet<QLiteralString *> *"); - qRegisterMetaType<const QList<QLiteralString *> *>("const QList<QLiteralString *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralstring.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralstring.h b/src/uml/qliteralstring.h index 7dfb9709..638f74b0 100644 --- a/src/uml/qliteralstring.h +++ b/src/uml/qliteralstring.h @@ -77,7 +77,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE QString stringValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralString) *> *) - QT_END_HEADER #endif // QTUML_QLITERALSTRING_H diff --git a/src/uml/qliteralunlimitednatural.cpp b/src/uml/qliteralunlimitednatural.cpp index 0b935edf..08b4f845 100644 --- a/src/uml/qliteralunlimitednatural.cpp +++ b/src/uml/qliteralunlimitednatural.cpp @@ -125,21 +125,6 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const return qint32(); // change here to your derived return } -void QLiteralUnlimitedNatural::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *>("QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *> *"); - qRegisterMetaType<QLiteralUnlimitedNatural *>("QLiteralUnlimitedNatural *"); - qRegisterMetaType<const QSet<QLiteralUnlimitedNatural *> *>("const QSet<QLiteralUnlimitedNatural *> *"); - qRegisterMetaType<const QList<QLiteralUnlimitedNatural *> *>("const QList<QLiteralUnlimitedNatural *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralunlimitednatural.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qliteralunlimitednatural.h b/src/uml/qliteralunlimitednatural.h index 7ca08469..fc8d92f3 100644 --- a/src/uml/qliteralunlimitednatural.h +++ b/src/uml/qliteralunlimitednatural.h @@ -75,7 +75,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE qint32 unlimitedValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLiteralUnlimitedNatural) *> *) - QT_END_HEADER #endif // QTUML_QLITERALUNLIMITEDNATURAL_H diff --git a/src/uml/qloopnode.cpp b/src/uml/qloopnode.cpp index 2c029f8a..3b242688 100644 --- a/src/uml/qloopnode.cpp +++ b/src/uml/qloopnode.cpp @@ -50,26 +50,14 @@ QT_BEGIN_NAMESPACE_QTUML QLoopNodePrivate::QLoopNodePrivate() : isTestedFirst(false), - loopVariableInputs(new QList<QInputPin *>), - decider(0), - bodyOutputs(new QList<QOutputPin *>), - loopVariables(new QList<QOutputPin *>), - results(new QList<QOutputPin *>), - setupParts(new QSet<QExecutableNode *>), - bodyParts(new QSet<QExecutableNode *>), - tests(new QSet<QExecutableNode *>) + decider(0) { } QLoopNodePrivate::~QLoopNodePrivate() { - delete loopVariableInputs; - delete bodyOutputs; - delete loopVariables; - delete results; - delete setupParts; - delete bodyParts; - delete tests; + qDeleteAll(loopVariableInputs); + qDeleteAll(results); } /*! @@ -131,7 +119,7 @@ void QLoopNode::unsetTestedFirst() /*! A list of values that are moved into the loop variable pins before the first iteration of the loop. */ -const QList<QInputPin *> *QLoopNode::loopVariableInputs() const +const QList<QInputPin *> &QLoopNode::loopVariableInputs() const { // This is a read-write association end @@ -144,8 +132,8 @@ void QLoopNode::addLoopVariableInput(QInputPin *loopVariableInput) // This is a read-write association end Q_D(QLoopNode); - if (!d->loopVariableInputs->contains(loopVariableInput)) { - d->loopVariableInputs->append(loopVariableInput); + if (!d->loopVariableInputs.contains(loopVariableInput)) { + d->loopVariableInputs.append(loopVariableInput); qTopLevelWrapper(loopVariableInput)->setParent(qTopLevelWrapper(this)); } } @@ -155,8 +143,8 @@ void QLoopNode::removeLoopVariableInput(QInputPin *loopVariableInput) // This is a read-write association end Q_D(QLoopNode); - if (d->loopVariableInputs->contains(loopVariableInput)) { - d->loopVariableInputs->removeAll(loopVariableInput); + if (d->loopVariableInputs.contains(loopVariableInput)) { + d->loopVariableInputs.removeAll(loopVariableInput); qTopLevelWrapper(loopVariableInput)->setParent(0); } } @@ -185,7 +173,7 @@ void QLoopNode::setDecider(QOutputPin *decider) /*! 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. */ -const QList<QOutputPin *> *QLoopNode::bodyOutputs() const +const QList<QOutputPin *> &QLoopNode::bodyOutputs() const { // This is a read-write association end @@ -198,8 +186,8 @@ void QLoopNode::addBodyOutput(QOutputPin *bodyOutput) // This is a read-write association end Q_D(QLoopNode); - if (!d->bodyOutputs->contains(bodyOutput)) { - d->bodyOutputs->append(bodyOutput); + if (!d->bodyOutputs.contains(bodyOutput)) { + d->bodyOutputs.append(bodyOutput); } } @@ -208,15 +196,15 @@ void QLoopNode::removeBodyOutput(QOutputPin *bodyOutput) // This is a read-write association end Q_D(QLoopNode); - if (d->bodyOutputs->contains(bodyOutput)) { - d->bodyOutputs->removeAll(bodyOutput); + if (d->bodyOutputs.contains(bodyOutput)) { + d->bodyOutputs.removeAll(bodyOutput); } } /*! 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. */ -const QList<QOutputPin *> *QLoopNode::loopVariables() const +const QList<QOutputPin *> &QLoopNode::loopVariables() const { // This is a read-write association end @@ -229,8 +217,8 @@ void QLoopNode::addLoopVariable(QOutputPin *loopVariable) // This is a read-write association end Q_D(QLoopNode); - if (!d->loopVariables->contains(loopVariable)) { - d->loopVariables->append(loopVariable); + if (!d->loopVariables.contains(loopVariable)) { + d->loopVariables.append(loopVariable); } } @@ -239,15 +227,15 @@ void QLoopNode::removeLoopVariable(QOutputPin *loopVariable) // This is a read-write association end Q_D(QLoopNode); - if (d->loopVariables->contains(loopVariable)) { - d->loopVariables->removeAll(loopVariable); + if (d->loopVariables.contains(loopVariable)) { + d->loopVariables.removeAll(loopVariable); } } /*! A list of output pins that constitute the data flow output of the entire loop. */ -const QList<QOutputPin *> *QLoopNode::results() const +const QList<QOutputPin *> &QLoopNode::results() const { // This is a read-write association end @@ -260,8 +248,8 @@ void QLoopNode::addResult(QOutputPin *result) // This is a read-write association end Q_D(QLoopNode); - if (!d->results->contains(result)) { - d->results->append(result); + if (!d->results.contains(result)) { + d->results.append(result); qTopLevelWrapper(result)->setParent(qTopLevelWrapper(this)); } } @@ -271,8 +259,8 @@ void QLoopNode::removeResult(QOutputPin *result) // This is a read-write association end Q_D(QLoopNode); - if (d->results->contains(result)) { - d->results->removeAll(result); + if (d->results.contains(result)) { + d->results.removeAll(result); qTopLevelWrapper(result)->setParent(0); } } @@ -280,7 +268,7 @@ void QLoopNode::removeResult(QOutputPin *result) /*! The set of nodes and edges that initialize values or perform other setup computations for the loop. */ -const QSet<QExecutableNode *> *QLoopNode::setupParts() const +const QSet<QExecutableNode *> &QLoopNode::setupParts() const { // This is a read-write association end @@ -293,8 +281,8 @@ void QLoopNode::addSetupPart(QExecutableNode *setupPart) // This is a read-write association end Q_D(QLoopNode); - if (!d->setupParts->contains(setupPart)) { - d->setupParts->insert(setupPart); + if (!d->setupParts.contains(setupPart)) { + d->setupParts.insert(setupPart); } } @@ -303,15 +291,15 @@ void QLoopNode::removeSetupPart(QExecutableNode *setupPart) // This is a read-write association end Q_D(QLoopNode); - if (d->setupParts->contains(setupPart)) { - d->setupParts->remove(setupPart); + if (d->setupParts.contains(setupPart)) { + d->setupParts.remove(setupPart); } } /*! 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. */ -const QSet<QExecutableNode *> *QLoopNode::bodyParts() const +const QSet<QExecutableNode *> &QLoopNode::bodyParts() const { // This is a read-write association end @@ -324,8 +312,8 @@ void QLoopNode::addBodyPart(QExecutableNode *bodyPart) // This is a read-write association end Q_D(QLoopNode); - if (!d->bodyParts->contains(bodyPart)) { - d->bodyParts->insert(bodyPart); + if (!d->bodyParts.contains(bodyPart)) { + d->bodyParts.insert(bodyPart); } } @@ -334,15 +322,15 @@ void QLoopNode::removeBodyPart(QExecutableNode *bodyPart) // This is a read-write association end Q_D(QLoopNode); - if (d->bodyParts->contains(bodyPart)) { - d->bodyParts->remove(bodyPart); + if (d->bodyParts.contains(bodyPart)) { + d->bodyParts.remove(bodyPart); } } /*! The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed. */ -const QSet<QExecutableNode *> *QLoopNode::tests() const +const QSet<QExecutableNode *> &QLoopNode::tests() const { // This is a read-write association end @@ -355,8 +343,8 @@ void QLoopNode::addTest(QExecutableNode *test) // This is a read-write association end Q_D(QLoopNode); - if (!d->tests->contains(test)) { - d->tests->insert(test); + if (!d->tests.contains(test)) { + d->tests.insert(test); } } @@ -365,47 +353,11 @@ void QLoopNode::removeTest(QExecutableNode *test) // This is a read-write association end Q_D(QLoopNode); - if (d->tests->contains(test)) { - d->tests->remove(test); + if (d->tests.contains(test)) { + d->tests.remove(test); } } -void QLoopNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *>("QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *> *"); - qRegisterMetaType<QLoopNode *>("QLoopNode *"); - qRegisterMetaType<const QSet<QLoopNode *> *>("const QSet<QLoopNode *> *"); - qRegisterMetaType<const QList<QLoopNode *> *>("const QList<QLoopNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<QExecutableNode *>("QExecutableNode *"); - qRegisterMetaType<const QSet<QExecutableNode *> *>("const QSet<QExecutableNode *> *"); - qRegisterMetaType<const QList<QExecutableNode *> *>("const QList<QExecutableNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QStructuredActivityNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qloopnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qloopnode.h b/src/uml/qloopnode.h index 9a41b55e..deb029b6 100644 --- a/src/uml/qloopnode.h +++ b/src/uml/qloopnode.h @@ -68,14 +68,14 @@ class Q_UML_EXPORT QLoopNode : public QStructuredActivityNode Q_OBJECT Q_PROPERTY(bool isTestedFirst READ isTestedFirst WRITE setTestedFirst RESET unsetTestedFirst) - Q_PROPERTY(const QList<QInputPin *> * loopVariableInputs READ loopVariableInputs) + Q_PROPERTY(QList<QInputPin *> loopVariableInputs READ loopVariableInputs) Q_PROPERTY(QOutputPin * decider READ decider WRITE setDecider) - Q_PROPERTY(const QList<QOutputPin *> * bodyOutputs READ bodyOutputs) - Q_PROPERTY(const QList<QOutputPin *> * loopVariables READ loopVariables) - Q_PROPERTY(const QList<QOutputPin *> * results READ results) - Q_PROPERTY(const QSet<QExecutableNode *> * setupParts READ setupParts) - Q_PROPERTY(const QSet<QExecutableNode *> * bodyParts READ bodyParts) - Q_PROPERTY(const QSet<QExecutableNode *> * tests READ tests) + 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_DISABLE_COPY(QLoopNode) Q_DECLARE_PRIVATE(QLoopNode) @@ -90,30 +90,29 @@ public: Q_INVOKABLE void unsetTestedFirst(); // Association ends from QLoopNode - Q_INVOKABLE const QList<QInputPin *> *loopVariableInputs() const; + Q_INVOKABLE const QList<QInputPin *> &loopVariableInputs() const; Q_INVOKABLE void addLoopVariableInput(QInputPin *loopVariableInput); Q_INVOKABLE void removeLoopVariableInput(QInputPin *loopVariableInput); Q_INVOKABLE QOutputPin *decider() const; Q_INVOKABLE void setDecider(QOutputPin *decider); - Q_INVOKABLE const QList<QOutputPin *> *bodyOutputs() const; + Q_INVOKABLE const QList<QOutputPin *> &bodyOutputs() const; Q_INVOKABLE void addBodyOutput(QOutputPin *bodyOutput); Q_INVOKABLE void removeBodyOutput(QOutputPin *bodyOutput); - Q_INVOKABLE const QList<QOutputPin *> *loopVariables() const; + Q_INVOKABLE const QList<QOutputPin *> &loopVariables() const; Q_INVOKABLE void addLoopVariable(QOutputPin *loopVariable); Q_INVOKABLE void removeLoopVariable(QOutputPin *loopVariable); - Q_INVOKABLE const QList<QOutputPin *> *results() const; + Q_INVOKABLE const QList<QOutputPin *> &results() const; Q_INVOKABLE void addResult(QOutputPin *result); Q_INVOKABLE void removeResult(QOutputPin *result); - Q_INVOKABLE const QSet<QExecutableNode *> *setupParts() const; + Q_INVOKABLE const QSet<QExecutableNode *> &setupParts() const; Q_INVOKABLE void addSetupPart(QExecutableNode *setupPart); Q_INVOKABLE void removeSetupPart(QExecutableNode *setupPart); - Q_INVOKABLE const QSet<QExecutableNode *> *bodyParts() const; + Q_INVOKABLE const QSet<QExecutableNode *> &bodyParts() const; Q_INVOKABLE void addBodyPart(QExecutableNode *bodyPart); Q_INVOKABLE void removeBodyPart(QExecutableNode *bodyPart); - Q_INVOKABLE const QSet<QExecutableNode *> *tests() const; + Q_INVOKABLE const QSet<QExecutableNode *> &tests() const; Q_INVOKABLE void addTest(QExecutableNode *test); Q_INVOKABLE void removeTest(QExecutableNode *test); - virtual void registerMetaTypes() const; protected: explicit QLoopNode(QLoopNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -121,10 +120,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QLoopNode) *> *) - QT_END_HEADER #endif // QTUML_QLOOPNODE_H diff --git a/src/uml/qloopnode_p.h b/src/uml/qloopnode_p.h index ec31cf7e..821e781e 100644 --- a/src/uml/qloopnode_p.h +++ b/src/uml/qloopnode_p.h @@ -71,14 +71,14 @@ public: virtual ~QLoopNodePrivate(); bool isTestedFirst; - QList<QInputPin *> *loopVariableInputs; + QList<QInputPin *> loopVariableInputs; QOutputPin *decider; - QList<QOutputPin *> *bodyOutputs; - QList<QOutputPin *> *loopVariables; - QList<QOutputPin *> *results; - QSet<QExecutableNode *> *setupParts; - QSet<QExecutableNode *> *bodyParts; - QSet<QExecutableNode *> *tests; + QList<QOutputPin *> bodyOutputs; + QList<QOutputPin *> loopVariables; + QList<QOutputPin *> results; + QSet<QExecutableNode *> setupParts; + QSet<QExecutableNode *> bodyParts; + QSet<QExecutableNode *> tests; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmanifestation.cpp b/src/uml/qmanifestation.cpp index 528b2504..d310871e 100644 --- a/src/uml/qmanifestation.cpp +++ b/src/uml/qmanifestation.cpp @@ -110,28 +110,6 @@ void QManifestation::setUtilizedElement(QPackageableElement *utilizedElement) } } -void QManifestation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *>("QT_PREPEND_NAMESPACE_QTUML(QManifestation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *"); - qRegisterMetaType<QManifestation *>("QManifestation *"); - qRegisterMetaType<const QSet<QManifestation *> *>("const QSet<QManifestation *> *"); - qRegisterMetaType<const QList<QManifestation *> *>("const QList<QManifestation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QAbstraction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QManifestation::addSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement) diff --git a/src/uml/qmanifestation.h b/src/uml/qmanifestation.h index 384ee97c..800afe8d 100644 --- a/src/uml/qmanifestation.h +++ b/src/uml/qmanifestation.h @@ -80,7 +80,6 @@ public: // Overriden methods for subsetted properties Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement); Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement); - virtual void registerMetaTypes() const; protected: explicit QManifestation(QManifestationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QManifestation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QManifestation) *> *) - QT_END_HEADER #endif // QTUML_QMANIFESTATION_H diff --git a/src/uml/qmergenode.cpp b/src/uml/qmergenode.cpp index 1adf70a7..aa00ba4a 100644 --- a/src/uml/qmergenode.cpp +++ b/src/uml/qmergenode.cpp @@ -74,21 +74,6 @@ QMergeNode::~QMergeNode() { } -void QMergeNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *>("QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *> *"); - qRegisterMetaType<QMergeNode *>("QMergeNode *"); - qRegisterMetaType<const QSet<QMergeNode *> *>("const QSet<QMergeNode *> *"); - qRegisterMetaType<const QList<QMergeNode *> *>("const QList<QMergeNode *> *"); - - QControlNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmergenode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmergenode.h b/src/uml/qmergenode.h index 7629af08..39ae4a0f 100644 --- a/src/uml/qmergenode.h +++ b/src/uml/qmergenode.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QMergeNode : public QControlNode public: Q_INVOKABLE explicit QMergeNode(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMergeNode(); - virtual void registerMetaTypes() const; protected: explicit QMergeNode(QMergeNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QMergeNode) *> *) - QT_END_HEADER #endif // QTUML_QMERGENODE_H diff --git a/src/uml/qmessage.cpp b/src/uml/qmessage.cpp index 1d15dce5..188891e1 100644 --- a/src/uml/qmessage.cpp +++ b/src/uml/qmessage.cpp @@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE_QTUML QMessagePrivate::QMessagePrivate() : messageSort(QtUml::MessageSynchCall), signature(0), - arguments(new QList<QValueSpecification *>), receiveEvent(0), interaction(0), sendEvent(0), @@ -62,7 +61,6 @@ QMessagePrivate::QMessagePrivate() : QMessagePrivate::~QMessagePrivate() { - delete arguments; } /*! @@ -157,7 +155,7 @@ void QMessage::setSignature(QNamedElement *signature) /*! The arguments of the Message */ -const QList<QValueSpecification *> *QMessage::arguments() const +const QList<QValueSpecification *> &QMessage::arguments() const { // This is a read-write association end @@ -170,8 +168,8 @@ void QMessage::addArgument(QValueSpecification *argument) // This is a read-write association end Q_D(QMessage); - if (!d->arguments->contains(argument)) { - d->arguments->append(argument); + if (!d->arguments.contains(argument)) { + d->arguments.append(argument); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(argument)); @@ -183,8 +181,8 @@ void QMessage::removeArgument(QValueSpecification *argument) // This is a read-write association end Q_D(QMessage); - if (d->arguments->contains(argument)) { - d->arguments->removeAll(argument); + if (d->arguments.contains(argument)) { + d->arguments.removeAll(argument); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(argument)); @@ -286,49 +284,6 @@ void QMessage::setConnector(QConnector *connector) } } -void QMessage::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessage) *>("QT_PREPEND_NAMESPACE_QTUML(QMessage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<QMessage *>("QMessage *"); - qRegisterMetaType<const QSet<QMessage *> *>("const QSet<QMessage *> *"); - qRegisterMetaType<const QList<QMessage *> *>("const QList<QMessage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *"); - qRegisterMetaType<QMessageEnd *>("QMessageEnd *"); - qRegisterMetaType<const QSet<QMessageEnd *> *>("const QSet<QMessageEnd *> *"); - qRegisterMetaType<const QList<QMessageEnd *> *>("const QList<QMessageEnd *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *>("QT_PREPEND_NAMESPACE_QTUML(QInteraction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInteraction) *> *"); - qRegisterMetaType<QInteraction *>("QInteraction *"); - qRegisterMetaType<const QSet<QInteraction *> *>("const QSet<QInteraction *> *"); - qRegisterMetaType<const QList<QInteraction *> *>("const QList<QInteraction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnector) *>("QT_PREPEND_NAMESPACE_QTUML(QConnector) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<QConnector *>("QConnector *"); - qRegisterMetaType<const QSet<QConnector *> *>("const QSet<QConnector *> *"); - qRegisterMetaType<const QList<QConnector *> *>("const QList<QConnector *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmessage.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessage.h b/src/uml/qmessage.h index fde95c57..2c0cf0f4 100644 --- a/src/uml/qmessage.h +++ b/src/uml/qmessage.h @@ -74,7 +74,7 @@ class Q_UML_EXPORT QMessage : public QNamedElement 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(const QList<QValueSpecification *> * arguments READ arguments) + 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) @@ -96,7 +96,7 @@ public: // Association ends from QMessage Q_INVOKABLE QNamedElement *signature() const; Q_INVOKABLE void setSignature(QNamedElement *signature); - Q_INVOKABLE const QList<QValueSpecification *> *arguments() const; + Q_INVOKABLE const QList<QValueSpecification *> &arguments() const; Q_INVOKABLE void addArgument(QValueSpecification *argument); Q_INVOKABLE void removeArgument(QValueSpecification *argument); Q_INVOKABLE QMessageEnd *receiveEvent() const; @@ -107,7 +107,6 @@ public: Q_INVOKABLE void setSendEvent(QMessageEnd *sendEvent); Q_INVOKABLE QConnector *connector() const; Q_INVOKABLE void setConnector(QConnector *connector); - virtual void registerMetaTypes() const; protected: explicit QMessage(QMessagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -115,10 +114,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QMessage) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *) - QT_END_HEADER #endif // QTUML_QMESSAGE_H diff --git a/src/uml/qmessage_p.h b/src/uml/qmessage_p.h index 0d01d79e..b6572d9d 100644 --- a/src/uml/qmessage_p.h +++ b/src/uml/qmessage_p.h @@ -76,7 +76,7 @@ public: QtUml::MessageSort messageSort; QNamedElement *signature; - QList<QValueSpecification *> *arguments; + QList<QValueSpecification *> arguments; QMessageEnd *receiveEvent; QInteraction *interaction; QMessageEnd *sendEvent; diff --git a/src/uml/qmessageend.cpp b/src/uml/qmessageend.cpp index bcefd72d..dab59248 100644 --- a/src/uml/qmessageend.cpp +++ b/src/uml/qmessageend.cpp @@ -102,28 +102,6 @@ void QMessageEnd::setMessage(QMessage *message) } } -void QMessageEnd::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *>("QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *"); - qRegisterMetaType<QMessageEnd *>("QMessageEnd *"); - qRegisterMetaType<const QSet<QMessageEnd *> *>("const QSet<QMessageEnd *> *"); - qRegisterMetaType<const QList<QMessageEnd *> *>("const QList<QMessageEnd *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessage) *>("QT_PREPEND_NAMESPACE_QTUML(QMessage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessage) *> *"); - qRegisterMetaType<QMessage *>("QMessage *"); - qRegisterMetaType<const QSet<QMessage *> *>("const QSet<QMessage *> *"); - qRegisterMetaType<const QList<QMessage *> *>("const QList<QMessage *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmessageend.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessageend.h b/src/uml/qmessageend.h index ee603cb8..73d8f4f8 100644 --- a/src/uml/qmessageend.h +++ b/src/uml/qmessageend.h @@ -73,7 +73,6 @@ public: // Association ends from QMessageEnd Q_INVOKABLE QMessage *message() const; Q_INVOKABLE void setMessage(QMessage *message); - virtual void registerMetaTypes() const; protected: explicit QMessageEnd(QMessageEndPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEnd) *> *) - QT_END_HEADER #endif // QTUML_QMESSAGEEND_H diff --git a/src/uml/qmessageevent.cpp b/src/uml/qmessageevent.cpp index e5852154..9bee5568 100644 --- a/src/uml/qmessageevent.cpp +++ b/src/uml/qmessageevent.cpp @@ -74,21 +74,6 @@ QMessageEvent::~QMessageEvent() { } -void QMessageEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *> *"); - qRegisterMetaType<QMessageEvent *>("QMessageEvent *"); - qRegisterMetaType<const QSet<QMessageEvent *> *>("const QSet<QMessageEvent *> *"); - qRegisterMetaType<const QList<QMessageEvent *> *>("const QList<QMessageEvent *> *"); - - QEvent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmessageevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessageevent.h b/src/uml/qmessageevent.h index 2f96289b..558e401d 100644 --- a/src/uml/qmessageevent.h +++ b/src/uml/qmessageevent.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QMessageEvent : public QEvent public: Q_INVOKABLE explicit QMessageEvent(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QMessageEvent(); - virtual void registerMetaTypes() const; protected: explicit QMessageEvent(QMessageEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageEvent) *> *) - QT_END_HEADER #endif // QTUML_QMESSAGEEVENT_H diff --git a/src/uml/qmessageoccurrencespecification.cpp b/src/uml/qmessageoccurrencespecification.cpp index d4b391f4..69c20e82 100644 --- a/src/uml/qmessageoccurrencespecification.cpp +++ b/src/uml/qmessageoccurrencespecification.cpp @@ -85,7 +85,7 @@ QMessageOccurrenceSpecification::~QMessageOccurrenceSpecification() /*! The Elements owned by this element. */ -const QSet<QElement *> *QMessageOccurrenceSpecification::ownedElements() const +const QSet<QElement *> &QMessageOccurrenceSpecification::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -101,7 +101,7 @@ QElement *QMessageOccurrenceSpecification::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QMessageOccurrenceSpecification::ownedComments() const +const QSet<QComment *> &QMessageOccurrenceSpecification::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -182,7 +182,7 @@ QNamespace *QMessageOccurrenceSpecification::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QMessageOccurrenceSpecification::clientDependencies() const +const QSet<QDependency *> &QMessageOccurrenceSpecification::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -214,21 +214,6 @@ void QMessageOccurrenceSpecification::setMessage(QMessage *message) (qwrappedobject_cast<QMessageEnd *>(this))->setMessage(message); } -void QMessageOccurrenceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *> *"); - qRegisterMetaType<QMessageOccurrenceSpecification *>("QMessageOccurrenceSpecification *"); - qRegisterMetaType<const QSet<QMessageOccurrenceSpecification *> *>("const QSet<QMessageOccurrenceSpecification *> *"); - qRegisterMetaType<const QList<QMessageOccurrenceSpecification *> *>("const QList<QMessageOccurrenceSpecification *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmessageoccurrencespecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmessageoccurrencespecification.h b/src/uml/qmessageoccurrencespecification.h index def38a54..d3ef5a06 100644 --- a/src/uml/qmessageoccurrencespecification.h +++ b/src/uml/qmessageoccurrencespecification.h @@ -69,9 +69,9 @@ public: virtual ~QMessageOccurrenceSpecification(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -86,14 +86,13 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QMessageEnd Q_INVOKABLE QMessage *message() const; Q_INVOKABLE void setMessage(QMessage *message); - virtual void registerMetaTypes() const; protected: explicit QMessageOccurrenceSpecification(QMessageOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -105,10 +104,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QMessageOccurrenceSpecification) *> *) - QT_END_HEADER #endif // QTUML_QMESSAGEOCCURRENCESPECIFICATION_H diff --git a/src/uml/qmodel.cpp b/src/uml/qmodel.cpp index 8efa6dbe..1ed851cd 100644 --- a/src/uml/qmodel.cpp +++ b/src/uml/qmodel.cpp @@ -99,21 +99,6 @@ void QModel::setViewpoint(QString viewpoint) } } -void QModel::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QModel) *>("QT_PREPEND_NAMESPACE_QTUML(QModel) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QModel) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QModel) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QModel) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QModel) *> *"); - qRegisterMetaType<QModel *>("QModel *"); - qRegisterMetaType<const QSet<QModel *> *>("const QSet<QModel *> *"); - qRegisterMetaType<const QList<QModel *> *>("const QList<QModel *> *"); - - QPackage::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmodel.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmodel.h b/src/uml/qmodel.h index f2423d29..2dcbefc9 100644 --- a/src/uml/qmodel.h +++ b/src/uml/qmodel.h @@ -73,7 +73,6 @@ public: // Attributes from QModel Q_INVOKABLE QString viewpoint() const; Q_INVOKABLE void setViewpoint(QString viewpoint); - virtual void registerMetaTypes() const; protected: explicit QModel(QModelPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QModel) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QModel) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QModel) *> *) - QT_END_HEADER #endif // QTUML_QMODEL_H diff --git a/src/uml/qmultiplicityelement.cpp b/src/uml/qmultiplicityelement.cpp index e7ddf8ed..3f1a423f 100644 --- a/src/uml/qmultiplicityelement.cpp +++ b/src/uml/qmultiplicityelement.cpp @@ -326,28 +326,6 @@ qint32 QMultiplicityElement::upperBound() const return qint32(); // change here to your derived return } -void QMultiplicityElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *>("QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *> *"); - qRegisterMetaType<QMultiplicityElement *>("QMultiplicityElement *"); - qRegisterMetaType<const QSet<QMultiplicityElement *> *>("const QSet<QMultiplicityElement *> *"); - qRegisterMetaType<const QList<QMultiplicityElement *> *>("const QList<QMultiplicityElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmultiplicityelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qmultiplicityelement.h b/src/uml/qmultiplicityelement.h index 9a7dc18b..a510d14a 100644 --- a/src/uml/qmultiplicityelement.h +++ b/src/uml/qmultiplicityelement.h @@ -102,7 +102,6 @@ public: Q_INVOKABLE bool isMultivalued() const; Q_INVOKABLE qint32 lowerBound() const; Q_INVOKABLE qint32 upperBound() const; - virtual void registerMetaTypes() const; protected: explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -110,10 +109,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QMultiplicityElement) *> *) - QT_END_HEADER #endif // QTUML_QMULTIPLICITYELEMENT_H diff --git a/src/uml/qnamedelement.cpp b/src/uml/qnamedelement.cpp index 499ee6a0..4653fa51 100644 --- a/src/uml/qnamedelement.cpp +++ b/src/uml/qnamedelement.cpp @@ -53,14 +53,12 @@ QT_BEGIN_NAMESPACE_QTUML QNamedElementPrivate::QNamedElementPrivate() : nameExpression(0), - namespace_(0), - clientDependencies(new QSet<QDependency *>) + namespace_(0) { } QNamedElementPrivate::~QNamedElementPrivate() { - delete clientDependencies; } void QNamedElementPrivate::setNamespace_(QNamespace *namespace_) @@ -166,7 +164,7 @@ QString QNamedElement::qualifiedName() const Q_D(const QNamedElement); if (d->name.isEmpty()) return QString(); QString qualifiedName_(d->name); - QScopedPointer< const QList<QNamespace *> > allNamespaces_(allNamespaces()); + QScopedPointer< const QList<QNamespace *> > allNamespaces_(&allNamespaces()); QString separator_ = separator(); foreach (QNamespace *namespace_, *allNamespaces_) { if (namespace_->name().isEmpty()) @@ -223,7 +221,7 @@ QNamespace *QNamedElement::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QNamedElement::clientDependencies() const +const QSet<QDependency *> &QNamedElement::clientDependencies() const { // This is a read-write association end @@ -236,8 +234,8 @@ void QNamedElement::addClientDependency(QDependency *clientDependency) // This is a read-write association end Q_D(QNamedElement); - if (!d->clientDependencies->contains(clientDependency)) { - d->clientDependencies->insert(clientDependency); + if (!d->clientDependencies.contains(clientDependency)) { + d->clientDependencies.insert(clientDependency); // Adjust opposite property clientDependency->addClient(this); @@ -249,8 +247,8 @@ void QNamedElement::removeClientDependency(QDependency *clientDependency) // This is a read-write association end Q_D(QNamedElement); - if (d->clientDependencies->contains(clientDependency)) { - d->clientDependencies->remove(clientDependency); + if (d->clientDependencies.contains(clientDependency)) { + d->clientDependencies.remove(clientDependency); // Adjust opposite property if (clientDependency) @@ -262,11 +260,11 @@ void QNamedElement::removeClientDependency(QDependency *clientDependency) The query allNamespaces() gives the sequence of namespaces in which the NamedElement is nested, working outwards. It is the caller's responsibility to delete the returned list. */ -const QList<QNamespace *> *QNamedElement::allNamespaces() const +const QList<QNamespace *> &QNamedElement::allNamespaces() const { Q_D(const QNamedElement); if (!d->namespace_) { - return new QList<QNamespace *>; + return *(new QList<QNamespace *>); } else { QList<QNamespace *> *allNamespaces_ = new QList<QNamespace *>; @@ -275,18 +273,18 @@ const QList<QNamespace *> *QNamedElement::allNamespaces() const allNamespaces_->append(namespace_); namespace_ = namespace_->namespace_(); } - return allNamespaces_; + return *allNamespaces_; } } /*! The query allOwningPackages() returns all the directly or indirectly owning packages. */ -const QSet<QPackage *> *QNamedElement::allOwningPackages() const +const QSet<QPackage *> &QNamedElement::allOwningPackages() const { qWarning("QNamedElement::allOwningPackages: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QPackage *>); // change here to your derived return } /*! @@ -309,49 +307,6 @@ QString QNamedElement::separator() const return QStringLiteral("::"); } -void QNamedElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackage) *>("QT_PREPEND_NAMESPACE_QTUML(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *>("QT_PREPEND_NAMESPACE_QTUML(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDependency) *>("QT_PREPEND_NAMESPACE_QTUML(QDependency) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDependency) *> *"); - qRegisterMetaType<QDependency *>("QDependency *"); - qRegisterMetaType<const QSet<QDependency *> *>("const QSet<QDependency *> *"); - qRegisterMetaType<const QList<QDependency *> *>("const QList<QDependency *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *"); - qRegisterMetaType<QStringExpression *>("QStringExpression *"); - qRegisterMetaType<const QSet<QStringExpression *> *>("const QSet<QStringExpression *> *"); - qRegisterMetaType<const QList<QStringExpression *> *>("const QList<QStringExpression *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnamedelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qnamedelement.h b/src/uml/qnamedelement.h index 87f546a3..e88d20e7 100644 --- a/src/uml/qnamedelement.h +++ b/src/uml/qnamedelement.h @@ -77,7 +77,7 @@ class Q_UML_EXPORT QNamedElement : public QElement Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(const QSet<QDependency *> * clientDependencies READ clientDependencies) + Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) Q_DISABLE_COPY(QNamedElement) Q_DECLARE_PRIVATE(QNamedElement) @@ -97,16 +97,15 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Operations - Q_INVOKABLE const QList<QNamespace *> *allNamespaces() const; - Q_INVOKABLE const QSet<QPackage *> *allOwningPackages() const; + Q_INVOKABLE const QList<QNamespace *> &allNamespaces() const; + Q_INVOKABLE const QSet<QPackage *> &allOwningPackages() const; Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; Q_INVOKABLE QString separator() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QNamespacePrivate; @@ -117,10 +116,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *) - QT_END_HEADER #endif // QTUML_QNAMEDELEMENT_H diff --git a/src/uml/qnamedelement_p.h b/src/uml/qnamedelement_p.h index bebe26e8..542c918e 100644 --- a/src/uml/qnamedelement_p.h +++ b/src/uml/qnamedelement_p.h @@ -79,7 +79,7 @@ public: QtUml::VisibilityKind visibility; QStringExpression *nameExpression; QNamespace *namespace_; - QSet<QDependency *> *clientDependencies; + QSet<QDependency *> clientDependencies; // Internal functions for read-only subsetted association ends void setNamespace_(QNamespace *namespace_); diff --git a/src/uml/qnamespace.cpp b/src/uml/qnamespace.cpp index 8404198c..b3a40dc3 100644 --- a/src/uml/qnamespace.cpp +++ b/src/uml/qnamespace.cpp @@ -52,30 +52,20 @@ QT_BEGIN_NAMESPACE_QTUML -QNamespacePrivate::QNamespacePrivate() : - packageImports(new QSet<QPackageImport *>), - members(new QSet<QNamedElement *>), - elementImports(new QSet<QElementImport *>), - ownedRules(new QSet<QConstraint *>), - ownedMembers(new QSet<QNamedElement *>) +QNamespacePrivate::QNamespacePrivate() { } QNamespacePrivate::~QNamespacePrivate() { - delete packageImports; - delete members; - delete elementImports; - delete ownedRules; - delete ownedMembers; } void QNamespacePrivate::addMember(QNamedElement *member) { // This is a read-only derived-union association end - if (!this->members->contains(member)) { - this->members->insert(member); + if (!this->members.contains(member)) { + this->members.insert(member); } } @@ -83,8 +73,8 @@ void QNamespacePrivate::removeMember(QNamedElement *member) { // This is a read-only derived-union association end - if (this->members->contains(member)) { - this->members->remove(member); + if (this->members.contains(member)) { + this->members.remove(member); } } @@ -92,8 +82,8 @@ void QNamespacePrivate::addOwnedMember(QNamedElement *ownedMember) { // This is a read-only derived-union association end - if (!this->ownedMembers->contains(ownedMember)) { - this->ownedMembers->insert(ownedMember); + if (!this->ownedMembers.contains(ownedMember)) { + this->ownedMembers.insert(ownedMember); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(ownedMember)); @@ -109,8 +99,8 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) { // This is a read-only derived-union association end - if (this->ownedMembers->contains(ownedMember)) { - this->ownedMembers->remove(ownedMember); + if (this->ownedMembers.contains(ownedMember)) { + this->ownedMembers.remove(ownedMember); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(ownedMember)); @@ -150,7 +140,7 @@ QNamespace::~QNamespace() /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QNamespace::packageImports() const +const QSet<QPackageImport *> &QNamespace::packageImports() const { // This is a read-write association end @@ -163,8 +153,8 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) // This is a read-write association end Q_D(QNamespace); - if (!d->packageImports->contains(packageImport)) { - d->packageImports->insert(packageImport); + if (!d->packageImports.contains(packageImport)) { + d->packageImports.insert(packageImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); @@ -174,7 +164,7 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) // Adjust indirectly subsetted property(ies) // This is because importedMembers is derived (not derivedUnion) and subsets member - foreach (QPackageableElement *packageableElement, *packageImport->importedPackage()->packagedElements()) + foreach (QPackageableElement *packageableElement, packageImport->importedPackage()->packagedElements()) d->addMember(qwrappedobject_cast<QNamedElement *>(packageableElement)); } } @@ -184,8 +174,8 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) // This is a read-write association end Q_D(QNamespace); - if (d->packageImports->contains(packageImport)) { - d->packageImports->remove(packageImport); + if (d->packageImports.contains(packageImport)) { + d->packageImports.remove(packageImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); @@ -195,7 +185,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) // Adjust indirectly subsetted property(ies) // This is because importedMembers is derived (not derivedUnion) and subsets member - foreach (QPackageableElement *packageableElement, *packageImport->importedPackage()->packagedElements()) + foreach (QPackageableElement *packageableElement, packageImport->importedPackage()->packagedElements()) d->removeMember(qwrappedobject_cast<QNamedElement *>(packageableElement)); } } @@ -203,7 +193,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QNamespace::members() const +const QSet<QNamedElement *> &QNamespace::members() const { // This is a read-only derived-union association end @@ -215,24 +205,24 @@ const QSet<QNamedElement *> *QNamespace::members() const References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. It is the caller's responsibility to delete the returned set. */ -const QSet<QPackageableElement *> *QNamespace::importedMembers() const +const QSet<QPackageableElement *> &QNamespace::importedMembers() const { // This is a read-only derived association end Q_D(const QNamespace); QSet<QPackageableElement *> * importedMembers_ = new QSet<QPackageableElement *>; - foreach (QElementImport *elementImport, *d->elementImports) + foreach (QElementImport *elementImport, d->elementImports) importedMembers_->insert(elementImport->importedElement()); - foreach (QPackageImport *packageImport, *d->packageImports) - importedMembers_->unite(*packageImport->importedPackage()->packagedElements()); + foreach (QPackageImport *packageImport, d->packageImports) + importedMembers_->unite(packageImport->importedPackage()->packagedElements()); - return importedMembers_; + return *importedMembers_; } /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QNamespace::elementImports() const +const QSet<QElementImport *> &QNamespace::elementImports() const { // This is a read-write association end @@ -245,8 +235,8 @@ void QNamespace::addElementImport(QElementImport *elementImport) // This is a read-write association end Q_D(QNamespace); - if (!d->elementImports->contains(elementImport)) { - d->elementImports->insert(elementImport); + if (!d->elementImports.contains(elementImport)) { + d->elementImports.insert(elementImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); @@ -265,8 +255,8 @@ void QNamespace::removeElementImport(QElementImport *elementImport) // This is a read-write association end Q_D(QNamespace); - if (d->elementImports->contains(elementImport)) { - d->elementImports->remove(elementImport); + if (d->elementImports.contains(elementImport)) { + d->elementImports.remove(elementImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); @@ -283,7 +273,7 @@ void QNamespace::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QNamespace::ownedRules() const +const QSet<QConstraint *> &QNamespace::ownedRules() const { // This is a read-write association end @@ -296,8 +286,8 @@ void QNamespace::addOwnedRule(QConstraint *ownedRule) // This is a read-write association end Q_D(QNamespace); - if (!d->ownedRules->contains(ownedRule)) { - d->ownedRules->insert(ownedRule); + if (!d->ownedRules.contains(ownedRule)) { + d->ownedRules.insert(ownedRule); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); @@ -312,8 +302,8 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) // This is a read-write association end Q_D(QNamespace); - if (d->ownedRules->contains(ownedRule)) { - d->ownedRules->remove(ownedRule); + if (d->ownedRules.contains(ownedRule)) { + d->ownedRules.remove(ownedRule); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); @@ -326,7 +316,7 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QNamespace::ownedMembers() const +const QSet<QNamedElement *> &QNamespace::ownedMembers() const { // This is a read-only derived-union association end @@ -337,34 +327,34 @@ const QSet<QNamedElement *> *QNamespace::ownedMembers() const /*! The query excludeCollisions() excludes from a set of PackageableElements any that would not be distinguishable from each other in this namespace. */ -const QSet<QPackageableElement *> *QNamespace::excludeCollisions(const QSet<QPackageableElement *> *imps) const +const QSet<QPackageableElement *> &QNamespace::excludeCollisions(const QSet<QPackageableElement *> &imps) const { qWarning("QNamespace::excludeCollisions: operation to be implemented"); Q_UNUSED(imps); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! The query getNamesOfMember() gives a set of all of the names that a member would have in a Namespace. In general a member can have multiple names in a Namespace if it is imported more than once with different aliases. The query takes account of importing. It gives back the set of names that an element would have in an importing namespace, either because it is owned, or if not owned then imported individually, or if not individually then from a package.The query getNamesOfMember() takes importing into account. It gives back the set of names that an element would have in an importing namespace, either because it is owned, or if not owned then imported individually, or if not individually then from a package. */ -const QSet<QString> *QNamespace::getNamesOfMember(const QNamedElement *element) const +const QSet<QString> QNamespace::getNamesOfMember(const QNamedElement *element) const { qWarning("QNamespace::getNamesOfMember: operation to be implemented"); Q_UNUSED(element); - return 0; // change here to your derived return + return QSet<QString>(); // change here to your derived return } /*! The query importMembers() defines which of a set of PackageableElements are actually imported into the namespace. This excludes hidden ones, i.e., those which have names that conflict with names of owned members, and also excludes elements which would have the same name when imported. */ -const QSet<QPackageableElement *> *QNamespace::importMembers(const QSet<QPackageableElement *> *imps) const +const QSet<QPackageableElement *> &QNamespace::importMembers(const QSet<QPackageableElement *> &imps) const { qWarning("QNamespace::importMembers: operation to be implemented"); Q_UNUSED(imps); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! @@ -377,49 +367,6 @@ bool QNamespace::membersAreDistinguishable() const return bool(); // change here to your derived return } -void QNamespace::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *>("QT_PREPEND_NAMESPACE_QTUML(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *>("QT_PREPEND_NAMESPACE_QTUML(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnamespace.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qnamespace.h b/src/uml/qnamespace.h index ad759d9b..f6c2d806 100644 --- a/src/uml/qnamespace.h +++ b/src/uml/qnamespace.h @@ -68,12 +68,12 @@ class Q_UML_EXPORT QNamespace : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QPackageImport *> * packageImports READ packageImports) - Q_PROPERTY(const QSet<QNamedElement *> * members READ members) - Q_PROPERTY(const QSet<QPackageableElement *> * importedMembers READ importedMembers STORED false) - Q_PROPERTY(const QSet<QElementImport *> * elementImports READ elementImports) - Q_PROPERTY(const QSet<QConstraint *> * ownedRules READ ownedRules) - Q_PROPERTY(const QSet<QNamedElement *> * ownedMembers READ ownedMembers) + 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_DISABLE_COPY(QNamespace) Q_DECLARE_PRIVATE(QNamespace) @@ -83,25 +83,24 @@ public: virtual ~QNamespace(); // Association ends from QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Operations - Q_INVOKABLE const QSet<QPackageableElement *> *excludeCollisions(const QSet<QPackageableElement *> *imps) const; - Q_INVOKABLE const QSet<QString> *getNamesOfMember(const QNamedElement *element) const; - Q_INVOKABLE const QSet<QPackageableElement *> *importMembers(const QSet<QPackageableElement *> *imps) const; + Q_INVOKABLE const QSet<QPackageableElement *> &excludeCollisions(const QSet<QPackageableElement *> &imps) const; + Q_INVOKABLE const QSet<QString> getNamesOfMember(const QNamedElement *element) const; + Q_INVOKABLE const QSet<QPackageableElement *> &importMembers(const QSet<QPackageableElement *> &imps) const; Q_INVOKABLE bool membersAreDistinguishable() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QNamedElementPrivate; @@ -112,10 +111,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QNamespace) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *) - QT_END_HEADER #endif // QTUML_QNAMESPACE_H diff --git a/src/uml/qnamespace_p.h b/src/uml/qnamespace_p.h index 9dabe44f..c8cd1df0 100644 --- a/src/uml/qnamespace_p.h +++ b/src/uml/qnamespace_p.h @@ -70,11 +70,11 @@ public: explicit QNamespacePrivate(); virtual ~QNamespacePrivate(); - QSet<QPackageImport *> *packageImports; - QSet<QNamedElement *> *members; - QSet<QElementImport *> *elementImports; - QSet<QConstraint *> *ownedRules; - QSet<QNamedElement *> *ownedMembers; + QSet<QPackageImport *> packageImports; + QSet<QNamedElement *> members; + QSet<QElementImport *> elementImports; + QSet<QConstraint *> ownedRules; + QSet<QNamedElement *> ownedMembers; // Internal functions for read-only subsetted association ends void addMember(QNamedElement *member); diff --git a/src/uml/qnode.cpp b/src/uml/qnode.cpp index 0e35b1bb..7b620366 100644 --- a/src/uml/qnode.cpp +++ b/src/uml/qnode.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTUML -QNodePrivate::QNodePrivate() : - nestedNodes(new QSet<QNode *>) +QNodePrivate::QNodePrivate() { } QNodePrivate::~QNodePrivate() { - delete nestedNodes; } /*! @@ -87,7 +85,7 @@ QNode::~QNode() /*! The Elements owned by this element. */ -const QSet<QElement *> *QNode::ownedElements() const +const QSet<QElement *> &QNode::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -103,7 +101,7 @@ QElement *QNode::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QNode::ownedComments() const +const QSet<QComment *> &QNode::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -184,7 +182,7 @@ QNamespace *QNode::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QNode::clientDependencies() const +const QSet<QDependency *> &QNode::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -206,7 +204,7 @@ void QNode::removeClientDependency(QDependency *clientDependency) /*! The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget. */ -const QSet<QPackageableElement *> *QNode::deployedElements() const +const QSet<QPackageableElement *> &QNode::deployedElements() const { return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployedElements(); } @@ -214,7 +212,7 @@ const QSet<QPackageableElement *> *QNode::deployedElements() const /*! The set of Deployments for a DeploymentTarget. */ -const QSet<QDeployment *> *QNode::deployments() const +const QSet<QDeployment *> &QNode::deployments() const { return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployments(); } @@ -236,7 +234,7 @@ void QNode::removeDeployment(QDeployment *deployment) /*! The Nodes that are defined (nested) within the Node. */ -const QSet<QNode *> *QNode::nestedNodes() const +const QSet<QNode *> &QNode::nestedNodes() const { // This is a read-write association end @@ -249,8 +247,8 @@ void QNode::addNestedNode(QNode *nestedNode) // This is a read-write association end Q_D(QNode); - if (!d->nestedNodes->contains(nestedNode)) { - d->nestedNodes->insert(nestedNode); + if (!d->nestedNodes.contains(nestedNode)) { + d->nestedNodes.insert(nestedNode); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedNode)); @@ -262,29 +260,14 @@ void QNode::removeNestedNode(QNode *nestedNode) // This is a read-write association end Q_D(QNode); - if (d->nestedNodes->contains(nestedNode)) { - d->nestedNodes->remove(nestedNode); + if (d->nestedNodes.contains(nestedNode)) { + d->nestedNodes.remove(nestedNode); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedNode)); } } -void QNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNode) *>("QT_PREPEND_NAMESPACE_QTUML(QNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNode) *> *"); - qRegisterMetaType<QNode *>("QNode *"); - qRegisterMetaType<const QSet<QNode *> *>("const QSet<QNode *> *"); - qRegisterMetaType<const QList<QNode *> *>("const QList<QNode *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qnode.h b/src/uml/qnode.h index 3c614eec..4db15109 100644 --- a/src/uml/qnode.h +++ b/src/uml/qnode.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QNode : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QNode *> * nestedNodes READ nestedNodes) + Q_PROPERTY(QSet<QNode *> nestedNodes READ nestedNodes) Q_DISABLE_COPY(QNode) Q_DECLARE_PRIVATE(QNode) @@ -74,9 +74,9 @@ public: virtual ~QNode(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -91,21 +91,20 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QDeploymentTarget - Q_INVOKABLE const QSet<QPackageableElement *> *deployedElements() const; - Q_INVOKABLE const QSet<QDeployment *> *deployments() const; + Q_INVOKABLE const QSet<QPackageableElement *> &deployedElements() const; + Q_INVOKABLE const QSet<QDeployment *> &deployments() const; Q_INVOKABLE void addDeployment(QDeployment *deployment); Q_INVOKABLE void removeDeployment(QDeployment *deployment); // Association ends from QNode - Q_INVOKABLE const QSet<QNode *> *nestedNodes() const; + Q_INVOKABLE const QSet<QNode *> &nestedNodes() const; Q_INVOKABLE void addNestedNode(QNode *nestedNode); Q_INVOKABLE void removeNestedNode(QNode *nestedNode); - virtual void registerMetaTypes() const; protected: explicit QNode(QNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -117,10 +116,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QNode) *> *) - QT_END_HEADER #endif // QTUML_QNODE_H diff --git a/src/uml/qnode_p.h b/src/uml/qnode_p.h index c1fae920..9986559f 100644 --- a/src/uml/qnode_p.h +++ b/src/uml/qnode_p.h @@ -69,7 +69,7 @@ public: explicit QNodePrivate(); virtual ~QNodePrivate(); - QSet<QNode *> *nestedNodes; + QSet<QNode *> nestedNodes; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qobjectflow.cpp b/src/uml/qobjectflow.cpp index 1d63c3de..0d88b685 100644 --- a/src/uml/qobjectflow.cpp +++ b/src/uml/qobjectflow.cpp @@ -182,28 +182,6 @@ void QObjectFlow::setTransformation(QBehavior *transformation) } } -void QObjectFlow::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *>("QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *"); - qRegisterMetaType<QObjectFlow *>("QObjectFlow *"); - qRegisterMetaType<const QSet<QObjectFlow *> *>("const QSet<QObjectFlow *> *"); - qRegisterMetaType<const QList<QObjectFlow *> *>("const QList<QObjectFlow *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - QActivityEdge::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qobjectflow.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qobjectflow.h b/src/uml/qobjectflow.h index 8a4d8b6d..ea091f35 100644 --- a/src/uml/qobjectflow.h +++ b/src/uml/qobjectflow.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void setSelection(QBehavior *selection); Q_INVOKABLE QBehavior *transformation() const; Q_INVOKABLE void setTransformation(QBehavior *transformation); - virtual void registerMetaTypes() const; protected: explicit QObjectFlow(QObjectFlowPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectFlow) *> *) - QT_END_HEADER #endif // QTUML_QOBJECTFLOW_H diff --git a/src/uml/qobjectnode.cpp b/src/uml/qobjectnode.cpp index 002bb7ef..4ae96852 100644 --- a/src/uml/qobjectnode.cpp +++ b/src/uml/qobjectnode.cpp @@ -52,14 +52,12 @@ QObjectNodePrivate::QObjectNodePrivate() : isControlType(false), ordering(QtUml::ObjectNodeOrderingFIFO), upperBound(0), - selection(0), - inState(new QSet<QState *>) + selection(0) { } QObjectNodePrivate::~QObjectNodePrivate() { - delete inState; } /*! @@ -95,7 +93,7 @@ QObjectNode::~QObjectNode() /*! The Elements owned by this element. */ -const QSet<QElement *> *QObjectNode::ownedElements() const +const QSet<QElement *> &QObjectNode::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -111,7 +109,7 @@ QElement *QObjectNode::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QObjectNode::ownedComments() const +const QSet<QComment *> &QObjectNode::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -192,7 +190,7 @@ QNamespace *QObjectNode::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QObjectNode::clientDependencies() const +const QSet<QDependency *> &QObjectNode::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -236,7 +234,7 @@ void QObjectNode::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QObjectNode::redefinedElements() const +const QSet<QRedefinableElement *> &QObjectNode::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -244,7 +242,7 @@ const QSet<QRedefinableElement *> *QObjectNode::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QObjectNode::redefinitionContexts() const +const QSet<QClassifier *> &QObjectNode::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -256,7 +254,7 @@ const QSet<QClassifier *> *QObjectNode::redefinitionContexts() const /*! Inherited nodes replaced by this node in a specialization of the activity. */ -const QSet<QActivityNode *> *QObjectNode::redefinedNodes() const +const QSet<QActivityNode *> &QObjectNode::redefinedNodes() const { return (qwrappedobject_cast<const QActivityNode *>(this))->redefinedNodes(); } @@ -274,7 +272,7 @@ void QObjectNode::removeRedefinedNode(QActivityNode *redefinedNode) /*! Edges that have the node as target. */ -const QSet<QActivityEdge *> *QObjectNode::incomings() const +const QSet<QActivityEdge *> &QObjectNode::incomings() const { return (qwrappedobject_cast<const QActivityNode *>(this))->incomings(); } @@ -305,7 +303,7 @@ void QObjectNode::setActivity(QActivity *activity) /*! Groups containing the node. */ -const QSet<QActivityGroup *> *QObjectNode::inGroup() const +const QSet<QActivityGroup *> &QObjectNode::inGroup() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inGroup(); } @@ -326,7 +324,7 @@ void QObjectNode::setInStructuredNode(QStructuredActivityNode *inStructuredNode) /*! Partitions containing the node. */ -const QSet<QActivityPartition *> *QObjectNode::inPartition() const +const QSet<QActivityPartition *> &QObjectNode::inPartition() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inPartition(); } @@ -344,7 +342,7 @@ void QObjectNode::removeInPartition(QActivityPartition *inPartition) /*! Interruptible regions containing the node. */ -const QSet<QInterruptibleActivityRegion *> *QObjectNode::inInterruptibleRegion() const +const QSet<QInterruptibleActivityRegion *> &QObjectNode::inInterruptibleRegion() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); } @@ -362,7 +360,7 @@ void QObjectNode::removeInInterruptibleRegion(QInterruptibleActivityRegion *inIn /*! Edges that have the node as source. */ -const QSet<QActivityEdge *> *QObjectNode::outgoings() const +const QSet<QActivityEdge *> &QObjectNode::outgoings() const { return (qwrappedobject_cast<const QActivityNode *>(this))->outgoings(); } @@ -507,7 +505,7 @@ void QObjectNode::setSelection(QBehavior *selection) /*! The required states of the object available at this point in the activity. */ -const QSet<QState *> *QObjectNode::inState() const +const QSet<QState *> &QObjectNode::inState() const { // This is a read-write association end @@ -520,8 +518,8 @@ void QObjectNode::addInState(QState *inState) // This is a read-write association end Q_D(QObjectNode); - if (!d->inState->contains(inState)) { - d->inState->insert(inState); + if (!d->inState.contains(inState)) { + d->inState.insert(inState); } } @@ -530,47 +528,11 @@ void QObjectNode::removeInState(QState *inState) // This is a read-write association end Q_D(QObjectNode); - if (d->inState->contains(inState)) { - d->inState->remove(inState); + if (d->inState.contains(inState)) { + d->inState.remove(inState); } } -void QObjectNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *>("QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *"); - qRegisterMetaType<QObjectNode *>("QObjectNode *"); - qRegisterMetaType<const QSet<QObjectNode *> *>("const QSet<QObjectNode *> *"); - qRegisterMetaType<const QList<QObjectNode *> *>("const QList<QObjectNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QState) *>("QT_PREPEND_NAMESPACE_QTUML(QState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<QState *>("QState *"); - qRegisterMetaType<const QSet<QState *> *>("const QSet<QState *> *"); - qRegisterMetaType<const QList<QState *> *>("const QList<QState *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qobjectnode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qobjectnode.h b/src/uml/qobjectnode.h index ef084dc1..a39b6629 100644 --- a/src/uml/qobjectnode.h +++ b/src/uml/qobjectnode.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QObjectNode : public QWrappedObject 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(const QSet<QState *> * inState READ inState) + Q_PROPERTY(QSet<QState *> inState READ inState) Q_DISABLE_COPY(QObjectNode) Q_DECLARE_PRIVATE(QObjectNode) @@ -86,9 +86,9 @@ public: virtual ~QObjectNode(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,7 +103,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -113,28 +113,28 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QActivityNode - Q_INVOKABLE const QSet<QActivityNode *> *redefinedNodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &redefinedNodes() const; Q_INVOKABLE void addRedefinedNode(QActivityNode *redefinedNode); Q_INVOKABLE void removeRedefinedNode(QActivityNode *redefinedNode); - Q_INVOKABLE const QSet<QActivityEdge *> *incomings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &incomings() const; Q_INVOKABLE void addIncoming(QActivityEdge *incoming); Q_INVOKABLE void removeIncoming(QActivityEdge *incoming); Q_INVOKABLE QActivity *activity() const; Q_INVOKABLE void setActivity(QActivity *activity); - Q_INVOKABLE const QSet<QActivityGroup *> *inGroup() const; + Q_INVOKABLE const QSet<QActivityGroup *> &inGroup() const; Q_INVOKABLE QStructuredActivityNode *inStructuredNode() const; Q_INVOKABLE void setInStructuredNode(QStructuredActivityNode *inStructuredNode); - Q_INVOKABLE const QSet<QActivityPartition *> *inPartition() const; + Q_INVOKABLE const QSet<QActivityPartition *> &inPartition() const; Q_INVOKABLE void addInPartition(QActivityPartition *inPartition); Q_INVOKABLE void removeInPartition(QActivityPartition *inPartition); - Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> *inInterruptibleRegion() const; + Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> &inInterruptibleRegion() const; Q_INVOKABLE void addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); Q_INVOKABLE void removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); - Q_INVOKABLE const QSet<QActivityEdge *> *outgoings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &outgoings() const; Q_INVOKABLE void addOutgoing(QActivityEdge *outgoing); Q_INVOKABLE void removeOutgoing(QActivityEdge *outgoing); @@ -155,10 +155,9 @@ public: Q_INVOKABLE void setUpperBound(QValueSpecification *upperBound); Q_INVOKABLE QBehavior *selection() const; Q_INVOKABLE void setSelection(QBehavior *selection); - Q_INVOKABLE const QSet<QState *> *inState() const; + Q_INVOKABLE const QSet<QState *> &inState() const; Q_INVOKABLE void addInState(QState *inState); Q_INVOKABLE void removeInState(QState *inState); - virtual void registerMetaTypes() const; protected: explicit QObjectNode(QObjectNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -170,10 +169,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QObjectNode) *> *) - QT_END_HEADER #endif // QTUML_QOBJECTNODE_H diff --git a/src/uml/qobjectnode_p.h b/src/uml/qobjectnode_p.h index 9303eaec..5878aeb3 100644 --- a/src/uml/qobjectnode_p.h +++ b/src/uml/qobjectnode_p.h @@ -78,7 +78,7 @@ public: QtUml::ObjectNodeOrderingKind ordering; QValueSpecification *upperBound; QBehavior *selection; - QSet<QState *> *inState; + QSet<QState *> inState; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qobservation.cpp b/src/uml/qobservation.cpp index 3abd099c..7f34287f 100644 --- a/src/uml/qobservation.cpp +++ b/src/uml/qobservation.cpp @@ -74,21 +74,6 @@ QObservation::~QObservation() { } -void QObservation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObservation) *>("QT_PREPEND_NAMESPACE_QTUML(QObservation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *"); - qRegisterMetaType<QObservation *>("QObservation *"); - qRegisterMetaType<const QSet<QObservation *> *>("const QSet<QObservation *> *"); - qRegisterMetaType<const QList<QObservation *> *>("const QList<QObservation *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qobservation.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qobservation.h b/src/uml/qobservation.h index 62033f36..b1a59706 100644 --- a/src/uml/qobservation.h +++ b/src/uml/qobservation.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QObservation : public QPackageableElement public: Q_INVOKABLE explicit QObservation(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QObservation(); - virtual void registerMetaTypes() const; protected: explicit QObservation(QObservationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QObservation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *) - QT_END_HEADER #endif // QTUML_QOBSERVATION_H diff --git a/src/uml/qoccurrencespecification.cpp b/src/uml/qoccurrencespecification.cpp index d680fd33..93187846 100644 --- a/src/uml/qoccurrencespecification.cpp +++ b/src/uml/qoccurrencespecification.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QOccurrenceSpecificationPrivate::QOccurrenceSpecificationPrivate() : - covered(0), - toAfter(new QSet<QGeneralOrdering *>), - toBefore(new QSet<QGeneralOrdering *>) + covered(0) { } QOccurrenceSpecificationPrivate::~QOccurrenceSpecificationPrivate() { - delete toAfter; - delete toBefore; } /*! @@ -110,7 +106,7 @@ void QOccurrenceSpecification::setCovered(QLifeline *covered) /*! References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification */ -const QSet<QGeneralOrdering *> *QOccurrenceSpecification::toAfter() const +const QSet<QGeneralOrdering *> &QOccurrenceSpecification::toAfter() const { // This is a read-write association end @@ -123,8 +119,8 @@ void QOccurrenceSpecification::addToAfter(QGeneralOrdering *toAfter) // This is a read-write association end Q_D(QOccurrenceSpecification); - if (!d->toAfter->contains(toAfter)) { - d->toAfter->insert(toAfter); + if (!d->toAfter.contains(toAfter)) { + d->toAfter.insert(toAfter); // Adjust opposite property toAfter->setBefore(this); @@ -136,8 +132,8 @@ void QOccurrenceSpecification::removeToAfter(QGeneralOrdering *toAfter) // This is a read-write association end Q_D(QOccurrenceSpecification); - if (d->toAfter->contains(toAfter)) { - d->toAfter->remove(toAfter); + if (d->toAfter.contains(toAfter)) { + d->toAfter.remove(toAfter); // Adjust opposite property toAfter->setBefore(0); @@ -147,7 +143,7 @@ void QOccurrenceSpecification::removeToAfter(QGeneralOrdering *toAfter) /*! References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification */ -const QSet<QGeneralOrdering *> *QOccurrenceSpecification::toBefore() const +const QSet<QGeneralOrdering *> &QOccurrenceSpecification::toBefore() const { // This is a read-write association end @@ -160,8 +156,8 @@ void QOccurrenceSpecification::addToBefore(QGeneralOrdering *toBefore) // This is a read-write association end Q_D(QOccurrenceSpecification); - if (!d->toBefore->contains(toBefore)) { - d->toBefore->insert(toBefore); + if (!d->toBefore.contains(toBefore)) { + d->toBefore.insert(toBefore); // Adjust opposite property toBefore->setAfter(this); @@ -173,43 +169,14 @@ void QOccurrenceSpecification::removeToBefore(QGeneralOrdering *toBefore) // This is a read-write association end Q_D(QOccurrenceSpecification); - if (d->toBefore->contains(toBefore)) { - d->toBefore->remove(toBefore); + if (d->toBefore.contains(toBefore)) { + d->toBefore.remove(toBefore); // Adjust opposite property toBefore->setAfter(0); } } -void QOccurrenceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *"); - qRegisterMetaType<QOccurrenceSpecification *>("QOccurrenceSpecification *"); - qRegisterMetaType<const QSet<QOccurrenceSpecification *> *>("const QSet<QOccurrenceSpecification *> *"); - qRegisterMetaType<const QList<QOccurrenceSpecification *> *>("const QList<QOccurrenceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *>("QT_PREPEND_NAMESPACE_QTUML(QLifeline) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<QLifeline *>("QLifeline *"); - qRegisterMetaType<const QSet<QLifeline *> *>("const QSet<QLifeline *> *"); - qRegisterMetaType<const QList<QLifeline *> *>("const QList<QLifeline *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *>("QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QGeneralOrdering) *> *"); - qRegisterMetaType<QGeneralOrdering *>("QGeneralOrdering *"); - qRegisterMetaType<const QSet<QGeneralOrdering *> *>("const QSet<QGeneralOrdering *> *"); - qRegisterMetaType<const QList<QGeneralOrdering *> *>("const QList<QGeneralOrdering *> *"); - - QInteractionFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qoccurrencespecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoccurrencespecification.h b/src/uml/qoccurrencespecification.h index 4676272e..d04915f8 100644 --- a/src/uml/qoccurrencespecification.h +++ b/src/uml/qoccurrencespecification.h @@ -66,8 +66,8 @@ class Q_UML_EXPORT QOccurrenceSpecification : public QInteractionFragment Q_OBJECT Q_PROPERTY(QLifeline * covered READ covered WRITE setCovered) - Q_PROPERTY(const QSet<QGeneralOrdering *> * toAfter READ toAfter) - Q_PROPERTY(const QSet<QGeneralOrdering *> * toBefore READ toBefore) + Q_PROPERTY(QSet<QGeneralOrdering *> toAfter READ toAfter) + Q_PROPERTY(QSet<QGeneralOrdering *> toBefore READ toBefore) Q_DISABLE_COPY(QOccurrenceSpecification) Q_DECLARE_PRIVATE(QOccurrenceSpecification) @@ -79,13 +79,12 @@ public: // Association ends from QOccurrenceSpecification Q_INVOKABLE QLifeline *covered() const; Q_INVOKABLE void setCovered(QLifeline *covered); - Q_INVOKABLE const QSet<QGeneralOrdering *> *toAfter() const; + Q_INVOKABLE const QSet<QGeneralOrdering *> &toAfter() const; Q_INVOKABLE void addToAfter(QGeneralOrdering *toAfter); Q_INVOKABLE void removeToAfter(QGeneralOrdering *toAfter); - Q_INVOKABLE const QSet<QGeneralOrdering *> *toBefore() const; + Q_INVOKABLE const QSet<QGeneralOrdering *> &toBefore() const; Q_INVOKABLE void addToBefore(QGeneralOrdering *toBefore); Q_INVOKABLE void removeToBefore(QGeneralOrdering *toBefore); - virtual void registerMetaTypes() const; protected: explicit QOccurrenceSpecification(QOccurrenceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOccurrenceSpecification) *> *) - QT_END_HEADER #endif // QTUML_QOCCURRENCESPECIFICATION_H diff --git a/src/uml/qoccurrencespecification_p.h b/src/uml/qoccurrencespecification_p.h index eeb4946c..78c16c0f 100644 --- a/src/uml/qoccurrencespecification_p.h +++ b/src/uml/qoccurrencespecification_p.h @@ -69,8 +69,8 @@ public: virtual ~QOccurrenceSpecificationPrivate(); QLifeline *covered; - QSet<QGeneralOrdering *> *toAfter; - QSet<QGeneralOrdering *> *toBefore; + QSet<QGeneralOrdering *> toAfter; + QSet<QGeneralOrdering *> toBefore; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaqueaction.cpp b/src/uml/qopaqueaction.cpp index bc43f63b..34eaf63e 100644 --- a/src/uml/qopaqueaction.cpp +++ b/src/uml/qopaqueaction.cpp @@ -47,20 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML -QOpaqueActionPrivate::QOpaqueActionPrivate() : - bodies(new QList<QString>), - languages(new QList<QString>), - inputValues(new QSet<QInputPin *>), - outputValues(new QSet<QOutputPin *>) +QOpaqueActionPrivate::QOpaqueActionPrivate() { } QOpaqueActionPrivate::~QOpaqueActionPrivate() { - delete bodies; - delete languages; - delete inputValues; - delete outputValues; } /*! @@ -92,7 +84,7 @@ QOpaqueAction::~QOpaqueAction() /*! Specifies the action in one or more languages. */ -const QList<QString> *QOpaqueAction::bodies() const +const QList<QString> QOpaqueAction::bodies() const { // This is a read-write attribute @@ -105,8 +97,8 @@ void QOpaqueAction::addBody(QString body) // This is a read-write attribute Q_D(QOpaqueAction); - if (!d->bodies->contains(body)) { - d->bodies->append(body); + if (!d->bodies.contains(body)) { + d->bodies.append(body); } } @@ -115,15 +107,15 @@ void QOpaqueAction::removeBody(QString body) // This is a read-write attribute Q_D(QOpaqueAction); - if (d->bodies->contains(body)) { - d->bodies->removeAll(body); + if (d->bodies.contains(body)) { + d->bodies.removeAll(body); } } /*! Languages the body strings use, in the same order as the body strings */ -const QList<QString> *QOpaqueAction::languages() const +const QList<QString> QOpaqueAction::languages() const { // This is a read-write attribute @@ -136,8 +128,8 @@ void QOpaqueAction::addLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueAction); - if (!d->languages->contains(language)) { - d->languages->append(language); + if (!d->languages.contains(language)) { + d->languages.append(language); } } @@ -146,8 +138,8 @@ void QOpaqueAction::removeLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueAction); - if (d->languages->contains(language)) { - d->languages->removeAll(language); + if (d->languages.contains(language)) { + d->languages.removeAll(language); } } @@ -158,7 +150,7 @@ void QOpaqueAction::removeLanguage(QString language) /*! Provides input to the action. */ -const QSet<QInputPin *> *QOpaqueAction::inputValues() const +const QSet<QInputPin *> &QOpaqueAction::inputValues() const { // This is a read-write association end @@ -171,8 +163,8 @@ void QOpaqueAction::addInputValue(QInputPin *inputValue) // This is a read-write association end Q_D(QOpaqueAction); - if (!d->inputValues->contains(inputValue)) { - d->inputValues->insert(inputValue); + if (!d->inputValues.contains(inputValue)) { + d->inputValues.insert(inputValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(inputValue)); @@ -184,8 +176,8 @@ void QOpaqueAction::removeInputValue(QInputPin *inputValue) // This is a read-write association end Q_D(QOpaqueAction); - if (d->inputValues->contains(inputValue)) { - d->inputValues->remove(inputValue); + if (d->inputValues.contains(inputValue)) { + d->inputValues.remove(inputValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(inputValue)); @@ -195,7 +187,7 @@ void QOpaqueAction::removeInputValue(QInputPin *inputValue) /*! Takes output from the action. */ -const QSet<QOutputPin *> *QOpaqueAction::outputValues() const +const QSet<QOutputPin *> &QOpaqueAction::outputValues() const { // This is a read-write association end @@ -208,8 +200,8 @@ void QOpaqueAction::addOutputValue(QOutputPin *outputValue) // This is a read-write association end Q_D(QOpaqueAction); - if (!d->outputValues->contains(outputValue)) { - d->outputValues->insert(outputValue); + if (!d->outputValues.contains(outputValue)) { + d->outputValues.insert(outputValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(outputValue)); @@ -221,43 +213,14 @@ void QOpaqueAction::removeOutputValue(QOutputPin *outputValue) // This is a read-write association end Q_D(QOpaqueAction); - if (d->outputValues->contains(outputValue)) { - d->outputValues->remove(outputValue); + if (d->outputValues.contains(outputValue)) { + d->outputValues.remove(outputValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(outputValue)); } } -void QOpaqueAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *>("QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *> *"); - qRegisterMetaType<QOpaqueAction *>("QOpaqueAction *"); - qRegisterMetaType<const QSet<QOpaqueAction *> *>("const QSet<QOpaqueAction *> *"); - qRegisterMetaType<const QList<QOpaqueAction *> *>("const QList<QOpaqueAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qopaqueaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaqueaction.h b/src/uml/qopaqueaction.h index 1759e93f..d1424368 100644 --- a/src/uml/qopaqueaction.h +++ b/src/uml/qopaqueaction.h @@ -67,10 +67,10 @@ class Q_UML_EXPORT QOpaqueAction : public QAction { Q_OBJECT - Q_PROPERTY(const QList<QString> * bodies READ bodies) - Q_PROPERTY(const QList<QString> * languages READ languages) - Q_PROPERTY(const QSet<QInputPin *> * inputValues READ inputValues) - Q_PROPERTY(const QSet<QOutputPin *> * outputValues READ outputValues) + 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_DISABLE_COPY(QOpaqueAction) Q_DECLARE_PRIVATE(QOpaqueAction) @@ -80,21 +80,20 @@ public: virtual ~QOpaqueAction(); // Attributes from QOpaqueAction - Q_INVOKABLE const QList<QString> *bodies() const; + Q_INVOKABLE const QList<QString> bodies() const; Q_INVOKABLE void addBody(QString body); Q_INVOKABLE void removeBody(QString body); - Q_INVOKABLE const QList<QString> *languages() const; + Q_INVOKABLE const QList<QString> languages() const; Q_INVOKABLE void addLanguage(QString language); Q_INVOKABLE void removeLanguage(QString language); // Association ends from QOpaqueAction - Q_INVOKABLE const QSet<QInputPin *> *inputValues() const; + Q_INVOKABLE const QSet<QInputPin *> &inputValues() const; Q_INVOKABLE void addInputValue(QInputPin *inputValue); Q_INVOKABLE void removeInputValue(QInputPin *inputValue); - Q_INVOKABLE const QSet<QOutputPin *> *outputValues() const; + Q_INVOKABLE const QSet<QOutputPin *> &outputValues() const; Q_INVOKABLE void addOutputValue(QOutputPin *outputValue); Q_INVOKABLE void removeOutputValue(QOutputPin *outputValue); - virtual void registerMetaTypes() const; protected: explicit QOpaqueAction(QOpaqueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -102,10 +101,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueAction) *> *) - QT_END_HEADER #endif // QTUML_QOPAQUEACTION_H diff --git a/src/uml/qopaqueaction_p.h b/src/uml/qopaqueaction_p.h index 5d038bda..cb9cbe11 100644 --- a/src/uml/qopaqueaction_p.h +++ b/src/uml/qopaqueaction_p.h @@ -70,10 +70,10 @@ public: explicit QOpaqueActionPrivate(); virtual ~QOpaqueActionPrivate(); - QList<QString> *bodies; - QList<QString> *languages; - QSet<QInputPin *> *inputValues; - QSet<QOutputPin *> *outputValues; + QList<QString> bodies; + QList<QString> languages; + QSet<QInputPin *> inputValues; + QSet<QOutputPin *> outputValues; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaquebehavior.cpp b/src/uml/qopaquebehavior.cpp index 57355938..0f13094b 100644 --- a/src/uml/qopaquebehavior.cpp +++ b/src/uml/qopaquebehavior.cpp @@ -44,16 +44,12 @@ QT_BEGIN_NAMESPACE_QTUML -QOpaqueBehaviorPrivate::QOpaqueBehaviorPrivate() : - languages(new QList<QString>), - bodies(new QList<QString>) +QOpaqueBehaviorPrivate::QOpaqueBehaviorPrivate() { } QOpaqueBehaviorPrivate::~QOpaqueBehaviorPrivate() { - delete languages; - delete bodies; } /*! @@ -85,7 +81,7 @@ QOpaqueBehavior::~QOpaqueBehavior() /*! Languages the body strings use in the same order as the body strings. */ -const QList<QString> *QOpaqueBehavior::languages() const +const QList<QString> QOpaqueBehavior::languages() const { // This is a read-write attribute @@ -98,8 +94,8 @@ void QOpaqueBehavior::addLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueBehavior); - if (!d->languages->contains(language)) { - d->languages->append(language); + if (!d->languages.contains(language)) { + d->languages.append(language); } } @@ -108,15 +104,15 @@ void QOpaqueBehavior::removeLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueBehavior); - if (d->languages->contains(language)) { - d->languages->removeAll(language); + if (d->languages.contains(language)) { + d->languages.removeAll(language); } } /*! Specifies the behavior in one or more languages. */ -const QList<QString> *QOpaqueBehavior::bodies() const +const QList<QString> QOpaqueBehavior::bodies() const { // This is a read-write attribute @@ -129,8 +125,8 @@ void QOpaqueBehavior::addBody(QString body) // This is a read-write attribute Q_D(QOpaqueBehavior); - if (!d->bodies->contains(body)) { - d->bodies->append(body); + if (!d->bodies.contains(body)) { + d->bodies.append(body); } } @@ -139,26 +135,11 @@ void QOpaqueBehavior::removeBody(QString body) // This is a read-write attribute Q_D(QOpaqueBehavior); - if (d->bodies->contains(body)) { - d->bodies->removeAll(body); + if (d->bodies.contains(body)) { + d->bodies.removeAll(body); } } -void QOpaqueBehavior::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *> *"); - qRegisterMetaType<QOpaqueBehavior *>("QOpaqueBehavior *"); - qRegisterMetaType<const QSet<QOpaqueBehavior *> *>("const QSet<QOpaqueBehavior *> *"); - qRegisterMetaType<const QList<QOpaqueBehavior *> *>("const QList<QOpaqueBehavior *> *"); - - QBehavior::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qopaquebehavior.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaquebehavior.h b/src/uml/qopaquebehavior.h index 2929d278..5c18832e 100644 --- a/src/uml/qopaquebehavior.h +++ b/src/uml/qopaquebehavior.h @@ -62,8 +62,8 @@ class Q_UML_EXPORT QOpaqueBehavior : public QBehavior { Q_OBJECT - Q_PROPERTY(const QList<QString> * languages READ languages) - Q_PROPERTY(const QList<QString> * bodies READ bodies) + Q_PROPERTY(QList<QString> languages READ languages) + Q_PROPERTY(QList<QString> bodies READ bodies) Q_DISABLE_COPY(QOpaqueBehavior) Q_DECLARE_PRIVATE(QOpaqueBehavior) @@ -73,13 +73,12 @@ public: virtual ~QOpaqueBehavior(); // Attributes from QOpaqueBehavior - Q_INVOKABLE const QList<QString> *languages() const; + Q_INVOKABLE const QList<QString> languages() const; Q_INVOKABLE void addLanguage(QString language); Q_INVOKABLE void removeLanguage(QString language); - Q_INVOKABLE const QList<QString> *bodies() const; + Q_INVOKABLE const QList<QString> bodies() const; Q_INVOKABLE void addBody(QString body); Q_INVOKABLE void removeBody(QString body); - virtual void registerMetaTypes() const; protected: explicit QOpaqueBehavior(QOpaqueBehaviorPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueBehavior) *> *) - QT_END_HEADER #endif // QTUML_QOPAQUEBEHAVIOR_H diff --git a/src/uml/qopaquebehavior_p.h b/src/uml/qopaquebehavior_p.h index 75e85f1a..8d97d5d2 100644 --- a/src/uml/qopaquebehavior_p.h +++ b/src/uml/qopaquebehavior_p.h @@ -65,8 +65,8 @@ public: explicit QOpaqueBehaviorPrivate(); virtual ~QOpaqueBehaviorPrivate(); - QList<QString> *languages; - QList<QString> *bodies; + QList<QString> languages; + QList<QString> bodies; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaqueexpression.cpp b/src/uml/qopaqueexpression.cpp index 3b235f0c..59d9bc39 100644 --- a/src/uml/qopaqueexpression.cpp +++ b/src/uml/qopaqueexpression.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() : - bodies(new QList<QString>), - languages(new QList<QString>), behavior(0) { } QOpaqueExpressionPrivate::~QOpaqueExpressionPrivate() { - delete bodies; - delete languages; } /*! @@ -89,7 +85,7 @@ QOpaqueExpression::~QOpaqueExpression() /*! The text of the expression, possibly in multiple languages. */ -const QList<QString> *QOpaqueExpression::bodies() const +const QList<QString> QOpaqueExpression::bodies() const { // This is a read-write attribute @@ -102,8 +98,8 @@ void QOpaqueExpression::addBody(QString body) // This is a read-write attribute Q_D(QOpaqueExpression); - if (!d->bodies->contains(body)) { - d->bodies->append(body); + if (!d->bodies.contains(body)) { + d->bodies.append(body); } } @@ -112,15 +108,15 @@ void QOpaqueExpression::removeBody(QString body) // This is a read-write attribute Q_D(QOpaqueExpression); - if (d->bodies->contains(body)) { - d->bodies->removeAll(body); + if (d->bodies.contains(body)) { + d->bodies.removeAll(body); } } /*! 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. */ -const QList<QString> *QOpaqueExpression::languages() const +const QList<QString> QOpaqueExpression::languages() const { // This is a read-write attribute @@ -133,8 +129,8 @@ void QOpaqueExpression::addLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueExpression); - if (!d->languages->contains(language)) { - d->languages->append(language); + if (!d->languages.contains(language)) { + d->languages.append(language); } } @@ -143,8 +139,8 @@ void QOpaqueExpression::removeLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueExpression); - if (d->languages->contains(language)) { - d->languages->removeAll(language); + if (d->languages.contains(language)) { + d->languages.removeAll(language); } } @@ -225,35 +221,6 @@ qint32 QOpaqueExpression::value() const return qint32(); // change here to your derived return } -void QOpaqueExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *"); - qRegisterMetaType<QOpaqueExpression *>("QOpaqueExpression *"); - qRegisterMetaType<const QSet<QOpaqueExpression *> *>("const QSet<QOpaqueExpression *> *"); - qRegisterMetaType<const QList<QOpaqueExpression *> *>("const QList<QOpaqueExpression *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qopaqueexpression.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qopaqueexpression.h b/src/uml/qopaqueexpression.h index 5c974834..cd5a205e 100644 --- a/src/uml/qopaqueexpression.h +++ b/src/uml/qopaqueexpression.h @@ -66,8 +66,8 @@ class Q_UML_EXPORT QOpaqueExpression : public QValueSpecification { Q_OBJECT - Q_PROPERTY(const QList<QString> * bodies READ bodies) - Q_PROPERTY(const QList<QString> * languages READ languages) + 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) @@ -79,10 +79,10 @@ public: virtual ~QOpaqueExpression(); // Attributes from QOpaqueExpression - Q_INVOKABLE const QList<QString> *bodies() const; + Q_INVOKABLE const QList<QString> bodies() const; Q_INVOKABLE void addBody(QString body); Q_INVOKABLE void removeBody(QString body); - Q_INVOKABLE const QList<QString> *languages() const; + Q_INVOKABLE const QList<QString> languages() const; Q_INVOKABLE void addLanguage(QString language); Q_INVOKABLE void removeLanguage(QString language); @@ -96,7 +96,6 @@ public: Q_INVOKABLE bool isNonNegative() const; Q_INVOKABLE bool isPositive() const; Q_INVOKABLE qint32 value() const; - virtual void registerMetaTypes() const; protected: explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -104,10 +103,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOpaqueExpression) *> *) - QT_END_HEADER #endif // QTUML_QOPAQUEEXPRESSION_H diff --git a/src/uml/qopaqueexpression_p.h b/src/uml/qopaqueexpression_p.h index 5ba44840..d8802c1a 100644 --- a/src/uml/qopaqueexpression_p.h +++ b/src/uml/qopaqueexpression_p.h @@ -69,8 +69,8 @@ public: explicit QOpaqueExpressionPrivate(); virtual ~QOpaqueExpressionPrivate(); - QList<QString> *bodies; - QList<QString> *languages; + QList<QString> bodies; + QList<QString> languages; QBehavior *behavior; }; diff --git a/src/uml/qoperation.cpp b/src/uml/qoperation.cpp index ef8bf98f..58c85778 100644 --- a/src/uml/qoperation.cpp +++ b/src/uml/qoperation.cpp @@ -55,26 +55,17 @@ QT_BEGIN_NAMESPACE_QTUML QOperationPrivate::QOperationPrivate() : isQuery(false), - ownedParameters(new QList<QParameter *>), bodyCondition(0), - redefinedOperations(new QSet<QOperation *>), - postconditions(new QSet<QConstraint *>), datatype(0), templateParameter(0), interface(0), - preconditions(new QSet<QConstraint *>), - class_(0), - raisedExceptions(new QSet<QType *>) + class_(0) { } QOperationPrivate::~QOperationPrivate() { - delete ownedParameters; - delete redefinedOperations; - delete postconditions; - delete preconditions; - delete raisedExceptions; + qDeleteAll(ownedParameters); } /*! @@ -112,7 +103,7 @@ QOperation::~QOperation() /*! The Elements owned by this element. */ -const QSet<QElement *> *QOperation::ownedElements() const +const QSet<QElement *> &QOperation::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -128,7 +119,7 @@ QElement *QOperation::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QOperation::ownedComments() const +const QSet<QComment *> &QOperation::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -163,7 +154,7 @@ void QOperation::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSign /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QOperation::templateBindings() const +const QSet<QTemplateBinding *> &QOperation::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -244,7 +235,7 @@ QNamespace *QOperation::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QOperation::clientDependencies() const +const QSet<QDependency *> &QOperation::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -266,7 +257,7 @@ void QOperation::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QOperation::packageImports() const +const QSet<QPackageImport *> &QOperation::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -284,7 +275,7 @@ void QOperation::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QOperation::members() const +const QSet<QNamedElement *> &QOperation::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -292,7 +283,7 @@ const QSet<QNamedElement *> *QOperation::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QOperation::importedMembers() const +const QSet<QPackageableElement *> &QOperation::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -300,7 +291,7 @@ const QSet<QPackageableElement *> *QOperation::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QOperation::elementImports() const +const QSet<QElementImport *> &QOperation::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -318,7 +309,7 @@ void QOperation::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QOperation::ownedRules() const +const QSet<QConstraint *> &QOperation::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -336,7 +327,7 @@ void QOperation::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QOperation::ownedMembers() const +const QSet<QNamedElement *> &QOperation::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -370,7 +361,7 @@ void QOperation::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QOperation::redefinedElements() const +const QSet<QRedefinableElement *> &QOperation::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -378,7 +369,7 @@ const QSet<QRedefinableElement *> *QOperation::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QOperation::redefinitionContexts() const +const QSet<QClassifier *> &QOperation::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -412,7 +403,7 @@ void QOperation::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QOperation::featuringClassifiers() const +const QSet<QClassifier *> &QOperation::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -464,7 +455,7 @@ void QOperation::unsetAbstract() /*! The ParameterSets owned by this BehavioralFeature. */ -const QSet<QParameterSet *> *QOperation::ownedParameterSets() const +const QSet<QParameterSet *> &QOperation::ownedParameterSets() const { return (qwrappedobject_cast<const QBehavioralFeature *>(this))->ownedParameterSets(); } @@ -482,7 +473,7 @@ void QOperation::removeOwnedParameterSet(QParameterSet *ownedParameterSet) /*! 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). */ -const QSet<QBehavior *> *QOperation::methods() const +const QSet<QBehavior *> &QOperation::methods() const { return (qwrappedobject_cast<const QBehavioralFeature *>(this))->methods(); } @@ -599,7 +590,7 @@ bool QOperation::isOrdered() const /*! Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation. */ -const QList<QParameter *> *QOperation::ownedParameters() const +const QList<QParameter *> &QOperation::ownedParameters() const { // This is a read-write association end @@ -612,8 +603,8 @@ void QOperation::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QOperation); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); qTopLevelWrapper(ownedParameter)->setParent(qTopLevelWrapper(this)); // Adjust opposite property @@ -626,8 +617,8 @@ void QOperation::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QOperation); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); qTopLevelWrapper(ownedParameter)->setParent(0); // Adjust opposite property @@ -667,7 +658,7 @@ void QOperation::setBodyCondition(QConstraint *bodyCondition) /*! References the Operations that are redefined by this Operation. */ -const QSet<QOperation *> *QOperation::redefinedOperations() const +const QSet<QOperation *> &QOperation::redefinedOperations() const { // This is a read-write association end @@ -680,8 +671,8 @@ void QOperation::addRedefinedOperation(QOperation *redefinedOperation) // This is a read-write association end Q_D(QOperation); - if (!d->redefinedOperations->contains(redefinedOperation)) { - d->redefinedOperations->insert(redefinedOperation); + if (!d->redefinedOperations.contains(redefinedOperation)) { + d->redefinedOperations.insert(redefinedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); @@ -693,8 +684,8 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) // This is a read-write association end Q_D(QOperation); - if (d->redefinedOperations->contains(redefinedOperation)) { - d->redefinedOperations->remove(redefinedOperation); + if (d->redefinedOperations.contains(redefinedOperation)) { + d->redefinedOperations.remove(redefinedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); @@ -704,7 +695,7 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) /*! An optional set of Constraints specifying the state of the system when the Operation is completed. */ -const QSet<QConstraint *> *QOperation::postconditions() const +const QSet<QConstraint *> &QOperation::postconditions() const { // This is a read-write association end @@ -717,8 +708,8 @@ void QOperation::addPostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QOperation); - if (!d->postconditions->contains(postcondition)) { - d->postconditions->insert(postcondition); + if (!d->postconditions.contains(postcondition)) { + d->postconditions.insert(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -730,8 +721,8 @@ void QOperation::removePostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QOperation); - if (d->postconditions->contains(postcondition)) { - d->postconditions->remove(postcondition); + if (d->postconditions.contains(postcondition)) { + d->postconditions.remove(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -863,7 +854,7 @@ QType *QOperation::type() const /*! An optional set of Constraints on the state of the system when the Operation is invoked. */ -const QSet<QConstraint *> *QOperation::preconditions() const +const QSet<QConstraint *> &QOperation::preconditions() const { // This is a read-write association end @@ -876,8 +867,8 @@ void QOperation::addPrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QOperation); - if (!d->preconditions->contains(precondition)) { - d->preconditions->insert(precondition); + if (!d->preconditions.contains(precondition)) { + d->preconditions.insert(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -889,8 +880,8 @@ void QOperation::removePrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QOperation); - if (d->preconditions->contains(precondition)) { - d->preconditions->remove(precondition); + if (d->preconditions.contains(precondition)) { + d->preconditions.remove(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -942,7 +933,7 @@ void QOperation::setClass_(QClass *class_) /*! References the Types representing exceptions that may be raised during an invocation of this operation. */ -const QSet<QType *> *QOperation::raisedExceptions() const +const QSet<QType *> &QOperation::raisedExceptions() const { // This is a read-write association end @@ -955,8 +946,8 @@ void QOperation::addRaisedException(QType *raisedException) // This is a read-write association end Q_D(QOperation); - if (!d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->insert(raisedException); + if (!d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.insert(raisedException); } } @@ -965,8 +956,8 @@ void QOperation::removeRaisedException(QType *raisedException) // This is a read-write association end Q_D(QOperation); - if (d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->remove(raisedException); + if (d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.remove(raisedException); } } @@ -984,82 +975,11 @@ bool QOperation::isConsistentWith(const QRedefinableElement *redefinee) const /*! The query returnResult() returns the set containing the return parameter of the Operation if one exists, otherwise, it returns an empty set */ -const QSet<QParameter *> *QOperation::returnResult() const +const QSet<QParameter *> &QOperation::returnResult() const { qWarning("QOperation::returnResult: operation to be implemented"); - return 0; // change here to your derived return -} - -void QOperation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *"); - qRegisterMetaType<QOperationTemplateParameter *>("QOperationTemplateParameter *"); - qRegisterMetaType<const QSet<QOperationTemplateParameter *> *>("const QSet<QOperationTemplateParameter *> *"); - qRegisterMetaType<const QList<QOperationTemplateParameter *> *>("const QList<QOperationTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterface) *>("QT_PREPEND_NAMESPACE_QTUML(QInterface) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<QInterface *>("QInterface *"); - qRegisterMetaType<const QSet<QInterface *> *>("const QSet<QInterface *> *"); - qRegisterMetaType<const QList<QInterface *> *>("const QList<QInterface *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDataType) *>("QT_PREPEND_NAMESPACE_QTUML(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClass) *>("QT_PREPEND_NAMESPACE_QTUML(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QParameter *>); // change here to your derived return } #include "moc_qoperation.cpp" diff --git a/src/uml/qoperation.h b/src/uml/qoperation.h index c7767f38..a948da68 100644 --- a/src/uml/qoperation.h +++ b/src/uml/qoperation.h @@ -81,17 +81,17 @@ class Q_UML_EXPORT QOperation : public QWrappedObject 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(const QList<QParameter *> * ownedParameters READ ownedParameters) + Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) Q_PROPERTY(QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) - Q_PROPERTY(const QSet<QOperation *> * redefinedOperations READ redefinedOperations) - Q_PROPERTY(const QSet<QConstraint *> * postconditions READ postconditions) + 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(const QSet<QConstraint *> * preconditions READ preconditions) + Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(const QSet<QType *> * raisedExceptions READ raisedExceptions) + Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) Q_DISABLE_COPY(QOperation) Q_DECLARE_PRIVATE(QOperation) @@ -101,16 +101,16 @@ public: virtual ~QOperation(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QTemplateableElement Q_INVOKABLE QTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -125,23 +125,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QRedefinableElement Q_INVOKABLE bool isLeaf() const; @@ -149,8 +149,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -158,7 +158,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Attributes from aggregated QBehavioralFeature Q_INVOKABLE QtUml::CallConcurrencyKind concurrency() const; @@ -169,10 +169,10 @@ public: Q_INVOKABLE void unsetAbstract(); // Association ends from aggregated QBehavioralFeature - Q_INVOKABLE const QSet<QParameterSet *> *ownedParameterSets() const; + Q_INVOKABLE const QSet<QParameterSet *> &ownedParameterSets() const; Q_INVOKABLE void addOwnedParameterSet(QParameterSet *ownedParameterSet); Q_INVOKABLE void removeOwnedParameterSet(QParameterSet *ownedParameterSet); - Q_INVOKABLE const QSet<QBehavior *> *methods() const; + Q_INVOKABLE const QSet<QBehavior *> &methods() const; Q_INVOKABLE void addMethod(QBehavior *method); Q_INVOKABLE void removeMethod(QBehavior *method); @@ -190,15 +190,15 @@ public: Q_INVOKABLE bool isOrdered() const; // Association ends from QOperation - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE QConstraint *bodyCondition() const; Q_INVOKABLE void setBodyCondition(QConstraint *bodyCondition); - Q_INVOKABLE const QSet<QOperation *> *redefinedOperations() const; + Q_INVOKABLE const QSet<QOperation *> &redefinedOperations() const; Q_INVOKABLE void addRedefinedOperation(QOperation *redefinedOperation); Q_INVOKABLE void removeRedefinedOperation(QOperation *redefinedOperation); - Q_INVOKABLE const QSet<QConstraint *> *postconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &postconditions() const; Q_INVOKABLE void addPostcondition(QConstraint *postcondition); Q_INVOKABLE void removePostcondition(QConstraint *postcondition); Q_INVOKABLE QDataType *datatype() const; @@ -208,19 +208,18 @@ public: Q_INVOKABLE QInterface *interface() const; Q_INVOKABLE void setInterface(QInterface *interface); Q_INVOKABLE QType *type() const; - Q_INVOKABLE const QSet<QConstraint *> *preconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &preconditions() const; Q_INVOKABLE void addPrecondition(QConstraint *precondition); Q_INVOKABLE void removePrecondition(QConstraint *precondition); Q_INVOKABLE QClass *class_() const; Q_INVOKABLE void setClass_(QClass *class_); - Q_INVOKABLE const QSet<QType *> *raisedExceptions() const; + Q_INVOKABLE const QSet<QType *> &raisedExceptions() const; Q_INVOKABLE void addRaisedException(QType *raisedException); Q_INVOKABLE void removeRaisedException(QType *raisedException); // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; - Q_INVOKABLE const QSet<QParameter *> *returnResult() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QParameter *> &returnResult() const; protected: explicit QOperation(QOperationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -233,10 +232,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOperation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *) - QT_END_HEADER #endif // QTUML_QOPERATION_H diff --git a/src/uml/qoperation_p.h b/src/uml/qoperation_p.h index ecadbf7e..02c8273c 100644 --- a/src/uml/qoperation_p.h +++ b/src/uml/qoperation_p.h @@ -80,16 +80,16 @@ public: virtual ~QOperationPrivate(); bool isQuery; - QList<QParameter *> *ownedParameters; + QList<QParameter *> ownedParameters; QConstraint *bodyCondition; - QSet<QOperation *> *redefinedOperations; - QSet<QConstraint *> *postconditions; + QSet<QOperation *> redefinedOperations; + QSet<QConstraint *> postconditions; QDataType *datatype; QOperationTemplateParameter *templateParameter; QInterface *interface; - QSet<QConstraint *> *preconditions; + QSet<QConstraint *> preconditions; QClass *class_; - QSet<QType *> *raisedExceptions; + QSet<QType *> raisedExceptions; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoperationtemplateparameter.cpp b/src/uml/qoperationtemplateparameter.cpp index 8a9c1e96..b06ca22b 100644 --- a/src/uml/qoperationtemplateparameter.cpp +++ b/src/uml/qoperationtemplateparameter.cpp @@ -107,28 +107,6 @@ void QOperationTemplateParameter::setParameteredElement(QOperation *parameteredE } } -void QOperationTemplateParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *"); - qRegisterMetaType<QOperationTemplateParameter *>("QOperationTemplateParameter *"); - qRegisterMetaType<const QSet<QOperationTemplateParameter *> *>("const QSet<QOperationTemplateParameter *> *"); - qRegisterMetaType<const QList<QOperationTemplateParameter *> *>("const QList<QOperationTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QTemplateParameter::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qoperationtemplateparameter.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoperationtemplateparameter.h b/src/uml/qoperationtemplateparameter.h index e9ec6987..dbe2efc9 100644 --- a/src/uml/qoperationtemplateparameter.h +++ b/src/uml/qoperationtemplateparameter.h @@ -73,7 +73,6 @@ public: // Association ends from QOperationTemplateParameter Q_INVOKABLE QOperation *parameteredElement() const; Q_INVOKABLE void setParameteredElement(QOperation *parameteredElement); - virtual void registerMetaTypes() const; protected: explicit QOperationTemplateParameter(QOperationTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOperationTemplateParameter) *> *) - QT_END_HEADER #endif // QTUML_QOPERATIONTEMPLATEPARAMETER_H diff --git a/src/uml/qoutputpin.cpp b/src/uml/qoutputpin.cpp index 72059ac9..e5e31f19 100644 --- a/src/uml/qoutputpin.cpp +++ b/src/uml/qoutputpin.cpp @@ -74,21 +74,6 @@ QOutputPin::~QOutputPin() { } -void QOutputPin::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QPin::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qoutputpin.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qoutputpin.h b/src/uml/qoutputpin.h index d606a231..1087b385 100644 --- a/src/uml/qoutputpin.h +++ b/src/uml/qoutputpin.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QOutputPin : public QPin public: Q_INVOKABLE explicit QOutputPin(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QOutputPin(); - virtual void registerMetaTypes() const; protected: explicit QOutputPin(QOutputPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *) - QT_END_HEADER #endif // QTUML_QOUTPUTPIN_H diff --git a/src/uml/qpackage.cpp b/src/uml/qpackage.cpp index f41fdd7c..07fdc2fb 100644 --- a/src/uml/qpackage.cpp +++ b/src/uml/qpackage.cpp @@ -52,18 +52,12 @@ QT_BEGIN_NAMESPACE_QTUML QPackagePrivate::QPackagePrivate() : - packagedElements(new QSet<QPackageableElement *>), - nestingPackage(0), - profileApplications(new QSet<QProfileApplication *>), - packageMerges(new QSet<QPackageMerge *>) + nestingPackage(0) { } QPackagePrivate::~QPackagePrivate() { - delete packagedElements; - delete profileApplications; - delete packageMerges; } /*! @@ -101,7 +95,7 @@ QPackage::~QPackage() /*! The Elements owned by this element. */ -const QSet<QElement *> *QPackage::ownedElements() const +const QSet<QElement *> &QPackage::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -117,7 +111,7 @@ QElement *QPackage::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QPackage::ownedComments() const +const QSet<QComment *> &QPackage::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -185,7 +179,7 @@ QNamespace *QPackage::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QPackage::clientDependencies() const +const QSet<QDependency *> &QPackage::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -207,7 +201,7 @@ void QPackage::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QPackage::packageImports() const +const QSet<QPackageImport *> &QPackage::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -225,7 +219,7 @@ void QPackage::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QPackage::members() const +const QSet<QNamedElement *> &QPackage::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -233,7 +227,7 @@ const QSet<QNamedElement *> *QPackage::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QPackage::importedMembers() const +const QSet<QPackageableElement *> &QPackage::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -241,7 +235,7 @@ const QSet<QPackageableElement *> *QPackage::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QPackage::elementImports() const +const QSet<QElementImport *> &QPackage::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -259,7 +253,7 @@ void QPackage::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QPackage::ownedRules() const +const QSet<QConstraint *> &QPackage::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -277,7 +271,7 @@ void QPackage::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QPackage::ownedMembers() const +const QSet<QNamedElement *> &QPackage::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -354,7 +348,7 @@ void QPackage::setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignat /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QPackage::templateBindings() const +const QSet<QTemplateBinding *> &QPackage::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -402,16 +396,16 @@ void QPackage::setURI(QString URI) References the packaged elements that are Types. It is the caller's responsibility to delete the returned set. */ -const QSet<QType *> *QPackage::ownedTypes() const +const QSet<QType *> &QPackage::ownedTypes() const { // This is a read-write derived association end Q_D(const QPackage); QSet<QType *> *ownedTypes_ = new QSet<QType *>; - foreach (QPackageableElement *packageableElement, *d->packagedElements) + foreach (QPackageableElement *packageableElement, d->packagedElements) if (QType *type = qwrappedobject_cast<QType *>(packageableElement)) ownedTypes_->insert(type); - return ownedTypes_; + return *ownedTypes_; } void QPackage::addOwnedType(QType *ownedType) @@ -419,7 +413,7 @@ void QPackage::addOwnedType(QType *ownedType) // This is a read-write derived association end Q_D(QPackage); - if (!d->packagedElements->contains(ownedType)) { + if (!d->packagedElements.contains(ownedType)) { // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); @@ -433,7 +427,7 @@ void QPackage::removeOwnedType(QType *ownedType) // This is a read-write derived association end Q_D(QPackage); - if (d->packagedElements->contains(ownedType)) { + if (d->packagedElements.contains(ownedType)) { // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); @@ -445,7 +439,7 @@ void QPackage::removeOwnedType(QType *ownedType) /*! Specifies the packageable elements that are owned by this Package. */ -const QSet<QPackageableElement *> *QPackage::packagedElements() const +const QSet<QPackageableElement *> &QPackage::packagedElements() const { // This is a read-write association end @@ -458,8 +452,8 @@ void QPackage::addPackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QPackage); - if (!d->packagedElements->contains(packagedElement)) { - d->packagedElements->insert(packagedElement); + if (!d->packagedElements.contains(packagedElement)) { + d->packagedElements.insert(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -471,8 +465,8 @@ void QPackage::removePackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QPackage); - if (d->packagedElements->contains(packagedElement)) { - d->packagedElements->remove(packagedElement); + if (d->packagedElements.contains(packagedElement)) { + d->packagedElements.remove(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -514,7 +508,7 @@ void QPackage::setNestingPackage(QPackage *nestingPackage) /*! References the ProfileApplications that indicate which profiles have been applied to the Package. */ -const QSet<QProfileApplication *> *QPackage::profileApplications() const +const QSet<QProfileApplication *> &QPackage::profileApplications() const { // This is a read-write association end @@ -527,8 +521,8 @@ void QPackage::addProfileApplication(QProfileApplication *profileApplication) // This is a read-write association end Q_D(QPackage); - if (!d->profileApplications->contains(profileApplication)) { - d->profileApplications->insert(profileApplication); + if (!d->profileApplications.contains(profileApplication)) { + d->profileApplications.insert(profileApplication); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(profileApplication)); @@ -543,8 +537,8 @@ void QPackage::removeProfileApplication(QProfileApplication *profileApplication) // This is a read-write association end Q_D(QPackage); - if (d->profileApplications->contains(profileApplication)) { - d->profileApplications->remove(profileApplication); + if (d->profileApplications.contains(profileApplication)) { + d->profileApplications.remove(profileApplication); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(profileApplication)); @@ -558,22 +552,22 @@ void QPackage::removeProfileApplication(QProfileApplication *profileApplication) References the Stereotypes that are owned by the Package It is the caller's responsibility to delete the returned set. */ -const QSet<QStereotype *> *QPackage::ownedStereotypes() const +const QSet<QStereotype *> &QPackage::ownedStereotypes() const { // This is a read-only derived association end Q_D(const QPackage); QSet<QStereotype *> *ownedStereotypes_ = new QSet<QStereotype *>; - foreach (QPackageableElement *packageableElement, *d->packagedElements) + foreach (QPackageableElement *packageableElement, d->packagedElements) if (QStereotype *stereotype = qwrappedobject_cast<QStereotype *>(packageableElement)) ownedStereotypes_->insert(stereotype); - return ownedStereotypes_; + return *ownedStereotypes_; } /*! References the PackageMerges that are owned by this Package. */ -const QSet<QPackageMerge *> *QPackage::packageMerges() const +const QSet<QPackageMerge *> &QPackage::packageMerges() const { // This is a read-write association end @@ -586,8 +580,8 @@ void QPackage::addPackageMerge(QPackageMerge *packageMerge) // This is a read-write association end Q_D(QPackage); - if (!d->packageMerges->contains(packageMerge)) { - d->packageMerges->insert(packageMerge); + if (!d->packageMerges.contains(packageMerge)) { + d->packageMerges.insert(packageMerge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); @@ -602,8 +596,8 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) // This is a read-write association end Q_D(QPackage); - if (d->packageMerges->contains(packageMerge)) { - d->packageMerges->remove(packageMerge); + if (d->packageMerges.contains(packageMerge)) { + d->packageMerges.remove(packageMerge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); @@ -617,16 +611,16 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) References the packaged elements that are Packages. It is the caller's responsibility to delete the returned set. */ -const QSet<QPackage *> *QPackage::nestedPackages() const +const QSet<QPackage *> &QPackage::nestedPackages() const { // This is a read-write derived association end Q_D(const QPackage); QSet<QPackage *> *nestedPackages_ = new QSet<QPackage *>; - foreach (QPackageableElement *packageableElement, *d->packagedElements) + foreach (QPackageableElement *packageableElement, d->packagedElements) if (QPackage *package = qwrappedobject_cast<QPackage *>(packageableElement)) nestedPackages_->insert(package); - return nestedPackages_; + return *nestedPackages_; } void QPackage::addNestedPackage(QPackage *nestedPackage) @@ -634,7 +628,7 @@ void QPackage::addNestedPackage(QPackage *nestedPackage) // This is a read-write derived association end Q_D(QPackage); - if (!d->packagedElements->contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { + if (!d->packagedElements.contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); @@ -648,7 +642,7 @@ void QPackage::removeNestedPackage(QPackage *nestedPackage) // This is a read-write derived association end Q_D(QPackage); - if (d->packagedElements->contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { + if (d->packagedElements.contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); @@ -660,11 +654,11 @@ void QPackage::removeNestedPackage(QPackage *nestedPackage) /*! The query allApplicableStereotypes() returns all the directly or indirectly owned stereotypes, including stereotypes contained in sub-profiles. */ -const QSet<QStereotype *> *QPackage::allApplicableStereotypes() const +const QSet<QStereotype *> &QPackage::allApplicableStereotypes() const { qWarning("QPackage::allApplicableStereotypes: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QStereotype *>); // change here to your derived return } /*! @@ -701,68 +695,11 @@ bool QPackage::mustBeOwned() const /*! The query visibleMembers() defines which members of a Package can be accessed outside it. */ -const QSet<QPackageableElement *> *QPackage::visibleMembers() const +const QSet<QPackageableElement *> &QPackage::visibleMembers() const { qWarning("QPackage::visibleMembers: operation to be implemented"); - return 0; // change here to your derived return -} - -void QPackage::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackage) *>("QT_PREPEND_NAMESPACE_QTUML(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProfile) *>("QT_PREPEND_NAMESPACE_QTUML(QProfile) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<QProfile *>("QProfile *"); - qRegisterMetaType<const QSet<QProfile *> *>("const QSet<QProfile *> *"); - qRegisterMetaType<const QList<QProfile *> *>("const QList<QProfile *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *>("QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *"); - qRegisterMetaType<QProfileApplication *>("QProfileApplication *"); - qRegisterMetaType<const QSet<QProfileApplication *> *>("const QSet<QProfileApplication *> *"); - qRegisterMetaType<const QList<QProfileApplication *> *>("const QList<QProfileApplication *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *"); - qRegisterMetaType<QPackageMerge *>("QPackageMerge *"); - qRegisterMetaType<const QSet<QPackageMerge *> *>("const QSet<QPackageMerge *> *"); - qRegisterMetaType<const QList<QPackageMerge *> *>("const QList<QPackageMerge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *>("QT_PREPEND_NAMESPACE_QTUML(QStereotype) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *"); - qRegisterMetaType<QStereotype *>("QStereotype *"); - qRegisterMetaType<const QSet<QStereotype *> *>("const QSet<QStereotype *> *"); - qRegisterMetaType<const QList<QStereotype *> *>("const QList<QStereotype *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QPackageableElement *>); // change here to your derived return } // Overriden methods for subsetted properties diff --git a/src/uml/qpackage.h b/src/uml/qpackage.h index 43c72fc7..81801f01 100644 --- a/src/uml/qpackage.h +++ b/src/uml/qpackage.h @@ -78,13 +78,13 @@ class Q_UML_EXPORT QPackage : public QWrappedObject Q_OBJECT Q_PROPERTY(QString URI READ URI WRITE setURI) - Q_PROPERTY(const QSet<QType *> * ownedTypes READ ownedTypes STORED false) - Q_PROPERTY(const QSet<QPackageableElement *> * packagedElements READ packagedElements) + 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(const QSet<QProfileApplication *> * profileApplications READ profileApplications) - Q_PROPERTY(const QSet<QStereotype *> * ownedStereotypes READ ownedStereotypes STORED false) - Q_PROPERTY(const QSet<QPackageMerge *> * packageMerges READ packageMerges) - Q_PROPERTY(const QSet<QPackage *> * nestedPackages READ nestedPackages STORED false) + 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_DISABLE_COPY(QPackage) Q_DECLARE_PRIVATE(QPackage) @@ -94,9 +94,9 @@ public: virtual ~QPackage(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -109,23 +109,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; @@ -141,7 +141,7 @@ public: // Association ends from aggregated QTemplateableElement Q_INVOKABLE QTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); @@ -150,38 +150,37 @@ public: Q_INVOKABLE void setURI(QString URI); // Association ends from QPackage - Q_INVOKABLE const QSet<QType *> *ownedTypes() const; + Q_INVOKABLE const QSet<QType *> &ownedTypes() const; Q_INVOKABLE void addOwnedType(QType *ownedType); Q_INVOKABLE void removeOwnedType(QType *ownedType); - Q_INVOKABLE const QSet<QPackageableElement *> *packagedElements() const; + Q_INVOKABLE const QSet<QPackageableElement *> &packagedElements() const; Q_INVOKABLE void addPackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE void removePackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE QPackage *nestingPackage() const; Q_INVOKABLE void setNestingPackage(QPackage *nestingPackage); - Q_INVOKABLE const QSet<QProfileApplication *> *profileApplications() const; + Q_INVOKABLE const QSet<QProfileApplication *> &profileApplications() const; Q_INVOKABLE void addProfileApplication(QProfileApplication *profileApplication); Q_INVOKABLE void removeProfileApplication(QProfileApplication *profileApplication); - Q_INVOKABLE const QSet<QStereotype *> *ownedStereotypes() const; - Q_INVOKABLE const QSet<QPackageMerge *> *packageMerges() const; + Q_INVOKABLE const QSet<QStereotype *> &ownedStereotypes() const; + Q_INVOKABLE const QSet<QPackageMerge *> &packageMerges() const; Q_INVOKABLE void addPackageMerge(QPackageMerge *packageMerge); Q_INVOKABLE void removePackageMerge(QPackageMerge *packageMerge); - Q_INVOKABLE const QSet<QPackage *> *nestedPackages() const; + Q_INVOKABLE const QSet<QPackage *> &nestedPackages() const; Q_INVOKABLE void addNestedPackage(QPackage *nestedPackage); Q_INVOKABLE void removeNestedPackage(QPackage *nestedPackage); // Operations - Q_INVOKABLE const QSet<QStereotype *> *allApplicableStereotypes() const; + Q_INVOKABLE const QSet<QStereotype *> &allApplicableStereotypes() const; Q_INVOKABLE QProfile *containingProfile() const; Q_INVOKABLE bool makesVisible(const QNamedElement *el) const; Q_INVOKABLE bool mustBeOwned() const; - Q_INVOKABLE const QSet<QPackageableElement *> *visibleMembers() const; + Q_INVOKABLE const QSet<QPackageableElement *> &visibleMembers() const; // Overriden methods for subsetted properties Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QType> ownedType); Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType); Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); - virtual void registerMetaTypes() const; protected: explicit QPackage(QPackagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -194,10 +193,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPackage) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *) - QT_END_HEADER #endif // QTUML_QPACKAGE_H diff --git a/src/uml/qpackage_p.h b/src/uml/qpackage_p.h index ae4f4f2a..84815d44 100644 --- a/src/uml/qpackage_p.h +++ b/src/uml/qpackage_p.h @@ -78,10 +78,10 @@ public: virtual ~QPackagePrivate(); QString URI; - QSet<QPackageableElement *> *packagedElements; + QSet<QPackageableElement *> packagedElements; QPackage *nestingPackage; - QSet<QProfileApplication *> *profileApplications; - QSet<QPackageMerge *> *packageMerges; + QSet<QProfileApplication *> profileApplications; + QSet<QPackageMerge *> packageMerges; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpackageableelement.cpp b/src/uml/qpackageableelement.cpp index f5bb47b9..52a08692 100644 --- a/src/uml/qpackageableelement.cpp +++ b/src/uml/qpackageableelement.cpp @@ -86,7 +86,7 @@ QPackageableElement::~QPackageableElement() /*! The Elements owned by this element. */ -const QSet<QElement *> *QPackageableElement::ownedElements() const +const QSet<QElement *> &QPackageableElement::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -102,7 +102,7 @@ QElement *QPackageableElement::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QPackageableElement::ownedComments() const +const QSet<QComment *> &QPackageableElement::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -200,7 +200,7 @@ QNamespace *QPackageableElement::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QPackageableElement::clientDependencies() const +const QSet<QDependency *> &QPackageableElement::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -245,21 +245,6 @@ void QPackageableElement::unsetVisibility() setVisibility(QtUml::VisibilityPublic); } -void QPackageableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackageableelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpackageableelement.h b/src/uml/qpackageableelement.h index 5e308787..0ab40081 100644 --- a/src/uml/qpackageableelement.h +++ b/src/uml/qpackageableelement.h @@ -74,9 +74,9 @@ public: virtual ~QPackageableElement(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -95,7 +95,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -103,7 +103,6 @@ public: Q_INVOKABLE QtUml::VisibilityKind visibility() const; Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); - virtual void registerMetaTypes() const; protected: explicit QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -115,10 +114,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageableElement) *> *) - QT_END_HEADER #endif // QTUML_QPACKAGEABLEELEMENT_H diff --git a/src/uml/qpackageimport.cpp b/src/uml/qpackageimport.cpp index 1e0fe93c..74090298 100644 --- a/src/uml/qpackageimport.cpp +++ b/src/uml/qpackageimport.cpp @@ -181,35 +181,6 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) } } -void QPackageImport::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackage) *>("QT_PREPEND_NAMESPACE_QTUML(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *>("QT_PREPEND_NAMESPACE_QTUML(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackageimport.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpackageimport.h b/src/uml/qpackageimport.h index 752a6a84..b37cb100 100644 --- a/src/uml/qpackageimport.h +++ b/src/uml/qpackageimport.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void setImportingNamespace(QNamespace *importingNamespace); Q_INVOKABLE QPackage *importedPackage() const; Q_INVOKABLE void setImportedPackage(QPackage *importedPackage); - virtual void registerMetaTypes() const; protected: explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *) - QT_END_HEADER #endif // QTUML_QPACKAGEIMPORT_H diff --git a/src/uml/qpackagemerge.cpp b/src/uml/qpackagemerge.cpp index e7e0ac5e..c9367fa2 100644 --- a/src/uml/qpackagemerge.cpp +++ b/src/uml/qpackagemerge.cpp @@ -149,28 +149,6 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) } } -void QPackageMerge::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *"); - qRegisterMetaType<QPackageMerge *>("QPackageMerge *"); - qRegisterMetaType<const QSet<QPackageMerge *> *>("const QSet<QPackageMerge *> *"); - qRegisterMetaType<const QList<QPackageMerge *> *>("const QList<QPackageMerge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackage) *>("QT_PREPEND_NAMESPACE_QTUML(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackagemerge.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpackagemerge.h b/src/uml/qpackagemerge.h index 6cd422d9..054cea3f 100644 --- a/src/uml/qpackagemerge.h +++ b/src/uml/qpackagemerge.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setMergedPackage(QPackage *mergedPackage); Q_INVOKABLE QPackage *receivingPackage() const; Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage); - virtual void registerMetaTypes() const; protected: explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageMerge) *> *) - QT_END_HEADER #endif // QTUML_QPACKAGEMERGE_H diff --git a/src/uml/qparameter.cpp b/src/uml/qparameter.cpp index bf6c37de..620b7307 100644 --- a/src/uml/qparameter.cpp +++ b/src/uml/qparameter.cpp @@ -53,14 +53,12 @@ QParameterPrivate::QParameterPrivate() : direction(QtUml::ParameterDirectionIn), isStream(false), operation(0), - defaultValue(0), - parameterSets(new QSet<QParameterSet *>) + defaultValue(0) { } QParameterPrivate::~QParameterPrivate() { - delete parameterSets; } /*! @@ -96,7 +94,7 @@ QParameter::~QParameter() /*! The Elements owned by this element. */ -const QSet<QElement *> *QParameter::ownedElements() const +const QSet<QElement *> &QParameter::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -112,7 +110,7 @@ QElement *QParameter::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QParameter::ownedComments() const +const QSet<QComment *> &QParameter::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -294,7 +292,7 @@ QNamespace *QParameter::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QParameter::clientDependencies() const +const QSet<QDependency *> &QParameter::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -350,7 +348,7 @@ void QParameter::setOwningTemplateParameter(QTemplateParameter *owningTemplatePa /*! Denotes a set of connector ends that attaches to this connectable element. */ -const QList<QConnectorEnd *> *QParameter::ends() const +const QList<QConnectorEnd *> &QParameter::ends() const { return (qwrappedobject_cast<const QConnectableElement *>(this))->ends(); } @@ -563,7 +561,7 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue) /*! The parameter sets containing the parameter. See ParameterSet. */ -const QSet<QParameterSet *> *QParameter::parameterSets() const +const QSet<QParameterSet *> &QParameter::parameterSets() const { // This is a read-write association end @@ -576,8 +574,8 @@ void QParameter::addParameterSet(QParameterSet *parameterSet) // This is a read-write association end Q_D(QParameter); - if (!d->parameterSets->contains(parameterSet)) { - d->parameterSets->insert(parameterSet); + if (!d->parameterSets.contains(parameterSet)) { + d->parameterSets.insert(parameterSet); // Adjust opposite property parameterSet->addParameter(this); @@ -589,8 +587,8 @@ void QParameter::removeParameterSet(QParameterSet *parameterSet) // This is a read-write association end Q_D(QParameter); - if (d->parameterSets->contains(parameterSet)) { - d->parameterSets->remove(parameterSet); + if (d->parameterSets.contains(parameterSet)) { + d->parameterSets.remove(parameterSet); // Adjust opposite property if (parameterSet) @@ -598,42 +596,6 @@ void QParameter::removeParameterSet(QParameterSet *parameterSet) } } -void QParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<QParameterSet *>("QParameterSet *"); - qRegisterMetaType<const QSet<QParameterSet *> *>("const QSet<QParameterSet *> *"); - qRegisterMetaType<const QList<QParameterSet *> *>("const QList<QParameterSet *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qparameter.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qparameter.h b/src/uml/qparameter.h index 35918935..fab0479c 100644 --- a/src/uml/qparameter.h +++ b/src/uml/qparameter.h @@ -81,7 +81,7 @@ class Q_UML_EXPORT QParameter : public QWrappedObject 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(const QSet<QParameterSet *> * parameterSets READ parameterSets) + Q_PROPERTY(QSet<QParameterSet *> parameterSets READ parameterSets) Q_DISABLE_COPY(QParameter) Q_DECLARE_PRIVATE(QParameter) @@ -91,9 +91,9 @@ public: virtual ~QParameter(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -127,7 +127,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -140,7 +140,7 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Association ends from aggregated QConnectableElement - Q_INVOKABLE const QList<QConnectorEnd *> *ends() const; + Q_INVOKABLE const QList<QConnectorEnd *> &ends() const; Q_INVOKABLE QConnectableElementTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QConnectableElementTemplateParameter *templateParameter); @@ -164,10 +164,9 @@ public: Q_INVOKABLE void setOperation(QOperation *operation); Q_INVOKABLE QValueSpecification *defaultValue() const; Q_INVOKABLE void setDefaultValue(QValueSpecification *defaultValue); - Q_INVOKABLE const QSet<QParameterSet *> *parameterSets() const; + Q_INVOKABLE const QSet<QParameterSet *> ¶meterSets() const; Q_INVOKABLE void addParameterSet(QParameterSet *parameterSet); Q_INVOKABLE void removeParameterSet(QParameterSet *parameterSet); - virtual void registerMetaTypes() const; protected: explicit QParameter(QParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -179,10 +178,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *) - QT_END_HEADER #endif // QTUML_QPARAMETER_H diff --git a/src/uml/qparameter_p.h b/src/uml/qparameter_p.h index 1213fd9a..d80a2a55 100644 --- a/src/uml/qparameter_p.h +++ b/src/uml/qparameter_p.h @@ -83,7 +83,7 @@ public: QtUml::ParameterEffectKind effect; QOperation *operation; QValueSpecification *defaultValue; - QSet<QParameterSet *> *parameterSets; + QSet<QParameterSet *> parameterSets; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qparameterableelement.cpp b/src/uml/qparameterableelement.cpp index 73f5088e..5e9d2f0d 100644 --- a/src/uml/qparameterableelement.cpp +++ b/src/uml/qparameterableelement.cpp @@ -159,28 +159,6 @@ bool QParameterableElement::isTemplateParameter() const return bool(); // change here to your derived return } -void QParameterableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<QParameterableElement *>("QParameterableElement *"); - qRegisterMetaType<const QSet<QParameterableElement *> *>("const QSet<QParameterableElement *> *"); - qRegisterMetaType<const QList<QParameterableElement *> *>("const QList<QParameterableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *"); - qRegisterMetaType<const QSet<QTemplateParameter *> *>("const QSet<QTemplateParameter *> *"); - qRegisterMetaType<const QList<QTemplateParameter *> *>("const QList<QTemplateParameter *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qparameterableelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qparameterableelement.h b/src/uml/qparameterableelement.h index 20d19690..827aa3dc 100644 --- a/src/uml/qparameterableelement.h +++ b/src/uml/qparameterableelement.h @@ -80,7 +80,6 @@ public: // Operations Q_INVOKABLE bool isCompatibleWith(const QParameterableElement *p) const; Q_INVOKABLE bool isTemplateParameter() const; - virtual void registerMetaTypes() const; protected: explicit QParameterableElement(QParameterableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *) - QT_END_HEADER #endif // QTUML_QPARAMETERABLEELEMENT_H diff --git a/src/uml/qparameterset.cpp b/src/uml/qparameterset.cpp index 5307da60..6d5e647b 100644 --- a/src/uml/qparameterset.cpp +++ b/src/uml/qparameterset.cpp @@ -47,16 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML -QParameterSetPrivate::QParameterSetPrivate() : - parameters(new QSet<QParameter *>), - conditions(new QSet<QConstraint *>) +QParameterSetPrivate::QParameterSetPrivate() { } QParameterSetPrivate::~QParameterSetPrivate() { - delete parameters; - delete conditions; } /*! @@ -88,7 +84,7 @@ QParameterSet::~QParameterSet() /*! Parameters in the parameter set. */ -const QSet<QParameter *> *QParameterSet::parameters() const +const QSet<QParameter *> &QParameterSet::parameters() const { // This is a read-write association end @@ -101,8 +97,8 @@ void QParameterSet::addParameter(QParameter *parameter) // This is a read-write association end Q_D(QParameterSet); - if (!d->parameters->contains(parameter)) { - d->parameters->insert(parameter); + if (!d->parameters.contains(parameter)) { + d->parameters.insert(parameter); // Adjust opposite property parameter->addParameterSet(this); @@ -114,8 +110,8 @@ void QParameterSet::removeParameter(QParameter *parameter) // This is a read-write association end Q_D(QParameterSet); - if (d->parameters->contains(parameter)) { - d->parameters->remove(parameter); + if (d->parameters.contains(parameter)) { + d->parameters.remove(parameter); // Adjust opposite property if (parameter) @@ -126,7 +122,7 @@ void QParameterSet::removeParameter(QParameter *parameter) /*! 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. */ -const QSet<QConstraint *> *QParameterSet::conditions() const +const QSet<QConstraint *> &QParameterSet::conditions() const { // This is a read-write association end @@ -139,8 +135,8 @@ void QParameterSet::addCondition(QConstraint *condition) // This is a read-write association end Q_D(QParameterSet); - if (!d->conditions->contains(condition)) { - d->conditions->insert(condition); + if (!d->conditions.contains(condition)) { + d->conditions.insert(condition); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(condition)); @@ -152,43 +148,14 @@ void QParameterSet::removeCondition(QConstraint *condition) // This is a read-write association end Q_D(QParameterSet); - if (d->conditions->contains(condition)) { - d->conditions->remove(condition); + if (d->conditions.contains(condition)) { + d->conditions.remove(condition); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(condition)); } } -void QParameterSet::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *"); - qRegisterMetaType<QParameterSet *>("QParameterSet *"); - qRegisterMetaType<const QSet<QParameterSet *> *>("const QSet<QParameterSet *> *"); - qRegisterMetaType<const QList<QParameterSet *> *>("const QList<QParameterSet *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qparameterset.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qparameterset.h b/src/uml/qparameterset.h index ef5bb7ff..81314b0b 100644 --- a/src/uml/qparameterset.h +++ b/src/uml/qparameterset.h @@ -65,8 +65,8 @@ class Q_UML_EXPORT QParameterSet : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QParameter *> * parameters READ parameters) - Q_PROPERTY(const QSet<QConstraint *> * conditions READ conditions) + Q_PROPERTY(QSet<QParameter *> parameters READ parameters) + Q_PROPERTY(QSet<QConstraint *> conditions READ conditions) Q_DISABLE_COPY(QParameterSet) Q_DECLARE_PRIVATE(QParameterSet) @@ -76,13 +76,12 @@ public: virtual ~QParameterSet(); // Association ends from QParameterSet - Q_INVOKABLE const QSet<QParameter *> *parameters() const; + Q_INVOKABLE const QSet<QParameter *> ¶meters() const; Q_INVOKABLE void addParameter(QParameter *parameter); Q_INVOKABLE void removeParameter(QParameter *parameter); - Q_INVOKABLE const QSet<QConstraint *> *conditions() const; + Q_INVOKABLE const QSet<QConstraint *> &conditions() const; Q_INVOKABLE void addCondition(QConstraint *condition); Q_INVOKABLE void removeCondition(QConstraint *condition); - virtual void registerMetaTypes() const; protected: explicit QParameterSet(QParameterSetPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterSet) *> *) - QT_END_HEADER #endif // QTUML_QPARAMETERSET_H diff --git a/src/uml/qparameterset_p.h b/src/uml/qparameterset_p.h index 790806f6..3c211b66 100644 --- a/src/uml/qparameterset_p.h +++ b/src/uml/qparameterset_p.h @@ -68,8 +68,8 @@ public: explicit QParameterSetPrivate(); virtual ~QParameterSetPrivate(); - QSet<QParameter *> *parameters; - QSet<QConstraint *> *conditions; + QSet<QParameter *> parameters; + QSet<QConstraint *> conditions; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpartdecomposition.cpp b/src/uml/qpartdecomposition.cpp index 01070a2f..364ce9fd 100644 --- a/src/uml/qpartdecomposition.cpp +++ b/src/uml/qpartdecomposition.cpp @@ -74,21 +74,6 @@ QPartDecomposition::~QPartDecomposition() { } -void QPartDecomposition::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *>("QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *"); - qRegisterMetaType<QPartDecomposition *>("QPartDecomposition *"); - qRegisterMetaType<const QSet<QPartDecomposition *> *>("const QSet<QPartDecomposition *> *"); - qRegisterMetaType<const QList<QPartDecomposition *> *>("const QList<QPartDecomposition *> *"); - - QInteractionUse::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpartdecomposition.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpartdecomposition.h b/src/uml/qpartdecomposition.h index 22b8ae8e..efda29a9 100644 --- a/src/uml/qpartdecomposition.h +++ b/src/uml/qpartdecomposition.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QPartDecomposition : public QInteractionUse public: Q_INVOKABLE explicit QPartDecomposition(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPartDecomposition(); - virtual void registerMetaTypes() const; protected: explicit QPartDecomposition(QPartDecompositionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPartDecomposition) *> *) - QT_END_HEADER #endif // QTUML_QPARTDECOMPOSITION_H diff --git a/src/uml/qpin.cpp b/src/uml/qpin.cpp index 46142066..c582d404 100644 --- a/src/uml/qpin.cpp +++ b/src/uml/qpin.cpp @@ -86,7 +86,7 @@ QPin::~QPin() /*! The Elements owned by this element. */ -const QSet<QElement *> *QPin::ownedElements() const +const QSet<QElement *> &QPin::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -102,7 +102,7 @@ QElement *QPin::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QPin::ownedComments() const +const QSet<QComment *> &QPin::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -284,7 +284,7 @@ QNamespace *QPin::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QPin::clientDependencies() const +const QSet<QDependency *> &QPin::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -328,7 +328,7 @@ void QPin::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QPin::redefinedElements() const +const QSet<QRedefinableElement *> &QPin::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -336,7 +336,7 @@ const QSet<QRedefinableElement *> *QPin::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QPin::redefinitionContexts() const +const QSet<QClassifier *> &QPin::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -348,7 +348,7 @@ const QSet<QClassifier *> *QPin::redefinitionContexts() const /*! Inherited nodes replaced by this node in a specialization of the activity. */ -const QSet<QActivityNode *> *QPin::redefinedNodes() const +const QSet<QActivityNode *> &QPin::redefinedNodes() const { return (qwrappedobject_cast<const QActivityNode *>(this))->redefinedNodes(); } @@ -366,7 +366,7 @@ void QPin::removeRedefinedNode(QActivityNode *redefinedNode) /*! Edges that have the node as target. */ -const QSet<QActivityEdge *> *QPin::incomings() const +const QSet<QActivityEdge *> &QPin::incomings() const { return (qwrappedobject_cast<const QActivityNode *>(this))->incomings(); } @@ -397,7 +397,7 @@ void QPin::setActivity(QActivity *activity) /*! Groups containing the node. */ -const QSet<QActivityGroup *> *QPin::inGroup() const +const QSet<QActivityGroup *> &QPin::inGroup() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inGroup(); } @@ -418,7 +418,7 @@ void QPin::setInStructuredNode(QStructuredActivityNode *inStructuredNode) /*! Partitions containing the node. */ -const QSet<QActivityPartition *> *QPin::inPartition() const +const QSet<QActivityPartition *> &QPin::inPartition() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inPartition(); } @@ -436,7 +436,7 @@ void QPin::removeInPartition(QActivityPartition *inPartition) /*! Interruptible regions containing the node. */ -const QSet<QInterruptibleActivityRegion *> *QPin::inInterruptibleRegion() const +const QSet<QInterruptibleActivityRegion *> &QPin::inInterruptibleRegion() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); } @@ -454,7 +454,7 @@ void QPin::removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterrupt /*! Edges that have the node as source. */ -const QSet<QActivityEdge *> *QPin::outgoings() const +const QSet<QActivityEdge *> &QPin::outgoings() const { return (qwrappedobject_cast<const QActivityNode *>(this))->outgoings(); } @@ -559,7 +559,7 @@ void QPin::setSelection(QBehavior *selection) /*! The required states of the object available at this point in the activity. */ -const QSet<QState *> *QPin::inState() const +const QSet<QState *> &QPin::inState() const { return (qwrappedobject_cast<const QObjectNode *>(this))->inState(); } @@ -604,21 +604,6 @@ void QPin::unsetControl() setControl(false); } -void QPin::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPin) *>("QT_PREPEND_NAMESPACE_QTUML(QPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPin) *> *"); - qRegisterMetaType<QPin *>("QPin *"); - qRegisterMetaType<const QSet<QPin *> *>("const QSet<QPin *> *"); - qRegisterMetaType<const QList<QPin *> *>("const QList<QPin *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpin.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpin.h b/src/uml/qpin.h index 00c514b0..7cfe9345 100644 --- a/src/uml/qpin.h +++ b/src/uml/qpin.h @@ -71,9 +71,9 @@ public: virtual ~QPin(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -107,7 +107,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -117,28 +117,28 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QActivityNode - Q_INVOKABLE const QSet<QActivityNode *> *redefinedNodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &redefinedNodes() const; Q_INVOKABLE void addRedefinedNode(QActivityNode *redefinedNode); Q_INVOKABLE void removeRedefinedNode(QActivityNode *redefinedNode); - Q_INVOKABLE const QSet<QActivityEdge *> *incomings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &incomings() const; Q_INVOKABLE void addIncoming(QActivityEdge *incoming); Q_INVOKABLE void removeIncoming(QActivityEdge *incoming); Q_INVOKABLE QActivity *activity() const; Q_INVOKABLE void setActivity(QActivity *activity); - Q_INVOKABLE const QSet<QActivityGroup *> *inGroup() const; + Q_INVOKABLE const QSet<QActivityGroup *> &inGroup() const; Q_INVOKABLE QStructuredActivityNode *inStructuredNode() const; Q_INVOKABLE void setInStructuredNode(QStructuredActivityNode *inStructuredNode); - Q_INVOKABLE const QSet<QActivityPartition *> *inPartition() const; + Q_INVOKABLE const QSet<QActivityPartition *> &inPartition() const; Q_INVOKABLE void addInPartition(QActivityPartition *inPartition); Q_INVOKABLE void removeInPartition(QActivityPartition *inPartition); - Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> *inInterruptibleRegion() const; + Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> &inInterruptibleRegion() const; Q_INVOKABLE void addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); Q_INVOKABLE void removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); - Q_INVOKABLE const QSet<QActivityEdge *> *outgoings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &outgoings() const; Q_INVOKABLE void addOutgoing(QActivityEdge *outgoing); Q_INVOKABLE void removeOutgoing(QActivityEdge *outgoing); @@ -159,7 +159,7 @@ public: Q_INVOKABLE void setUpperBound(QValueSpecification *upperBound); Q_INVOKABLE QBehavior *selection() const; Q_INVOKABLE void setSelection(QBehavior *selection); - Q_INVOKABLE const QSet<QState *> *inState() const; + Q_INVOKABLE const QSet<QState *> &inState() const; Q_INVOKABLE void addInState(QState *inState); Q_INVOKABLE void removeInState(QState *inState); @@ -167,7 +167,6 @@ public: Q_INVOKABLE bool isControl() const; Q_INVOKABLE void setControl(bool isControl); Q_INVOKABLE void unsetControl(); - virtual void registerMetaTypes() const; protected: explicit QPin(QPinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -179,10 +178,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPin) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPin) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPin) *> *) - QT_END_HEADER #endif // QTUML_QPIN_H diff --git a/src/uml/qport.cpp b/src/uml/qport.cpp index 20eae6d8..b872b472 100644 --- a/src/uml/qport.cpp +++ b/src/uml/qport.cpp @@ -51,14 +51,12 @@ QPortPrivate::QPortPrivate() : isConjugated(false), isBehavior(false), isService(true), - protocol(0), - redefinedPorts(new QSet<QPort *>) + protocol(0) { } QPortPrivate::~QPortPrivate() { - delete redefinedPorts; } /*! @@ -193,31 +191,31 @@ void QPort::setProtocol(QProtocolStateMachine *protocol) /*! 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. */ -const QSet<QInterface *> *QPort::required() const +const QSet<QInterface *> &QPort::required() const { // This is a read-only derived association end qWarning("QPort::required: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QInterface *>); // change here to your derived return } /*! 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. */ -const QSet<QInterface *> *QPort::provided() const +const QSet<QInterface *> &QPort::provided() const { // This is a read-only derived association end qWarning("QPort::provided: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QInterface *>); // change here to your derived return } /*! 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. */ -const QSet<QPort *> *QPort::redefinedPorts() const +const QSet<QPort *> &QPort::redefinedPorts() const { // This is a read-write association end @@ -230,8 +228,8 @@ void QPort::addRedefinedPort(QPort *redefinedPort) // This is a read-write association end Q_D(QPort); - if (!d->redefinedPorts->contains(redefinedPort)) { - d->redefinedPorts->insert(redefinedPort); + if (!d->redefinedPorts.contains(redefinedPort)) { + d->redefinedPorts.insert(redefinedPort); // Adjust subsetted property(ies) (qwrappedobject_cast<QProperty *>(this))->addRedefinedProperty(qwrappedobject_cast<QProperty *>(redefinedPort)); @@ -243,43 +241,14 @@ void QPort::removeRedefinedPort(QPort *redefinedPort) // This is a read-write association end Q_D(QPort); - if (d->redefinedPorts->contains(redefinedPort)) { - d->redefinedPorts->remove(redefinedPort); + if (d->redefinedPorts.contains(redefinedPort)) { + d->redefinedPorts.remove(redefinedPort); // Adjust subsetted property(ies) (qwrappedobject_cast<QProperty *>(this))->removeRedefinedProperty(qwrappedobject_cast<QProperty *>(redefinedPort)); } } -void QPort::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPort) *>("QT_PREPEND_NAMESPACE_QTUML(QPort) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<QPort *>("QPort *"); - qRegisterMetaType<const QSet<QPort *> *>("const QSet<QPort *> *"); - qRegisterMetaType<const QList<QPort *> *>("const QList<QPort *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *"); - qRegisterMetaType<const QSet<QProtocolStateMachine *> *>("const QSet<QProtocolStateMachine *> *"); - qRegisterMetaType<const QList<QProtocolStateMachine *> *>("const QList<QProtocolStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterface) *>("QT_PREPEND_NAMESPACE_QTUML(QInterface) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<QInterface *>("QInterface *"); - qRegisterMetaType<const QSet<QInterface *> *>("const QSet<QInterface *> *"); - qRegisterMetaType<const QList<QInterface *> *>("const QList<QInterface *> *"); - - QProperty::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QPort::addRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort) diff --git a/src/uml/qport.h b/src/uml/qport.h index 6343d36e..dd53fa6b 100644 --- a/src/uml/qport.h +++ b/src/uml/qport.h @@ -72,9 +72,9 @@ class Q_UML_EXPORT QPort : public QProperty 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(const QSet<QInterface *> * required READ required STORED false) - Q_PROPERTY(const QSet<QInterface *> * provided READ provided STORED false) - Q_PROPERTY(const QSet<QPort *> * redefinedPorts READ redefinedPorts) + 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_DISABLE_COPY(QPort) Q_DECLARE_PRIVATE(QPort) @@ -97,16 +97,15 @@ public: // Association ends from QPort Q_INVOKABLE QProtocolStateMachine *protocol() const; Q_INVOKABLE void setProtocol(QProtocolStateMachine *protocol); - Q_INVOKABLE const QSet<QInterface *> *required() const; - Q_INVOKABLE const QSet<QInterface *> *provided() const; - Q_INVOKABLE const QSet<QPort *> *redefinedPorts() const; + Q_INVOKABLE const QSet<QInterface *> &required() const; + Q_INVOKABLE const QSet<QInterface *> &provided() const; + Q_INVOKABLE const QSet<QPort *> &redefinedPorts() const; Q_INVOKABLE void addRedefinedPort(QPort *redefinedPort); Q_INVOKABLE void removeRedefinedPort(QPort *redefinedPort); // Overriden methods for subsetted properties Q_INVOKABLE void addRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort); Q_INVOKABLE void removeRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort); - virtual void registerMetaTypes() const; protected: explicit QPort(QPortPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -114,10 +113,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPort) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *) - QT_END_HEADER #endif // QTUML_QPORT_H diff --git a/src/uml/qport_p.h b/src/uml/qport_p.h index 414b5909..f004d6fb 100644 --- a/src/uml/qport_p.h +++ b/src/uml/qport_p.h @@ -72,7 +72,7 @@ public: bool isBehavior; bool isService; QProtocolStateMachine *protocol; - QSet<QPort *> *redefinedPorts; + QSet<QPort *> redefinedPorts; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprimitivetype.cpp b/src/uml/qprimitivetype.cpp index 149ecef6..5ba39b9d 100644 --- a/src/uml/qprimitivetype.cpp +++ b/src/uml/qprimitivetype.cpp @@ -74,21 +74,6 @@ QPrimitiveType::~QPrimitiveType() { } -void QPrimitiveType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *>("QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *> *"); - qRegisterMetaType<QPrimitiveType *>("QPrimitiveType *"); - qRegisterMetaType<const QSet<QPrimitiveType *> *>("const QSet<QPrimitiveType *> *"); - qRegisterMetaType<const QList<QPrimitiveType *> *>("const QList<QPrimitiveType *> *"); - - QDataType::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprimitivetype.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprimitivetype.h b/src/uml/qprimitivetype.h index 5037b988..3aee8e90 100644 --- a/src/uml/qprimitivetype.h +++ b/src/uml/qprimitivetype.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QPrimitiveType : public QDataType public: Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPrimitiveType(); - virtual void registerMetaTypes() const; protected: explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPrimitiveType) *> *) - QT_END_HEADER #endif // QTUML_QPRIMITIVETYPE_H diff --git a/src/uml/qprofile.cpp b/src/uml/qprofile.cpp index 65765202..006d2595 100644 --- a/src/uml/qprofile.cpp +++ b/src/uml/qprofile.cpp @@ -47,16 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML -QProfilePrivate::QProfilePrivate() : - metamodelReferences(new QSet<QPackageImport *>), - metaclassReferences(new QSet<QElementImport *>) +QProfilePrivate::QProfilePrivate() { } QProfilePrivate::~QProfilePrivate() { - delete metamodelReferences; - delete metaclassReferences; } /*! @@ -88,7 +84,7 @@ QProfile::~QProfile() /*! References a package containing (directly or indirectly) metaclasses that may be extended. */ -const QSet<QPackageImport *> *QProfile::metamodelReferences() const +const QSet<QPackageImport *> &QProfile::metamodelReferences() const { // This is a read-write association end @@ -101,8 +97,8 @@ void QProfile::addMetamodelReference(QPackageImport *metamodelReference) // This is a read-write association end Q_D(QProfile); - if (!d->metamodelReferences->contains(metamodelReference)) { - d->metamodelReferences->insert(metamodelReference); + if (!d->metamodelReferences.contains(metamodelReference)) { + d->metamodelReferences.insert(metamodelReference); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addPackageImport(qwrappedobject_cast<QPackageImport *>(metamodelReference)); @@ -114,8 +110,8 @@ void QProfile::removeMetamodelReference(QPackageImport *metamodelReference) // This is a read-write association end Q_D(QProfile); - if (d->metamodelReferences->contains(metamodelReference)) { - d->metamodelReferences->remove(metamodelReference); + if (d->metamodelReferences.contains(metamodelReference)) { + d->metamodelReferences.remove(metamodelReference); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removePackageImport(qwrappedobject_cast<QPackageImport *>(metamodelReference)); @@ -125,7 +121,7 @@ void QProfile::removeMetamodelReference(QPackageImport *metamodelReference) /*! References a metaclass that may be extended. */ -const QSet<QElementImport *> *QProfile::metaclassReferences() const +const QSet<QElementImport *> &QProfile::metaclassReferences() const { // This is a read-write association end @@ -138,8 +134,8 @@ void QProfile::addMetaclassReference(QElementImport *metaclassReference) // This is a read-write association end Q_D(QProfile); - if (!d->metaclassReferences->contains(metaclassReference)) { - d->metaclassReferences->insert(metaclassReference); + if (!d->metaclassReferences.contains(metaclassReference)) { + d->metaclassReferences.insert(metaclassReference); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addElementImport(qwrappedobject_cast<QElementImport *>(metaclassReference)); @@ -151,43 +147,14 @@ void QProfile::removeMetaclassReference(QElementImport *metaclassReference) // This is a read-write association end Q_D(QProfile); - if (d->metaclassReferences->contains(metaclassReference)) { - d->metaclassReferences->remove(metaclassReference); + if (d->metaclassReferences.contains(metaclassReference)) { + d->metaclassReferences.remove(metaclassReference); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeElementImport(qwrappedobject_cast<QElementImport *>(metaclassReference)); } } -void QProfile::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProfile) *>("QT_PREPEND_NAMESPACE_QTUML(QProfile) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<QProfile *>("QProfile *"); - qRegisterMetaType<const QSet<QProfile *> *>("const QSet<QProfile *> *"); - qRegisterMetaType<const QList<QProfile *> *>("const QList<QProfile *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *>("QT_PREPEND_NAMESPACE_QTUML(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - QPackage::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprofile.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprofile.h b/src/uml/qprofile.h index 592ebb3f..005b2317 100644 --- a/src/uml/qprofile.h +++ b/src/uml/qprofile.h @@ -65,8 +65,8 @@ class Q_UML_EXPORT QProfile : public QPackage { Q_OBJECT - Q_PROPERTY(const QSet<QPackageImport *> * metamodelReferences READ metamodelReferences) - Q_PROPERTY(const QSet<QElementImport *> * metaclassReferences READ metaclassReferences) + Q_PROPERTY(QSet<QPackageImport *> metamodelReferences READ metamodelReferences) + Q_PROPERTY(QSet<QElementImport *> metaclassReferences READ metaclassReferences) Q_DISABLE_COPY(QProfile) Q_DECLARE_PRIVATE(QProfile) @@ -76,13 +76,12 @@ public: virtual ~QProfile(); // Association ends from QProfile - Q_INVOKABLE const QSet<QPackageImport *> *metamodelReferences() const; + Q_INVOKABLE const QSet<QPackageImport *> &metamodelReferences() const; Q_INVOKABLE void addMetamodelReference(QPackageImport *metamodelReference); Q_INVOKABLE void removeMetamodelReference(QPackageImport *metamodelReference); - Q_INVOKABLE const QSet<QElementImport *> *metaclassReferences() const; + Q_INVOKABLE const QSet<QElementImport *> &metaclassReferences() const; Q_INVOKABLE void addMetaclassReference(QElementImport *metaclassReference); Q_INVOKABLE void removeMetaclassReference(QElementImport *metaclassReference); - virtual void registerMetaTypes() const; protected: explicit QProfile(QProfilePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QProfile) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *) - QT_END_HEADER #endif // QTUML_QPROFILE_H diff --git a/src/uml/qprofile_p.h b/src/uml/qprofile_p.h index 00b0d7eb..5cd01137 100644 --- a/src/uml/qprofile_p.h +++ b/src/uml/qprofile_p.h @@ -68,8 +68,8 @@ public: explicit QProfilePrivate(); virtual ~QProfilePrivate(); - QSet<QPackageImport *> *metamodelReferences; - QSet<QElementImport *> *metaclassReferences; + QSet<QPackageImport *> metamodelReferences; + QSet<QElementImport *> metaclassReferences; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprofileapplication.cpp b/src/uml/qprofileapplication.cpp index 167fcfb0..8984111a 100644 --- a/src/uml/qprofileapplication.cpp +++ b/src/uml/qprofileapplication.cpp @@ -181,35 +181,6 @@ void QProfileApplication::setAppliedProfile(QProfile *appliedProfile) } } -void QProfileApplication::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *>("QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *"); - qRegisterMetaType<QProfileApplication *>("QProfileApplication *"); - qRegisterMetaType<const QSet<QProfileApplication *> *>("const QSet<QProfileApplication *> *"); - qRegisterMetaType<const QList<QProfileApplication *> *>("const QList<QProfileApplication *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProfile) *>("QT_PREPEND_NAMESPACE_QTUML(QProfile) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<QProfile *>("QProfile *"); - qRegisterMetaType<const QSet<QProfile *> *>("const QSet<QProfile *> *"); - qRegisterMetaType<const QList<QProfile *> *>("const QList<QProfile *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackage) *>("QT_PREPEND_NAMESPACE_QTUML(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprofileapplication.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprofileapplication.h b/src/uml/qprofileapplication.h index 002c3892..4de95b84 100644 --- a/src/uml/qprofileapplication.h +++ b/src/uml/qprofileapplication.h @@ -83,7 +83,6 @@ public: Q_INVOKABLE void setApplyingPackage(QPackage *applyingPackage); Q_INVOKABLE QProfile *appliedProfile() const; Q_INVOKABLE void setAppliedProfile(QProfile *appliedProfile); - virtual void registerMetaTypes() const; protected: explicit QProfileApplication(QProfileApplicationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QProfileApplication) *> *) - QT_END_HEADER #endif // QTUML_QPROFILEAPPLICATION_H diff --git a/src/uml/qproperty.cpp b/src/uml/qproperty.cpp index 66c3dd92..f7061f75 100644 --- a/src/uml/qproperty.cpp +++ b/src/uml/qproperty.cpp @@ -59,14 +59,11 @@ QPropertyPrivate::QPropertyPrivate() : isID(false), isDerivedUnion(false), aggregation(QtUml::AggregationNone), - subsettedProperties(new QSet<QProperty *>), owningAssociation(0), - qualifiers(new QList<QProperty *>), defaultValue(0), class_(0), associationEnd(0), datatype(0), - redefinedProperties(new QSet<QProperty *>), association(0), interface(0) { @@ -74,9 +71,6 @@ QPropertyPrivate::QPropertyPrivate() : QPropertyPrivate::~QPropertyPrivate() { - delete subsettedProperties; - delete qualifiers; - delete redefinedProperties; } /*! @@ -114,7 +108,7 @@ QProperty::~QProperty() /*! The Elements owned by this element. */ -const QSet<QElement *> *QProperty::ownedElements() const +const QSet<QElement *> &QProperty::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -130,7 +124,7 @@ QElement *QProperty::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QProperty::ownedComments() const +const QSet<QComment *> &QProperty::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -211,7 +205,7 @@ QNamespace *QProperty::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QProperty::clientDependencies() const +const QSet<QDependency *> &QProperty::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -373,7 +367,7 @@ void QProperty::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QProperty::redefinedElements() const +const QSet<QRedefinableElement *> &QProperty::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -381,7 +375,7 @@ const QSet<QRedefinableElement *> *QProperty::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QProperty::redefinitionContexts() const +const QSet<QClassifier *> &QProperty::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -415,7 +409,7 @@ void QProperty::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QProperty::featuringClassifiers() const +const QSet<QClassifier *> &QProperty::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -444,7 +438,7 @@ void QProperty::setOwningTemplateParameter(QTemplateParameter *owningTemplatePar /*! Denotes a set of connector ends that attaches to this connectable element. */ -const QList<QConnectorEnd *> *QProperty::ends() const +const QList<QConnectorEnd *> &QProperty::ends() const { return (qwrappedobject_cast<const QConnectableElement *>(this))->ends(); } @@ -469,7 +463,7 @@ void QProperty::setTemplateParameter(QConnectableElementTemplateParameter *templ /*! The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget. */ -const QSet<QPackageableElement *> *QProperty::deployedElements() const +const QSet<QPackageableElement *> &QProperty::deployedElements() const { return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployedElements(); } @@ -477,7 +471,7 @@ const QSet<QPackageableElement *> *QProperty::deployedElements() const /*! The set of Deployments for a DeploymentTarget. */ -const QSet<QDeployment *> *QProperty::deployments() const +const QSet<QDeployment *> &QProperty::deployments() const { return (qwrappedobject_cast<const QDeploymentTarget *>(this))->deployments(); } @@ -686,7 +680,7 @@ void QProperty::unsetAggregation() /*! References the properties of which this property is constrained to be a subset. */ -const QSet<QProperty *> *QProperty::subsettedProperties() const +const QSet<QProperty *> &QProperty::subsettedProperties() const { // This is a read-write association end @@ -699,8 +693,8 @@ void QProperty::addSubsettedProperty(QProperty *subsettedProperty) // This is a read-write association end Q_D(QProperty); - if (!d->subsettedProperties->contains(subsettedProperty)) { - d->subsettedProperties->insert(subsettedProperty); + if (!d->subsettedProperties.contains(subsettedProperty)) { + d->subsettedProperties.insert(subsettedProperty); } } @@ -709,8 +703,8 @@ void QProperty::removeSubsettedProperty(QProperty *subsettedProperty) // This is a read-write association end Q_D(QProperty); - if (d->subsettedProperties->contains(subsettedProperty)) { - d->subsettedProperties->remove(subsettedProperty); + if (d->subsettedProperties.contains(subsettedProperty)) { + d->subsettedProperties.remove(subsettedProperty); } } @@ -760,7 +754,7 @@ void QProperty::setOwningAssociation(QAssociation *owningAssociation) /*! An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified. */ -const QList<QProperty *> *QProperty::qualifiers() const +const QList<QProperty *> &QProperty::qualifiers() const { // This is a read-write association end @@ -773,8 +767,8 @@ void QProperty::addQualifier(QProperty *qualifier) // This is a read-write association end Q_D(QProperty); - if (!d->qualifiers->contains(qualifier)) { - d->qualifiers->append(qualifier); + if (!d->qualifiers.contains(qualifier)) { + d->qualifiers.append(qualifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); @@ -789,8 +783,8 @@ void QProperty::removeQualifier(QProperty *qualifier) // This is a read-write association end Q_D(QProperty); - if (d->qualifiers->contains(qualifier)) { - d->qualifiers->removeAll(qualifier); + if (d->qualifiers.contains(qualifier)) { + d->qualifiers.removeAll(qualifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(qualifier)); @@ -972,7 +966,7 @@ void QProperty::setDatatype(QDataType *datatype) /*! References the properties that are redefined by this property. */ -const QSet<QProperty *> *QProperty::redefinedProperties() const +const QSet<QProperty *> &QProperty::redefinedProperties() const { // This is a read-write association end @@ -985,8 +979,8 @@ void QProperty::addRedefinedProperty(QProperty *redefinedProperty) // This is a read-write association end Q_D(QProperty); - if (!d->redefinedProperties->contains(redefinedProperty)) { - d->redefinedProperties->insert(redefinedProperty); + if (!d->redefinedProperties.contains(redefinedProperty)) { + d->redefinedProperties.insert(redefinedProperty); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); @@ -998,8 +992,8 @@ void QProperty::removeRedefinedProperty(QProperty *redefinedProperty) // This is a read-write association end Q_D(QProperty); - if (d->redefinedProperties->contains(redefinedProperty)) { - d->redefinedProperties->remove(redefinedProperty); + if (d->redefinedProperties.contains(redefinedProperty)) { + d->redefinedProperties.remove(redefinedProperty); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); @@ -1123,82 +1117,11 @@ bool QProperty::isNavigable() const /*! The query subsettingContext() gives the context for subsetting a property. It consists, in the case of an attribute, of the corresponding classifier, and in the case of an association end, all of the classifiers at the other ends. */ -const QSet<QType *> *QProperty::subsettingContext() const +const QSet<QType *> &QProperty::subsettingContext() const { qWarning("QProperty::subsettingContext: operation to be implemented"); - return 0; // change here to your derived return -} - -void QProperty::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInterface) *>("QT_PREPEND_NAMESPACE_QTUML(QInterface) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInterface) *> *"); - qRegisterMetaType<QInterface *>("QInterface *"); - qRegisterMetaType<const QSet<QInterface *> *>("const QSet<QInterface *> *"); - qRegisterMetaType<const QList<QInterface *> *>("const QList<QInterface *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<QParameterableElement *>("QParameterableElement *"); - qRegisterMetaType<const QSet<QParameterableElement *> *>("const QSet<QParameterableElement *> *"); - qRegisterMetaType<const QList<QParameterableElement *> *>("const QList<QParameterableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QDataType) *>("QT_PREPEND_NAMESPACE_QTUML(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *>("QT_PREPEND_NAMESPACE_QTUML(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClass) *>("QT_PREPEND_NAMESPACE_QTUML(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QType *>); // change here to your derived return } #include "moc_qproperty.cpp" diff --git a/src/uml/qproperty.h b/src/uml/qproperty.h index c715aff1..b311fcde 100644 --- a/src/uml/qproperty.h +++ b/src/uml/qproperty.h @@ -87,15 +87,15 @@ class Q_UML_EXPORT QProperty : public QWrappedObject 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(const QSet<QProperty *> * subsettedProperties READ subsettedProperties) + Q_PROPERTY(QSet<QProperty *> subsettedProperties READ subsettedProperties) Q_PROPERTY(QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) - Q_PROPERTY(const QList<QProperty *> * qualifiers READ qualifiers) + 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(const QSet<QProperty *> * redefinedProperties READ redefinedProperties) + Q_PROPERTY(QSet<QProperty *> redefinedProperties READ redefinedProperties) Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) Q_PROPERTY(QInterface * interface READ interface WRITE setInterface) @@ -107,9 +107,9 @@ public: virtual ~QProperty(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -124,7 +124,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -157,8 +157,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -166,20 +166,20 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Association ends from aggregated QParameterableElement Q_INVOKABLE QTemplateParameter *owningTemplateParameter() const; Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Association ends from aggregated QConnectableElement - Q_INVOKABLE const QList<QConnectorEnd *> *ends() const; + Q_INVOKABLE const QList<QConnectorEnd *> &ends() const; Q_INVOKABLE QConnectableElementTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QConnectableElementTemplateParameter *templateParameter); // Association ends from aggregated QDeploymentTarget - Q_INVOKABLE const QSet<QPackageableElement *> *deployedElements() const; - Q_INVOKABLE const QSet<QDeployment *> *deployments() const; + Q_INVOKABLE const QSet<QPackageableElement *> &deployedElements() const; + Q_INVOKABLE const QSet<QDeployment *> &deployments() const; Q_INVOKABLE void addDeployment(QDeployment *deployment); Q_INVOKABLE void removeDeployment(QDeployment *deployment); @@ -206,12 +206,12 @@ public: Q_INVOKABLE void unsetAggregation(); // Association ends from QProperty - Q_INVOKABLE const QSet<QProperty *> *subsettedProperties() const; + Q_INVOKABLE const QSet<QProperty *> &subsettedProperties() const; Q_INVOKABLE void addSubsettedProperty(QProperty *subsettedProperty); Q_INVOKABLE void removeSubsettedProperty(QProperty *subsettedProperty); Q_INVOKABLE QAssociation *owningAssociation() const; Q_INVOKABLE void setOwningAssociation(QAssociation *owningAssociation); - Q_INVOKABLE const QList<QProperty *> *qualifiers() const; + Q_INVOKABLE const QList<QProperty *> &qualifiers() const; Q_INVOKABLE void addQualifier(QProperty *qualifier); Q_INVOKABLE void removeQualifier(QProperty *qualifier); Q_INVOKABLE QValueSpecification *defaultValue() const; @@ -224,7 +224,7 @@ public: Q_INVOKABLE void setAssociationEnd(QProperty *associationEnd); Q_INVOKABLE QDataType *datatype() const; Q_INVOKABLE void setDatatype(QDataType *datatype); - Q_INVOKABLE const QSet<QProperty *> *redefinedProperties() const; + Q_INVOKABLE const QSet<QProperty *> &redefinedProperties() const; Q_INVOKABLE void addRedefinedProperty(QProperty *redefinedProperty); Q_INVOKABLE void removeRedefinedProperty(QProperty *redefinedProperty); Q_INVOKABLE QAssociation *association() const; @@ -237,8 +237,7 @@ public: Q_INVOKABLE bool isCompatibleWith(const QParameterableElement *p) const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isNavigable() const; - Q_INVOKABLE const QSet<QType *> *subsettingContext() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QType *> &subsettingContext() const; protected: explicit QProperty(QPropertyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -251,10 +250,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QProperty) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *) - QT_END_HEADER #endif // QTUML_QPROPERTY_H diff --git a/src/uml/qproperty_p.h b/src/uml/qproperty_p.h index 99112c12..58996ac3 100644 --- a/src/uml/qproperty_p.h +++ b/src/uml/qproperty_p.h @@ -88,14 +88,14 @@ public: bool isID; bool isDerivedUnion; QtUml::AggregationKind aggregation; - QSet<QProperty *> *subsettedProperties; + QSet<QProperty *> subsettedProperties; QAssociation *owningAssociation; - QList<QProperty *> *qualifiers; + QList<QProperty *> qualifiers; QValueSpecification *defaultValue; QClass *class_; QProperty *associationEnd; QDataType *datatype; - QSet<QProperty *> *redefinedProperties; + QSet<QProperty *> redefinedProperties; QAssociation *association; QInterface *interface; }; diff --git a/src/uml/qprotocolconformance.cpp b/src/uml/qprotocolconformance.cpp index 1534637c..1c90b709 100644 --- a/src/uml/qprotocolconformance.cpp +++ b/src/uml/qprotocolconformance.cpp @@ -149,28 +149,6 @@ void QProtocolConformance::setGeneralMachine(QProtocolStateMachine *generalMachi } } -void QProtocolConformance::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *"); - qRegisterMetaType<QProtocolConformance *>("QProtocolConformance *"); - qRegisterMetaType<const QSet<QProtocolConformance *> *>("const QSet<QProtocolConformance *> *"); - qRegisterMetaType<const QList<QProtocolConformance *> *>("const QList<QProtocolConformance *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *"); - qRegisterMetaType<const QSet<QProtocolStateMachine *> *>("const QSet<QProtocolStateMachine *> *"); - qRegisterMetaType<const QList<QProtocolStateMachine *> *>("const QList<QProtocolStateMachine *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprotocolconformance.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprotocolconformance.h b/src/uml/qprotocolconformance.h index bdd3afac..b23445fe 100644 --- a/src/uml/qprotocolconformance.h +++ b/src/uml/qprotocolconformance.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setSpecificMachine(QProtocolStateMachine *specificMachine); Q_INVOKABLE QProtocolStateMachine *generalMachine() const; Q_INVOKABLE void setGeneralMachine(QProtocolStateMachine *generalMachine); - virtual void registerMetaTypes() const; protected: explicit QProtocolConformance(QProtocolConformancePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *) - QT_END_HEADER #endif // QTUML_QPROTOCOLCONFORMANCE_H diff --git a/src/uml/qprotocolstatemachine.cpp b/src/uml/qprotocolstatemachine.cpp index fa426cb1..a1c80235 100644 --- a/src/uml/qprotocolstatemachine.cpp +++ b/src/uml/qprotocolstatemachine.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QProtocolStateMachinePrivate::QProtocolStateMachinePrivate() : - conformance(new QSet<QProtocolConformance *>) +QProtocolStateMachinePrivate::QProtocolStateMachinePrivate() { } QProtocolStateMachinePrivate::~QProtocolStateMachinePrivate() { - delete conformance; } /*! @@ -85,7 +83,7 @@ QProtocolStateMachine::~QProtocolStateMachine() /*! Conformance between protocol state machines. */ -const QSet<QProtocolConformance *> *QProtocolStateMachine::conformance() const +const QSet<QProtocolConformance *> &QProtocolStateMachine::conformance() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QProtocolStateMachine::addConformance(QProtocolConformance *conformance) // This is a read-write association end Q_D(QProtocolStateMachine); - if (!d->conformance->contains(conformance)) { - d->conformance->insert(conformance); + if (!d->conformance.contains(conformance)) { + d->conformance.insert(conformance); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(conformance)); @@ -114,8 +112,8 @@ void QProtocolStateMachine::removeConformance(QProtocolConformance *conformance) // This is a read-write association end Q_D(QProtocolStateMachine); - if (d->conformance->contains(conformance)) { - d->conformance->remove(conformance); + if (d->conformance.contains(conformance)) { + d->conformance.remove(conformance); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(conformance)); @@ -125,28 +123,6 @@ void QProtocolStateMachine::removeConformance(QProtocolConformance *conformance) } } -void QProtocolStateMachine::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *"); - qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *"); - qRegisterMetaType<const QSet<QProtocolStateMachine *> *>("const QSet<QProtocolStateMachine *> *"); - qRegisterMetaType<const QList<QProtocolStateMachine *> *>("const QList<QProtocolStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolConformance) *> *"); - qRegisterMetaType<QProtocolConformance *>("QProtocolConformance *"); - qRegisterMetaType<const QSet<QProtocolConformance *> *>("const QSet<QProtocolConformance *> *"); - qRegisterMetaType<const QList<QProtocolConformance *> *>("const QList<QProtocolConformance *> *"); - - QStateMachine::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprotocolstatemachine.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprotocolstatemachine.h b/src/uml/qprotocolstatemachine.h index 16055e03..aed3202f 100644 --- a/src/uml/qprotocolstatemachine.h +++ b/src/uml/qprotocolstatemachine.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QProtocolStateMachine : public QStateMachine { Q_OBJECT - Q_PROPERTY(const QSet<QProtocolConformance *> * conformance READ conformance) + Q_PROPERTY(QSet<QProtocolConformance *> conformance READ conformance) Q_DISABLE_COPY(QProtocolStateMachine) Q_DECLARE_PRIVATE(QProtocolStateMachine) @@ -74,10 +74,9 @@ public: virtual ~QProtocolStateMachine(); // Association ends from QProtocolStateMachine - Q_INVOKABLE const QSet<QProtocolConformance *> *conformance() const; + Q_INVOKABLE const QSet<QProtocolConformance *> &conformance() const; Q_INVOKABLE void addConformance(QProtocolConformance *conformance); Q_INVOKABLE void removeConformance(QProtocolConformance *conformance); - virtual void registerMetaTypes() const; protected: explicit QProtocolStateMachine(QProtocolStateMachinePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolStateMachine) *> *) - QT_END_HEADER #endif // QTUML_QPROTOCOLSTATEMACHINE_H diff --git a/src/uml/qprotocolstatemachine_p.h b/src/uml/qprotocolstatemachine_p.h index 0abf34ad..19dd2187 100644 --- a/src/uml/qprotocolstatemachine_p.h +++ b/src/uml/qprotocolstatemachine_p.h @@ -67,7 +67,7 @@ public: explicit QProtocolStateMachinePrivate(); virtual ~QProtocolStateMachinePrivate(); - QSet<QProtocolConformance *> *conformance; + QSet<QProtocolConformance *> conformance; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprotocoltransition.cpp b/src/uml/qprotocoltransition.cpp index 02ea7a98..f5af20d6 100644 --- a/src/uml/qprotocoltransition.cpp +++ b/src/uml/qprotocoltransition.cpp @@ -115,13 +115,13 @@ void QProtocolTransition::setPostCondition(QConstraint *postCondition) /*! This association refers to the associated operation. It is derived from the operation of the call trigger when applicable. */ -const QSet<QOperation *> *QProtocolTransition::referred() const +const QSet<QOperation *> &QProtocolTransition::referred() const { // This is a read-only derived association end qWarning("QProtocolTransition::referred: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QOperation *>); // change here to your derived return } /*! @@ -148,35 +148,6 @@ void QProtocolTransition::setPreCondition(QConstraint *preCondition) } } -void QProtocolTransition::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *>("QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *> *"); - qRegisterMetaType<QProtocolTransition *>("QProtocolTransition *"); - qRegisterMetaType<const QSet<QProtocolTransition *> *>("const QSet<QProtocolTransition *> *"); - qRegisterMetaType<const QList<QProtocolTransition *> *>("const QList<QProtocolTransition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOperation) *>("QT_PREPEND_NAMESPACE_QTUML(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QTransition::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprotocoltransition.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qprotocoltransition.h b/src/uml/qprotocoltransition.h index 15d778a0..1a4e94ec 100644 --- a/src/uml/qprotocoltransition.h +++ b/src/uml/qprotocoltransition.h @@ -66,7 +66,7 @@ class Q_UML_EXPORT QProtocolTransition : public QTransition Q_OBJECT Q_PROPERTY(QConstraint * postCondition READ postCondition WRITE setPostCondition) - Q_PROPERTY(const QSet<QOperation *> * referred READ referred STORED false) + Q_PROPERTY(QSet<QOperation *> referred READ referred STORED false) Q_PROPERTY(QConstraint * preCondition READ preCondition WRITE setPreCondition) Q_DISABLE_COPY(QProtocolTransition) @@ -79,10 +79,9 @@ public: // Association ends from QProtocolTransition Q_INVOKABLE QConstraint *postCondition() const; Q_INVOKABLE void setPostCondition(QConstraint *postCondition); - Q_INVOKABLE const QSet<QOperation *> *referred() const; + Q_INVOKABLE const QSet<QOperation *> &referred() const; Q_INVOKABLE QConstraint *preCondition() const; Q_INVOKABLE void setPreCondition(QConstraint *preCondition); - virtual void registerMetaTypes() const; protected: explicit QProtocolTransition(QProtocolTransitionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QProtocolTransition) *> *) - QT_END_HEADER #endif // QTUML_QPROTOCOLTRANSITION_H diff --git a/src/uml/qpseudostate.cpp b/src/uml/qpseudostate.cpp index b80716df..8c15de31 100644 --- a/src/uml/qpseudostate.cpp +++ b/src/uml/qpseudostate.cpp @@ -178,35 +178,6 @@ void QPseudostate::setStateMachine(QStateMachine *stateMachine) } } -void QPseudostate::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *>("QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<QPseudostate *>("QPseudostate *"); - qRegisterMetaType<const QSet<QPseudostate *> *>("const QSet<QPseudostate *> *"); - qRegisterMetaType<const QList<QPseudostate *> *>("const QList<QPseudostate *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QState) *>("QT_PREPEND_NAMESPACE_QTUML(QState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<QState *>("QState *"); - qRegisterMetaType<const QSet<QState *> *>("const QSet<QState *> *"); - qRegisterMetaType<const QList<QState *> *>("const QList<QState *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<QStateMachine *>("QStateMachine *"); - qRegisterMetaType<const QSet<QStateMachine *> *>("const QSet<QStateMachine *> *"); - qRegisterMetaType<const QList<QStateMachine *> *>("const QList<QStateMachine *> *"); - - QVertex::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpseudostate.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qpseudostate.h b/src/uml/qpseudostate.h index 0012835b..fd7799bc 100644 --- a/src/uml/qpseudostate.h +++ b/src/uml/qpseudostate.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void setState(QState *state); Q_INVOKABLE QStateMachine *stateMachine() const; Q_INVOKABLE void setStateMachine(QStateMachine *stateMachine); - virtual void registerMetaTypes() const; protected: explicit QPseudostate(QPseudostatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *) - QT_END_HEADER #endif // QTUML_QPSEUDOSTATE_H diff --git a/src/uml/qqualifiervalue.cpp b/src/uml/qqualifiervalue.cpp index 296bee98..d0c7094f 100644 --- a/src/uml/qqualifiervalue.cpp +++ b/src/uml/qqualifiervalue.cpp @@ -125,35 +125,6 @@ void QQualifierValue::setQualifier(QProperty *qualifier) } } -void QQualifierValue::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *>("QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *"); - qRegisterMetaType<QQualifierValue *>("QQualifierValue *"); - qRegisterMetaType<const QSet<QQualifierValue *> *>("const QSet<QQualifierValue *> *"); - qRegisterMetaType<const QList<QQualifierValue *> *>("const QList<QQualifierValue *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qqualifiervalue.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qqualifiervalue.h b/src/uml/qqualifiervalue.h index 0a0e7621..4ace4bba 100644 --- a/src/uml/qqualifiervalue.h +++ b/src/uml/qqualifiervalue.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setValue(QInputPin *value); Q_INVOKABLE QProperty *qualifier() const; Q_INVOKABLE void setQualifier(QProperty *qualifier); - virtual void registerMetaTypes() const; protected: explicit QQualifierValue(QQualifierValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QQualifierValue) *> *) - QT_END_HEADER #endif // QTUML_QQUALIFIERVALUE_H diff --git a/src/uml/qraiseexceptionaction.cpp b/src/uml/qraiseexceptionaction.cpp index 1c7a6ad4..242a91f7 100644 --- a/src/uml/qraiseexceptionaction.cpp +++ b/src/uml/qraiseexceptionaction.cpp @@ -110,28 +110,6 @@ void QRaiseExceptionAction::setException(QInputPin *exception) } } -void QRaiseExceptionAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *>("QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *> *"); - qRegisterMetaType<QRaiseExceptionAction *>("QRaiseExceptionAction *"); - qRegisterMetaType<const QSet<QRaiseExceptionAction *> *>("const QSet<QRaiseExceptionAction *> *"); - qRegisterMetaType<const QList<QRaiseExceptionAction *> *>("const QList<QRaiseExceptionAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qraiseexceptionaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qraiseexceptionaction.h b/src/uml/qraiseexceptionaction.h index 3a49435e..7bb198d4 100644 --- a/src/uml/qraiseexceptionaction.h +++ b/src/uml/qraiseexceptionaction.h @@ -73,7 +73,6 @@ public: // Association ends from QRaiseExceptionAction Q_INVOKABLE QInputPin *exception() const; Q_INVOKABLE void setException(QInputPin *exception); - virtual void registerMetaTypes() const; protected: explicit QRaiseExceptionAction(QRaiseExceptionActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRaiseExceptionAction) *> *) - QT_END_HEADER #endif // QTUML_QRAISEEXCEPTIONACTION_H diff --git a/src/uml/qreadextentaction.cpp b/src/uml/qreadextentaction.cpp index a886d907..a6b4936b 100644 --- a/src/uml/qreadextentaction.cpp +++ b/src/uml/qreadextentaction.cpp @@ -133,35 +133,6 @@ void QReadExtentAction::setResult(QOutputPin *result) } } -void QReadExtentAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *> *"); - qRegisterMetaType<QReadExtentAction *>("QReadExtentAction *"); - qRegisterMetaType<const QSet<QReadExtentAction *> *>("const QSet<QReadExtentAction *> *"); - qRegisterMetaType<const QList<QReadExtentAction *> *>("const QList<QReadExtentAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadextentaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadextentaction.h b/src/uml/qreadextentaction.h index 52a64042..6a9cb29d 100644 --- a/src/uml/qreadextentaction.h +++ b/src/uml/qreadextentaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setClassifier(QClassifier *classifier); Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QReadExtentAction(QReadExtentActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadExtentAction) *> *) - QT_END_HEADER #endif // QTUML_QREADEXTENTACTION_H diff --git a/src/uml/qreadisclassifiedobjectaction.cpp b/src/uml/qreadisclassifiedobjectaction.cpp index 315e87a4..ea04ed6c 100644 --- a/src/uml/qreadisclassifiedobjectaction.cpp +++ b/src/uml/qreadisclassifiedobjectaction.cpp @@ -195,42 +195,6 @@ void QReadIsClassifiedObjectAction::setClassifier(QClassifier *classifier) } } -void QReadIsClassifiedObjectAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *> *"); - qRegisterMetaType<QReadIsClassifiedObjectAction *>("QReadIsClassifiedObjectAction *"); - qRegisterMetaType<const QSet<QReadIsClassifiedObjectAction *> *>("const QSet<QReadIsClassifiedObjectAction *> *"); - qRegisterMetaType<const QList<QReadIsClassifiedObjectAction *> *>("const QList<QReadIsClassifiedObjectAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadisclassifiedobjectaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadisclassifiedobjectaction.h b/src/uml/qreadisclassifiedobjectaction.h index fc5094c2..af0c73b4 100644 --- a/src/uml/qreadisclassifiedobjectaction.h +++ b/src/uml/qreadisclassifiedobjectaction.h @@ -87,7 +87,6 @@ public: Q_INVOKABLE void setObject(QInputPin *object); Q_INVOKABLE QClassifier *classifier() const; Q_INVOKABLE void setClassifier(QClassifier *classifier); - virtual void registerMetaTypes() const; protected: explicit QReadIsClassifiedObjectAction(QReadIsClassifiedObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadIsClassifiedObjectAction) *> *) - QT_END_HEADER #endif // QTUML_QREADISCLASSIFIEDOBJECTACTION_H diff --git a/src/uml/qreadlinkaction.cpp b/src/uml/qreadlinkaction.cpp index 0d75f80d..88105938 100644 --- a/src/uml/qreadlinkaction.cpp +++ b/src/uml/qreadlinkaction.cpp @@ -110,28 +110,6 @@ void QReadLinkAction::setResult(QOutputPin *result) } } -void QReadLinkAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *> *"); - qRegisterMetaType<QReadLinkAction *>("QReadLinkAction *"); - qRegisterMetaType<const QSet<QReadLinkAction *> *>("const QSet<QReadLinkAction *> *"); - qRegisterMetaType<const QList<QReadLinkAction *> *>("const QList<QReadLinkAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QLinkAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadlinkaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadlinkaction.h b/src/uml/qreadlinkaction.h index bc697a43..4f1633f7 100644 --- a/src/uml/qreadlinkaction.h +++ b/src/uml/qreadlinkaction.h @@ -73,7 +73,6 @@ public: // Association ends from QReadLinkAction Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QReadLinkAction(QReadLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkAction) *> *) - QT_END_HEADER #endif // QTUML_QREADLINKACTION_H diff --git a/src/uml/qreadlinkobjectendaction.cpp b/src/uml/qreadlinkobjectendaction.cpp index 1d56ea07..d18be56b 100644 --- a/src/uml/qreadlinkobjectendaction.cpp +++ b/src/uml/qreadlinkobjectendaction.cpp @@ -164,42 +164,6 @@ void QReadLinkObjectEndAction::setResult(QOutputPin *result) } } -void QReadLinkObjectEndAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *> *"); - qRegisterMetaType<QReadLinkObjectEndAction *>("QReadLinkObjectEndAction *"); - qRegisterMetaType<const QSet<QReadLinkObjectEndAction *> *>("const QSet<QReadLinkObjectEndAction *> *"); - qRegisterMetaType<const QList<QReadLinkObjectEndAction *> *>("const QList<QReadLinkObjectEndAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadlinkobjectendaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadlinkobjectendaction.h b/src/uml/qreadlinkobjectendaction.h index f177f384..260e0670 100644 --- a/src/uml/qreadlinkobjectendaction.h +++ b/src/uml/qreadlinkobjectendaction.h @@ -81,7 +81,6 @@ public: Q_INVOKABLE void setObject(QInputPin *object); Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QReadLinkObjectEndAction(QReadLinkObjectEndActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndAction) *> *) - QT_END_HEADER #endif // QTUML_QREADLINKOBJECTENDACTION_H diff --git a/src/uml/qreadlinkobjectendqualifieraction.cpp b/src/uml/qreadlinkobjectendqualifieraction.cpp index 5a01445a..b2936668 100644 --- a/src/uml/qreadlinkobjectendqualifieraction.cpp +++ b/src/uml/qreadlinkobjectendqualifieraction.cpp @@ -164,42 +164,6 @@ void QReadLinkObjectEndQualifierAction::setQualifier(QProperty *qualifier) } } -void QReadLinkObjectEndQualifierAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *> *"); - qRegisterMetaType<QReadLinkObjectEndQualifierAction *>("QReadLinkObjectEndQualifierAction *"); - qRegisterMetaType<const QSet<QReadLinkObjectEndQualifierAction *> *>("const QSet<QReadLinkObjectEndQualifierAction *> *"); - qRegisterMetaType<const QList<QReadLinkObjectEndQualifierAction *> *>("const QList<QReadLinkObjectEndQualifierAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadlinkobjectendqualifieraction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadlinkobjectendqualifieraction.h b/src/uml/qreadlinkobjectendqualifieraction.h index e785d686..d181fb30 100644 --- a/src/uml/qreadlinkobjectendqualifieraction.h +++ b/src/uml/qreadlinkobjectendqualifieraction.h @@ -81,7 +81,6 @@ public: Q_INVOKABLE void setObject(QInputPin *object); Q_INVOKABLE QProperty *qualifier() const; Q_INVOKABLE void setQualifier(QProperty *qualifier); - virtual void registerMetaTypes() const; protected: explicit QReadLinkObjectEndQualifierAction(QReadLinkObjectEndQualifierActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadLinkObjectEndQualifierAction) *> *) - QT_END_HEADER #endif // QTUML_QREADLINKOBJECTENDQUALIFIERACTION_H diff --git a/src/uml/qreadselfaction.cpp b/src/uml/qreadselfaction.cpp index 6e722c07..bb39d650 100644 --- a/src/uml/qreadselfaction.cpp +++ b/src/uml/qreadselfaction.cpp @@ -110,28 +110,6 @@ void QReadSelfAction::setResult(QOutputPin *result) } } -void QReadSelfAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *> *"); - qRegisterMetaType<QReadSelfAction *>("QReadSelfAction *"); - qRegisterMetaType<const QSet<QReadSelfAction *> *>("const QSet<QReadSelfAction *> *"); - qRegisterMetaType<const QList<QReadSelfAction *> *>("const QList<QReadSelfAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadselfaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadselfaction.h b/src/uml/qreadselfaction.h index b4712492..88e82a00 100644 --- a/src/uml/qreadselfaction.h +++ b/src/uml/qreadselfaction.h @@ -73,7 +73,6 @@ public: // Association ends from QReadSelfAction Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QReadSelfAction(QReadSelfActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadSelfAction) *> *) - QT_END_HEADER #endif // QTUML_QREADSELFACTION_H diff --git a/src/uml/qreadstructuralfeatureaction.cpp b/src/uml/qreadstructuralfeatureaction.cpp index 65c342d3..27f1171f 100644 --- a/src/uml/qreadstructuralfeatureaction.cpp +++ b/src/uml/qreadstructuralfeatureaction.cpp @@ -110,28 +110,6 @@ void QReadStructuralFeatureAction::setResult(QOutputPin *result) } } -void QReadStructuralFeatureAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *> *"); - qRegisterMetaType<QReadStructuralFeatureAction *>("QReadStructuralFeatureAction *"); - qRegisterMetaType<const QSet<QReadStructuralFeatureAction *> *>("const QSet<QReadStructuralFeatureAction *> *"); - qRegisterMetaType<const QList<QReadStructuralFeatureAction *> *>("const QList<QReadStructuralFeatureAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QStructuralFeatureAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadstructuralfeatureaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadstructuralfeatureaction.h b/src/uml/qreadstructuralfeatureaction.h index 1e92c2e1..f12cffe0 100644 --- a/src/uml/qreadstructuralfeatureaction.h +++ b/src/uml/qreadstructuralfeatureaction.h @@ -73,7 +73,6 @@ public: // Association ends from QReadStructuralFeatureAction Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QReadStructuralFeatureAction(QReadStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadStructuralFeatureAction) *> *) - QT_END_HEADER #endif // QTUML_QREADSTRUCTURALFEATUREACTION_H diff --git a/src/uml/qreadvariableaction.cpp b/src/uml/qreadvariableaction.cpp index 9149ebb7..9c959059 100644 --- a/src/uml/qreadvariableaction.cpp +++ b/src/uml/qreadvariableaction.cpp @@ -110,28 +110,6 @@ void QReadVariableAction::setResult(QOutputPin *result) } } -void QReadVariableAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *> *"); - qRegisterMetaType<QReadVariableAction *>("QReadVariableAction *"); - qRegisterMetaType<const QSet<QReadVariableAction *> *>("const QSet<QReadVariableAction *> *"); - qRegisterMetaType<const QList<QReadVariableAction *> *>("const QList<QReadVariableAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QVariableAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreadvariableaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreadvariableaction.h b/src/uml/qreadvariableaction.h index 72c1aa01..1d73ae63 100644 --- a/src/uml/qreadvariableaction.h +++ b/src/uml/qreadvariableaction.h @@ -73,7 +73,6 @@ public: // Association ends from QReadVariableAction Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QReadVariableAction(QReadVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReadVariableAction) *> *) - QT_END_HEADER #endif // QTUML_QREADVARIABLEACTION_H diff --git a/src/uml/qrealization.cpp b/src/uml/qrealization.cpp index df24478e..4921b454 100644 --- a/src/uml/qrealization.cpp +++ b/src/uml/qrealization.cpp @@ -74,21 +74,6 @@ QRealization::~QRealization() { } -void QRealization::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRealization) *>("QT_PREPEND_NAMESPACE_QTUML(QRealization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRealization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRealization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRealization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRealization) *> *"); - qRegisterMetaType<QRealization *>("QRealization *"); - qRegisterMetaType<const QSet<QRealization *> *>("const QSet<QRealization *> *"); - qRegisterMetaType<const QList<QRealization *> *>("const QList<QRealization *> *"); - - QAbstraction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qrealization.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qrealization.h b/src/uml/qrealization.h index a13b72a3..fb0b9369 100644 --- a/src/uml/qrealization.h +++ b/src/uml/qrealization.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QRealization : public QAbstraction public: Q_INVOKABLE explicit QRealization(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QRealization(); - virtual void registerMetaTypes() const; protected: explicit QRealization(QRealizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRealization) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRealization) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRealization) *> *) - QT_END_HEADER #endif // QTUML_QREALIZATION_H diff --git a/src/uml/qreception.cpp b/src/uml/qreception.cpp index 1c8aadb6..4519e3b5 100644 --- a/src/uml/qreception.cpp +++ b/src/uml/qreception.cpp @@ -102,28 +102,6 @@ void QReception::setSignal(QSignal *signal) } } -void QReception::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReception) *>("QT_PREPEND_NAMESPACE_QTUML(QReception) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *"); - qRegisterMetaType<QReception *>("QReception *"); - qRegisterMetaType<const QSet<QReception *> *>("const QSet<QReception *> *"); - qRegisterMetaType<const QList<QReception *> *>("const QList<QReception *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSignal) *>("QT_PREPEND_NAMESPACE_QTUML(QSignal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<QSignal *>("QSignal *"); - qRegisterMetaType<const QSet<QSignal *> *>("const QSet<QSignal *> *"); - qRegisterMetaType<const QList<QSignal *> *>("const QList<QSignal *> *"); - - QBehavioralFeature::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreception.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreception.h b/src/uml/qreception.h index 766ea0b0..9f0d31e4 100644 --- a/src/uml/qreception.h +++ b/src/uml/qreception.h @@ -73,7 +73,6 @@ public: // Association ends from QReception Q_INVOKABLE QSignal *signal() const; Q_INVOKABLE void setSignal(QSignal *signal); - virtual void registerMetaTypes() const; protected: explicit QReception(QReceptionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReception) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReception) *> *) - QT_END_HEADER #endif // QTUML_QRECEPTION_H diff --git a/src/uml/qreclassifyobjectaction.cpp b/src/uml/qreclassifyobjectaction.cpp index 29c77cb0..6a0b8681 100644 --- a/src/uml/qreclassifyobjectaction.cpp +++ b/src/uml/qreclassifyobjectaction.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML QReclassifyObjectActionPrivate::QReclassifyObjectActionPrivate() : isReplaceAll(false), - oldClassifiers(new QSet<QClassifier *>), - object(0), - newClassifiers(new QSet<QClassifier *>) + object(0) { } QReclassifyObjectActionPrivate::~QReclassifyObjectActionPrivate() { - delete oldClassifiers; - delete newClassifiers; } /*! @@ -120,7 +116,7 @@ void QReclassifyObjectAction::unsetReplaceAll() /*! A set of classifiers to be removed from the classifiers of the object. */ -const QSet<QClassifier *> *QReclassifyObjectAction::oldClassifiers() const +const QSet<QClassifier *> &QReclassifyObjectAction::oldClassifiers() const { // This is a read-write association end @@ -133,8 +129,8 @@ void QReclassifyObjectAction::addOldClassifier(QClassifier *oldClassifier) // This is a read-write association end Q_D(QReclassifyObjectAction); - if (!d->oldClassifiers->contains(oldClassifier)) { - d->oldClassifiers->insert(oldClassifier); + if (!d->oldClassifiers.contains(oldClassifier)) { + d->oldClassifiers.insert(oldClassifier); } } @@ -143,8 +139,8 @@ void QReclassifyObjectAction::removeOldClassifier(QClassifier *oldClassifier) // This is a read-write association end Q_D(QReclassifyObjectAction); - if (d->oldClassifiers->contains(oldClassifier)) { - d->oldClassifiers->remove(oldClassifier); + if (d->oldClassifiers.contains(oldClassifier)) { + d->oldClassifiers.remove(oldClassifier); } } @@ -180,7 +176,7 @@ void QReclassifyObjectAction::setObject(QInputPin *object) /*! A set of classifiers to be added to the classifiers of the object. */ -const QSet<QClassifier *> *QReclassifyObjectAction::newClassifiers() const +const QSet<QClassifier *> &QReclassifyObjectAction::newClassifiers() const { // This is a read-write association end @@ -193,8 +189,8 @@ void QReclassifyObjectAction::addNewClassifier(QClassifier *newClassifier) // This is a read-write association end Q_D(QReclassifyObjectAction); - if (!d->newClassifiers->contains(newClassifier)) { - d->newClassifiers->insert(newClassifier); + if (!d->newClassifiers.contains(newClassifier)) { + d->newClassifiers.insert(newClassifier); } } @@ -203,40 +199,11 @@ void QReclassifyObjectAction::removeNewClassifier(QClassifier *newClassifier) // This is a read-write association end Q_D(QReclassifyObjectAction); - if (d->newClassifiers->contains(newClassifier)) { - d->newClassifiers->remove(newClassifier); + if (d->newClassifiers.contains(newClassifier)) { + d->newClassifiers.remove(newClassifier); } } -void QReclassifyObjectAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *> *"); - qRegisterMetaType<QReclassifyObjectAction *>("QReclassifyObjectAction *"); - qRegisterMetaType<const QSet<QReclassifyObjectAction *> *>("const QSet<QReclassifyObjectAction *> *"); - qRegisterMetaType<const QList<QReclassifyObjectAction *> *>("const QList<QReclassifyObjectAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreclassifyobjectaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreclassifyobjectaction.h b/src/uml/qreclassifyobjectaction.h index 82812a2a..fbb5596e 100644 --- a/src/uml/qreclassifyobjectaction.h +++ b/src/uml/qreclassifyobjectaction.h @@ -66,9 +66,9 @@ class Q_UML_EXPORT QReclassifyObjectAction : public QAction Q_OBJECT Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) - Q_PROPERTY(const QSet<QClassifier *> * oldClassifiers READ oldClassifiers) + Q_PROPERTY(QSet<QClassifier *> oldClassifiers READ oldClassifiers) Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(const QSet<QClassifier *> * newClassifiers READ newClassifiers) + Q_PROPERTY(QSet<QClassifier *> newClassifiers READ newClassifiers) Q_DISABLE_COPY(QReclassifyObjectAction) Q_DECLARE_PRIVATE(QReclassifyObjectAction) @@ -83,15 +83,14 @@ public: Q_INVOKABLE void unsetReplaceAll(); // Association ends from QReclassifyObjectAction - Q_INVOKABLE const QSet<QClassifier *> *oldClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &oldClassifiers() const; Q_INVOKABLE void addOldClassifier(QClassifier *oldClassifier); Q_INVOKABLE void removeOldClassifier(QClassifier *oldClassifier); Q_INVOKABLE QInputPin *object() const; Q_INVOKABLE void setObject(QInputPin *object); - Q_INVOKABLE const QSet<QClassifier *> *newClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &newClassifiers() const; Q_INVOKABLE void addNewClassifier(QClassifier *newClassifier); Q_INVOKABLE void removeNewClassifier(QClassifier *newClassifier); - virtual void registerMetaTypes() const; protected: explicit QReclassifyObjectAction(QReclassifyObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -99,10 +98,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReclassifyObjectAction) *> *) - QT_END_HEADER #endif // QTUML_QRECLASSIFYOBJECTACTION_H diff --git a/src/uml/qreclassifyobjectaction_p.h b/src/uml/qreclassifyobjectaction_p.h index 87ba4c96..322b462f 100644 --- a/src/uml/qreclassifyobjectaction_p.h +++ b/src/uml/qreclassifyobjectaction_p.h @@ -69,9 +69,9 @@ public: virtual ~QReclassifyObjectActionPrivate(); bool isReplaceAll; - QSet<QClassifier *> *oldClassifiers; + QSet<QClassifier *> oldClassifiers; QInputPin *object; - QSet<QClassifier *> *newClassifiers; + QSet<QClassifier *> newClassifiers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qredefinableelement.cpp b/src/uml/qredefinableelement.cpp index 57ea125f..ec71c691 100644 --- a/src/uml/qredefinableelement.cpp +++ b/src/uml/qredefinableelement.cpp @@ -47,24 +47,20 @@ QT_BEGIN_NAMESPACE_QTUML QRedefinableElementPrivate::QRedefinableElementPrivate() : - isLeaf(false), - redefinedElements(new QSet<QRedefinableElement *>), - redefinitionContexts(new QSet<QClassifier *>) + isLeaf(false) { } QRedefinableElementPrivate::~QRedefinableElementPrivate() { - delete redefinedElements; - delete redefinitionContexts; } void QRedefinableElementPrivate::addRedefinedElement(QRedefinableElement *redefinedElement) { // This is a read-only derived-union association end - if (!this->redefinedElements->contains(redefinedElement)) { - this->redefinedElements->insert(redefinedElement); + if (!this->redefinedElements.contains(redefinedElement)) { + this->redefinedElements.insert(redefinedElement); } } @@ -72,8 +68,8 @@ void QRedefinableElementPrivate::removeRedefinedElement(QRedefinableElement *red { // This is a read-only derived-union association end - if (this->redefinedElements->contains(redefinedElement)) { - this->redefinedElements->remove(redefinedElement); + if (this->redefinedElements.contains(redefinedElement)) { + this->redefinedElements.remove(redefinedElement); } } @@ -81,8 +77,8 @@ void QRedefinableElementPrivate::addRedefinitionContext(QClassifier *redefinitio { // This is a read-only derived-union association end - if (!this->redefinitionContexts->contains(redefinitionContext)) { - this->redefinitionContexts->insert(redefinitionContext); + if (!this->redefinitionContexts.contains(redefinitionContext)) { + this->redefinitionContexts.insert(redefinitionContext); } } @@ -90,8 +86,8 @@ void QRedefinableElementPrivate::removeRedefinitionContext(QClassifier *redefini { // This is a read-only derived-union association end - if (this->redefinitionContexts->contains(redefinitionContext)) { - this->redefinitionContexts->remove(redefinitionContext); + if (this->redefinitionContexts.contains(redefinitionContext)) { + this->redefinitionContexts.remove(redefinitionContext); } } @@ -154,7 +150,7 @@ void QRedefinableElement::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QRedefinableElement::redefinedElements() const +const QSet<QRedefinableElement *> &QRedefinableElement::redefinedElements() const { // This is a read-only derived-union association end @@ -165,7 +161,7 @@ const QSet<QRedefinableElement *> *QRedefinableElement::redefinedElements() cons /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QRedefinableElement::redefinitionContexts() const +const QSet<QClassifier *> &QRedefinableElement::redefinitionContexts() const { // This is a read-only derived-union association end @@ -195,28 +191,6 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement * return bool(); // change here to your derived return } -void QRedefinableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qredefinableelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qredefinableelement.h b/src/uml/qredefinableelement.h index 5d0b2658..6bfdebce 100644 --- a/src/uml/qredefinableelement.h +++ b/src/uml/qredefinableelement.h @@ -65,8 +65,8 @@ class Q_UML_EXPORT QRedefinableElement : public QNamedElement Q_OBJECT Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(const QSet<QRedefinableElement *> * redefinedElements READ redefinedElements) - Q_PROPERTY(const QSet<QClassifier *> * redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) Q_DISABLE_COPY(QRedefinableElement) Q_DECLARE_PRIVATE(QRedefinableElement) @@ -81,13 +81,12 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const; - virtual void registerMetaTypes() const; protected: explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *) - QT_END_HEADER #endif // QTUML_QREDEFINABLEELEMENT_H diff --git a/src/uml/qredefinableelement_p.h b/src/uml/qredefinableelement_p.h index 5ee14a27..bf2b05c9 100644 --- a/src/uml/qredefinableelement_p.h +++ b/src/uml/qredefinableelement_p.h @@ -68,8 +68,8 @@ public: virtual ~QRedefinableElementPrivate(); bool isLeaf; - QSet<QRedefinableElement *> *redefinedElements; - QSet<QClassifier *> *redefinitionContexts; + QSet<QRedefinableElement *> redefinedElements; + QSet<QClassifier *> redefinitionContexts; // Internal functions for read-only subsetted association ends void addRedefinedElement(QRedefinableElement *redefinedElement); diff --git a/src/uml/qredefinabletemplatesignature.cpp b/src/uml/qredefinabletemplatesignature.cpp index 8d1d7dc8..f00af30e 100644 --- a/src/uml/qredefinabletemplatesignature.cpp +++ b/src/uml/qredefinabletemplatesignature.cpp @@ -48,14 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QRedefinableTemplateSignaturePrivate::QRedefinableTemplateSignaturePrivate() : - classifier(0), - extendedSignatures(new QSet<QRedefinableTemplateSignature *>) + classifier(0) { } QRedefinableTemplateSignaturePrivate::~QRedefinableTemplateSignaturePrivate() { - delete extendedSignatures; } /*! @@ -91,7 +89,7 @@ QRedefinableTemplateSignature::~QRedefinableTemplateSignature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QRedefinableTemplateSignature::ownedElements() const +const QSet<QElement *> &QRedefinableTemplateSignature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -107,7 +105,7 @@ QElement *QRedefinableTemplateSignature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QRedefinableTemplateSignature::ownedComments() const +const QSet<QComment *> &QRedefinableTemplateSignature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -188,7 +186,7 @@ QNamespace *QRedefinableTemplateSignature::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QRedefinableTemplateSignature::clientDependencies() const +const QSet<QDependency *> &QRedefinableTemplateSignature::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -232,7 +230,7 @@ void QRedefinableTemplateSignature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QRedefinableTemplateSignature::redefinedElements() const +const QSet<QRedefinableElement *> &QRedefinableTemplateSignature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -240,7 +238,7 @@ const QSet<QRedefinableElement *> *QRedefinableTemplateSignature::redefinedEleme /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QRedefinableTemplateSignature::redefinitionContexts() const +const QSet<QClassifier *> &QRedefinableTemplateSignature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -252,13 +250,13 @@ const QSet<QClassifier *> *QRedefinableTemplateSignature::redefinitionContexts() /*! The formal template parameters of the extendedSignature. */ -const QSet<QTemplateParameter *> *QRedefinableTemplateSignature::inheritedParameters() const +const QSet<QTemplateParameter *> &QRedefinableTemplateSignature::inheritedParameters() const { // This is a read-only derived association end qWarning("QRedefinableTemplateSignature::inheritedParameters: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QTemplateParameter *>); // change here to your derived return } /*! @@ -298,7 +296,7 @@ void QRedefinableTemplateSignature::setClassifier(QClassifier *classifier) /*! The template signature that is extended by this template signature. */ -const QSet<QRedefinableTemplateSignature *> *QRedefinableTemplateSignature::extendedSignatures() const +const QSet<QRedefinableTemplateSignature *> &QRedefinableTemplateSignature::extendedSignatures() const { // This is a read-write association end @@ -311,8 +309,8 @@ void QRedefinableTemplateSignature::addExtendedSignature(QRedefinableTemplateSig // This is a read-write association end Q_D(QRedefinableTemplateSignature); - if (!d->extendedSignatures->contains(extendedSignature)) { - d->extendedSignatures->insert(extendedSignature); + if (!d->extendedSignatures.contains(extendedSignature)) { + d->extendedSignatures.insert(extendedSignature); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(extendedSignature)); @@ -324,8 +322,8 @@ void QRedefinableTemplateSignature::removeExtendedSignature(QRedefinableTemplate // This is a read-write association end Q_D(QRedefinableTemplateSignature); - if (d->extendedSignatures->contains(extendedSignature)) { - d->extendedSignatures->remove(extendedSignature); + if (d->extendedSignatures.contains(extendedSignature)) { + d->extendedSignatures.remove(extendedSignature); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(extendedSignature)); @@ -343,35 +341,6 @@ bool QRedefinableTemplateSignature::isConsistentWith(const QRedefinableElement * return bool(); // change here to your derived return } -void QRedefinableTemplateSignature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *>("QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *"); - qRegisterMetaType<QRedefinableTemplateSignature *>("QRedefinableTemplateSignature *"); - qRegisterMetaType<const QSet<QRedefinableTemplateSignature *> *>("const QSet<QRedefinableTemplateSignature *> *"); - qRegisterMetaType<const QList<QRedefinableTemplateSignature *> *>("const QList<QRedefinableTemplateSignature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *"); - qRegisterMetaType<const QSet<QTemplateParameter *> *>("const QSet<QTemplateParameter *> *"); - qRegisterMetaType<const QList<QTemplateParameter *> *>("const QList<QTemplateParameter *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qredefinabletemplatesignature.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qredefinabletemplatesignature.h b/src/uml/qredefinabletemplatesignature.h index 430ed922..372cbd03 100644 --- a/src/uml/qredefinabletemplatesignature.h +++ b/src/uml/qredefinabletemplatesignature.h @@ -68,9 +68,9 @@ class Q_UML_EXPORT QRedefinableTemplateSignature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QTemplateParameter *> * inheritedParameters READ inheritedParameters STORED false) + Q_PROPERTY(QSet<QTemplateParameter *> inheritedParameters READ inheritedParameters STORED false) Q_PROPERTY(QClassifier * classifier READ classifier WRITE setClassifier) - Q_PROPERTY(const QSet<QRedefinableTemplateSignature *> * extendedSignatures READ extendedSignatures) + Q_PROPERTY(QSet<QRedefinableTemplateSignature *> extendedSignatures READ extendedSignatures) Q_DISABLE_COPY(QRedefinableTemplateSignature) Q_DECLARE_PRIVATE(QRedefinableTemplateSignature) @@ -80,9 +80,9 @@ public: virtual ~QRedefinableTemplateSignature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -97,7 +97,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -107,20 +107,19 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from QRedefinableTemplateSignature - Q_INVOKABLE const QSet<QTemplateParameter *> *inheritedParameters() const; + Q_INVOKABLE const QSet<QTemplateParameter *> &inheritedParameters() const; Q_INVOKABLE QClassifier *classifier() const; Q_INVOKABLE void setClassifier(QClassifier *classifier); - Q_INVOKABLE const QSet<QRedefinableTemplateSignature *> *extendedSignatures() const; + Q_INVOKABLE const QSet<QRedefinableTemplateSignature *> &extendedSignatures() const; Q_INVOKABLE void addExtendedSignature(QRedefinableTemplateSignature *extendedSignature); Q_INVOKABLE void removeExtendedSignature(QRedefinableTemplateSignature *extendedSignature); // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; - virtual void registerMetaTypes() const; protected: explicit QRedefinableTemplateSignature(QRedefinableTemplateSignaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -132,10 +131,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableTemplateSignature) *> *) - QT_END_HEADER #endif // QTUML_QREDEFINABLETEMPLATESIGNATURE_H diff --git a/src/uml/qredefinabletemplatesignature_p.h b/src/uml/qredefinabletemplatesignature_p.h index 17083cb2..02564449 100644 --- a/src/uml/qredefinabletemplatesignature_p.h +++ b/src/uml/qredefinabletemplatesignature_p.h @@ -72,7 +72,7 @@ public: virtual ~QRedefinableTemplateSignaturePrivate(); QClassifier *classifier; - QSet<QRedefinableTemplateSignature *> *extendedSignatures; + QSet<QRedefinableTemplateSignature *> extendedSignatures; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreduceaction.cpp b/src/uml/qreduceaction.cpp index af0567ad..aec0dd78 100644 --- a/src/uml/qreduceaction.cpp +++ b/src/uml/qreduceaction.cpp @@ -195,42 +195,6 @@ void QReduceAction::setReducer(QBehavior *reducer) } } -void QReduceAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *> *"); - qRegisterMetaType<QReduceAction *>("QReduceAction *"); - qRegisterMetaType<const QSet<QReduceAction *> *>("const QSet<QReduceAction *> *"); - qRegisterMetaType<const QList<QReduceAction *> *>("const QList<QReduceAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreduceaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreduceaction.h b/src/uml/qreduceaction.h index c16a5cf0..3cd8e42d 100644 --- a/src/uml/qreduceaction.h +++ b/src/uml/qreduceaction.h @@ -87,7 +87,6 @@ public: Q_INVOKABLE void setCollection(QInputPin *collection); Q_INVOKABLE QBehavior *reducer() const; Q_INVOKABLE void setReducer(QBehavior *reducer); - virtual void registerMetaTypes() const; protected: explicit QReduceAction(QReduceActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReduceAction) *> *) - QT_END_HEADER #endif // QTUML_QREDUCEACTION_H diff --git a/src/uml/qregion.cpp b/src/uml/qregion.cpp index d0470115..c796f1dd 100644 --- a/src/uml/qregion.cpp +++ b/src/uml/qregion.cpp @@ -52,17 +52,13 @@ QT_BEGIN_NAMESPACE_QTUML QRegionPrivate::QRegionPrivate() : extendedRegion(0), - transitions(new QSet<QTransition *>), stateMachine(0), - state(0), - subvertices(new QSet<QVertex *>) + state(0) { } QRegionPrivate::~QRegionPrivate() { - delete transitions; - delete subvertices; } /*! @@ -98,7 +94,7 @@ QRegion::~QRegion() /*! The Elements owned by this element. */ -const QSet<QElement *> *QRegion::ownedElements() const +const QSet<QElement *> &QRegion::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -114,7 +110,7 @@ QElement *QRegion::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QRegion::ownedComments() const +const QSet<QComment *> &QRegion::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -195,7 +191,7 @@ QNamespace *QRegion::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QRegion::clientDependencies() const +const QSet<QDependency *> &QRegion::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -239,7 +235,7 @@ void QRegion::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QRegion::redefinedElements() const +const QSet<QRedefinableElement *> &QRegion::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -251,7 +247,7 @@ const QSet<QRedefinableElement *> *QRegion::redefinedElements() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QRegion::packageImports() const +const QSet<QPackageImport *> &QRegion::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -269,7 +265,7 @@ void QRegion::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QRegion::members() const +const QSet<QNamedElement *> &QRegion::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -277,7 +273,7 @@ const QSet<QNamedElement *> *QRegion::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QRegion::importedMembers() const +const QSet<QPackageableElement *> &QRegion::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -285,7 +281,7 @@ const QSet<QPackageableElement *> *QRegion::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QRegion::elementImports() const +const QSet<QElementImport *> &QRegion::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -303,7 +299,7 @@ void QRegion::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QRegion::ownedRules() const +const QSet<QConstraint *> &QRegion::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -321,7 +317,7 @@ void QRegion::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QRegion::ownedMembers() const +const QSet<QNamedElement *> &QRegion::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -362,7 +358,7 @@ void QRegion::setExtendedRegion(QRegion *extendedRegion) /*! The set of transitions owned by the region. */ -const QSet<QTransition *> *QRegion::transitions() const +const QSet<QTransition *> &QRegion::transitions() const { // This is a read-write association end @@ -375,8 +371,8 @@ void QRegion::addTransition(QTransition *transition) // This is a read-write association end Q_D(QRegion); - if (!d->transitions->contains(transition)) { - d->transitions->insert(transition); + if (!d->transitions.contains(transition)) { + d->transitions.insert(transition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(transition)); @@ -391,8 +387,8 @@ void QRegion::removeTransition(QTransition *transition) // This is a read-write association end Q_D(QRegion); - if (d->transitions->contains(transition)) { - d->transitions->remove(transition); + if (d->transitions.contains(transition)) { + d->transitions.remove(transition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(transition)); @@ -481,7 +477,7 @@ QClassifier *QRegion::redefinitionContext() const /*! The set of vertices that are owned by this region. */ -const QSet<QVertex *> *QRegion::subvertices() const +const QSet<QVertex *> &QRegion::subvertices() const { // This is a read-write association end @@ -494,8 +490,8 @@ void QRegion::addSubvertex(QVertex *subvertex) // This is a read-write association end Q_D(QRegion); - if (!d->subvertices->contains(subvertex)) { - d->subvertices->insert(subvertex); + if (!d->subvertices.contains(subvertex)) { + d->subvertices.insert(subvertex); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(subvertex)); @@ -510,8 +506,8 @@ void QRegion::removeSubvertex(QVertex *subvertex) // This is a read-write association end Q_D(QRegion); - if (d->subvertices->contains(subvertex)) { - d->subvertices->remove(subvertex); + if (d->subvertices.contains(subvertex)) { + d->subvertices.remove(subvertex); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(subvertex)); @@ -563,56 +559,6 @@ bool QRegion::isRedefinitionContextValid(const QRegion *redefined) const return bool(); // change here to your derived return } -void QRegion::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<QRegion *>("QRegion *"); - qRegisterMetaType<const QSet<QRegion *> *>("const QSet<QRegion *> *"); - qRegisterMetaType<const QList<QRegion *> *>("const QList<QRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVertex) *>("QT_PREPEND_NAMESPACE_QTUML(QVertex) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *"); - qRegisterMetaType<QVertex *>("QVertex *"); - qRegisterMetaType<const QSet<QVertex *> *>("const QSet<QVertex *> *"); - qRegisterMetaType<const QList<QVertex *> *>("const QList<QVertex *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTransition) *>("QT_PREPEND_NAMESPACE_QTUML(QTransition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *"); - qRegisterMetaType<QTransition *>("QTransition *"); - qRegisterMetaType<const QSet<QTransition *> *>("const QSet<QTransition *> *"); - qRegisterMetaType<const QList<QTransition *> *>("const QList<QTransition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<QStateMachine *>("QStateMachine *"); - qRegisterMetaType<const QSet<QStateMachine *> *>("const QSet<QStateMachine *> *"); - qRegisterMetaType<const QList<QStateMachine *> *>("const QList<QStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QState) *>("QT_PREPEND_NAMESPACE_QTUML(QState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<QState *>("QState *"); - qRegisterMetaType<const QSet<QState *> *>("const QSet<QState *> *"); - qRegisterMetaType<const QList<QState *> *>("const QList<QState *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qregion.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qregion.h b/src/uml/qregion.h index f5739c62..8119b94d 100644 --- a/src/uml/qregion.h +++ b/src/uml/qregion.h @@ -72,11 +72,11 @@ class Q_UML_EXPORT QRegion : public QWrappedObject Q_OBJECT Q_PROPERTY(QRegion * extendedRegion READ extendedRegion WRITE setExtendedRegion) - Q_PROPERTY(const QSet<QTransition *> * transitions READ transitions) + 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(const QSet<QVertex *> * subvertices READ subvertices) + Q_PROPERTY(QSet<QVertex *> subvertices READ subvertices) Q_DISABLE_COPY(QRegion) Q_DECLARE_PRIVATE(QRegion) @@ -86,9 +86,9 @@ public: virtual ~QRegion(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,7 +103,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -113,26 +113,26 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from QRegion Q_INVOKABLE QRegion *extendedRegion() const; Q_INVOKABLE void setExtendedRegion(QRegion *extendedRegion); - Q_INVOKABLE const QSet<QTransition *> *transitions() const; + Q_INVOKABLE const QSet<QTransition *> &transitions() const; Q_INVOKABLE void addTransition(QTransition *transition); Q_INVOKABLE void removeTransition(QTransition *transition); Q_INVOKABLE QStateMachine *stateMachine() const; @@ -140,7 +140,7 @@ public: Q_INVOKABLE QState *state() const; Q_INVOKABLE void setState(QState *state); Q_INVOKABLE QClassifier *redefinitionContext() const; - Q_INVOKABLE const QSet<QVertex *> *subvertices() const; + Q_INVOKABLE const QSet<QVertex *> &subvertices() const; Q_INVOKABLE void addSubvertex(QVertex *subvertex); Q_INVOKABLE void removeSubvertex(QVertex *subvertex); @@ -149,7 +149,6 @@ public: Q_INVOKABLE QStateMachine *containingStateMachine() const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isRedefinitionContextValid(const QRegion *redefined) const; - virtual void registerMetaTypes() const; protected: explicit QRegion(QRegionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -161,10 +160,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRegion) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *) - QT_END_HEADER #endif // QTUML_QREGION_H diff --git a/src/uml/qregion_p.h b/src/uml/qregion_p.h index b7318a08..49b44a9a 100644 --- a/src/uml/qregion_p.h +++ b/src/uml/qregion_p.h @@ -75,10 +75,10 @@ public: virtual ~QRegionPrivate(); QRegion *extendedRegion; - QSet<QTransition *> *transitions; + QSet<QTransition *> transitions; QStateMachine *stateMachine; QState *state; - QSet<QVertex *> *subvertices; + QSet<QVertex *> subvertices; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qrelationship.cpp b/src/uml/qrelationship.cpp index 95c929e0..cd24ecc0 100644 --- a/src/uml/qrelationship.cpp +++ b/src/uml/qrelationship.cpp @@ -44,22 +44,20 @@ QT_BEGIN_NAMESPACE_QTUML -QRelationshipPrivate::QRelationshipPrivate() : - relatedElements(new QSet<QElement *>) +QRelationshipPrivate::QRelationshipPrivate() { } QRelationshipPrivate::~QRelationshipPrivate() { - delete relatedElements; } void QRelationshipPrivate::addRelatedElement(QElement *relatedElement) { // This is a read-only derived-union association end - if (!this->relatedElements->contains(relatedElement)) { - this->relatedElements->insert(relatedElement); + if (!this->relatedElements.contains(relatedElement)) { + this->relatedElements.insert(relatedElement); } } @@ -67,8 +65,8 @@ void QRelationshipPrivate::removeRelatedElement(QElement *relatedElement) { // This is a read-only derived-union association end - if (this->relatedElements->contains(relatedElement)) { - this->relatedElements->remove(relatedElement); + if (this->relatedElements.contains(relatedElement)) { + this->relatedElements.remove(relatedElement); } } @@ -101,7 +99,7 @@ QRelationship::~QRelationship() /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QRelationship::relatedElements() const +const QSet<QElement *> &QRelationship::relatedElements() const { // This is a read-only derived-union association end @@ -109,21 +107,6 @@ const QSet<QElement *> *QRelationship::relatedElements() const return d->relatedElements; } -void QRelationship::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *>("QT_PREPEND_NAMESPACE_QTUML(QRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *"); - qRegisterMetaType<QRelationship *>("QRelationship *"); - qRegisterMetaType<const QSet<QRelationship *> *>("const QSet<QRelationship *> *"); - qRegisterMetaType<const QList<QRelationship *> *>("const QList<QRelationship *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qrelationship.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qrelationship.h b/src/uml/qrelationship.h index 2aeaaa4a..af3bbd79 100644 --- a/src/uml/qrelationship.h +++ b/src/uml/qrelationship.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QRelationship : public QElement { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * relatedElements READ relatedElements) + Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) Q_DISABLE_COPY(QRelationship) Q_DECLARE_PRIVATE(QRelationship) @@ -71,8 +71,7 @@ public: virtual ~QRelationship(); // Association ends from QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; protected: explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -80,10 +79,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRelationship) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRelationship) *> *) - QT_END_HEADER #endif // QTUML_QRELATIONSHIP_H diff --git a/src/uml/qrelationship_p.h b/src/uml/qrelationship_p.h index 925e8c4c..14b55f87 100644 --- a/src/uml/qrelationship_p.h +++ b/src/uml/qrelationship_p.h @@ -63,7 +63,7 @@ public: explicit QRelationshipPrivate(); virtual ~QRelationshipPrivate(); - QSet<QElement *> *relatedElements; + QSet<QElement *> relatedElements; // Internal functions for read-only subsetted association ends void addRelatedElement(QElement *relatedElement); diff --git a/src/uml/qremovestructuralfeaturevalueaction.cpp b/src/uml/qremovestructuralfeaturevalueaction.cpp index 288c0f72..4165ed52 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.cpp +++ b/src/uml/qremovestructuralfeaturevalueaction.cpp @@ -141,28 +141,6 @@ void QRemoveStructuralFeatureValueAction::setRemoveAt(QInputPin *removeAt) } } -void QRemoveStructuralFeatureValueAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *>("QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *> *"); - qRegisterMetaType<QRemoveStructuralFeatureValueAction *>("QRemoveStructuralFeatureValueAction *"); - qRegisterMetaType<const QSet<QRemoveStructuralFeatureValueAction *> *>("const QSet<QRemoveStructuralFeatureValueAction *> *"); - qRegisterMetaType<const QList<QRemoveStructuralFeatureValueAction *> *>("const QList<QRemoveStructuralFeatureValueAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QWriteStructuralFeatureAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qremovestructuralfeaturevalueaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qremovestructuralfeaturevalueaction.h b/src/uml/qremovestructuralfeaturevalueaction.h index 340e850d..0e992df0 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.h +++ b/src/uml/qremovestructuralfeaturevalueaction.h @@ -79,7 +79,6 @@ public: // Association ends from QRemoveStructuralFeatureValueAction Q_INVOKABLE QInputPin *removeAt() const; Q_INVOKABLE void setRemoveAt(QInputPin *removeAt); - virtual void registerMetaTypes() const; protected: explicit QRemoveStructuralFeatureValueAction(QRemoveStructuralFeatureValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRemoveStructuralFeatureValueAction) *> *) - QT_END_HEADER #endif // QTUML_QREMOVESTRUCTURALFEATUREVALUEACTION_H diff --git a/src/uml/qremovevariablevalueaction.cpp b/src/uml/qremovevariablevalueaction.cpp index b534931d..e4bf79e9 100644 --- a/src/uml/qremovevariablevalueaction.cpp +++ b/src/uml/qremovevariablevalueaction.cpp @@ -141,28 +141,6 @@ void QRemoveVariableValueAction::setRemoveAt(QInputPin *removeAt) } } -void QRemoveVariableValueAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *>("QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *> *"); - qRegisterMetaType<QRemoveVariableValueAction *>("QRemoveVariableValueAction *"); - qRegisterMetaType<const QSet<QRemoveVariableValueAction *> *>("const QSet<QRemoveVariableValueAction *> *"); - qRegisterMetaType<const QList<QRemoveVariableValueAction *> *>("const QList<QRemoveVariableValueAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QWriteVariableAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qremovevariablevalueaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qremovevariablevalueaction.h b/src/uml/qremovevariablevalueaction.h index f2636430..c66ff184 100644 --- a/src/uml/qremovevariablevalueaction.h +++ b/src/uml/qremovevariablevalueaction.h @@ -79,7 +79,6 @@ public: // Association ends from QRemoveVariableValueAction Q_INVOKABLE QInputPin *removeAt() const; Q_INVOKABLE void setRemoveAt(QInputPin *removeAt); - virtual void registerMetaTypes() const; protected: explicit QRemoveVariableValueAction(QRemoveVariableValueActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QRemoveVariableValueAction) *> *) - QT_END_HEADER #endif // QTUML_QREMOVEVARIABLEVALUEACTION_H diff --git a/src/uml/qreplyaction.cpp b/src/uml/qreplyaction.cpp index c08418a7..f409bb3d 100644 --- a/src/uml/qreplyaction.cpp +++ b/src/uml/qreplyaction.cpp @@ -49,14 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML QReplyActionPrivate::QReplyActionPrivate() : replyToCall(0), - returnInformation(0), - replyValues(new QSet<QInputPin *>) + returnInformation(0) { } QReplyActionPrivate::~QReplyActionPrivate() { - delete replyValues; } /*! @@ -138,7 +136,7 @@ void QReplyAction::setReturnInformation(QInputPin *returnInformation) /*! A list of pins containing the reply values of the operation. These values are returned to the caller. */ -const QSet<QInputPin *> *QReplyAction::replyValues() const +const QSet<QInputPin *> &QReplyAction::replyValues() const { // This is a read-write association end @@ -151,8 +149,8 @@ void QReplyAction::addReplyValue(QInputPin *replyValue) // This is a read-write association end Q_D(QReplyAction); - if (!d->replyValues->contains(replyValue)) { - d->replyValues->insert(replyValue); + if (!d->replyValues.contains(replyValue)) { + d->replyValues.insert(replyValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(replyValue)); @@ -164,43 +162,14 @@ void QReplyAction::removeReplyValue(QInputPin *replyValue) // This is a read-write association end Q_D(QReplyAction); - if (d->replyValues->contains(replyValue)) { - d->replyValues->remove(replyValue); + if (d->replyValues.contains(replyValue)) { + d->replyValues.remove(replyValue); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(replyValue)); } } -void QReplyAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *>("QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *> *"); - qRegisterMetaType<QReplyAction *>("QReplyAction *"); - qRegisterMetaType<const QSet<QReplyAction *> *>("const QSet<QReplyAction *> *"); - qRegisterMetaType<const QList<QReplyAction *> *>("const QList<QReplyAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *>("QT_PREPEND_NAMESPACE_QTUML(QTrigger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<QTrigger *>("QTrigger *"); - qRegisterMetaType<const QSet<QTrigger *> *>("const QSet<QTrigger *> *"); - qRegisterMetaType<const QList<QTrigger *> *>("const QList<QTrigger *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreplyaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qreplyaction.h b/src/uml/qreplyaction.h index 213b6b9d..04320edf 100644 --- a/src/uml/qreplyaction.h +++ b/src/uml/qreplyaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QReplyAction : public QAction Q_PROPERTY(QTrigger * replyToCall READ replyToCall WRITE setReplyToCall) Q_PROPERTY(QInputPin * returnInformation READ returnInformation WRITE setReturnInformation) - Q_PROPERTY(const QSet<QInputPin *> * replyValues READ replyValues) + Q_PROPERTY(QSet<QInputPin *> replyValues READ replyValues) Q_DISABLE_COPY(QReplyAction) Q_DECLARE_PRIVATE(QReplyAction) @@ -81,10 +81,9 @@ public: Q_INVOKABLE void setReplyToCall(QTrigger *replyToCall); Q_INVOKABLE QInputPin *returnInformation() const; Q_INVOKABLE void setReturnInformation(QInputPin *returnInformation); - Q_INVOKABLE const QSet<QInputPin *> *replyValues() const; + Q_INVOKABLE const QSet<QInputPin *> &replyValues() const; Q_INVOKABLE void addReplyValue(QInputPin *replyValue); Q_INVOKABLE void removeReplyValue(QInputPin *replyValue); - virtual void registerMetaTypes() const; protected: explicit QReplyAction(QReplyActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QReplyAction) *> *) - QT_END_HEADER #endif // QTUML_QREPLYACTION_H diff --git a/src/uml/qreplyaction_p.h b/src/uml/qreplyaction_p.h index f5fa4556..95ed55da 100644 --- a/src/uml/qreplyaction_p.h +++ b/src/uml/qreplyaction_p.h @@ -70,7 +70,7 @@ public: QTrigger *replyToCall; QInputPin *returnInformation; - QSet<QInputPin *> *replyValues; + QSet<QInputPin *> replyValues; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsendobjectaction.cpp b/src/uml/qsendobjectaction.cpp index bbea8eae..ad03fa95 100644 --- a/src/uml/qsendobjectaction.cpp +++ b/src/uml/qsendobjectaction.cpp @@ -133,28 +133,6 @@ void QSendObjectAction::setTarget(QInputPin *target) } } -void QSendObjectAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *>("QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *> *"); - qRegisterMetaType<QSendObjectAction *>("QSendObjectAction *"); - qRegisterMetaType<const QSet<QSendObjectAction *> *>("const QSet<QSendObjectAction *> *"); - qRegisterMetaType<const QList<QSendObjectAction *> *>("const QList<QSendObjectAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QInvocationAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qsendobjectaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsendobjectaction.h b/src/uml/qsendobjectaction.h index 83e02d92..7e5623b5 100644 --- a/src/uml/qsendobjectaction.h +++ b/src/uml/qsendobjectaction.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setRequest(QInputPin *request); Q_INVOKABLE QInputPin *target() const; Q_INVOKABLE void setTarget(QInputPin *target); - virtual void registerMetaTypes() const; protected: explicit QSendObjectAction(QSendObjectActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSendObjectAction) *> *) - QT_END_HEADER #endif // QTUML_QSENDOBJECTACTION_H diff --git a/src/uml/qsendsignalaction.cpp b/src/uml/qsendsignalaction.cpp index 52089314..dcbc287e 100644 --- a/src/uml/qsendsignalaction.cpp +++ b/src/uml/qsendsignalaction.cpp @@ -133,35 +133,6 @@ void QSendSignalAction::setSignal(QSignal *signal) } } -void QSendSignalAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *>("QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *> *"); - qRegisterMetaType<QSendSignalAction *>("QSendSignalAction *"); - qRegisterMetaType<const QSet<QSendSignalAction *> *>("const QSet<QSendSignalAction *> *"); - qRegisterMetaType<const QList<QSendSignalAction *> *>("const QList<QSendSignalAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSignal) *>("QT_PREPEND_NAMESPACE_QTUML(QSignal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<QSignal *>("QSignal *"); - qRegisterMetaType<const QSet<QSignal *> *>("const QSet<QSignal *> *"); - qRegisterMetaType<const QList<QSignal *> *>("const QList<QSignal *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QInvocationAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qsendsignalaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsendsignalaction.h b/src/uml/qsendsignalaction.h index c2606b69..0ab38eba 100644 --- a/src/uml/qsendsignalaction.h +++ b/src/uml/qsendsignalaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setTarget(QInputPin *target); Q_INVOKABLE QSignal *signal() const; Q_INVOKABLE void setSignal(QSignal *signal); - virtual void registerMetaTypes() const; protected: explicit QSendSignalAction(QSendSignalActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSendSignalAction) *> *) - QT_END_HEADER #endif // QTUML_QSENDSIGNALACTION_H diff --git a/src/uml/qsequencenode.cpp b/src/uml/qsequencenode.cpp index 201c5e36..1c2d734d 100644 --- a/src/uml/qsequencenode.cpp +++ b/src/uml/qsequencenode.cpp @@ -46,14 +46,13 @@ QT_BEGIN_NAMESPACE_QTUML -QSequenceNodePrivate::QSequenceNodePrivate() : - executableNodes(new QList<QExecutableNode *>) +QSequenceNodePrivate::QSequenceNodePrivate() { } QSequenceNodePrivate::~QSequenceNodePrivate() { - delete executableNodes; + qDeleteAll(executableNodes); } /*! @@ -85,7 +84,7 @@ QSequenceNode::~QSequenceNode() /*! An ordered set of executable nodes. */ -const QList<QExecutableNode *> *QSequenceNode::executableNodes() const +const QList<QExecutableNode *> &QSequenceNode::executableNodes() const { // This is a read-write association end @@ -98,8 +97,8 @@ void QSequenceNode::addExecutableNode(QExecutableNode *executableNode) // This is a read-write association end Q_D(QSequenceNode); - if (!d->executableNodes->contains(executableNode)) { - d->executableNodes->append(executableNode); + if (!d->executableNodes.contains(executableNode)) { + d->executableNodes.append(executableNode); qTopLevelWrapper(executableNode)->setParent(qTopLevelWrapper(this)); } } @@ -109,34 +108,12 @@ void QSequenceNode::removeExecutableNode(QExecutableNode *executableNode) // This is a read-write association end Q_D(QSequenceNode); - if (d->executableNodes->contains(executableNode)) { - d->executableNodes->removeAll(executableNode); + if (d->executableNodes.contains(executableNode)) { + d->executableNodes.removeAll(executableNode); qTopLevelWrapper(executableNode)->setParent(0); } } -void QSequenceNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *>("QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *> *"); - qRegisterMetaType<QSequenceNode *>("QSequenceNode *"); - qRegisterMetaType<const QSet<QSequenceNode *> *>("const QSet<QSequenceNode *> *"); - qRegisterMetaType<const QList<QSequenceNode *> *>("const QList<QSequenceNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *>("QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExecutableNode) *> *"); - qRegisterMetaType<QExecutableNode *>("QExecutableNode *"); - qRegisterMetaType<const QSet<QExecutableNode *> *>("const QSet<QExecutableNode *> *"); - qRegisterMetaType<const QList<QExecutableNode *> *>("const QList<QExecutableNode *> *"); - - QStructuredActivityNode::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qsequencenode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsequencenode.h b/src/uml/qsequencenode.h index 759ed4d2..b898c38a 100644 --- a/src/uml/qsequencenode.h +++ b/src/uml/qsequencenode.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QSequenceNode : public QStructuredActivityNode { Q_OBJECT - Q_PROPERTY(const QList<QExecutableNode *> * executableNodes READ executableNodes) + Q_PROPERTY(QList<QExecutableNode *> executableNodes READ executableNodes) Q_DISABLE_COPY(QSequenceNode) Q_DECLARE_PRIVATE(QSequenceNode) @@ -74,10 +74,9 @@ public: virtual ~QSequenceNode(); // Association ends from QSequenceNode - Q_INVOKABLE const QList<QExecutableNode *> *executableNodes() const; + Q_INVOKABLE const QList<QExecutableNode *> &executableNodes() const; Q_INVOKABLE void addExecutableNode(QExecutableNode *executableNode); Q_INVOKABLE void removeExecutableNode(QExecutableNode *executableNode); - virtual void registerMetaTypes() const; protected: explicit QSequenceNode(QSequenceNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSequenceNode) *> *) - QT_END_HEADER #endif // QTUML_QSEQUENCENODE_H diff --git a/src/uml/qsequencenode_p.h b/src/uml/qsequencenode_p.h index 98fa6b99..05622db8 100644 --- a/src/uml/qsequencenode_p.h +++ b/src/uml/qsequencenode_p.h @@ -67,7 +67,7 @@ public: explicit QSequenceNodePrivate(); virtual ~QSequenceNodePrivate(); - QList<QExecutableNode *> *executableNodes; + QList<QExecutableNode *> executableNodes; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsignal.cpp b/src/uml/qsignal.cpp index e5dadd2f..f15fe834 100644 --- a/src/uml/qsignal.cpp +++ b/src/uml/qsignal.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTUML -QSignalPrivate::QSignalPrivate() : - ownedAttributes(new QList<QProperty *>) +QSignalPrivate::QSignalPrivate() { } QSignalPrivate::~QSignalPrivate() { - delete ownedAttributes; } /*! @@ -85,7 +83,7 @@ QSignal::~QSignal() /*! The attributes owned by the signal. */ -const QList<QProperty *> *QSignal::ownedAttributes() const +const QList<QProperty *> &QSignal::ownedAttributes() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QSignal::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QSignal); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -112,8 +110,8 @@ void QSignal::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QSignal); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedAttribute)); @@ -121,28 +119,6 @@ void QSignal::removeOwnedAttribute(QProperty *ownedAttribute) } } -void QSignal::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSignal) *>("QT_PREPEND_NAMESPACE_QTUML(QSignal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<QSignal *>("QSignal *"); - qRegisterMetaType<const QSet<QSignal *> *>("const QSet<QSignal *> *"); - qRegisterMetaType<const QList<QSignal *> *>("const QList<QSignal *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qsignal.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsignal.h b/src/uml/qsignal.h index 43bbf088..07e74eae 100644 --- a/src/uml/qsignal.h +++ b/src/uml/qsignal.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QSignal : public QClassifier { Q_OBJECT - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QSignal) Q_DECLARE_PRIVATE(QSignal) @@ -74,10 +74,9 @@ public: virtual ~QSignal(); // Association ends from QSignal - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - virtual void registerMetaTypes() const; protected: explicit QSignal(QSignalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSignal) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *) - QT_END_HEADER #endif // QTUML_QSIGNAL_H diff --git a/src/uml/qsignal_p.h b/src/uml/qsignal_p.h index 4c593e26..4944487b 100644 --- a/src/uml/qsignal_p.h +++ b/src/uml/qsignal_p.h @@ -67,7 +67,7 @@ public: explicit QSignalPrivate(); virtual ~QSignalPrivate(); - QList<QProperty *> *ownedAttributes; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsignalevent.cpp b/src/uml/qsignalevent.cpp index 47b52441..f989da26 100644 --- a/src/uml/qsignalevent.cpp +++ b/src/uml/qsignalevent.cpp @@ -102,28 +102,6 @@ void QSignalEvent::setSignal(QSignal *signal) } } -void QSignalEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *> *"); - qRegisterMetaType<QSignalEvent *>("QSignalEvent *"); - qRegisterMetaType<const QSet<QSignalEvent *> *>("const QSet<QSignalEvent *> *"); - qRegisterMetaType<const QList<QSignalEvent *> *>("const QList<QSignalEvent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSignal) *>("QT_PREPEND_NAMESPACE_QTUML(QSignal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSignal) *> *"); - qRegisterMetaType<QSignal *>("QSignal *"); - qRegisterMetaType<const QSet<QSignal *> *>("const QSet<QSignal *> *"); - qRegisterMetaType<const QList<QSignal *> *>("const QList<QSignal *> *"); - - QMessageEvent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qsignalevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qsignalevent.h b/src/uml/qsignalevent.h index f6a7ec00..219ed705 100644 --- a/src/uml/qsignalevent.h +++ b/src/uml/qsignalevent.h @@ -73,7 +73,6 @@ public: // Association ends from QSignalEvent Q_INVOKABLE QSignal *signal() const; Q_INVOKABLE void setSignal(QSignal *signal); - virtual void registerMetaTypes() const; protected: explicit QSignalEvent(QSignalEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSignalEvent) *> *) - QT_END_HEADER #endif // QTUML_QSIGNALEVENT_H diff --git a/src/uml/qslot.cpp b/src/uml/qslot.cpp index ea920399..fa0b00bb 100644 --- a/src/uml/qslot.cpp +++ b/src/uml/qslot.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE_QTUML QSlotPrivate::QSlotPrivate() : - values(new QList<QValueSpecification *>), definingFeature(0), owningInstance(0) { @@ -57,7 +56,6 @@ QSlotPrivate::QSlotPrivate() : QSlotPrivate::~QSlotPrivate() { - delete values; } /*! @@ -89,7 +87,7 @@ QSlot::~QSlot() /*! The value or values corresponding to the defining feature for the owning instance specification. */ -const QList<QValueSpecification *> *QSlot::values() const +const QList<QValueSpecification *> &QSlot::values() const { // This is a read-write association end @@ -102,8 +100,8 @@ void QSlot::addValue(QValueSpecification *value) // This is a read-write association end Q_D(QSlot); - if (!d->values->contains(value)) { - d->values->append(value); + if (!d->values.contains(value)) { + d->values.append(value); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); @@ -115,8 +113,8 @@ void QSlot::removeValue(QValueSpecification *value) // This is a read-write association end Q_D(QSlot); - if (d->values->contains(value)) { - d->values->removeAll(value); + if (d->values.contains(value)) { + d->values.removeAll(value); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(value)); @@ -176,42 +174,6 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) } } -void QSlot::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSlot) *>("QT_PREPEND_NAMESPACE_QTUML(QSlot) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *"); - qRegisterMetaType<QSlot *>("QSlot *"); - qRegisterMetaType<const QSet<QSlot *> *>("const QSet<QSlot *> *"); - qRegisterMetaType<const QList<QSlot *> *>("const QList<QSlot *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qslot.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qslot.h b/src/uml/qslot.h index e9986e2a..47166da4 100644 --- a/src/uml/qslot.h +++ b/src/uml/qslot.h @@ -66,7 +66,7 @@ class Q_UML_EXPORT QSlot : public QElement { Q_OBJECT - Q_PROPERTY(const QList<QValueSpecification *> * values READ values) + Q_PROPERTY(QList<QValueSpecification *> values READ values) Q_PROPERTY(QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) Q_PROPERTY(QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) @@ -78,14 +78,13 @@ public: virtual ~QSlot(); // Association ends from QSlot - Q_INVOKABLE const QList<QValueSpecification *> *values() const; + Q_INVOKABLE const QList<QValueSpecification *> &values() const; Q_INVOKABLE void addValue(QValueSpecification *value); Q_INVOKABLE void removeValue(QValueSpecification *value); Q_INVOKABLE QStructuralFeature *definingFeature() const; Q_INVOKABLE void setDefiningFeature(QStructuralFeature *definingFeature); Q_INVOKABLE QInstanceSpecification *owningInstance() const; Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance); - virtual void registerMetaTypes() const; protected: explicit QSlot(QSlotPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSlot) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSlot) *> *) - QT_END_HEADER #endif // QTUML_QSLOT_H diff --git a/src/uml/qslot_p.h b/src/uml/qslot_p.h index 83f6067e..5e5aec92 100644 --- a/src/uml/qslot_p.h +++ b/src/uml/qslot_p.h @@ -69,7 +69,7 @@ public: explicit QSlotPrivate(); virtual ~QSlotPrivate(); - QList<QValueSpecification *> *values; + QList<QValueSpecification *> values; QStructuralFeature *definingFeature; QInstanceSpecification *owningInstance; }; diff --git a/src/uml/qstartclassifierbehavioraction.cpp b/src/uml/qstartclassifierbehavioraction.cpp index 89fcc10a..8dd103d9 100644 --- a/src/uml/qstartclassifierbehavioraction.cpp +++ b/src/uml/qstartclassifierbehavioraction.cpp @@ -110,28 +110,6 @@ void QStartClassifierBehaviorAction::setObject(QInputPin *object) } } -void QStartClassifierBehaviorAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *>("QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *> *"); - qRegisterMetaType<QStartClassifierBehaviorAction *>("QStartClassifierBehaviorAction *"); - qRegisterMetaType<const QSet<QStartClassifierBehaviorAction *> *>("const QSet<QStartClassifierBehaviorAction *> *"); - qRegisterMetaType<const QList<QStartClassifierBehaviorAction *> *>("const QList<QStartClassifierBehaviorAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstartclassifierbehavioraction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstartclassifierbehavioraction.h b/src/uml/qstartclassifierbehavioraction.h index f6b347c6..3d8cbd2a 100644 --- a/src/uml/qstartclassifierbehavioraction.h +++ b/src/uml/qstartclassifierbehavioraction.h @@ -73,7 +73,6 @@ public: // Association ends from QStartClassifierBehaviorAction Q_INVOKABLE QInputPin *object() const; Q_INVOKABLE void setObject(QInputPin *object); - virtual void registerMetaTypes() const; protected: explicit QStartClassifierBehaviorAction(QStartClassifierBehaviorActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStartClassifierBehaviorAction) *> *) - QT_END_HEADER #endif // QTUML_QSTARTCLASSIFIERBEHAVIORACTION_H diff --git a/src/uml/qstartobjectbehavioraction.cpp b/src/uml/qstartobjectbehavioraction.cpp index fa18b177..497453af 100644 --- a/src/uml/qstartobjectbehavioraction.cpp +++ b/src/uml/qstartobjectbehavioraction.cpp @@ -110,28 +110,6 @@ void QStartObjectBehaviorAction::setObject(QInputPin *object) } } -void QStartObjectBehaviorAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *>("QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *> *"); - qRegisterMetaType<QStartObjectBehaviorAction *>("QStartObjectBehaviorAction *"); - qRegisterMetaType<const QSet<QStartObjectBehaviorAction *> *>("const QSet<QStartObjectBehaviorAction *> *"); - qRegisterMetaType<const QList<QStartObjectBehaviorAction *> *>("const QList<QStartObjectBehaviorAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QCallAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstartobjectbehavioraction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstartobjectbehavioraction.h b/src/uml/qstartobjectbehavioraction.h index 5fdfbafd..b9c162c6 100644 --- a/src/uml/qstartobjectbehavioraction.h +++ b/src/uml/qstartobjectbehavioraction.h @@ -73,7 +73,6 @@ public: // Association ends from QStartObjectBehaviorAction Q_INVOKABLE QInputPin *object() const; Q_INVOKABLE void setObject(QInputPin *object); - virtual void registerMetaTypes() const; protected: explicit QStartObjectBehaviorAction(QStartObjectBehaviorActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStartObjectBehaviorAction) *> *) - QT_END_HEADER #endif // QTUML_QSTARTOBJECTBEHAVIORACTION_H diff --git a/src/uml/qstate.cpp b/src/uml/qstate.cpp index 4eefc7e6..614747d8 100644 --- a/src/uml/qstate.cpp +++ b/src/uml/qstate.cpp @@ -54,12 +54,8 @@ QT_BEGIN_NAMESPACE_QTUML QStatePrivate::QStatePrivate() : - regions(new QSet<QRegion *>), exit(0), - connections(new QSet<QConnectionPointReference *>), redefinedState(0), - deferrableTriggers(new QSet<QTrigger *>), - connectionPoints(new QSet<QPseudostate *>), entry(0), doActivity(0), submachine(0), @@ -69,10 +65,6 @@ QStatePrivate::QStatePrivate() : QStatePrivate::~QStatePrivate() { - delete regions; - delete connections; - delete deferrableTriggers; - delete connectionPoints; } /*! @@ -110,7 +102,7 @@ QState::~QState() /*! The Elements owned by this element. */ -const QSet<QElement *> *QState::ownedElements() const +const QSet<QElement *> &QState::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -126,7 +118,7 @@ QElement *QState::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QState::ownedComments() const +const QSet<QComment *> &QState::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -207,7 +199,7 @@ QNamespace *QState::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QState::clientDependencies() const +const QSet<QDependency *> &QState::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -229,7 +221,7 @@ void QState::removeClientDependency(QDependency *clientDependency) /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QState::packageImports() const +const QSet<QPackageImport *> &QState::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -247,7 +239,7 @@ void QState::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QState::members() const +const QSet<QNamedElement *> &QState::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -255,7 +247,7 @@ const QSet<QNamedElement *> *QState::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QState::importedMembers() const +const QSet<QPackageableElement *> &QState::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -263,7 +255,7 @@ const QSet<QPackageableElement *> *QState::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QState::elementImports() const +const QSet<QElementImport *> &QState::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -281,7 +273,7 @@ void QState::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QState::ownedRules() const +const QSet<QConstraint *> &QState::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -299,7 +291,7 @@ void QState::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QState::ownedMembers() const +const QSet<QNamedElement *> &QState::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -333,7 +325,7 @@ void QState::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QState::redefinedElements() const +const QSet<QRedefinableElement *> &QState::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -345,7 +337,7 @@ const QSet<QRedefinableElement *> *QState::redefinedElements() const /*! Specifies the transitions entering this vertex. */ -const QSet<QTransition *> *QState::incomings() const +const QSet<QTransition *> &QState::incomings() const { return (qwrappedobject_cast<const QVertex *>(this))->incomings(); } @@ -366,7 +358,7 @@ void QState::setContainer(QRegion *container) /*! Specifies the transitions departing from this vertex. */ -const QSet<QTransition *> *QState::outgoings() const +const QSet<QTransition *> &QState::outgoings() const { return (qwrappedobject_cast<const QVertex *>(this))->outgoings(); } @@ -430,7 +422,7 @@ bool QState::isSubmachineState() const /*! The regions owned directly by the state. */ -const QSet<QRegion *> *QState::regions() const +const QSet<QRegion *> &QState::regions() const { // This is a read-write association end @@ -443,8 +435,8 @@ void QState::addRegion(QRegion *region) // This is a read-write association end Q_D(QState); - if (!d->regions->contains(region)) { - d->regions->insert(region); + if (!d->regions.contains(region)) { + d->regions.insert(region); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); @@ -459,8 +451,8 @@ void QState::removeRegion(QRegion *region) // This is a read-write association end Q_D(QState); - if (d->regions->contains(region)) { - d->regions->remove(region); + if (d->regions.contains(region)) { + d->regions.remove(region); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); @@ -502,7 +494,7 @@ void QState::setExit(QBehavior *exit) /*! 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. */ -const QSet<QConnectionPointReference *> *QState::connections() const +const QSet<QConnectionPointReference *> &QState::connections() const { // This is a read-write association end @@ -515,8 +507,8 @@ void QState::addConnection(QConnectionPointReference *connection) // This is a read-write association end Q_D(QState); - if (!d->connections->contains(connection)) { - d->connections->insert(connection); + if (!d->connections.contains(connection)) { + d->connections.insert(connection); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(connection)); @@ -531,8 +523,8 @@ void QState::removeConnection(QConnectionPointReference *connection) // This is a read-write association end Q_D(QState); - if (d->connections->contains(connection)) { - d->connections->remove(connection); + if (d->connections.contains(connection)) { + d->connections.remove(connection); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(connection)); @@ -586,7 +578,7 @@ void QState::setRedefinedState(QState *redefinedState) /*! 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. */ -const QSet<QTrigger *> *QState::deferrableTriggers() const +const QSet<QTrigger *> &QState::deferrableTriggers() const { // This is a read-write association end @@ -599,8 +591,8 @@ void QState::addDeferrableTrigger(QTrigger *deferrableTrigger) // This is a read-write association end Q_D(QState); - if (!d->deferrableTriggers->contains(deferrableTrigger)) { - d->deferrableTriggers->insert(deferrableTrigger); + if (!d->deferrableTriggers.contains(deferrableTrigger)) { + d->deferrableTriggers.insert(deferrableTrigger); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(deferrableTrigger)); @@ -612,8 +604,8 @@ void QState::removeDeferrableTrigger(QTrigger *deferrableTrigger) // This is a read-write association end Q_D(QState); - if (d->deferrableTriggers->contains(deferrableTrigger)) { - d->deferrableTriggers->remove(deferrableTrigger); + if (d->deferrableTriggers.contains(deferrableTrigger)) { + d->deferrableTriggers.remove(deferrableTrigger); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(deferrableTrigger)); @@ -623,7 +615,7 @@ void QState::removeDeferrableTrigger(QTrigger *deferrableTrigger) /*! 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. */ -const QSet<QPseudostate *> *QState::connectionPoints() const +const QSet<QPseudostate *> &QState::connectionPoints() const { // This is a read-write association end @@ -636,8 +628,8 @@ void QState::addConnectionPoint(QPseudostate *connectionPoint) // This is a read-write association end Q_D(QState); - if (!d->connectionPoints->contains(connectionPoint)) { - d->connectionPoints->insert(connectionPoint); + if (!d->connectionPoints.contains(connectionPoint)) { + d->connectionPoints.insert(connectionPoint); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); @@ -652,8 +644,8 @@ void QState::removeConnectionPoint(QPseudostate *connectionPoint) // This is a read-write association end Q_D(QState); - if (d->connectionPoints->contains(connectionPoint)) { - d->connectionPoints->remove(connectionPoint); + if (d->connectionPoints.contains(connectionPoint)) { + d->connectionPoints.remove(connectionPoint); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); @@ -811,77 +803,6 @@ bool QState::isRedefinitionContextValid(const QState *redefined) const return bool(); // change here to your derived return } -void QState::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QState) *>("QT_PREPEND_NAMESPACE_QTUML(QState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<QState *>("QState *"); - qRegisterMetaType<const QSet<QState *> *>("const QSet<QState *> *"); - qRegisterMetaType<const QList<QState *> *>("const QList<QState *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<QStateMachine *>("QStateMachine *"); - qRegisterMetaType<const QSet<QStateMachine *> *>("const QSet<QStateMachine *> *"); - qRegisterMetaType<const QList<QStateMachine *> *>("const QList<QStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<QRegion *>("QRegion *"); - qRegisterMetaType<const QSet<QRegion *> *>("const QSet<QRegion *> *"); - qRegisterMetaType<const QList<QRegion *> *>("const QList<QRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectionPointReference) *> *"); - qRegisterMetaType<QConnectionPointReference *>("QConnectionPointReference *"); - qRegisterMetaType<const QSet<QConnectionPointReference *> *>("const QSet<QConnectionPointReference *> *"); - qRegisterMetaType<const QList<QConnectionPointReference *> *>("const QList<QConnectionPointReference *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *>("QT_PREPEND_NAMESPACE_QTUML(QTrigger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<QTrigger *>("QTrigger *"); - qRegisterMetaType<const QSet<QTrigger *> *>("const QSet<QTrigger *> *"); - qRegisterMetaType<const QList<QTrigger *> *>("const QList<QTrigger *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *>("QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<QPseudostate *>("QPseudostate *"); - qRegisterMetaType<const QSet<QPseudostate *> *>("const QSet<QPseudostate *> *"); - qRegisterMetaType<const QList<QPseudostate *> *>("const QList<QPseudostate *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstate.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstate.h b/src/uml/qstate.h index a0318fec..11e6579f 100644 --- a/src/uml/qstate.h +++ b/src/uml/qstate.h @@ -79,13 +79,13 @@ class Q_UML_EXPORT QState : public QWrappedObject 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(const QSet<QRegion *> * regions READ regions) + Q_PROPERTY(QSet<QRegion *> regions READ regions) Q_PROPERTY(QBehavior * exit READ exit WRITE setExit) - Q_PROPERTY(const QSet<QConnectionPointReference *> * connections READ connections) + 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(const QSet<QTrigger *> * deferrableTriggers READ deferrableTriggers) - Q_PROPERTY(const QSet<QPseudostate *> * connectionPoints READ connectionPoints) + 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) @@ -99,9 +99,9 @@ public: virtual ~QState(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -116,23 +116,23 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QRedefinableElement Q_INVOKABLE bool isLeaf() const; @@ -140,13 +140,13 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; // Association ends from aggregated QVertex - Q_INVOKABLE const QSet<QTransition *> *incomings() const; + Q_INVOKABLE const QSet<QTransition *> &incomings() const; Q_INVOKABLE QRegion *container() const; Q_INVOKABLE void setContainer(QRegion *container); - Q_INVOKABLE const QSet<QTransition *> *outgoings() const; + Q_INVOKABLE const QSet<QTransition *> &outgoings() const; // Attributes from QState Q_INVOKABLE bool isSimple() const; @@ -155,21 +155,21 @@ public: Q_INVOKABLE bool isSubmachineState() const; // Association ends from QState - Q_INVOKABLE const QSet<QRegion *> *regions() const; + Q_INVOKABLE const QSet<QRegion *> ®ions() const; Q_INVOKABLE void addRegion(QRegion *region); Q_INVOKABLE void removeRegion(QRegion *region); Q_INVOKABLE QBehavior *exit() const; Q_INVOKABLE void setExit(QBehavior *exit); - Q_INVOKABLE const QSet<QConnectionPointReference *> *connections() const; + Q_INVOKABLE const QSet<QConnectionPointReference *> &connections() const; Q_INVOKABLE void addConnection(QConnectionPointReference *connection); Q_INVOKABLE void removeConnection(QConnectionPointReference *connection); Q_INVOKABLE QClassifier *redefinitionContext() const; Q_INVOKABLE QState *redefinedState() const; Q_INVOKABLE void setRedefinedState(QState *redefinedState); - Q_INVOKABLE const QSet<QTrigger *> *deferrableTriggers() const; + Q_INVOKABLE const QSet<QTrigger *> &deferrableTriggers() const; Q_INVOKABLE void addDeferrableTrigger(QTrigger *deferrableTrigger); Q_INVOKABLE void removeDeferrableTrigger(QTrigger *deferrableTrigger); - Q_INVOKABLE const QSet<QPseudostate *> *connectionPoints() const; + Q_INVOKABLE const QSet<QPseudostate *> &connectionPoints() const; Q_INVOKABLE void addConnectionPoint(QPseudostate *connectionPoint); Q_INVOKABLE void removeConnectionPoint(QPseudostate *connectionPoint); Q_INVOKABLE QBehavior *entry() const; @@ -185,7 +185,6 @@ public: Q_INVOKABLE QStateMachine *containingStateMachine() const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isRedefinitionContextValid(const QState *redefined) const; - virtual void registerMetaTypes() const; protected: explicit QState(QStatePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -198,10 +197,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QState) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *) - QT_END_HEADER #endif // QTUML_QSTATE_H diff --git a/src/uml/qstate_p.h b/src/uml/qstate_p.h index 4c9f6e15..8c7c3952 100644 --- a/src/uml/qstate_p.h +++ b/src/uml/qstate_p.h @@ -78,12 +78,12 @@ public: explicit QStatePrivate(); virtual ~QStatePrivate(); - QSet<QRegion *> *regions; + QSet<QRegion *> regions; QBehavior *exit; - QSet<QConnectionPointReference *> *connections; + QSet<QConnectionPointReference *> connections; QState *redefinedState; - QSet<QTrigger *> *deferrableTriggers; - QSet<QPseudostate *> *connectionPoints; + QSet<QTrigger *> deferrableTriggers; + QSet<QPseudostate *> connectionPoints; QBehavior *entry; QBehavior *doActivity; QStateMachine *submachine; diff --git a/src/uml/qstateinvariant.cpp b/src/uml/qstateinvariant.cpp index 9e8261b2..3e299baa 100644 --- a/src/uml/qstateinvariant.cpp +++ b/src/uml/qstateinvariant.cpp @@ -133,35 +133,6 @@ void QStateInvariant::setCovered(QLifeline *covered) } } -void QStateInvariant::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *>("QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *> *"); - qRegisterMetaType<QStateInvariant *>("QStateInvariant *"); - qRegisterMetaType<const QSet<QStateInvariant *> *>("const QSet<QStateInvariant *> *"); - qRegisterMetaType<const QList<QStateInvariant *> *>("const QList<QStateInvariant *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *>("QT_PREPEND_NAMESPACE_QTUML(QLifeline) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QLifeline) *> *"); - qRegisterMetaType<QLifeline *>("QLifeline *"); - qRegisterMetaType<const QSet<QLifeline *> *>("const QSet<QLifeline *> *"); - qRegisterMetaType<const QList<QLifeline *> *>("const QList<QLifeline *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - QInteractionFragment::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstateinvariant.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstateinvariant.h b/src/uml/qstateinvariant.h index 87ffc1d2..e28514ae 100644 --- a/src/uml/qstateinvariant.h +++ b/src/uml/qstateinvariant.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setInvariant(QConstraint *invariant); Q_INVOKABLE QLifeline *covered() const; Q_INVOKABLE void setCovered(QLifeline *covered); - virtual void registerMetaTypes() const; protected: explicit QStateInvariant(QStateInvariantPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStateInvariant) *> *) - QT_END_HEADER #endif // QTUML_QSTATEINVARIANT_H diff --git a/src/uml/qstatemachine.cpp b/src/uml/qstatemachine.cpp index 958f3c4f..aa3a7f81 100644 --- a/src/uml/qstatemachine.cpp +++ b/src/uml/qstatemachine.cpp @@ -50,20 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML -QStateMachinePrivate::QStateMachinePrivate() : - extendedStateMachines(new QSet<QStateMachine *>), - connectionPoints(new QSet<QPseudostate *>), - submachineStates(new QSet<QState *>), - regions(new QSet<QRegion *>) +QStateMachinePrivate::QStateMachinePrivate() { } QStateMachinePrivate::~QStateMachinePrivate() { - delete extendedStateMachines; - delete connectionPoints; - delete submachineStates; - delete regions; } /*! @@ -95,7 +87,7 @@ QStateMachine::~QStateMachine() /*! The state machines of which this is an extension. */ -const QSet<QStateMachine *> *QStateMachine::extendedStateMachines() const +const QSet<QStateMachine *> &QStateMachine::extendedStateMachines() const { // This is a read-write association end @@ -108,8 +100,8 @@ void QStateMachine::addExtendedStateMachine(QStateMachine *extendedStateMachine) // This is a read-write association end Q_D(QStateMachine); - if (!d->extendedStateMachines->contains(extendedStateMachine)) { - d->extendedStateMachines->insert(extendedStateMachine); + if (!d->extendedStateMachines.contains(extendedStateMachine)) { + d->extendedStateMachines.insert(extendedStateMachine); } } @@ -118,15 +110,15 @@ void QStateMachine::removeExtendedStateMachine(QStateMachine *extendedStateMachi // This is a read-write association end Q_D(QStateMachine); - if (d->extendedStateMachines->contains(extendedStateMachine)) { - d->extendedStateMachines->remove(extendedStateMachine); + if (d->extendedStateMachines.contains(extendedStateMachine)) { + d->extendedStateMachines.remove(extendedStateMachine); } } /*! The connection points defined for this state machine. They represent the interface of the state machine when used as part of submachine state. */ -const QSet<QPseudostate *> *QStateMachine::connectionPoints() const +const QSet<QPseudostate *> &QStateMachine::connectionPoints() const { // This is a read-write association end @@ -139,8 +131,8 @@ void QStateMachine::addConnectionPoint(QPseudostate *connectionPoint) // This is a read-write association end Q_D(QStateMachine); - if (!d->connectionPoints->contains(connectionPoint)) { - d->connectionPoints->insert(connectionPoint); + if (!d->connectionPoints.contains(connectionPoint)) { + d->connectionPoints.insert(connectionPoint); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); @@ -155,8 +147,8 @@ void QStateMachine::removeConnectionPoint(QPseudostate *connectionPoint) // This is a read-write association end Q_D(QStateMachine); - if (d->connectionPoints->contains(connectionPoint)) { - d->connectionPoints->remove(connectionPoint); + if (d->connectionPoints.contains(connectionPoint)) { + d->connectionPoints.remove(connectionPoint); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(connectionPoint)); @@ -169,7 +161,7 @@ void QStateMachine::removeConnectionPoint(QPseudostate *connectionPoint) /*! References the submachine(s) in case of a submachine state. Multiple machines are referenced in case of a concurrent state. */ -const QSet<QState *> *QStateMachine::submachineStates() const +const QSet<QState *> &QStateMachine::submachineStates() const { // This is a read-write association end @@ -182,8 +174,8 @@ void QStateMachine::addSubmachineState(QState *submachineState) // This is a read-write association end Q_D(QStateMachine); - if (!d->submachineStates->contains(submachineState)) { - d->submachineStates->insert(submachineState); + if (!d->submachineStates.contains(submachineState)) { + d->submachineStates.insert(submachineState); // Adjust opposite property submachineState->setSubmachine(this); @@ -195,8 +187,8 @@ void QStateMachine::removeSubmachineState(QState *submachineState) // This is a read-write association end Q_D(QStateMachine); - if (d->submachineStates->contains(submachineState)) { - d->submachineStates->remove(submachineState); + if (d->submachineStates.contains(submachineState)) { + d->submachineStates.remove(submachineState); // Adjust opposite property submachineState->setSubmachine(0); @@ -206,7 +198,7 @@ void QStateMachine::removeSubmachineState(QState *submachineState) /*! The regions owned directly by the state machine. */ -const QSet<QRegion *> *QStateMachine::regions() const +const QSet<QRegion *> &QStateMachine::regions() const { // This is a read-write association end @@ -219,8 +211,8 @@ void QStateMachine::addRegion(QRegion *region) // This is a read-write association end Q_D(QStateMachine); - if (!d->regions->contains(region)) { - d->regions->insert(region); + if (!d->regions.contains(region)) { + d->regions.insert(region); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); @@ -235,8 +227,8 @@ void QStateMachine::removeRegion(QRegion *region) // This is a read-write association end Q_D(QStateMachine); - if (d->regions->contains(region)) { - d->regions->remove(region); + if (d->regions.contains(region)) { + d->regions.remove(region); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(region)); @@ -292,56 +284,6 @@ bool QStateMachine::isRedefinitionContextValid(const QStateMachine *redefined) c return bool(); // change here to your derived return } -void QStateMachine::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<QStateMachine *>("QStateMachine *"); - qRegisterMetaType<const QSet<QStateMachine *> *>("const QSet<QStateMachine *> *"); - qRegisterMetaType<const QList<QStateMachine *> *>("const QList<QStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *>("QT_PREPEND_NAMESPACE_QTUML(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QState) *>("QT_PREPEND_NAMESPACE_QTUML(QState) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QState) *> *"); - qRegisterMetaType<QState *>("QState *"); - qRegisterMetaType<const QSet<QState *> *>("const QSet<QState *> *"); - qRegisterMetaType<const QList<QState *> *>("const QList<QState *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *>("QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPseudostate) *> *"); - qRegisterMetaType<QPseudostate *>("QPseudostate *"); - qRegisterMetaType<const QSet<QPseudostate *> *>("const QSet<QPseudostate *> *"); - qRegisterMetaType<const QList<QPseudostate *> *>("const QList<QPseudostate *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<QRegion *>("QRegion *"); - qRegisterMetaType<const QSet<QRegion *> *>("const QSet<QRegion *> *"); - qRegisterMetaType<const QList<QRegion *> *>("const QList<QRegion *> *"); - - QBehavior::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstatemachine.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstatemachine.h b/src/uml/qstatemachine.h index 02a1e282..ab8ec31c 100644 --- a/src/uml/qstatemachine.h +++ b/src/uml/qstatemachine.h @@ -68,10 +68,10 @@ class Q_UML_EXPORT QStateMachine : public QBehavior { Q_OBJECT - Q_PROPERTY(const QSet<QStateMachine *> * extendedStateMachines READ extendedStateMachines) - Q_PROPERTY(const QSet<QPseudostate *> * connectionPoints READ connectionPoints) - Q_PROPERTY(const QSet<QState *> * submachineStates READ submachineStates) - Q_PROPERTY(const QSet<QRegion *> * regions READ regions) + 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_DISABLE_COPY(QStateMachine) Q_DECLARE_PRIVATE(QStateMachine) @@ -81,16 +81,16 @@ public: virtual ~QStateMachine(); // Association ends from QStateMachine - Q_INVOKABLE const QSet<QStateMachine *> *extendedStateMachines() const; + Q_INVOKABLE const QSet<QStateMachine *> &extendedStateMachines() const; Q_INVOKABLE void addExtendedStateMachine(QStateMachine *extendedStateMachine); Q_INVOKABLE void removeExtendedStateMachine(QStateMachine *extendedStateMachine); - Q_INVOKABLE const QSet<QPseudostate *> *connectionPoints() const; + Q_INVOKABLE const QSet<QPseudostate *> &connectionPoints() const; Q_INVOKABLE void addConnectionPoint(QPseudostate *connectionPoint); Q_INVOKABLE void removeConnectionPoint(QPseudostate *connectionPoint); - Q_INVOKABLE const QSet<QState *> *submachineStates() const; + Q_INVOKABLE const QSet<QState *> &submachineStates() const; Q_INVOKABLE void addSubmachineState(QState *submachineState); Q_INVOKABLE void removeSubmachineState(QState *submachineState); - Q_INVOKABLE const QSet<QRegion *> *regions() const; + Q_INVOKABLE const QSet<QRegion *> ®ions() const; Q_INVOKABLE void addRegion(QRegion *region); Q_INVOKABLE void removeRegion(QRegion *region); @@ -99,7 +99,6 @@ public: Q_INVOKABLE bool ancestor(const QState *s1, const QState *s2) const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isRedefinitionContextValid(const QStateMachine *redefined) const; - virtual void registerMetaTypes() const; protected: explicit QStateMachine(QStateMachinePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -107,10 +106,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *) - QT_END_HEADER #endif // QTUML_QSTATEMACHINE_H diff --git a/src/uml/qstatemachine_p.h b/src/uml/qstatemachine_p.h index 1762b3f8..0bae5703 100644 --- a/src/uml/qstatemachine_p.h +++ b/src/uml/qstatemachine_p.h @@ -71,10 +71,10 @@ public: explicit QStateMachinePrivate(); virtual ~QStateMachinePrivate(); - QSet<QStateMachine *> *extendedStateMachines; - QSet<QPseudostate *> *connectionPoints; - QSet<QState *> *submachineStates; - QSet<QRegion *> *regions; + QSet<QStateMachine *> extendedStateMachines; + QSet<QPseudostate *> connectionPoints; + QSet<QState *> submachineStates; + QSet<QRegion *> regions; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstereotype.cpp b/src/uml/qstereotype.cpp index 8b00a77e..147e5f31 100644 --- a/src/uml/qstereotype.cpp +++ b/src/uml/qstereotype.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML -QStereotypePrivate::QStereotypePrivate() : - icons(new QSet<QImage *>) +QStereotypePrivate::QStereotypePrivate() { } QStereotypePrivate::~QStereotypePrivate() { - delete icons; } /*! @@ -86,7 +84,7 @@ QStereotype::~QStereotype() /*! 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. */ -const QSet<QImage *> *QStereotype::icons() const +const QSet<QImage *> &QStereotype::icons() const { // This is a read-write association end @@ -99,8 +97,8 @@ void QStereotype::addIcon(QImage *icon) // This is a read-write association end Q_D(QStereotype); - if (!d->icons->contains(icon)) { - d->icons->insert(icon); + if (!d->icons.contains(icon)) { + d->icons.insert(icon); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(icon)); @@ -112,8 +110,8 @@ void QStereotype::removeIcon(QImage *icon) // This is a read-write association end Q_D(QStereotype); - if (d->icons->contains(icon)) { - d->icons->remove(icon); + if (d->icons.contains(icon)) { + d->icons.remove(icon); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(icon)); @@ -142,35 +140,6 @@ QProfile *QStereotype::containingProfile() const return 0; // change here to your derived return } -void QStereotype::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *>("QT_PREPEND_NAMESPACE_QTUML(QStereotype) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *"); - qRegisterMetaType<QStereotype *>("QStereotype *"); - qRegisterMetaType<const QSet<QStereotype *> *>("const QSet<QStereotype *> *"); - qRegisterMetaType<const QList<QStereotype *> *>("const QList<QStereotype *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QImage) *>("QT_PREPEND_NAMESPACE_QTUML(QImage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QImage) *> *"); - qRegisterMetaType<QImage *>("QImage *"); - qRegisterMetaType<const QSet<QImage *> *>("const QSet<QImage *> *"); - qRegisterMetaType<const QList<QImage *> *>("const QList<QImage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProfile) *>("QT_PREPEND_NAMESPACE_QTUML(QProfile) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProfile) *> *"); - qRegisterMetaType<QProfile *>("QProfile *"); - qRegisterMetaType<const QSet<QProfile *> *>("const QSet<QProfile *> *"); - qRegisterMetaType<const QList<QProfile *> *>("const QList<QProfile *> *"); - - QClass::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstereotype.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstereotype.h b/src/uml/qstereotype.h index a4e5c1b9..55fa8054 100644 --- a/src/uml/qstereotype.h +++ b/src/uml/qstereotype.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QStereotype : public QClass { Q_OBJECT - Q_PROPERTY(const QSet<QImage *> * icons READ icons) + Q_PROPERTY(QSet<QImage *> icons READ icons) Q_PROPERTY(QProfile * profile READ profile STORED false) Q_DISABLE_COPY(QStereotype) @@ -76,14 +76,13 @@ public: virtual ~QStereotype(); // Association ends from QStereotype - Q_INVOKABLE const QSet<QImage *> *icons() const; + Q_INVOKABLE const QSet<QImage *> &icons() const; Q_INVOKABLE void addIcon(QImage *icon); Q_INVOKABLE void removeIcon(QImage *icon); Q_INVOKABLE QProfile *profile() const; // Operations Q_INVOKABLE QProfile *containingProfile() const; - virtual void registerMetaTypes() const; protected: explicit QStereotype(QStereotypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStereotype) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStereotype) *> *) - QT_END_HEADER #endif // QTUML_QSTEREOTYPE_H diff --git a/src/uml/qstereotype_p.h b/src/uml/qstereotype_p.h index cd7eac09..3efc46c4 100644 --- a/src/uml/qstereotype_p.h +++ b/src/uml/qstereotype_p.h @@ -68,7 +68,7 @@ public: explicit QStereotypePrivate(); virtual ~QStereotypePrivate(); - QSet<QImage *> *icons; + QSet<QImage *> icons; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstringexpression.cpp b/src/uml/qstringexpression.cpp index 3e5c83b7..083a9c0e 100644 --- a/src/uml/qstringexpression.cpp +++ b/src/uml/qstringexpression.cpp @@ -45,14 +45,12 @@ QT_BEGIN_NAMESPACE_QTUML QStringExpressionPrivate::QStringExpressionPrivate() : - owningExpression(0), - subExpressions(new QSet<QStringExpression *>) + owningExpression(0) { } QStringExpressionPrivate::~QStringExpressionPrivate() { - delete subExpressions; } /*! @@ -88,7 +86,7 @@ QStringExpression::~QStringExpression() /*! The Elements owned by this element. */ -const QSet<QElement *> *QStringExpression::ownedElements() const +const QSet<QElement *> &QStringExpression::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -104,7 +102,7 @@ QElement *QStringExpression::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QStringExpression::ownedComments() const +const QSet<QComment *> &QStringExpression::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -139,7 +137,7 @@ void QStringExpression::setOwnedTemplateSignature(QTemplateSignature *ownedTempl /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QStringExpression::templateBindings() const +const QSet<QTemplateBinding *> &QStringExpression::templateBindings() const { return (qwrappedobject_cast<const QTemplateableElement *>(this))->templateBindings(); } @@ -193,7 +191,7 @@ void QStringExpression::setOwningExpression(QStringExpression *owningExpression) /*! The StringExpressions that constitute this StringExpression. */ -const QSet<QStringExpression *> *QStringExpression::subExpressions() const +const QSet<QStringExpression *> &QStringExpression::subExpressions() const { // This is a read-write association end @@ -206,8 +204,8 @@ void QStringExpression::addSubExpression(QStringExpression *subExpression) // This is a read-write association end Q_D(QStringExpression); - if (!d->subExpressions->contains(subExpression)) { - d->subExpressions->insert(subExpression); + if (!d->subExpressions.contains(subExpression)) { + d->subExpressions.insert(subExpression); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(subExpression)); @@ -222,8 +220,8 @@ void QStringExpression::removeSubExpression(QStringExpression *subExpression) // This is a read-write association end Q_D(QStringExpression); - if (d->subExpressions->contains(subExpression)) { - d->subExpressions->remove(subExpression); + if (d->subExpressions.contains(subExpression)) { + d->subExpressions.remove(subExpression); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(subExpression)); @@ -243,21 +241,6 @@ QString QStringExpression::stringValue() const return QString(); // change here to your derived return } -void QStringExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *"); - qRegisterMetaType<QStringExpression *>("QStringExpression *"); - qRegisterMetaType<const QSet<QStringExpression *> *>("const QSet<QStringExpression *> *"); - qRegisterMetaType<const QList<QStringExpression *> *>("const QList<QStringExpression *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstringexpression.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstringexpression.h b/src/uml/qstringexpression.h index 008ddf76..aba9dbdd 100644 --- a/src/uml/qstringexpression.h +++ b/src/uml/qstringexpression.h @@ -66,7 +66,7 @@ class Q_UML_EXPORT QStringExpression : public QWrappedObject Q_OBJECT Q_PROPERTY(QStringExpression * owningExpression READ owningExpression WRITE setOwningExpression) - Q_PROPERTY(const QSet<QStringExpression *> * subExpressions READ subExpressions) + Q_PROPERTY(QSet<QStringExpression *> subExpressions READ subExpressions) Q_DISABLE_COPY(QStringExpression) Q_DECLARE_PRIVATE(QStringExpression) @@ -76,29 +76,28 @@ public: virtual ~QStringExpression(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QTemplateableElement Q_INVOKABLE QTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); // Association ends from QStringExpression Q_INVOKABLE QStringExpression *owningExpression() const; Q_INVOKABLE void setOwningExpression(QStringExpression *owningExpression); - Q_INVOKABLE const QSet<QStringExpression *> *subExpressions() const; + Q_INVOKABLE const QSet<QStringExpression *> &subExpressions() const; Q_INVOKABLE void addSubExpression(QStringExpression *subExpression); Q_INVOKABLE void removeSubExpression(QStringExpression *subExpression); // Operations Q_INVOKABLE QString stringValue() const; - virtual void registerMetaTypes() const; protected: explicit QStringExpression(QStringExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -110,10 +109,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStringExpression) *> *) - QT_END_HEADER #endif // QTUML_QSTRINGEXPRESSION_H diff --git a/src/uml/qstringexpression_p.h b/src/uml/qstringexpression_p.h index 2f0dfb4c..e97ab83a 100644 --- a/src/uml/qstringexpression_p.h +++ b/src/uml/qstringexpression_p.h @@ -71,7 +71,7 @@ public: virtual ~QStringExpressionPrivate(); QStringExpression *owningExpression; - QSet<QStringExpression *> *subExpressions; + QSet<QStringExpression *> subExpressions; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstructuralfeature.cpp b/src/uml/qstructuralfeature.cpp index 5dd3d395..f0c0ce07 100644 --- a/src/uml/qstructuralfeature.cpp +++ b/src/uml/qstructuralfeature.cpp @@ -88,7 +88,7 @@ QStructuralFeature::~QStructuralFeature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QStructuralFeature::ownedElements() const +const QSet<QElement *> &QStructuralFeature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -104,7 +104,7 @@ QElement *QStructuralFeature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QStructuralFeature::ownedComments() const +const QSet<QComment *> &QStructuralFeature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -185,7 +185,7 @@ QNamespace *QStructuralFeature::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QStructuralFeature::clientDependencies() const +const QSet<QDependency *> &QStructuralFeature::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -347,7 +347,7 @@ void QStructuralFeature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const +const QSet<QRedefinableElement *> &QStructuralFeature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -355,7 +355,7 @@ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const +const QSet<QClassifier *> &QStructuralFeature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -389,7 +389,7 @@ void QStructuralFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QStructuralFeature::featuringClassifiers() const +const QSet<QClassifier *> &QStructuralFeature::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -424,21 +424,6 @@ void QStructuralFeature::unsetReadOnly() setReadOnly(false); } -void QStructuralFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstructuralfeature.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstructuralfeature.h b/src/uml/qstructuralfeature.h index 4325852c..73666182 100644 --- a/src/uml/qstructuralfeature.h +++ b/src/uml/qstructuralfeature.h @@ -72,9 +72,9 @@ public: virtual ~QStructuralFeature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -89,7 +89,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -122,8 +122,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -131,13 +131,12 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Attributes from QStructuralFeature Q_INVOKABLE bool isReadOnly() const; Q_INVOKABLE void setReadOnly(bool isReadOnly); Q_INVOKABLE void unsetReadOnly(); - virtual void registerMetaTypes() const; protected: explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -150,10 +149,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *) - QT_END_HEADER #endif // QTUML_QSTRUCTURALFEATURE_H diff --git a/src/uml/qstructuralfeatureaction.cpp b/src/uml/qstructuralfeatureaction.cpp index e661ff62..df215183 100644 --- a/src/uml/qstructuralfeatureaction.cpp +++ b/src/uml/qstructuralfeatureaction.cpp @@ -133,35 +133,6 @@ void QStructuralFeatureAction::setStructuralFeature(QStructuralFeature *structur } } -void QStructuralFeatureAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *> *"); - qRegisterMetaType<QStructuralFeatureAction *>("QStructuralFeatureAction *"); - qRegisterMetaType<const QSet<QStructuralFeatureAction *> *>("const QSet<QStructuralFeatureAction *> *"); - qRegisterMetaType<const QList<QStructuralFeatureAction *> *>("const QList<QStructuralFeatureAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstructuralfeatureaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstructuralfeatureaction.h b/src/uml/qstructuralfeatureaction.h index 2407827f..e6bbd597 100644 --- a/src/uml/qstructuralfeatureaction.h +++ b/src/uml/qstructuralfeatureaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setObject(QInputPin *object); Q_INVOKABLE QStructuralFeature *structuralFeature() const; Q_INVOKABLE void setStructuralFeature(QStructuralFeature *structuralFeature); - virtual void registerMetaTypes() const; protected: explicit QStructuralFeatureAction(QStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuralFeatureAction) *> *) - QT_END_HEADER #endif // QTUML_QSTRUCTURALFEATUREACTION_H diff --git a/src/uml/qstructuredactivitynode.cpp b/src/uml/qstructuredactivitynode.cpp index f603edf5..8eab4a0d 100644 --- a/src/uml/qstructuredactivitynode.cpp +++ b/src/uml/qstructuredactivitynode.cpp @@ -53,22 +53,12 @@ QT_BEGIN_NAMESPACE_QTUML QStructuredActivityNodePrivate::QStructuredActivityNodePrivate() : mustIsolate(false), - structuredNodeInputs(new QSet<QInputPin *>), - nodes(new QSet<QActivityNode *>), - structuredNodeOutputs(new QSet<QOutputPin *>), - edges(new QSet<QActivityEdge *>), - variables(new QSet<QVariable *>), activity(0) { } QStructuredActivityNodePrivate::~QStructuredActivityNodePrivate() { - delete structuredNodeInputs; - delete nodes; - delete structuredNodeOutputs; - delete edges; - delete variables; } /*! @@ -106,7 +96,7 @@ QStructuredActivityNode::~QStructuredActivityNode() /*! The Elements owned by this element. */ -const QSet<QElement *> *QStructuredActivityNode::ownedElements() const +const QSet<QElement *> &QStructuredActivityNode::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -122,7 +112,7 @@ QElement *QStructuredActivityNode::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QStructuredActivityNode::ownedComments() const +const QSet<QComment *> &QStructuredActivityNode::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -203,7 +193,7 @@ QNamespace *QStructuredActivityNode::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QStructuredActivityNode::clientDependencies() const +const QSet<QDependency *> &QStructuredActivityNode::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -247,7 +237,7 @@ void QStructuredActivityNode::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QStructuredActivityNode::redefinedElements() const +const QSet<QRedefinableElement *> &QStructuredActivityNode::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -255,7 +245,7 @@ const QSet<QRedefinableElement *> *QStructuredActivityNode::redefinedElements() /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QStructuredActivityNode::redefinitionContexts() const +const QSet<QClassifier *> &QStructuredActivityNode::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -267,7 +257,7 @@ const QSet<QClassifier *> *QStructuredActivityNode::redefinitionContexts() const /*! Inherited nodes replaced by this node in a specialization of the activity. */ -const QSet<QActivityNode *> *QStructuredActivityNode::redefinedNodes() const +const QSet<QActivityNode *> &QStructuredActivityNode::redefinedNodes() const { return (qwrappedobject_cast<const QActivityNode *>(this))->redefinedNodes(); } @@ -285,7 +275,7 @@ void QStructuredActivityNode::removeRedefinedNode(QActivityNode *redefinedNode) /*! Edges that have the node as target. */ -const QSet<QActivityEdge *> *QStructuredActivityNode::incomings() const +const QSet<QActivityEdge *> &QStructuredActivityNode::incomings() const { return (qwrappedobject_cast<const QActivityNode *>(this))->incomings(); } @@ -303,7 +293,7 @@ void QStructuredActivityNode::removeIncoming(QActivityEdge *incoming) /*! Groups containing the node. */ -const QSet<QActivityGroup *> *QStructuredActivityNode::inGroup() const +const QSet<QActivityGroup *> &QStructuredActivityNode::inGroup() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inGroup(); } @@ -324,7 +314,7 @@ void QStructuredActivityNode::setInStructuredNode(QStructuredActivityNode *inStr /*! Partitions containing the node. */ -const QSet<QActivityPartition *> *QStructuredActivityNode::inPartition() const +const QSet<QActivityPartition *> &QStructuredActivityNode::inPartition() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inPartition(); } @@ -342,7 +332,7 @@ void QStructuredActivityNode::removeInPartition(QActivityPartition *inPartition) /*! Interruptible regions containing the node. */ -const QSet<QInterruptibleActivityRegion *> *QStructuredActivityNode::inInterruptibleRegion() const +const QSet<QInterruptibleActivityRegion *> &QStructuredActivityNode::inInterruptibleRegion() const { return (qwrappedobject_cast<const QActivityNode *>(this))->inInterruptibleRegion(); } @@ -360,7 +350,7 @@ void QStructuredActivityNode::removeInInterruptibleRegion(QInterruptibleActivity /*! Edges that have the node as source. */ -const QSet<QActivityEdge *> *QStructuredActivityNode::outgoings() const +const QSet<QActivityEdge *> &QStructuredActivityNode::outgoings() const { return (qwrappedobject_cast<const QActivityNode *>(this))->outgoings(); } @@ -382,7 +372,7 @@ void QStructuredActivityNode::removeOutgoing(QActivityEdge *outgoing) /*! A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node. */ -const QSet<QExceptionHandler *> *QStructuredActivityNode::handlers() const +const QSet<QExceptionHandler *> &QStructuredActivityNode::handlers() const { return (qwrappedobject_cast<const QExecutableNode *>(this))->handlers(); } @@ -434,7 +424,7 @@ QClassifier *QStructuredActivityNode::context() const /*! Constraint that must be satisfied when executed is completed. */ -const QSet<QConstraint *> *QStructuredActivityNode::localPostconditions() const +const QSet<QConstraint *> &QStructuredActivityNode::localPostconditions() const { return (qwrappedobject_cast<const QAction *>(this))->localPostconditions(); } @@ -452,7 +442,7 @@ void QStructuredActivityNode::removeLocalPostcondition(QConstraint *localPostcon /*! Constraint that must be satisfied when execution is started. */ -const QSet<QConstraint *> *QStructuredActivityNode::localPreconditions() const +const QSet<QConstraint *> &QStructuredActivityNode::localPreconditions() const { return (qwrappedobject_cast<const QAction *>(this))->localPreconditions(); } @@ -470,7 +460,7 @@ void QStructuredActivityNode::removeLocalPrecondition(QConstraint *localPrecondi /*! The ordered set of input pins connected to the Action. These are among the total set of inputs. */ -const QList<QInputPin *> *QStructuredActivityNode::inputs() const +const QList<QInputPin *> &QStructuredActivityNode::inputs() const { return (qwrappedobject_cast<const QAction *>(this))->inputs(); } @@ -478,7 +468,7 @@ const QList<QInputPin *> *QStructuredActivityNode::inputs() const /*! The ordered set of output pins connected to the Action. The action places its results onto pins in this set. */ -const QList<QOutputPin *> *QStructuredActivityNode::outputs() const +const QList<QOutputPin *> &QStructuredActivityNode::outputs() const { return (qwrappedobject_cast<const QAction *>(this))->outputs(); } @@ -490,7 +480,7 @@ const QList<QOutputPin *> *QStructuredActivityNode::outputs() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QStructuredActivityNode::packageImports() const +const QSet<QPackageImport *> &QStructuredActivityNode::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -508,7 +498,7 @@ void QStructuredActivityNode::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QStructuredActivityNode::members() const +const QSet<QNamedElement *> &QStructuredActivityNode::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -516,7 +506,7 @@ const QSet<QNamedElement *> *QStructuredActivityNode::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QStructuredActivityNode::importedMembers() const +const QSet<QPackageableElement *> &QStructuredActivityNode::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -524,7 +514,7 @@ const QSet<QPackageableElement *> *QStructuredActivityNode::importedMembers() co /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QStructuredActivityNode::elementImports() const +const QSet<QElementImport *> &QStructuredActivityNode::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -542,7 +532,7 @@ void QStructuredActivityNode::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QStructuredActivityNode::ownedRules() const +const QSet<QConstraint *> &QStructuredActivityNode::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -560,7 +550,7 @@ void QStructuredActivityNode::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QStructuredActivityNode::ownedMembers() const +const QSet<QNamedElement *> &QStructuredActivityNode::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -572,7 +562,7 @@ const QSet<QNamedElement *> *QStructuredActivityNode::ownedMembers() const /*! Nodes immediately contained in the group. */ -const QSet<QActivityNode *> *QStructuredActivityNode::containedNodes() const +const QSet<QActivityNode *> &QStructuredActivityNode::containedNodes() const { return (qwrappedobject_cast<const QActivityGroup *>(this))->containedNodes(); } @@ -580,7 +570,7 @@ const QSet<QActivityNode *> *QStructuredActivityNode::containedNodes() const /*! Groups immediately contained in the group. */ -const QSet<QActivityGroup *> *QStructuredActivityNode::subgroups() const +const QSet<QActivityGroup *> &QStructuredActivityNode::subgroups() const { return (qwrappedobject_cast<const QActivityGroup *>(this))->subgroups(); } @@ -588,7 +578,7 @@ const QSet<QActivityGroup *> *QStructuredActivityNode::subgroups() const /*! Edges immediately contained in the group. */ -const QSet<QActivityEdge *> *QStructuredActivityNode::containedEdges() const +const QSet<QActivityEdge *> &QStructuredActivityNode::containedEdges() const { return (qwrappedobject_cast<const QActivityGroup *>(this))->containedEdges(); } @@ -635,7 +625,7 @@ void QStructuredActivityNode::unsetMustIsolate() // ASSOCIATION ENDS FROM QStructuredActivityNode // --------------------------------------------------------------- -const QSet<QInputPin *> *QStructuredActivityNode::structuredNodeInputs() const +const QSet<QInputPin *> &QStructuredActivityNode::structuredNodeInputs() const { // This is a read-write association end @@ -648,8 +638,8 @@ void QStructuredActivityNode::addStructuredNodeInput(QInputPin *structuredNodeIn // This is a read-write association end Q_D(QStructuredActivityNode); - if (!d->structuredNodeInputs->contains(structuredNodeInput)) { - d->structuredNodeInputs->insert(structuredNodeInput); + if (!d->structuredNodeInputs.contains(structuredNodeInput)) { + d->structuredNodeInputs.insert(structuredNodeInput); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addInput(qwrappedobject_cast<QInputPin *>(structuredNodeInput)); @@ -661,8 +651,8 @@ void QStructuredActivityNode::removeStructuredNodeInput(QInputPin *structuredNod // This is a read-write association end Q_D(QStructuredActivityNode); - if (d->structuredNodeInputs->contains(structuredNodeInput)) { - d->structuredNodeInputs->remove(structuredNodeInput); + if (d->structuredNodeInputs.contains(structuredNodeInput)) { + d->structuredNodeInputs.remove(structuredNodeInput); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeInput(qwrappedobject_cast<QInputPin *>(structuredNodeInput)); @@ -672,7 +662,7 @@ void QStructuredActivityNode::removeStructuredNodeInput(QInputPin *structuredNod /*! Nodes immediately contained in the group. */ -const QSet<QActivityNode *> *QStructuredActivityNode::nodes() const +const QSet<QActivityNode *> &QStructuredActivityNode::nodes() const { // This is a read-write association end @@ -685,8 +675,8 @@ void QStructuredActivityNode::addNode(QActivityNode *node) // This is a read-write association end Q_D(QStructuredActivityNode); - if (!d->nodes->contains(node)) { - d->nodes->insert(node); + if (!d->nodes.contains(node)) { + d->nodes.insert(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedNode(qwrappedobject_cast<QActivityNode *>(node)); @@ -702,8 +692,8 @@ void QStructuredActivityNode::removeNode(QActivityNode *node) // This is a read-write association end Q_D(QStructuredActivityNode); - if (d->nodes->contains(node)) { - d->nodes->remove(node); + if (d->nodes.contains(node)) { + d->nodes.remove(node); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedNode(qwrappedobject_cast<QActivityNode *>(node)); @@ -714,7 +704,7 @@ void QStructuredActivityNode::removeNode(QActivityNode *node) } } -const QSet<QOutputPin *> *QStructuredActivityNode::structuredNodeOutputs() const +const QSet<QOutputPin *> &QStructuredActivityNode::structuredNodeOutputs() const { // This is a read-write association end @@ -727,8 +717,8 @@ void QStructuredActivityNode::addStructuredNodeOutput(QOutputPin *structuredNode // This is a read-write association end Q_D(QStructuredActivityNode); - if (!d->structuredNodeOutputs->contains(structuredNodeOutput)) { - d->structuredNodeOutputs->insert(structuredNodeOutput); + if (!d->structuredNodeOutputs.contains(structuredNodeOutput)) { + d->structuredNodeOutputs.insert(structuredNodeOutput); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(structuredNodeOutput)); @@ -740,8 +730,8 @@ void QStructuredActivityNode::removeStructuredNodeOutput(QOutputPin *structuredN // This is a read-write association end Q_D(QStructuredActivityNode); - if (d->structuredNodeOutputs->contains(structuredNodeOutput)) { - d->structuredNodeOutputs->remove(structuredNodeOutput); + if (d->structuredNodeOutputs.contains(structuredNodeOutput)) { + d->structuredNodeOutputs.remove(structuredNodeOutput); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(structuredNodeOutput)); @@ -751,7 +741,7 @@ void QStructuredActivityNode::removeStructuredNodeOutput(QOutputPin *structuredN /*! Edges immediately contained in the structured node. */ -const QSet<QActivityEdge *> *QStructuredActivityNode::edges() const +const QSet<QActivityEdge *> &QStructuredActivityNode::edges() const { // This is a read-write association end @@ -764,8 +754,8 @@ void QStructuredActivityNode::addEdge(QActivityEdge *edge) // This is a read-write association end Q_D(QStructuredActivityNode); - if (!d->edges->contains(edge)) { - d->edges->insert(edge); + if (!d->edges.contains(edge)) { + d->edges.insert(edge); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->addContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); @@ -781,8 +771,8 @@ void QStructuredActivityNode::removeEdge(QActivityEdge *edge) // This is a read-write association end Q_D(QStructuredActivityNode); - if (d->edges->contains(edge)) { - d->edges->remove(edge); + if (d->edges.contains(edge)) { + d->edges.remove(edge); // Adjust subsetted property(ies) (qwrappedobject_cast<QActivityGroupPrivate *>(d))->removeContainedEdge(qwrappedobject_cast<QActivityEdge *>(edge)); @@ -796,7 +786,7 @@ void QStructuredActivityNode::removeEdge(QActivityEdge *edge) /*! A variable defined in the scope of the structured activity node. It has no value and may not be accessed */ -const QSet<QVariable *> *QStructuredActivityNode::variables() const +const QSet<QVariable *> &QStructuredActivityNode::variables() const { // This is a read-write association end @@ -809,8 +799,8 @@ void QStructuredActivityNode::addVariable(QVariable *variable) // This is a read-write association end Q_D(QStructuredActivityNode); - if (!d->variables->contains(variable)) { - d->variables->insert(variable); + if (!d->variables.contains(variable)) { + d->variables.insert(variable); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); @@ -825,8 +815,8 @@ void QStructuredActivityNode::removeVariable(QVariable *variable) // This is a read-write association end Q_D(QStructuredActivityNode); - if (d->variables->contains(variable)) { - d->variables->remove(variable); + if (d->variables.contains(variable)) { + d->variables.remove(variable); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(variable)); @@ -865,63 +855,6 @@ void QStructuredActivityNode::setActivity(QActivity *activity) } } -void QStructuredActivityNode::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *"); - qRegisterMetaType<const QSet<QStructuredActivityNode *> *>("const QSet<QStructuredActivityNode *> *"); - qRegisterMetaType<const QList<QStructuredActivityNode *> *>("const QList<QStructuredActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVariable) *>("QT_PREPEND_NAMESPACE_QTUML(QVariable) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<QVariable *>("QVariable *"); - qRegisterMetaType<const QSet<QVariable *> *>("const QSet<QVariable *> *"); - qRegisterMetaType<const QList<QVariable *> *>("const QList<QVariable *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityEdge) *> *"); - qRegisterMetaType<QActivityEdge *>("QActivityEdge *"); - qRegisterMetaType<const QSet<QActivityEdge *> *>("const QSet<QActivityEdge *> *"); - qRegisterMetaType<const QList<QActivityEdge *> *>("const QList<QActivityEdge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivity) *>("QT_PREPEND_NAMESPACE_QTUML(QActivity) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<QActivity *>("QActivity *"); - qRegisterMetaType<const QSet<QActivity *> *>("const QSet<QActivity *> *"); - qRegisterMetaType<const QList<QActivity *> *>("const QList<QActivity *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityNode) *> *"); - qRegisterMetaType<QActivityNode *>("QActivityNode *"); - qRegisterMetaType<const QSet<QActivityNode *> *>("const QSet<QActivityNode *> *"); - qRegisterMetaType<const QList<QActivityNode *> *>("const QList<QActivityNode *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstructuredactivitynode.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstructuredactivitynode.h b/src/uml/qstructuredactivitynode.h index b87f6e78..0cfb5fba 100644 --- a/src/uml/qstructuredactivitynode.h +++ b/src/uml/qstructuredactivitynode.h @@ -74,11 +74,11 @@ class Q_UML_EXPORT QStructuredActivityNode : public QWrappedObject Q_OBJECT Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate) - Q_PROPERTY(const QSet<QInputPin *> * structuredNodeInputs READ structuredNodeInputs) - Q_PROPERTY(const QSet<QActivityNode *> * nodes READ nodes) - Q_PROPERTY(const QSet<QOutputPin *> * structuredNodeOutputs READ structuredNodeOutputs) - Q_PROPERTY(const QSet<QActivityEdge *> * edges READ edges) - Q_PROPERTY(const QSet<QVariable *> * variables READ variables) + 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_DISABLE_COPY(QStructuredActivityNode) @@ -89,9 +89,9 @@ public: virtual ~QStructuredActivityNode(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -106,7 +106,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -116,31 +116,31 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QActivityNode - Q_INVOKABLE const QSet<QActivityNode *> *redefinedNodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &redefinedNodes() const; Q_INVOKABLE void addRedefinedNode(QActivityNode *redefinedNode); Q_INVOKABLE void removeRedefinedNode(QActivityNode *redefinedNode); - Q_INVOKABLE const QSet<QActivityEdge *> *incomings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &incomings() const; Q_INVOKABLE void addIncoming(QActivityEdge *incoming); Q_INVOKABLE void removeIncoming(QActivityEdge *incoming); - Q_INVOKABLE const QSet<QActivityGroup *> *inGroup() const; + Q_INVOKABLE const QSet<QActivityGroup *> &inGroup() const; Q_INVOKABLE QStructuredActivityNode *inStructuredNode() const; Q_INVOKABLE void setInStructuredNode(QStructuredActivityNode *inStructuredNode); - Q_INVOKABLE const QSet<QActivityPartition *> *inPartition() const; + Q_INVOKABLE const QSet<QActivityPartition *> &inPartition() const; Q_INVOKABLE void addInPartition(QActivityPartition *inPartition); Q_INVOKABLE void removeInPartition(QActivityPartition *inPartition); - Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> *inInterruptibleRegion() const; + Q_INVOKABLE const QSet<QInterruptibleActivityRegion *> &inInterruptibleRegion() const; Q_INVOKABLE void addInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); Q_INVOKABLE void removeInInterruptibleRegion(QInterruptibleActivityRegion *inInterruptibleRegion); - Q_INVOKABLE const QSet<QActivityEdge *> *outgoings() const; + Q_INVOKABLE const QSet<QActivityEdge *> &outgoings() const; Q_INVOKABLE void addOutgoing(QActivityEdge *outgoing); Q_INVOKABLE void removeOutgoing(QActivityEdge *outgoing); // Association ends from aggregated QExecutableNode - Q_INVOKABLE const QSet<QExceptionHandler *> *handlers() const; + Q_INVOKABLE const QSet<QExceptionHandler *> &handlers() const; Q_INVOKABLE void addHandler(QExceptionHandler *handler); Q_INVOKABLE void removeHandler(QExceptionHandler *handler); @@ -151,33 +151,33 @@ public: // Association ends from aggregated QAction Q_INVOKABLE QClassifier *context() const; - Q_INVOKABLE const QSet<QConstraint *> *localPostconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &localPostconditions() const; Q_INVOKABLE void addLocalPostcondition(QConstraint *localPostcondition); Q_INVOKABLE void removeLocalPostcondition(QConstraint *localPostcondition); - Q_INVOKABLE const QSet<QConstraint *> *localPreconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &localPreconditions() const; Q_INVOKABLE void addLocalPrecondition(QConstraint *localPrecondition); Q_INVOKABLE void removeLocalPrecondition(QConstraint *localPrecondition); - Q_INVOKABLE const QList<QInputPin *> *inputs() const; - Q_INVOKABLE const QList<QOutputPin *> *outputs() const; + Q_INVOKABLE const QList<QInputPin *> &inputs() const; + Q_INVOKABLE const QList<QOutputPin *> &outputs() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from aggregated QActivityGroup - Q_INVOKABLE const QSet<QActivityNode *> *containedNodes() const; - Q_INVOKABLE const QSet<QActivityGroup *> *subgroups() const; - Q_INVOKABLE const QSet<QActivityEdge *> *containedEdges() const; + Q_INVOKABLE const QSet<QActivityNode *> &containedNodes() const; + Q_INVOKABLE const QSet<QActivityGroup *> &subgroups() const; + Q_INVOKABLE const QSet<QActivityEdge *> &containedEdges() const; Q_INVOKABLE QActivityGroup *superGroup() const; // Attributes from QStructuredActivityNode @@ -186,24 +186,23 @@ public: Q_INVOKABLE void unsetMustIsolate(); // Association ends from QStructuredActivityNode - Q_INVOKABLE const QSet<QInputPin *> *structuredNodeInputs() const; + Q_INVOKABLE const QSet<QInputPin *> &structuredNodeInputs() const; Q_INVOKABLE void addStructuredNodeInput(QInputPin *structuredNodeInput); Q_INVOKABLE void removeStructuredNodeInput(QInputPin *structuredNodeInput); - Q_INVOKABLE const QSet<QActivityNode *> *nodes() const; + Q_INVOKABLE const QSet<QActivityNode *> &nodes() const; Q_INVOKABLE void addNode(QActivityNode *node); Q_INVOKABLE void removeNode(QActivityNode *node); - Q_INVOKABLE const QSet<QOutputPin *> *structuredNodeOutputs() const; + Q_INVOKABLE const QSet<QOutputPin *> &structuredNodeOutputs() const; Q_INVOKABLE void addStructuredNodeOutput(QOutputPin *structuredNodeOutput); Q_INVOKABLE void removeStructuredNodeOutput(QOutputPin *structuredNodeOutput); - Q_INVOKABLE const QSet<QActivityEdge *> *edges() const; + Q_INVOKABLE const QSet<QActivityEdge *> &edges() const; Q_INVOKABLE void addEdge(QActivityEdge *edge); Q_INVOKABLE void removeEdge(QActivityEdge *edge); - Q_INVOKABLE const QSet<QVariable *> *variables() const; + Q_INVOKABLE const QSet<QVariable *> &variables() const; Q_INVOKABLE void addVariable(QVariable *variable); Q_INVOKABLE void removeVariable(QVariable *variable); Q_INVOKABLE QActivity *activity() const; Q_INVOKABLE void setActivity(QActivity *activity); - virtual void registerMetaTypes() const; protected: explicit QStructuredActivityNode(QStructuredActivityNodePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -216,10 +215,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *) - QT_END_HEADER #endif // QTUML_QSTRUCTUREDACTIVITYNODE_H diff --git a/src/uml/qstructuredactivitynode_p.h b/src/uml/qstructuredactivitynode_p.h index 9e46fe05..b3f93f45 100644 --- a/src/uml/qstructuredactivitynode_p.h +++ b/src/uml/qstructuredactivitynode_p.h @@ -77,11 +77,11 @@ public: virtual ~QStructuredActivityNodePrivate(); bool mustIsolate; - QSet<QInputPin *> *structuredNodeInputs; - QSet<QActivityNode *> *nodes; - QSet<QOutputPin *> *structuredNodeOutputs; - QSet<QActivityEdge *> *edges; - QSet<QVariable *> *variables; + QSet<QInputPin *> structuredNodeInputs; + QSet<QActivityNode *> nodes; + QSet<QOutputPin *> structuredNodeOutputs; + QSet<QActivityEdge *> edges; + QSet<QVariable *> variables; QActivity *activity; }; diff --git a/src/uml/qstructuredclassifier.cpp b/src/uml/qstructuredclassifier.cpp index 54c31639..63526bca 100644 --- a/src/uml/qstructuredclassifier.cpp +++ b/src/uml/qstructuredclassifier.cpp @@ -48,26 +48,20 @@ QT_BEGIN_NAMESPACE_QTUML -QStructuredClassifierPrivate::QStructuredClassifierPrivate() : - roles(new QSet<QConnectableElement *>), - ownedAttributes(new QList<QProperty *>), - ownedConnectors(new QSet<QConnector *>) +QStructuredClassifierPrivate::QStructuredClassifierPrivate() { } QStructuredClassifierPrivate::~QStructuredClassifierPrivate() { - delete roles; - delete ownedAttributes; - delete ownedConnectors; } void QStructuredClassifierPrivate::addRole(QConnectableElement *role) { // This is a read-only derived-union association end - if (!this->roles->contains(role)) { - this->roles->insert(role); + if (!this->roles.contains(role)) { + this->roles.insert(role); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(role)); @@ -78,8 +72,8 @@ void QStructuredClassifierPrivate::removeRole(QConnectableElement *role) { // This is a read-only derived-union association end - if (this->roles->contains(role)) { - this->roles->remove(role); + if (this->roles.contains(role)) { + this->roles.remove(role); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(role)); @@ -115,7 +109,7 @@ QStructuredClassifier::~QStructuredClassifier() /*! References the roles that instances may play in this classifier. */ -const QSet<QConnectableElement *> *QStructuredClassifier::roles() const +const QSet<QConnectableElement *> &QStructuredClassifier::roles() const { // This is a read-only derived-union association end @@ -126,7 +120,7 @@ const QSet<QConnectableElement *> *QStructuredClassifier::roles() const /*! References the properties owned by the classifier. */ -const QList<QProperty *> *QStructuredClassifier::ownedAttributes() const +const QList<QProperty *> &QStructuredClassifier::ownedAttributes() const { // This is a read-write association end @@ -139,8 +133,8 @@ void QStructuredClassifier::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QStructuredClassifier); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -154,8 +148,8 @@ void QStructuredClassifier::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QStructuredClassifier); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -167,19 +161,19 @@ void QStructuredClassifier::removeOwnedAttribute(QProperty *ownedAttribute) /*! References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true. */ -const QSet<QProperty *> *QStructuredClassifier::parts() const +const QSet<QProperty *> &QStructuredClassifier::parts() const { // This is a read-only derived association end qWarning("QStructuredClassifier::parts: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QProperty *>); // change here to your derived return } /*! References the connectors owned by the classifier. */ -const QSet<QConnector *> *QStructuredClassifier::ownedConnectors() const +const QSet<QConnector *> &QStructuredClassifier::ownedConnectors() const { // This is a read-write association end @@ -192,8 +186,8 @@ void QStructuredClassifier::addOwnedConnector(QConnector *ownedConnector) // This is a read-write association end Q_D(QStructuredClassifier); - if (!d->ownedConnectors->contains(ownedConnector)) { - d->ownedConnectors->insert(ownedConnector); + if (!d->ownedConnectors.contains(ownedConnector)) { + d->ownedConnectors.insert(ownedConnector); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedConnector)); @@ -206,8 +200,8 @@ void QStructuredClassifier::removeOwnedConnector(QConnector *ownedConnector) // This is a read-write association end Q_D(QStructuredClassifier); - if (d->ownedConnectors->contains(ownedConnector)) { - d->ownedConnectors->remove(ownedConnector); + if (d->ownedConnectors.contains(ownedConnector)) { + d->ownedConnectors.remove(ownedConnector); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedConnector)); @@ -215,42 +209,6 @@ void QStructuredClassifier::removeOwnedConnector(QConnector *ownedConnector) } } -void QStructuredClassifier::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *> *"); - qRegisterMetaType<QStructuredClassifier *>("QStructuredClassifier *"); - qRegisterMetaType<const QSet<QStructuredClassifier *> *>("const QSet<QStructuredClassifier *> *"); - qRegisterMetaType<const QList<QStructuredClassifier *> *>("const QList<QStructuredClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QProperty) *>("QT_PREPEND_NAMESPACE_QTUML(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnector) *>("QT_PREPEND_NAMESPACE_QTUML(QConnector) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnector) *> *"); - qRegisterMetaType<QConnector *>("QConnector *"); - qRegisterMetaType<const QSet<QConnector *> *>("const QSet<QConnector *> *"); - qRegisterMetaType<const QList<QConnector *> *>("const QList<QConnector *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConnectableElement) *> *"); - qRegisterMetaType<QConnectableElement *>("QConnectableElement *"); - qRegisterMetaType<const QSet<QConnectableElement *> *>("const QSet<QConnectableElement *> *"); - qRegisterMetaType<const QList<QConnectableElement *> *>("const QList<QConnectableElement *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstructuredclassifier.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qstructuredclassifier.h b/src/uml/qstructuredclassifier.h index cd7dd28b..5f59d7ba 100644 --- a/src/uml/qstructuredclassifier.h +++ b/src/uml/qstructuredclassifier.h @@ -67,10 +67,10 @@ class Q_UML_EXPORT QStructuredClassifier : public QClassifier { Q_OBJECT - Q_PROPERTY(const QSet<QConnectableElement *> * roles READ roles) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) - Q_PROPERTY(const QSet<QProperty *> * parts READ parts STORED false) - Q_PROPERTY(const QSet<QConnector *> * ownedConnectors READ ownedConnectors) + 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_DISABLE_COPY(QStructuredClassifier) Q_DECLARE_PRIVATE(QStructuredClassifier) @@ -80,15 +80,14 @@ public: virtual ~QStructuredClassifier(); // Association ends from QStructuredClassifier - Q_INVOKABLE const QSet<QConnectableElement *> *roles() const; - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QSet<QConnectableElement *> &roles() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - Q_INVOKABLE const QSet<QProperty *> *parts() const; - Q_INVOKABLE const QSet<QConnector *> *ownedConnectors() const; + Q_INVOKABLE const QSet<QProperty *> &parts() const; + Q_INVOKABLE const QSet<QConnector *> &ownedConnectors() const; Q_INVOKABLE void addOwnedConnector(QConnector *ownedConnector); Q_INVOKABLE void removeOwnedConnector(QConnector *ownedConnector); - virtual void registerMetaTypes() const; protected: explicit QStructuredClassifier(QStructuredClassifierPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -96,10 +95,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredClassifier) *> *) - QT_END_HEADER #endif // QTUML_QSTRUCTUREDCLASSIFIER_H diff --git a/src/uml/qstructuredclassifier_p.h b/src/uml/qstructuredclassifier_p.h index 5f8ce9aa..8c532311 100644 --- a/src/uml/qstructuredclassifier_p.h +++ b/src/uml/qstructuredclassifier_p.h @@ -69,9 +69,9 @@ public: explicit QStructuredClassifierPrivate(); virtual ~QStructuredClassifierPrivate(); - QSet<QConnectableElement *> *roles; - QList<QProperty *> *ownedAttributes; - QSet<QConnector *> *ownedConnectors; + QSet<QConnectableElement *> roles; + QList<QProperty *> ownedAttributes; + QSet<QConnector *> ownedConnectors; // Internal functions for read-only subsetted association ends void addRole(QConnectableElement *role); diff --git a/src/uml/qsubstitution.cpp b/src/uml/qsubstitution.cpp index 34840409..b4bd7fc1 100644 --- a/src/uml/qsubstitution.cpp +++ b/src/uml/qsubstitution.cpp @@ -149,28 +149,6 @@ void QSubstitution::setSubstitutingClassifier(QClassifier *substitutingClassifie } } -void QSubstitution::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *>("QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *"); - qRegisterMetaType<QSubstitution *>("QSubstitution *"); - qRegisterMetaType<const QSet<QSubstitution *> *>("const QSet<QSubstitution *> *"); - qRegisterMetaType<const QList<QSubstitution *> *>("const QList<QSubstitution *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QRealization::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - // Overriden methods for subsetted properties void QSubstitution::addSupplier(QWrappedObjectPointer<QClassifier> contract) diff --git a/src/uml/qsubstitution.h b/src/uml/qsubstitution.h index 2e7c9a79..1778e3fc 100644 --- a/src/uml/qsubstitution.h +++ b/src/uml/qsubstitution.h @@ -85,7 +85,6 @@ public: Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QClassifier> contract); Q_INVOKABLE void addClient(QWrappedObjectPointer<QClassifier> substitutingClassifier); Q_INVOKABLE void removeClient(QWrappedObjectPointer<QClassifier> substitutingClassifier); - virtual void registerMetaTypes() const; protected: explicit QSubstitution(QSubstitutionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QSubstitution) *> *) - QT_END_HEADER #endif // QTUML_QSUBSTITUTION_H diff --git a/src/uml/qtemplateableelement.cpp b/src/uml/qtemplateableelement.cpp index b6766455..23207db0 100644 --- a/src/uml/qtemplateableelement.cpp +++ b/src/uml/qtemplateableelement.cpp @@ -49,14 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML QTemplateableElementPrivate::QTemplateableElementPrivate() : - ownedTemplateSignature(0), - templateBindings(new QSet<QTemplateBinding *>) + ownedTemplateSignature(0) { } QTemplateableElementPrivate::~QTemplateableElementPrivate() { - delete templateBindings; } /*! @@ -122,7 +120,7 @@ void QTemplateableElement::setOwnedTemplateSignature(QTemplateSignature *ownedTe /*! The optional bindings from this element to templates. */ -const QSet<QTemplateBinding *> *QTemplateableElement::templateBindings() const +const QSet<QTemplateBinding *> &QTemplateableElement::templateBindings() const { // This is a read-write association end @@ -135,8 +133,8 @@ void QTemplateableElement::addTemplateBinding(QTemplateBinding *templateBinding) // This is a read-write association end Q_D(QTemplateableElement); - if (!d->templateBindings->contains(templateBinding)) { - d->templateBindings->insert(templateBinding); + if (!d->templateBindings.contains(templateBinding)) { + d->templateBindings.insert(templateBinding); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(templateBinding)); @@ -151,8 +149,8 @@ void QTemplateableElement::removeTemplateBinding(QTemplateBinding *templateBindi // This is a read-write association end Q_D(QTemplateableElement); - if (d->templateBindings->contains(templateBinding)) { - d->templateBindings->remove(templateBinding); + if (d->templateBindings.contains(templateBinding)) { + d->templateBindings.remove(templateBinding); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(templateBinding)); @@ -175,47 +173,11 @@ bool QTemplateableElement::isTemplate() const /*! The query parameterableElements() returns the set of elements that may be used as the parametered elements for a template parameter of this templateable element. By default, this set includes all the owned elements. Subclasses may override this operation if they choose to restrict the set of parameterable elements. */ -const QSet<QParameterableElement *> *QTemplateableElement::parameterableElements() const +const QSet<QParameterableElement *> &QTemplateableElement::parameterableElements() const { qWarning("QTemplateableElement::parameterableElements: operation to be implemented"); - return 0; // change here to your derived return -} - -void QTemplateableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *"); - qRegisterMetaType<QTemplateableElement *>("QTemplateableElement *"); - qRegisterMetaType<const QSet<QTemplateableElement *> *>("const QSet<QTemplateableElement *> *"); - qRegisterMetaType<const QList<QTemplateableElement *> *>("const QList<QTemplateableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *"); - qRegisterMetaType<const QSet<QTemplateSignature *> *>("const QSet<QTemplateSignature *> *"); - qRegisterMetaType<const QList<QTemplateSignature *> *>("const QList<QTemplateSignature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *"); - qRegisterMetaType<QTemplateBinding *>("QTemplateBinding *"); - qRegisterMetaType<const QSet<QTemplateBinding *> *>("const QSet<QTemplateBinding *> *"); - qRegisterMetaType<const QList<QTemplateBinding *> *>("const QList<QTemplateBinding *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<QParameterableElement *>("QParameterableElement *"); - qRegisterMetaType<const QSet<QParameterableElement *> *>("const QSet<QParameterableElement *> *"); - qRegisterMetaType<const QList<QParameterableElement *> *>("const QList<QParameterableElement *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QParameterableElement *>); // change here to your derived return } #include "moc_qtemplateableelement.cpp" diff --git a/src/uml/qtemplateableelement.h b/src/uml/qtemplateableelement.h index a4d30894..3d261ba8 100644 --- a/src/uml/qtemplateableelement.h +++ b/src/uml/qtemplateableelement.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QTemplateableElement : public QElement Q_OBJECT Q_PROPERTY(QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(const QSet<QTemplateBinding *> * templateBindings READ templateBindings) + Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) Q_DISABLE_COPY(QTemplateableElement) Q_DECLARE_PRIVATE(QTemplateableElement) @@ -79,14 +79,13 @@ public: // Association ends from QTemplateableElement Q_INVOKABLE QTemplateSignature *ownedTemplateSignature() const; Q_INVOKABLE void setOwnedTemplateSignature(QTemplateSignature *ownedTemplateSignature); - Q_INVOKABLE const QSet<QTemplateBinding *> *templateBindings() const; + Q_INVOKABLE const QSet<QTemplateBinding *> &templateBindings() const; Q_INVOKABLE void addTemplateBinding(QTemplateBinding *templateBinding); Q_INVOKABLE void removeTemplateBinding(QTemplateBinding *templateBinding); // Operations Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE const QSet<QParameterableElement *> *parameterableElements() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QParameterableElement *> ¶meterableElements() const; protected: explicit QTemplateableElement(QTemplateableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *) - QT_END_HEADER #endif // QTUML_QTEMPLATEABLEELEMENT_H diff --git a/src/uml/qtemplateableelement_p.h b/src/uml/qtemplateableelement_p.h index a681e01d..a532d7e2 100644 --- a/src/uml/qtemplateableelement_p.h +++ b/src/uml/qtemplateableelement_p.h @@ -69,7 +69,7 @@ public: virtual ~QTemplateableElementPrivate(); QTemplateSignature *ownedTemplateSignature; - QSet<QTemplateBinding *> *templateBindings; + QSet<QTemplateBinding *> templateBindings; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplatebinding.cpp b/src/uml/qtemplatebinding.cpp index b85f8438..3a054c92 100644 --- a/src/uml/qtemplatebinding.cpp +++ b/src/uml/qtemplatebinding.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QTemplateBindingPrivate::QTemplateBindingPrivate() : signature(0), - boundElement(0), - parameterSubstitutions(new QSet<QTemplateParameterSubstitution *>) + boundElement(0) { } QTemplateBindingPrivate::~QTemplateBindingPrivate() { - delete parameterSubstitutions; } /*! @@ -156,7 +154,7 @@ void QTemplateBinding::setBoundElement(QTemplateableElement *boundElement) /*! The parameter substitutions owned by this template binding. */ -const QSet<QTemplateParameterSubstitution *> *QTemplateBinding::parameterSubstitutions() const +const QSet<QTemplateParameterSubstitution *> &QTemplateBinding::parameterSubstitutions() const { // This is a read-write association end @@ -169,8 +167,8 @@ void QTemplateBinding::addParameterSubstitution(QTemplateParameterSubstitution * // This is a read-write association end Q_D(QTemplateBinding); - if (!d->parameterSubstitutions->contains(parameterSubstitution)) { - d->parameterSubstitutions->insert(parameterSubstitution); + if (!d->parameterSubstitutions.contains(parameterSubstitution)) { + d->parameterSubstitutions.insert(parameterSubstitution); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(parameterSubstitution)); @@ -185,8 +183,8 @@ void QTemplateBinding::removeParameterSubstitution(QTemplateParameterSubstitutio // This is a read-write association end Q_D(QTemplateBinding); - if (d->parameterSubstitutions->contains(parameterSubstitution)) { - d->parameterSubstitutions->remove(parameterSubstitution); + if (d->parameterSubstitutions.contains(parameterSubstitution)) { + d->parameterSubstitutions.remove(parameterSubstitution); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(parameterSubstitution)); @@ -196,42 +194,6 @@ void QTemplateBinding::removeParameterSubstitution(QTemplateParameterSubstitutio } } -void QTemplateBinding::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *"); - qRegisterMetaType<QTemplateBinding *>("QTemplateBinding *"); - qRegisterMetaType<const QSet<QTemplateBinding *> *>("const QSet<QTemplateBinding *> *"); - qRegisterMetaType<const QList<QTemplateBinding *> *>("const QList<QTemplateBinding *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *"); - qRegisterMetaType<QTemplateableElement *>("QTemplateableElement *"); - qRegisterMetaType<const QSet<QTemplateableElement *> *>("const QSet<QTemplateableElement *> *"); - qRegisterMetaType<const QList<QTemplateableElement *> *>("const QList<QTemplateableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *"); - qRegisterMetaType<QTemplateParameterSubstitution *>("QTemplateParameterSubstitution *"); - qRegisterMetaType<const QSet<QTemplateParameterSubstitution *> *>("const QSet<QTemplateParameterSubstitution *> *"); - qRegisterMetaType<const QList<QTemplateParameterSubstitution *> *>("const QList<QTemplateParameterSubstitution *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *"); - qRegisterMetaType<const QSet<QTemplateSignature *> *>("const QSet<QTemplateSignature *> *"); - qRegisterMetaType<const QList<QTemplateSignature *> *>("const QList<QTemplateSignature *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtemplatebinding.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplatebinding.h b/src/uml/qtemplatebinding.h index 231aa314..8d1c536b 100644 --- a/src/uml/qtemplatebinding.h +++ b/src/uml/qtemplatebinding.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QTemplateBinding : public QDirectedRelationship Q_PROPERTY(QTemplateSignature * signature READ signature WRITE setSignature) Q_PROPERTY(QTemplateableElement * boundElement READ boundElement WRITE setBoundElement) - Q_PROPERTY(const QSet<QTemplateParameterSubstitution *> * parameterSubstitutions READ parameterSubstitutions) + Q_PROPERTY(QSet<QTemplateParameterSubstitution *> parameterSubstitutions READ parameterSubstitutions) Q_DISABLE_COPY(QTemplateBinding) Q_DECLARE_PRIVATE(QTemplateBinding) @@ -82,10 +82,9 @@ public: Q_INVOKABLE void setSignature(QTemplateSignature *signature); Q_INVOKABLE QTemplateableElement *boundElement() const; Q_INVOKABLE void setBoundElement(QTemplateableElement *boundElement); - Q_INVOKABLE const QSet<QTemplateParameterSubstitution *> *parameterSubstitutions() const; + Q_INVOKABLE const QSet<QTemplateParameterSubstitution *> ¶meterSubstitutions() const; Q_INVOKABLE void addParameterSubstitution(QTemplateParameterSubstitution *parameterSubstitution); Q_INVOKABLE void removeParameterSubstitution(QTemplateParameterSubstitution *parameterSubstitution); - virtual void registerMetaTypes() const; protected: explicit QTemplateBinding(QTemplateBindingPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *) - QT_END_HEADER #endif // QTUML_QTEMPLATEBINDING_H diff --git a/src/uml/qtemplatebinding_p.h b/src/uml/qtemplatebinding_p.h index fa4c79b4..2c1ef0ae 100644 --- a/src/uml/qtemplatebinding_p.h +++ b/src/uml/qtemplatebinding_p.h @@ -71,7 +71,7 @@ public: QTemplateSignature *signature; QTemplateableElement *boundElement; - QSet<QTemplateParameterSubstitution *> *parameterSubstitutions; + QSet<QTemplateParameterSubstitution *> parameterSubstitutions; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplateparameter.cpp b/src/uml/qtemplateparameter.cpp index dee40ca9..a175cdda 100644 --- a/src/uml/qtemplateparameter.cpp +++ b/src/uml/qtemplateparameter.cpp @@ -230,35 +230,6 @@ void QTemplateParameter::setSignature(QTemplateSignature *signature) } } -void QTemplateParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *"); - qRegisterMetaType<const QSet<QTemplateParameter *> *>("const QSet<QTemplateParameter *> *"); - qRegisterMetaType<const QList<QTemplateParameter *> *>("const QList<QTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<QParameterableElement *>("QParameterableElement *"); - qRegisterMetaType<const QSet<QParameterableElement *> *>("const QSet<QParameterableElement *> *"); - qRegisterMetaType<const QList<QParameterableElement *> *>("const QList<QParameterableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *"); - qRegisterMetaType<const QSet<QTemplateSignature *> *>("const QSet<QTemplateSignature *> *"); - qRegisterMetaType<const QList<QTemplateSignature *> *>("const QList<QTemplateSignature *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtemplateparameter.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplateparameter.h b/src/uml/qtemplateparameter.h index 840d9215..d94eaf56 100644 --- a/src/uml/qtemplateparameter.h +++ b/src/uml/qtemplateparameter.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void setOwnedDefault(QParameterableElement *ownedDefault); Q_INVOKABLE QTemplateSignature *signature() const; Q_INVOKABLE void setSignature(QTemplateSignature *signature); - virtual void registerMetaTypes() const; protected: explicit QTemplateParameter(QTemplateParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *) - QT_END_HEADER #endif // QTUML_QTEMPLATEPARAMETER_H diff --git a/src/uml/qtemplateparametersubstitution.cpp b/src/uml/qtemplateparametersubstitution.cpp index bf0f56aa..eb93df7a 100644 --- a/src/uml/qtemplateparametersubstitution.cpp +++ b/src/uml/qtemplateparametersubstitution.cpp @@ -190,42 +190,6 @@ void QTemplateParameterSubstitution::setTemplateBinding(QTemplateBinding *templa } } -void QTemplateParameterSubstitution::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *"); - qRegisterMetaType<QTemplateParameterSubstitution *>("QTemplateParameterSubstitution *"); - qRegisterMetaType<const QSet<QTemplateParameterSubstitution *> *>("const QSet<QTemplateParameterSubstitution *> *"); - qRegisterMetaType<const QList<QTemplateParameterSubstitution *> *>("const QList<QTemplateParameterSubstitution *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<QParameterableElement *>("QParameterableElement *"); - qRegisterMetaType<const QSet<QParameterableElement *> *>("const QSet<QParameterableElement *> *"); - qRegisterMetaType<const QList<QParameterableElement *> *>("const QList<QParameterableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *"); - qRegisterMetaType<const QSet<QTemplateParameter *> *>("const QSet<QTemplateParameter *> *"); - qRegisterMetaType<const QList<QTemplateParameter *> *>("const QList<QTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateBinding) *> *"); - qRegisterMetaType<QTemplateBinding *>("QTemplateBinding *"); - qRegisterMetaType<const QSet<QTemplateBinding *> *>("const QSet<QTemplateBinding *> *"); - qRegisterMetaType<const QList<QTemplateBinding *> *>("const QList<QTemplateBinding *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtemplateparametersubstitution.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplateparametersubstitution.h b/src/uml/qtemplateparametersubstitution.h index 8f7159de..f42fde87 100644 --- a/src/uml/qtemplateparametersubstitution.h +++ b/src/uml/qtemplateparametersubstitution.h @@ -84,7 +84,6 @@ public: Q_INVOKABLE void setActual(QParameterableElement *actual); Q_INVOKABLE QTemplateBinding *templateBinding() const; Q_INVOKABLE void setTemplateBinding(QTemplateBinding *templateBinding); - virtual void registerMetaTypes() const; protected: explicit QTemplateParameterSubstitution(QTemplateParameterSubstitutionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameterSubstitution) *> *) - QT_END_HEADER #endif // QTUML_QTEMPLATEPARAMETERSUBSTITUTION_H diff --git a/src/uml/qtemplatesignature.cpp b/src/uml/qtemplatesignature.cpp index c6ee45b9..856f3b6c 100644 --- a/src/uml/qtemplatesignature.cpp +++ b/src/uml/qtemplatesignature.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QTemplateSignaturePrivate::QTemplateSignaturePrivate() : - parameters(new QList<QTemplateParameter *>), - template_(0), - ownedParameters(new QList<QTemplateParameter *>) + template_(0) { } QTemplateSignaturePrivate::~QTemplateSignaturePrivate() { - delete parameters; - delete ownedParameters; } /*! @@ -89,7 +85,7 @@ QTemplateSignature::~QTemplateSignature() /*! The ordered set of all formal template parameters for this template signature. */ -const QList<QTemplateParameter *> *QTemplateSignature::parameters() const +const QList<QTemplateParameter *> &QTemplateSignature::parameters() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QTemplateSignature::addParameter(QTemplateParameter *parameter) // This is a read-write association end Q_D(QTemplateSignature); - if (!d->parameters->contains(parameter)) { - d->parameters->append(parameter); + if (!d->parameters.contains(parameter)) { + d->parameters.append(parameter); } } @@ -112,8 +108,8 @@ void QTemplateSignature::removeParameter(QTemplateParameter *parameter) // This is a read-write association end Q_D(QTemplateSignature); - if (d->parameters->contains(parameter)) { - d->parameters->removeAll(parameter); + if (d->parameters.contains(parameter)) { + d->parameters.removeAll(parameter); } } @@ -149,7 +145,7 @@ void QTemplateSignature::setTemplate_(QTemplateableElement *template_) /*! The formal template parameters that are owned by this template signature. */ -const QList<QTemplateParameter *> *QTemplateSignature::ownedParameters() const +const QList<QTemplateParameter *> &QTemplateSignature::ownedParameters() const { // This is a read-write association end @@ -162,8 +158,8 @@ void QTemplateSignature::addOwnedParameter(QTemplateParameter *ownedParameter) // This is a read-write association end Q_D(QTemplateSignature); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QTemplateSignature *>(this))->addParameter(qwrappedobject_cast<QTemplateParameter *>(ownedParameter)); @@ -179,8 +175,8 @@ void QTemplateSignature::removeOwnedParameter(QTemplateParameter *ownedParameter // This is a read-write association end Q_D(QTemplateSignature); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QTemplateSignature *>(this))->removeParameter(qwrappedobject_cast<QTemplateParameter *>(ownedParameter)); @@ -191,35 +187,6 @@ void QTemplateSignature::removeOwnedParameter(QTemplateParameter *ownedParameter } } -void QTemplateSignature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *"); - qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *"); - qRegisterMetaType<const QSet<QTemplateSignature *> *>("const QSet<QTemplateSignature *> *"); - qRegisterMetaType<const QList<QTemplateSignature *> *>("const QList<QTemplateSignature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateParameter) *> *"); - qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *"); - qRegisterMetaType<const QSet<QTemplateParameter *> *>("const QSet<QTemplateParameter *> *"); - qRegisterMetaType<const QList<QTemplateParameter *> *>("const QList<QTemplateParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateableElement) *> *"); - qRegisterMetaType<QTemplateableElement *>("QTemplateableElement *"); - qRegisterMetaType<const QSet<QTemplateableElement *> *>("const QSet<QTemplateableElement *> *"); - qRegisterMetaType<const QList<QTemplateableElement *> *>("const QList<QTemplateableElement *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtemplatesignature.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtemplatesignature.h b/src/uml/qtemplatesignature.h index 272ab650..a7f9e8e4 100644 --- a/src/uml/qtemplatesignature.h +++ b/src/uml/qtemplatesignature.h @@ -65,9 +65,9 @@ class Q_UML_EXPORT QTemplateSignature : public QElement { Q_OBJECT - Q_PROPERTY(const QList<QTemplateParameter *> * parameters READ parameters) + Q_PROPERTY(QList<QTemplateParameter *> parameters READ parameters) Q_PROPERTY(QTemplateableElement * template_ READ template_ WRITE setTemplate_) - Q_PROPERTY(const QList<QTemplateParameter *> * ownedParameters READ ownedParameters) + Q_PROPERTY(QList<QTemplateParameter *> ownedParameters READ ownedParameters) Q_DISABLE_COPY(QTemplateSignature) Q_DECLARE_PRIVATE(QTemplateSignature) @@ -77,15 +77,14 @@ public: virtual ~QTemplateSignature(); // Association ends from QTemplateSignature - Q_INVOKABLE const QList<QTemplateParameter *> *parameters() const; + Q_INVOKABLE const QList<QTemplateParameter *> ¶meters() const; Q_INVOKABLE void addParameter(QTemplateParameter *parameter); Q_INVOKABLE void removeParameter(QTemplateParameter *parameter); Q_INVOKABLE QTemplateableElement *template_() const; Q_INVOKABLE void setTemplate_(QTemplateableElement *template_); - Q_INVOKABLE const QList<QTemplateParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QTemplateParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QTemplateParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QTemplateParameter *ownedParameter); - virtual void registerMetaTypes() const; protected: explicit QTemplateSignature(QTemplateSignaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTemplateSignature) *> *) - QT_END_HEADER #endif // QTUML_QTEMPLATESIGNATURE_H diff --git a/src/uml/qtemplatesignature_p.h b/src/uml/qtemplatesignature_p.h index 780f8cd6..2d88303c 100644 --- a/src/uml/qtemplatesignature_p.h +++ b/src/uml/qtemplatesignature_p.h @@ -68,9 +68,9 @@ public: explicit QTemplateSignaturePrivate(); virtual ~QTemplateSignaturePrivate(); - QList<QTemplateParameter *> *parameters; + QList<QTemplateParameter *> parameters; QTemplateableElement *template_; - QList<QTemplateParameter *> *ownedParameters; + QList<QTemplateParameter *> ownedParameters; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtestidentityaction.cpp b/src/uml/qtestidentityaction.cpp index 97b2d837..1c4336c8 100644 --- a/src/uml/qtestidentityaction.cpp +++ b/src/uml/qtestidentityaction.cpp @@ -171,35 +171,6 @@ void QTestIdentityAction::setFirst(QInputPin *first) } } -void QTestIdentityAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *>("QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *> *"); - qRegisterMetaType<QTestIdentityAction *>("QTestIdentityAction *"); - qRegisterMetaType<const QSet<QTestIdentityAction *> *>("const QSet<QTestIdentityAction *> *"); - qRegisterMetaType<const QList<QTestIdentityAction *> *>("const QList<QTestIdentityAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtestidentityaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtestidentityaction.h b/src/uml/qtestidentityaction.h index 24b7719a..1f2cd2b3 100644 --- a/src/uml/qtestidentityaction.h +++ b/src/uml/qtestidentityaction.h @@ -80,7 +80,6 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); Q_INVOKABLE QInputPin *first() const; Q_INVOKABLE void setFirst(QInputPin *first); - virtual void registerMetaTypes() const; protected: explicit QTestIdentityAction(QTestIdentityActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTestIdentityAction) *> *) - QT_END_HEADER #endif // QTUML_QTESTIDENTITYACTION_H diff --git a/src/uml/qtimeconstraint.cpp b/src/uml/qtimeconstraint.cpp index 3a7bf6b6..adeef02d 100644 --- a/src/uml/qtimeconstraint.cpp +++ b/src/uml/qtimeconstraint.cpp @@ -134,28 +134,6 @@ void QTimeConstraint::setSpecification(QTimeInterval *specification) } } -void QTimeConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *> *"); - qRegisterMetaType<QTimeConstraint *>("QTimeConstraint *"); - qRegisterMetaType<const QSet<QTimeConstraint *> *>("const QSet<QTimeConstraint *> *"); - qRegisterMetaType<const QList<QTimeConstraint *> *>("const QList<QTimeConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *"); - qRegisterMetaType<QTimeInterval *>("QTimeInterval *"); - qRegisterMetaType<const QSet<QTimeInterval *> *>("const QSet<QTimeInterval *> *"); - qRegisterMetaType<const QList<QTimeInterval *> *>("const QList<QTimeInterval *> *"); - - QIntervalConstraint::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtimeconstraint.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeconstraint.h b/src/uml/qtimeconstraint.h index bf2aecd6..85f65d81 100644 --- a/src/uml/qtimeconstraint.h +++ b/src/uml/qtimeconstraint.h @@ -79,7 +79,6 @@ public: // Association ends from QTimeConstraint Q_INVOKABLE QTimeInterval *specification() const; Q_INVOKABLE void setSpecification(QTimeInterval *specification); - virtual void registerMetaTypes() const; protected: explicit QTimeConstraint(QTimeConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeConstraint) *> *) - QT_END_HEADER #endif // QTUML_QTIMECONSTRAINT_H diff --git a/src/uml/qtimeevent.cpp b/src/uml/qtimeevent.cpp index 3b276704..1894a816 100644 --- a/src/uml/qtimeevent.cpp +++ b/src/uml/qtimeevent.cpp @@ -141,28 +141,6 @@ void QTimeEvent::setWhen(QTimeExpression *when) } } -void QTimeEvent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *> *"); - qRegisterMetaType<QTimeEvent *>("QTimeEvent *"); - qRegisterMetaType<const QSet<QTimeEvent *> *>("const QSet<QTimeEvent *> *"); - qRegisterMetaType<const QList<QTimeEvent *> *>("const QList<QTimeEvent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *"); - qRegisterMetaType<QTimeExpression *>("QTimeExpression *"); - qRegisterMetaType<const QSet<QTimeExpression *> *>("const QSet<QTimeExpression *> *"); - qRegisterMetaType<const QList<QTimeExpression *> *>("const QList<QTimeExpression *> *"); - - QEvent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtimeevent.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeevent.h b/src/uml/qtimeevent.h index 004759c1..ce00de7b 100644 --- a/src/uml/qtimeevent.h +++ b/src/uml/qtimeevent.h @@ -79,7 +79,6 @@ public: // Association ends from QTimeEvent Q_INVOKABLE QTimeExpression *when() const; Q_INVOKABLE void setWhen(QTimeExpression *when); - virtual void registerMetaTypes() const; protected: explicit QTimeEvent(QTimeEventPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeEvent) *> *) - QT_END_HEADER #endif // QTUML_QTIMEEVENT_H diff --git a/src/uml/qtimeexpression.cpp b/src/uml/qtimeexpression.cpp index 3e37415d..92bdfdc6 100644 --- a/src/uml/qtimeexpression.cpp +++ b/src/uml/qtimeexpression.cpp @@ -47,14 +47,12 @@ QT_BEGIN_NAMESPACE_QTUML QTimeExpressionPrivate::QTimeExpressionPrivate() : - observations(new QSet<QObservation *>), expr(0) { } QTimeExpressionPrivate::~QTimeExpressionPrivate() { - delete observations; } /*! @@ -86,7 +84,7 @@ QTimeExpression::~QTimeExpression() /*! Refers to the time and duration observations that are involved in expr. */ -const QSet<QObservation *> *QTimeExpression::observations() const +const QSet<QObservation *> &QTimeExpression::observations() const { // This is a read-write association end @@ -99,8 +97,8 @@ void QTimeExpression::addObservation(QObservation *observation) // This is a read-write association end Q_D(QTimeExpression); - if (!d->observations->contains(observation)) { - d->observations->insert(observation); + if (!d->observations.contains(observation)) { + d->observations.insert(observation); } } @@ -109,8 +107,8 @@ void QTimeExpression::removeObservation(QObservation *observation) // This is a read-write association end Q_D(QTimeExpression); - if (d->observations->contains(observation)) { - d->observations->remove(observation); + if (d->observations.contains(observation)) { + d->observations.remove(observation); } } @@ -143,28 +141,6 @@ void QTimeExpression::setExpr(QValueSpecification *expr) } } -void QTimeExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *"); - qRegisterMetaType<QTimeExpression *>("QTimeExpression *"); - qRegisterMetaType<const QSet<QTimeExpression *> *>("const QSet<QTimeExpression *> *"); - qRegisterMetaType<const QList<QTimeExpression *> *>("const QList<QTimeExpression *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QObservation) *>("QT_PREPEND_NAMESPACE_QTUML(QObservation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QObservation) *> *"); - qRegisterMetaType<QObservation *>("QObservation *"); - qRegisterMetaType<const QSet<QObservation *> *>("const QSet<QObservation *> *"); - qRegisterMetaType<const QList<QObservation *> *>("const QList<QObservation *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtimeexpression.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeexpression.h b/src/uml/qtimeexpression.h index ac078fcd..4e3ea1b6 100644 --- a/src/uml/qtimeexpression.h +++ b/src/uml/qtimeexpression.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QTimeExpression : public QValueSpecification { Q_OBJECT - Q_PROPERTY(const QSet<QObservation *> * observations READ observations) + Q_PROPERTY(QSet<QObservation *> observations READ observations) Q_PROPERTY(QValueSpecification * expr READ expr WRITE setExpr) Q_DISABLE_COPY(QTimeExpression) @@ -75,12 +75,11 @@ public: virtual ~QTimeExpression(); // Association ends from QTimeExpression - Q_INVOKABLE const QSet<QObservation *> *observations() const; + Q_INVOKABLE const QSet<QObservation *> &observations() const; Q_INVOKABLE void addObservation(QObservation *observation); Q_INVOKABLE void removeObservation(QObservation *observation); Q_INVOKABLE QValueSpecification *expr() const; Q_INVOKABLE void setExpr(QValueSpecification *expr); - virtual void registerMetaTypes() const; protected: explicit QTimeExpression(QTimeExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *) - QT_END_HEADER #endif // QTUML_QTIMEEXPRESSION_H diff --git a/src/uml/qtimeexpression_p.h b/src/uml/qtimeexpression_p.h index 7a5c446e..5050a980 100644 --- a/src/uml/qtimeexpression_p.h +++ b/src/uml/qtimeexpression_p.h @@ -67,7 +67,7 @@ public: explicit QTimeExpressionPrivate(); virtual ~QTimeExpressionPrivate(); - QSet<QObservation *> *observations; + QSet<QObservation *> observations; QValueSpecification *expr; }; diff --git a/src/uml/qtimeinterval.cpp b/src/uml/qtimeinterval.cpp index 55623945..dcf95c11 100644 --- a/src/uml/qtimeinterval.cpp +++ b/src/uml/qtimeinterval.cpp @@ -124,28 +124,6 @@ void QTimeInterval::setMin(QTimeExpression *min) } } -void QTimeInterval::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *"); - qRegisterMetaType<QTimeInterval *>("QTimeInterval *"); - qRegisterMetaType<const QSet<QTimeInterval *> *>("const QSet<QTimeInterval *> *"); - qRegisterMetaType<const QList<QTimeInterval *> *>("const QList<QTimeInterval *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeExpression) *> *"); - qRegisterMetaType<QTimeExpression *>("QTimeExpression *"); - qRegisterMetaType<const QSet<QTimeExpression *> *>("const QSet<QTimeExpression *> *"); - qRegisterMetaType<const QList<QTimeExpression *> *>("const QList<QTimeExpression *> *"); - - QInterval::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtimeinterval.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeinterval.h b/src/uml/qtimeinterval.h index 9d456ee5..6934597c 100644 --- a/src/uml/qtimeinterval.h +++ b/src/uml/qtimeinterval.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setMax(QTimeExpression *max); Q_INVOKABLE QTimeExpression *min() const; Q_INVOKABLE void setMin(QTimeExpression *min); - virtual void registerMetaTypes() const; protected: explicit QTimeInterval(QTimeIntervalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeInterval) *> *) - QT_END_HEADER #endif // QTUML_QTIMEINTERVAL_H diff --git a/src/uml/qtimeobservation.cpp b/src/uml/qtimeobservation.cpp index 8e1dfb60..f36dd372 100644 --- a/src/uml/qtimeobservation.cpp +++ b/src/uml/qtimeobservation.cpp @@ -133,28 +133,6 @@ void QTimeObservation::setEvent(QNamedElement *event) } } -void QTimeObservation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *>("QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *> *"); - qRegisterMetaType<QTimeObservation *>("QTimeObservation *"); - qRegisterMetaType<const QSet<QTimeObservation *> *>("const QSet<QTimeObservation *> *"); - qRegisterMetaType<const QList<QTimeObservation *> *>("const QList<QTimeObservation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QObservation::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtimeobservation.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtimeobservation.h b/src/uml/qtimeobservation.h index f581a035..34b66162 100644 --- a/src/uml/qtimeobservation.h +++ b/src/uml/qtimeobservation.h @@ -79,7 +79,6 @@ public: // Association ends from QTimeObservation Q_INVOKABLE QNamedElement *event() const; Q_INVOKABLE void setEvent(QNamedElement *event); - virtual void registerMetaTypes() const; protected: explicit QTimeObservation(QTimeObservationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -87,10 +86,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTimeObservation) *> *) - QT_END_HEADER #endif // QTUML_QTIMEOBSERVATION_H diff --git a/src/uml/qtransition.cpp b/src/uml/qtransition.cpp index 36ef49c6..7753162b 100644 --- a/src/uml/qtransition.cpp +++ b/src/uml/qtransition.cpp @@ -61,14 +61,12 @@ QTransitionPrivate::QTransitionPrivate() : effect(0), container(0), redefinedTransition(0), - source(0), - triggers(new QSet<QTrigger *>) + source(0) { } QTransitionPrivate::~QTransitionPrivate() { - delete triggers; } /*! @@ -104,7 +102,7 @@ QTransition::~QTransition() /*! The Elements owned by this element. */ -const QSet<QElement *> *QTransition::ownedElements() const +const QSet<QElement *> &QTransition::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -120,7 +118,7 @@ QElement *QTransition::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QTransition::ownedComments() const +const QSet<QComment *> &QTransition::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -201,7 +199,7 @@ QNamespace *QTransition::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QTransition::clientDependencies() const +const QSet<QDependency *> &QTransition::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -245,7 +243,7 @@ void QTransition::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QTransition::redefinedElements() const +const QSet<QRedefinableElement *> &QTransition::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -257,7 +255,7 @@ const QSet<QRedefinableElement *> *QTransition::redefinedElements() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QTransition::packageImports() const +const QSet<QPackageImport *> &QTransition::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -275,7 +273,7 @@ void QTransition::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QTransition::members() const +const QSet<QNamedElement *> &QTransition::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -283,7 +281,7 @@ const QSet<QNamedElement *> *QTransition::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QTransition::importedMembers() const +const QSet<QPackageableElement *> &QTransition::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -291,7 +289,7 @@ const QSet<QPackageableElement *> *QTransition::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QTransition::elementImports() const +const QSet<QElementImport *> &QTransition::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -309,7 +307,7 @@ void QTransition::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QTransition::ownedRules() const +const QSet<QConstraint *> &QTransition::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -327,7 +325,7 @@ void QTransition::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QTransition::ownedMembers() const +const QSet<QNamedElement *> &QTransition::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -558,7 +556,7 @@ void QTransition::setSource(QVertex *source) /*! Specifies the triggers that may fire the transition. */ -const QSet<QTrigger *> *QTransition::triggers() const +const QSet<QTrigger *> &QTransition::triggers() const { // This is a read-write association end @@ -571,8 +569,8 @@ void QTransition::addTrigger(QTrigger *trigger) // This is a read-write association end Q_D(QTransition); - if (!d->triggers->contains(trigger)) { - d->triggers->insert(trigger); + if (!d->triggers.contains(trigger)) { + d->triggers.insert(trigger); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(trigger)); @@ -584,8 +582,8 @@ void QTransition::removeTrigger(QTrigger *trigger) // This is a read-write association end Q_D(QTransition); - if (d->triggers->contains(trigger)) { - d->triggers->remove(trigger); + if (d->triggers.contains(trigger)) { + d->triggers.remove(trigger); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(trigger)); @@ -613,70 +611,6 @@ bool QTransition::isConsistentWith(const QRedefinableElement *redefinee) const return bool(); // change here to your derived return } -void QTransition::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTransition) *>("QT_PREPEND_NAMESPACE_QTUML(QTransition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *"); - qRegisterMetaType<QTransition *>("QTransition *"); - qRegisterMetaType<const QSet<QTransition *> *>("const QSet<QTransition *> *"); - qRegisterMetaType<const QList<QTransition *> *>("const QList<QTransition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *>("QT_PREPEND_NAMESPACE_QTUML(QTrigger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<QTrigger *>("QTrigger *"); - qRegisterMetaType<const QSet<QTrigger *> *>("const QSet<QTrigger *> *"); - qRegisterMetaType<const QList<QTrigger *> *>("const QList<QTrigger *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVertex) *>("QT_PREPEND_NAMESPACE_QTUML(QVertex) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *"); - qRegisterMetaType<QVertex *>("QVertex *"); - qRegisterMetaType<const QSet<QVertex *> *>("const QSet<QVertex *> *"); - qRegisterMetaType<const QList<QVertex *> *>("const QList<QVertex *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<QStateMachine *>("QStateMachine *"); - qRegisterMetaType<const QSet<QStateMachine *> *>("const QSet<QStateMachine *> *"); - qRegisterMetaType<const QList<QStateMachine *> *>("const QList<QStateMachine *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<QRegion *>("QRegion *"); - qRegisterMetaType<const QSet<QRegion *> *>("const QSet<QRegion *> *"); - qRegisterMetaType<const QList<QRegion *> *>("const QList<QRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *>("QT_PREPEND_NAMESPACE_QTUML(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *>("QT_PREPEND_NAMESPACE_QTUML(QBehavior) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QBehavior) *> *"); - qRegisterMetaType<QBehavior *>("QBehavior *"); - qRegisterMetaType<const QSet<QBehavior *> *>("const QSet<QBehavior *> *"); - qRegisterMetaType<const QList<QBehavior *> *>("const QList<QBehavior *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtransition.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtransition.h b/src/uml/qtransition.h index 37e74abf..622fe785 100644 --- a/src/uml/qtransition.h +++ b/src/uml/qtransition.h @@ -84,7 +84,7 @@ class Q_UML_EXPORT QTransition : public QWrappedObject 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(const QSet<QTrigger *> * triggers READ triggers) + Q_PROPERTY(QSet<QTrigger *> triggers READ triggers) Q_DISABLE_COPY(QTransition) Q_DECLARE_PRIVATE(QTransition) @@ -94,9 +94,9 @@ public: virtual ~QTransition(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -111,7 +111,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -121,21 +121,21 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from QTransition Q_INVOKABLE QtUml::TransitionKind kind() const; @@ -156,14 +156,13 @@ public: Q_INVOKABLE void setRedefinedTransition(QTransition *redefinedTransition); Q_INVOKABLE QVertex *source() const; Q_INVOKABLE void setSource(QVertex *source); - Q_INVOKABLE const QSet<QTrigger *> *triggers() const; + Q_INVOKABLE const QSet<QTrigger *> &triggers() const; Q_INVOKABLE void addTrigger(QTrigger *trigger); Q_INVOKABLE void removeTrigger(QTrigger *trigger); // Operations Q_INVOKABLE QStateMachine *containingStateMachine() const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; - virtual void registerMetaTypes() const; protected: explicit QTransition(QTransitionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -175,10 +174,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTransition) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *) - QT_END_HEADER #endif // QTUML_QTRANSITION_H diff --git a/src/uml/qtransition_p.h b/src/uml/qtransition_p.h index 96befeb9..4db43bac 100644 --- a/src/uml/qtransition_p.h +++ b/src/uml/qtransition_p.h @@ -86,7 +86,7 @@ public: QRegion *container; QTransition *redefinedTransition; QVertex *source; - QSet<QTrigger *> *triggers; + QSet<QTrigger *> triggers; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtrigger.cpp b/src/uml/qtrigger.cpp index f502de96..6a7b80d4 100644 --- a/src/uml/qtrigger.cpp +++ b/src/uml/qtrigger.cpp @@ -48,14 +48,12 @@ QT_BEGIN_NAMESPACE_QTUML QTriggerPrivate::QTriggerPrivate() : - ports(new QSet<QPort *>), event(0) { } QTriggerPrivate::~QTriggerPrivate() { - delete ports; } /*! @@ -87,7 +85,7 @@ QTrigger::~QTrigger() /*! A optional port of the receiver object on which the behavioral feature is invoked. */ -const QSet<QPort *> *QTrigger::ports() const +const QSet<QPort *> &QTrigger::ports() const { // This is a read-write association end @@ -100,8 +98,8 @@ void QTrigger::addPort(QPort *port) // This is a read-write association end Q_D(QTrigger); - if (!d->ports->contains(port)) { - d->ports->insert(port); + if (!d->ports.contains(port)) { + d->ports.insert(port); } } @@ -110,8 +108,8 @@ void QTrigger::removePort(QPort *port) // This is a read-write association end Q_D(QTrigger); - if (d->ports->contains(port)) { - d->ports->remove(port); + if (d->ports.contains(port)) { + d->ports.remove(port); } } @@ -136,35 +134,6 @@ void QTrigger::setEvent(QEvent *event) } } -void QTrigger::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *>("QT_PREPEND_NAMESPACE_QTUML(QTrigger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *"); - qRegisterMetaType<QTrigger *>("QTrigger *"); - qRegisterMetaType<const QSet<QTrigger *> *>("const QSet<QTrigger *> *"); - qRegisterMetaType<const QList<QTrigger *> *>("const QList<QTrigger *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QEvent) *>("QT_PREPEND_NAMESPACE_QTUML(QEvent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QEvent) *> *"); - qRegisterMetaType<QEvent *>("QEvent *"); - qRegisterMetaType<const QSet<QEvent *> *>("const QSet<QEvent *> *"); - qRegisterMetaType<const QList<QEvent *> *>("const QList<QEvent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPort) *>("QT_PREPEND_NAMESPACE_QTUML(QPort) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPort) *> *"); - qRegisterMetaType<QPort *>("QPort *"); - qRegisterMetaType<const QSet<QPort *> *>("const QSet<QPort *> *"); - qRegisterMetaType<const QList<QPort *> *>("const QList<QPort *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtrigger.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtrigger.h b/src/uml/qtrigger.h index f1d7367e..2ffb09b3 100644 --- a/src/uml/qtrigger.h +++ b/src/uml/qtrigger.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QTrigger : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QPort *> * ports READ ports) + Q_PROPERTY(QSet<QPort *> ports READ ports) Q_PROPERTY(QEvent * event READ event WRITE setEvent) Q_DISABLE_COPY(QTrigger) @@ -76,12 +76,11 @@ public: virtual ~QTrigger(); // Association ends from QTrigger - Q_INVOKABLE const QSet<QPort *> *ports() const; + Q_INVOKABLE const QSet<QPort *> &ports() const; Q_INVOKABLE void addPort(QPort *port); Q_INVOKABLE void removePort(QPort *port); Q_INVOKABLE QEvent *event() const; Q_INVOKABLE void setEvent(QEvent *event); - virtual void registerMetaTypes() const; protected: explicit QTrigger(QTriggerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTrigger) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTrigger) *> *) - QT_END_HEADER #endif // QTUML_QTRIGGER_H diff --git a/src/uml/qtrigger_p.h b/src/uml/qtrigger_p.h index 532b1756..ed694270 100644 --- a/src/uml/qtrigger_p.h +++ b/src/uml/qtrigger_p.h @@ -68,7 +68,7 @@ public: explicit QTriggerPrivate(); virtual ~QTriggerPrivate(); - QSet<QPort *> *ports; + QSet<QPort *> ports; QEvent *event; }; diff --git a/src/uml/qtype.cpp b/src/uml/qtype.cpp index 6bbaf1f3..4f593b51 100644 --- a/src/uml/qtype.cpp +++ b/src/uml/qtype.cpp @@ -124,28 +124,6 @@ bool QType::conformsTo(const QType *other) const return bool(); // change here to your derived return } -void QType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QPackage) *>("QT_PREPEND_NAMESPACE_QTUML(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtype.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtype.h b/src/uml/qtype.h index be350050..8ee20cdf 100644 --- a/src/uml/qtype.h +++ b/src/uml/qtype.h @@ -76,7 +76,6 @@ public: // Operations Q_INVOKABLE bool conformsTo(const QType *other) const; - virtual void registerMetaTypes() const; protected: explicit QType(QTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *) - QT_END_HEADER #endif // QTUML_QTYPE_H diff --git a/src/uml/qtypedelement.cpp b/src/uml/qtypedelement.cpp index d76a8f4b..a344aa15 100644 --- a/src/uml/qtypedelement.cpp +++ b/src/uml/qtypedelement.cpp @@ -102,28 +102,6 @@ void QTypedElement::setType(QType *type) } } -void QTypedElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *>("QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *> *"); - qRegisterMetaType<QTypedElement *>("QTypedElement *"); - qRegisterMetaType<const QSet<QTypedElement *> *>("const QSet<QTypedElement *> *"); - qRegisterMetaType<const QList<QTypedElement *> *>("const QList<QTypedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QType) *>("QT_PREPEND_NAMESPACE_QTUML(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtypedelement.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qtypedelement.h b/src/uml/qtypedelement.h index 9fb1d382..8ea62d8d 100644 --- a/src/uml/qtypedelement.h +++ b/src/uml/qtypedelement.h @@ -73,7 +73,6 @@ public: // Association ends from QTypedElement Q_INVOKABLE QType *type() const; Q_INVOKABLE void setType(QType *type); - virtual void registerMetaTypes() const; protected: explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QTypedElement) *> *) - QT_END_HEADER #endif // QTUML_QTYPEDELEMENT_H diff --git a/src/uml/qunmarshallaction.cpp b/src/uml/qunmarshallaction.cpp index 9058983c..2b50e778 100644 --- a/src/uml/qunmarshallaction.cpp +++ b/src/uml/qunmarshallaction.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTUML QUnmarshallActionPrivate::QUnmarshallActionPrivate() : object(0), - results(new QSet<QOutputPin *>), unmarshallType(0) { } QUnmarshallActionPrivate::~QUnmarshallActionPrivate() { - delete results; } /*! @@ -118,7 +116,7 @@ void QUnmarshallAction::setObject(QInputPin *object) /*! The values of the structural features of the input object. */ -const QSet<QOutputPin *> *QUnmarshallAction::results() const +const QSet<QOutputPin *> &QUnmarshallAction::results() const { // This is a read-write association end @@ -131,8 +129,8 @@ void QUnmarshallAction::addResult(QOutputPin *result) // This is a read-write association end Q_D(QUnmarshallAction); - if (!d->results->contains(result)) { - d->results->insert(result); + if (!d->results.contains(result)) { + d->results.insert(result); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->addOutput(qwrappedobject_cast<QOutputPin *>(result)); @@ -144,8 +142,8 @@ void QUnmarshallAction::removeResult(QOutputPin *result) // This is a read-write association end Q_D(QUnmarshallAction); - if (d->results->contains(result)) { - d->results->remove(result); + if (d->results.contains(result)) { + d->results.remove(result); // Adjust subsetted property(ies) (qwrappedobject_cast<QActionPrivate *>(d))->removeOutput(qwrappedobject_cast<QOutputPin *>(result)); @@ -173,42 +171,6 @@ void QUnmarshallAction::setUnmarshallType(QClassifier *unmarshallType) } } -void QUnmarshallAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *>("QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *> *"); - qRegisterMetaType<QUnmarshallAction *>("QUnmarshallAction *"); - qRegisterMetaType<const QSet<QUnmarshallAction *> *>("const QSet<QUnmarshallAction *> *"); - qRegisterMetaType<const QList<QUnmarshallAction *> *>("const QList<QUnmarshallAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qunmarshallaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qunmarshallaction.h b/src/uml/qunmarshallaction.h index ebc2e661..539ef788 100644 --- a/src/uml/qunmarshallaction.h +++ b/src/uml/qunmarshallaction.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QUnmarshallAction : public QAction Q_OBJECT Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(const QSet<QOutputPin *> * results READ results) + Q_PROPERTY(QSet<QOutputPin *> results READ results) Q_PROPERTY(QClassifier * unmarshallType READ unmarshallType WRITE setUnmarshallType) Q_DISABLE_COPY(QUnmarshallAction) @@ -80,12 +80,11 @@ public: // Association ends from QUnmarshallAction Q_INVOKABLE QInputPin *object() const; Q_INVOKABLE void setObject(QInputPin *object); - Q_INVOKABLE const QSet<QOutputPin *> *results() const; + Q_INVOKABLE const QSet<QOutputPin *> &results() const; Q_INVOKABLE void addResult(QOutputPin *result); Q_INVOKABLE void removeResult(QOutputPin *result); Q_INVOKABLE QClassifier *unmarshallType() const; Q_INVOKABLE void setUnmarshallType(QClassifier *unmarshallType); - virtual void registerMetaTypes() const; protected: explicit QUnmarshallAction(QUnmarshallActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QUnmarshallAction) *> *) - QT_END_HEADER #endif // QTUML_QUNMARSHALLACTION_H diff --git a/src/uml/qunmarshallaction_p.h b/src/uml/qunmarshallaction_p.h index 1802f31e..d24106ad 100644 --- a/src/uml/qunmarshallaction_p.h +++ b/src/uml/qunmarshallaction_p.h @@ -70,7 +70,7 @@ public: virtual ~QUnmarshallActionPrivate(); QInputPin *object; - QSet<QOutputPin *> *results; + QSet<QOutputPin *> results; QClassifier *unmarshallType; }; diff --git a/src/uml/qusage.cpp b/src/uml/qusage.cpp index 04d0ff22..b3e2c25d 100644 --- a/src/uml/qusage.cpp +++ b/src/uml/qusage.cpp @@ -74,21 +74,6 @@ QUsage::~QUsage() { } -void QUsage::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUsage) *>("QT_PREPEND_NAMESPACE_QTUML(QUsage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUsage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUsage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUsage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUsage) *> *"); - qRegisterMetaType<QUsage *>("QUsage *"); - qRegisterMetaType<const QSet<QUsage *> *>("const QSet<QUsage *> *"); - qRegisterMetaType<const QList<QUsage *> *>("const QList<QUsage *> *"); - - QDependency::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qusage.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qusage.h b/src/uml/qusage.h index 0af2d8b1..3f6a0300 100644 --- a/src/uml/qusage.h +++ b/src/uml/qusage.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QUsage : public QDependency public: Q_INVOKABLE explicit QUsage(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QUsage(); - virtual void registerMetaTypes() const; protected: explicit QUsage(QUsagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QUsage) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QUsage) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QUsage) *> *) - QT_END_HEADER #endif // QTUML_QUSAGE_H diff --git a/src/uml/qusecase.cpp b/src/uml/qusecase.cpp index 1b3de295..2de1f2c3 100644 --- a/src/uml/qusecase.cpp +++ b/src/uml/qusecase.cpp @@ -49,20 +49,12 @@ QT_BEGIN_NAMESPACE_QTUML -QUseCasePrivate::QUseCasePrivate() : - extensionPoints(new QSet<QExtensionPoint *>), - includes(new QSet<QInclude *>), - subjects(new QSet<QClassifier *>), - extends(new QSet<QExtend *>) +QUseCasePrivate::QUseCasePrivate() { } QUseCasePrivate::~QUseCasePrivate() { - delete extensionPoints; - delete includes; - delete subjects; - delete extends; } /*! @@ -94,7 +86,7 @@ QUseCase::~QUseCase() /*! References the ExtensionPoints owned by the use case. */ -const QSet<QExtensionPoint *> *QUseCase::extensionPoints() const +const QSet<QExtensionPoint *> &QUseCase::extensionPoints() const { // This is a read-write association end @@ -107,8 +99,8 @@ void QUseCase::addExtensionPoint(QExtensionPoint *extensionPoint) // This is a read-write association end Q_D(QUseCase); - if (!d->extensionPoints->contains(extensionPoint)) { - d->extensionPoints->insert(extensionPoint); + if (!d->extensionPoints.contains(extensionPoint)) { + d->extensionPoints.insert(extensionPoint); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(extensionPoint)); @@ -123,8 +115,8 @@ void QUseCase::removeExtensionPoint(QExtensionPoint *extensionPoint) // This is a read-write association end Q_D(QUseCase); - if (d->extensionPoints->contains(extensionPoint)) { - d->extensionPoints->remove(extensionPoint); + if (d->extensionPoints.contains(extensionPoint)) { + d->extensionPoints.remove(extensionPoint); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(extensionPoint)); @@ -137,7 +129,7 @@ void QUseCase::removeExtensionPoint(QExtensionPoint *extensionPoint) /*! References the Include relationships owned by this use case. */ -const QSet<QInclude *> *QUseCase::includes() const +const QSet<QInclude *> &QUseCase::includes() const { // This is a read-write association end @@ -150,8 +142,8 @@ void QUseCase::addInclude(QInclude *include) // This is a read-write association end Q_D(QUseCase); - if (!d->includes->contains(include)) { - d->includes->insert(include); + if (!d->includes.contains(include)) { + d->includes.insert(include); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(include)); @@ -166,8 +158,8 @@ void QUseCase::removeInclude(QInclude *include) // This is a read-write association end Q_D(QUseCase); - if (d->includes->contains(include)) { - d->includes->remove(include); + if (d->includes.contains(include)) { + d->includes.remove(include); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(include)); @@ -180,7 +172,7 @@ void QUseCase::removeInclude(QInclude *include) /*! 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. */ -const QSet<QClassifier *> *QUseCase::subjects() const +const QSet<QClassifier *> &QUseCase::subjects() const { // This is a read-write association end @@ -193,8 +185,8 @@ void QUseCase::addSubject(QClassifier *subject) // This is a read-write association end Q_D(QUseCase); - if (!d->subjects->contains(subject)) { - d->subjects->insert(subject); + if (!d->subjects.contains(subject)) { + d->subjects.insert(subject); // Adjust opposite property subject->addUseCase(this); @@ -206,8 +198,8 @@ void QUseCase::removeSubject(QClassifier *subject) // This is a read-write association end Q_D(QUseCase); - if (d->subjects->contains(subject)) { - d->subjects->remove(subject); + if (d->subjects.contains(subject)) { + d->subjects.remove(subject); // Adjust opposite property if (subject) @@ -218,7 +210,7 @@ void QUseCase::removeSubject(QClassifier *subject) /*! References the Extend relationships owned by this use case. */ -const QSet<QExtend *> *QUseCase::extends() const +const QSet<QExtend *> &QUseCase::extends() const { // This is a read-write association end @@ -231,8 +223,8 @@ void QUseCase::addExtend(QExtend *extend) // This is a read-write association end Q_D(QUseCase); - if (!d->extends->contains(extend)) { - d->extends->insert(extend); + if (!d->extends.contains(extend)) { + d->extends.insert(extend); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(extend)); @@ -247,8 +239,8 @@ void QUseCase::removeExtend(QExtend *extend) // This is a read-write association end Q_D(QUseCase); - if (d->extends->contains(extend)) { - d->extends->remove(extend); + if (d->extends.contains(extend)) { + d->extends.remove(extend); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(extend)); @@ -261,54 +253,11 @@ void QUseCase::removeExtend(QExtend *extend) /*! The query allIncludedUseCases() returns the transitive closure of all use cases (directly or indirectly) included by this use case. */ -const QSet<QUseCase *> *QUseCase::allIncludedUseCases() const +const QSet<QUseCase *> &QUseCase::allIncludedUseCases() const { qWarning("QUseCase::allIncludedUseCases: operation to be implemented"); - return 0; // change here to your derived return -} - -void QUseCase::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *>("QT_PREPEND_NAMESPACE_QTUML(QUseCase) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *"); - qRegisterMetaType<QUseCase *>("QUseCase *"); - qRegisterMetaType<const QSet<QUseCase *> *>("const QSet<QUseCase *> *"); - qRegisterMetaType<const QList<QUseCase *> *>("const QList<QUseCase *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *>("QT_PREPEND_NAMESPACE_QTUML(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInclude) *>("QT_PREPEND_NAMESPACE_QTUML(QInclude) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInclude) *> *"); - qRegisterMetaType<QInclude *>("QInclude *"); - qRegisterMetaType<const QSet<QInclude *> *>("const QSet<QInclude *> *"); - qRegisterMetaType<const QList<QInclude *> *>("const QList<QInclude *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtend) *>("QT_PREPEND_NAMESPACE_QTUML(QExtend) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtend) *> *"); - qRegisterMetaType<QExtend *>("QExtend *"); - qRegisterMetaType<const QSet<QExtend *> *>("const QSet<QExtend *> *"); - qRegisterMetaType<const QList<QExtend *> *>("const QList<QExtend *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *>("QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QExtensionPoint) *> *"); - qRegisterMetaType<QExtensionPoint *>("QExtensionPoint *"); - qRegisterMetaType<const QSet<QExtensionPoint *> *>("const QSet<QExtensionPoint *> *"); - qRegisterMetaType<const QList<QExtensionPoint *> *>("const QList<QExtensionPoint *> *"); - - QBehavioredClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QUseCase *>); // change here to your derived return } #include "moc_qusecase.cpp" diff --git a/src/uml/qusecase.h b/src/uml/qusecase.h index e08d68c9..6b8c074e 100644 --- a/src/uml/qusecase.h +++ b/src/uml/qusecase.h @@ -67,10 +67,10 @@ class Q_UML_EXPORT QUseCase : public QBehavioredClassifier { Q_OBJECT - Q_PROPERTY(const QSet<QExtensionPoint *> * extensionPoints READ extensionPoints) - Q_PROPERTY(const QSet<QInclude *> * includes READ includes) - Q_PROPERTY(const QSet<QClassifier *> * subjects READ subjects) - Q_PROPERTY(const QSet<QExtend *> * extends READ extends) + 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_DISABLE_COPY(QUseCase) Q_DECLARE_PRIVATE(QUseCase) @@ -80,22 +80,21 @@ public: virtual ~QUseCase(); // Association ends from QUseCase - Q_INVOKABLE const QSet<QExtensionPoint *> *extensionPoints() const; + Q_INVOKABLE const QSet<QExtensionPoint *> &extensionPoints() const; Q_INVOKABLE void addExtensionPoint(QExtensionPoint *extensionPoint); Q_INVOKABLE void removeExtensionPoint(QExtensionPoint *extensionPoint); - Q_INVOKABLE const QSet<QInclude *> *includes() const; + Q_INVOKABLE const QSet<QInclude *> &includes() const; Q_INVOKABLE void addInclude(QInclude *include); Q_INVOKABLE void removeInclude(QInclude *include); - Q_INVOKABLE const QSet<QClassifier *> *subjects() const; + Q_INVOKABLE const QSet<QClassifier *> &subjects() const; Q_INVOKABLE void addSubject(QClassifier *subject); Q_INVOKABLE void removeSubject(QClassifier *subject); - Q_INVOKABLE const QSet<QExtend *> *extends() const; + Q_INVOKABLE const QSet<QExtend *> &extends() const; Q_INVOKABLE void addExtend(QExtend *extend); Q_INVOKABLE void removeExtend(QExtend *extend); // Operations - Q_INVOKABLE const QSet<QUseCase *> *allIncludedUseCases() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QUseCase *> &allIncludedUseCases() const; protected: explicit QUseCase(QUseCasePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -103,10 +102,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QUseCase) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QUseCase) *> *) - QT_END_HEADER #endif // QTUML_QUSECASE_H diff --git a/src/uml/qusecase_p.h b/src/uml/qusecase_p.h index 68ade269..16fcdfe0 100644 --- a/src/uml/qusecase_p.h +++ b/src/uml/qusecase_p.h @@ -70,10 +70,10 @@ public: explicit QUseCasePrivate(); virtual ~QUseCasePrivate(); - QSet<QExtensionPoint *> *extensionPoints; - QSet<QInclude *> *includes; - QSet<QClassifier *> *subjects; - QSet<QExtend *> *extends; + QSet<QExtensionPoint *> extensionPoints; + QSet<QInclude *> includes; + QSet<QClassifier *> subjects; + QSet<QExtend *> extends; }; QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvaluepin.cpp b/src/uml/qvaluepin.cpp index 7a088c53..5eed6d8a 100644 --- a/src/uml/qvaluepin.cpp +++ b/src/uml/qvaluepin.cpp @@ -110,28 +110,6 @@ void QValuePin::setValue(QValueSpecification *value) } } -void QValuePin::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *>("QT_PREPEND_NAMESPACE_QTUML(QValuePin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *> *"); - qRegisterMetaType<QValuePin *>("QValuePin *"); - qRegisterMetaType<const QSet<QValuePin *> *>("const QSet<QValuePin *> *"); - qRegisterMetaType<const QList<QValuePin *> *>("const QList<QValuePin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QInputPin::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvaluepin.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvaluepin.h b/src/uml/qvaluepin.h index ae9aba70..68ce9f7b 100644 --- a/src/uml/qvaluepin.h +++ b/src/uml/qvaluepin.h @@ -73,7 +73,6 @@ public: // Association ends from QValuePin Q_INVOKABLE QValueSpecification *value() const; Q_INVOKABLE void setValue(QValueSpecification *value); - virtual void registerMetaTypes() const; protected: explicit QValuePin(QValuePinPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QValuePin) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QValuePin) *> *) - QT_END_HEADER #endif // QTUML_QVALUEPIN_H diff --git a/src/uml/qvaluespecification.cpp b/src/uml/qvaluespecification.cpp index 63e0ad11..c7fb5f9d 100644 --- a/src/uml/qvaluespecification.cpp +++ b/src/uml/qvaluespecification.cpp @@ -87,7 +87,7 @@ QValueSpecification::~QValueSpecification() /*! The Elements owned by this element. */ -const QSet<QElement *> *QValueSpecification::ownedElements() const +const QSet<QElement *> &QValueSpecification::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -103,7 +103,7 @@ QElement *QValueSpecification::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QValueSpecification::ownedComments() const +const QSet<QComment *> &QValueSpecification::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -171,7 +171,7 @@ QNamespace *QValueSpecification::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QValueSpecification::clientDependencies() const +const QSet<QDependency *> &QValueSpecification::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -336,28 +336,6 @@ qint32 QValueSpecification::unlimitedValue() const return qint32(); // change here to your derived return } -void QValueSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *>("QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QParameterableElement) *> *"); - qRegisterMetaType<QParameterableElement *>("QParameterableElement *"); - qRegisterMetaType<const QSet<QParameterableElement *> *>("const QSet<QParameterableElement *> *"); - qRegisterMetaType<const QList<QParameterableElement *> *>("const QList<QParameterableElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvaluespecification.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvaluespecification.h b/src/uml/qvaluespecification.h index 55524601..f216e4a0 100644 --- a/src/uml/qvaluespecification.h +++ b/src/uml/qvaluespecification.h @@ -75,9 +75,9 @@ public: virtual ~QValueSpecification(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -90,7 +90,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -118,7 +118,6 @@ public: Q_INVOKABLE qreal realValue() const; Q_INVOKABLE QString stringValue() const; Q_INVOKABLE qint32 unlimitedValue() const; - virtual void registerMetaTypes() const; protected: explicit QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -130,10 +129,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *) - QT_END_HEADER #endif // QTUML_QVALUESPECIFICATION_H diff --git a/src/uml/qvaluespecificationaction.cpp b/src/uml/qvaluespecificationaction.cpp index 081a5be7..bfffd36a 100644 --- a/src/uml/qvaluespecificationaction.cpp +++ b/src/uml/qvaluespecificationaction.cpp @@ -141,35 +141,6 @@ void QValueSpecificationAction::setResult(QOutputPin *result) } } -void QValueSpecificationAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *> *"); - qRegisterMetaType<QValueSpecificationAction *>("QValueSpecificationAction *"); - qRegisterMetaType<const QSet<QValueSpecificationAction *> *>("const QSet<QValueSpecificationAction *> *"); - qRegisterMetaType<const QList<QValueSpecificationAction *> *>("const QList<QValueSpecificationAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvaluespecificationaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvaluespecificationaction.h b/src/uml/qvaluespecificationaction.h index aa66c2fb..6c283b4a 100644 --- a/src/uml/qvaluespecificationaction.h +++ b/src/uml/qvaluespecificationaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setValue(QValueSpecification *value); Q_INVOKABLE QOutputPin *result() const; Q_INVOKABLE void setResult(QOutputPin *result); - virtual void registerMetaTypes() const; protected: explicit QValueSpecificationAction(QValueSpecificationActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QValueSpecificationAction) *> *) - QT_END_HEADER #endif // QTUML_QVALUESPECIFICATIONACTION_H diff --git a/src/uml/qvariable.cpp b/src/uml/qvariable.cpp index fb51b017..19912b5c 100644 --- a/src/uml/qvariable.cpp +++ b/src/uml/qvariable.cpp @@ -91,7 +91,7 @@ QVariable::~QVariable() /*! The Elements owned by this element. */ -const QSet<QElement *> *QVariable::ownedElements() const +const QSet<QElement *> &QVariable::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -107,7 +107,7 @@ QElement *QVariable::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QVariable::ownedComments() const +const QSet<QComment *> &QVariable::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -289,7 +289,7 @@ QNamespace *QVariable::namespace_() const /*! Indicates the dependencies that reference the client. */ -const QSet<QDependency *> *QVariable::clientDependencies() const +const QSet<QDependency *> &QVariable::clientDependencies() const { return (qwrappedobject_cast<const QNamedElement *>(this))->clientDependencies(); } @@ -345,7 +345,7 @@ void QVariable::setOwningTemplateParameter(QTemplateParameter *owningTemplatePar /*! Denotes a set of connector ends that attaches to this connectable element. */ -const QList<QConnectorEnd *> *QVariable::ends() const +const QList<QConnectorEnd *> &QVariable::ends() const { return (qwrappedobject_cast<const QConnectableElement *>(this))->ends(); } @@ -442,42 +442,6 @@ bool QVariable::isAccessibleBy(const QAction *a) const return bool(); // change here to your derived return } -void QVariable::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVariable) *>("QT_PREPEND_NAMESPACE_QTUML(QVariable) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<QVariable *>("QVariable *"); - qRegisterMetaType<const QSet<QVariable *> *>("const QSet<QVariable *> *"); - qRegisterMetaType<const QList<QVariable *> *>("const QList<QVariable *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QActivity) *>("QT_PREPEND_NAMESPACE_QTUML(QActivity) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QActivity) *> *"); - qRegisterMetaType<QActivity *>("QActivity *"); - qRegisterMetaType<const QSet<QActivity *> *>("const QSet<QActivity *> *"); - qRegisterMetaType<const QList<QActivity *> *>("const QList<QActivity *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *>("QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStructuredActivityNode) *> *"); - qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *"); - qRegisterMetaType<const QSet<QStructuredActivityNode *> *>("const QSet<QStructuredActivityNode *> *"); - qRegisterMetaType<const QList<QStructuredActivityNode *> *>("const QList<QStructuredActivityNode *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QAction) *>("QT_PREPEND_NAMESPACE_QTUML(QAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QAction) *> *"); - qRegisterMetaType<QAction *>("QAction *"); - qRegisterMetaType<const QSet<QAction *> *>("const QSet<QAction *> *"); - qRegisterMetaType<const QList<QAction *> *>("const QList<QAction *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvariable.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvariable.h b/src/uml/qvariable.h index 8b9dcb10..5fbe1f41 100644 --- a/src/uml/qvariable.h +++ b/src/uml/qvariable.h @@ -77,9 +77,9 @@ public: virtual ~QVariable(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -113,7 +113,7 @@ public: Q_INVOKABLE QStringExpression *nameExpression() const; Q_INVOKABLE void setNameExpression(QStringExpression *nameExpression); Q_INVOKABLE QNamespace *namespace_() const; - Q_INVOKABLE const QSet<QDependency *> *clientDependencies() const; + Q_INVOKABLE const QSet<QDependency *> &clientDependencies() const; Q_INVOKABLE void addClientDependency(QDependency *clientDependency); Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); @@ -126,7 +126,7 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Association ends from aggregated QConnectableElement - Q_INVOKABLE const QList<QConnectorEnd *> *ends() const; + Q_INVOKABLE const QList<QConnectorEnd *> &ends() const; Q_INVOKABLE QConnectableElementTemplateParameter *templateParameter() const; Q_INVOKABLE void setTemplateParameter(QConnectableElementTemplateParameter *templateParameter); @@ -138,7 +138,6 @@ public: // Operations Q_INVOKABLE bool isAccessibleBy(const QAction *a) const; - virtual void registerMetaTypes() const; protected: explicit QVariable(QVariablePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -150,10 +149,6 @@ private: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QVariable) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *) - QT_END_HEADER #endif // QTUML_QVARIABLE_H diff --git a/src/uml/qvariableaction.cpp b/src/uml/qvariableaction.cpp index ae51524e..4a3b6bb9 100644 --- a/src/uml/qvariableaction.cpp +++ b/src/uml/qvariableaction.cpp @@ -102,28 +102,6 @@ void QVariableAction::setVariable(QVariable *variable) } } -void QVariableAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *>("QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *> *"); - qRegisterMetaType<QVariableAction *>("QVariableAction *"); - qRegisterMetaType<const QSet<QVariableAction *> *>("const QSet<QVariableAction *> *"); - qRegisterMetaType<const QList<QVariableAction *> *>("const QList<QVariableAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVariable) *>("QT_PREPEND_NAMESPACE_QTUML(QVariable) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVariable) *> *"); - qRegisterMetaType<QVariable *>("QVariable *"); - qRegisterMetaType<const QSet<QVariable *> *>("const QSet<QVariable *> *"); - qRegisterMetaType<const QList<QVariable *> *>("const QList<QVariable *> *"); - - QAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvariableaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvariableaction.h b/src/uml/qvariableaction.h index cdf0db56..3bce9ba2 100644 --- a/src/uml/qvariableaction.h +++ b/src/uml/qvariableaction.h @@ -73,7 +73,6 @@ public: // Association ends from QVariableAction Q_INVOKABLE QVariable *variable() const; Q_INVOKABLE void setVariable(QVariable *variable); - virtual void registerMetaTypes() const; protected: explicit QVariableAction(QVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QVariableAction) *> *) - QT_END_HEADER #endif // QTUML_QVARIABLEACTION_H diff --git a/src/uml/qvertex.cpp b/src/uml/qvertex.cpp index d6b8948a..a9ad1214 100644 --- a/src/uml/qvertex.cpp +++ b/src/uml/qvertex.cpp @@ -148,13 +148,13 @@ QVertex::~QVertex() /*! Specifies the transitions entering this vertex. */ -const QSet<QTransition *> *QVertex::incomings() const +const QSet<QTransition *> &QVertex::incomings() const { // This is a read-only derived association end qWarning("QVertex::incomings: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QTransition *>); // change here to your derived return } /*! @@ -192,13 +192,13 @@ void QVertex::setContainer(QRegion *container) /*! Specifies the transitions departing from this vertex. */ -const QSet<QTransition *> *QVertex::outgoings() const +const QSet<QTransition *> &QVertex::outgoings() const { // This is a read-only derived association end qWarning("QVertex::outgoings: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QTransition *>); // change here to your derived return } /*! @@ -211,42 +211,6 @@ QStateMachine *QVertex::containingStateMachine() const return 0; // change here to your derived return } -void QVertex::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QVertex) *>("QT_PREPEND_NAMESPACE_QTUML(QVertex) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *"); - qRegisterMetaType<QVertex *>("QVertex *"); - qRegisterMetaType<const QSet<QVertex *> *>("const QSet<QVertex *> *"); - qRegisterMetaType<const QList<QVertex *> *>("const QList<QVertex *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QRegion) *>("QT_PREPEND_NAMESPACE_QTUML(QRegion) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QRegion) *> *"); - qRegisterMetaType<QRegion *>("QRegion *"); - qRegisterMetaType<const QSet<QRegion *> *>("const QSet<QRegion *> *"); - qRegisterMetaType<const QList<QRegion *> *>("const QList<QRegion *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QTransition) *>("QT_PREPEND_NAMESPACE_QTUML(QTransition) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QTransition) *> *"); - qRegisterMetaType<QTransition *>("QTransition *"); - qRegisterMetaType<const QSet<QTransition *> *>("const QSet<QTransition *> *"); - qRegisterMetaType<const QList<QTransition *> *>("const QList<QTransition *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *>("QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QStateMachine) *> *"); - qRegisterMetaType<QStateMachine *>("QStateMachine *"); - qRegisterMetaType<const QSet<QStateMachine *> *>("const QSet<QStateMachine *> *"); - qRegisterMetaType<const QList<QStateMachine *> *>("const QList<QStateMachine *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvertex.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qvertex.h b/src/uml/qvertex.h index a4fa889f..fe07868b 100644 --- a/src/uml/qvertex.h +++ b/src/uml/qvertex.h @@ -66,9 +66,9 @@ class Q_UML_EXPORT QVertex : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QTransition *> * incomings READ incomings STORED false) + Q_PROPERTY(QSet<QTransition *> incomings READ incomings STORED false) Q_PROPERTY(QRegion * container READ container WRITE setContainer) - Q_PROPERTY(const QSet<QTransition *> * outgoings READ outgoings STORED false) + Q_PROPERTY(QSet<QTransition *> outgoings READ outgoings STORED false) Q_DISABLE_COPY(QVertex) Q_DECLARE_PRIVATE(QVertex) @@ -78,14 +78,13 @@ public: virtual ~QVertex(); // Association ends from QVertex - Q_INVOKABLE const QSet<QTransition *> *incomings() const; + Q_INVOKABLE const QSet<QTransition *> &incomings() const; Q_INVOKABLE QRegion *container() const; Q_INVOKABLE void setContainer(QRegion *container); - Q_INVOKABLE const QSet<QTransition *> *outgoings() const; + Q_INVOKABLE const QSet<QTransition *> &outgoings() const; // Operations Q_INVOKABLE QStateMachine *containingStateMachine() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QTransition; @@ -96,10 +95,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QVertex) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QVertex) *> *) - QT_END_HEADER #endif // QTUML_QVERTEX_H diff --git a/src/uml/qwritelinkaction.cpp b/src/uml/qwritelinkaction.cpp index c3feac31..b00e0c66 100644 --- a/src/uml/qwritelinkaction.cpp +++ b/src/uml/qwritelinkaction.cpp @@ -74,21 +74,6 @@ QWriteLinkAction::~QWriteLinkAction() { } -void QWriteLinkAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *>("QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *> *"); - qRegisterMetaType<QWriteLinkAction *>("QWriteLinkAction *"); - qRegisterMetaType<const QSet<QWriteLinkAction *> *>("const QSet<QWriteLinkAction *> *"); - qRegisterMetaType<const QList<QWriteLinkAction *> *>("const QList<QWriteLinkAction *> *"); - - QLinkAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qwritelinkaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qwritelinkaction.h b/src/uml/qwritelinkaction.h index 27573ac3..ba0b4684 100644 --- a/src/uml/qwritelinkaction.h +++ b/src/uml/qwritelinkaction.h @@ -64,7 +64,6 @@ class Q_UML_EXPORT QWriteLinkAction : public QLinkAction public: Q_INVOKABLE explicit QWriteLinkAction(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QWriteLinkAction(); - virtual void registerMetaTypes() const; protected: explicit QWriteLinkAction(QWriteLinkActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteLinkAction) *> *) - QT_END_HEADER #endif // QTUML_QWRITELINKACTION_H diff --git a/src/uml/qwritestructuralfeatureaction.cpp b/src/uml/qwritestructuralfeatureaction.cpp index 82aabae2..2d197d87 100644 --- a/src/uml/qwritestructuralfeatureaction.cpp +++ b/src/uml/qwritestructuralfeatureaction.cpp @@ -141,35 +141,6 @@ void QWriteStructuralFeatureAction::setValue(QInputPin *value) } } -void QWriteStructuralFeatureAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *>("QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *> *"); - qRegisterMetaType<QWriteStructuralFeatureAction *>("QWriteStructuralFeatureAction *"); - qRegisterMetaType<const QSet<QWriteStructuralFeatureAction *> *>("const QSet<QWriteStructuralFeatureAction *> *"); - qRegisterMetaType<const QList<QWriteStructuralFeatureAction *> *>("const QList<QWriteStructuralFeatureAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QOutputPin) *> *"); - qRegisterMetaType<QOutputPin *>("QOutputPin *"); - qRegisterMetaType<const QSet<QOutputPin *> *>("const QSet<QOutputPin *> *"); - qRegisterMetaType<const QList<QOutputPin *> *>("const QList<QOutputPin *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QStructuralFeatureAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qwritestructuralfeatureaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qwritestructuralfeatureaction.h b/src/uml/qwritestructuralfeatureaction.h index 89c09403..fdb5e9e3 100644 --- a/src/uml/qwritestructuralfeatureaction.h +++ b/src/uml/qwritestructuralfeatureaction.h @@ -77,7 +77,6 @@ public: Q_INVOKABLE void setResult(QOutputPin *result); Q_INVOKABLE QInputPin *value() const; Q_INVOKABLE void setValue(QInputPin *value); - virtual void registerMetaTypes() const; protected: explicit QWriteStructuralFeatureAction(QWriteStructuralFeatureActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteStructuralFeatureAction) *> *) - QT_END_HEADER #endif // QTUML_QWRITESTRUCTURALFEATUREACTION_H diff --git a/src/uml/qwritevariableaction.cpp b/src/uml/qwritevariableaction.cpp index dcf168cb..2850b27f 100644 --- a/src/uml/qwritevariableaction.cpp +++ b/src/uml/qwritevariableaction.cpp @@ -110,28 +110,6 @@ void QWriteVariableAction::setValue(QInputPin *value) } } -void QWriteVariableAction::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *>("QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *> *"); - qRegisterMetaType<QWriteVariableAction *>("QWriteVariableAction *"); - qRegisterMetaType<const QSet<QWriteVariableAction *> *>("const QSet<QWriteVariableAction *> *"); - qRegisterMetaType<const QList<QWriteVariableAction *> *>("const QList<QWriteVariableAction *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *>("QT_PREPEND_NAMESPACE_QTUML(QInputPin) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *>("const QList<QT_PREPEND_NAMESPACE_QTUML(QInputPin) *> *"); - qRegisterMetaType<QInputPin *>("QInputPin *"); - qRegisterMetaType<const QSet<QInputPin *> *>("const QSet<QInputPin *> *"); - qRegisterMetaType<const QList<QInputPin *> *>("const QList<QInputPin *> *"); - - QVariableAction::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qwritevariableaction.cpp" QT_END_NAMESPACE_QTUML diff --git a/src/uml/qwritevariableaction.h b/src/uml/qwritevariableaction.h index 4d5d5c33..de711ea1 100644 --- a/src/uml/qwritevariableaction.h +++ b/src/uml/qwritevariableaction.h @@ -73,7 +73,6 @@ public: // Association ends from QWriteVariableAction Q_INVOKABLE QInputPin *value() const; Q_INVOKABLE void setValue(QInputPin *value); - virtual void registerMetaTypes() const; protected: explicit QWriteVariableAction(QWriteVariableActionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QWriteVariableAction) *> *) - QT_END_HEADER #endif // QTUML_QWRITEVARIABLEACTION_H |