Updating examples and tests

Disabling plugins building by now

Change-Id: Idcdcca005520d585d74c579e6fa42dc76d42be8e
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

4 files changed, 37 insertions, 37 deletions

diff --git a/examples/uml/profiles/main.cpp b/examples/uml/profiles/main.cpp
index 6db5c52e..c08f7e16 100644
--- a/examples/uml/profiles/main.cpp
+++ b/examples/uml/profiles/main.cpp
@@ -38,8 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtWrappedObjects/QWrappedObjectPointer>
-
 #include <QtUml/QUmlPrimitiveType>
 #include <QtUml/QUmlProfile>
 #include <QtUml/QUmlProperty>
@@ -58,37 +56,37 @@ typedef const QSet<QUmlPackageableElement *> QUmlPackageableElementList;
 int main ()
 {
     // Create a "dymmy" UML meta-model
-    QWrappedObjectPointer<QUmlModel> umlModel = new QUmlModel;
+    QUmlModel *umlModel = new QUmlModel;
     umlModel->setName("UML Meta-Model");
-    QWrappedObjectPointer<QUmlClass> class_ = new QUmlClass;
+    QUmlClass *class_ = new QUmlClass;
     class_->setName("Class");
     umlModel->addOwnedType(class_);
 
     // Create a profile
-    QWrappedObjectPointer<QUmlProfile> profile = new QUmlProfile;
+    QUmlProfile *profile = new QUmlProfile;
     profile->setName("MyProfile");
 
     // Add a stereotype to profile
-    QWrappedObjectPointer<QUmlStereotype> stereotype = new QUmlStereotype;
+    QUmlStereotype *stereotype = new QUmlStereotype;
     stereotype->setName("MyStereotype");
     profile->addPackagedElement(stereotype);
 
     // Show profile's owned stereotypes
     qDebug() << "Owned stereotypes:";
-    foreach (QUmlStereotype *ownedStereotype, profile->ownedStereotypes())
+    foreach (QUmlStereotype *ownedStereotype, profile->ownedStereotype())
         qDebug() << "    " << ownedStereotype->name();
 
     // Adding attribute to stereotype
-    QWrappedObjectPointer<QUmlPrimitiveType> booleanPrimitiveType = new QUmlPrimitiveType;
+    QUmlPrimitiveType *booleanPrimitiveType = new QUmlPrimitiveType;
     booleanPrimitiveType->setName("boolean");
-    QWrappedObjectPointer<QUmlProperty> property = new QUmlProperty;
+    QUmlProperty *property = new QUmlProperty;
     property->setName("isTransient");
     property->setType(booleanPrimitiveType);
     stereotype->addOwnedAttribute(property);
 
     // Create UML meta-model element import
-    QWrappedObjectPointer<QUmlElementImport> elementImport = new QUmlElementImport;
-    elementImport->setImportedElement(umlModel->packagedElements().toList().first());
+    QUmlElementImport *elementImport = new QUmlElementImport;
+    elementImport->setImportedElement(umlModel->packagedElement().toList().first());
 
     // Add meta-class reference to profile
     profile->addMetaclassReference(elementImport);
@@ -96,24 +94,24 @@ int main ()
 
     // Show profile's data
     qDebug() << "Profile members:";
-    foreach (QUmlNamedElement *namedElement, profile->members())
+    foreach (QUmlNamedElement *namedElement, profile->member())
         qDebug() << "    " << namedElement->name();
     qDebug() << "Profile owned members:";
-    foreach (QUmlNamedElement *namedElement, profile->ownedMembers())
+    foreach (QUmlNamedElement *namedElement, profile->ownedMember())
         qDebug() << "    " << namedElement->name();
     qDebug() << "Profile imported members:";
-    foreach (QUmlPackageableElement *importedMember, profile->importedMembers())
+    foreach (QUmlPackageableElement *importedMember, profile->importedMember())
         qDebug() << "    " << importedMember->name();
 
     // Create extension
-    QWrappedObjectPointer<QUmlExtension> extension = new QUmlExtension;
+    QUmlExtension *extension = new QUmlExtension;
     extension->setName("class_stereotype");
 
-    QWrappedObjectPointer<QUmlProperty> stereotypeProperty = new QUmlProperty;
+    QUmlProperty *stereotypeProperty = new QUmlProperty;
     stereotypeProperty->setName("base_class");
     stereotypeProperty->setType(class_);
 
-    QWrappedObjectPointer<QUmlExtensionEnd> extensionEnd = new QUmlExtensionEnd;
+    QUmlExtensionEnd *extensionEnd = new QUmlExtensionEnd;
     extensionEnd->setName("extension_stereotype");
     extensionEnd->setType(stereotype);
 
@@ -123,8 +121,8 @@ int main ()
 
     stereotype->addOwnedAttribute(stereotypeProperty);
 
-    delete profile.data(); // That will delete all owned elements
-    delete umlModel.data(); // That will delete all owned elements
-    delete extension.data(); // That will delete all owned elements
+    delete profile; // That will delete all owned elements
+    delete umlModel; // That will delete all owned elements
+    delete extension; // That will delete all owned elements
 }
 
diff --git a/examples/uml/uml.pro b/examples/uml/uml.pro
index 3d9c7c43..fee7d63a 100644
--- a/examples/uml/uml.pro
+++ b/examples/uml/uml.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS = nested-packages profiles xmi-write xmi-read
+#SUBDIRS = nested-packages profiles xmi-write xmi-read
+SUBDIRS = nested-packages profiles
 qtHaveModule(widgets):qtHaveModule(quick):qtHaveModule(qml): SUBDIRS += duse-mt
diff --git a/src/src.pro b/src/src.pro
index b1bc4588..bff30b56 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,5 +3,6 @@ CONFIG  += ordered
 
 SUBDIRS = modeling wrappedobjects
 qtHaveModule(widgets): SUBDIRS += wrappedobjectswidgets
-qtHaveModule(qml): SUBDIRS += mof uml duse saduseprofile plugins
+#qtHaveModule(qml): SUBDIRS += mof uml duse saduseprofile plugins
+qtHaveModule(qml): SUBDIRS += mof uml duse saduseprofile
 qtHaveModule(quick): SUBDIRS += imports
diff --git a/tests/auto/qtumlcontainment/tst_qtumlcontainment.cpp b/tests/auto/qtumlcontainment/tst_qtumlcontainment.cpp
index 9a39fdc7..e31e40dc 100644
--- a/tests/auto/qtumlcontainment/tst_qtumlcontainment.cpp
+++ b/tests/auto/qtumlcontainment/tst_qtumlcontainment.cpp
@@ -54,20 +54,20 @@ private Q_SLOTS:
 private:
     void check(QString modelName, QString packageName, int modelSize, int packageSize);
 
-    QWrappedObjectPointer<QUmlModel> _model;
-    QWrappedObjectPointer<QUmlPackage> _package;
+    QUmlModel *_model;
+    QUmlPackage *_package;
 };
 
 void TestQtUmlContainment::check(QString modelName, QString packageName, int modelSize, int packageSize)
 {
     QCOMPARE(_model->qualifiedName(), modelName);
     QCOMPARE(_package->qualifiedName(), packageName);
-    QCOMPARE(_model->members().size(), modelSize);
-    QCOMPARE(_model->ownedMembers().size(), modelSize);
-    QCOMPARE(_model->ownedElements().size(), modelSize);
-    QCOMPARE(_package->members().size(), packageSize);
-    QCOMPARE(_package->ownedMembers().size(), packageSize);
-    QCOMPARE(_package->ownedElements().size(), packageSize);
+    QCOMPARE(_model->member().size(), modelSize);
+    QCOMPARE(_model->ownedMember().size(), modelSize);
+    QCOMPARE(_model->ownedElement().size(), modelSize);
+    QCOMPARE(_package->member().size(), packageSize);
+    QCOMPARE(_package->ownedMember().size(), packageSize);
+    QCOMPARE(_package->ownedElement().size(), packageSize);
 }
 
 void TestQtUmlContainment::qtumlcontainment()
@@ -100,15 +100,15 @@ void TestQtUmlContainment::qtumlcontainment()
     _model->removeNestedPackage(_package);
     check("Model", "Package", 0, 0);
 
-    QWrappedObjectPointer<QUmlComment> comment = new QUmlComment;
+    QUmlComment *comment = new QUmlComment;
     _package->addOwnedComment(comment);
-    QCOMPARE(_package->members().size(), 0);
-    QCOMPARE(_package->ownedMembers().size(), 0);
-    QCOMPARE(_package->ownedElements().size(), 1);
-    QCOMPARE(_package->ownedComments().size(), 1);
+    QCOMPARE(_package->member().size(), 0);
+    QCOMPARE(_package->ownedMember().size(), 0);
+    QCOMPARE(_package->ownedElement().size(), 1);
+    QCOMPARE(_package->ownedComment().size(), 1);
 
-    delete _model.data();
-    delete _package.data();
+    delete _model;
+    delete _package;
 }
 
 QTEST_MAIN(TestQtUmlContainment)