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 93f7e94bad907ae5884fbdbb9fcbed17431b786b..c89dd4e7302760578409f1ccaee58af92bbac06d 100644 (file)
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -17,9 +17,8 @@
 
 #include "BufferView.h"
 #include "Cursor.h"
-#include "debug.h"
-#include "gettext.h"
-#include "Color.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Lexer.h"
 #include "OutputParams.h"
 
@@ -30,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")
@@ -55,7 +51,7 @@ InsetFormulaMacro::InsetFormulaMacro
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
        : InsetMathNest(2), name_("unknownB")
 {
-       std::istringstream is(s);
+       istringstream is(s);
        read(is);
 }
 
@@ -66,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);
@@ -74,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;
@@ -84,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);
@@ -97,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();
@@ -139,7 +134,7 @@ void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
 {
        // label
        Font font = p.base.font;
-       font.setColor(Color::math);
+       font.setColor(Color_math);
 
        PainterInfo pi(p.base.bv, p.pain);
        pi.base.style = LM_ST_TEXT;
@@ -149,9 +144,9 @@ void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
        int const w = dim_.wid - 2;
        int const h = dim_.height() - 2;
 
-       // Color::mathbg used to be "AntiqueWhite" but is "linen" now, too
-       pi.pain.fillRectangle(x, a, w, h, Color::mathmacrobg);
-       pi.pain.rectangle(x, a, w, h, Color::mathframe);
+       // Color_mathbg used to be "AntiqueWhite" but is "linen" now, too
+       pi.pain.fillRectangle(x, a, w, h, Color_mathmacrobg);
+       pi.pain.rectangle(x, a, w, h, Color_mathframe);
 
        // FIXME
 #if 0