From f05d3f6e5d6da8be530c0cd4ffaaec0382240ec5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Jun 2014 01:12:43 -0400 Subject: Use only section-based ini reading. --- Source/Core/DolphinWX/LogConfigWindow.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Source/Core/DolphinWX/LogConfigWindow.cpp') diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp index 6498668869..624aad92ae 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/LogConfigWindow.cpp @@ -117,9 +117,11 @@ void LogConfigWindow::LoadSettings() IniFile ini; ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX)); + IniFile::Section* options = ini.GetOrCreateSection("Options"); + // Retrieve the verbosity value from the config ini file. int verbosity; - ini.Get("Options", "Verbosity", &verbosity, 0); + options->Get("Verbosity", &verbosity, 0); // Ensure the verbosity level is valid. if (verbosity < 1) @@ -131,16 +133,16 @@ void LogConfigWindow::LoadSettings() m_verbosity->SetSelection(verbosity - 1); // Get the logger output settings from the config ini file. - ini.Get("Options", "WriteToFile", &m_writeFile, false); + options->Get("WriteToFile", &m_writeFile, false); m_writeFileCB->SetValue(m_writeFile); - ini.Get("Options", "WriteToConsole", &m_writeConsole, true); + options->Get("WriteToConsole", &m_writeConsole, true); m_writeConsoleCB->SetValue(m_writeConsole); - ini.Get("Options", "WriteToWindow", &m_writeWindow, true); + options->Get("WriteToWindow", &m_writeWindow, true); m_writeWindowCB->SetValue(m_writeWindow); #ifdef _MSC_VER if (IsDebuggerPresent()) { - ini.Get("Options", "WriteToDebugger", &m_writeDebugger, true); + options->Get("WriteToDebugger", &m_writeDebugger, true); m_writeDebuggerCB->SetValue(m_writeDebugger); } else @@ -154,7 +156,7 @@ void LogConfigWindow::LoadSettings() for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) { bool log_enabled; - ini.Get("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &log_enabled, true); + ini.GetOrCreateSection("Logs")->Get(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), &log_enabled, true); if (log_enabled) enableAll = false; @@ -168,22 +170,20 @@ void LogConfigWindow::SaveSettings() IniFile ini; ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX)); - // Save the verbosity level. - ini.Set("Options", "Verbosity", m_verbosity->GetSelection() + 1); - - // Save the enabled/disabled states of the logger outputs to the config ini. - ini.Set("Options", "WriteToFile", m_writeFile); - ini.Set("Options", "WriteToConsole", m_writeConsole); - ini.Set("Options", "WriteToWindow", m_writeWindow); + IniFile::Section* options = ini.GetOrCreateSection("Options"); + options->Set("Verbosity", m_verbosity->GetSelection() + 1); + options->Set("WriteToFile", m_writeFile); + options->Set("WriteToConsole", m_writeConsole); + options->Set("WriteToWindow", m_writeWindow); #ifdef _MSC_VER if (IsDebuggerPresent()) - ini.Set("Options", "WriteToDebugger", m_writeDebugger); + options->Set("WriteToDebugger", m_writeDebugger); #endif // Save all enabled/disabled states of the log types to the config ini. for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i) { - ini.Set("Logs", m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i)); + ini.GetOrCreateSection("Logs")->Set(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i), m_checks->IsChecked(i)); } ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX)); -- cgit v1.2.3