revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index d3c4183ce654e471f828fbf0f27e224a77d9a182..c89dd4e7302760578409f1ccaee58af92bbac06d 100644 (file)
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -17,8 +17,8 @@
 
 #include "BufferView.h"
 #include "Cursor.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Lexer.h"
 #include "OutputParams.h"
 
@@ -29,14 +29,11 @@
 
 #include <sstream>
 
-using std::string;
-using std::ostream;
-using std::endl;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-
 
 InsetFormulaMacro::InsetFormulaMacro()
        : InsetMathNest(2), name_("unknownA")
@@ -54,7 +51,7 @@ InsetFormulaMacro::InsetFormulaMacro
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
        : InsetMathNest(2), name_("unknownB")
 {
-       std::istringstream is(s);
+       istringstream is(s);
        read(is);
 }
 
@@ -65,7 +62,7 @@ Inset * InsetFormulaMacro::clone() const
 }
 
 
-void InsetFormulaMacro::write(Buffer const &, ostream & os) const
+void InsetFormulaMacro::write(ostream & os) const
 {
        os << "FormulaMacro\n";
        WriteStream wi(os, false, false);
@@ -73,7 +70,7 @@ void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 }
 
 
-int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
+int InsetFormulaMacro::latex(odocstream & os,
                             OutputParams const & runparams) const
 {
        //lyxerr << "InsetFormulaMacro::latex" << endl;
@@ -83,8 +80,7 @@ int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
 }
 
 
-int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
-                                OutputParams const &) const
+int InsetFormulaMacro::plaintext(odocstream & os, OutputParams const &) const
 {
        odocstringstream oss;
        WriteStream wi(oss, false, true);
@@ -96,20 +92,20 @@ int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os,
+int InsetFormulaMacro::docbook(ostream & os,
                               OutputParams const & runparams) const
 {
-       return plaintext(buf, os, runparams);
+       return plaintext(os, runparams);
 }
 
 
-void InsetFormulaMacro::read(Buffer const &, Lexer & lex)
+void InsetFormulaMacro::read(Lexer & lex)
 {
        read(lex.getStream());
 }
 
 
-void InsetFormulaMacro::read(std::istream & is)
+void InsetFormulaMacro::read(istream & is)
 {
        auto_ptr<MathMacroTemplate> p(new MathMacroTemplate(is));
        name_ = p->name();