summaryrefslogtreecommitdiff
path: root/Source/Core/Common
diff options
context:
space:
mode:
authorGlenn Rice <glennricster@gmail.com>2010-03-18 14:34:37 +0000
committerGlenn Rice <glennricster@gmail.com>2010-03-18 14:34:37 +0000
commitf885eb2de0103699347da903c63acece4db0cb7f (patch)
tree2bf7183bfc7d34ee7d8dff865cdaec81b1cfaffb /Source/Core/Common
parent14bb53dcc693135ea44672b9683e0e6cbf1c9e88 (diff)
Did some clean up of the GUI main. Also, parse command line options first, then set up directories (linux and apple), then load the log manager, sconfig, etc. Removes the need for my silly log manager and sysconf reload.
Changed the default font for the log window to the local font (why was a Japanese font the default?). Also fixed an issue that prevented the log windows settings from being saved properly. Lots more needs to be done with the AUI manager. That stuff doesn't work. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5213 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
-rw-r--r--Source/Core/Common/Src/LogManager.cpp4
-rw-r--r--Source/Core/Common/Src/LogManager.h2
-rw-r--r--Source/Core/Common/Src/SysConf.cpp8
-rw-r--r--Source/Core/Common/Src/SysConf.h2
4 files changed, 0 insertions, 16 deletions
diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp
index e613f2763d..2abf20b2f3 100644
--- a/Source/Core/Common/Src/LogManager.cpp
+++ b/Source/Core/Common/Src/LogManager.cpp
@@ -192,10 +192,6 @@ FileLogListener::FileLogListener(const char *filename) {
setEnable(true);
}
-void FileLogListener::Reload() {
- m_logfile = fopen(m_filename, "a+");
-}
-
FileLogListener::~FileLogListener() {
free(m_filename);
if (m_logfile)
diff --git a/Source/Core/Common/Src/LogManager.h b/Source/Core/Common/Src/LogManager.h
index eb5b7edff1..9b91e189de 100644
--- a/Source/Core/Common/Src/LogManager.h
+++ b/Source/Core/Common/Src/LogManager.h
@@ -42,8 +42,6 @@ public:
FileLogListener(const char *filename);
~FileLogListener();
- void Reload();
-
void Log(LogTypes::LOG_LEVELS, const char *msg);
bool isValid() {
diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp
index 18a3669210..dbac407dc7 100644
--- a/Source/Core/Common/Src/SysConf.cpp
+++ b/Source/Core/Common/Src/SysConf.cpp
@@ -25,14 +25,6 @@ SysConf::SysConf()
m_IsValid = true;
}
-void SysConf::Reload()
-{
- if (m_IsValid)
- return;
- if (LoadFromFile(File::GetUserPath(F_WIISYSCONF_IDX)))
- m_IsValid = true;
-}
-
SysConf::~SysConf()
{
if (!m_IsValid)
diff --git a/Source/Core/Common/Src/SysConf.h b/Source/Core/Common/Src/SysConf.h
index 5d7c50007e..c2db94fa3b 100644
--- a/Source/Core/Common/Src/SysConf.h
+++ b/Source/Core/Common/Src/SysConf.h
@@ -71,8 +71,6 @@ public:
bool IsValid() { return m_IsValid; }
- void Reload();
-
template<class T>
T GetData(const char* sectionName)
{