From: Martin Read <mpread@chiark.greenend.org.uk>
Date: Wed, 6 Apr 2011 18:20:38 +0000 (+0100)
Subject: Appcfg.cc actually compiles now :-)
X-Git-Tag: v1.0.0~4
X-Git-Url: http://git.blackswordsonics.com/?a=commitdiff_plain;h=dc2325f19ff8b6904a3e654e0cf65abf22fe6e7d;p=libmormegil

Appcfg.cc actually compiles now :-)
---

diff --git a/include/libmormegil/Appcfg.hh b/include/libmormegil/Appcfg.hh
index 784d999..d1bc7ad 100644
--- a/include/libmormegil/Appcfg.hh
+++ b/include/libmormegil/Appcfg.hh
@@ -34,6 +34,7 @@ namespace libmormegil
     private:
         std::map<std::string, Entry> data;
         typedef std::map<std::string, Entry>::iterator data_iterator;
+        typedef std::map<std::string, Entry>::const_iterator data_const_iterator;
     public:
         // registration functions
         bool register_bool(const std::string& name, bool defval = false);
@@ -48,10 +49,10 @@ namespace libmormegil
         bool set(const std::string& name, const std::string& val);
 
         // get functions
-        bool get(const std::string& name, bool& dest);
-        bool get(const std::string& name, int64_t& dest);
+        bool get(const std::string& name, bool& dest) const;
+        bool get(const std::string& name, int64_t& dest) const;
         // for code hygeine reasons, we don't support
-        bool get(const std::string& name, std::string& dest);
+        bool get(const std::string& name, std::string& dest) const;
 
         // dumper function
         int dump(std::list<Entry>& dest);
diff --git a/src/Appcfg.cc b/src/Appcfg.cc
index b74f0fb..a925bf6 100644
--- a/src/Appcfg.cc
+++ b/src/Appcfg.cc
@@ -67,9 +67,9 @@ bool libmormegil::Appcfg::register_string(const std::string& name, const std::st
     data[name] = e;
 }
 
-bool libmormegil::Appcfg::get(const std::string& name, int64_t& val)
+bool libmormegil::Appcfg::get(const std::string& name, int64_t& val) const
 {
-    data_iterator iter = data.find(name);
+    data_const_iterator iter = data.find(name);
     if ((iter != data.end()) && (iter->second.t == Appcfg_integer))
     {
         val = iter->second.ival;
@@ -78,9 +78,9 @@ bool libmormegil::Appcfg::get(const std::string& name, int64_t& val)
     return false;
 }
 
-bool libmormegil::Appcfg::get(const std::string& name, std::string& val)
+bool libmormegil::Appcfg::get(const std::string& name, std::string& val) const
 {
-    data_iterator iter = data.find(name);
+    data_const_iterator iter = data.find(name);
     if ((iter != data.end()) && (iter->second.t == Appcfg_string))
     {
         val = iter->second.sval;
@@ -91,7 +91,7 @@ bool libmormegil::Appcfg::get(const std::string& name, std::string& val)
 
 bool libmormegil::Appcfg::get(const std::string& name, bool& val) const
 {
-    data_iterator iter = data.find(name);
+    data_const_iterator iter = data.find(name);
     if ((iter != data.end()) && (iter->second.t == Appcfg_boolean))
     {
         val = iter->second.bval;