aboutsummaryrefslogtreecommitdiff
path: root/launcher/java/JavaChecker.h
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:09:10 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:09:10 +0300
commitb2fdd8359405c93d0d93aa8c68971c986a1f68cb (patch)
tree59859119373213ce04b2f5e2d7a95227b57be609 /launcher/java/JavaChecker.h
parent149b6d59cf848a3b3cd50b3aee1c112e9c47e633 (diff)
parentae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff)
downloadPrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.tar.gz
PrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.tar.bz2
PrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/java/JavaChecker.h')
-rw-r--r--launcher/java/JavaChecker.h25
1 files changed, 9 insertions, 16 deletions
diff --git a/launcher/java/JavaChecker.h b/launcher/java/JavaChecker.h
index 122861cf..743f4941 100644
--- a/launcher/java/JavaChecker.h
+++ b/launcher/java/JavaChecker.h
@@ -9,8 +9,7 @@
class JavaChecker;
-struct JavaCheckResult
-{
+struct JavaCheckResult {
QString path;
QString mojangPlatform;
QString realPlatform;
@@ -20,21 +19,15 @@ struct JavaCheckResult
QString errorLog;
bool is_64bit = false;
int id;
- enum class Validity
- {
- Errored,
- ReturnedInvalidData,
- Valid
- } validity = Validity::Errored;
+ enum class Validity { Errored, ReturnedInvalidData, Valid } validity = Validity::Errored;
};
typedef shared_qobject_ptr<QProcess> QProcessPtr;
typedef shared_qobject_ptr<JavaChecker> JavaCheckerPtr;
-class JavaChecker : public QObject
-{
+class JavaChecker : public QObject {
Q_OBJECT
-public:
- explicit JavaChecker(QObject *parent = 0);
+ public:
+ explicit JavaChecker(QObject* parent = 0);
void performCheck();
QString m_path;
@@ -44,15 +37,15 @@ public:
int m_maxMem = 0;
int m_permGen = 64;
-signals:
+ signals:
void checkFinished(JavaCheckResult result);
-private:
+
+ private:
QProcessPtr process;
QTimer killTimer;
QString m_stdout;
QString m_stderr;
-public
-slots:
+ public slots:
void timeout();
void finished(int exitcode, QProcess::ExitStatus);
void error(QProcess::ProcessError);