* src/frontends/GuiDocument.{cpp,h}:

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 410d4abc5bb25286f84f0ea8abd2da710c096ebe..2f87daf5b59d553417418371384dfc34fcdc7750 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -14,7 +14,7 @@
 
 #include "BufferParams.h"
 #include "Changes.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "InsetList.h"
 #include "Layout.h"
 #include "Paragraph.h"
@@ -24,12 +24,10 @@
 
 #include <boost/next_prior.hpp>
 
+using namespace std;
 
 namespace lyx {
 
-using std::endl;
-
-
 static bool moveItem(Paragraph & fromPar, pos_type fromPos,
        Paragraph & toPar, pos_type toPos, BufferParams const & params)
 {
@@ -196,8 +194,8 @@ void mergeParagraph(BufferParams const & bparams,
        // marked as unmodified. Otherwise, its change is adopted by the first
        // character of the next paragraph.
        if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
-               LYXERR(Debug::CHANGES) <<
-                  "merging par with inserted/deleted end-of-par character" << endl;
+               LYXERR(Debug::CHANGES,
+                  "merging par with inserted/deleted end-of-par character");
                par.setChange(par.size(), Change(Change::UNCHANGED));
        }