[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/playlist
From:       Teo Mrnjavac <teo.mrnjavac () gmail ! com>
Date:       2009-07-16 21:03:57
Message-ID: 1247778237.169778.25253.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 998030 by mrnjavac:

Move dummy methods from Playlist::Model to Playlist::AbstractModel.

 M  +0 -6      PlaylistModel.h  
 M  +3 -3      proxymodels/AbstractModel.h  


--- trunk/extragear/multimedia/amarok/src/playlist/PlaylistModel.h #998029:998030
@@ -134,12 +134,6 @@
         // static member functions
         static QString prettyColumnName( Column index ); //!takes a Column enum and \
returns its string name  
-        //dummies: AbstractModel requires that a Playlist model supports searching, \
                which
-        // is implemented in a higher proxy.
-        void clearSearchTerm(){}
-        QString currentSearchTerm() { return QString(); }
-        int currentSearchFields() { return -1; }
-
     public slots:
         bool savePlaylist() const;
 
--- trunk/extragear/multimedia/amarok/src/playlist/proxymodels/AbstractModel.h \
#998029:998030 @@ -44,7 +44,7 @@
     /**
      * Clears the current search term.
      */
-    virtual void clearSearchTerm() = 0;
+    virtual void clearSearchTerm() {}    //dummy, needed by Playlist::Model
 
     /**
      * Reports if the current model exposes a given track.
@@ -57,13 +57,13 @@
      * Get the current search fields bitmask.
      * @return The current search fields.
      */
-    virtual int currentSearchFields() = 0;
+    virtual int currentSearchFields() { return -1; } //dummy, needed by \
Playlist::Model  
     /**
      * Get the current search term.
      * @return The curent search term.
      */
-    virtual QString currentSearchTerm() = 0;
+    virtual QString currentSearchTerm() { return QString(); }   //dummy, needed by \
Playlist::Model  
    /**
      * Returns the number of columns exposed by the current model.


[prev in list] [next in list] [prev in thread] [next in thread]