Further rewriting of the JSON-related code

This commit is contained in:
Christophe Dumez 2012-05-26 22:58:53 +03:00
parent 122655758d
commit a0d21ead18
11 changed files with 155 additions and 200 deletions

View file

@ -94,16 +94,6 @@ QString json::toJson(const QVariant& v) {
}
}
// TODO: Remove
QString json::toJson(const QVariantMap& m) {
QStringList vlist;
QVariantMap::ConstIterator it;
for (it = m.constBegin(); it != m.constEnd(); it++) {
vlist << toJson(it.key())+":"+toJson(it.value());
}
return "{"+vlist.join(",")+"}";
}
QVariantMap json::fromJson(const QString& json) {
qDebug("JSON is %s", qPrintable(json));
QVariantMap m;
@ -165,17 +155,3 @@ QVariantMap json::fromJson(const QString& json) {
}
return m;
}
// TODO: Remove
QString json::toJson(const QList<QVariantMap>& v) {
QStringList res;
foreach (QVariantMap m, v) {
QStringList vlist;
QVariantMap::ConstIterator it;
for (it = m.constBegin(); it != m.constEnd(); it++) {
vlist << toJson(it.key())+":"+toJson(it.value());
}
res << "{"+vlist.join(",")+"}";
}
return "["+res.join(",")+"]";
}