1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00

* Style fixes to dynamic playlist code.

This commit is contained in:
Christian Muehlhaeuser
2014-09-26 11:27:08 +02:00
parent 735c2107a3
commit 887cd9dacb
3 changed files with 21 additions and 16 deletions

View File

@@ -68,7 +68,6 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
QVariant v = TomahawkUtils::parseJson( controlsQuery.value(1).toByteArray(), &ok ); QVariant v = TomahawkUtils::parseJson( controlsQuery.value(1).toByteArray(), &ok );
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
type = controlsQuery.value( 3 ).toString(); type = controlsQuery.value( 3 ).toString();
mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() ); mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() );

View File

@@ -315,7 +315,8 @@ DynamicPlaylist::loadRevision( const QString& rev )
setBusy( true ); setBusy( true );
DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev ); DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev );
if ( d->generator->mode() == OnDemand ) { if ( d->generator->mode() == OnDemand )
{
connect( cmd, SIGNAL( done( QString, connect( cmd, SIGNAL( done( QString,
bool, bool,
QString, QString,
@@ -326,7 +327,9 @@ DynamicPlaylist::loadRevision( const QString& rev )
QString, QString,
QList< QVariantMap >, QList< QVariantMap >,
bool ) ) ); bool ) ) );
} else if ( d->generator->mode() == Static ) { }
else if ( d->generator->mode() == Static )
{
connect( cmd, SIGNAL( done( QString, connect( cmd, SIGNAL( done( QString,
QList< QString >, QList< QString >,
QList< QString >, QList< QString >,
@@ -345,6 +348,9 @@ DynamicPlaylist::loadRevision( const QString& rev )
bool ) ) ); bool ) ) );
} }
else
Q_ASSERT( false );
Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) ); Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) );
} }