From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/java/JavaCheckerJob.h | 55 +++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'api/logic/java/JavaCheckerJob.h')

diff --git a/api/logic/java/JavaCheckerJob.h b/api/logic/java/JavaCheckerJob.h
index cac2b638..24d0d1b8 100644
--- a/api/logic/java/JavaCheckerJob.h
+++ b/api/logic/java/JavaCheckerJob.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,41 +20,42 @@
 #include "tasks/Task.h"
 
 class JavaCheckerJob;
-typedef std::shared_ptr<JavaCheckerJob> JavaCheckerJobPtr;
+typedef shared_qobject_ptr<JavaCheckerJob> JavaCheckerJobPtr;
 
 // FIXME: this just seems horribly redundant
 class JavaCheckerJob : public Task
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
-
-	bool addJavaCheckerAction(JavaCheckerPtr base)
-	{
-		javacheckers.append(base);
-		// if this is already running, the action needs to be started right away!
-		if (isRunning())
-		{
-			setProgress(num_finished, javacheckers.size());
-			connect(base.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
-			base->performCheck();
-		}
-		return true;
-	}
-	QList<JavaCheckResult> getResults()
-	{
-		return javaresults;
-	}
+    explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
+    virtual ~JavaCheckerJob() {};
+
+    bool addJavaCheckerAction(JavaCheckerPtr base)
+    {
+        javacheckers.append(base);
+        // if this is already running, the action needs to be started right away!
+        if (isRunning())
+        {
+            setProgress(num_finished, javacheckers.size());
+            connect(base.get(), &JavaChecker::checkFinished, this, &JavaCheckerJob::partFinished);
+            base->performCheck();
+        }
+        return true;
+    }
+    QList<JavaCheckResult> getResults()
+    {
+        return javaresults;
+    }
 
 private slots:
-	void partFinished(JavaCheckResult result);
+    void partFinished(JavaCheckResult result);
 
 protected:
-	virtual void executeTask() override;
+    virtual void executeTask() override;
 
 private:
-	QString m_job_name;
-	QList<JavaCheckerPtr> javacheckers;
-	QList<JavaCheckResult> javaresults;
-	int num_finished = 0;
+    QString m_job_name;
+    QList<JavaCheckerPtr> javacheckers;
+    QList<JavaCheckResult> javaresults;
+    int num_finished = 0;
 };
-- 
cgit v1.2.3