Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 39 insertions, 42 deletions

diff --git a/launcher/JavaCommon.h b/launcher/JavaCommon.h
index 59cb7a67..c96f7a98 100644
--- a/launcher/JavaCommon.h
+++ b/launcher/JavaCommon.h
@@ -6,45 +6,42 @@ class QWidget;
 /**
  * Common UI bits for the java pages to use.
  */
-namespace JavaCommon
-{
-    bool checkJVMArgs(QString args, QWidget *parent);
-
-    // Show a dialog saying that the Java binary was usable
-    void javaWasOk(QWidget *parent, JavaCheckResult result);
-    // Show a dialog saying that the Java binary was not usable because of bad options
-    void javaArgsWereBad(QWidget *parent, JavaCheckResult result);
-    // Show a dialog saying that the Java binary was not usable
-    void javaBinaryWasBad(QWidget *parent, JavaCheckResult result);
-    // Show a dialog if we couldn't find Java Checker
-    void javaCheckNotFound(QWidget *parent);
-
-    class TestCheck : public QObject
-    {
-        Q_OBJECT
-    public:
-        TestCheck(QWidget *parent, QString path, QString args, int minMem, int maxMem, int permGen)
-            :m_parent(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen)
-        {
-        }
-        virtual ~TestCheck() {};
-
-        void run();
-
-    signals:
-        void finished();
-
-    private slots:
-        void checkFinished(JavaCheckResult result);
-        void checkFinishedWithArgs(JavaCheckResult result);
-
-    private:
-        std::shared_ptr<JavaChecker> checker;
-        QWidget *m_parent = nullptr;
-        QString m_path;
-        QString m_args;
-        int m_minMem = 0;
-        int m_maxMem = 0;
-        int m_permGen = 64;
-    };
-}
+namespace JavaCommon {
+bool checkJVMArgs(QString args, QWidget* parent);
+
+// Show a dialog saying that the Java binary was usable
+void javaWasOk(QWidget* parent, const JavaCheckResult& result);
+// Show a dialog saying that the Java binary was not usable because of bad options
+void javaArgsWereBad(QWidget* parent, const JavaCheckResult& result);
+// Show a dialog saying that the Java binary was not usable
+void javaBinaryWasBad(QWidget* parent, const JavaCheckResult& result);
+// Show a dialog if we couldn't find Java Checker
+void javaCheckNotFound(QWidget* parent);
+
+class TestCheck : public QObject {
+    Q_OBJECT
+   public:
+    TestCheck(QWidget* parent, QString path, QString args, int minMem, int maxMem, int permGen)
+        : m_parent(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen)
+    {}
+    virtual ~TestCheck(){};
+
+    void run();
+
+   signals:
+    void finished();
+
+   private slots:
+    void checkFinished(JavaCheckResult result);
+    void checkFinishedWithArgs(JavaCheckResult result);
+
+   private:
+    std::shared_ptr<JavaChecker> checker;
+    QWidget* m_parent = nullptr;
+    QString m_path;
+    QString m_args;
+    int m_minMem = 0;
+    int m_maxMem = 0;
+    int m_permGen = 64;
+};
+}  // namespace JavaCommon