1 files changed, 84 insertions, 83 deletions

diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp
index ce733778..211dc929 100644
--- a/application/pages/global/JavaPage.cpp
+++ b/application/pages/global/JavaPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QDir>
+#include <QTabBar>
 
 #include "dialogs/VersionSelectDialog.h"
 
@@ -34,120 +35,120 @@
 
 JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
 
-	auto sysMB = Sys::getSystemRam() / Sys::megabyte;
-	ui->maxMemSpinBox->setMaximum(sysMB);
-	loadSettings();
+    auto sysMB = Sys::getSystemRam() / Sys::megabyte;
+    ui->maxMemSpinBox->setMaximum(sysMB);
+    loadSettings();
 }
 
 JavaPage::~JavaPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool JavaPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void JavaPage::applySettings()
 {
-	auto s = MMC->settings();
-
-	// Memory
-	int min = ui->minMemSpinBox->value();
-	int max = ui->maxMemSpinBox->value();
-	if(min < max)
-	{
-		s->set("MinMemAlloc", min);
-		s->set("MaxMemAlloc", max);
-	}
-	else
-	{
-		s->set("MinMemAlloc", max);
-		s->set("MaxMemAlloc", min);
-	}
-	s->set("PermGen", ui->permGenSpinBox->value());
-
-	// Java Settings
-	s->set("JavaPath", ui->javaPathTextBox->text());
-	s->set("JvmArgs", ui->jvmArgsTextBox->text());
-	JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
+    auto s = MMC->settings();
+
+    // Memory
+    int min = ui->minMemSpinBox->value();
+    int max = ui->maxMemSpinBox->value();
+    if(min < max)
+    {
+        s->set("MinMemAlloc", min);
+        s->set("MaxMemAlloc", max);
+    }
+    else
+    {
+        s->set("MinMemAlloc", max);
+        s->set("MaxMemAlloc", min);
+    }
+    s->set("PermGen", ui->permGenSpinBox->value());
+
+    // Java Settings
+    s->set("JavaPath", ui->javaPathTextBox->text());
+    s->set("JvmArgs", ui->jvmArgsTextBox->text());
+    JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
 }
 void JavaPage::loadSettings()
 {
-	auto s = MMC->settings();
-	// Memory
-	int min = s->get("MinMemAlloc").toInt();
-	int max = s->get("MaxMemAlloc").toInt();
-	if(min < max)
-	{
-		ui->minMemSpinBox->setValue(min);
-		ui->maxMemSpinBox->setValue(max);
-	}
-	else
-	{
-		ui->minMemSpinBox->setValue(max);
-		ui->maxMemSpinBox->setValue(min);
-	}
-	ui->permGenSpinBox->setValue(s->get("PermGen").toInt());
-
-	// Java Settings
-	ui->javaPathTextBox->setText(s->get("JavaPath").toString());
-	ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString());
+    auto s = MMC->settings();
+    // Memory
+    int min = s->get("MinMemAlloc").toInt();
+    int max = s->get("MaxMemAlloc").toInt();
+    if(min < max)
+    {
+        ui->minMemSpinBox->setValue(min);
+        ui->maxMemSpinBox->setValue(max);
+    }
+    else
+    {
+        ui->minMemSpinBox->setValue(max);
+        ui->maxMemSpinBox->setValue(min);
+    }
+    ui->permGenSpinBox->setValue(s->get("PermGen").toInt());
+
+    // Java Settings
+    ui->javaPathTextBox->setText(s->get("JavaPath").toString());
+    ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString());
 }
 
 void JavaPage::on_javaDetectBtn_clicked()
 {
-	JavaInstallPtr java;
+    JavaInstallPtr java;
 
-	VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true);
-	vselect.setResizeOn(2);
-	vselect.exec();
+    VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true);
+    vselect.setResizeOn(2);
+    vselect.exec();
 
-	if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
-	{
-		java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
-		ui->javaPathTextBox->setText(java->path);
-	}
+    if (vselect.result() == QDialog::Accepted && vselect.selectedVersion())
+    {
+        java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion());
+        ui->javaPathTextBox->setText(java->path);
+    }
 }
 
 void JavaPage::on_javaBrowseBtn_clicked()
 {
-	QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
-
-	// do not allow current dir - it's dirty. Do not allow dirs that don't exist
-	if(raw_path.isEmpty())
-	{
-		return;
-	}
-
-	QString cooked_path = FS::NormalizePath(raw_path);
-	QFileInfo javaInfo(cooked_path);;
-	if(!javaInfo.exists() || !javaInfo.isExecutable())
-	{
-		return;
-	}
-	ui->javaPathTextBox->setText(cooked_path);
+    QString raw_path = QFileDialog::getOpenFileName(this, tr("Find Java executable"));
+
+    // do not allow current dir - it's dirty. Do not allow dirs that don't exist
+    if(raw_path.isEmpty())
+    {
+        return;
+    }
+
+    QString cooked_path = FS::NormalizePath(raw_path);
+    QFileInfo javaInfo(cooked_path);;
+    if(!javaInfo.exists() || !javaInfo.isExecutable())
+    {
+        return;
+    }
+    ui->javaPathTextBox->setText(cooked_path);
 }
 
 void JavaPage::on_javaTestBtn_clicked()
 {
-	if(checker)
-	{
-		return;
-	}
-	checker.reset(new JavaCommon::TestCheck(
-		this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->text(),
-		ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
-	connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
-	checker->run();
+    if(checker)
+    {
+        return;
+    }
+    checker.reset(new JavaCommon::TestCheck(
+        this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->text(),
+        ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value()));
+    connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished()));
+    checker->run();
 }
 
 void JavaPage::checkerFinished()
 {
-	checker.reset();
+    checker.reset();
 }