From 3944988f51769b0ffd8e58c05566c82416bf983d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 19 Oct 2008 21:21:57 +0200 Subject: Interface-?nderungen am ConfigManager/Configurable --- src/Common/ConfigManager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Common/ConfigManager.cpp') diff --git a/src/Common/ConfigManager.cpp b/src/Common/ConfigManager.cpp index fbd73ea..20a6110 100644 --- a/src/Common/ConfigManager.cpp +++ b/src/Common/ConfigManager.cpp @@ -31,16 +31,16 @@ namespace Common { ConfigManager ConfigManager::configManager; -void ConfigManager::handleConfigEntry(const std::vector &entry, const std::vector > §ion) { +void ConfigManager::handleConfigEntry(const std::vector > &entry) { bool handled = false; for(std::set::iterator c = configurables.begin(); c != configurables.end(); ++c) { - if((*c)->handleConfigEntry(entry, section)) + if((*c)->handleConfigEntry(entry)) handled = true; } if(!handled) - Logger::logf(Logger::WARNING, "Unknown config option '%s'.", entry.front().c_str()); + Logger::logf(Logger::WARNING, "Invalid config option '%s'.", entry.back().front().c_str()); } bool ConfigManager::loadFile(const std::string &filename, bool finish) { @@ -87,15 +87,15 @@ bool ConfigManager::loadFile(const std::string &filename, bool finish) { if(pos == std::string::npos) { entry.push_back(line); - - handleConfigEntry(entry, section); } else { entry.push_back(line.substr(0, pos)); entry.push_back(Util::trim(line.substr(pos))); - - handleConfigEntry(entry, section); } + + section.push_back(entry); + handleConfigEntry(section); + section.pop_back(); } switch(bracket) { -- cgit v1.2.3