mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 00:54:20 +02:00
Code Issues Releases Wiki Activity

Only set ok value if not NULL pointer

Browse Source
This commit is contained in:
Uwe L. Korn
2014-04-13 21:23:53 +01:00
parent dfd010d495
commit a41e604f83
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/utils/TomahawkUtils.cpp
View File

@@ -852,7 +852,10 @@ parseJson( const QByteArray& jsonData, bool* ok )
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
QJsonParseError error; QJsonParseError error;
QJsonDocument doc = QJsonDocument::fromJson( jsonData, &error ); QJsonDocument doc = QJsonDocument::fromJson( jsonData, &error );
if ( ok != NULL )
{
*ok = ( error.error == QJsonParseError::NoError ); *ok = ( error.error == QJsonParseError::NoError );
}
return doc.toVariant(); return doc.toVariant();
#else #else
QJson::Parser p; QJson::Parser p;
@@ -866,7 +869,10 @@ 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 ); QJsonDocument doc = QJsonDocument::fromVariant( variant );
if ( ok != NULL )
{
*ok = true; *ok = true;
}
return doc.toJson(); return doc.toJson();
#else #else
QJson::Serializer serializer; QJson::Serializer serializer;