we rely on Windows and maybe Linux on a Qt bug

[lyx.git] / src / mathed / MathMacroTable.C

diff --git a/src/mathed/MathMacroTable.C b/src/mathed/MathMacroTable.C
index 88e794d1d2f10696f85ad717d2297df841906565..961235c2f28a426ebf37353679c170cac43a1f99 100644 (file)
--- a/src/mathed/MathMacroTable.C
+++ b/src/mathed/MathMacroTable.C
@@ -40,8 +40,8 @@ MacroData::MacroData()
 {}
 
 
-MacroData::MacroData(docstring const & def, int numargs, docstring const & disp)
-       : def_(def), numargs_(numargs), disp_(disp)
+MacroData::MacroData(docstring const & def, int numargs, docstring const & disp, string const & requires)
+       : def_(def), numargs_(numargs), disp_(disp), requires_(requires)
 {}
 
 
@@ -99,12 +99,13 @@ void MacroTable::insert(docstring const & name, MacroData const & data)
 }
 
 
-void MacroTable::insert(docstring const & def)
+void MacroTable::insert(docstring const & def, string const & requires)
 {
        //lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl;
-       std::istringstream is(to_utf8(def));
-       MathMacroTemplate mac(is);
-       insert(mac.name(), mac.asMacroData());
+       MathMacroTemplate mac(def);
+       MacroData data = mac.asMacroData();
+       data.requires() = requires;
+       insert(mac.name(), data);
 }