From a9bf18e17f296f0795d40f7adfac46ddb3d058da Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 29 Jun 2012 02:28:02 +0200
Subject: [PATCH] * Use new PlayableModel API throughout app.
---
src/libtomahawk/playlist/PlaylistView.cpp | 4 ++--
src/libtomahawk/playlist/QueueProxyModel.cpp | 4 ++--
src/libtomahawk/playlist/TrackView.cpp | 4 ++--
src/libtomahawk/playlist/dynamic/DynamicModel.h | 2 +-
src/libtomahawk/playlist/dynamic/DynamicView.cpp | 2 +-
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/libtomahawk/playlist/PlaylistView.cpp b/src/libtomahawk/playlist/PlaylistView.cpp
index ef62eca80..5b7fdff59 100644
--- a/src/libtomahawk/playlist/PlaylistView.cpp
+++ b/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() );
}
diff --git a/src/libtomahawk/playlist/QueueProxyModel.cpp b/src/libtomahawk/playlist/QueueProxyModel.cpp
index 2a9fd5f4f..78a0f7cb0 100644
--- a/src/libtomahawk/playlist/QueueProxyModel.cpp
+++ b/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 );
}
diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp
index fe58e550e..908f0a9fb 100644
--- a/src/libtomahawk/playlist/TrackView.cpp
+++ b/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 );
}
}
diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.h b/src/libtomahawk/playlist/dynamic/DynamicModel.h
index 304059e57..683f4c2d4 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicModel.h
+++ b/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; }
diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
index a1643195d..acd6aec43 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp
+++ b/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 );
}
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index bf323dcb9..8cebb8fea 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/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();
}