diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-01-12 18:06:52 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2013-01-12 22:07:43 +0100 |
| commit | 62b0d506a96b928baa84429d69c4ae02db72d95e (patch) | |
| tree | 9f7d5f37dfb6ad04986ad48b71644e9823bbd873 /examples/uml | |
| parent | 59515e689583b909c62c983332029bb471169207 (diff) | |
Remove registerMetaType from QWrappedObject and inheriting classes
Change-Id: I958ab7f269c9675b9e6a752738cd8795fb49e650
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
Diffstat (limited to 'examples/uml')
| -rw-r--r-- | examples/uml/qtumleditor/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp | 1 | ||||
| -rw-r--r-- | examples/uml/xmi-read/main.cpp | 11 |
3 files changed, 5 insertions, 11 deletions
diff --git a/examples/uml/qtumleditor/mainwindow.cpp b/examples/uml/qtumleditor/mainwindow.cpp index 9af70c3a..b4933576 100644 --- a/examples/uml/qtumleditor/mainwindow.cpp +++ b/examples/uml/qtumleditor/mainwindow.cpp @@ -4,7 +4,7 @@ #include <QtWidgets/QFileDialog> #include <QtWidgets/QMessageBox> -#include <QtMof/QtMofMetaModel> +#include <QtMof/QMofMetaModel> #include "wrappedobjectmodel.h" #include "wrappedobjectpropertymodel.h" @@ -18,7 +18,7 @@ MainWindow::MainWindow(QWidget *parent) : { ui->setupUi(this); - QtMofMetaModel::init(); + QMofMetaModel::init(); ui->wrappedObjectView->setModel(_wrappedObjectModel); diff --git a/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp b/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp index 94c3b846..12997398 100644 --- a/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp +++ b/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp @@ -84,7 +84,6 @@ QVariant WrappedObjectPropertyModel::data(const QModelIndex &index, int role) co if (index.parent().row() != -1 && metaPropertyInfo) { QMetaProperty metaProperty = metaPropertyInfo->metaProperty; QWrappedObject *propertyWrappedObject = metaPropertyInfo->propertyWrappedObject; - propertyWrappedObject->registerMetaTypes(); QString typeName = metaProperty.typeName(); QVariant variant = metaProperty.read(propertyWrappedObject); if (metaProperty.type() == QVariant::String) { diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp index b86772b9..39c16a92 100644 --- a/examples/uml/xmi-read/main.cpp +++ b/examples/uml/xmi-read/main.cpp @@ -1,20 +1,15 @@ -#include <QtWrappedObjects> +#include <QtWrappedObjects/QtWrappedObjects> #include <QtMof/QXmiReader> -using QtMof::QXmiReader; #include <QtMof/QXmiWriter> -using QtMof::QXmiWriter; - -#include <QtMof/QtMofMetaModel> -#include <QtCore/QDebug> +using QtMof::QXmiReader; +using QtMof::QXmiWriter; using namespace QtWrappedObjects; int main () { - QtMof::QtMofMetaModel::init(); - QFile file("test.xmi"); if (!file.open(QFile::ReadOnly | QFile::Text)) { |