From bff7f01e22794f9e5abbacb68a34a77d11021e8f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 31 May 2012 21:28:37 +0200 Subject: [PATCH] * Fixed warnings and added itemCountChanged( uint ) signal to PlayableModel. --- src/libtomahawk/playlist/PlayableModel.cpp | 8 ++++++++ src/libtomahawk/playlist/PlayableModel.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp index e3a6c66db..00036d987 100644 --- a/src/libtomahawk/playlist/PlayableModel.cpp +++ b/src/libtomahawk/playlist/PlayableModel.cpp @@ -210,6 +210,7 @@ PlayableModel::queryData( const query_ptr& query, int column, int role ) const break; case AlbumPos: + { QString tPos; if ( query->albumpos() != 0 ) { @@ -220,6 +221,10 @@ PlayableModel::queryData( const query_ptr& query, int column, int role ) const return QString( "%1.%2" ).arg( QString::number( query->discnumber() ) ) .arg( tPos ); } + } + break; + + default: break; } if ( query->numResults() ) @@ -251,6 +256,9 @@ PlayableModel::queryData( const query_ptr& query, int column, int role ) const case Score: return query->results().first()->score(); break; + + default: + break; } } diff --git a/src/libtomahawk/playlist/PlayableModel.h b/src/libtomahawk/playlist/PlayableModel.h index 28db6a001..c529850e6 100644 --- a/src/libtomahawk/playlist/PlayableModel.h +++ b/src/libtomahawk/playlist/PlayableModel.h @@ -81,6 +81,7 @@ public: virtual void setIcon( const QPixmap& pixmap ) { m_icon = pixmap; } virtual int trackCount() const { return rowCount( QModelIndex() ); } + virtual int itemCount() const { return rowCount( QModelIndex() ); } virtual int rowCount( const QModelIndex& parent ) const; virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const; @@ -117,6 +118,7 @@ signals: void shuffleModeChanged( bool enabled ); void trackCountChanged( unsigned int tracks ); + void itemCountChanged( unsigned int items ); void loadingStarted(); void loadingFinished();