NOISSUE reformat MeshMC to new clang format rules and fixed macOS portability issue and java find issue

Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>

1 files changed, 39 insertions, 47 deletions

diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp
index 6e64898150..5d00ff164b 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/JavaWizardPage.cpp
@@ -42,78 +42,70 @@
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/widgets/JavaSettingsWidget.h"
 
-
-JavaWizardPage::JavaWizardPage(QWidget *parent)
-    :BaseWizardPage(parent)
+JavaWizardPage::JavaWizardPage(QWidget* parent) : BaseWizardPage(parent)
 {
-    setupUi();
+	setupUi();
 }
 
 void JavaWizardPage::setupUi()
 {
-    setObjectName(QStringLiteral("javaPage"));
-    QVBoxLayout * layout = new QVBoxLayout(this);
+	setObjectName(QStringLiteral("javaPage"));
+	QVBoxLayout* layout = new QVBoxLayout(this);
 
-    m_java_widget = new JavaSettingsWidget(this);
-    layout->addWidget(m_java_widget);
-    setLayout(layout);
+	m_java_widget = new JavaSettingsWidget(this);
+	layout->addWidget(m_java_widget);
+	setLayout(layout);
 
-    retranslate();
+	retranslate();
 }
 
 void JavaWizardPage::refresh()
 {
-    m_java_widget->refresh();
+	m_java_widget->refresh();
 }
 
 void JavaWizardPage::initializePage()
 {
-    m_java_widget->initialize();
+	m_java_widget->initialize();
 }
 
 bool JavaWizardPage::wantsRefreshButton()
 {
-    return true;
+	return true;
 }
 
 bool JavaWizardPage::validatePage()
 {
-    auto settings = APPLICATION->settings();
-    auto result = m_java_widget->validate();
-    switch(result)
-    {
-        default:
-        case JavaSettingsWidget::ValidationStatus::Bad:
-        {
-            return false;
-        }
-        case JavaSettingsWidget::ValidationStatus::AllOK:
-        {
-            settings->set("JavaPath", m_java_widget->javaPath());
-        }
-        case JavaSettingsWidget::ValidationStatus::JavaBad:
-        {
-            // Memory
-            auto s = APPLICATION->settings();
-            s->set("MinMemAlloc", m_java_widget->minHeapSize());
-            s->set("MaxMemAlloc", m_java_widget->maxHeapSize());
-            if (m_java_widget->permGenEnabled())
-            {
-                s->set("PermGen", m_java_widget->permGenSize());
-            }
-            else
-            {
-                s->reset("PermGen");
-            }
-            return true;
-        }
-    }
+	auto settings = APPLICATION->settings();
+	auto result = m_java_widget->validate();
+	switch (result) {
+		default:
+		case JavaSettingsWidget::ValidationStatus::Bad: {
+			return false;
+		}
+		case JavaSettingsWidget::ValidationStatus::AllOK: {
+			settings->set("JavaPath", m_java_widget->javaPath());
+		}
+		case JavaSettingsWidget::ValidationStatus::JavaBad: {
+			// Memory
+			auto s = APPLICATION->settings();
+			s->set("MinMemAlloc", m_java_widget->minHeapSize());
+			s->set("MaxMemAlloc", m_java_widget->maxHeapSize());
+			if (m_java_widget->permGenEnabled()) {
+				s->set("PermGen", m_java_widget->permGenSize());
+			} else {
+				s->reset("PermGen");
+			}
+			return true;
+		}
+	}
 }
 
 void JavaWizardPage::retranslate()
 {
-    setTitle(tr("Java"));
-    setSubTitle(tr("You do not have a working Java set up yet or it went missing.\n"
-        "Please select one of the following or browse for a java executable."));
-    m_java_widget->retranslate();
+	setTitle(tr("Java"));
+	setSubTitle(tr(
+		"You do not have a working Java set up yet or it went missing.\n"
+		"Please select one of the following or browse for a java executable."));
+	m_java_widget->retranslate();
 }