diff options
Diffstat (limited to 'api/logic/java/JavaCheckerJob.h')
| -rw-r--r-- | api/logic/java/JavaCheckerJob.h | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/api/logic/java/JavaCheckerJob.h b/api/logic/java/JavaCheckerJob.h index 58a98190..cac2b638 100644 --- a/api/logic/java/JavaCheckerJob.h +++ b/api/logic/java/JavaCheckerJob.h @@ -1,4 +1,4 @@ -/* Copyright 2013-2017 MultiMC Contributors +/* Copyright 2013-2018 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ class JavaCheckerJob; typedef std::shared_ptr<JavaCheckerJob> JavaCheckerJobPtr; +// FIXME: this just seems horribly redundant class JavaCheckerJob : public Task { Q_OBJECT @@ -31,41 +32,19 @@ public: bool addJavaCheckerAction(JavaCheckerPtr base) { javacheckers.append(base); - total_progress++; // if this is already running, the action needs to be started right away! if (isRunning()) { - setProgress(current_progress, total_progress); - connect(base.get(), SIGNAL(checkFinished(JavaCheckResult)), SLOT(partFinished(JavaCheckResult))); - + setProgress(num_finished, javacheckers.size()); + connect(base.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished); base->performCheck(); } return true; } - - JavaCheckerPtr operator[](int index) + QList<JavaCheckResult> getResults() { - return javacheckers[index]; + return javaresults; } - ; - JavaCheckerPtr first() - { - if (javacheckers.size()) - return javacheckers[0]; - return JavaCheckerPtr(); - } - int size() const - { - return javacheckers.size(); - } - virtual bool isRunning() const override - { - return m_running; - } - -signals: - void started(); - void finished(QList<JavaCheckResult>); private slots: void partFinished(JavaCheckResult result); @@ -77,8 +56,5 @@ private: QString m_job_name; QList<JavaCheckerPtr> javacheckers; QList<JavaCheckResult> javaresults; - qint64 current_progress = 0; - qint64 total_progress = 0; int num_finished = 0; - bool m_running = false; }; |