From 0c7f3309181fcbcf3a8a43f76ed545b7f577c331 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 3 Dec 2012 17:36:07 +0100 Subject: [PATCH] * Changed various classes to use the new itemCountChanged() signal. --- src/infoplugins/linux/mpris/MprisPlugin.cpp | 4 ++-- src/libtomahawk/playlist/PlayableModel.cpp | 5 ++--- src/libtomahawk/playlist/PlayableModel.h | 1 - src/libtomahawk/playlist/PlayableProxyModel.cpp | 2 ++ src/libtomahawk/playlist/PlayableProxyModel.h | 2 ++ .../playlist/PlayableProxyModelPlaylistInterface.cpp | 2 +- src/libtomahawk/playlist/PlaylistModel.cpp | 4 ++-- src/libtomahawk/playlist/QueueView.cpp | 2 +- src/libtomahawk/playlist/dynamic/DynamicModel.cpp | 2 +- src/libtomahawk/playlist/dynamic/DynamicView.cpp | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/infoplugins/linux/mpris/MprisPlugin.cpp b/src/infoplugins/linux/mpris/MprisPlugin.cpp index 98d9e20dd..d86e4a399 100644 --- a/src/infoplugins/linux/mpris/MprisPlugin.cpp +++ b/src/infoplugins/linux/mpris/MprisPlugin.cpp @@ -84,7 +84,7 @@ MprisPlugin::init() Tomahawk::playlistinterface_ptr playlist = AudioEngine::instance()->playlist(); if ( !playlist.isNull() ) { - connect( playlist.data(), SIGNAL( trackCountChanged( unsigned int ) ), + connect( playlist.data(), SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) ); } @@ -551,7 +551,7 @@ MprisPlugin::onPlaylistChanged( Tomahawk::playlistinterface_ptr playlist ) disconnect( this, SLOT( onTrackCountChanged( unsigned int ) ) ); if ( !playlist.isNull() ) - connect( playlist.data(), SIGNAL( trackCountChanged( unsigned int ) ), + connect( playlist.data(), SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) ); // Notify relevant changes diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp index 83b09a71e..c78872f01 100644 --- a/src/libtomahawk/playlist/PlayableModel.cpp +++ b/src/libtomahawk/playlist/PlayableModel.cpp @@ -538,7 +538,6 @@ PlayableModel::insertInternal( const QList< T >& items, int row ) { if ( !items.count() ) { - emit trackCountChanged( rowCount( QModelIndex() ) ); emit itemCountChanged( rowCount( QModelIndex() ) ); finishLoading(); @@ -567,7 +566,7 @@ PlayableModel::insertInternal( const QList< T >& items, int row ) } emit endInsertRows(); - emit trackCountChanged( rowCount( QModelIndex() ) ); + emit itemCountChanged( rowCount( QModelIndex() ) ); finishLoading(); } @@ -603,7 +602,7 @@ PlayableModel::removeIndex( const QModelIndex& index, bool moreToCome ) } if ( !moreToCome ) - emit trackCountChanged( rowCount( QModelIndex() ) ); + emit itemCountChanged( rowCount( QModelIndex() ) ); } diff --git a/src/libtomahawk/playlist/PlayableModel.h b/src/libtomahawk/playlist/PlayableModel.h index c9dcbf555..c0b1810ed 100644 --- a/src/libtomahawk/playlist/PlayableModel.h +++ b/src/libtomahawk/playlist/PlayableModel.h @@ -115,7 +115,6 @@ signals: void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode ); void shuffleModeChanged( bool enabled ); - void trackCountChanged( unsigned int tracks ); void itemCountChanged( unsigned int items ); void loadingStarted(); diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp index dd4dd7487..1778b4c72 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp @@ -106,6 +106,7 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel ) { disconnect( m_model, SIGNAL( loadingStarted() ), this, SIGNAL( loadingStarted() ) ); disconnect( m_model, SIGNAL( loadingFinished() ), this, SIGNAL( loadingFinished() ) ); + disconnect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), this, SIGNAL( itemCountChanged( unsigned int ) ) ); disconnect( m_model, SIGNAL( indexPlayable( QModelIndex ) ), this, SLOT( onIndexPlayable( QModelIndex ) ) ); } @@ -115,6 +116,7 @@ PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel ) { connect( m_model, SIGNAL( loadingStarted() ), SIGNAL( loadingStarted() ) ); connect( m_model, SIGNAL( loadingFinished() ), SIGNAL( loadingFinished() ) ); + connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SIGNAL( itemCountChanged( unsigned int ) ) ); connect( m_model, SIGNAL( indexPlayable( QModelIndex ) ), SLOT( onIndexPlayable( QModelIndex ) ) ); } diff --git a/src/libtomahawk/playlist/PlayableProxyModel.h b/src/libtomahawk/playlist/PlayableProxyModel.h index 88d7c033c..3db7f125a 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.h +++ b/src/libtomahawk/playlist/PlayableProxyModel.h @@ -96,6 +96,8 @@ signals: void indexPlayable( const QModelIndex& index ); void currentIndexChanged(); + void itemCountChanged( unsigned int items ); + protected: virtual bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const; virtual bool lessThan( const QModelIndex& left, const QModelIndex& right ) const; diff --git a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp index 0712bb7d3..02e5f6772 100644 --- a/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp @@ -41,7 +41,7 @@ PlayableProxyModelPlaylistInterface::PlayableProxyModelPlaylistInterface( Playab connect( proxyModel, SIGNAL( currentIndexChanged() ), SLOT( onModelChanged() ) ); connect( proxyModel, SIGNAL( indexPlayable( QModelIndex ) ), SLOT( onModelChanged() ) ); connect( proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onModelChanged() ) ); -// connect( proxyModel, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onModelChanged() ) ); + connect( proxyModel, SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onModelChanged() ) ); } diff --git a/src/libtomahawk/playlist/PlaylistModel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp index 655eac5b2..f470aa157 100644 --- a/src/libtomahawk/playlist/PlaylistModel.cpp +++ b/src/libtomahawk/playlist/PlaylistModel.cpp @@ -242,7 +242,7 @@ PlaylistModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int { if ( !entries.count() ) { - emit trackCountChanged( rowCount( QModelIndex() ) ); + emit itemCountChanged( rowCount( QModelIndex() ) ); finishLoading(); return; } @@ -293,7 +293,7 @@ PlaylistModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int finishLoading(); emit endInsertRows(); - emit trackCountChanged( rowCount( QModelIndex() ) ); + emit itemCountChanged( rowCount( QModelIndex() ) ); } diff --git a/src/libtomahawk/playlist/QueueView.cpp b/src/libtomahawk/playlist/QueueView.cpp index 5eaca075a..2d25eb3e1 100644 --- a/src/libtomahawk/playlist/QueueView.cpp +++ b/src/libtomahawk/playlist/QueueView.cpp @@ -55,7 +55,7 @@ QueueView::QueueView( AnimatedSplitter* parent ) // ui->queue->setEmptyTip( tr( "The queue is currently empty. Drop something to enqueue it!" ) ); ui->queue->setEmptyTip( QString() ); - connect( queueModel, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( updateLabel() ) ); + connect( queueModel, SIGNAL( itemCountChanged( unsigned int ) ), SLOT( updateLabel() ) ); connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( show() ) ); connect( this, SIGNAL( animationFinished() ), SLOT( onAnimationFinished() ) ); diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp index ad5ea0652..fb8839935 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp @@ -71,7 +71,7 @@ DynamicModel::loadPlaylist( const Tomahawk::dynplaylist_ptr& playlist, bool load PlaylistModel::loadPlaylist( m_playlist, m_playlist->mode() == Static ); if ( m_playlist->mode() == OnDemand && oldCount != rowCount( QModelIndex() ) ) - emit trackCountChanged( rowCount( QModelIndex() ) ); + emit itemCountChanged( rowCount( QModelIndex() ) ); } diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp index beaf51804..3b0de79ba 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp @@ -76,7 +76,7 @@ DynamicView::setDynamicModel( DynamicModel* model ) m_model = model; PlaylistView::setPlaylistModel( m_model ); - connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) ); + connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) ); connect( m_model, SIGNAL( checkForOverflow() ), SLOT( checkForOverflow() ) ); }