Fix xmi-write to work with new UML metamodel implementation

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

4 files changed, 17 insertions, 19 deletions

diff --git a/examples/uml/duse-mt/duse-mt.pro b/examples/uml/duse-mt/duse-mt.pro
index 14b4322b..44864a4a 100644
--- a/examples/uml/duse-mt/duse-mt.pro
+++ b/examples/uml/duse-mt/duse-mt.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT = wrappedobjectswidgets script quick quick-private qml duse
+QT = modelingwidgets script quick quick-private qml duse
 
 TARGET = duse-mt
 TEMPLATE = app
diff --git a/examples/uml/uml.pro b/examples/uml/uml.pro
index fee7d63a..3d9c7c43 100644
--- a/examples/uml/uml.pro
+++ b/examples/uml/uml.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
 
-#SUBDIRS = nested-packages profiles xmi-write xmi-read
-SUBDIRS = nested-packages profiles
+SUBDIRS = nested-packages profiles xmi-write xmi-read
 qtHaveModule(widgets):qtHaveModule(quick):qtHaveModule(qml): SUBDIRS += duse-mt
diff --git a/examples/uml/xmi-write/main.cpp b/examples/uml/xmi-write/main.cpp
index 95e36218..a1151b7b 100644
--- a/examples/uml/xmi-write/main.cpp
+++ b/examples/uml/xmi-write/main.cpp
@@ -38,43 +38,42 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtWrappedObjects/QXmiWriter>
-#include <QtWrappedObjects/QtWrappedObjects>
+#include <QtModeling/QXmiWriter>
 
 #include <QtUml/QtUml>
 
 int main ()
 {
-    QWrappedObjectPointer<QUmlPackage> model = new QUmlPackage;
+    QUmlPackage *model = new QUmlPackage;
     model->setName("MyRootPackage");
 
-    QWrappedObjectPointer<QUmlPackage> package = new QUmlPackage;
+    QUmlPackage *package = new QUmlPackage;
     package->setName("Package1");
 
-    QWrappedObjectPointer<QUmlPrimitiveType> primitiveType = new QUmlPrimitiveType;
+    QUmlPrimitiveType *primitiveType = new QUmlPrimitiveType;
     primitiveType->setName("String");
 
-    QWrappedObjectPointer<QUmlEnumeration> enumeration = new QUmlEnumeration;
+    QUmlEnumeration *enumeration = new QUmlEnumeration;
     enumeration->setName("DirectionKind");
-    QWrappedObjectPointer<QUmlEnumerationLiteral> directionIn = new QUmlEnumerationLiteral;
+    QUmlEnumerationLiteral *directionIn = new QUmlEnumerationLiteral;
     directionIn->setName("DirectionIn");
     enumeration->addOwnedLiteral(directionIn);
 
-    QWrappedObjectPointer<QUmlClass> class_ = new QUmlClass;
+    QUmlClass *class_ = new QUmlClass;
     class_->setName("Student");
     class_->setAbstract(false);
-    class_->setVisibility(QtUml::QtUml::VisibilityPackage);
+    class_->setVisibility(QtUml::VisibilityKindPackage);
 
-    QWrappedObjectPointer<QUmlProperty> property = new QUmlProperty;
+    QUmlProperty *property = new QUmlProperty;
     property->setName("name");
     property->setType(primitiveType);
     class_->addOwnedAttribute(property);
 
-    QWrappedObjectPointer<QUmlClass> class2_ = new QUmlClass;
+    QUmlClass *class2_ = new QUmlClass;
     class2_->setName("InterStudent");
 
-    QWrappedObjectPointer<QUmlGeneralization> generalization = new QUmlGeneralization;
-    generalization->setObjectName("generalization");
+    QUmlGeneralization *generalization = new QUmlGeneralization;
+    generalization->asQObject()->setObjectName("generalization");
     generalization->setGeneral(class_);
     class2_->addGeneralization(generalization);
 
@@ -92,13 +91,13 @@ int main ()
         return 1;
     }
 
-    QXmiWriter writer(model);
+    QXmiWriter writer(model->asQObject());
     if (writer.writeFile(&file))
         qDebug() << "XMI file saved !";
     else
         qDebug() << "Error when writing XMI file !";
     file.close();
 
-    delete package.data();
+    delete package;
 }
 
diff --git a/examples/uml/xmi-write/xmi-write.pro b/examples/uml/xmi-write/xmi-write.pro
index b70a25e6..4c9b3d44 100644
--- a/examples/uml/xmi-write/xmi-write.pro
+++ b/examples/uml/xmi-write/xmi-write.pro
@@ -3,7 +3,7 @@ TARGET = xmi-write
 DEPENDPATH += .
 INCLUDEPATH += .
 
-QT += uml mof
+QT += uml
 QT -= gui
 
 # Input