From 8b21d4766702bbf2d671e4dc9bfe41b68d4ee2f1 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 26 Apr 2013 03:14:53 +0200 Subject: [PATCH] * Style cleanups. --- .../accounts/spotify/SpotifyPlaylistUpdater.cpp | 16 ++++++++++------ .../DatabaseCommand_LoadAllPlaylists.cpp | 1 - .../playlist/dynamic/DynamicPlaylist.cpp | 4 ++-- .../playlist/dynamic/widgets/DynamicWidget.cpp | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp index 6c6f21c5a..eb7dd8394 100644 --- a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp +++ b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp @@ -98,12 +98,16 @@ SpotifyPlaylistUpdater::SpotifyPlaylistUpdater( SpotifyAccount* acct, const QStr void SpotifyPlaylistUpdater::init() { - - connect( playlist().data(), SIGNAL( tracksInserted( QList, int ) ), this, SLOT( tomahawkTracksInserted( QList, int ) ) ); - connect( playlist().data(), SIGNAL( tracksRemoved( QList ) ), this, SLOT( tomahawkTracksRemoved( QList ) ) ); - connect( playlist().data(), SIGNAL( tracksMoved( QList, int ) ), this, SLOT( tomahawkTracksMoved( QList, int ) ) ); - connect( playlist().data(), SIGNAL( renamed( QString, QString ) ), this, SLOT( tomahawkPlaylistRenamed( QString, QString ) ) ); - 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 + connect( playlist().data(), SIGNAL( tracksInserted( QList, int ) ), + SLOT( tomahawkTracksInserted( QList, int ) ) ); + connect( playlist().data(), SIGNAL( tracksRemoved( QList ) ), + SLOT( tomahawkTracksRemoved( QList ) ) ); + connect( playlist().data(), SIGNAL( tracksMoved( QList, int ) ), + SLOT( tomahawkTracksMoved( QList, 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 saveToSettings(); diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp index ede7245b7..b018d8962 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp @@ -47,7 +47,6 @@ DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi ) if ( !source().isNull() ) 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 " "FROM playlist " "WHERE dynplaylist = 'false' " diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp index c1807f872..f3c62968d 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp @@ -266,7 +266,7 @@ DynamicPlaylist::createNewRevision( const QString& newrev, void 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 ); DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev ); @@ -414,7 +414,7 @@ DynamicPlaylist::setRevision( const QString& rev, if ( applied ) setCurrentrevision( rev ); - // qDebug() << "EMITTING REVISION LOADED 1!"; + //qDebug() << "EMITTING REVISION LOADED!"; setBusy( false ); setLoaded( true ); emit dynamicRevisionLoaded( dpr ); diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index acde8b7e0..c33272128 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -187,7 +187,7 @@ void DynamicWidget::onRevisionLoaded( const Tomahawk::DynamicPlaylistRevision& rev ) { Q_UNUSED( rev ); - qDebug() << "DynamicWidget::onRevisionLoaded"; + tDebug( LOGVERBOSE ) << "DynamicWidget::onRevisionLoaded" << rev.revisionguid; if ( m_model->ignoreRevision( rev.revisionguid ) ) { m_model->removeRevisionFromIgnore( rev.revisionguid );