From 6d057732b59e6d786ec43894960a6534ef25a09b Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Thu, 31 May 2012 23:09:58 +0200
Subject: [PATCH] * Support new AlbumModel API.

---
 src/libtomahawk/playlist/AlbumProxyModel.cpp | 6 +++---
 src/libtomahawk/playlist/AlbumProxyModel.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libtomahawk/playlist/AlbumProxyModel.cpp b/src/libtomahawk/playlist/AlbumProxyModel.cpp
index 528805662..29d4bbf45 100644
--- a/src/libtomahawk/playlist/AlbumProxyModel.cpp
+++ b/src/libtomahawk/playlist/AlbumProxyModel.cpp
@@ -37,7 +37,7 @@ AlbumProxyModel::AlbumProxyModel( QObject* parent )
     setSortCaseSensitivity( Qt::CaseInsensitive );
     setDynamicSortFilter( true );
 
-    setSourceAlbumModel( 0 );
+    setSourcePlayableModel( 0 );
 }
 
 
@@ -51,7 +51,7 @@ AlbumProxyModel::setSourceModel( QAbstractItemModel* sourceModel )
 
 
 void
-AlbumProxyModel::setSourceAlbumModel( AlbumModel* sourceModel )
+AlbumProxyModel::setSourcePlayableModel( PlayableModel* sourceModel )
 {
     m_model = sourceModel;
 
@@ -125,7 +125,7 @@ AlbumProxyModel::removeIndex( const QModelIndex& index )
     if ( index.column() > 0 )
         return;
 
-    sourceModel()->removeIndex( mapToSource( index ) );
+    sourceModel()->remove( mapToSource( index ) );
 }
 
 
diff --git a/src/libtomahawk/playlist/AlbumProxyModel.h b/src/libtomahawk/playlist/AlbumProxyModel.h
index c0973caaa..f93356811 100644
--- a/src/libtomahawk/playlist/AlbumProxyModel.h
+++ b/src/libtomahawk/playlist/AlbumProxyModel.h
@@ -23,7 +23,7 @@
 #include <QSortFilterProxyModel>
 
 #include "PlaylistInterface.h"
-#include "playlist/AlbumModel.h"
+#include "playlist/PlayableModel.h"
 
 #include "DllMacro.h"
 
@@ -35,8 +35,8 @@ public:
     explicit AlbumProxyModel( QObject* parent = 0 );
     virtual ~AlbumProxyModel() {}
 
-    virtual AlbumModel* sourceModel() const { return m_model; }
-    virtual void setSourceAlbumModel( AlbumModel* sourceModel );
+    virtual PlayableModel* sourceModel() const { return m_model; }
+    virtual void setSourcePlayableModel( PlayableModel* sourceModel );
     virtual void setSourceModel( QAbstractItemModel* sourceModel );
 
     virtual int albumCount() const { return rowCount( QModelIndex() ); }
@@ -56,7 +56,7 @@ protected:
     bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
 
 private:
-    AlbumModel* m_model;
+    PlayableModel* m_model;
 
     Tomahawk::playlistinterface_ptr m_playlistInterface;
 };