Remove todo

[lyx.git] / src / CursorSlice.cpp

diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp
index 3d6e8794b42fbf9b30ca2e571234bd6ead42db1f..f4319dcf01532da242081211ae6a7a0ad2187f10 100644 (file)
--- a/src/CursorSlice.cpp
+++ b/src/CursorSlice.cpp
@@ -15,10 +15,11 @@
 
 #include "CursorSlice.h"
 
-#include "debug.h"
 #include "Text.h"
 #include "Paragraph.h"
 
+#include "support/debug.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/InsetMath.h"
@@ -26,8 +27,9 @@
 
 #include <boost/assert.hpp>
 
-using std::endl;
+#include <ostream>
 
+using namespace std;
 
 namespace lyx {
 
@@ -180,8 +182,8 @@ bool operator!=(CursorSlice const & p, CursorSlice const & q)
 bool operator<(CursorSlice const & p, CursorSlice const & q)
 {
        if (&p.inset() != &q.inset()) {
-               lyxerr << "can't compare cursor and anchor in different insets\n"
-                      << "p: " << p << '\n' << "q: " << q << endl;
+               LYXERR0("can't compare cursor and anchor in different insets\n"
+                      << "p: " << p << '\n' << "q: " << q);
                BOOST_ASSERT(false);
        }
        if (p.idx() != q.idx())
@@ -204,10 +206,10 @@ bool operator<=(CursorSlice const & p, CursorSlice const & q)
 }
 
 
-std::ostream & operator<<(std::ostream & os, CursorSlice const & item)
+ostream & operator<<(ostream & os, CursorSlice const & item)
 {
        return os
-          << "inset: " << &item.inset()
+          << "inset: " << (void *)&item.inset()
 //        << " text: " << item.text()
           << " idx: " << item.idx()
           << " par: " << item.pit()