From b9a909eb561fadad8c90183ea40b9c99531c785a Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 14 Jul 2012 12:43:13 +0200
Subject: [PATCH] * Properly store / restore DynamicQmlWidgets.

---
 src/libtomahawk/ViewManager.cpp | 9 ++-------
 src/libtomahawk/ViewManager.h   | 3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index ebdedd7d5..9893378e6 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -190,14 +190,9 @@ ViewManager::show( const Tomahawk::playlist_ptr& playlist )
 Tomahawk::ViewPage*
 ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist )
 {
-    DynamicQmlWidget* w = new Tomahawk::DynamicQmlWidget( playlist, m_stack );
-    setPage( w );
-    return w;
-
-    //// OLD FOO
     if ( !m_dynamicWidgets.contains( playlist ) || m_dynamicWidgets.value( playlist ).isNull() )
     {
-       m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicWidget( playlist, m_stack );
+       m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicQmlWidget( playlist, m_stack );
 
        playlist->resolve();
     }
@@ -855,7 +850,7 @@ ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) c
 Tomahawk::dynplaylist_ptr
 ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interface ) const
 {
-    foreach ( QWeakPointer<DynamicWidget> view, m_dynamicWidgets.values() )
+    foreach ( QWeakPointer<DynamicQmlWidget> view, m_dynamicWidgets.values() )
     {
         if ( !view.isNull() && view.data()->playlistInterface() == interface )
         {
diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h
index 71a942ec7..5e97bb73f 100644
--- a/src/libtomahawk/ViewManager.h
+++ b/src/libtomahawk/ViewManager.h
@@ -59,6 +59,7 @@ class QPushButton;
 namespace Tomahawk
 {
     class DynamicWidget;
+    class DynamicQmlWidget;
 }
 
 class DLLEXPORT ViewManager : public QObject
@@ -199,7 +200,7 @@ private:
 
     QList< Tomahawk::collection_ptr > m_superCollections;
 
-    QHash< Tomahawk::dynplaylist_ptr, QWeakPointer<Tomahawk::DynamicWidget> > m_dynamicWidgets;
+    QHash< Tomahawk::dynplaylist_ptr, QWeakPointer<Tomahawk::DynamicQmlWidget> > m_dynamicWidgets;
     QHash< Tomahawk::collection_ptr, QWeakPointer<TreeView> > m_treeViews;
     QHash< Tomahawk::artist_ptr, QWeakPointer<ArtistInfoWidget> > m_artistViews;
     QHash< Tomahawk::album_ptr, QWeakPointer<AlbumInfoWidget> > m_albumViews;