mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-09 07:36:48 +02:00
* Extra safety for QJson 0.8.0.
This commit is contained in:
@@ -53,10 +53,13 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
|
|||||||
QJson::Parser parser; bool ok;
|
QJson::Parser parser; bool ok;
|
||||||
|
|
||||||
if ( query_entries.next() )
|
if ( query_entries.next() )
|
||||||
|
{
|
||||||
|
if ( !query_entries.value( 0 ).isNull() )
|
||||||
{
|
{
|
||||||
// entries should be a list of strings:
|
// entries should be a list of strings:
|
||||||
QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
|
QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
|
||||||
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
|
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
|
||||||
|
|
||||||
m_guids = v.toStringList();
|
m_guids = v.toStringList();
|
||||||
QString inclause = QString( "('%1')" ).arg( m_guids.join( "', '" ) );
|
QString inclause = QString( "('%1')" ).arg( m_guids.join( "', '" ) );
|
||||||
|
|
||||||
@@ -90,6 +93,7 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
|
|||||||
|
|
||||||
m_entrymap.insert( e->guid(), e );
|
m_entrymap.insert( e->guid(), e );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
prevrev = query_entries.value( 4 ).toString();
|
prevrev = query_entries.value( 4 ).toString();
|
||||||
}
|
}
|
||||||
@@ -116,9 +120,12 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
|
|||||||
Q_ASSERT( false );
|
Q_ASSERT( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( !query_entries_old.value( 0 ).isNull() )
|
||||||
|
{
|
||||||
QVariant v = parser.parse( query_entries_old.value( 0 ).toByteArray(), &ok );
|
QVariant v = parser.parse( query_entries_old.value( 0 ).toByteArray(), &ok );
|
||||||
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
|
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
|
||||||
m_oldentries = v.toStringList();
|
m_oldentries = v.toStringList();
|
||||||
|
}
|
||||||
m_islatest = query_entries_old.value( 1 ).toBool();
|
m_islatest = query_entries_old.value( 1 ).toBool();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user