Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / InsetList.cpp

diff --git a/src/InsetList.cpp b/src/InsetList.cpp
index 5f6398b48c56d5eb62c923f5fa2b1ac314edf0fa..1f205858794ef899ac7aabeb2d0d214dcaf85cf1 100644 (file)
--- a/src/InsetList.cpp
+++ b/src/InsetList.cpp
@@ -16,13 +16,11 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
-#include "debug.h"
+#include "support/debug.h"
 
 #include "insets/InsetBranch.h"
 
-using std::endl;
-using std::lower_bound;
-
+using namespace std;
 
 namespace lyx {
 
@@ -31,8 +29,8 @@ namespace {
 
 typedef InsetList::InsetTable Table;
 
-class InsetTablePosLess : public std::binary_function<Table, Table, bool> {
-public:
+struct InsetTablePosLess
+{
        bool operator()(Table const & t1, Table const & t2) const
        {
                return t1.pos < t2.pos;
@@ -76,8 +74,8 @@ void InsetList::insert(Inset * inset, pos_type pos)
        List::iterator end = list_.end();
        List::iterator it = insetIterator(pos);
        if (it != end && it->pos == pos) {
-               lyxerr << "ERROR (InsetList::insert): "
-                      << "There is an inset in position: " << pos << endl;
+               LYXERR0("ERROR (InsetList::insert): "
+                      << "There is an inset in position: " << pos);
        } else {
                list_.insert(it, InsetTable(pos, inset));
        }