From e316534dc0f0ec9921e33402b7da10a6702fc832 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 26 Jun 2012 02:57:12 +0200
Subject: [PATCH] * Split up CTOR and setSource methods.

---
 .../playlist/RecentlyPlayedModel.cpp          | 40 +++++++++++--------
 .../playlist/RecentlyPlayedModel.h            |  5 ++-
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp
index 5902ee44a..ec9b66a80 100644
--- a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp
+++ b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp
@@ -34,25 +34,10 @@
 using namespace Tomahawk;
 
 
-RecentlyPlayedModel::RecentlyPlayedModel( const source_ptr& source, QObject* parent )
+RecentlyPlayedModel::RecentlyPlayedModel( QObject* parent )
     : PlaylistModel( parent )
-    , m_source( source )
     , m_limit( HISTORY_TRACK_ITEMS )
 {
-    if ( source.isNull() )
-    {
-        if ( SourceList::instance()->isReady() )
-            onSourcesReady();
-        else
-            connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onSourcesReady() ) );
-
-        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
-    }
-    else
-    {
-        onSourceAdded( source );
-        loadHistory();
-    }
 }
 
 
@@ -68,7 +53,7 @@ RecentlyPlayedModel::loadHistory()
     {
         clear();
     }
-    loadingStarted();
+    startLoading();
 
     DatabaseCommand_PlaybackHistory* cmd = new DatabaseCommand_PlaybackHistory( m_source );
     cmd->setLimit( m_limit );
@@ -92,6 +77,27 @@ RecentlyPlayedModel::onSourcesReady()
 }
 
 
+void
+RecentlyPlayedModel::setSource( const Tomahawk::source_ptr& source )
+{
+    m_source = source;
+    if ( source.isNull() )
+    {
+        if ( SourceList::instance()->isReady() )
+            onSourcesReady();
+        else
+            connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onSourcesReady() ) );
+
+        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
+    }
+    else
+    {
+        onSourceAdded( source );
+        loadHistory();
+    }
+}
+
+
 void
 RecentlyPlayedModel::onSourceAdded( const Tomahawk::source_ptr& source )
 {
diff --git a/src/libtomahawk/playlist/RecentlyPlayedModel.h b/src/libtomahawk/playlist/RecentlyPlayedModel.h
index 78573ee95..8ec9328e0 100644
--- a/src/libtomahawk/playlist/RecentlyPlayedModel.h
+++ b/src/libtomahawk/playlist/RecentlyPlayedModel.h
@@ -32,7 +32,7 @@ class DLLEXPORT RecentlyPlayedModel : public PlaylistModel
 Q_OBJECT
 
 public:
-    explicit RecentlyPlayedModel( const Tomahawk::source_ptr& source, QObject* parent = 0 );
+    explicit RecentlyPlayedModel( QObject* parent = 0 );
     ~RecentlyPlayedModel();
 
     unsigned int limit() const { return m_limit; }
@@ -40,6 +40,9 @@ public:
 
     bool isTemporary() const;
 
+public slots:
+    void setSource( const Tomahawk::source_ptr& source );
+
 private slots:
     void onSourcesReady();
     void onSourceAdded( const Tomahawk::source_ptr& source );