From f4a3db0c3701c6e3b1167c41926356c89b0d3f5f Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 26 Apr 2013 13:57:36 +0200
Subject: [PATCH] * Renamed (Dynamic)Playlist::load() to ::get().

---
 src/libtomahawk/Playlist.cpp                         | 4 ++--
 src/libtomahawk/Playlist.h                           | 2 +-
 src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp | 6 +++---
 src/libtomahawk/playlist/dynamic/DynamicPlaylist.h   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp
index ef4bcc382..0852c0479 100644
--- a/src/libtomahawk/Playlist.cpp
+++ b/src/libtomahawk/Playlist.cpp
@@ -161,14 +161,14 @@ Playlist::create( const source_ptr& author,
 
 
 playlist_ptr
-Playlist::load( const QString& guid )
+Playlist::get( const QString& guid )
 {
     playlist_ptr p;
 
     foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
     {
         p = source->dbCollection()->playlist( guid );
-        if ( !p.isNull() )
+        if ( p )
             return p;
     }
 
diff --git a/src/libtomahawk/Playlist.h b/src/libtomahawk/Playlist.h
index b6dd44d4e..667a2f126 100644
--- a/src/libtomahawk/Playlist.h
+++ b/src/libtomahawk/Playlist.h
@@ -93,7 +93,7 @@ friend class ::PlaylistModel;
 public:
     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
     static Tomahawk::playlist_ptr create( const source_ptr& author,
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
index f3c62968d..17f5ee8aa 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
@@ -124,17 +124,17 @@ DynamicPlaylist::setMode( int mode )
 
 
 dynplaylist_ptr
-DynamicPlaylist::load( const QString& guid )
+DynamicPlaylist::get( const QString& guid )
 {
     dynplaylist_ptr p;
 
     foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
     {
         p = source->dbCollection()->autoPlaylist( guid );
-        if ( p.isNull() )
+        if ( !p )
             p = source->dbCollection()->station( guid );
 
-        if ( !p.isNull() )
+        if ( p )
             return p;
     }
 
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
index 33b616996..256125709 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h
@@ -74,7 +74,7 @@ class DLLEXPORT DynamicPlaylist : public Tomahawk::Playlist
 public:
     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
     static Tomahawk::dynplaylist_ptr create( const source_ptr& author,