From 3944988f51769b0ffd8e58c05566c82416bf983d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Sun, 19 Oct 2008 21:21:57 +0200
Subject: Interface-?nderungen am ConfigManager/Configurable

---
 src/Common/ConfigManager.cpp | 14 +++++++-------
 src/Common/ConfigManager.h   |  2 +-
 src/Common/Configurable.h    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/Common')

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<std::string> &entry, const std::vector<std::vector<std::string> > &section) {
+void ConfigManager::handleConfigEntry(const std::vector<std::vector<std::string> > &entry) {
   bool handled = false;
 
   for(std::set<Configurable*>::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) {
diff --git a/src/Common/ConfigManager.h b/src/Common/ConfigManager.h
index 7fa781e..ccf5d13 100644
--- a/src/Common/ConfigManager.h
+++ b/src/Common/ConfigManager.h
@@ -38,7 +38,7 @@ class ConfigManager {
 
     ConfigManager() : finished(false) {}
 
-    void handleConfigEntry(const std::vector<std::string>&, const std::vector<std::vector<std::string> >&);
+    void handleConfigEntry(const std::vector<std::vector<std::string> > &entry);
 
   public:
     bool loadFile(const std::string &filename, bool finish = true);
diff --git a/src/Common/Configurable.h b/src/Common/Configurable.h
index 350b444..0c471c7 100644
--- a/src/Common/Configurable.h
+++ b/src/Common/Configurable.h
@@ -32,7 +32,7 @@ class Configurable {
   protected:
     friend class ConfigManager;
 
-    virtual bool handleConfigEntry(const std::vector<std::string>&, const std::vector<std::vector<std::string> >&) {return false;}
+    virtual bool handleConfigEntry(const std::vector<std::vector<std::string> >&) {return false;}
     virtual void configFinished() {}
 };
 
-- 
cgit v1.2.3