15 files changed, 65 insertions, 110 deletions
diff --git a/examples/uml/qtumleditor/mainwindow.cpp b/examples/uml/qtumleditor/mainwindow.cpp
index dcbc8409..be5ff7b8 100644
--- a/examples/uml/qtumleditor/mainwindow.cpp
+++ b/examples/uml/qtumleditor/mainwindow.cpp
@@ -5,18 +5,17 @@
 #include <QtCore/QPluginLoader>
 #include <QtCore/QStringListModel>
 
+#include <QtWidgets/QListView>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
-#include <QtWidgets/QListView>
 
+#include <QtWrappedObjects/QXmiWriter>
+#include <QtWrappedObjects/QXmiReader>
 #include <QtWrappedObjects/QWrappedObject>
 #include <QtWrappedObjects/QMetaModelPlugin>
 #include <QtWrappedObjectsWidgets/QWrappedObjectModel>
 #include <QtWrappedObjectsWidgets/QWrappedObjectPropertyModel>
 
-#include <QtMof/QXmiWriter>
-#include <QtMof/QXmiReader>
-
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
@@ -64,7 +63,7 @@ void MainWindow::saveXmi(QWrappedObject *rootElement)
         return;
     }
 
-    QtMof::QXmiWriter writer(rootElement);
+    QXmiWriter writer(rootElement);
     if (!writer.writeFile(&file))
         QMessageBox::critical(this, tr("Save As"), tr("Error when writing XMI file !"));
     else
@@ -79,7 +78,7 @@ QWrappedObject *MainWindow::loadXmi()
         return 0;
     }
 
-    QtMof::QXmiReader reader;
+    QXmiReader reader;
     setWindowTitle(QFileInfo(file).fileName() + " - QtUml Editor");
     QWrappedObject *wrappedObject = reader.readFile(&file);
     ui->issues->setModel(new QStringListModel(reader.errorStrings()));
diff --git a/examples/uml/qtumleditor/qtumleditor.pro b/examples/uml/qtumleditor/qtumleditor.pro
index 77bd4971..382792f5 100644
--- a/examples/uml/qtumleditor/qtumleditor.pro
+++ b/examples/uml/qtumleditor/qtumleditor.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT = wrappedobjectswidgets mof
+QT = wrappedobjectswidgets
 
 TARGET = qtumleditor
 TEMPLATE = app
diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp
index 0a27c3a3..fcc5832b 100644
--- a/examples/uml/xmi-read/main.cpp
+++ b/examples/uml/xmi-read/main.cpp
@@ -1,11 +1,7 @@
+#include <QtWrappedObjects/QXmiReader>
+#include <QtWrappedObjects/QXmiWriter>
 #include <QtWrappedObjects/QtWrappedObjects>
 
-#include <QtMof/QXmiReader>
-#include <QtMof/QXmiWriter>
-
-using QtMof::QXmiReader;
-using QtMof::QXmiWriter;
-
 int main ()
 {
     QFile file("test.xmi");
@@ -24,7 +20,7 @@ int main ()
         foreach (QString error, reader.errorStrings())
             qDebug() << "\t" << error;
     }
-/*
+
     QFile file2("test-out.xmi");
 
     if (!file2.open(QFile::WriteOnly | QFile::Text)) {
@@ -33,6 +29,5 @@ int main ()
     }
     QXmiWriter writer(rootElement);
     writer.writeFile(&file2);
-*/
 }
 
diff --git a/examples/uml/xmi-read/xmi-read.pro b/examples/uml/xmi-read/xmi-read.pro
index 1ec08ba7..c1e41a8d 100644
--- a/examples/uml/xmi-read/xmi-read.pro
+++ b/examples/uml/xmi-read/xmi-read.pro
@@ -3,7 +3,7 @@ TARGET = xmi-read
 DEPENDPATH += .
 INCLUDEPATH += .
 
-QT += uml mof
+QT += wrappedobjects
 QT -= gui
 
 CONFIG += c++11
diff --git a/examples/uml/xmi-write/main.cpp b/examples/uml/xmi-write/main.cpp
index ccd321b8..6fe27024 100644
--- a/examples/uml/xmi-write/main.cpp
+++ b/examples/uml/xmi-write/main.cpp
@@ -1,15 +1,14 @@
+#include <QtWrappedObjects/QXmiWriter>
 #include <QtWrappedObjects/QtWrappedObjects>
 
 #include <QtUml/QtUml>
 
-#include <QtMof/QXmiWriter>
-
 using namespace QtUml;
 
-using QtMof::QXmiWriter;
-
 int main ()
 {
+    QUmlMetaModel::init();
+
     QWrappedObjectPointer<QPackage> model = new QPackage;
     model->setName("MyRootPackage");
 
diff --git a/src/mof/mof.pri b/src/mof/mof.pri
index 1f2dffe2..34873dbf 100644
--- a/src/mof/mof.pri
+++ b/src/mof/mof.pri
@@ -54,9 +54,7 @@ PUBLIC_HEADERS += \
     qpackageimport.h \
     qargument.h \
     qbehavioralfeature.h \
-    qmofmetamodel.h \
-    qxmiwriter.h \
-    qxmireader.h
+    qmofmetamodel.h
 
 PRIVATE_HEADERS += \
     qrelationship_p.h \
@@ -111,9 +109,7 @@ PRIVATE_HEADERS += \
     qfeature_p.h \
     qpackageimport_p.h \
     qargument_p.h \
-    qbehavioralfeature_p.h \
-    qxmiwriter_p.h \
-    qxmireader_p.h
+    qbehavioralfeature_p.h
 
 SOURCES += \
     qtmofnamespace.cpp \
@@ -170,6 +166,4 @@ SOURCES += \
     qpackageimport.cpp \
     qargument.cpp \
     qbehavioralfeature.cpp \
-    qmofmetamodel.cpp \
-    qxmiwriter.cpp \
-    qxmireader.cpp
+    qmofmetamodel.cpp
diff --git a/src/mof/qmofmetamodel.cpp b/src/mof/qmofmetamodel.cpp
index d8a38786..9a146b0f 100644
--- a/src/mof/qmofmetamodel.cpp
+++ b/src/mof/qmofmetamodel.cpp
@@ -204,12 +204,6 @@ void QMofMetaModel::init()
     qRegisterMetaType<QValueSpecification *>();
     qRegisterMetaType<QList<QValueSpecification *>>();
     qRegisterMetaType<QSet<QValueSpecification *>>();
-    qRegisterMetaType<QXmiReader *>();
-    qRegisterMetaType<QList<QXmiReader *>>();
-    qRegisterMetaType<QSet<QXmiReader *>>();
-    qRegisterMetaType<QXmiWriter *>();
-    qRegisterMetaType<QList<QXmiWriter *>>();
-    qRegisterMetaType<QSet<QXmiWriter *>>();
 }
 
 QT_END_NAMESPACE_QTMOF
diff --git a/src/wrappedobjects/qwrappedobjectpointer.h b/src/wrappedobjects/qwrappedobjectpointer.h
index f2b9e1d1..dd7e3737 100644
--- a/src/wrappedobjects/qwrappedobjectpointer.h
+++ b/src/wrappedobjects/qwrappedobjectpointer.h
@@ -49,6 +49,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(QtWrappedObjects)
+
 template <class T>
 class Q_CORE_EXPORT QWrappedObjectPointer : public QPointer<T>
 {
diff --git a/src/mof/qxmireader.cpp b/src/wrappedobjects/qxmireader.cpp
index fdd441ae..3cb93787 100644
--- a/src/mof/qxmireader.cpp
+++ b/src/wrappedobjects/qxmireader.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org>
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtMof module of the Qt Toolkit.
+** This file is part of the QtWrappedObjects module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,22 +44,14 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QStack>
-#include <QtCore/QIODevice>
-#include <QtCore/QMetaMethod>
 #include <QtCore/QPluginLoader>
 #include <QtCore/QCoreApplication>
-#include <QtCore/QRegularExpression>
 
 #include <QtWrappedObjects/QWrappedObject>
 #include <QtWrappedObjects/QMetaModelPlugin>
-#include <QtWrappedObjects/QMetaPropertyInfo>
 #include <QtWrappedObjects/QMetaWrappedObject>
-#include <QtWrappedObjects/QtWrappedObjectsNamespace>
 
-using QT_PREPEND_NAMESPACE(QMetaPropertyInfo);
-using QT_PREPEND_NAMESPACE(QMetaWrappedObject);
-
-QT_BEGIN_NAMESPACE_QTMOF
+QT_BEGIN_NAMESPACE
 
 QXmiReaderPrivate::QXmiReaderPrivate()
 {
@@ -233,5 +225,4 @@ QStringList QXmiReader::errorStrings() const
 
 #include "moc_qxmireader.cpp"
 
-QT_END_NAMESPACE_QTMOF
-
+QT_END_NAMESPACE
diff --git a/src/mof/qxmireader.h b/src/wrappedobjects/qxmireader.h
index 399ca96a..4d600df7 100644
--- a/src/mof/qxmireader.h
+++ b/src/wrappedobjects/qxmireader.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org>
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtMof module of the Qt Toolkit.
+** This file is part of the QtWrappedObjects module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -38,29 +38,23 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QTMOF_QXMIREADER_H
-#define QTMOF_QXMIREADER_H
+#ifndef QTWRAPPEDOBJECTS_QXMIREADER_H
+#define QTWRAPPEDOBJECTS_QXMIREADER_H
 
-#include <QtMof/QtMofGlobal>
-
-// Base class includes
 #include <QtCore/QObject>
 
 QT_BEGIN_HEADER
 
-class QIODevice;
-
 QT_BEGIN_NAMESPACE
-class QWrappedObject;
-QT_END_NAMESPACE
 
-QT_BEGIN_NAMESPACE_QTMOF
+QT_MODULE(QtWrappedObjects)
 
-QT_MODULE(QtMof)
+class QIODevice;
+class QWrappedObject;
 
 class QXmiReaderPrivate;
 
-class Q_MOF_EXPORT QXmiReader : public QObject
+class Q_CORE_EXPORT QXmiReader : public QObject
 {
     Q_OBJECT
 
@@ -79,9 +73,9 @@ protected:
     QWrappedObject *createInstance(QString instanceClass, QString instanceName);
 };
 
-QT_END_NAMESPACE_QTMOF
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QTMOF_QXMIREADER_H
+#endif // QTWRAPPEDOBJECTS_QXMIREADER_H
 
diff --git a/src/mof/qxmireader_p.h b/src/wrappedobjects/qxmireader_p.h
index d08264cb..f8c2574a 100644
--- a/src/mof/qxmireader_p.h
+++ b/src/wrappedobjects/qxmireader_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org>
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtMof module of the Qt Toolkit.
+** This file is part of the QtWrappedObjects module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -38,28 +38,23 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QTMOF_QXMIREADER_P_H
-#define QTMOF_QXMIREADER_P_H
+#ifndef QTWRAPPEDOBJECTS_QXMIREADER_P_H
+#define QTWRAPPEDOBJECTS_QXMIREADER_P_H
 
-// Base class includes
 #include "private/qobject_p.h"
 
-#include "QtMof/QXmiReader"
-
 #include <QtCore/QStringList>
 #include <QtCore/QXmlStreamReader>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
-class QMetaModelPlugin;
-QT_END_NAMESPACE
 
-QT_BEGIN_NAMESPACE_QTMOF
+QT_MODULE(QtWrappedObjects)
 
-QT_MODULE(QtMof)
+class QMetaModelPlugin;
 
-class Q_MOF_EXPORT QXmiReaderPrivate : public QObjectPrivate
+class Q_CORE_EXPORT QXmiReaderPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QXmiReader)
 
@@ -73,9 +68,9 @@ public:
     QStringList errors;
 };
 
-QT_END_NAMESPACE_QTMOF
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QTMOF_QXMIREADER_P_H
+#endif // QTWRAPPEDOBJECTS_QXMIREADER_P_H
 
diff --git a/src/mof/qxmiwriter.cpp b/src/wrappedobjects/qxmiwriter.cpp
index 37890f29..7c87f229 100644
--- a/src/mof/qxmiwriter.cpp
+++ b/src/wrappedobjects/qxmiwriter.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org>
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtMof module of the Qt Toolkit.
+** This file is part of the QtWrappedObjects module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,17 +42,13 @@
 #include "qxmiwriter.h"
 #include "qxmiwriter_p.h"
 
-#include <QtCore/QIODevice>
+#include <QtCore/QSet>
 #include <QtCore/QRegularExpression>
 
 #include <QtWrappedObjects/QWrappedObject>
-#include <QtWrappedObjects/QMetaWrappedObject>
 #include <QtWrappedObjects/QMetaPropertyInfo>
-#include <QtWrappedObjects/QtWrappedObjectsNamespace>
 
-#include <QtMof/QMofMetaModel>
-
-QT_BEGIN_NAMESPACE_QTMOF
+QT_BEGIN_NAMESPACE
 
 QXmiWriterPrivate::QXmiWriterPrivate(QWrappedObject *wrappedObject)
     : wrappedObject(wrappedObject)
@@ -68,7 +64,6 @@ QXmiWriterPrivate::~QXmiWriterPrivate()
 QXmiWriter::QXmiWriter(QWrappedObject *wrappedObject, QObject *parent) :
     QObject(*new QXmiWriterPrivate(wrappedObject), parent)
 {
-    QMofMetaModel::init();
 }
 
 QXmiWriter::~QXmiWriter()
@@ -265,5 +260,5 @@ void QXmiWriter::writeWrappedObject(QWrappedObject *wrappedObject, QString eleme
 
 #include "moc_qxmiwriter.cpp"
 
-QT_END_NAMESPACE_QTMOF
+QT_END_NAMESPACE
 
diff --git a/src/mof/qxmiwriter.h b/src/wrappedobjects/qxmiwriter.h
index 103c401d..4f70faa1 100644
--- a/src/mof/qxmiwriter.h
+++ b/src/wrappedobjects/qxmiwriter.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org>
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtMof module of the Qt Toolkit.
+** This file is part of the QtWrappedObjects module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -38,29 +38,23 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QTMOF_QXMIWRITER_H
-#define QTMOF_QXMIWRITER_H
+#ifndef QTWRAPPEDOBJECTS_QXMIWRITER_H
+#define QTWRAPPEDOBJECTS_QXMIWRITER_H
 
-#include <QtMof/QtMofGlobal>
-
-// Base class includes
 #include <QtCore/QObject>
 
 QT_BEGIN_HEADER
 
-class QIODevice;
-
 QT_BEGIN_NAMESPACE
-class QWrappedObject;
-QT_END_NAMESPACE
 
-QT_BEGIN_NAMESPACE_QTMOF
+QT_MODULE(QtWrappedObjects)
 
-QT_MODULE(QtMof)
+class QIODevice;
+class QWrappedObject;
 
 class QXmiWriterPrivate;
 
-class Q_MOF_EXPORT QXmiWriter : public QObject
+class Q_CORE_EXPORT QXmiWriter : public QObject
 {
     Q_OBJECT
 
@@ -78,9 +72,9 @@ protected:
     void writeWrappedObject(QWrappedObject *wrappedObject, QString elementName = QString::fromLatin1(""));
 };
 
-QT_END_NAMESPACE_QTMOF
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QTMOF_QXMIWRITER_H
+#endif // QTWRAPPEDOBJECTS_QXMIWRITER_H
 
diff --git a/src/mof/qxmiwriter_p.h b/src/wrappedobjects/qxmiwriter_p.h
index b1de2fc2..ea1401d1 100644
--- a/src/mof/qxmiwriter_p.h
+++ b/src/wrappedobjects/qxmiwriter_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Sandro S. Andrade <sandroandrade@kde.org>
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtMof module of the Qt Toolkit.
+** This file is part of the QtWrappedObjects module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -38,24 +38,21 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QTMOF_QXMIWRITER_P_H
-#define QTMOF_QXMIWRITER_P_H
+#ifndef QTWRAPPEDOBJECTS_QXMIWRITER_P_H
+#define QTWRAPPEDOBJECTS_QXMIWRITER_P_H
 
-// Base class includes
 #include "private/qobject_p.h"
 
-#include "QtMof/QXmiWriter"
-
 #include <QtCore/QStringList>
 #include <QtCore/QXmlStreamWriter>
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE_QTMOF
+QT_BEGIN_NAMESPACE
 
-QT_MODULE(QtMof)
+QT_MODULE(QtWrappedObjects)
 
-class Q_MOF_EXPORT QXmiWriterPrivate : public QObjectPrivate
+class Q_CORE_EXPORT QXmiWriterPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QXmiWriter)
 
@@ -71,9 +68,9 @@ public:
     QStringList blacklistedOppositeEnds;
 };
 
-QT_END_NAMESPACE_QTMOF
+QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QTMOF_QXMIWRITER_P_H
+#endif // QTWRAPPEDOBJECTS_QXMIWRITER_P_H
 
diff --git a/src/wrappedobjects/wrappedobjects.pro b/src/wrappedobjects/wrappedobjects.pro
index 7ab45996..4beef050 100644
--- a/src/wrappedobjects/wrappedobjects.pro
+++ b/src/wrappedobjects/wrappedobjects.pro
@@ -8,6 +8,8 @@ QMAKE_DOCS = $$PWD/doc/qtwrappedobjects.qdocconf
 load(qt_module)
 
 PUBLIC_HEADERS += \
+    qxmiwriter.h \
+    qxmireader.h \
     qwrappedobject.h \
     qmetamodelplugin.h \
     qmetawrappedobject.h \
@@ -15,10 +17,14 @@ PUBLIC_HEADERS += \
     qtwrappedobjectsnamespace.h
 
 PRIVATE_HEADERS += \
+    qxmiwriter_p.h \
+    qxmireader_p.h \
     qwrappedobject_p.h \
     qmetawrappedobject_p.h
 
 SOURCES += \
+    qxmiwriter.cpp \
+    qxmireader.cpp \
     qwrappedobject.cpp \
     qmetamodelplugin.cpp \
     qmetawrappedobject.cpp \