diff options
Diffstat (limited to 'src/Core/ConfigManager.cpp')
-rw-r--r-- | src/Core/ConfigManager.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/Core/ConfigManager.cpp b/src/Core/ConfigManager.cpp index 8b1ebd4..9e0dada 100644 --- a/src/Core/ConfigManager.cpp +++ b/src/Core/ConfigManager.cpp @@ -17,11 +17,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "Application.h" #include "ConfigManager.h" #include "ConfigEntry.h" #include "Configurable.h" -#include "Logger.h" -#include "LogManager.h" #include "Tokenizer.h" #include <fstream> @@ -30,9 +29,6 @@ namespace Mad { namespace Core { -ConfigManager ConfigManager::configManager; - - bool ConfigManager::Compare::operator() (const Configurable *c1, const Configurable *c2) { if(c1->getPriority() != c2->getPriority()) return c1->getPriority() > c2->getPriority(); @@ -50,7 +46,7 @@ void ConfigManager::handleConfigEntry(const ConfigEntry &entry) { } if(!handled) - Logger::logf(Logger::WARNING, "Invalid config option '%s'.", entry[entry.getSize()-1].getKey().c_str()); + application->logf(LoggerBase::WARNING, "Invalid config option '%s'.", entry[entry.getSize()-1].getKey().c_str()); } bool ConfigManager::loadFile(const std::string &filename) { @@ -129,13 +125,5 @@ void ConfigManager::finish() { finished = true; } -ConfigManager::ConfigManager() : finished(false) { - registerConfigurable(LogManager::get()); -} - -ConfigManager::~ConfigManager() { - unregisterConfigurable(LogManager::get()); -} - } } |