summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2013-02-07 23:23:32 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2013-02-07 23:23:32 -0600
commit87bbdbf5428b94520b44a97df53a5f7ee1e9945d (patch)
tree56f28588d900220817c0ffb46361310534a4632a /Source
parent026793fa4abfd7e2d1b6f443022e621b81bddac9 (diff)
Remove settings stuff that was not actually used anywhere.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/ConfigManager.cpp20
-rw-r--r--Source/Core/Core/Src/ConfigManager.h5
2 files changed, 1 insertions, 24 deletions
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index f6194c1bb7..978eadace1 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -100,9 +100,6 @@ SConfig::SConfig()
{
// Make sure we have log manager
LoadSettings();
- //Make sure we load any extra settings
- LoadSettingsWii();
-
}
void SConfig::Init()
@@ -427,19 +424,4 @@ void SConfig::LoadSettings()
}
m_SYSCONF = new SysConf();
-}
-void SConfig::LoadSettingsWii()
-{
- IniFile ini;
- //Wiimote configs
- ini.Load((File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini"));
- for (int i = 0; i < 4; i++)
- {
- char SectionName[32];
- sprintf(SectionName, "Wiimote%i", i + 1);
- ini.Get(SectionName, "AutoReconnectRealWiimote", &m_WiiAutoReconnect[i], false);
- }
- ini.Load((File::GetUserPath(D_CONFIG_IDX) + "wiimote.ini"));
- ini.Get("Real", "Unpair", &m_WiiAutoUnpair, false);
-
-}
+} \ No newline at end of file
diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h
index e92d29ee65..e3ad7b42a9 100644
--- a/Source/Core/Core/Src/ConfigManager.h
+++ b/Source/Core/Core/Src/ConfigManager.h
@@ -41,8 +41,6 @@ struct SConfig : NonCopyable
// Wii Devices
bool m_WiiSDCard;
bool m_WiiKeyboard;
- bool m_WiiAutoReconnect[4];
- bool m_WiiAutoUnpair;
bool m_WiimoteReconnectOnLoad;
// name of the last used filename
@@ -107,9 +105,6 @@ struct SConfig : NonCopyable
// load settings
void LoadSettings();
- //Special load settings
- void LoadSettingsWii();
-
// Return the permanent and somewhat globally used instance of this struct
static SConfig& GetInstance() {return(*m_Instance);}