Replace LString.h with support/std_string.h,

[features.git] / src / mathed / formulamacro.C

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 39ab9325401bde56f23a94e7d151e9f8f2577d76..f15942bc7762c3ade5fc535a5849810ca027fc1d 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -12,27 +12,17 @@
 #include <config.h>
 
 #include "formulamacro.h"
-#include "lfuns.h"
 #include "math_cursor.h"
-#include "math_parser.h"
-#include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
-#include "metricsinfo.h"
-#include "math_support.h"
 #include "math_mathmlstream.h"
-#include "BufferView.h"
 #include "gettext.h"
 #include "latexrunparams.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
-#include "support/lyxlib.h"
 #include "support/lstrings.h"
-#include "support/LOstream.h"
-#include "debug.h"
 #include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 
@@ -70,7 +60,7 @@ auto_ptr<InsetBase> InsetFormulaMacro::clone() const
 }
 
 
-void InsetFormulaMacro::write(Buffer const *, ostream & os) const
+void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 {
        os << "FormulaMacro ";
        WriteStream wi(os, false, false);
@@ -78,7 +68,7 @@ void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 }
 
 
-int InsetFormulaMacro::latex(Buffer const *, ostream & os,
+int InsetFormulaMacro::latex(Buffer const &, ostream & os,
                             LatexRunParams const & runparams) const
 {
        WriteStream wi(os, runparams.moving_arg, true);
@@ -87,7 +77,7 @@ int InsetFormulaMacro::latex(Buffer const *, ostream & os,
 }
 
 
-int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
+int InsetFormulaMacro::ascii(Buffer const &, ostream & os, int) const
 {
        WriteStream wi(os, false, true);
        par()->write(wi);
@@ -95,19 +85,19 @@ int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
 }
 
 
-int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::linuxdoc(Buffer const & buf, ostream & os) const
 {
        return ascii(buf, os, 0);
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const
+int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os, bool) const
 {
        return ascii(buf, os, 0);
 }
 
 
-void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
+void InsetFormulaMacro::read(Buffer const &, LyXLex & lex)
 {
        read(lex.getStream());
 }
@@ -124,7 +114,7 @@ void InsetFormulaMacro::read(std::istream & is)
 
 string InsetFormulaMacro::prefix() const
 {
-       return bformat(_(" Macro: %s: "), getInsetName());
+       return bformat(_(" Macro: %1$s: "), getInsetName());
 }