Dekels tabular/textinset patches

[lyx.git] / src / Variables.C

diff --git a/src/Variables.C b/src/Variables.C
index 128f5538b5c12d0024c50604bbad1600b232ecec..f2dc8ddc2fd6b9c4ed63fed4e0d6b1beb83fcecc 100644 (file)
--- a/src/Variables.C
+++ b/src/Variables.C
@@ -17,16 +17,18 @@
 #include "Variables.h"
 #include "support/LRegex.h"
 
-void Variables::set(string const &var, string const &val)
+
+void Variables::set(string const & var, string const & val)
 {
-  Vars::const_iterator cit = vars_.find(var);
-  if (cit != vars_.end()) 
-    vars_.erase(var);
-  vars_[var] = val;;
+       // We want to use const_iterator (Lgb)
+       Vars::iterator cit = vars_.find(var);
+       if (cit != vars_.end()) 
+               vars_.erase(var);
+       vars_[var] = val;;
 }
 
 
-string Variables::get(string const &var) const
+string const Variables::get(string const & var) const
 {
   Vars::const_iterator cit = vars_.find(var);
   if (cit != vars_.end()) 
@@ -35,14 +37,17 @@ string Variables::get(string const &var) const
     return string();
 }
 
+
 bool Variables::isset(string const & var) const
 {
    Vars::const_iterator cit = vars_.find(var);
    return  (cit != vars_.end()); 
 }
 
-string Variables::expand(string str) const
+
+string const Variables::expand(string const & s) const
 {
+  string str(s);
   LRegex reg("\\$\\{\\(.*\\)\\}");
 
   if (!reg.exact_match(str))