'using namespace std' instead of 'using std::xxx'

[lyx.git] / src / paragraph_funcs.cpp

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 367f214a1c59f0c5f23e2fa6cd8ce995acc94673..2f87daf5b59d553417418371384dfc34fcdc7750 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -14,21 +14,20 @@
 
 #include "BufferParams.h"
 #include "Changes.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "InsetList.h"
 #include "Layout.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "Text.h"
+#include "TextClass.h"
 
 #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)
 {
@@ -195,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));
        }
 
@@ -291,7 +290,7 @@ int getEndLabel(pit_type p, ParagraphList const & pars)
 Font const outerFont(pit_type par_offset, ParagraphList const & pars)
 {
        depth_type par_depth = pars[par_offset].getDepth();
-       Font tmpfont(Font::ALL_INHERIT);
+       FontInfo tmpfont = inherit_font;
 
        // Resolve against environment font information
        while (par_offset != pit_type(pars.size())
@@ -304,7 +303,7 @@ Font const outerFont(pit_type par_offset, ParagraphList const & pars)
                }
        }
 
-       return tmpfont;
+       return Font(tmpfont);
 }