From 5ea015332a188943b393b7c8a2b0d5452529239e Mon Sep 17 00:00:00 2001 From: "Sandro S. Andrade" Date: Fri, 28 Dec 2012 16:48:58 -0300 Subject: Make use of new Qt5 properties facilities in QtUml/QtMof Change-Id: I1510b900fd3aebd34620dba873dd63939f5b4ca6 Reviewed-by: Sandro S. Andrade --- examples/uml/nested-packages/main.cpp | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'examples/uml/nested-packages') 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 nestedPackages (model->nestedPackages()); + QScopedPointer nestedPackages (&model->nestedPackages()); qDebug() << "model->nestedPackages()->size():" << nestedPackages->size(); - QScopedPointer ownedStereotypes (model->ownedStereotypes()); + QScopedPointer ownedStereotypes (&model->ownedStereotypes()); qDebug() << "model->ownedStereotypes()->size():" << ownedStereotypes->size(); - QScopedPointer ownedTypes (model->ownedTypes()); + QScopedPointer ownedTypes (&model->ownedTypes()); qDebug() << "model->ownedTypes()->size():" << ownedTypes->size(); checkProperties(model); @@ -105,19 +105,19 @@ int main () QWrappedObjectPointer 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); -- cgit v1.2.3