From cdddb3bdf420a7751befcaaeebc94e5728ade22c Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 23 Nov 2010 08:31:20 +0100
Subject: [PATCH] * DRY: No need to reimplement previous- & nextItem over and
 over again.

---
 include/tomahawk/album.h             |  2 --
 include/tomahawk/playlistinterface.h |  4 ++--
 src/playlist/albummodel.h            |  2 --
 src/playlist/albumproxymodel.cpp     | 14 --------------
 src/playlist/albumproxymodel.h       |  2 --
 src/playlist/trackmodel.h            |  2 --
 src/playlist/trackproxymodel.cpp     | 14 --------------
 src/playlist/trackproxymodel.h       |  2 --
 8 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/include/tomahawk/album.h b/include/tomahawk/album.h
index 452c8fcd2..f140a0fcc 100644
--- a/include/tomahawk/album.h
+++ b/include/tomahawk/album.h
@@ -30,8 +30,6 @@ public:
     QList<Tomahawk::query_ptr> tracks();
 
     virtual int trackCount() const { return m_queries.count(); }
-    virtual Tomahawk::result_ptr previousItem() { return siblingItem( -1 ); }
-    virtual Tomahawk::result_ptr nextItem() { return siblingItem( 1 ); }
     virtual Tomahawk::result_ptr siblingItem( int itemsAway );
 
     virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
diff --git a/include/tomahawk/playlistinterface.h b/include/tomahawk/playlistinterface.h
index 512851a25..54f22d047 100644
--- a/include/tomahawk/playlistinterface.h
+++ b/include/tomahawk/playlistinterface.h
@@ -15,8 +15,8 @@ public:
 
     virtual int trackCount() const = 0;
 
-    virtual Tomahawk::result_ptr previousItem() = 0;
-    virtual Tomahawk::result_ptr nextItem() = 0;
+    virtual Tomahawk::result_ptr previousItem() { return siblingItem( -1 ); }
+    virtual Tomahawk::result_ptr nextItem() { return siblingItem( 1 ); }
     virtual Tomahawk::result_ptr siblingItem( int itemsAway ) = 0;
 
     virtual PlaylistInterface::RepeatMode repeatMode() const = 0;
diff --git a/src/playlist/albummodel.h b/src/playlist/albummodel.h
index cf494396d..1f96442cd 100644
--- a/src/playlist/albummodel.h
+++ b/src/playlist/albummodel.h
@@ -38,8 +38,6 @@ public:
     virtual void removeIndex( const QModelIndex& index );
     virtual void removeIndexes( const QList<QModelIndex>& indexes );
 
-    virtual Tomahawk::result_ptr previousItem() { return Tomahawk::result_ptr(); }
-    virtual Tomahawk::result_ptr nextItem() { return Tomahawk::result_ptr(); }
     virtual Tomahawk::result_ptr siblingItem( int direction ) { return Tomahawk::result_ptr(); }
 
     virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
diff --git a/src/playlist/albumproxymodel.cpp b/src/playlist/albumproxymodel.cpp
index d5535460b..9c88ed6b6 100644
--- a/src/playlist/albumproxymodel.cpp
+++ b/src/playlist/albumproxymodel.cpp
@@ -94,20 +94,6 @@ AlbumProxyModel::removeIndexes( const QList<QModelIndex>& indexes )
 }
 
 
-Tomahawk::result_ptr
-AlbumProxyModel::previousItem()
-{
-    return siblingItem( -1 );
-}
-
-
-Tomahawk::result_ptr
-AlbumProxyModel::nextItem()
-{
-    return siblingItem( 1 );
-}
-
-
 Tomahawk::result_ptr
 AlbumProxyModel::siblingItem( int itemsAway )
 {
diff --git a/src/playlist/albumproxymodel.h b/src/playlist/albumproxymodel.h
index f1fa1c95c..bce853224 100644
--- a/src/playlist/albumproxymodel.h
+++ b/src/playlist/albumproxymodel.h
@@ -22,8 +22,6 @@ public:
     virtual void removeIndex( const QModelIndex& index );
     virtual void removeIndexes( const QList<QModelIndex>& indexes );
 
-    virtual Tomahawk::result_ptr previousItem();
-    virtual Tomahawk::result_ptr nextItem();
     virtual Tomahawk::result_ptr siblingItem( int direction );
 
     void setFilterRegExp( const QString& pattern );
diff --git a/src/playlist/trackmodel.h b/src/playlist/trackmodel.h
index c00d56210..2ecd7088d 100644
--- a/src/playlist/trackmodel.h
+++ b/src/playlist/trackmodel.h
@@ -42,8 +42,6 @@ public:
     virtual void removeIndex( const QModelIndex& index );
     virtual void removeIndexes( const QList<QModelIndex>& indexes );
 
-    virtual Tomahawk::result_ptr previousItem() { return Tomahawk::result_ptr(); }
-    virtual Tomahawk::result_ptr nextItem() { return Tomahawk::result_ptr(); }
     virtual Tomahawk::result_ptr siblingItem( int direction ) { return Tomahawk::result_ptr(); }
 
     virtual QMimeData* mimeData( const QModelIndexList& indexes ) const;
diff --git a/src/playlist/trackproxymodel.cpp b/src/playlist/trackproxymodel.cpp
index 57e7f8faa..34379f843 100644
--- a/src/playlist/trackproxymodel.cpp
+++ b/src/playlist/trackproxymodel.cpp
@@ -44,20 +44,6 @@ TrackProxyModel::setFilterRegExp( const QString& pattern )
 }
 
 
-Tomahawk::result_ptr
-TrackProxyModel::previousItem()
-{
-    return siblingItem( -1 );
-}
-
-
-Tomahawk::result_ptr
-TrackProxyModel::nextItem()
-{
-    return siblingItem( 1 );
-}
-
-
 Tomahawk::result_ptr
 TrackProxyModel::siblingItem( int itemsAway )
 {
diff --git a/src/playlist/trackproxymodel.h b/src/playlist/trackproxymodel.h
index 01ea929e8..90e9fbeff 100644
--- a/src/playlist/trackproxymodel.h
+++ b/src/playlist/trackproxymodel.h
@@ -24,8 +24,6 @@ public:
     virtual void removeIndex( const QModelIndex& index );
     virtual void removeIndexes( const QList<QModelIndex>& indexes );
 
-    virtual Tomahawk::result_ptr previousItem();
-    virtual Tomahawk::result_ptr nextItem();
     virtual Tomahawk::result_ptr siblingItem( int itemsAway );
 
     void setFilterRegExp( const QString& pattern );