Reformat and (slightly) decruft all the things.

1 files changed, 73 insertions, 67 deletions

diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 6a6b195b..c38f75ef 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@
 
 #include <QFileInfo>
 #include <QDir>
-#include <MultiMC.h>
+#include "MultiMC.h"
 
 #include "inisettingsobject.h"
 #include "setting.h"
@@ -28,64 +28,74 @@
 #include "pathutils.h"
 #include "lists/MinecraftVersionList.h"
 
-
-BaseInstance::BaseInstance( BaseInstancePrivate* d_in,
-							const QString& rootDir,
-							SettingsObject* settings_obj,
-							QObject* parent
-						  )
-:inst_d(d_in), QObject(parent)
+BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
+						   SettingsObject *settings_obj, QObject *parent)
+	: inst_d(d_in), QObject(parent)
 {
 	I_D(BaseInstance);
 	d->m_settings = settings_obj;
 	d->m_rootDir = rootDir;
-	
+
 	settings().registerSetting(new Setting("name", "Unnamed Instance"));
 	settings().registerSetting(new Setting("iconKey", "default"));
 	settings().registerSetting(new Setting("notes", ""));
 	settings().registerSetting(new Setting("lastLaunchTime", 0));
-	
+
 	/*
-	 * custom base jar has no default. it is determined in code... see the accessor methods for it
-	 * 
+	 * custom base jar has no default. it is determined in code... see the accessor methods for
+	 *it
+	 *
 	 * for instances that DO NOT have the CustomBaseJar setting (legacy instances),
 	 * [.]minecraft/bin/mcbackup.jar is the default base jar
 	 */
 	settings().registerSetting(new Setting("UseCustomBaseJar", true));
 	settings().registerSetting(new Setting("CustomBaseJar", ""));
-	
+
 	auto globalSettings = MMC->settings();
-	
+
 	// Java Settings
 	settings().registerSetting(new Setting("OverrideJava", false));
-	settings().registerSetting(new OverrideSetting("JavaPath", globalSettings->getSetting("JavaPath")));
-	settings().registerSetting(new OverrideSetting("JvmArgs", globalSettings->getSetting("JvmArgs")));
-	
+	settings().registerSetting(
+		new OverrideSetting("JavaPath", globalSettings->getSetting("JavaPath")));
+	settings().registerSetting(
+		new OverrideSetting("JvmArgs", globalSettings->getSetting("JvmArgs")));
+
 	// Custom Commands
 	settings().registerSetting(new Setting("OverrideCommands", false));
-	settings().registerSetting(new OverrideSetting("PreLaunchCommand", globalSettings->getSetting("PreLaunchCommand")));
-	settings().registerSetting(new OverrideSetting("PostExitCommand", globalSettings->getSetting("PostExitCommand")));
-	
+	settings().registerSetting(new OverrideSetting(
+		"PreLaunchCommand", globalSettings->getSetting("PreLaunchCommand")));
+	settings().registerSetting(
+		new OverrideSetting("PostExitCommand", globalSettings->getSetting("PostExitCommand")));
+
 	// Window Size
 	settings().registerSetting(new Setting("OverrideWindow", false));
-	settings().registerSetting(new OverrideSetting("LaunchMaximized", globalSettings->getSetting("LaunchMaximized")));
-	settings().registerSetting(new OverrideSetting("MinecraftWinWidth", globalSettings->getSetting("MinecraftWinWidth")));
-	settings().registerSetting(new OverrideSetting("MinecraftWinHeight", globalSettings->getSetting("MinecraftWinHeight")));
-	
+	settings().registerSetting(
+		new OverrideSetting("LaunchMaximized", globalSettings->getSetting("LaunchMaximized")));
+	settings().registerSetting(new OverrideSetting(
+		"MinecraftWinWidth", globalSettings->getSetting("MinecraftWinWidth")));
+	settings().registerSetting(new OverrideSetting(
+		"MinecraftWinHeight", globalSettings->getSetting("MinecraftWinHeight")));
+
 	// Memory
 	settings().registerSetting(new Setting("OverrideMemory", false));
-	settings().registerSetting(new OverrideSetting("MinMemAlloc", globalSettings->getSetting("MinMemAlloc")));
-	settings().registerSetting(new OverrideSetting("MaxMemAlloc", globalSettings->getSetting("MaxMemAlloc")));
-	settings().registerSetting(new OverrideSetting("PermGen", globalSettings->getSetting("PermGen")));
-	
+	settings().registerSetting(
+		new OverrideSetting("MinMemAlloc", globalSettings->getSetting("MinMemAlloc")));
+	settings().registerSetting(
+		new OverrideSetting("MaxMemAlloc", globalSettings->getSetting("MaxMemAlloc")));
+	settings().registerSetting(
+		new OverrideSetting("PermGen", globalSettings->getSetting("PermGen")));
+
 	// Auto login
 	settings().registerSetting(new Setting("OverrideLogin", false));
-	settings().registerSetting(new OverrideSetting("AutoLogin", globalSettings->getSetting("AutoLogin")));
-	
+	settings().registerSetting(
+		new OverrideSetting("AutoLogin", globalSettings->getSetting("AutoLogin")));
+
 	// Console
 	settings().registerSetting(new Setting("OverrideConsole", false));
-	settings().registerSetting(new OverrideSetting("ShowConsole", globalSettings->getSetting("ShowConsole")));
-	settings().registerSetting(new OverrideSetting("AutoCloseConsole", globalSettings->getSetting("AutoCloseConsole")));
+	settings().registerSetting(
+		new OverrideSetting("ShowConsole", globalSettings->getSetting("ShowConsole")));
+	settings().registerSetting(new OverrideSetting(
+		"AutoCloseConsole", globalSettings->getSetting("AutoCloseConsole")));
 }
 
 void BaseInstance::nuke()
@@ -94,7 +104,6 @@ void BaseInstance::nuke()
 	emit nuked(this);
 }
 
-
 QString BaseInstance::id() const
 {
 	return QFileInfo(instanceRoot()).fileName();
@@ -106,7 +115,6 @@ QString BaseInstance::instanceType() const
 	return d->m_settings->get("InstanceType").toString();
 }
 
-
 QString BaseInstance::instanceRoot() const
 {
 	I_D(BaseInstance);
@@ -117,9 +125,9 @@ QString BaseInstance::minecraftRoot() const
 {
 	QFileInfo mcDir(PathCombine(instanceRoot(), "minecraft"));
 	QFileInfo dotMCDir(PathCombine(instanceRoot(), ".minecraft"));
-	
+
 	if (dotMCDir.exists() && !mcDir.exists())
-        return dotMCDir.filePath();
+		return dotMCDir.filePath();
 	else
 		return mcDir.filePath();
 }
@@ -147,7 +155,7 @@ QString BaseInstance::baseJar() const
 {
 	I_D(BaseInstance);
 	bool customJar = d->m_settings->get("UseCustomBaseJar").toBool();
-	if(customJar)
+	if (customJar)
 	{
 		return customBaseJar();
 	}
@@ -158,99 +166,97 @@ QString BaseInstance::baseJar() const
 QString BaseInstance::customBaseJar() const
 {
 	I_D(BaseInstance);
-	QString value = d->m_settings->get ( "CustomBaseJar" ).toString();
-	if(value.isNull() || value.isEmpty())
+	QString value = d->m_settings->get("CustomBaseJar").toString();
+	if (value.isNull() || value.isEmpty())
 	{
 		return defaultCustomBaseJar();
 	}
 	return value;
 }
 
-void BaseInstance::setCustomBaseJar ( QString val )
+void BaseInstance::setCustomBaseJar(QString val)
 {
 	I_D(BaseInstance);
-	if(val.isNull() || val.isEmpty() || val == defaultCustomBaseJar())
-		d->m_settings->reset ( "CustomBaseJar" );
+	if (val.isNull() || val.isEmpty() || val == defaultCustomBaseJar())
+		d->m_settings->reset("CustomBaseJar");
 	else
-		d->m_settings->set ( "CustomBaseJar", val );
+		d->m_settings->set("CustomBaseJar", val);
 }
 
-void BaseInstance::setShouldUseCustomBaseJar ( bool val )
+void BaseInstance::setShouldUseCustomBaseJar(bool val)
 {
 	I_D(BaseInstance);
-	d->m_settings->set ( "UseCustomBaseJar", val );
+	d->m_settings->set("UseCustomBaseJar", val);
 }
 
 bool BaseInstance::shouldUseCustomBaseJar() const
 {
 	I_D(BaseInstance);
-	return d->m_settings->get ( "UseCustomBaseJar" ).toBool();
+	return d->m_settings->get("UseCustomBaseJar").toBool();
 }
 
-
 qint64 BaseInstance::lastLaunch() const
 {
 	I_D(BaseInstance);
-	return d->m_settings->get ( "lastLaunchTime" ).value<qint64>();
+	return d->m_settings->get("lastLaunchTime").value<qint64>();
 }
-void BaseInstance::setLastLaunch ( qint64 val )
+void BaseInstance::setLastLaunch(qint64 val)
 {
 	I_D(BaseInstance);
-	d->m_settings->set ( "lastLaunchTime", val );
-	emit propertiesChanged ( this );
+	d->m_settings->set("lastLaunchTime", val);
+	emit propertiesChanged(this);
 }
 
-void BaseInstance::setGroupInitial ( QString val )
+void BaseInstance::setGroupInitial(QString val)
 {
 	I_D(BaseInstance);
 	d->m_group = val;
-	emit propertiesChanged ( this );
+	emit propertiesChanged(this);
 }
 
-void BaseInstance::setGroupPost ( QString val )
+void BaseInstance::setGroupPost(QString val)
 {
 	setGroupInitial(val);
 	emit groupChanged();
 }
 
-
 QString BaseInstance::group() const
 {
 	I_D(BaseInstance);
 	return d->m_group;
 }
 
-void BaseInstance::setNotes ( QString val )
+void BaseInstance::setNotes(QString val)
 {
 	I_D(BaseInstance);
-	d->m_settings->set ( "notes", val );
+	d->m_settings->set("notes", val);
 }
 QString BaseInstance::notes() const
 {
 	I_D(BaseInstance);
-	return d->m_settings->get ( "notes" ).toString();
+	return d->m_settings->get("notes").toString();
 }
 
-void BaseInstance::setIconKey ( QString val )
+void BaseInstance::setIconKey(QString val)
 {
 	I_D(BaseInstance);
-	d->m_settings->set ( "iconKey", val );
-	emit propertiesChanged ( this );
+	d->m_settings->set("iconKey", val);
+	emit propertiesChanged(this);
 }
 QString BaseInstance::iconKey() const
 {
 	I_D(BaseInstance);
-	return d->m_settings->get ( "iconKey" ).toString();
+	return d->m_settings->get("iconKey").toString();
 }
 
-void BaseInstance::setName ( QString val )
+void BaseInstance::setName(QString val)
 {
 	I_D(BaseInstance);
-	d->m_settings->set ( "name", val );
-	emit propertiesChanged ( this );
+	d->m_settings->set("name", val);
+	emit propertiesChanged(this);
 }
 QString BaseInstance::name() const
 {
 	I_D(BaseInstance);
-	return d->m_settings->get ( "name" ).toString();
+	return d->m_settings->get("name").toString();
 }