mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace QtScript with QJson*

Browse Source 
QtScript is deprecated and this was needed to start supporting Qt6
This commit is contained in:
Luis Ángel San Martín
2021-02-27 12:02:57 +01:00
parent 32e1db7134
commit 51a9c72d05
10 changed files with 232 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
YACReaderLibrary/comic_vine/model/volume_comics_model.cpp
View File

@ -1,7 +1,8 @@
#include "volume_comics_model.h"
#include "qnaturalsorting.h"
#include <QtScript>
#include <QJsonDocument>
#include <QJsonParseError>
bool lessThan(const QList<QString> &left, const QList<QString> &right)
{
@ -18,33 +19,29 @@ VolumeComicsModel::VolumeComicsModel(QObject *parent)
void VolumeComicsModel::load(const QString &json)
{
QScriptEngine engine;
QScriptValue sc;
sc = engine.evaluate("(" + json + ")");
QJsonParseError Err;
QVariantMap sc = QJsonDocument::fromJson(json.toUtf8(), &Err).toVariant().toMap();
if (!sc.property("error").isValid() && sc.property("error").toString() != "OK") {
if (Err.error != QJsonParseError::NoError) {
qDebug("Error detected");
} else {
QScriptValueIterator it(sc.property("results"));
//bool test;
QScriptValue resultsValue;
while (it.hasNext()) {
it.next();
if (it.flags() & QScriptValue::SkipInEnumeration)
continue;
resultsValue = it.value();
QString issueNumber = resultsValue.property("issue_number").toString();
QScriptValue propertyName = resultsValue.property("name");
QString name = propertyName.isNull() ? "-" : propertyName.toString();
QString coverURL = resultsValue.property("image").property("medium_url").toString();
QString id = resultsValue.property("id").toString();
QStringList l;
l << issueNumber << name << coverURL << id;
_data.push_back(l);
}
qSort(_data.begin(), _data.end(), lessThan);
return;
}
QListIterator<QVariant> it(sc.value("results").toList());
QVariantMap resultsValue;
while (it.hasNext()) {
resultsValue = it.next().toMap();
QString issueNumber = resultsValue.value("issue_number").toString();
QVariant propertyName = resultsValue.value("name");
QString name = propertyName.isNull() ? "-" : propertyName.toString();
QString coverURL = resultsValue.value("image").toMap().value("medium_url").toString();
QString id = resultsValue.value("id").toString();
QStringList l;
l << issueNumber << name << coverURL << id;
_data.push_back(l);
}
qSort(_data.begin(), _data.end(), lessThan);
}
/*void VolumeComicsModel::load(const QStringList &jsonList)