From d22bccd9fbbbf5b1c430dbdbb37e2123b636dd27 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 10 Dec 2011 02:02:44 +0100 Subject: [PATCH] * A few cleanups. --- src/libtomahawk/database/databaseimpl.cpp | 2 +- src/libtomahawk/playlistinterface.h | 6 +----- src/libtomahawk/sourceplaylistinterface.h | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/database/databaseimpl.cpp b/src/libtomahawk/database/databaseimpl.cpp index 136649b53..ef25eac50 100644 --- a/src/libtomahawk/database/databaseimpl.cpp +++ b/src/libtomahawk/database/databaseimpl.cpp @@ -385,7 +385,7 @@ DatabaseImpl::searchTable( const QString& table, const QString& name, uint limit return resultslist; QList< QPair > resultscapped; - for ( unsigned int i = 0; i < limit && i < resultsmap.count(); i++ ) + for ( int i = 0; i < (int)limit && i < resultsmap.count(); i++ ) { resultscapped << resultslist.at( i ); } diff --git a/src/libtomahawk/playlistinterface.h b/src/libtomahawk/playlistinterface.h index c6017f197..4ef652137 100644 --- a/src/libtomahawk/playlistinterface.h +++ b/src/libtomahawk/playlistinterface.h @@ -73,15 +73,11 @@ public: QObject* object() const { return m_object; } - static void dontDelete( Tomahawk::PlaylistInterface* obj ) - { - tDebug() << Q_FUNC_INFO << obj; - } virtual Tomahawk::playlistinterface_ptr getSharedPointer() { if ( m_sharedPtr.isNull() ) { - m_sharedPtr = Tomahawk::playlistinterface_ptr( this, dontDelete ); + m_sharedPtr = Tomahawk::playlistinterface_ptr( this ); } return m_sharedPtr; diff --git a/src/libtomahawk/sourceplaylistinterface.h b/src/libtomahawk/sourceplaylistinterface.h index 6ff1822dd..1b23f5af3 100644 --- a/src/libtomahawk/sourceplaylistinterface.h +++ b/src/libtomahawk/sourceplaylistinterface.h @@ -77,8 +77,6 @@ private slots: void resolvingFinished( bool hasResults ); private: - SourcePlaylistInterface(); - Tomahawk::source_ptr m_source; Tomahawk::result_ptr m_currentItem; bool m_gotNextItem;