mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-21 05:11:44 +02:00
Code Issues Releases Wiki Activity

* Renamed (Dynamic)Playlist::load() to ::get().

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-26 13:57:36 +02:00
parent 83d5b56386
commit f4a3db0c37
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/Playlist.cpp
View File

@@ -161,14 +161,14 @@ Playlist::create( const source_ptr& author,
playlist_ptr playlist_ptr
Playlist::load( const QString& guid ) Playlist::get( const QString& guid )
{ {
playlist_ptr p; playlist_ptr p;
foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() ) foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
{ {
p = source->dbCollection()->playlist( guid ); p = source->dbCollection()->playlist( guid );
if ( !p.isNull() ) if ( p )
return p; return p;
} }

2
src/libtomahawk/Playlist.h
View File

@@ -93,7 +93,7 @@ friend class ::PlaylistModel;
public: public:
virtual ~Playlist(); virtual ~Playlist();
static Tomahawk::playlist_ptr load( const QString& guid ); static Tomahawk::playlist_ptr get( const QString& guid );
// one CTOR is private, only called by DatabaseCommand_LoadAllPlaylists // one CTOR is private, only called by DatabaseCommand_LoadAllPlaylists
static Tomahawk::playlist_ptr create( const source_ptr& author, static Tomahawk::playlist_ptr create( const source_ptr& author,

6
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@@ -124,17 +124,17 @@ DynamicPlaylist::setMode( int mode )
dynplaylist_ptr dynplaylist_ptr
DynamicPlaylist::load( const QString& guid ) DynamicPlaylist::get( const QString& guid )
{ {
dynplaylist_ptr p; dynplaylist_ptr p;
foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() ) foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
{ {
p = source->dbCollection()->autoPlaylist( guid ); p = source->dbCollection()->autoPlaylist( guid );
if ( p.isNull() ) if ( !p )
p = source->dbCollection()->station( guid ); p = source->dbCollection()->station( guid );
if ( !p.isNull() ) if ( p )
return p; return p;
} }

2
src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
View File

@@ -74,7 +74,7 @@ class DLLEXPORT DynamicPlaylist : public Tomahawk::Playlist
public: public:
virtual ~DynamicPlaylist(); virtual ~DynamicPlaylist();
static Tomahawk::dynplaylist_ptr load( const QString& guid ); static Tomahawk::dynplaylist_ptr get( const QString& guid );
/// Generate an empty dynamic playlist with default generator /// Generate an empty dynamic playlist with default generator
static Tomahawk::dynplaylist_ptr create( const source_ptr& author, static Tomahawk::dynplaylist_ptr create( const source_ptr& author,