* Moved and renamed PlaylistView::deleteItems() to TrackView::deleteSelectedItems().

src/libtomahawk/playlist/PlaylistView.cpp

@@ -88,12 +88,6 @@ PlaylistView::keyPressEvent( QKeyEvent* event )
 
     if ( !model() )
         return;
-
-    if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !model()->isReadOnly() )
-    {
-        qDebug() << "Removing selected items";
-        deleteItems();
-    }
 }
 
 
@@ -129,13 +123,6 @@ PlaylistView::eventFilter( QObject* obj, QEvent* event )
 }
 
 
-void
-PlaylistView::deleteItems()
-{
-    proxyModel()->removeIndexes( selectedIndexes() );
-}
-
-
 QList<PlaylistUpdaterInterface*>
 PlaylistView::updaters() const
 {
@@ -183,10 +170,6 @@ PlaylistView::onMenuTriggered( int action )
 {
     switch ( action )
     {
-        case ContextMenu::ActionDelete:
-            deleteItems();
-            break;
-
         default:
             break;
     }

src/libtomahawk/playlist/PlaylistView.h

@@ -54,7 +54,6 @@ protected:
 
 private slots:
     void onMenuTriggered( int action );
-    void deleteItems();
 
     void onDeleted();
     void onChanged();

src/libtomahawk/playlist/TrackView.cpp

@@ -324,6 +324,11 @@ TrackView::keyPressEvent( QKeyEvent* event )
     {
         onItemActivated( currentIndex() );
     }
+    if ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace )
+    {
+        tDebug() << "Removing selected items from playlist";
+        deleteSelectedItems();
+    }
 }
 
 
@@ -593,6 +598,10 @@ TrackView::onMenuTriggered( int action )
             onItemActivated( m_contextMenuIndex );
             break;
 
+        case ContextMenu::ActionDelete:
+            deleteSelectedItems();
+            break;
+
         default:
             break;
     }
@@ -741,3 +750,17 @@ TrackView::setFilter( const QString& filter )
     m_proxyModel->setFilter( filter );
     return true;
 }
+
+
+void
+TrackView::deleteSelectedItems()
+{
+    if ( !model()->isReadOnly() )
+    {
+        proxyModel()->removeIndexes( selectedIndexes() );
+    }
+    else
+    {
+        tDebug() << Q_FUNC_INFO << "Error: Model is read-only!";
+    }
+}

src/libtomahawk/playlist/TrackView.h

@@ -86,6 +86,8 @@ public:
 public slots:
     virtual void onItemActivated( const QModelIndex& index );
 
+    void deleteSelectedItems();
+
     void playItem();
     void onMenuTriggered( int action );