bug + spped fixes + small stuff

[lyx.git] / src / mathed / math_macro.h

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 1ec617c35f2e253f665abc08796a5d7bcd1155eb..9351d8ea51f367552bd97932f22fd6f908ce6a6c 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -16,7 +16,7 @@
 #include "math_data.h"
 #include "math_nestinset.h"
 #include "metricsinfo.h"
-#include "support/std_string.h"
+
 
 class MathMacroTemplate;
 
@@ -25,7 +25,7 @@ class MathMacroTemplate;
 class MathMacro : public MathNestInset {
 public:
        /// A macro can be built from an existing template
-       explicit MathMacro(string const &);
+       explicit MathMacro(std::string const &);
        ///
        MathMacro(MathMacro const &);
        ///
@@ -38,18 +38,16 @@ public:
        void dump() const;
 
        ///
-       bool idxUpDown(idx_type & idx, pos_type & pos, bool up, int targetx) const;
+       bool idxUpDown(LCursor & cur, bool up) const;
        ///
-       bool idxLeft(idx_type & idx, pos_type & pos) const;
+       bool idxLeft(LCursor & cur) const;
        ///
-       bool idxRight(idx_type & idx, pos_type & pos) const;
+       bool idxRight(LCursor & cur) const;
 
        ///
        void validate(LaTeXFeatures &) const;
        ///
        bool isMacro() const { return true; }
-       ///
-       bool match(MathAtom const &) const { return false; }
 
        ///
        void maple(MapleStream &) const;
@@ -66,7 +64,7 @@ private:
        ///
        void operator=(MathMacro const &);
        ///
-       string name() const;
+       std::string name() const;
        ///
        bool defining() const;
        ///