summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/uml/duse-mt/duse-mt.pro2
-rw-r--r--examples/uml/nested-packages/nested-packages.pro2
-rw-r--r--examples/uml/profiles/profiles.pro2
-rw-r--r--examples/uml/xmi-read/main.cpp8
-rw-r--r--examples/uml/xmi-read/xmi-read.pro2
-rw-r--r--examples/uml/xmi-write/main.cpp2
-rw-r--r--examples/uml/xmi-write/xmi-write.pro2
7 files changed, 4 insertions, 16 deletions
diff --git a/examples/uml/duse-mt/duse-mt.pro b/examples/uml/duse-mt/duse-mt.pro
index ba0e516c..14b4322b 100644
--- a/examples/uml/duse-mt/duse-mt.pro
+++ b/examples/uml/duse-mt/duse-mt.pro
@@ -16,8 +16,6 @@ xmi.files = example.xmi
INSTALLS += target xmi
-CONFIG += c++11
-
SOURCES += main.cpp \
mainwindow.cpp \
newdusedesign.cpp
diff --git a/examples/uml/nested-packages/nested-packages.pro b/examples/uml/nested-packages/nested-packages.pro
index 1efb6bd4..74afd727 100644
--- a/examples/uml/nested-packages/nested-packages.pro
+++ b/examples/uml/nested-packages/nested-packages.pro
@@ -6,7 +6,5 @@ INCLUDEPATH += .
QT += uml
QT -= gui
-CONFIG += c++11
-
# Input
SOURCES += main.cpp
diff --git a/examples/uml/profiles/profiles.pro b/examples/uml/profiles/profiles.pro
index e298d2b0..c5db0546 100644
--- a/examples/uml/profiles/profiles.pro
+++ b/examples/uml/profiles/profiles.pro
@@ -6,7 +6,5 @@ INCLUDEPATH += .
QT += uml
QT -= gui
-CONFIG += c++11
-
# Input
SOURCES += main.cpp
diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp
index 7b85c814..04e5b06f 100644
--- a/examples/uml/xmi-read/main.cpp
+++ b/examples/uml/xmi-read/main.cpp
@@ -52,9 +52,9 @@ int main ()
}
QXmiReader reader(0, true);
- QWrappedObject *rootElement = reader.readFile(&file);
- if (rootElement)
- qDebug() << "Successfully read object with name" << rootElement->objectName();
+ QList<QWrappedObject *> rootElements = reader.readFile(&file);
+ if (!rootElements.isEmpty())
+ qDebug() << "Successfully read object with name" << rootElements.first()->objectName();
if (reader.errorStrings().size() > 0) {
qDebug() << "Errors:";
foreach (QString error, reader.errorStrings())
@@ -67,7 +67,7 @@ int main ()
qDebug() << "Cannot write file !";
return 1;
}
- QXmiWriter writer(rootElement);
+ QXmiWriter writer(rootElements.first());
writer.writeFile(&file2);
}
diff --git a/examples/uml/xmi-read/xmi-read.pro b/examples/uml/xmi-read/xmi-read.pro
index c1e41a8d..0a4201a8 100644
--- a/examples/uml/xmi-read/xmi-read.pro
+++ b/examples/uml/xmi-read/xmi-read.pro
@@ -6,7 +6,5 @@ INCLUDEPATH += .
QT += wrappedobjects
QT -= gui
-CONFIG += c++11
-
# Input
SOURCES += main.cpp
diff --git a/examples/uml/xmi-write/main.cpp b/examples/uml/xmi-write/main.cpp
index 59c8120c..95e36218 100644
--- a/examples/uml/xmi-write/main.cpp
+++ b/examples/uml/xmi-write/main.cpp
@@ -45,8 +45,6 @@
int main ()
{
- QUmlMetaModel::init();
-
QWrappedObjectPointer<QUmlPackage> model = new QUmlPackage;
model->setName("MyRootPackage");
diff --git a/examples/uml/xmi-write/xmi-write.pro b/examples/uml/xmi-write/xmi-write.pro
index f6acab0e..b70a25e6 100644
--- a/examples/uml/xmi-write/xmi-write.pro
+++ b/examples/uml/xmi-write/xmi-write.pro
@@ -6,7 +6,5 @@ INCLUDEPATH += .
QT += uml mof
QT -= gui
-CONFIG += c++11
-
# Input
SOURCES += main.cpp