From d58eec71b76eb2da91c75feda74b3615bab0e22d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 22 Jun 2013 12:31:39 +0200 Subject: [PATCH] * Get rid of passing tomahawkLoaded signal through TomahawkWindow and ViewManager. --- src/libtomahawk/ViewManager.cpp | 11 ----------- src/libtomahawk/ViewManager.h | 8 -------- src/tomahawk/TomahawkWindow.cpp | 1 - 3 files changed, 20 deletions(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index c3e38a1ab..7655d54ea 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -87,7 +87,6 @@ ViewManager::ViewManager( QObject* parent ) , m_inboxWidget( 0 ) , m_networkActivityWidget( 0 ) , m_currentPage( 0 ) - , m_loaded( false ) { s_instance = this; @@ -123,8 +122,6 @@ ViewManager::ViewManager( QObject* parent ) connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) ); connect( m_infobar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) ); - connect( this, SIGNAL( tomahawkLoaded() ), m_dashboard, SLOT( loadData() ) ); - /* connect( m_infobar, SIGNAL( flatMode() ), SLOT( setTableMode() ) ); connect( m_infobar, SIGNAL( artistMode() ), SLOT( setTreeMode() ) ); connect( m_infobar, SIGNAL( albumMode() ), SLOT( setAlbumMode() ) );*/ @@ -766,14 +763,6 @@ ViewManager::onWidgetDestroyed( QWidget* widget ) } -void -ViewManager::setTomahawkLoaded() -{ - m_loaded = true; - emit tomahawkLoaded(); -} - - ViewPage* ViewManager::pageForDynPlaylist(const dynplaylist_ptr& pl) const { diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index d41c2f122..3857844bf 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -119,8 +119,6 @@ public: FlexibleView* createPageForList( const QString& title, const QList< Tomahawk::query_ptr >& queries ); - bool isTomahawkLoaded() const { return m_loaded; } - signals: void filterAvailable( bool b ); @@ -135,8 +133,6 @@ signals: void showQueueRequested(); void hideQueueRequested(); - void tomahawkLoaded(); - void historyBackAvailable( bool avail ); void historyForwardAvailable( bool avail ); @@ -177,8 +173,6 @@ public slots: void playlistInterfaceChanged( Tomahawk::playlistinterface_ptr ); - void setTomahawkLoaded(); - private slots: void setFilter( const QString& filter ); void applyFilter(); @@ -231,8 +225,6 @@ private: QTimer m_filterTimer; QString m_filter; - bool m_loaded; - static ViewManager* s_instance; }; diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 699a562ab..f3155971d 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -121,7 +121,6 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) connect( vm, SIGNAL( showQueueRequested() ), SLOT( showQueue() ) ); connect( vm, SIGNAL( hideQueueRequested() ), SLOT( hideQueue() ) ); - connect( APP, SIGNAL( tomahawkLoaded() ), vm, SLOT( setTomahawkLoaded() ) ); // Pass loaded signal into libtomahawk so components in there can connect to ViewManager #ifdef Q_OS_WIN connect( AudioEngine::instance(), SIGNAL( stateChanged( AudioState, AudioState) ), SLOT( audioStateChanged( AudioState, AudioState) ) );