aboutsummaryrefslogtreecommitdiff
path: root/launcher/java/JavaChecker.h
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-15 12:16:00 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-15 12:16:00 +0300
commitc94ee67077076fdfb3ad04e93a0de2ae32b6a4e5 (patch)
tree437dec3be224cae5e229eeaa4ac9ebeedffd03e3 /launcher/java/JavaChecker.h
parent019e5ca3e819f5daf9933bc0fb091784b0ca561f (diff)
parent8f5bb982cd27dd9158b63d826769c168455a139b (diff)
downloadPrismLauncher-c94ee67077076fdfb3ad04e93a0de2ae32b6a4e5.tar.gz
PrismLauncher-c94ee67077076fdfb3ad04e93a0de2ae32b6a4e5.tar.bz2
PrismLauncher-c94ee67077076fdfb3ad04e93a0de2ae32b6a4e5.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
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);