From a2f880d16079167ddcb23775884d82943f99df99 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 02:44:59 +0200 Subject: [PATCH] * Removed filter/setFilter methods from PlaylistInterfaces. --- src/libtomahawk/AlbumPlaylistInterface.h | 2 -- src/libtomahawk/ArtistPlaylistInterface.h | 2 -- src/libtomahawk/PlaylistInterface.h | 3 --- src/libtomahawk/PlaylistPlaylistInterface.h | 2 -- src/libtomahawk/SourcePlaylistInterface.h | 1 - .../PlayableProxyModelPlaylistInterface.cpp | 13 ------------- .../playlist/PlayableProxyModelPlaylistInterface.h | 1 - .../playlist/TreeProxyModelPlaylistInterface.cpp | 9 --------- .../playlist/TreeProxyModelPlaylistInterface.h | 6 ------ 9 files changed, 39 deletions(-) diff --git a/src/libtomahawk/AlbumPlaylistInterface.h b/src/libtomahawk/AlbumPlaylistInterface.h index 14d6efd19..b1caf14ff 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.h +++ b/src/libtomahawk/AlbumPlaylistInterface.h @@ -56,8 +56,6 @@ public: virtual void setRepeatMode( PlaylistModes::RepeatMode ) {} virtual void setShuffled( bool ) {} - virtual void setFilter( const QString& /*pattern*/ ) {} - signals: void tracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ); diff --git a/src/libtomahawk/ArtistPlaylistInterface.h b/src/libtomahawk/ArtistPlaylistInterface.h index 03b1b36bd..920923512 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.h +++ b/src/libtomahawk/ArtistPlaylistInterface.h @@ -55,8 +55,6 @@ public: virtual void setRepeatMode( PlaylistModes::RepeatMode ) {} virtual void setShuffled( bool ) {} - virtual void setFilter( const QString& /*pattern*/ ) {} - signals: void tracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection ); diff --git a/src/libtomahawk/PlaylistInterface.h b/src/libtomahawk/PlaylistInterface.h index 380c80430..b0efdb923 100644 --- a/src/libtomahawk/PlaylistInterface.h +++ b/src/libtomahawk/PlaylistInterface.h @@ -66,9 +66,6 @@ public: virtual PlaylistModes::LatchMode latchMode() const { return m_latchMode; } virtual void setLatchMode( PlaylistModes::LatchMode latchMode ) { m_latchMode = latchMode; } - virtual QString filter() const { return m_filter; } - virtual void setFilter( const QString& pattern ) { m_filter = pattern; } - virtual void reset() {} //TODO: Get rid of the next two functions once all playlsitinterfaces are factored out diff --git a/src/libtomahawk/PlaylistPlaylistInterface.h b/src/libtomahawk/PlaylistPlaylistInterface.h index 4db326431..c234a951a 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.h +++ b/src/libtomahawk/PlaylistPlaylistInterface.h @@ -55,8 +55,6 @@ public: virtual PlaylistModes::RepeatMode repeatMode() const { return PlaylistModes::NoRepeat; } virtual bool shuffled() const { return false; } - virtual void setFilter( const QString& /*pattern*/ ) {} - public slots: virtual void setRepeatMode( PlaylistModes::RepeatMode ) {} virtual void setShuffled( bool ) {} diff --git a/src/libtomahawk/SourcePlaylistInterface.h b/src/libtomahawk/SourcePlaylistInterface.h index cc09e4dc9..ccfc45e1b 100644 --- a/src/libtomahawk/SourcePlaylistInterface.h +++ b/src/libtomahawk/SourcePlaylistInterface.h @@ -59,7 +59,6 @@ public: virtual void setLatchMode( PlaylistModes::LatchMode latchMode ) { m_latchMode = latchMode; emit latchModeChanged( latchMode ); } virtual bool shuffled() const { return false; } - virtual void setFilter( const QString& /*pattern*/ ) {} virtual QWeakPointer< Tomahawk::Source > source() const; diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp index 96df71e03..d47b88be0 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp @@ -66,19 +66,6 @@ PlayableProxyModelPlaylistInterface::filter() const } -void -PlayableProxyModelPlaylistInterface::setFilter( const QString& pattern ) -{ - if ( m_proxyModel.isNull() ) - return; - - m_proxyModel.data()->setFilterRegExp( pattern ); - m_proxyModel.data()->emitFilterChanged( pattern ); - - emit trackCountChanged( trackCount() ); -} - - QList< Tomahawk::query_ptr > PlayableProxyModelPlaylistInterface::tracks() { diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h index bc785aa58..d26c1d1c3 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h @@ -50,7 +50,6 @@ public: virtual bool hasNextItem(); virtual QString filter() const; - virtual void setFilter( const QString& pattern ); virtual PlaylistModes::RepeatMode repeatMode() const { return m_repeatMode; } virtual bool shuffled() const { return m_shuffled; } diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index 294cba009..824589a55 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -56,15 +56,6 @@ TreeProxyModelPlaylistInterface::filter() const } -void -TreeProxyModelPlaylistInterface::setFilter( const QString& pattern ) -{ - if ( m_proxyModel.isNull() ) - return; - m_proxyModel.data()->newFilterFromPlaylistInterface( pattern ); -} - - int TreeProxyModelPlaylistInterface::unfilteredTrackCount() const { diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h index 2367f5e06..67137fe1a 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h @@ -50,12 +50,6 @@ public: virtual Tomahawk::result_ptr siblingItem( int direction, bool readOnly ); virtual QString filter() const; - virtual void setFilter( const QString& pattern ); - - virtual QString vanillaFilter() const { return PlaylistInterface::filter(); } - virtual void setVanillaFilter( const QString &filter ) { PlaylistInterface::setFilter( filter ); } - - virtual void sendTrackCount() { emit trackCountChanged( trackCount() ); } virtual PlaylistModes::RepeatMode repeatMode() const { return m_repeatMode; } virtual bool shuffled() const { return m_shuffled; }