Fixed some lines that were too long. It compiled afterwards.

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

diff --git a/src/mathed/InsetFormulaMacro.h b/src/mathed/InsetFormulaMacro.h
index 8f9f46a6eb6085db5dd0a396dcff278677584081..db33b839dc81d959ae27eb06b02abc5ea814c31f 100644 (file)
--- a/src/mathed/InsetFormulaMacro.h
+++ b/src/mathed/InsetFormulaMacro.h
@@ -15,8 +15,11 @@
 
 #include "InsetMathNest.h"
 
+
+namespace lyx {
+
 class MathMacroTemplate;
-class LyXLex;
+class Lexer;
 
 
 // An InsetFormulaMacro only knows its name and asks the global
@@ -28,34 +31,34 @@ public:
        ///
        InsetFormulaMacro();
        /// construct a macro hull from its name and the number of arguments
-       InsetFormulaMacro(std::string const & name, int nargs, std::string const & t);
+       InsetFormulaMacro(docstring const & name, int nargs, docstring const & t);
        /// constructs a mocro from its LaTeX definition
-       explicit InsetFormulaMacro(std::string const & s);
+       explicit InsetFormulaMacro(docstring const & s);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
 
        ///
-       void read(Buffer const &, LyXLex & lex);
+       void read(Buffer const &, Lexer & lex);
        ///
        void write(Buffer const &, std::ostream & os) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
+       int latex(Buffer const &, odocstream & os,
                  OutputParams const &) const;
        ///
-       int latex(Buffer const &, std::ostream & os,
-                 OutputParams const &) const;
+       int plaintext(Buffer const &, odocstream &,
+                     OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
 
        ///
-       std::auto_ptr<InsetBase> clone() const;
+       std::auto_ptr<Inset> clone() const;
        ///
-       InsetBase::Code lyxCode() const { return MATHMACRO_CODE; }
+       Inset::Code lyxCode() const { return MATHMACRO_CODE; }
        ///
-       std::string const & getInsetName() const { return name_; }
+       docstring const & getInsetName() const { return name_; }
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
 private:
@@ -64,9 +67,12 @@ private:
        ///
        void read(std::istream & is);
        /// prefix in inset
-       std::string prefix() const;
+       docstring prefix() const;
        ///
-       std::string name_;
+       docstring name_;
 };
 
+
+} // namespace lyx
+
 #endif