Remove obsolete auto login option.

6 files changed, 0 insertions, 72 deletions

diff --git a/MultiMC.cpp b/MultiMC.cpp
index bf0d9d99..65c24087 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -319,9 +319,6 @@ void MultiMC::initGlobalSettings()
 	m_settings->registerSetting(new Setting("MinecraftWinWidth", 854));
 	m_settings->registerSetting(new Setting("MinecraftWinHeight", 480));
 
-	// Auto login
-	m_settings->registerSetting(new Setting("AutoLogin", false));
-
 	// Memory
 	m_settings->registerSetting(new Setting("MinMemAlloc", 512));
 	m_settings->registerSetting(new Setting("MaxMemAlloc", 1024));
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp
index 641c7fab..e3f8a66b 100644
--- a/gui/dialogs/InstanceSettings.cpp
+++ b/gui/dialogs/InstanceSettings.cpp
@@ -98,18 +98,6 @@ void InstanceSettings::applySettings()
 		m_obj->reset("MinecraftWinHeight");
 	}
 
-	// Auto Login
-	bool login = ui->accountSettingsBox->isChecked();
-	m_obj->set("OverrideLogin", login);
-	if (login)
-	{
-		m_obj->set("AutoLogin", ui->autoLoginCheckBox->isChecked());
-	}
-	else
-	{
-		m_obj->reset("AutoLogin");
-	}
-
 	// Memory
 	bool memory = ui->memoryGroupBox->isChecked();
 	m_obj->set("OverrideMemory", memory);
@@ -170,10 +158,6 @@ void InstanceSettings::loadSettings()
 	ui->windowWidthSpinBox->setValue(m_obj->get("MinecraftWinWidth").toInt());
 	ui->windowHeightSpinBox->setValue(m_obj->get("MinecraftWinHeight").toInt());
 
-	// Auto Login
-	ui->accountSettingsBox->setChecked(m_obj->get("OverrideLogin").toBool());
-	ui->autoLoginCheckBox->setChecked(m_obj->get("AutoLogin").toBool());
-
 	// Memory
 	ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool());
 	ui->minMemSpinBox->setValue(m_obj->get("MinMemAlloc").toInt());
diff --git a/gui/dialogs/InstanceSettings.ui b/gui/dialogs/InstanceSettings.ui
index c4a7d6ed..9260caea 100644
--- a/gui/dialogs/InstanceSettings.ui
+++ b/gui/dialogs/InstanceSettings.ui
@@ -132,31 +132,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="accountSettingsBox">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Account Settings</string>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_6">
-          <item>
-           <widget class="QCheckBox" name="autoLoginCheckBox">
-            <property name="text">
-             <string>Login automatically when an instance icon is double clicked?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
         <spacer name="verticalSpacerMinecraft">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -411,7 +386,6 @@
   <tabstop>consoleSettingsBox</tabstop>
   <tabstop>showConsoleCheck</tabstop>
   <tabstop>autoCloseConsoleCheck</tabstop>
-  <tabstop>accountSettingsBox</tabstop>
   <tabstop>memoryGroupBox</tabstop>
   <tabstop>minMemSpinBox</tabstop>
   <tabstop>maxMemSpinBox</tabstop>
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index e7f537e3..b960483a 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -150,9 +150,6 @@ void SettingsDialog::applySettings(SettingsObject *s)
 	s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
 	s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
 
-	// Auto Login
-	s->set("AutoLogin", ui->autoLoginCheckBox->isChecked());
-
 	// Memory
 	s->set("MinMemAlloc", ui->minMemSpinBox->value());
 	s->set("MaxMemAlloc", ui->maxMemSpinBox->value());
@@ -202,9 +199,6 @@ void SettingsDialog::loadSettings(SettingsObject *s)
 	ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
 	ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
 
-	// Auto Login
-	ui->autoLoginCheckBox->setChecked(s->get("AutoLogin").toBool());
-
 	// Memory
 	ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
 	ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 0dbc8def..17320b48 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -262,22 +262,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="accountSettingsBox">
-         <property name="title">
-          <string>Account Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QCheckBox" name="autoLoginCheckBox">
-            <property name="text">
-             <string>Login automatically when an instance icon is double clicked?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
         <spacer name="verticalSpacerMinecraft">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 6f8222b7..bc82fee1 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -85,11 +85,6 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
 	settings().registerSetting(
 		new OverrideSetting("PermGen", globalSettings->getSetting("PermGen")));
 
-	// Auto login
-	settings().registerSetting(new Setting("OverrideLogin", false));
-	settings().registerSetting(
-		new OverrideSetting("AutoLogin", globalSettings->getSetting("AutoLogin")));
-
 	// Console
 	settings().registerSetting(new Setting("OverrideConsole", false));
 	settings().registerSetting(