GH-849 Further NetJob related fixes

2 files changed, 7 insertions, 7 deletions

diff --git a/logic/net/NetJob.cpp b/logic/net/NetJob.cpp
index b5503daf..40d2d1c9 100644
--- a/logic/net/NetJob.cpp
+++ b/logic/net/NetJob.cpp
@@ -64,7 +64,7 @@ void NetJob::partProgress(int index, qint64 bytesReceived, qint64 bytesTotal)
 	emit progress(current_progress, total_progress);
 }
 
-void NetJob::start()
+void NetJob::executeTask()
 {
 	qDebug() << m_job_name.toLocal8Bit() << " started.";
 	m_running = true;
@@ -86,12 +86,12 @@ void NetJob::startMoreParts()
 			if(!m_failed.size())
 			{
 				qDebug() << m_job_name << "succeeded.";
-				emit succeeded();
+				emitSucceeded();
 			}
 			else
 			{
 				qCritical() << m_job_name << "failed.";
-				emit failed(tr("%1 failed").arg(m_job_name));
+				emitFailed(tr("Job '%1' failed to process:\n%2").arg(m_job_name).arg(getFailedFiles().join("\n")));
 			}
 		}
 		return;
diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h
index 912a74b3..c0172bea 100644
--- a/logic/net/NetJob.h
+++ b/logic/net/NetJob.h
@@ -21,17 +21,17 @@
 #include "MD5EtagDownload.h"
 #include "CacheDownload.h"
 #include "HttpMetaCache.h"
-#include "tasks/ProgressProvider.h"
+#include "tasks/Task.h"
 #include "QObjectPtr.h"
 
 class NetJob;
 typedef QObjectPtr<NetJob> NetJobPtr;
 
-class NetJob : public ProgressProvider
+class NetJob : public Task
 {
 	Q_OBJECT
 public:
-	explicit NetJob(QString job_name) : ProgressProvider(), m_job_name(job_name) {}
+	explicit NetJob(QString job_name) : Task(), m_job_name(job_name) {}
 	virtual ~NetJob() {}
 	template <typename T> bool addNetAction(T action)
 	{
@@ -87,7 +87,7 @@ private slots:
 	void startMoreParts();
 
 public slots:
-	virtual void start();
+	virtual void executeTask();
 	// FIXME: implement
 	virtual void abort() {};