Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 855b4902e97d02f69b1faeb828beec585f245da0..25c4b3fdc826d6d5315233a3f99abac82df2242f 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/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.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,13 +56,13 @@ void InsetMath::dump() const
 
 void InsetMath::metricsT(TextMetricsInfo const &, Dimension &) const
 {
-       lyxerr << "InsetMath::metricsT(Text) called directly!" << endl;
+       LYXERR0("InsetMath::metricsT(Text) called directly!");
 }
 
 
 void InsetMath::drawT(TextPainter &, int, int) const
 {
-       lyxerr << "InsetMath::drawT(Text) called directly!" << endl;
+       LYXERR0("InsetMath::drawT(Text) called directly!");
 }
 
 
@@ -78,8 +77,7 @@ void InsetMath::write(WriteStream & os) const
 }
 
 
-int InsetMath::plaintext(Buffer const &, odocstream &,
-                        OutputParams const &) const
+int InsetMath::plaintext(odocstream &, OutputParams const &) const
 {
        // all math plain text output shall take place in InsetMathHull
        BOOST_ASSERT(false);
@@ -134,7 +132,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);