From d587720010036e3335e321f192449808a75e958b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 21 Mar 2016 02:19:23 +0100 Subject: NOISSUE use new mojang assets locations --- logic/net/NetJob.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'logic/net') diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h index 45f6dacf..afbe9ff3 100644 --- a/logic/net/NetJob.h +++ b/logic/net/NetJob.h @@ -35,16 +35,15 @@ class MULTIMC_LOGIC_EXPORT NetJob : public Task public: explicit NetJob(QString job_name) : Task(), m_job_name(job_name) {} virtual ~NetJob() {} - template bool addNetAction(T action) + bool addNetAction(NetActionPtr action) { - NetActionPtr base = std::static_pointer_cast(action); - base->m_index_within_job = downloads.size(); + action->m_index_within_job = downloads.size(); downloads.append(action); part_info pi; { - pi.current_progress = base->currentProgress(); - pi.total_progress = base->totalProgress(); - pi.failures = base->numberOfFailures(); + pi.current_progress = action->currentProgress(); + pi.total_progress = action->totalProgress(); + pi.failures = action->numberOfFailures(); } parts_progress.append(pi); total_progress += pi.total_progress; @@ -52,11 +51,11 @@ public: if (isRunning()) { setProgress(current_progress, total_progress); - connect(base.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int))); - connect(base.get(), SIGNAL(failed(int)), SLOT(partFailed(int))); - connect(base.get(), SIGNAL(netActionProgress(int, qint64, qint64)), + connect(action.get(), SIGNAL(succeeded(int)), SLOT(partSucceeded(int))); + connect(action.get(), SIGNAL(failed(int)), SLOT(partFailed(int))); + connect(action.get(), SIGNAL(netActionProgress(int, qint64, qint64)), SLOT(partProgress(int, qint64, qint64))); - base->start(); + action->start(); } return true; } -- cgit v1.2.3