diff --git a/autotests/kerfuffle/jsonparser.cpp b/autotests/kerfuffle/jsonparser.cpp index 492808fc..c4b63d80 100644 --- a/autotests/kerfuffle/jsonparser.cpp +++ b/autotests/kerfuffle/jsonparser.cpp @@ -1,83 +1,83 @@ /* * Copyright (c) 2011 Raphael Kubo da Costa * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ( INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "jsonparser.h" #include "kerfuffle/archiveinterface.h" #include "kerfuffle/archiveentry.h" #include #include #include JSONParser::JSONParser() { } JSONParser::~JSONParser() { } JSONParser::JSONArchive JSONParser::parse(QIODevice *json) { QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(json->readAll(), &error); if (error.error != QJsonParseError::NoError) { qDebug() << "Parse error: " << error.errorString(); return JSONParser::JSONArchive(); } return createJSONArchive(jsonDoc.toVariant()); } JSONParser::JSONArchive JSONParser::createJSONArchive(const QVariant &json) { JSONParser::JSONArchive archive; foreach (const QVariant &entry, json.toList()) { const QVariantMap entryMap = entry.toMap(); if (!entryMap.contains(QStringLiteral("fullPath"))) { continue; } Kerfuffle::Archive::Entry *e = new Kerfuffle::Archive::Entry(); QVariantMap::const_iterator entryIterator = entryMap.constBegin(); for (; entryIterator != entryMap.constEnd(); ++entryIterator) { - const char *key = entryIterator.key().toStdString().c_str(); + const char *key = entryIterator.key().toUtf8(); if (e->property(key).isValid()) { e->setProperty(key, entryIterator.value()); } else { qDebug() << entryIterator.key() << "is not a valid entry key"; } } const QString fullPath = entryMap[QStringLiteral("fullPath")].toString(); archive[fullPath] = e; } return archive; }