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

* Use QSharedPointers in DbCmd_AllTracks.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-01-14 08:33:28 +01:00
parent ff9a033e1e
commit 7ffe53b745
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/albumplaylistinterface.cpp
View File

@@ -88,11 +88,11 @@ AlbumPlaylistInterface::tracks()
if ( m_queries.isEmpty() && m_album ) if ( m_queries.isEmpty() && m_album )
{ {
DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks(); DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks();
cmd->setAlbum( m_album.data() ); cmd->setAlbum( m_album );
cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
m_album.data(), SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) ); m_album.data(), SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) ); Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
} }

2
src/libtomahawk/artistplaylistinterface.cpp
View File

@@ -86,7 +86,7 @@ ArtistPlaylistInterface::tracks()
if ( m_queries.isEmpty() && m_artist ) if ( m_queries.isEmpty() && m_artist )
{ {
DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks(); DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks();
cmd->setArtist( m_artist.data() ); cmd->setArtist( m_artist );
cmd->setSortOrder( DatabaseCommand_AllTracks::Album ); cmd->setSortOrder( DatabaseCommand_AllTracks::Album );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),

2
src/libtomahawk/database/databasecommand_alltracks.cpp
View File

@@ -60,7 +60,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
{ {
if ( m_album->id() == 0 ) if ( m_album->id() == 0 )
{ {
m_artist = m_album->artist().data(); m_artist = m_album->artist();
albumToken = QString( "AND album.id IS NULL" ); albumToken = QString( "AND album.id IS NULL" );
} }
else else

8
src/libtomahawk/database/databasecommand_alltracks.h
View File

@@ -55,8 +55,8 @@ public:
virtual bool doesMutates() const { return false; } virtual bool doesMutates() const { return false; }
virtual QString commandname() const { return "alltracks"; } virtual QString commandname() const { return "alltracks"; }
void setArtist( Tomahawk::Artist* artist ) { m_artist = artist; } void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; }
void setAlbum( Tomahawk::Album* album ) { m_album = album; } void setAlbum( const Tomahawk::album_ptr& album ) { m_album = album; }
void setLimit( unsigned int amount ) { m_amount = amount; } void setLimit( unsigned int amount ) { m_amount = amount; }
void setSortOrder( DatabaseCommand_AllTracks::SortOrder order ) { m_sortOrder = order; } void setSortOrder( DatabaseCommand_AllTracks::SortOrder order ) { m_sortOrder = order; }
@@ -69,8 +69,8 @@ signals:
private: private:
Tomahawk::collection_ptr m_collection; Tomahawk::collection_ptr m_collection;
Tomahawk::Artist* m_artist; Tomahawk::artist_ptr m_artist;
Tomahawk::Album* m_album; Tomahawk::album_ptr m_album;
unsigned int m_amount; unsigned int m_amount;
DatabaseCommand_AllTracks::SortOrder m_sortOrder; DatabaseCommand_AllTracks::SortOrder m_sortOrder;

2
src/libtomahawk/playlist/treemodel.cpp
View File

@@ -654,7 +654,7 @@ TreeModel::addTracks( const album_ptr& album, const QModelIndex& parent, bool au
if ( m_mode == DatabaseMode ) if ( m_mode == DatabaseMode )
{ {
DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
cmd->setAlbum( album.data() ); cmd->setAlbum( album );
cmd->setData( QVariant( rows ) ); cmd->setData( QVariant( rows ) );
connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ), connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),