From 7ffe53b745e4e12a337d0e118ac2f1d891afff81 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 14 Jan 2012 08:33:28 +0100 Subject: [PATCH] * Use QSharedPointers in DbCmd_AllTracks. --- src/libtomahawk/albumplaylistinterface.cpp | 6 +++--- src/libtomahawk/artistplaylistinterface.cpp | 2 +- src/libtomahawk/database/databasecommand_alltracks.cpp | 2 +- src/libtomahawk/database/databasecommand_alltracks.h | 8 ++++---- src/libtomahawk/playlist/treemodel.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libtomahawk/albumplaylistinterface.cpp b/src/libtomahawk/albumplaylistinterface.cpp index a929d09c6..3d44e32dc 100644 --- a/src/libtomahawk/albumplaylistinterface.cpp +++ b/src/libtomahawk/albumplaylistinterface.cpp @@ -88,11 +88,11 @@ AlbumPlaylistInterface::tracks() if ( m_queries.isEmpty() && m_album ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks(); - cmd->setAlbum( m_album.data() ); + cmd->setAlbum( m_album ); cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition ); - connect( cmd, SIGNAL( tracks( QList, QVariant ) ), - m_album.data(), SLOT( onTracksAdded( QList ) ) ); + connect( cmd, SIGNAL( tracks( QList, QVariant ) ), + m_album.data(), SLOT( onTracksAdded( QList ) ) ); Database::instance()->enqueue( QSharedPointer( cmd ) ); } diff --git a/src/libtomahawk/artistplaylistinterface.cpp b/src/libtomahawk/artistplaylistinterface.cpp index 6f22397ad..4ab49bc79 100644 --- a/src/libtomahawk/artistplaylistinterface.cpp +++ b/src/libtomahawk/artistplaylistinterface.cpp @@ -86,7 +86,7 @@ ArtistPlaylistInterface::tracks() if ( m_queries.isEmpty() && m_artist ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks(); - cmd->setArtist( m_artist.data() ); + cmd->setArtist( m_artist ); cmd->setSortOrder( DatabaseCommand_AllTracks::Album ); connect( cmd, SIGNAL( tracks( QList, QVariant ) ), diff --git a/src/libtomahawk/database/databasecommand_alltracks.cpp b/src/libtomahawk/database/databasecommand_alltracks.cpp index 8f528bd81..84bf66a43 100644 --- a/src/libtomahawk/database/databasecommand_alltracks.cpp +++ b/src/libtomahawk/database/databasecommand_alltracks.cpp @@ -60,7 +60,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi ) { if ( m_album->id() == 0 ) { - m_artist = m_album->artist().data(); + m_artist = m_album->artist(); albumToken = QString( "AND album.id IS NULL" ); } else diff --git a/src/libtomahawk/database/databasecommand_alltracks.h b/src/libtomahawk/database/databasecommand_alltracks.h index e8e109b5c..c03ebbb53 100644 --- a/src/libtomahawk/database/databasecommand_alltracks.h +++ b/src/libtomahawk/database/databasecommand_alltracks.h @@ -55,8 +55,8 @@ public: virtual bool doesMutates() const { return false; } virtual QString commandname() const { return "alltracks"; } - void setArtist( Tomahawk::Artist* artist ) { m_artist = artist; } - void setAlbum( Tomahawk::Album* album ) { m_album = album; } + void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; } + void setAlbum( const Tomahawk::album_ptr& album ) { m_album = album; } void setLimit( unsigned int amount ) { m_amount = amount; } void setSortOrder( DatabaseCommand_AllTracks::SortOrder order ) { m_sortOrder = order; } @@ -69,8 +69,8 @@ signals: private: Tomahawk::collection_ptr m_collection; - Tomahawk::Artist* m_artist; - Tomahawk::Album* m_album; + Tomahawk::artist_ptr m_artist; + Tomahawk::album_ptr m_album; unsigned int m_amount; DatabaseCommand_AllTracks::SortOrder m_sortOrder; diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp index d34e69821..c8cc17835 100644 --- a/src/libtomahawk/playlist/treemodel.cpp +++ b/src/libtomahawk/playlist/treemodel.cpp @@ -654,7 +654,7 @@ TreeModel::addTracks( const album_ptr& album, const QModelIndex& parent, bool au if ( m_mode == DatabaseMode ) { DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection ); - cmd->setAlbum( album.data() ); + cmd->setAlbum( album ); cmd->setData( QVariant( rows ) ); connect( cmd, SIGNAL( tracks( QList, QVariant ) ),