fix reading UTF8 encoded symbol file

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

diff --git a/src/mathed/InsetMathMacro.h b/src/mathed/InsetMathMacro.h
index 3c82d9ac24d907573e39ee921671ba2f8cb09cfb..24cd74586c1ce387aa48cd87252f7f6d7e4a23ac 100644 (file)
--- a/src/mathed/InsetMathMacro.h
+++ b/src/mathed/InsetMathMacro.h
@@ -19,11 +19,14 @@
 #include "MathMacroTable.h"
 
 
+namespace lyx {
+
+
 /// This class contains the data for a macro.
 class MathMacro : public InsetMathNest {
 public:
        /// A macro can be built from an existing template
-       MathMacro(std::string const & name, int numargs);
+       MathMacro(docstring const & name, int numargs);
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -33,11 +36,12 @@ public:
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        /// get cursor position
-       void cursorPos(CursorSlice const & sl, bool boundary, int & x, int & y) const;
+       void cursorPos(BufferView const & bv, CursorSlice const & sl,
+               bool boundary, int & x, int & y) const;
        ///
        InsetBase * editXY(LCursor & cur, int x, int y);
        ///
-       std::string name() const;
+       docstring name() const;
        ///
        void setExpansion(MathArray const & exp, MathArray const & args) const;
 
@@ -47,13 +51,13 @@ public:
        ///
        void maple(MapleStream &) const;
        ///
-       void mathmlize(MathMLStream &) const;
+       void mathmlize(MathStream &) const;
        ///
        void octave(OctaveStream &) const;
        ///
-       void infoize(std::ostream &) const;
+       void infoize(odocstream &) const;
        ///
-       void infoize2(std::ostream &) const;
+       void infoize2(odocstream &) const;
 
 private:
        virtual std::auto_ptr<InsetBase> doClone() const;
@@ -63,7 +67,7 @@ private:
        void expand() const;
 
        /// name of macro
-       std::string name_;
+       docstring name_;
        /// the unexpanded macro defintition
        mutable MathArray tmpl_;
        /// the macro substituted with our args
@@ -71,4 +75,7 @@ private:
 };
 
 
+
+
+} // namespace lyx
 #endif