simplify GuiToc / TocWidget interaction. Much can still be simplified...

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

diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index d3c4183ce654e471f828fbf0f27e224a77d9a182..7676aa982349fc69a9baa21c9343be3dac866d56 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);
 }
 
@@ -109,7 +106,7 @@ void InsetFormulaMacro::read(Buffer const &, Lexer & lex)
 }
 
 
-void InsetFormulaMacro::read(std::istream & is)
+void InsetFormulaMacro::read(istream & is)
 {
        auto_ptr<MathMacroTemplate> p(new MathMacroTemplate(is));
        name_ = p->name();