mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 15:47:38 +02:00
Code Issues Releases Wiki Activity

* Style cleanups.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-26 03:14:53 +02:00
parent 3d974786d0
commit 8b21d47667
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp
View File

@@ -98,12 +98,16 @@ SpotifyPlaylistUpdater::SpotifyPlaylistUpdater( SpotifyAccount* acct, const QStr
void void
SpotifyPlaylistUpdater::init() SpotifyPlaylistUpdater::init()
{ {
connect( playlist().data(), SIGNAL( tracksInserted( QList<Tomahawk::plentry_ptr>, int ) ),
connect( playlist().data(), SIGNAL( tracksInserted( QList<Tomahawk::plentry_ptr>, int ) ), this, SLOT( tomahawkTracksInserted( QList<Tomahawk::plentry_ptr>, int ) ) ); SLOT( tomahawkTracksInserted( QList<Tomahawk::plentry_ptr>, int ) ) );
connect( playlist().data(), SIGNAL( tracksRemoved( QList<Tomahawk::query_ptr> ) ), this, SLOT( tomahawkTracksRemoved( QList<Tomahawk::query_ptr> ) ) ); connect( playlist().data(), SIGNAL( tracksRemoved( QList<Tomahawk::query_ptr> ) ),
connect( playlist().data(), SIGNAL( tracksMoved( QList<Tomahawk::plentry_ptr>, int ) ), this, SLOT( tomahawkTracksMoved( QList<Tomahawk::plentry_ptr>, int ) ) ); SLOT( tomahawkTracksRemoved( QList<Tomahawk::query_ptr> ) ) );
connect( playlist().data(), SIGNAL( renamed( QString, QString ) ), this, SLOT( tomahawkPlaylistRenamed( QString, QString ) ) ); connect( playlist().data(), SIGNAL( tracksMoved( QList<Tomahawk::plentry_ptr>, int ) ),
connect( playlist().data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistRevisionLoaded() ), Qt::QueuedConnection ); // Queued so that in Playlist.cpp:443 we let the playlist clear its own queue first SLOT( tomahawkTracksMoved( QList<Tomahawk::plentry_ptr>, int ) ) );
connect( playlist().data(), SIGNAL( renamed( QString, QString ) ),
SLOT( tomahawkPlaylistRenamed( QString, QString ) ) );
connect( playlist().data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ),
SLOT( playlistRevisionLoaded() ), Qt::QueuedConnection ); // Queued so that in Playlist.cpp:443 we let the playlist clear its own queue first
// TODO reorders in a playlist // TODO reorders in a playlist
saveToSettings(); saveToSettings();

1
src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp
View File

@@ -47,7 +47,6 @@ DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
if ( !source().isNull() ) if ( !source().isNull() )
sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ); sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
query.exec( QString( "SELECT guid, title, info, creator, lastmodified, shared, currentrevision, createdOn " query.exec( QString( "SELECT guid, title, info, creator, lastmodified, shared, currentrevision, createdOn "
"FROM playlist " "FROM playlist "
"WHERE dynplaylist = 'false' " "WHERE dynplaylist = 'false' "

4
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@@ -266,7 +266,7 @@ DynamicPlaylist::createNewRevision( const QString& newrev,
void void
DynamicPlaylist::loadRevision( const QString& rev ) DynamicPlaylist::loadRevision( const QString& rev )
{ {
// qDebug() << Q_FUNC_INFO << "Loading with:" << ( rev.isEmpty() ? currentrevision() : rev ); //tDebug() << Q_FUNC_INFO << "Loading with:" << ( rev.isEmpty() ? currentrevision() : 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 );
@@ -414,7 +414,7 @@ DynamicPlaylist::setRevision( const QString& rev,
if ( applied ) if ( applied )
setCurrentrevision( rev ); setCurrentrevision( rev );
// qDebug() << "EMITTING REVISION LOADED 1!"; //qDebug() << "EMITTING REVISION LOADED!";
setBusy( false ); setBusy( false );
setLoaded( true ); setLoaded( true );
emit dynamicRevisionLoaded( dpr ); emit dynamicRevisionLoaded( dpr );

2
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@@ -187,7 +187,7 @@ void
DynamicWidget::onRevisionLoaded( const Tomahawk::DynamicPlaylistRevision& rev ) DynamicWidget::onRevisionLoaded( const Tomahawk::DynamicPlaylistRevision& rev )
{ {
Q_UNUSED( rev ); Q_UNUSED( rev );
qDebug() << "DynamicWidget::onRevisionLoaded"; tDebug( LOGVERBOSE ) << "DynamicWidget::onRevisionLoaded" << rev.revisionguid;
if ( m_model->ignoreRevision( rev.revisionguid ) ) if ( m_model->ignoreRevision( rev.revisionguid ) )
{ {
m_model->removeRevisionFromIgnore( rev.revisionguid ); m_model->removeRevisionFromIgnore( rev.revisionguid );