drop qxml, port quotes from xml to json (xml has been used for qt4

branch)
This commit is contained in:
arcan1s
2015-05-28 09:16:27 +03:00
parent 8dc3510a30
commit b51c97abbb
6 changed files with 38 additions and 53 deletions

View File

@ -21,6 +21,7 @@
#include <QDebug>
#include <QDir>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QSettings>
#include <QStandardPaths>
#include <QTextCodec>
@ -392,7 +393,11 @@ void ExtScript::readJsonFilters()
QString jsonText = jsonFile.readAll();
jsonFile.close();
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8());
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
if (debug) qDebug() << PDEBUG << ":" << "Json parse error" << error.errorString();
if (error.error != QJsonParseError::NoError)
return;
jsonFilters = jsonDoc.toVariant().toMap();
if (debug) qDebug() << PDEBUG << ":" << "Filters" << jsonFilters;