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 c8ba7ca628199185ca5d24fd21231d55e9584c42..4d06c78259210d21900e5463474ca64c083cfc00 100644 (file)
--- a/src/mathed/math_autocorrect.C
+++ b/src/mathed/math_autocorrect.C
@@ -1,23 +1,33 @@
-#ifdef __GNUG__
-#pragma implementation 
-#endif
+/**
+ * \file math_autocorrect.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #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 lyx::support::LibFileSearch;
 
+using std::string;
 using std::ifstream;
 using std::istream;
+using std::istringstream;
 using std::ostream;
 using std::endl;
 using std::vector;
@@ -67,21 +77,21 @@ bool Correction::read(istream & is)
 void Correction::write(ostream & os) const
 {
        os << "from: '" << from1_ << "' and '" << from2_
-          << "' to '" << to_ << "'" << endl;
+          << "' to '" << to_ << '\'' << endl;
 }
 
 
 bool Correction::correct(MathAtom & at, char c) const
 {
        //lyxerr[Debug::MATHED]
-       //      << "trying to correct ar: " << at << " from: '" << from1_ << "'" << endl;
+       //      << "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
-               << " from: '" << from1_ << "' to '" << to_ << "'" << endl;
+               << " from: '" << from1_ << "' to '" << to_ << '\'' << endl;
        at = to_;
        return true;
 }
@@ -143,14 +153,15 @@ void initAutoCorrect()
        ifstream is(file.c_str());
        while (getline(is, line)) {
                if (line.size() == 0 || line[0] == '#') {
-                       //lyxerr[Debug::MATHED] << "ignoring line '" << line << "'" << endl;
+                       //lyxerr[Debug::MATHED] << "ignoring line '" << line << '\'' << endl;
                        continue;
                }
                istringstream il(line);
-               //lyxerr[Debug::MATHED] << "line '" << line << "'" << endl;
+
+               //lyxerr[Debug::MATHED] << "line '" << line << '\'' << endl;
                Correction corr;
                if (corr.read(il)) {
-                       //lyxerr[Debug::MATHED] << "parsed: '" << corr << "'" << endl;
+                       //lyxerr[Debug::MATHED] << "parsed: '" << corr << '\'' << endl;
                        theCorrections.insert(corr);
                }
        }