Remove mixed_content from output parameters.

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

diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C
index 06464b38a7d9dc6dbe70458c9a6ef2029615fed2..4d06c78259210d21900e5463474ca64c083cfc00 100644 (file)
--- a/src/mathed/math_autocorrect.C
+++ b/src/mathed/math_autocorrect.C
@@ -11,19 +11,23 @@
 #include <config.h>
 
 #include "math_autocorrect.h"
-#include "Lsstream.h"
-#include "debug.h"
-#include "support/filetools.h" //  LibFileSearch
 #include "math_data.h"
 #include "math_inset.h"
+#include "math_support.h"
 #include "math_parser.h"
+#include "debug.h"
+
+#include "support/filetools.h" //  LibFileSearch
 
 #include <fstream>
+#include <sstream>
 
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
 
+using std::string;
 using std::ifstream;
 using std::istream;
+using std::istringstream;
 using std::ostream;
 using std::endl;
 using std::vector;
@@ -83,7 +87,7 @@ bool Correction::correct(MathAtom & at, char c) const
        //      << "trying to correct ar: " << at << " from: '" << from1_ << '\'' << endl;
        if (from2_ != c)
                return false;
-       if (!at->match(from1_))
+       if (asString(at) != asString(from1_))
                return false;
        lyxerr[Debug::MATHED]
                << "match found! subst in " << at
@@ -152,7 +156,7 @@ void initAutoCorrect()
                        //lyxerr[Debug::MATHED] << "ignoring line '" << line << '\'' << endl;
                        continue;
                }
-               istringstream il(STRCONV(line));
+               istringstream il(line);
 
                //lyxerr[Debug::MATHED] << "line '" << line << '\'' << endl;
                Correction corr;