From 84d36f45a227b35aab467d6fb0b241cac08fe24c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 18 Apr 2015 06:01:59 +0200 Subject: [PATCH] Clean up DownloadManager and add jobFinished() signal. --- src/libtomahawk/DownloadManager.cpp | 6 +----- src/libtomahawk/DownloadManager.h | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/DownloadManager.cpp b/src/libtomahawk/DownloadManager.cpp index 93af57604..6f6798caf 100644 --- a/src/libtomahawk/DownloadManager.cpp +++ b/src/libtomahawk/DownloadManager.cpp @@ -162,8 +162,8 @@ DownloadManager::addJob( const downloadjob_ptr& job ) connect( job.data(), SIGNAL( finished() ), SLOT( onJobFinished() ) ); connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) ); + connect( job.data(), SIGNAL( finished() ), SIGNAL( jobFinished() ) ); connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SLOT( checkJobs() ) ) ; -// connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ) ); checkJobs(); return true; @@ -242,10 +242,6 @@ DownloadManager::checkJobs() if ( state() == DownloadManager::Waiting && !currentJob().isNull() ) { downloadjob_ptr job = currentJob(); -/* connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) ); - connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SLOT( checkJobs() ) ) ; - connect( job.data(), SIGNAL( stateChanged( DownloadJob::TrackState, DownloadJob::TrackState ) ), SIGNAL( stateChanged( Track::TrackState, Track::TrackState ) ) );*/ - job->download(); } } diff --git a/src/libtomahawk/DownloadManager.h b/src/libtomahawk/DownloadManager.h index 00a5ad000..0bb0b02a6 100644 --- a/src/libtomahawk/DownloadManager.h +++ b/src/libtomahawk/DownloadManager.h @@ -59,8 +59,7 @@ public slots: signals: void jobAdded( const downloadjob_ptr& job ); void jobRemoved( const downloadjob_ptr& job ); - - void stateChanged( DownloadManagerState newState, DownloadManagerState oldState ); + void jobFinished(); private slots: void onJobFinished();