Commit e874e5b7 authored by Jan Möbius's avatar Jan Möbius

- Remove QT4 ifdefs

refs #141
parent 3f31babe
......@@ -77,10 +77,8 @@
#include <vector>
#include <QMap>
#include "perObjectData.hh"
#if QT_VERSION >= 0x050000
#include <QJsonDocument>
#include <QJsonObject>
#endif
//== TYPEDEFS =================================================================
......@@ -598,7 +596,6 @@ class DLLEXPORT BaseObject : public QObject {
/*
* Compose JSON parsable object.
*/
#if QT_VERSION >= 0x050000
QJsonObject comment_obj;
for (QMap<QString, QString>::const_iterator it = commentsByKey_.begin(), it_end = commentsByKey_.end();
it != it_end; ++it) {
......@@ -614,12 +611,6 @@ class DLLEXPORT BaseObject : public QObject {
}
}
result.append(QString::fromUtf8(QJsonDocument(comment_obj).toJson(QJsonDocument::Indented)));
#else
for (QMap<QString, QString>::const_iterator it = commentsByKey_.begin(), it_end = commentsByKey_.end();
it != it_end; ++it) {
result.append(QString("%1: %2").arg(it.key(), it.value()));
}
#endif
result.append(QString("END Comments for object \"%1\"\n").arg(name()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment