From fee2f3a01b2b5a2cec4709f11549ae718bfbe814 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Thu, 31 May 2012 23:10:27 +0200
Subject: [PATCH] * AlbumView now uses a PlayableModel internally.

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

diff --git a/src/libtomahawk/playlist/AlbumView.cpp b/src/libtomahawk/playlist/AlbumView.cpp
index 321d1d54b..11b12d8af 100644
--- a/src/libtomahawk/playlist/AlbumView.cpp
+++ b/src/libtomahawk/playlist/AlbumView.cpp
@@ -33,6 +33,7 @@
 #include "PlayableItem.h"
 #include "AlbumItemDelegate.h"
 #include "AlbumModel.h"
+#include "PlayableModel.h"
 #include "ContextMenu.h"
 #include "ViewManager.h"
 #include "utils/Logger.h"
@@ -115,14 +116,14 @@ AlbumView::setModel( QAbstractItemModel* model )
 
 
 void
-AlbumView::setAlbumModel( AlbumModel* model )
+AlbumView::setPlayableModel( PlayableModel* model )
 {
     m_inited = false;
     m_model = model;
 
     if ( m_proxyModel )
     {
-        m_proxyModel->setSourceAlbumModel( m_model );
+        m_proxyModel->setSourcePlayableModel( m_model );
         m_proxyModel->sort( 0 );
     }
 
@@ -202,8 +203,7 @@ AlbumView::layoutItems()
 #endif
         int rectWidth = contentsRect().width() - scrollbar - 3;
         int itemWidth = 160;
-        QSize itemSize = m_proxyModel->data( QModelIndex(), Qt::SizeHintRole ).toSize();
-        Q_UNUSED( itemSize ); // looks obsolete
+//        QSize itemSize = m_proxyModel->data( QModelIndex(), Qt::SizeHintRole ).toSize();
 
         int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) );
 //        int rightSpacing = rectWidth - ( itemsPerRow * ( itemSize.width() + 16 ) );
diff --git a/src/libtomahawk/playlist/AlbumView.h b/src/libtomahawk/playlist/AlbumView.h
index 0a231f002..a1f256d8b 100644
--- a/src/libtomahawk/playlist/AlbumView.h
+++ b/src/libtomahawk/playlist/AlbumView.h
@@ -34,9 +34,9 @@ namespace Tomahawk
     class ContextMenu;
 };
 
-class AlbumModel;
 class AnimatedSpinner;
 class AlbumItemDelegate;
+class PlayableModel;
 
 class DLLEXPORT AlbumView : public QListView, public Tomahawk::ViewPage
 {
@@ -48,13 +48,13 @@ public:
 
     void setProxyModel( AlbumProxyModel* model );
 
-    AlbumModel* model() const { return m_model; }
+    PlayableModel* model() const { return m_model; }
     AlbumProxyModel* proxyModel() const { return m_proxyModel; }
 
     bool autoFitItems() const { return m_autoFitItems; }
     void setAutoFitItems( bool b ) { m_autoFitItems = b; }
 
-    void setAlbumModel( AlbumModel* model );
+    void setPlayableModel( PlayableModel* model );
     void setModel( QAbstractItemModel* model );
 
     virtual QWidget* widget() { return this; }
@@ -91,7 +91,7 @@ private slots:
     void layoutItems();
 
 private:
-    AlbumModel* m_model;
+    PlayableModel* m_model;
     AlbumProxyModel* m_proxyModel;
     AlbumItemDelegate* m_delegate;
     AnimatedSpinner* m_loadingSpinner;