mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 22:56:42 +02:00
Code Issues Releases Wiki Activity

* Resolved a bunch more hidden overloaded virtual methods in PlayableModel.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-29 03:12:09 +02:00
parent a9bf18e17f
commit 0c00cccc1f
2 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/libtomahawk/playlist/PlayableModel.cpp
View File

@@ -576,20 +576,6 @@ PlayableModel::queries() const
} }
template<typename T>
void
PlayableModel::insertInternal( const T& item, int row )
{
if ( item.isNull() )
return;
QList< T > list;
list << item;
insert( list, row );
}
template <typename T> template <typename T>
void void
PlayableModel::insertInternal( const QList< T >& items, int row ) PlayableModel::insertInternal( const QList< T >& items, int row )
@@ -828,84 +814,102 @@ PlayableModel::itemFromIndex( const QModelIndex& index ) const
void void
PlayableModel::append( const Tomahawk::artist_ptr& artist ) PlayableModel::appendArtist( const Tomahawk::artist_ptr& artist )
{ {
insert( artist, rowCount( QModelIndex() ) ); QList< artist_ptr > artists;
artists << artist;
appendArtists( artists );
} }
void void
PlayableModel::append( const Tomahawk::album_ptr& album ) PlayableModel::appendAlbum( const Tomahawk::album_ptr& album )
{ {
insert( album, rowCount( QModelIndex() ) ); QList< album_ptr > albums;
albums << album;
appendAlbums( albums );
} }
void void
PlayableModel::append( const Tomahawk::query_ptr& query ) PlayableModel::appendQuery( const Tomahawk::query_ptr& query )
{ {
insert( query, rowCount( QModelIndex() ) ); QList< query_ptr > queries;
queries << query;
appendQueries( queries );
} }
void void
PlayableModel::append( const QList< Tomahawk::artist_ptr >& artists ) PlayableModel::appendArtists( const QList< Tomahawk::artist_ptr >& artists )
{ {
insert( artists, rowCount( QModelIndex() ) ); insertArtists( artists, rowCount( QModelIndex() ) );
} }
void void
PlayableModel::append( const QList< Tomahawk::album_ptr >& albums ) PlayableModel::appendAlbums( const QList< Tomahawk::album_ptr >& albums )
{ {
insert( albums, rowCount( QModelIndex() ) ); insertAlbums( albums, rowCount( QModelIndex() ) );
} }
void void
PlayableModel::append( const QList< Tomahawk::query_ptr >& queries ) PlayableModel::appendQueries( const QList< Tomahawk::query_ptr >& queries )
{ {
insert( queries, rowCount( QModelIndex() ) ); insertQueries( queries, rowCount( QModelIndex() ) );
} }
void void
PlayableModel::insert( const Tomahawk::artist_ptr& artist, int row ) PlayableModel::insertArtist( const Tomahawk::artist_ptr& artist, int row )
{ {
insertInternal( artist, row ); QList< artist_ptr > artists;
artists << artist;
insertArtists( artists, row );
} }
void void
PlayableModel::insert( const Tomahawk::album_ptr& album, int row ) PlayableModel::insertAlbum( const Tomahawk::album_ptr& album, int row )
{ {
insertInternal( album, row ); QList< album_ptr > albums;
albums << album;
insertAlbums( albums, row );
} }
void void
PlayableModel::insert( const Tomahawk::query_ptr& query, int row ) PlayableModel::insertQuery( const Tomahawk::query_ptr& query, int row )
{ {
insertInternal( query, row ); QList< query_ptr > queries;
queries << query;
insertQueries( queries, row );
} }
void void
PlayableModel::insert( const QList< Tomahawk::artist_ptr >& artists, int row ) PlayableModel::insertArtists( const QList< Tomahawk::artist_ptr >& artists, int row )
{ {
insertInternal( artists, row ); insertInternal( artists, row );
} }
void void
PlayableModel::insert( const QList< Tomahawk::album_ptr >& albums, int row ) PlayableModel::insertAlbums( const QList< Tomahawk::album_ptr >& albums, int row )
{ {
insertInternal( albums, row ); insertInternal( albums, row );
} }
void void
PlayableModel::insert( const QList< Tomahawk::query_ptr >& queries, int row ) PlayableModel::insertQueries( const QList< Tomahawk::query_ptr >& queries, int row )
{ {
insertInternal( queries, row ); insertInternal( queries, row );
} }

26
src/libtomahawk/playlist/PlayableModel.h
View File

@@ -136,19 +136,19 @@ public slots:
virtual void clear(); virtual void clear();
virtual void append( const QList< Tomahawk::query_ptr >& queries ); virtual void appendQueries( const QList< Tomahawk::query_ptr >& queries );
virtual void append( const QList< Tomahawk::artist_ptr >& artists ); virtual void appendArtists( const QList< Tomahawk::artist_ptr >& artists );
virtual void append( const QList< Tomahawk::album_ptr >& albums ); virtual void appendAlbums( const QList< Tomahawk::album_ptr >& albums );
virtual void append( const Tomahawk::query_ptr& query ); virtual void appendQuery( const Tomahawk::query_ptr& query );
virtual void append( const Tomahawk::artist_ptr& artist ); virtual void appendArtist( const Tomahawk::artist_ptr& artist );
virtual void append( const Tomahawk::album_ptr& album ); virtual void appendAlbum( const Tomahawk::album_ptr& album );
virtual void insert( const QList< Tomahawk::query_ptr >& queries, int row = 0 ); virtual void insertQueries( const QList< Tomahawk::query_ptr >& queries, int row = 0 );
virtual void insert( const QList< Tomahawk::artist_ptr >& artists, int row = 0 ); virtual void insertArtists( const QList< Tomahawk::artist_ptr >& artists, int row = 0 );
virtual void insert( const QList< Tomahawk::album_ptr >& albums, int row = 0 ); virtual void insertAlbums( const QList< Tomahawk::album_ptr >& albums, int row = 0 );
virtual void insert( const Tomahawk::query_ptr& query, int row = 0 ); virtual void insertQuery( const Tomahawk::query_ptr& query, int row = 0 );
virtual void insert( const Tomahawk::artist_ptr& artist, int row = 0 ); virtual void insertArtist( const Tomahawk::artist_ptr& artist, int row = 0 );
virtual void insert( const Tomahawk::album_ptr& album, int row = 0 ); virtual void insertAlbum( const Tomahawk::album_ptr& album, int row = 0 );
virtual void remove( int row, bool moreToCome = false ); virtual void remove( int row, bool moreToCome = false );
virtual void removeIndex( const QModelIndex& index, bool moreToCome = false ); virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
@@ -170,8 +170,6 @@ private slots:
private: private:
template <typename T> template <typename T>
void insertInternal( const QList< T >& items, int row ); void insertInternal( const QList< T >& items, int row );
template <typename T>
void insertInternal( const T& item, int row );
Qt::Alignment columnAlignment( int column ) const; Qt::Alignment columnAlignment( int column ) const;