X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FInsetList.cpp;h=3d4f7155ffd63764d86649613a5596d987aeb390;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=5f6398b48c56d5eb62c923f5fa2b1ac314edf0fa;hpb=1026a87b72ee7f2b2e3fe69577b68c228ebbde88;p=lyx.git

diff --git a/src/InsetList.cpp b/src/InsetList.cpp
index 5f6398b48c..3d4f7155ff 100644
--- a/src/InsetList.cpp
+++ b/src/InsetList.cpp
@@ -3,26 +3,26 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Martin Vermeer
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
+#include <algorithm>
 
 #include "InsetList.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
-#include "debug.h"
 
 #include "insets/InsetBranch.h"
 
-using std::endl;
-using std::lower_bound;
+#include "support/debug.h"
 
+using namespace std;
 
 namespace lyx {
 
@@ -31,8 +31,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;
@@ -42,16 +42,45 @@ public:
 } // namespace anon
 
 
+InsetList::InsetList(InsetList const & il) : list_(il.list_)
+{
+	List::iterator it = list_.begin();
+	List::iterator end = list_.end();
+	for (; it != end; ++it)
+		it->inset = it->inset->clone();
+}
+
+
+InsetList::InsetList(InsetList const & il, pos_type beg, pos_type end)
+{
+	InsetList::const_iterator cit = il.begin();
+	InsetList::const_iterator cend = il.end();
+	for (; cit != cend; ++cit) {
+		if (cit->pos < beg)
+			continue;
+		if (cit->pos >= end)
+			break;
+		// Add a new entry in the insetlist_.
+		insert(cit->inset->clone(), cit->pos - beg);
+	}
+}
+
 
 InsetList::~InsetList()
 {
-	// If we begin storing a shared_ptr in the List
-	// this code can be removed. (Lgb)
 	List::iterator it = list_.begin();
 	List::iterator end = list_.end();
-	for (; it != end; ++it) {
+	for (; it != end; ++it)
 		delete it->inset;
-	}
+}
+
+
+void InsetList::setBuffer(Buffer & b)
+{
+	List::iterator it = list_.begin();
+	List::iterator end = list_.end();
+	for (; it != end; ++it)
+		it->inset->setBuffer(b);
 }
 
 
@@ -76,8 +105,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));
 	}
@@ -122,9 +151,8 @@ void InsetList::increasePosAfterPos(pos_type pos)
 {
 	List::iterator end = list_.end();
 	List::iterator it = insetIterator(pos);
-	for (; it != end; ++it) {
+	for (; it != end; ++it)
 		++it->pos;
-	}
 }
 
 
@@ -132,19 +160,8 @@ void InsetList::decreasePosAfterPos(pos_type pos)
 {
 	List::iterator end = list_.end();
 	List::iterator it = insetIterator(pos);
-	for (; it != end; ++it) {
-		--it->pos;
-	}
-}
-
-
-InsetList::InsetList(InsetList const & il)
-{
-	list_ = il.list_;
-	List::iterator it = list_.begin();
-	List::iterator end = list_.end();
 	for (; it != end; ++it)
-		it->inset = it->inset->clone();
+		--it->pos;
 }