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

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

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index fe22ce78254906992edc1c334eb9981a92e58467..a056f27bfee3f02072751a6c83d0cb5a54105f6d 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -14,24 +14,23 @@
 #include "InsetMath.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "gettext.h"
-#include "debug.h"
+#include "support/gettext.h"
+#include "support/debug.h"
 
+#include "support/docstream.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <boost/current_function.hpp>
+#include <boost/assert.hpp>
 
-using std::endl;
+using namespace std;
 
 namespace lyx {
 
-
-
 MathData & InsetMath::cell(idx_type)
 {
        static MathData dummyCell;
-       lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
+       LYXERR0("I don't have any cell");
        return dummyCell;
 }
 
@@ -39,7 +38,7 @@ MathData & InsetMath::cell(idx_type)
 MathData const & InsetMath::cell(idx_type) const
 {
        static MathData dummyCell;
-       lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
+       LYXERR0("I don't have any cell");
        return dummyCell;
 }
 
@@ -57,21 +56,16 @@ void InsetMath::dump() const
 
 void InsetMath::metricsT(TextMetricsInfo const &, Dimension &) const
 {
-#ifdef WITH_WARNINGS
-       lyxerr << "InsetMath::metricsT(Text) called directly!" << endl;
-#endif
+       LYXERR0("InsetMath::metricsT(Text) called directly!");
 }
 
 
 void InsetMath::drawT(TextPainter &, int, int) const
 {
-#ifdef WITH_WARNINGS
-       lyxerr << "InsetMath::drawT(Text) called directly!" << endl;
-#endif
+       LYXERR0("InsetMath::drawT(Text) called directly!");
 }
 
 
-
 void InsetMath::write(WriteStream & os) const
 {
        docstring const s = name();
@@ -139,7 +133,7 @@ HullType InsetMath::getType() const
 }
 
 
-std::ostream & operator<<(std::ostream & os, MathAtom const & at)
+ostream & operator<<(ostream & os, MathAtom const & at)
 {
        odocstringstream oss;
        WriteStream wi(oss, false, false);