Add separate lib QtWrappedObjects, update QtMof and QtUml accordingly

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

6 files changed, 52 insertions, 50 deletions

diff --git a/examples/uml/editor/mainwindow.cpp b/examples/uml/editor/mainwindow.cpp
index 4ff0f732..b1caa7e1 100644
--- a/examples/uml/editor/mainwindow.cpp
+++ b/examples/uml/editor/mainwindow.cpp
@@ -1,7 +1,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
-#include <QtMof/QMofPointer>
+#include <QtWrappedObjects/QWrappedObjectPointer>
 
 #include <QtUml/QModel>
 #include <QtUml/QPrimitiveType>
@@ -20,7 +20,7 @@
 #include <QContextMenuEvent>
 
 using namespace QtUml;
-using QtMof::QMofPointer;
+using QtWrappedObjects::QWrappedObjectPointer;
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -40,22 +40,22 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->propertyEditor->setSelectionMode(QAbstractItemView::SingleSelection);
     ui->propertyEditor->setSelectionBehavior(QAbstractItemView::SelectRows);
 
-    QMofPointer<QModel> model = new QModel;
+    QWrappedObjectPointer<QModel> model = new QModel;
     model->setName("MyModel");
 
-    QMofPointer<QPackage> package = new QPackage;
+    QWrappedObjectPointer<QPackage> package = new QPackage;
     package->setName("Package1");
 
-    QMofPointer<QPrimitiveType> primitiveType = new QPrimitiveType;
+    QWrappedObjectPointer<QPrimitiveType> primitiveType = new QPrimitiveType;
     primitiveType->setName("String");
 
-    QMofPointer<QEnumeration> enumeration = new QEnumeration;
+    QWrappedObjectPointer<QEnumeration> enumeration = new QEnumeration;
     enumeration->setName("DirectionKind");
-    QMofPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral;
+    QWrappedObjectPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral;
     directionIn->setName("DirectionIn");
     enumeration->addOwnedLiteral(directionIn);
 
-    QMofPointer<QClass> class_ = new QClass;
+    QWrappedObjectPointer<QClass> class_ = new QClass;
     class_->setName("Student");
     class_->setAbstract(true);
     class_->setVisibility(QtUml::QtUml::VisibilityPackage);
@@ -111,7 +111,7 @@ void MainWindow::populateContextMenu(QMenu &menu, QObject *element)
     }
 }
 
-void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QMetaObject *metaObject, int level)
+void MainWindow::handleMetaObjectProperties(QtWrappedObjects::QWrappedObject *element, const QMetaObject *metaObject, int level)
 {
     if (metaObject->superClass() && !_visitedParents.contains(metaObject->superClass()->className()))
         handleMetaObjectProperties(element, metaObject->superClass(), level+1);
@@ -184,7 +184,7 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM
         if (property.type() == QVariant::String) {
             QObject *rootElement = element;
             if (QString(property.name()) == "objectName")
-                rootElement = qmofobject_cast<QObject *>(element);
+                rootElement = qwrappedobject_cast<QObject *>(element);
             item->setText(1, property.read(rootElement).toString());
         }
 
@@ -197,11 +197,11 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM
         }
 
         if (typeName.endsWith('*') && typeName.contains("QSet") && property.read(element).isValid()) {
-            if (QSet<QtMof::QMofObject *> *elements = reinterpret_cast<QSet<QtMof::QMofObject *> *>(*((QSet<QObject *> **) property.read(element).data()))) {
+            if (QSet<QtWrappedObjects::QWrappedObject *> *elements = reinterpret_cast<QSet<QtWrappedObjects::QWrappedObject *> *>(*((QSet<QObject *> **) property.read(element).data()))) {
                 if (elements->size() > 0) {
                     QString str = "[";
-                    foreach (QtMof::QMofObject *object, *elements)
-                        str.append((qmofobject_cast<QtMof::QMofObject *>(object))->objectName().append(", "));
+                    foreach (QtWrappedObjects::QWrappedObject *object, *elements)
+                        str.append((qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(object))->objectName().append(", "));
                     str.chop(2);
                     str.append("]");
                     item->setText(1, str);
@@ -212,11 +212,11 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM
         }
 
         if (typeName.endsWith('*') && typeName.contains("QList") && property.read(element).isValid()) {
-            if (QList<QtMof::QMofObject *> *elements = reinterpret_cast<QList<QtMof::QMofObject *> *>(*((QList<QObject *> **) property.read(element).data()))) {
+            if (QList<QtWrappedObjects::QWrappedObject *> *elements = reinterpret_cast<QList<QtWrappedObjects::QWrappedObject *> *>(*((QList<QObject *> **) property.read(element).data()))) {
                 if (elements->size() > 0) {
                     QString str = "[";
-                    foreach (QtMof::QMofObject *object, *elements)
-                        str.append((qmofobject_cast<QtMof::QMofObject *>(object))->objectName().append(", "));
+                    foreach (QtWrappedObjects::QWrappedObject *object, *elements)
+                        str.append((qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(object))->objectName().append(", "));
                     str.chop(2);
                     str.append("]");
                     item->setText(1, str);
@@ -231,10 +231,10 @@ void MainWindow::handleMetaObjectProperties(QtMof::QMofObject *element, const QM
     }
 }
 
-void MainWindow::handleObjectProperties(QtMof::QMofObject *element, int level)
+void MainWindow::handleObjectProperties(QtWrappedObjects::QWrappedObject *element, int level)
 {
     foreach (QObject *child, element->children())
-            handleObjectProperties(dynamic_cast<QtMof::QMofObject *>(child), level+1);
+            handleObjectProperties(dynamic_cast<QtWrappedObjects::QWrappedObject *>(child), level+1);
 
     handleMetaObjectProperties(element, element->metaObject(), level);
 }
@@ -247,7 +247,7 @@ void MainWindow::on_modelExplorer_currentItemChanged(QTreeWidgetItem *current, Q
         return;
 
     ui->propertyEditor->blockSignals(true);
-    QtMof::QMofObject *element = qmofobject_cast<QtMof::QMofObject *>(current->data(0, Qt::UserRole).value<QtMof::QMofObject *>());
+    QtWrappedObjects::QWrappedObject *element = qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(current->data(0, Qt::UserRole).value<QtWrappedObjects::QWrappedObject *>());
     ui->propertyEditor->clear();
 
     _visitedParents.clear();
@@ -284,7 +284,7 @@ void MainWindow::currentIndexChanged(int index)
     }
 }
 
-void MainWindow::populateModelExplorer(QtMof::QMofObject *element, QTreeWidgetItem *parent)
+void MainWindow::populateModelExplorer(QtWrappedObjects::QWrappedObject *element, QTreeWidgetItem *parent)
 {
     if (!element)
         return;
@@ -299,7 +299,7 @@ void MainWindow::populateModelExplorer(QtMof::QMofObject *element, QTreeWidgetIt
     if (!parent)
         ui->modelExplorer->addTopLevelItem(item);
 
-    if (QElement *umlElement = qmofobject_cast<QElement *>(element))
+    if (QElement *umlElement = qwrappedobject_cast<QElement *>(element))
         foreach (QElement *ownedElement, *umlElement->ownedElements())
             populateModelExplorer(ownedElement, item);
     ui->modelExplorer->blockSignals(false);
@@ -340,7 +340,7 @@ void MainWindow::handleAddMethod()
 
 void MainWindow::refreshModel()
 {
-    QtMof::QMofObject *rootElement = qmofobject_cast<QtMof::QMofObject *>(ui->modelExplorer->topLevelItem(0)->data(0, Qt::UserRole).value<QtMof::QMofObject *>());
+    QtWrappedObjects::QWrappedObject *rootElement = qwrappedobject_cast<QtWrappedObjects::QWrappedObject *>(ui->modelExplorer->topLevelItem(0)->data(0, Qt::UserRole).value<QtWrappedObjects::QWrappedObject *>());
     ui->modelExplorer->clear();
     populateModelExplorer(rootElement);
 }
diff --git a/examples/uml/editor/mainwindow.h b/examples/uml/editor/mainwindow.h
index 16c7d292..97daa481 100644
--- a/examples/uml/editor/mainwindow.h
+++ b/examples/uml/editor/mainwindow.h
@@ -8,8 +8,8 @@ namespace Ui {
     class MainWindow;
 }
 
-namespace QtMof {
-    class QMofObject;
+namespace QtWrappedObjects {
+    class QWrappedObject;
 }
 
 namespace QtUml {
@@ -33,7 +33,7 @@ private Q_SLOTS:
     void on_modelExplorer_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
     void on_propertyEditor_itemChanged(QTreeWidgetItem *item, int column);
     void currentIndexChanged(int index);
-    void populateModelExplorer(QtMof::QMofObject *element, QTreeWidgetItem *parent = 0);
+    void populateModelExplorer(QtWrappedObjects::QWrappedObject *element, QTreeWidgetItem *parent = 0);
     QTreeWidgetItem *parentItemForProperty(QString propertyGroup);
     void handleAddMethod();
     void refreshModel();
@@ -44,8 +44,8 @@ private:
     QMap< QString, QPair<int, QTreeWidgetItem *> > _visitedProperties;
     QMap< QString, QPair<QObject *, QMetaMethod> > _visitedAddMethods;
 
-    void handleObjectProperties(QtMof::QMofObject *element, int level = 0);
-    void handleMetaObjectProperties(QtMof::QMofObject *element, const QMetaObject *metaObject, int level = 0);
+    void handleObjectProperties(QtWrappedObjects::QWrappedObject *element, int level = 0);
+    void handleMetaObjectProperties(QtWrappedObjects::QWrappedObject *element, const QMetaObject *metaObject, int level = 0);
     void populateContextMenu(QMenu &menu, QObject *element);
 };
 
diff --git a/examples/uml/nested-packages/main.cpp b/examples/uml/nested-packages/main.cpp
index 157306a1..df53f456 100644
--- a/examples/uml/nested-packages/main.cpp
+++ b/examples/uml/nested-packages/main.cpp
@@ -1,4 +1,4 @@
-#include <QtMof/QMofPointer>
+#include <QtWrappedObjects/QWrappedObjectPointer>
 
 #include <QtUml/QModel>
 #include <QtUml/QPackage>
@@ -14,7 +14,7 @@
 #include <QtCore/QMetaProperty>
 
 using namespace QtUml;
-using QtMof::QMofPointer;
+using QtWrappedObjects::QWrappedObjectPointer;
 
 typedef const QSet<QPackage *> QPackageList;
 typedef const QSet<QStereotype *> QStereotypeList;
@@ -31,22 +31,22 @@ void checkProperties(QObject *object)
 
 int main ()
 {
-    QMofPointer<QModel> model = new QModel;
+    QWrappedObjectPointer<QModel> model = new QModel;
     model->setName("MyModel");
 
-    QMofPointer<QPackage> package = new QPackage;
+    QWrappedObjectPointer<QPackage> package = new QPackage;
     package->setName("Package1");
 
-    QMofPointer<QPrimitiveType> primitiveType = new QPrimitiveType;
+    QWrappedObjectPointer<QPrimitiveType> primitiveType = new QPrimitiveType;
     primitiveType->setName("String");
 
-    QMofPointer<QEnumeration> enumeration = new QEnumeration;
+    QWrappedObjectPointer<QEnumeration> enumeration = new QEnumeration;
     enumeration->setName("DirectionKind");
-    QMofPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral;
+    QWrappedObjectPointer<QEnumerationLiteral> directionIn = new QEnumerationLiteral;
     directionIn->setName("DirectionIn");
     enumeration->addOwnedLiteral(directionIn);
 
-    QMofPointer<QClass> class_ = new QClass;
+    QWrappedObjectPointer<QClass> class_ = new QClass;
     class_->setName("Student");
     class_->setAbstract(false);
 
@@ -100,9 +100,9 @@ int main ()
 
     checkProperties(model);
 
-    QMofPointer<QComponent> c1 = new QComponent;
-    QMofPointer<QComponent> c2 = new QComponent;
-    QMofPointer<QComponentRealization> cr = new QComponentRealization;
+    QWrappedObjectPointer<QComponent> c1 = new QComponent;
+    QWrappedObjectPointer<QComponent> c2 = new QComponent;
+    QWrappedObjectPointer<QComponentRealization> cr = new QComponentRealization;
     cr->setAbstraction(c1);
     qDebug();
     qDebug() << "cr->suppliers()->size():" << cr->suppliers()->size();
diff --git a/examples/uml/nested-packages/nested-packages.pro b/examples/uml/nested-packages/nested-packages.pro
index 558d1579..74afd727 100644
--- a/examples/uml/nested-packages/nested-packages.pro
+++ b/examples/uml/nested-packages/nested-packages.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 
 QT += uml
+QT -= gui
 
 # Input
 SOURCES += main.cpp
diff --git a/examples/uml/profiles/main.cpp b/examples/uml/profiles/main.cpp
index 62c7c03f..b8e1b8ca 100644
--- a/examples/uml/profiles/main.cpp
+++ b/examples/uml/profiles/main.cpp
@@ -1,4 +1,4 @@
-#include <QtMof/QMofPointer>
+#include <QtWrappedObjects/QWrappedObjectPointer>
 
 #include <QtUml/QPrimitiveType>
 #include <QtUml/QProfile>
@@ -13,7 +13,7 @@
 #include <QtCore/QDebug>
 
 using namespace QtUml;
-using QtMof::QMofPointer;
+using QtWrappedObjects::QWrappedObjectPointer;
 
 typedef const QSet<QStereotype *> QStereotypeList;
 typedef const QSet<QPackageableElement *> QPackageableElementList;
@@ -21,18 +21,18 @@ typedef const QSet<QPackageableElement *> QPackageableElementList;
 int main ()
 {
     // Create a "dymmy" UML meta-model
-    QMofPointer<QModel> umlModel = new QModel;
+    QWrappedObjectPointer<QModel> umlModel = new QModel;
     umlModel->setName("UML Meta-Model");
-    QMofPointer<QClass> class_ = new QClass;
+    QWrappedObjectPointer<QClass> class_ = new QClass;
     class_->setName("Class");
     umlModel->addOwnedType(class_);
 
     // Create a profile
-    QMofPointer<QProfile> profile = new QProfile;
+    QWrappedObjectPointer<QProfile> profile = new QProfile;
     profile->setName("MyProfile");
 
     // Add a stereotype to profile
-    QMofPointer<QStereotype> stereotype = new QStereotype;
+    QWrappedObjectPointer<QStereotype> stereotype = new QStereotype;
     stereotype->setName("MyStereotype");
     profile->addPackagedElement(stereotype);
 
@@ -43,15 +43,15 @@ int main ()
         qDebug() << "    " << ownedStereotype->name();
 
     // Adding attribute to stereotype
-    QMofPointer<QPrimitiveType> booleanPrimitiveType = new QPrimitiveType;
+    QWrappedObjectPointer<QPrimitiveType> booleanPrimitiveType = new QPrimitiveType;
     booleanPrimitiveType->setName("boolean");
-    QMofPointer<QProperty> property = new QProperty;
+    QWrappedObjectPointer<QProperty> property = new QProperty;
     property->setName("isTransient");
     property->setType(booleanPrimitiveType);
     stereotype->addOwnedAttribute(property);
 
     // Create UML meta-model element import
-    QMofPointer<QElementImport> elementImport = new QElementImport;
+    QWrappedObjectPointer<QElementImport> elementImport = new QElementImport;
     elementImport->setImportedElement(umlModel->packagedElements()->toList().first());
 
     // Add meta-class reference to profile
@@ -71,14 +71,14 @@ int main ()
         qDebug() << "    " << importedMember->name();
 
     // Create extension
-    QMofPointer<QExtension> extension = new QExtension;
+    QWrappedObjectPointer<QExtension> extension = new QExtension;
     extension->setName("class_stereotype");
 
-    QMofPointer<QProperty> stereotypeProperty = new QProperty;
+    QWrappedObjectPointer<QProperty> stereotypeProperty = new QProperty;
     stereotypeProperty->setName("base_class");
     stereotypeProperty->setType(class_);
 
-    QMofPointer<QExtensionEnd> extensionEnd = new QExtensionEnd;
+    QWrappedObjectPointer<QExtensionEnd> extensionEnd = new QExtensionEnd;
     extensionEnd->setName("extension_stereotype");
     extensionEnd->setType(stereotype);
 
diff --git a/examples/uml/profiles/profiles.pro b/examples/uml/profiles/profiles.pro
index 7db81ae6..c5db0546 100644
--- a/examples/uml/profiles/profiles.pro
+++ b/examples/uml/profiles/profiles.pro
@@ -4,6 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 
 QT += uml
+QT -= gui
 
 # Input
 SOURCES += main.cpp