Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

[lyx.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 1dc5b5b2ad135c9970e61e3846972239ed53b03a..9369555c58ea3769342aeb09f148f5999eebffc1 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -20,11 +20,11 @@
 #include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "InsetList.h"
 #include "Intl.h"
 #include "lyxfind.h"
@@ -54,22 +54,15 @@
 #include <boost/bind.hpp>
 #include <boost/assert.hpp>
 
-
-namespace lyx {
-
-using graphics::PreviewLoader;
-
-using support::isStrUnsignedInt;
+using namespace std;
+using namespace lyx::support;
 
 using boost::bind;
 using boost::ref;
 
-using std::endl;
-using std::for_each;
-using std::max;
-using std::string;
-using std::ostream;
-using std::vector;
+namespace lyx {
+
+using graphics::PreviewLoader;
 
 
 InsetText::InsetText(BufferParams const & bp)
@@ -226,9 +219,8 @@ Inset * InsetText::editXY(Cursor & cur, int x, int y)
 
 void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       LYXERR(Debug::ACTION) << "InsetText::doDispatch()"
-                            << " [ cmd.action = "
-                            << cmd.action << ']' << endl;
+       LYXERR(Debug::ACTION, "InsetText::doDispatch()"
+               << " [ cmd.action = " << cmd.action << ']');
        text_.dispatch(cur, cmd);
 }
 
@@ -388,7 +380,7 @@ void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
        ParagraphList::iterator ins = pl.insert(pl.end(), *pit);
        ++pit;
        mergeParagraph(buffer->params(), pl,
-                      std::distance(pl.begin(), ins) - 1);
+                      distance(pl.begin(), ins) - 1);
 
        for_each(pit, plist.end(),
                 bind(&ParagraphList::push_back, ref(pl), _1));