fix typo that put too many include paths for most people

[lyx.git] / src / Variables.C

diff --git a/src/Variables.C b/src/Variables.C
index 698647a1e69db5051f0dbfd191991417c5a900c1..3edcdfb193c5e9b0e1734b0b5b32316dbbe4c672 100644 (file)
--- a/src/Variables.C
+++ b/src/Variables.C
@@ -1,10 +1,10 @@
 /* This file is part of
-* ====================================================== 
-* 
+* ======================================================
+*
 *           LyX, The Document Processor
-*        
+*
 *           Copyright 1995 Matthias Ettrich
-*           Copyright 1995-2000 the LyX Team.
+*           Copyright 1995-2001 the LyX Team.
 *
 * ====================================================== */
 
@@ -22,7 +22,7 @@ void Variables::set(string const & var, string const & val)
 {
        // We want to use const_iterator (Lgb)
        Vars::iterator cit = vars_.find(var);
-       if (cit != vars_.end()) 
+       if (cit != vars_.end())
                vars_.erase(var);
        vars_[var] = val;;
 }
@@ -30,40 +30,40 @@ void Variables::set(string const & var, string const & val)
 
 string const Variables::get(string const & var) const
 {
-  Vars::const_iterator cit = vars_.find(var);
-  if (cit != vars_.end()) 
-    return (*cit).second;
-  else 
-    return string();
+       Vars::const_iterator cit = vars_.find(var);
+       if (cit != vars_.end())
+               return cit->second;
+       else
+               return string();
 }
 
 
-bool Variables::set(string const & var) const
+bool Variables::isSet(string const & var) const
 {
-   Vars::const_iterator cit = vars_.find(var);
-   return  (cit != vars_.end()); 
+       Vars::const_iterator cit = vars_.find(var);
+       return (cit != vars_.end());
 }
 
 
 string const Variables::expand(string const & s) const
 {
-  string str(s);
-  LRegex reg("\\$\\{\\(.*\\)\\}");
-
-  if (!reg.exact_match(str))
-    return str;
-
-  LRegex::MatchPair match;
-  string var;
-  
-  do {
-    match = reg.first_match(str);
-    var = str.substr(match.first,match.second);
-    // we correct the match to take ${} in account.
-    str.replace(match.first - 2, match.second + 3, get(var));
-  } while (reg.exact_match(str));
-
-  return str;
+       string str(s);
+       LRegex reg("\\$\\{\\(.*\\)\\}");
+
+       if (!reg.exact_match(str))
+               return str;
+
+       LRegex::MatchPair match;
+       string var;
+
+       do {
+               match = reg.first_match(str);
+               var = str.substr(match.first,match.second);
+               // we correct the match to take ${} in account.
+               str.replace(match.first - 2, match.second + 3, get(var));
+       } while (reg.exact_match(str));
+
+       return str;
 }
 
 #ifdef TEST
@@ -73,11 +73,10 @@ using std::endl;
 using std::cout;
 
 int main() {
-  Variables vars;
-  vars.set("x", "hello");
-  vars.set("y", "world");
-  cout << vars.expand("${x}") << endl;
+       Variables vars;
+       vars.set("x", "hello");
+       vars.set("y", "world");
+       cout << vars.expand("${x}") << endl;
 }
 
 #endif
-