From 2d356c5baec1d12157082e60469d1662435796db Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 18 May 2012 12:14:19 +0200 Subject: [PATCH] * No more mode init. --- src/libtomahawk/ViewManager.cpp | 4 ++-- src/libtomahawk/ViewManager.h | 2 +- src/libtomahawk/playlist/ArtistView.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index f8aa166e3..e70089bc4 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -239,12 +239,12 @@ ViewManager::show( const Tomahawk::artist_ptr& artist ) Tomahawk::ViewPage* -ViewManager::show( const Tomahawk::album_ptr& album, Tomahawk::ModelMode initialMode ) +ViewManager::show( const Tomahawk::album_ptr& album ) { AlbumInfoWidget* swidget; if ( !m_albumViews.contains( album ) || m_albumViews.value( album ).isNull() ) { - swidget = new AlbumInfoWidget( album, initialMode ); + swidget = new AlbumInfoWidget( album ); m_albumViews.insert( album, swidget ); } else diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index 31d86012e..0725b75ab 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -151,7 +151,7 @@ public slots: Tomahawk::ViewPage* show( const Tomahawk::playlist_ptr& playlist ); Tomahawk::ViewPage* show( const Tomahawk::dynplaylist_ptr& playlist ); Tomahawk::ViewPage* show( const Tomahawk::artist_ptr& artist ); - Tomahawk::ViewPage* show( const Tomahawk::album_ptr& album, Tomahawk::ModelMode withInitialMode = Tomahawk::InfoSystemMode ); + Tomahawk::ViewPage* show( const Tomahawk::album_ptr& album ); Tomahawk::ViewPage* show( const Tomahawk::query_ptr& query ); Tomahawk::ViewPage* show( const Tomahawk::collection_ptr& collection ); Tomahawk::ViewPage* show( const Tomahawk::source_ptr& source ); diff --git a/src/libtomahawk/playlist/ArtistView.cpp b/src/libtomahawk/playlist/ArtistView.cpp index fec374771..7f1116849 100644 --- a/src/libtomahawk/playlist/ArtistView.cpp +++ b/src/libtomahawk/playlist/ArtistView.cpp @@ -94,7 +94,7 @@ ArtistView::ArtistView( QWidget* parent ) ArtistView::~ArtistView() { - qDebug() << Q_FUNC_INFO; + tDebug() << Q_FUNC_INFO; } @@ -224,7 +224,7 @@ ArtistView::onItemActivated( const QModelIndex& index ) if ( !item->artist().isNull() ) ViewManager::instance()->show( item->artist() ); else if ( !item->album().isNull() ) - ViewManager::instance()->show( item->album(), m_model->mode() ); + ViewManager::instance()->show( item->album() ); else if ( !item->result().isNull() && item->result()->isOnline() ) { m_model->setCurrentItem( item->index );