X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_autocorrect.C;h=4d06c78259210d21900e5463474ca64c083cfc00;hb=1ecc7b79cdf95de50f2683fb7a8f983b5dcdf0d2;hp=27fbf604ea8bb02cca07113188271e6bc1aa1090;hpb=1f9e9cf5173fa1fbafdff5f21080e5194b05818b;p=lyx.git

diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C
index 27fbf604ea..4d06c78259 100644
--- a/src/mathed/math_autocorrect.C
+++ b/src/mathed/math_autocorrect.C
@@ -10,22 +10,24 @@
 
 #include <config.h>
 
-#include "LString.h"
-#include "Lsstream.h"
-#include "debug.h"
-#include "support/filetools.h" //  LibFileSearch
+#include "math_autocorrect.h"
 #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 <iostream>
 #include <fstream>
-#include <vector>
+#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;
@@ -85,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
@@ -154,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;