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/JavaChecker.h | 72 +++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

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

diff --git a/api/logic/java/JavaChecker.h b/api/logic/java/JavaChecker.h
index c6bd697c..af0dcb90 100644
--- a/api/logic/java/JavaChecker.h
+++ b/api/logic/java/JavaChecker.h
@@ -3,6 +3,8 @@
 #include <QTimer>
 #include <memory>
 
+#include "QObjectPtr.h"
+
 #include "multimc_logic_export.h"
 
 #include "JavaVersion.h"
@@ -11,50 +13,50 @@ class JavaChecker;
 
 struct MULTIMC_LOGIC_EXPORT JavaCheckResult
 {
-	QString path;
-	QString mojangPlatform;
-	QString realPlatform;
-	JavaVersion javaVersion;
-	QString outLog;
-	QString errorLog;
-	bool is_64bit = false;
-	int id;
-	enum class Validity
-	{
-		Errored,
-		ReturnedInvalidData,
-		Valid
-	} validity = Validity::Errored;
+    QString path;
+    QString mojangPlatform;
+    QString realPlatform;
+    JavaVersion javaVersion;
+    QString outLog;
+    QString errorLog;
+    bool is_64bit = false;
+    int id;
+    enum class Validity
+    {
+        Errored,
+        ReturnedInvalidData,
+        Valid
+    } validity = Validity::Errored;
 };
 
-typedef std::shared_ptr<QProcess> QProcessPtr;
-typedef std::shared_ptr<JavaChecker> JavaCheckerPtr;
+typedef shared_qobject_ptr<QProcess> QProcessPtr;
+typedef shared_qobject_ptr<JavaChecker> JavaCheckerPtr;
 class MULTIMC_LOGIC_EXPORT JavaChecker : public QObject
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit JavaChecker(QObject *parent = 0);
-	void performCheck();
+    explicit JavaChecker(QObject *parent = 0);
+    void performCheck();
 
-	QString m_path;
-	QString m_args;
-	int m_id = 0;
-	int m_minMem = 0;
-	int m_maxMem = 0;
-	int m_permGen = 64;
+    QString m_path;
+    QString m_args;
+    int m_id = 0;
+    int m_minMem = 0;
+    int m_maxMem = 0;
+    int m_permGen = 64;
 
 signals:
-	void checkFinished(JavaCheckResult result);
+    void checkFinished(JavaCheckResult result);
 private:
-	QProcessPtr process;
-	QTimer killTimer;
-	QString m_stdout;
-	QString m_stderr;
+    QProcessPtr process;
+    QTimer killTimer;
+    QString m_stdout;
+    QString m_stderr;
 public
 slots:
-	void timeout();
-	void finished(int exitcode, QProcess::ExitStatus);
-	void error(QProcess::ProcessError);
-	void stdoutReady();
-	void stderrReady();
+    void timeout();
+    void finished(int exitcode, QProcess::ExitStatus);
+    void error(QProcess::ProcessError);
+    void stdoutReady();
+    void stderrReady();
 };
-- 
cgit v1.2.3