More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / Variables.C

diff --git a/src/Variables.C b/src/Variables.C
index 9f4a516e3829a372d77bd8fbb833849281c8030c..f2dc8ddc2fd6b9c4ed63fed4e0d6b1beb83fcecc 100644 (file)
--- a/src/Variables.C
+++ b/src/Variables.C
@@ -20,14 +20,15 @@
 
 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()) 
@@ -44,7 +45,7 @@ bool Variables::isset(string const & var) const
 }
 
 
-string Variables::expand(string const & s) const
+string const Variables::expand(string const & s) const
 {
   string str(s);
   LRegex reg("\\$\\{\\(.*\\)\\}");