Merge branch 'master' into jreen-tpqt4-comp

.gitignore

@@ -10,3 +10,5 @@ moc_*
 *~
 /tomahawk
 thirdparty/qtweetlib/WARNING-twitter-api-keys
+.kdev4
+tomahawk.kdev4

include/tomahawk/infosystem.h

@@ -36,7 +36,7 @@ namespace InfoSystem {
 class InfoSystemCache;
     
 enum InfoType {
-    InfoTrackID,
+    InfoTrackID = 0,
     InfoTrackArtist,
     InfoTrackAlbum,
     InfoTrackGenre,

src/infosystem/infosystemcache.cpp

@@ -17,29 +17,128 @@
  */
 
 #include <QtDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QSettings>
 
 #include "infosystemcache.h"
 
-void
+
-Tomahawk::InfoSystem::InfoSystemCache::getCachedInfoSlot( Tomahawk::InfoSystem::InfoCacheCriteria criteria, QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, Tomahawk::InfoSystem::InfoCustomData customData )
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+
+InfoSystemCache::InfoSystemCache( QObject* parent )
+    : QObject(parent)
 {
     qDebug() << Q_FUNC_INFO;
-    if( !m_memCache.contains( type ) || !m_memCache[type].contains( criteria ) )
+    QString cacheBaseDir = QDesktopServices::storageLocation( QDesktopServices::CacheLocation );
+    for( int i = 0; i <= InfoNoInfo; i++ )
+    {
+        InfoType type = (InfoType)(i);
+        if( m_dirtySet.contains( type ) && m_dataCache.contains( type ) )
+        {
+            QString cacheDir = cacheBaseDir + QString::number( i );
+            QDir dir( cacheDir );
+            if( dir.exists() && QFile::exists( QString( cacheDir + '/' + QString::number( i ) ) ) )
+                loadCache( type, QString( cacheDir + '/' + QString::number( i ) ) );
+        }
+    }
+}
+
+
+InfoSystemCache::~InfoSystemCache()
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Saving infosystemcache to disk";
+    QString cacheBaseDir = QDesktopServices::storageLocation( QDesktopServices::CacheLocation );
+    for( int i = 0; i <= InfoNoInfo; i++ )
+    {
+        InfoType type = (InfoType)(i);
+        if( m_dirtySet.contains( type ) && m_dataCache.contains( type ) )
+        {
+            QString cacheDir = cacheBaseDir + QString::number( i );
+            saveCache( type, cacheDir );
+        }
+    }
+}
+
+
+void
+InfoSystemCache::getCachedInfoSlot( Tomahawk::InfoSystem::InfoCacheCriteria criteria, QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, Tomahawk::InfoSystem::InfoCustomData customData )
+{
+    qDebug() << Q_FUNC_INFO;
+    if( !m_dataCache.contains( type ) || !m_dataCache[type].contains( criteria ) )
     {
         emit notInCache( criteria, caller, type, input, customData );
         return;
     }
     
-    emit info( caller, type, input, m_memCache[type][criteria], customData );
+    emit info( caller, type, input, m_dataCache[type][criteria], customData );
 }
 
+
 void
-Tomahawk::InfoSystem::InfoSystemCache::updateCacheSlot( Tomahawk::InfoSystem::InfoCacheCriteria criteria, Tomahawk::InfoSystem::InfoType type, QVariant output )
+InfoSystemCache::updateCacheSlot( Tomahawk::InfoSystem::InfoCacheCriteria criteria, Tomahawk::InfoSystem::InfoType type, QVariant output )
 {
     qDebug() << Q_FUNC_INFO;
-    QHash< InfoCacheCriteria, QVariant > typecache;
+    QHash< InfoCacheCriteria, QVariant > typedatacache;
-    if( m_memCache.contains( type ) )
+    QHash< InfoCacheCriteria, QDateTime > typetimecache;
-        typecache = m_memCache[type];
+    typedatacache[criteria] = output;
-    typecache[criteria] = output;
+    typetimecache[criteria] = QDateTime::currentDateTimeUtc();
-    m_memCache[type] = typecache;
+    m_dataCache[type] = typedatacache;
+    m_timeCache[type] = typetimecache;
+    m_dirtySet.insert( type );
 }
+
+
+void
+InfoSystemCache::loadCache( InfoType type, const QString &cacheDir )
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+InfoSystemCache::saveCache( InfoType type, const QString &cacheDir )
+{
+    qDebug() << Q_FUNC_INFO;
+    QDir dir( cacheDir );
+    if( !dir.exists( cacheDir ) )
+    {
+        qDebug() << "Creating cache directory " << cacheDir;
+        if( !dir.mkpath( cacheDir ) )
+        {
+            qDebug() << "Failed to create cache dir! Bailing...";
+            return;
+        }
+    }
+
+    QSettings cacheFile( QString( cacheDir + '/' + QString::number( (int)type ) ), QSettings::IniFormat );
+    
+    foreach( InfoCacheCriteria criteria, m_dataCache[type].keys() )
+    {
+        cacheFile.beginGroup( "type_" +  QString::number( type ) );
+        cacheFile.beginWriteArray( "criteria" );
+        QStringList keys = criteria.keys();
+        for( int i = 0; i < criteria.size(); i++ )
+        {
+            cacheFile.setArrayIndex( i );
+            cacheFile.setValue( keys.at( i ), criteria[keys.at( i )] );
+        }
+        cacheFile.endArray();
+        cacheFile.setValue( "data", m_dataCache[type][criteria] );
+        cacheFile.setValue( "time", m_timeCache[type][criteria] );
+        cacheFile.endGroup();
+    }
+
+    m_dirtySet.remove( type );
+}
+
+
+} //namespace InfoSystem
+
+} //namespace Tomahawk

src/infosystem/infosystemcache.h

@@ -19,6 +19,7 @@
 #ifndef TOMAHAWK_INFOSYSTEMCACHE_H
 #define TOMAHAWK_INFOSYSTEMCACHE_H
 
+#include <QDateTime>
 #include <QObject>
 #include <QtDebug>
 
@@ -35,16 +36,9 @@ class InfoSystemCache : public QObject
 Q_OBJECT
 
 public:
-    InfoSystemCache( QObject *parent = 0 )
+    InfoSystemCache( QObject *parent = 0 );
-        : QObject( parent )
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
     
-    virtual ~InfoSystemCache()
+    virtual ~InfoSystemCache();
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
 
 signals:
     void notInCache( Tomahawk::InfoSystem::InfoCacheCriteria criteria, QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, Tomahawk::InfoSystem::InfoCustomData customData );
@@ -55,7 +49,12 @@ public slots:
     void updateCacheSlot( Tomahawk::InfoSystem::InfoCacheCriteria criteria, Tomahawk::InfoSystem::InfoType type, QVariant output );
     
 private:
-    QHash< InfoType, QHash< InfoCacheCriteria, QVariant > > m_memCache;
+    void loadCache( InfoType type, const QString &cache );
+    void saveCache( InfoType type, const QString &cache );
+    
+    QHash< InfoType, QHash< InfoCacheCriteria, QVariant > > m_dataCache;
+    QHash< InfoType, QHash< InfoCacheCriteria, QDateTime > > m_timeCache;
+    QSet< InfoType > m_dirtySet;
 };
 
 } //namespace InfoSystem

src/libtomahawk/CMakeLists.txt

@@ -78,7 +78,6 @@ set( libSources
     playlist/collectionflatmodel.cpp
     playlist/collectionview.cpp
     playlist/playlistmanager.cpp
-    playlist/plitem.cpp
     playlist/playlistmodel.cpp
     playlist/playlistproxymodel.cpp
     playlist/playlistview.cpp
@@ -86,6 +85,7 @@ set( libSources
     playlist/queueproxymodel.cpp
     playlist/queueview.cpp
     playlist/trackmodel.cpp
+    playlist/trackmodelitem.cpp
     playlist/trackproxymodel.cpp
     playlist/trackview.cpp
     playlist/trackheader.cpp
@@ -232,7 +232,6 @@ set( libHeaders
     playlist/collectionflatmodel.h
     playlist/collectionview.h
     playlist/playlistmanager.h
-    playlist/plitem.h
     playlist/playlistmodel.h
     playlist/playlistproxymodel.h
     playlist/playlistview.h
@@ -240,6 +239,7 @@ set( libHeaders
     playlist/queueproxymodel.h
     playlist/queueview.h
     playlist/trackmodel.h
+    playlist/trackmodelitem.h
     playlist/trackproxymodel.h
     playlist/trackview.h
     playlist/trackheader.h

src/libtomahawk/database/databasecommand_alltracks.cpp

@@ -138,6 +138,7 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
         QList<Tomahawk::result_ptr> results;
         results << result;
         qry->addResults( results );
+        qry->setResolveFinished( true );
         
         ql << qry;
     }

src/libtomahawk/playlist.cpp

@@ -229,6 +229,8 @@ Playlist::reportDeleted( const Tomahawk::playlist_ptr& self )
     qDebug() << Q_FUNC_INFO;
     Q_ASSERT( self.data() == this );
     m_source->collection()->deletePlaylist( self );
+    
+    emit deleted( self );
 }
 
 

src/libtomahawk/playlist.h

@@ -182,6 +182,9 @@ signals:
     /// renamed etc.
     void changed();
 
+    /// was deleted, eh?
+    void deleted( const Tomahawk::playlist_ptr& pl );
+    
     void repeatModeChanged( PlaylistInterface::RepeatMode mode );
     void shuffleModeChanged( bool enabled );
 

src/libtomahawk/playlist/collectionflatmodel.cpp

@@ -120,7 +120,7 @@ CollectionFlatModel::removeCollection( const collection_ptr& collection )
     QTime timer;
     timer.start();
 
-//    QList<PlItem*> plitems = m_collectionIndex.values( collection );
+//    QList<TrackModelItem*> plitems = m_collectionIndex.values( collection );
     QList< QPair< int, int > > rows;
     QList< QPair< int, int > > sortrows;
     QPair< int, int > row;
@@ -167,7 +167,7 @@ CollectionFlatModel::removeCollection( const collection_ptr& collection )
         emit beginRemoveRows( QModelIndex(), row.first, row.second );
         for ( int i = row.second; i >= row.first; i-- )
         {
-            PlItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
+            TrackModelItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
             delete item;
         }
         emit endRemoveRows();
@@ -212,12 +212,12 @@ CollectionFlatModel::processTracksToAdd()
     emit beginInsertRows( QModelIndex(), c, c + maxc - 1 );
     //beginResetModel();
 
-    PlItem* plitem;
+    TrackModelItem* plitem;
     QList< Tomahawk::query_ptr >::iterator iter = m_tracksToAdd.begin();
 
     for( int i = 0; i < maxc; ++i )
     {
-        plitem = new PlItem( *iter, m_rootItem );
+        plitem = new TrackModelItem( *iter, m_rootItem );
         plitem->index = createIndex( m_rootItem->children.count() - 1, 0, plitem );
 
         connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
@@ -245,7 +245,7 @@ CollectionFlatModel::onTracksRemoved( const QList<Tomahawk::query_ptr>& tracks )
     QList<Tomahawk::query_ptr> t = tracks;
     for ( int i = rowCount( QModelIndex() ); i >= 0 && t.count(); i-- )
     {
-        PlItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
+        TrackModelItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
         if ( !item )
             continue;
 
@@ -275,7 +275,7 @@ CollectionFlatModel::onTracksRemoved( const QList<Tomahawk::query_ptr>& tracks )
 void
 CollectionFlatModel::onDataChanged()
 {
-    PlItem* p = (PlItem*)sender();
+    TrackModelItem* p = (TrackModelItem*)sender();
 //    emit itemSizeChanged( p->index );
 
     if ( p )

src/libtomahawk/playlist/collectionflatmodel.h

@@ -23,7 +23,7 @@
 #include <QList>
 #include <QHash>
 
-#include "plitem.h"
+#include "trackmodelitem.h"
 #include "trackmodel.h"
 #include "collection.h"
 #include "query.h"

src/libtomahawk/playlist/collectionmodel.cpp

@@ -40,7 +40,6 @@ CollectionModel::CollectionModel( QObject* parent )
 
 CollectionModel::~CollectionModel()
 {
-//    delete m_rootItem;
 }
 
 
@@ -50,8 +49,8 @@ CollectionModel::index( int row, int column, const QModelIndex& parent ) const
     if ( !m_rootItem || row < 0 || column < 0 )
         return QModelIndex();
 
-    PlItem* parentItem = itemFromIndex( parent );
+    TrackModelItem* parentItem = itemFromIndex( parent );
-    PlItem* childItem = parentItem->children.value( row );
+    TrackModelItem* childItem = parentItem->children.value( row );
     if ( !childItem )
         return QModelIndex();
 
@@ -65,7 +64,7 @@ CollectionModel::rowCount( const QModelIndex& parent ) const
     if ( parent.column() > 0 )
         return 0;
 
-    PlItem* parentItem = itemFromIndex( parent );
+    TrackModelItem* parentItem = itemFromIndex( parent );
     if ( !parentItem )
         return 0;
 
@@ -83,15 +82,15 @@ CollectionModel::columnCount( const QModelIndex& parent ) const
 QModelIndex
 CollectionModel::parent( const QModelIndex& child ) const
 {
-    PlItem* entry = itemFromIndex( child );
+    TrackModelItem* entry = itemFromIndex( child );
     if ( !entry )
         return QModelIndex();
 
-    PlItem* parentEntry = entry->parent;
+    TrackModelItem* parentEntry = entry->parent;
     if ( !parentEntry )
         return QModelIndex();
 
-    PlItem* grandparentEntry = parentEntry->parent;
+    TrackModelItem* grandparentEntry = parentEntry->parent;
     if ( !grandparentEntry )
         return QModelIndex();
 
@@ -106,7 +105,7 @@ CollectionModel::data( const QModelIndex& index, int role ) const
     if ( role != Qt::DisplayRole )
         return QVariant();
 
-    PlItem* entry = itemFromIndex( index );
+    TrackModelItem* entry = itemFromIndex( index );
     if ( !entry )
         return QVariant();
 
@@ -199,7 +198,7 @@ CollectionModel::removeCollection( const collection_ptr& collection )
     disconnect( collection.data(), SIGNAL( tracksFinished( Tomahawk::collection_ptr ) ),
                 this, SLOT( onTracksAddingFinished( Tomahawk::collection_ptr ) ) );
 
-    QList<PlItem*> plitems = m_collectionIndex.values( collection );
+    QList<TrackModelItem*> plitems = m_collectionIndex.values( collection );
 
     m_collectionIndex.remove( collection );
 }
@@ -210,17 +209,17 @@ CollectionModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const
 {
 //    int c = rowCount( QModelIndex() );
 
-    PlItem* plitem;
+    TrackModelItem* plitem;
     foreach( const Tomahawk::query_ptr& query, tracks )
     {
-        PlItem* parent = m_rootItem;
+        TrackModelItem* parent = m_rootItem;
         if ( parent->hash.contains( query->artist() ) )
         {
             parent = parent->hash.value( query->artist() );
         }
         else
         {
-            parent = new PlItem( query->artist(), m_rootItem );
+            parent = new TrackModelItem( query->artist(), m_rootItem );
             m_rootItem->hash.insert( query->artist(), parent );
         }
 
@@ -232,14 +231,14 @@ CollectionModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const
         }
         else
         {
-            PlItem* subitem = new PlItem( query->album(), parent );
+            TrackModelItem* subitem = new TrackModelItem( query->album(), parent );
             parent->hash.insert( query->album(), subitem );
             parent->childCount++;
             subitem->childCount++;
             parent = subitem;
         }
 
-        plitem = new PlItem( query, parent );
+        plitem = new TrackModelItem( query, parent );
         m_collectionIndex.insertMulti( collection, plitem );
     }
 
@@ -275,11 +274,11 @@ CollectionModel::onSourceOffline( Tomahawk::source_ptr src )
 }
 
 
-PlItem*
+TrackModelItem*
 CollectionModel::itemFromIndex( const QModelIndex& index ) const
 {
     if ( index.isValid() )
-        return static_cast<PlItem*>( index.internalPointer() );
+        return static_cast<TrackModelItem*>( index.internalPointer() );
     else
     {
         return m_rootItem;

src/libtomahawk/playlist/collectionmodel.h

@@ -23,7 +23,7 @@
 #include <QList>
 #include <QHash>
 
-#include "plitem.h"
+#include "trackmodelitem.h"
 #include "collection.h"
 #include "query.h"
 #include "typedefs.h"
@@ -62,7 +62,7 @@ public:
     virtual void setRepeatMode( PlaylistInterface::RepeatMode mode ) {}
     virtual void setShuffled( bool shuffled ) {}
 
-    PlItem* itemFromIndex( const QModelIndex& index ) const;
+    TrackModelItem* itemFromIndex( const QModelIndex& index ) const;
 
 signals:
     void repeatModeChanged( PlaylistInterface::RepeatMode mode );
@@ -79,8 +79,8 @@ private slots:
     void onSourceOffline( Tomahawk::source_ptr src );
 
 private:
-    PlItem* m_rootItem;
+    TrackModelItem* m_rootItem;
-    QMap< Tomahawk::collection_ptr, PlItem* > m_collectionIndex;
+    QMap< Tomahawk::collection_ptr, TrackModelItem* > m_collectionIndex;
 };
 
 #endif // COLLECTIONMODEL_H

src/libtomahawk/playlist/collectionproxymodel.cpp

@@ -35,8 +35,8 @@ CollectionProxyModel::CollectionProxyModel( QObject* parent )
 bool
 CollectionProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
 {
-    PlItem* p1 = itemFromIndex( left );
+    TrackModelItem* p1 = itemFromIndex( left );
-    PlItem* p2 = itemFromIndex( right );
+    TrackModelItem* p2 = itemFromIndex( right );
 
     if ( !p1 )
         return true;

src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp

@@ -265,6 +265,8 @@ DynamicPlaylist::reportDeleted( const Tomahawk::dynplaylist_ptr& self )
     Q_ASSERT( self.data() == this );
     // will emit Collection::playlistDeleted(...)
     author()->collection()->deleteDynamicPlaylist( self ); 
+    
+    emit deleted( self );
 }
 
 void DynamicPlaylist::addEntries(const QList< query_ptr >& queries, const QString& oldrev)

src/libtomahawk/playlist/dynamic/DynamicPlaylist.h

@@ -113,6 +113,8 @@ signals:
     /// emitted when the playlist revision changes (whenever the playlist changes)
     void dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision );
     
+    void deleted( const Tomahawk::dynplaylist_ptr& pl );
+    
 public slots:
     // want to update the playlist from the model?
     // generate a newrev using uuid() and call this:

src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp

@@ -137,6 +137,7 @@ DynamicWidget::loadDynamicPlaylist( const Tomahawk::dynplaylist_ptr& playlist )
         disconnect( m_playlist->generator().data(), SIGNAL( generated( QList<Tomahawk::query_ptr> ) ), this, SLOT( tracksGenerated( QList<Tomahawk::query_ptr> ) ) );
         disconnect( m_playlist.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision) ), this, SLOT(onRevisionLoaded( Tomahawk::DynamicPlaylistRevision) ) );
         disconnect( m_playlist->generator().data(), SIGNAL( error( QString, QString ) ), this, SLOT( generatorError( QString, QString ) ) );
+        disconnect( m_playlist.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ), this, SLOT( onDeleted() ) );
     }
 
 
@@ -163,6 +164,7 @@ DynamicWidget::loadDynamicPlaylist( const Tomahawk::dynplaylist_ptr& playlist )
     connect( m_playlist->generator().data(), SIGNAL( generated( QList<Tomahawk::query_ptr> ) ), this, SLOT( tracksGenerated( QList<Tomahawk::query_ptr> ) ) );
     connect( m_playlist.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( onRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ) );
     connect( m_playlist->generator().data(), SIGNAL( error( QString, QString ) ), this, SLOT( generatorError( QString, QString ) ) );
+    connect( m_playlist.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ), this, SLOT( onDeleted() ) );
 }
 
 
@@ -407,3 +409,10 @@ DynamicWidget::jumpToCurrentTrack()
     m_view->scrollTo( m_view->proxyModel()->currentItem(), QAbstractItemView::PositionAtCenter );
     return true;
 }
+
+void
+DynamicWidget::onDeleted()
+{
+    emit destroyed( widget() );
+    deleteLater();
+}

src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h

@@ -96,6 +96,7 @@ public slots:
 
 signals:
     void descriptionChanged( const QString& caption );
+    void destroyed( QWidget* widget );
 
 private slots:
     void generate( int = -1 );
@@ -107,6 +108,7 @@ private slots:
     void showPreview();
 
     void layoutFloatingWidgets();
+    void onDeleted();
 
 private:
     dynplaylist_ptr m_playlist;

src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp

@@ -81,7 +81,7 @@ LoadingSpinner::hideFinished()
 QSize 
 LoadingSpinner::sizeHint() const
 {
-    return QSize( 64, 64 );
+    return QSize( 31, 31 );
 }
 
 void 
@@ -99,7 +99,7 @@ LoadingSpinner::reposition()
     int x = ( parentWidget()->width() / 2 ) - ( width() / 2 );
     int y = ( parentWidget()->height() / 2 ) - ( height() / 2 );
     move( x, y );
-    resize( 64, 64 );
+    resize( 31, 31 );
 }
 
 

src/libtomahawk/playlist/playlistitemdelegate.cpp

@@ -24,10 +24,10 @@
 #include "query.h"
 #include "result.h"
 
-#include "playlist/plitem.h"
+#include "trackmodelitem.h"
-#include "playlist/trackproxymodel.h"
+#include "trackproxymodel.h"
-#include "playlist/trackview.h"
+#include "trackview.h"
-#include "playlist/trackheader.h"
+#include "trackheader.h"
 
 #include "utils/tomahawkutils.h"
 
@@ -68,7 +68,7 @@ PlaylistItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem&
 void
 PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
-    PlItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    TrackModelItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
     if ( !item || item->query().isNull() )
         return;
 

src/libtomahawk/playlist/playlistmanager.cpp

@@ -19,6 +19,7 @@
 #include "playlistmanager.h"
 
 #include <QVBoxLayout>
+#include <QMetaMethod>
 
 #include "audio/audioengine.h"
 #include "utils/animatedsplitter.h"
@@ -183,6 +184,8 @@ PlaylistManager::show( const Tomahawk::dynplaylist_ptr& playlist )
     {
        m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicWidget( playlist, m_stack );
 
+       connect( playlist.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ), this, SLOT( onDynamicDeleted( Tomahawk::dynplaylist_ptr ) ) );
+
        playlist->resolve();
     }
 
@@ -334,11 +337,6 @@ PlaylistManager::show( const Tomahawk::source_ptr& source )
 bool
 PlaylistManager::show( ViewPage* page )
 {
-    if ( m_stack->indexOf( page->widget() ) < 0 )
-    {
-        connect( page->widget(), SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ) );
-    }
-
     setPage( page );
 
     return true;
@@ -489,6 +487,7 @@ PlaylistManager::showHistory( int historyPosition )
 
     setHistoryPosition( historyPosition );
     ViewPage* page = m_pageHistory.at( historyPosition );
+    qDebug() << "Showing page after a deleting:" << page->widget()->metaObject()->className();
     setPage( page, false );
 }
 
@@ -539,11 +538,11 @@ PlaylistManager::setPage( ViewPage* page, bool trackHistory )
         setHistoryPosition( m_pageHistory.count() - 1 );
     }
 
-    if ( playlistForInterface( currentPlaylistInterface() ) )
+    if ( !playlistForInterface( currentPlaylistInterface() ).isNull() )
         emit playlistActivated( playlistForInterface( currentPlaylistInterface() ) );
-    if ( dynamicPlaylistForInterface( currentPlaylistInterface() ) )
+    if ( !dynamicPlaylistForInterface( currentPlaylistInterface() ).isNull() )
         emit dynamicPlaylistActivated( dynamicPlaylistForInterface( currentPlaylistInterface() ) );
-    if ( collectionForInterface( currentPlaylistInterface() ) )
+    if ( !collectionForInterface( currentPlaylistInterface() ).isNull() )
         emit collectionActivated( collectionForInterface( currentPlaylistInterface() ) );
     if ( isSuperCollectionVisible() )
         emit superCollectionActivated();
@@ -554,10 +553,17 @@ PlaylistManager::setPage( ViewPage* page, bool trackHistory )
         AudioEngine::instance()->setPlaylist( currentPlaylistInterface() );
 
     // UGH!
-    if( QObject* obj = dynamic_cast< QObject* >( currentPage() ) ) {
+    if ( QObject* obj = dynamic_cast< QObject* >( currentPage() ) )
-//         qDebug() << SIGNAL( descriptionChanged( QString ) ) << QMetaObject::normalizedSignature( SIGNAL( descriptionChanged( QString ) ) ) << obj->metaObject()->indexOfSignal( QMetaObject::normalizedSignature( SIGNAL( descriptionChanged( QString ) ) ) );
+    {
-//         if( obj->metaObject()->indexOfSignal( QMetaObject::normalizedSignature( SIGNAL( descriptionChanged( QString ) ) ) ) > -1 ) // if the signal exists (just to hide the qobject runtime warning...)
+        // if the signal exists (just to hide the qobject runtime warning...)
-            connect( obj, SIGNAL( descriptionChanged( QString ) ), m_infobar, SLOT( setDescription( QString ) ) );
+        if( obj->metaObject()->indexOfSignal( "descriptionChanged(QString)" ) > -1 )
+            connect( obj, SIGNAL( descriptionChanged( QString ) ), m_infobar, SLOT( setDescription( QString ) ), Qt::UniqueConnection );
+    }
+    if ( QObject* obj = dynamic_cast< QObject* >( currentPage() ) )
+    {
+        // if the signal exists (just to hide the qobject runtime warning...)
+        if( obj->metaObject()->indexOfSignal( "destroyed(QWidget*)" ) > -1 )
+            connect( obj, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
     }
 
     m_stack->setCurrentWidget( page->widget() );
@@ -641,14 +647,23 @@ PlaylistManager::updateView()
 void
 PlaylistManager::onWidgetDestroyed( QWidget* widget )
 {
-    qDebug() << "Destroyed child:" << widget;
+    qDebug() << "Destroyed child:" << widget << widget->metaObject()->className();
 
     bool resetWidget = ( m_stack->currentWidget() == widget );
-    m_stack->removeWidget( widget );
 
     for ( int i = 0; i < m_pageHistory.count(); i++ )
     {
         ViewPage* page = m_pageHistory.at( i );
+
+        if ( !playlistForInterface( page->playlistInterface() ).isNull() )
+        {
+            m_playlistViews.remove( playlistForInterface( page->playlistInterface() ) );
+        }
+        if ( !dynamicPlaylistForInterface( page->playlistInterface() ).isNull() )
+        {
+            m_dynamicWidgets.remove( dynamicPlaylistForInterface( page->playlistInterface() ) );
+        }
+
         if ( page->widget() == widget )
         {
             m_pageHistory.removeAt( i );
@@ -658,6 +673,8 @@ PlaylistManager::onWidgetDestroyed( QWidget* widget )
         }
     }
 
+    m_stack->removeWidget( widget );
+
     if ( resetWidget )
     {
         if ( m_pageHistory.count() )

src/libtomahawk/playlist/playlistmanager.h

@@ -135,6 +135,7 @@ public slots:
 private slots:
     void setFilter( const QString& filter );
     void applyFilter();
+
     void onWidgetDestroyed( QWidget* widget );
 
 private:

src/libtomahawk/playlist/playlistmodel.cpp

@@ -71,7 +71,10 @@ void
 PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEntries )
 {
     if ( !m_playlist.isNull() )
+    {
         disconnect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) );
+        disconnect( m_playlist.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ), this, SIGNAL( playlistDeleted() ) );
+    }
 
     if ( rowCount( QModelIndex() ) && loadEntries )
     {
@@ -80,6 +83,7 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn
 
     m_playlist = playlist;
     connect( playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) );
+    connect( playlist.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ), this, SIGNAL( playlistDeleted() ) );
 
     setReadOnly( !m_playlist->author()->isLocal() );
     setTitle( playlist->title() );
@@ -88,23 +92,28 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn
     if ( !loadEntries )
         return;
 
-    PlItem* plitem;
+    TrackModelItem* plitem;
     QList<plentry_ptr> entries = playlist->entries();
     if ( entries.count() )
     {
         int c = rowCount( QModelIndex() );
 
         qDebug() << "Starting loading" << playlist->title();
-        emit loadingStarts();
         emit beginInsertRows( QModelIndex(), c, c + entries.count() - 1 );
 
+        m_waitingForResolved.clear();
         foreach( const plentry_ptr& entry, entries )
         {
             qDebug() << entry->query()->toString();
-            plitem = new PlItem( entry, m_rootItem );
+            plitem = new TrackModelItem( entry, m_rootItem );
             plitem->index = createIndex( m_rootItem->children.count() - 1, 0, plitem );
 
             connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+
+            if( !entry->query()->resolvingFinished() && entry->query()->playable() ) {
+                m_waitingForResolved.append( entry->query().data() );
+                connect( entry->query().data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( trackResolved( bool ) ) );
+            }
         }
 
         emit endInsertRows();
@@ -112,7 +121,9 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn
     else
         qDebug() << "Playlist seems empty:" << playlist->title();
 
-    emit loadingFinished();
+    if( !m_waitingForResolved.isEmpty() )
+        emit loadingStarted();
+
     emit trackCountChanged( rowCount( QModelIndex() ) );
 }
 
@@ -147,7 +158,7 @@ PlaylistModel::clear()
         delete m_rootItem;
         m_rootItem = 0;
         emit endResetModel();
-        m_rootItem = new PlItem( 0, this );
+        m_rootItem = new TrackModelItem( 0, this );
     }
 }
 
@@ -203,6 +214,19 @@ PlaylistModel::insert( unsigned int row, const Tomahawk::query_ptr& query )
     onTracksInserted( row, ql );
 }
 
+void
+PlaylistModel::trackResolved( bool )
+{
+    Tomahawk::Query* q = qobject_cast< Query* >( sender() );
+    Q_ASSERT( q );
+
+    m_waitingForResolved.removeAll( q );
+    disconnect( q, SIGNAL( resolvingFinished( bool ) ), this, SLOT( trackResolved( bool ) ) );
+
+    if( m_waitingForResolved.isEmpty() )
+        emit loadingFinished();
+}
+
 
 void
 PlaylistModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks )
@@ -228,13 +252,13 @@ PlaylistModel::onTracksInserted( unsigned int row, const QList<Tomahawk::query_p
     emit beginInsertRows( QModelIndex(), crows.first, crows.second );
 
     int i = 0;
-    PlItem* plitem;
+    TrackModelItem* plitem;
     foreach( const query_ptr& query, tracks )
     {
         plentry_ptr entry = plentry_ptr( new PlaylistEntry() );
         entry->setQuery( query );
 
-        plitem = new PlItem( entry, m_rootItem, row + i );
+        plitem = new TrackModelItem( entry, m_rootItem, row + i );
         plitem->index = createIndex( row + i, 0, plitem );
 
         i++;
@@ -250,7 +274,7 @@ PlaylistModel::onTracksInserted( unsigned int row, const QList<Tomahawk::query_p
 void
 PlaylistModel::onDataChanged()
 {
-    PlItem* p = (PlItem*)sender();
+    TrackModelItem* p = (TrackModelItem*)sender();
     if ( p && p->index.isValid() )
         emit dataChanged( p->index, p->index.sibling( p->index.row(), columnCount() - 1 ) );
 }
@@ -326,7 +350,7 @@ PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int r
             e->setAnnotation( "" ); // FIXME
             e->setQuery( query );
 
-            PlItem* plitem = new PlItem( e, m_rootItem, beginRow );
+            TrackModelItem* plitem = new TrackModelItem( e, m_rootItem, beginRow );
             plitem->index = createIndex( beginRow++, 0, plitem );
 
             connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
@@ -387,7 +411,7 @@ PlaylistModel::playlistEntries() const
         if ( !idx.isValid() )
             continue;
 
-        PlItem* item = itemFromIndex( idx );
+        TrackModelItem* item = itemFromIndex( idx );
         if ( item )
             l << item->entry();
     }

src/libtomahawk/playlist/playlistmodel.h

@@ -22,7 +22,7 @@
 #include <QList>
 #include <QHash>
 
-#include "plitem.h"
+#include "trackmodelitem.h"
 #include "trackmodel.h"
 #include "collection.h"
 #include "query.h"
@@ -71,8 +71,7 @@ signals:
 
     void itemSizeChanged( const QModelIndex& index );
 
-    void loadingStarts();
+    void playlistDeleted();
-    void loadingFinished();
 
 private slots:
     void onDataChanged();
@@ -83,11 +82,14 @@ private slots:
     void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );
     void onTracksInserted( unsigned int row, const QList<Tomahawk::query_ptr>& tracks );
 
+    void trackResolved( bool );
+
 private:
     QList<Tomahawk::plentry_ptr> playlistEntries() const;
 
     Tomahawk::playlist_ptr m_playlist;
     bool m_waitForUpdate;
+    QList< Tomahawk::Query* > m_waitingForResolved;
 };
 
 #endif // PLAYLISTMODEL_H

src/libtomahawk/playlist/playlistview.cpp

@@ -58,6 +58,7 @@ PlaylistView::setModel( PlaylistModel* model )
         setGuid( "playlistview" );
 
     connect( model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
+    connect( model, SIGNAL( playlistDeleted() ), SLOT( onDeleted() ) );
 }
 
 
@@ -154,3 +155,12 @@ PlaylistView::jumpToCurrentTrack()
     scrollTo( proxyModel()->currentItem(), QAbstractItemView::PositionAtCenter );
     return true;
 }
+
+
+void
+PlaylistView::onDeleted()
+{
+    qDebug() << Q_FUNC_INFO;
+    emit destroyed( widget() );
+    deleteLater();
+}

src/libtomahawk/playlist/playlistview.h

@@ -50,6 +50,9 @@ public:
 
     virtual bool jumpToCurrentTrack();
 
+signals:
+    void destroyed( QWidget* widget );
+
 protected:
     void keyPressEvent( QKeyEvent* event );
 
@@ -60,6 +63,8 @@ private slots:
     void addItemsToPlaylist();
     void deleteItems();
 
+    void onDeleted();
+
 private:
     void setupMenus();
 

src/libtomahawk/playlist/trackmodel.cpp

@@ -33,7 +33,7 @@ using namespace Tomahawk;
 
 TrackModel::TrackModel( QObject* parent )
     : QAbstractItemModel( parent )
-    , m_rootItem( new PlItem( 0, this ) )
+    , m_rootItem( new TrackModelItem( 0, this ) )
     , m_readOnly( true )
 {
     qDebug() << Q_FUNC_INFO;
@@ -45,7 +45,7 @@ TrackModel::TrackModel( QObject* parent )
 
 TrackModel::~TrackModel()
 {
-    delete m_rootItem;
+//    delete m_rootItem;
 }
 
 
@@ -55,8 +55,8 @@ TrackModel::index( int row, int column, const QModelIndex& parent ) const
     if ( !m_rootItem || row < 0 || column < 0 )
         return QModelIndex();
 
-    PlItem* parentItem = itemFromIndex( parent );
+    TrackModelItem* parentItem = itemFromIndex( parent );
-    PlItem* childItem = parentItem->children.value( row );
+    TrackModelItem* childItem = parentItem->children.value( row );
     if ( !childItem )
         return QModelIndex();
 
@@ -70,7 +70,7 @@ TrackModel::rowCount( const QModelIndex& parent ) const
     if ( parent.column() > 0 )
         return 0;
 
-    PlItem* parentItem = itemFromIndex( parent );
+    TrackModelItem* parentItem = itemFromIndex( parent );
     if ( !parentItem )
         return 0;
 
@@ -88,15 +88,15 @@ TrackModel::columnCount( const QModelIndex& parent ) const
 QModelIndex
 TrackModel::parent( const QModelIndex& child ) const
 {
-    PlItem* entry = itemFromIndex( child );
+    TrackModelItem* entry = itemFromIndex( child );
     if ( !entry )
         return QModelIndex();
 
-    PlItem* parentEntry = entry->parent;
+    TrackModelItem* parentEntry = entry->parent;
     if ( !parentEntry )
         return QModelIndex();
 
-    PlItem* grandparentEntry = parentEntry->parent;
+    TrackModelItem* grandparentEntry = parentEntry->parent;
     if ( !grandparentEntry )
         return QModelIndex();
 
@@ -108,7 +108,7 @@ TrackModel::parent( const QModelIndex& child ) const
 QVariant
 TrackModel::data( const QModelIndex& index, int role ) const
 {
-    PlItem* entry = itemFromIndex( index );
+    TrackModelItem* entry = itemFromIndex( index );
     if ( !entry )
         return QVariant();
 
@@ -222,13 +222,13 @@ void
 TrackModel::setCurrentItem( const QModelIndex& index )
 {
     qDebug() << Q_FUNC_INFO;
-    PlItem* oldEntry = itemFromIndex( m_currentIndex );
+    TrackModelItem* oldEntry = itemFromIndex( m_currentIndex );
     if ( oldEntry )
     {
         oldEntry->setIsPlaying( false );
     }
 
-    PlItem* entry = itemFromIndex( index );
+    TrackModelItem* entry = itemFromIndex( index );
     if ( entry )
     {
         m_currentIndex = index;
@@ -283,7 +283,7 @@ TrackModel::mimeData( const QModelIndexList &indexes ) const
             continue;
 
         QModelIndex idx = index( i.row(), 0, i.parent() );
-        PlItem* item = itemFromIndex( idx );
+        TrackModelItem* item = itemFromIndex( idx );
         if ( item )
         {
             const query_ptr& query = item->query();
@@ -315,7 +315,7 @@ TrackModel::removeIndex( const QModelIndex& index, bool moreToCome )
     if ( index.column() > 0 )
         return;
 
-    PlItem* item = itemFromIndex( index );
+    TrackModelItem* item = itemFromIndex( index );
     if ( item )
     {
         emit beginRemoveRows( index.parent(), index.row(), index.row() );
@@ -337,11 +337,11 @@ TrackModel::removeIndexes( const QList<QModelIndex>& indexes )
 }
 
 
-PlItem*
+TrackModelItem*
 TrackModel::itemFromIndex( const QModelIndex& index ) const
 {
     if ( index.isValid() )
-        return static_cast<PlItem*>( index.internalPointer() );
+        return static_cast<TrackModelItem*>( index.internalPointer() );
     else
     {
         return m_rootItem;
@@ -352,7 +352,7 @@ TrackModel::itemFromIndex( const QModelIndex& index ) const
 void
 TrackModel::onPlaybackFinished( const Tomahawk::result_ptr& result )
 {
-    PlItem* oldEntry = itemFromIndex( m_currentIndex );
+    TrackModelItem* oldEntry = itemFromIndex( m_currentIndex );
     if ( oldEntry && !oldEntry->query().isNull() && oldEntry->query()->results().contains( result ) )
     {
         oldEntry->setIsPlaying( false );
@@ -363,7 +363,7 @@ TrackModel::onPlaybackFinished( const Tomahawk::result_ptr& result )
 void
 TrackModel::onPlaybackStopped()
 {
-    PlItem* oldEntry = itemFromIndex( m_currentIndex );
+    TrackModelItem* oldEntry = itemFromIndex( m_currentIndex );
     if ( oldEntry )
     {
         oldEntry->setIsPlaying( false );

src/libtomahawk/playlist/trackmodel.h

@@ -22,7 +22,7 @@
 #include <QAbstractItemModel>
 
 #include "playlistinterface.h"
-#include "playlist/plitem.h"
+#include "trackmodelitem.h"
 
 #include "dllmacro.h"
 
@@ -80,9 +80,9 @@ public:
 
     virtual void append( const Tomahawk::query_ptr& query ) = 0;
 
-    PlItem* itemFromIndex( const QModelIndex& index ) const;
+    TrackModelItem* itemFromIndex( const QModelIndex& index ) const;
 
-    PlItem* m_rootItem;
+    TrackModelItem* m_rootItem;
 
 signals:
     void repeatModeChanged( PlaylistInterface::RepeatMode mode );

src/libtomahawk/playlist/trackmodelitem.cpp

@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "plitem.h"
+#include "trackmodelitem.h"
 
 #include "utils/tomahawkutils.h"
 #include "playlist.h"
@@ -27,7 +27,7 @@
 using namespace Tomahawk;
 
 
-PlItem::~PlItem()
+TrackModelItem::~TrackModelItem()
 {
     // Don't use qDeleteAll here! The children will remove themselves
     // from the list when they get deleted and the qDeleteAll iterator
@@ -42,7 +42,7 @@ PlItem::~PlItem()
 }
 
 
-PlItem::PlItem( PlItem* parent, QAbstractItemModel* model )
+TrackModelItem::TrackModelItem( TrackModelItem* parent, QAbstractItemModel* model )
 {
     this->parent = parent;
     this->model = model;
@@ -56,7 +56,7 @@ PlItem::PlItem( PlItem* parent, QAbstractItemModel* model )
 }
 
 
-PlItem::PlItem( const QString& caption, PlItem* parent )
+TrackModelItem::TrackModelItem( const QString& caption, TrackModelItem* parent )
 {
     this->parent = parent;
     this->caption = caption;
@@ -72,14 +72,14 @@ PlItem::PlItem( const QString& caption, PlItem* parent )
 }
 
 
-PlItem::PlItem( const Tomahawk::query_ptr& query, PlItem* parent, int row )
+TrackModelItem::TrackModelItem( const Tomahawk::query_ptr& query, TrackModelItem* parent, int row )
     : QObject( parent )
 {
     setupItem( query, parent, row );
 }
 
 
-PlItem::PlItem( const Tomahawk::plentry_ptr& entry, PlItem* parent, int row )
+TrackModelItem::TrackModelItem( const Tomahawk::plentry_ptr& entry, TrackModelItem* parent, int row )
     : QObject( parent )
     , m_entry( entry )
 {
@@ -87,20 +87,20 @@ PlItem::PlItem( const Tomahawk::plentry_ptr& entry, PlItem* parent, int row )
 }
 
 const Tomahawk::plentry_ptr&
-PlItem::entry() const
+TrackModelItem::entry() const
 {
     return m_entry;
 }
 
 const Tomahawk::query_ptr&
-PlItem::query() const
+TrackModelItem::query() const
 {
     if ( !m_entry.isNull() ) return m_entry->query(); else return m_query;
 }
 
 
 void
-PlItem::setupItem( const Tomahawk::query_ptr& query, PlItem* parent, int row )
+TrackModelItem::setupItem( const Tomahawk::query_ptr& query, TrackModelItem* parent, int row )
 {
     this->parent = parent;
     if ( parent )

src/libtomahawk/playlist/trackmodelitem.h

@@ -29,17 +29,17 @@
 
 #include "dllmacro.h"
 
-class DLLEXPORT PlItem : public QObject
+class DLLEXPORT TrackModelItem : public QObject
 {
 Q_OBJECT
 
 public:
-    virtual ~PlItem();
+    virtual ~TrackModelItem();
 
-    explicit PlItem( PlItem* parent = 0, QAbstractItemModel* model = 0 );
+    explicit TrackModelItem( TrackModelItem* parent = 0, QAbstractItemModel* model = 0 );
-    explicit PlItem( const QString& caption, PlItem* parent = 0 );
+    explicit TrackModelItem( const QString& caption, TrackModelItem* parent = 0 );
-    explicit PlItem( const Tomahawk::query_ptr& query, PlItem* parent = 0, int row = -1 );
+    explicit TrackModelItem( const Tomahawk::query_ptr& query, TrackModelItem* parent = 0, int row = -1 );
-    explicit PlItem( const Tomahawk::plentry_ptr& entry, PlItem* parent = 0, int row = -1 );
+    explicit TrackModelItem( const Tomahawk::plentry_ptr& entry, TrackModelItem* parent = 0, int row = -1 );
 
     const Tomahawk::plentry_ptr& entry() const;
     const Tomahawk::query_ptr& query() const;
@@ -47,9 +47,9 @@ public:
     bool isPlaying() { return m_isPlaying; }
     void setIsPlaying( bool b ) { m_isPlaying = b; emit dataChanged(); }
 
-    PlItem* parent;
+    TrackModelItem* parent;
-    QVector<PlItem*> children;
+    QVector<TrackModelItem*> children;
-    QHash<QString, PlItem*> hash;
+    QHash<QString, TrackModelItem*> hash;
     QString caption;
     int childCount;
     QPersistentModelIndex index;
@@ -60,7 +60,7 @@ signals:
     void dataChanged();
 
 private:
-    void setupItem( const Tomahawk::query_ptr& query, PlItem* parent, int row = -1 );
+    void setupItem( const Tomahawk::query_ptr& query, TrackModelItem* parent, int row = -1 );
 
     Tomahawk::plentry_ptr m_entry;
     Tomahawk::query_ptr m_query;

src/libtomahawk/playlist/trackproxymodel.cpp

@@ -76,7 +76,7 @@ TrackProxyModel::tracks()
 
     for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
     {
-        PlItem* item = itemFromIndex( mapToSource( index( i, 0 ) ) );
+        TrackModelItem* item = itemFromIndex( mapToSource( index( i, 0 ) ) );
         if ( item )
             queries << item->query();
     }
@@ -135,7 +135,7 @@ TrackProxyModel::siblingItem( int itemsAway )
     // Try to find the next available PlaylistItem (with results)
     if ( idx.isValid() ) do
     {
-        PlItem* item = itemFromIndex( mapToSource( idx ) );
+        TrackModelItem* item = itemFromIndex( mapToSource( idx ) );
         qDebug() << item->query()->toString();
         if ( item && item->query()->playable() )
         {
@@ -156,7 +156,7 @@ TrackProxyModel::siblingItem( int itemsAway )
 bool
 TrackProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
 {
-    PlItem* pi = itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
+    TrackModelItem* pi = itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
     if ( !pi )
         return false;
 

src/libtomahawk/playlist/trackproxymodel.h

@@ -59,7 +59,7 @@ public:
     bool showOfflineResults() const { return m_showOfflineResults; }
     void setShowOfflineResults( bool b ) { m_showOfflineResults = b; }
 
-    PlItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); }
+    TrackModelItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); }
 
 signals:
     void repeatModeChanged( PlaylistInterface::RepeatMode mode );

src/libtomahawk/playlist/trackview.cpp

@@ -129,7 +129,7 @@ TrackView::setModel( TrackModel* model )
 void
 TrackView::onItemActivated( const QModelIndex& index )
 {
-    PlItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
+    TrackModelItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
     if ( item && item->query()->numResults() )
     {
         qDebug() << "Result activated:" << item->query()->toString() << item->query()->results().first()->url();
@@ -178,7 +178,7 @@ TrackView::addItemsToQueue()
         if ( idx.column() )
             continue;
 
-        PlItem* item = model()->itemFromIndex( proxyModel()->mapToSource( idx ) );
+        TrackModelItem* item = model()->itemFromIndex( proxyModel()->mapToSource( idx ) );
         if ( item && item->query()->numResults() )
         {
             PlaylistManager::instance()->queue()->model()->append( item->query() );

src/libtomahawk/query.cpp

@@ -45,6 +45,7 @@ Query::get( const QString& artist, const QString& track, const QString& album, c
 Query::Query( const QString& artist, const QString& track, const QString& album, const QID& qid )
     : m_solved( false )
     , m_playable( false )
+    , m_resolveFinished( false )
     , m_qid( qid )
     , m_artist( artist )
     , m_album( album )
@@ -61,7 +62,6 @@ Query::Query( const QString& artist, const QString& track, const QString& album,
 void
 Query::addResults( const QList< Tomahawk::result_ptr >& newresults )
 {
-    bool becameSolved = false;
     {
         QMutexLocker lock( &m_mutex );
         m_results.append( newresults );
@@ -114,6 +114,7 @@ void
 Query::onResolvingFinished()
 {
 //    qDebug() << Q_FUNC_INFO << "Finished resolving." << toString();
+    m_resolveFinished = true;
     emit resolvingFinished( m_solved );
 }
 

src/libtomahawk/query.h

@@ -64,6 +64,8 @@ public:
     /// true when any result has been found (score may be less than 1.0)
     bool playable() const { return m_playable; }
 
+    bool resolvingFinished() const { return m_resolveFinished; }
+    
     unsigned int lastPipelineWeight() const { return m_lastpipelineweight; }
     void setLastPipelineWeight( unsigned int w ) { m_lastpipelineweight = w; }
 
@@ -72,6 +74,7 @@ public:
     void setTrack( const QString& track ) { m_track = track; }
     void setResultHint( const QString& resultHint ) { m_resultHint = resultHint; }
     void setDuration( int duration ) { m_duration = duration; }
+    void setResolveFinished( bool resolved ) { m_resolveFinished = resolved; }
     
     QVariant toVariant() const;
     QString toString() const;
@@ -108,6 +111,7 @@ private:
     QList< Tomahawk::result_ptr > m_results;
     bool m_solved;
     bool m_playable;
+    bool m_resolveFinished;
     mutable QID m_qid;
     unsigned int m_lastpipelineweight;
 

src/libtomahawk/viewpage.h

@@ -48,6 +48,12 @@ public:
 
     virtual bool jumpToCurrentTrack() = 0;
 
+    /** subclasses implementing ViewPage can emit the following signals:
+     * descriptionChanged( const QString& )
+     * destroyed( QWidget* widget );
+     *
+     * See DynamicWidget for an example
+     */
 private:
 };
 

src/sip/twitter/twitter.cpp

@@ -266,6 +266,19 @@ TwitterPlugin::connectTimerFired()
     {
         QHash< QString, QVariant > peerData = m_cachedPeers[screenName].toHash();
 
+        if ( Servent::instance()->connectedToSession( peerData["node"].toString() ) )
+        {
+            peerData["lastseen"] = QDateTime::currentMSecsSinceEpoch();
+            m_cachedPeers[screenName] = peerData;
+        }
+        
+        if ( QDateTime::currentMSecsSinceEpoch() - peerData["lastseen"].toLongLong() > 1209600000 ) // 2 weeks
+        {
+            qDebug() << "Aging peer " << screenName << " out of cache";
+            m_cachedPeers.remove( screenName );
+            continue;
+        }
+        
         if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) )
         {
             qDebug() << "TwitterPlugin does not have host, port and/or pkey values for " << screenName << " (this is usually *not* a bug or problem but a normal part of the process)";
@@ -529,11 +542,14 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
         _peerData.remove( "resend" );
     }
 
-    if ( !_peerData.contains( "okey" ) )
+    if ( !_peerData.contains( "okey" ) ||
+         !_peerData.contains( "onod" ) ||
+         ( _peerData.contains( "onod" ) && _peerData["onod"] != Database::instance()->dbid() ) )
     {
         QString okey = QUuid::createUuid().toString().split( '-' ).last();
         okey.chop( 1 );
         _peerData["okey"] = QVariant::fromValue< QString >( okey );
+        _peerData["onod"] = QVariant::fromValue< QString >( Database::instance()->dbid() );
         peersChanged = true;
         needToAddToCache = true;
         needToSend = true;
@@ -568,6 +584,7 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
 
     if ( peersChanged )
     {
+        _peerData["lastseen"] = QString::number( QDateTime::currentMSecsSinceEpoch() );
         m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData );
         TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
     }
@@ -595,7 +612,8 @@ void
 TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData )
 {
     qDebug() << Q_FUNC_INFO;
-    if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) )
+    if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) ||
+         peerData["host"].toString().isEmpty() || peerData["port"].toString().isEmpty() || peerData["pkey"].toString().isEmpty() || peerData["node"].toString().isEmpty() )
     {
         qDebug() << "TwitterPlugin could not find host and/or port and/or pkey and/or node for peer " << screenName;
         return;

src/sourcetree/sourcetreeview.cpp

@@ -298,15 +298,18 @@ SourceTreeView::deletePlaylist()
         playlist_ptr playlist = SourcesModel::indexToPlaylist( idx );
         if ( !playlist.isNull() )
         {
-            qDebug() << "Playlist about to be deleted:" << playlist->title();
             Playlist::remove( playlist );
         }
-    } else if( type == SourcesModel::DynamicPlaylistSource ) {
+    }
+    else if ( type == SourcesModel::DynamicPlaylistSource )
+    {
         dynplaylist_ptr playlist = SourcesModel::indexToDynamicPlaylist( idx );
         if( !playlist.isNull() )
+        {
             DynamicPlaylist::remove( playlist );
         }
     }
+}
 
 
 void

src/tomahawkapp.cpp

@@ -299,7 +299,7 @@ TomahawkApp::~TomahawkApp()
     delete m_mainwindow;
     delete m_audioEngine;
 #endif
-
+    delete m_infoSystem;
     delete m_database;
 }
 
@@ -348,6 +348,8 @@ TomahawkApp::registerMetaTypes()
     qRegisterMetaType< Tomahawk::query_ptr >("Tomahawk::query_ptr");
     qRegisterMetaType< Tomahawk::source_ptr >("Tomahawk::source_ptr");
     qRegisterMetaType< Tomahawk::dyncontrol_ptr >("Tomahawk::dyncontrol_ptr");
+    qRegisterMetaType< Tomahawk::playlist_ptr >("Tomahawk::playlist_ptr");
+    qRegisterMetaType< Tomahawk::dynplaylist_ptr >("Tomahawk::dynplaylist_ptr");
     qRegisterMetaType< Tomahawk::geninterface_ptr >("Tomahawk::geninterface_ptr");
     qRegisterMetaType< QList<Tomahawk::playlist_ptr> >("QList<Tomahawk::playlist_ptr>");
     qRegisterMetaType< QList<Tomahawk::dynplaylist_ptr> >("QList<Tomahawk::dynplaylist_ptr>");