mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Convert QVariantHash to QVariantMap for JSON generation

Browse Source
This commit is contained in:
Uwe L. Korn
2014-05-05 12:41:05 +01:00
parent 101c89d97a
commit dfa649c6cd
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libtomahawk/utils/Json.cpp
View File

@@ -20,9 +20,9 @@
// Qt version specific includes // Qt version specific includes
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
#include <QUrlQuery>
#include <QJsonDocument> #include <QJsonDocument>
#include <QMetaProperty> #include <QMetaProperty>
#include <QVariantHash>
#else #else
#include <qjson/parser.h> #include <qjson/parser.h>
#include <qjson/qobjecthelper.h> #include <qjson/qobjecthelper.h>
@@ -106,7 +106,22 @@ QByteArray
toJson( const QVariant &variant, bool* ok ) toJson( const QVariant &variant, bool* ok )
{ {
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
QJsonDocument doc = QJsonDocument::fromVariant( variant ); QVariant _variant = variant;
if ( variant.type() == QVariant::Hash )
{
// QJsonDocument cannot deal with QVariantHash, so convert.
const QVariantHash hash = variant.toHash();
QVariantMap map;
QHashIterator<QString, QVariant> it(hash);
while ( it.hasNext() )
{
it.next();
map.insert( it.key(), it.value() );
}
_variant = map;
}
QJsonDocument doc = QJsonDocument::fromVariant( _variant );
if ( ok != NULL ) if ( ok != NULL )
{ {
*ok = !doc.isNull(); *ok = !doc.isNull();