* Use new PlayableModel API throughout app.

src/libtomahawk/playlist/PlaylistView.cpp

@@ -92,7 +92,7 @@ PlaylistView::keyPressEvent( QKeyEvent* event )
     if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !model()->isReadOnly() )
     {
         qDebug() << "Removing selected items";
-        proxyModel()->remove( selectedIndexes() );
+        deleteItems();
     }
 }
 
@@ -132,7 +132,7 @@ PlaylistView::eventFilter( QObject* obj, QEvent* event )
 void
 PlaylistView::deleteItems()
 {
-    proxyModel()->remove( selectedIndexes() );
+    proxyModel()->removeIndexes( selectedIndexes() );
 }
 
 

src/libtomahawk/playlist/QueueProxyModel.cpp

@@ -52,7 +52,7 @@ QueueProxyModel::onPlaybackStarted( const Tomahawk::result_ptr& result )
         PlayableItem* item = itemFromIndex( mapToSource( idx ) );
         if ( item && item->query() && ( item->query()->results().contains( result ) ||
                                         item->query()->equals( result->toQuery() ) ) )
-            remove( idx );
+            removeIndex( idx );
     }
 }
 
@@ -61,7 +61,7 @@ void
 QueueProxyModel::onIndexActivated( const QModelIndex& index )
 {
     setCurrentIndex( QModelIndex() );
-    remove( index );
+    removeIndex( index );
 }
 
 

src/libtomahawk/playlist/TrackView.cpp

@@ -99,7 +99,7 @@ TrackView::TrackView( QWidget* parent )
     connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
     connect( this, SIGNAL( customContextMenuRequested( const QPoint& ) ), SLOT( onCustomContextMenu( const QPoint& ) ) );
     connect( m_contextMenu, SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
-    
+
     setProxyModel( new PlayableProxyModel( this ) );
 }
 
@@ -554,7 +554,7 @@ TrackView::startDrag( Qt::DropActions supportedActions )
     Qt::DropAction action = drag->exec( supportedActions, Qt::CopyAction );
     if ( action == Qt::MoveAction )
     {
-        m_proxyModel->remove( pindexes );
+        m_proxyModel->removeIndexes( pindexes );
     }
 }
 

src/libtomahawk/playlist/dynamic/DynamicModel.h

@@ -46,7 +46,7 @@ public:
 
     void loadPlaylist( const dynplaylist_ptr& playlist, bool loadEntries = true );
 
-    virtual void remove( const QModelIndex& index, bool moreToCome = false );
+    virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
 
     bool searchingForNext() const { return m_searchingForNext; }
 

src/libtomahawk/playlist/dynamic/DynamicView.cpp

@@ -260,7 +260,7 @@ DynamicView::collapseEntries( int startRow, int num, int numToKeep )
             todel << proxyModel()->index( startRow + i, k );
         }
     }
-    proxyModel()->remove( todel );
+    proxyModel()->removeIndexes( todel );
 }
 
 

src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp

@@ -442,7 +442,7 @@ DynamicWidget::steeringChanged()
         toRemove << m_view->proxyModel()->index( i, 0, QModelIndex() );
     }
 
-    m_view->proxyModel()->remove( toRemove );
+    m_view->proxyModel()->removeIndexes( toRemove );
 
     m_playlist->generator()->fetchNext();
 }