diff --git a/src/AudioControls.cpp b/src/AudioControls.cpp index 8afb903f7..48f8cddac 100644 --- a/src/AudioControls.cpp +++ b/src/AudioControls.cpp @@ -85,7 +85,7 @@ AudioControls::AudioControls( QWidget* parent ) ui->socialButton->setPixmap( RESPATH "images/share.png" ); ui->loveButton->setPixmap( RESPATH "images/not-loved.png" ); ui->loveButton->setCheckable( true ); - + ui->socialButton->setFixedSize( QSize( 20, 20 ) ); ui->loveButton->setFixedSize( QSize( 20, 20 ) ); @@ -588,7 +588,7 @@ AudioControls::droppedTracks( QList< query_ptr > tracks ) { // queue and play the first no matter what GlobalActionManager::instance()->handlePlayTrack( tracks.first() ); - ViewManager::instance()->queue()->model()->append( tracks ); + ViewManager::instance()->queue()->model()->appendQueries( tracks ); } } diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index 4a88949cf..faaac4bbe 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -224,7 +224,7 @@ ContextMenu::onTriggered( int action ) case ActionCopyLink: copyLink(); break; - + case ActionPage: openPage(); break; @@ -252,15 +252,15 @@ ContextMenu::addToQueue() { foreach ( const query_ptr& query, m_queries ) { - ViewManager::instance()->queue()->model()->append( query ); + ViewManager::instance()->queue()->model()->appendQuery( query ); } foreach ( const artist_ptr& artist, m_artists ) { - ViewManager::instance()->queue()->model()->append( artist ); + ViewManager::instance()->queue()->model()->appendArtist( artist ); } foreach ( const album_ptr& album, m_albums ) { - ViewManager::instance()->queue()->model()->append( album ); + ViewManager::instance()->queue()->model()->appendAlbum( album ); } ViewManager::instance()->showQueue(); diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index 1f1c1bf1c..45244f52e 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -553,7 +553,7 @@ GlobalActionManager::handleOpenCommand( const QUrl& url ) void GlobalActionManager::handleOpenTrack( const query_ptr& q ) { - ViewManager::instance()->queue()->model()->append( q ); + ViewManager::instance()->queue()->model()->appendQuery( q ); ViewManager::instance()->showQueue(); if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() ) @@ -570,7 +570,7 @@ GlobalActionManager::handleOpenTracks( const QList< query_ptr >& queries ) if ( queries.isEmpty() ) return; - ViewManager::instance()->queue()->model()->append( queries ); + ViewManager::instance()->queue()->model()->appendQueries( queries ); ViewManager::instance()->showQueue(); if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() ) @@ -670,7 +670,7 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q Pipeline::instance()->resolve( q, true ); - ViewManager::instance()->queue()->model()->append( q ); + ViewManager::instance()->queue()->model()->appendQuery( q ); ViewManager::instance()->showQueue(); } return true; @@ -1343,7 +1343,7 @@ GlobalActionManager::waitingForResolved( bool /* success */ ) AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() ); else { - ViewManager::instance()->queue()->model()->append( m_waitingToPlay ); + ViewManager::instance()->queue()->model()->appendQuery( m_waitingToPlay ); AudioEngine::instance()->play(); } } diff --git a/src/libtomahawk/context/pages/TopTracksContext.cpp b/src/libtomahawk/context/pages/TopTracksContext.cpp index a8df51fe3..b9dff8d3b 100644 --- a/src/libtomahawk/context/pages/TopTracksContext.cpp +++ b/src/libtomahawk/context/pages/TopTracksContext.cpp @@ -100,7 +100,7 @@ TopTracksContext::onTracksFound( const QList& queries, Mode { Q_UNUSED( mode ); - m_topHitsModel->append( queries ); + m_topHitsModel->appendQueries( queries ); } diff --git a/src/libtomahawk/playlist/CustomPlaylistView.cpp b/src/libtomahawk/playlist/CustomPlaylistView.cpp index 40f81ffdc..8ae04bbd0 100644 --- a/src/libtomahawk/playlist/CustomPlaylistView.cpp +++ b/src/libtomahawk/playlist/CustomPlaylistView.cpp @@ -112,7 +112,7 @@ CustomPlaylistView::tracksGenerated( QList< query_ptr > tracks ) return; m_model->clear(); - m_model->append( newTracks ); + m_model->appendQueries( newTracks ); } diff --git a/src/libtomahawk/widgets/NewPlaylistWidget.cpp b/src/libtomahawk/widgets/NewPlaylistWidget.cpp index da16b1741..285c871fc 100644 --- a/src/libtomahawk/widgets/NewPlaylistWidget.cpp +++ b/src/libtomahawk/widgets/NewPlaylistWidget.cpp @@ -125,10 +125,7 @@ NewPlaylistWidget::suggestionsFound() m_suggestionsModel = new PlaylistModel( ui->suggestionsView ); ui->suggestionsView->setPlaylistModel( m_suggestionsModel ); - foreach( const Tomahawk::query_ptr& query, m_queries ) - { - m_suggestionsModel->append( query ); - } + m_suggestionsModel->appendQueries( m_queries ); loader->deleteLater(); } diff --git a/src/libtomahawk/widgets/NewReleasesWidget.cpp b/src/libtomahawk/widgets/NewReleasesWidget.cpp index c4e7631bc..58f031608 100644 --- a/src/libtomahawk/widgets/NewReleasesWidget.cpp +++ b/src/libtomahawk/widgets/NewReleasesWidget.cpp @@ -356,7 +356,7 @@ NewReleasesWidget::newReleasesLoaded( ChartDataLoader* loader, const QList< albu Q_ASSERT( m_albumModels.contains( chartId ) ); if ( m_albumModels.contains( chartId ) ) - m_albumModels[ chartId ]->append( albums ); + m_albumModels[ chartId ]->appendAlbums( albums ); m_workers.remove( loader ); loader->deleteLater(); diff --git a/src/libtomahawk/widgets/SearchWidget.cpp b/src/libtomahawk/widgets/SearchWidget.cpp index 29af944c7..4c2a90504 100644 --- a/src/libtomahawk/widgets/SearchWidget.cpp +++ b/src/libtomahawk/widgets/SearchWidget.cpp @@ -124,7 +124,7 @@ SearchWidget::onResultsFound( const QList& results ) Tomahawk::query_ptr q = result->toQuery(); q->addResults( rl ); - m_resultsModel->append( q ); + m_resultsModel->appendQuery( q ); m_artists << result->artist(); m_albums << result->album(); @@ -178,7 +178,7 @@ SearchWidget::sortArtists() } m_artistsModel->clear(); - m_artistsModel->append( sortedArtists ); + m_artistsModel->appendArtists( sortedArtists ); } @@ -205,5 +205,5 @@ SearchWidget::sortAlbums() } m_albumsModel->clear(); - m_albumsModel->append( sortedAlbums ); + m_albumsModel->appendAlbums( sortedAlbums ); } diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp index cd42b8dfe..a7876d4a9 100644 --- a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp +++ b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp @@ -140,7 +140,7 @@ SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums ) { m_popularNewAlbumsModel->clear(); - m_popularNewAlbumsModel->append( albums ); + m_popularNewAlbumsModel->appendAlbums( albums ); } @@ -148,6 +148,6 @@ void SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks ) { m_topForeignTracksModel->clear(); - foreach( const query_ptr& q, tracks ) - m_topForeignTracksModel->append( q ); + + m_topForeignTracksModel->appendQueries( tracks ); } diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp index 5522bc36a..2c6deff51 100644 --- a/src/libtomahawk/widgets/WhatsHotWidget.cpp +++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp @@ -507,7 +507,7 @@ WhatsHotWidget::chartTracksLoaded( ChartDataLoader* loader, const QList< query_p if ( m_trackModels.contains( chartId ) ) { Pipeline::instance()->resolve( tracks ); - m_trackModels[ chartId ]->append( tracks ); + m_trackModels[ chartId ]->appendQueries( tracks ); m_trackModels[ chartId ]->finishLoading(); } @@ -524,7 +524,7 @@ WhatsHotWidget::chartAlbumsLoaded( ChartDataLoader* loader, const QList< album_p if ( m_albumModels.contains( chartId ) ) { - m_albumModels[ chartId ]->append( albums ); + m_albumModels[ chartId ]->appendAlbums( albums ); m_albumModels[ chartId ]->finishLoading(); } diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index cdf1a9673..630b5978d 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -184,7 +184,7 @@ AlbumInfoWidget::gotAlbums( const QList& albums ) if ( al.contains( m_album ) ) al.removeAll( m_album ); - m_albumsModel->append( al ); + m_albumsModel->appendAlbums( al ); } diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 2eb36082d..645bdaace 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -251,7 +251,7 @@ ArtistInfoWidget::onAlbumsFound( const QList& albums, Model { Q_UNUSED( mode ); - m_albumsModel->append( albums ); + m_albumsModel->appendAlbums( albums ); } @@ -261,14 +261,14 @@ ArtistInfoWidget::onTracksFound( const QList& queries, Mode Q_UNUSED( mode ); m_topHitsModel->finishLoading(); - m_topHitsModel->append( queries ); + m_topHitsModel->appendQueries( queries ); } void ArtistInfoWidget::onSimilarArtistsLoaded() { - m_relatedModel->append( m_artist->similarArtists() ); + m_relatedModel->appendArtists( m_artist->similarArtists() ); } diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 06ddfe780..98d20957f 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -244,7 +244,7 @@ TrackInfoWidget::onSimilarArtistsLoaded() void TrackInfoWidget::onSimilarTracksLoaded() { - m_relatedTracksModel->append( m_query->similarTracks() ); + m_relatedTracksModel->appendQueries( m_query->similarTracks() ); m_relatedTracksModel->finishLoading(); }