X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FInsetList.C;h=5cd85c14daf946221c05f22b552d68045b7ec193;hb=414a11684e77aee713135ae65ec7438cfc4b162f;hp=de65af81094f684a580eccf0a016968d7f7c7994;hpb=7803b6341b9e9bfcacdb1928f3d90b72e65f7c35;p=lyx.git

diff --git a/src/InsetList.C b/src/InsetList.C
index de65af8109..5cd85c14da 100644
--- a/src/InsetList.C
+++ b/src/InsetList.C
@@ -15,6 +15,7 @@
 
 #include "buffer.h"
 #include "bufferparams.h"
+#include "BranchList.h"
 #include "BufferView.h"
 #include "debug.h"
 
@@ -24,112 +25,82 @@ using lyx::pos_type;
 
 using std::endl;
 using std::lower_bound;
-using std::upper_bound;
 
 
 namespace {
 
-struct MatchIt {
-	/// used by lower_bound and upper_bound
-	inline
-	int operator()(InsetList::InsetTable const & a,
-		       InsetList::InsetTable const & b) const
+typedef InsetList::InsetTable Table;
+
+class InsetTablePosLess : public std::binary_function<Table, Table, bool> {
+public:
+	bool operator()(Table const & t1, Table const & t2) const
 	{
-		return a.pos < b.pos;
+		return t1.pos < t2.pos;
 	}
 };
 
 } // namespace anon
 
 
+
 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();
+	List::iterator it = list_.begin();
+	List::iterator end = list_.end();
 	for (; it != end; ++it) {
 		delete it->inset;
 	}
 }
 
 
-InsetList::iterator InsetList::begin()
-{
-	return list.begin();
-}
-
-
-InsetList::iterator InsetList::end()
-{
-	return list.end();
-}
-
-
-InsetList::const_iterator InsetList::begin() const
-{
-	return list.begin();
-}
-
-
-InsetList::const_iterator InsetList::end() const
+InsetList::iterator InsetList::insetIterator(pos_type pos)
 {
-	return list.end();
+	InsetTable search_elem(pos, 0);
+	return lower_bound(list_.begin(), list_.end(), search_elem,
+			   InsetTablePosLess());
 }
 
 
-InsetList::iterator
-InsetList::insetIterator(pos_type pos)
+InsetList::const_iterator InsetList::insetIterator(pos_type pos) const
 {
 	InsetTable search_elem(pos, 0);
-	List::iterator it = lower_bound(list.begin(),
-					list.end(),
-					search_elem, MatchIt());
-	return it;
+	return lower_bound(list_.begin(), list_.end(), search_elem,
+			   InsetTablePosLess());
 }
 
 
-void InsetList::insert(InsetOld * inset, lyx::pos_type pos)
+void InsetList::insert(InsetBase * inset, lyx::pos_type pos)
 {
-	InsetTable search_elem(pos, 0);
-	List::iterator end = list.end();
-	List::iterator it = lower_bound(list.begin(),
-					end,
-					search_elem, MatchIt());
+	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;
 	} else {
-		list.insert(it, InsetTable(pos, inset));
+		list_.insert(it, InsetTable(pos, inset));
 	}
 }
 
 
 void InsetList::erase(pos_type pos)
 {
-	InsetTable search_elem(pos, 0);
-	List::iterator end = list.end();
-	List::iterator it =
-		lower_bound(list.begin(),
-			    end,
-			    search_elem, MatchIt());
+	List::iterator end = list_.end();
+	List::iterator it = insetIterator(pos);
 	if (it != end && it->pos == pos) {
 		delete it->inset;
-		list.erase(it);
+		list_.erase(it);
 	}
 }
 
 
-InsetOld * InsetList::release(pos_type pos)
+InsetBase * InsetList::release(pos_type pos)
 {
-	InsetTable search_elem(pos, 0);
-	List::iterator end = list.end();
-	List::iterator it =
-		lower_bound(list.begin(),
-			    end,
-			    search_elem, MatchIt());
+	List::iterator end = list_.end();
+	List::iterator it = insetIterator(pos);
 	if (it != end && it->pos == pos) {
-		InsetOld * tmp = it->inset;
+		InsetBase * tmp = it->inset;
 		it->inset = 0;
 		return tmp;
 	}
@@ -137,14 +108,10 @@ InsetOld * InsetList::release(pos_type pos)
 }
 
 
-InsetOld * InsetList::get(pos_type pos) const
+InsetBase * InsetList::get(pos_type pos) const
 {
-	InsetTable search_elem(pos, 0);
-	List::const_iterator end = list.end();
-	List::const_iterator it =
-		lower_bound(list.begin(),
-			    end,
-			    search_elem, MatchIt());
+	List::const_iterator end = list_.end();
+	List::const_iterator it = insetIterator(pos);
 	if (it != end && it->pos == pos)
 		return it->inset;
 	return 0;
@@ -153,11 +120,8 @@ InsetOld * InsetList::get(pos_type pos) const
 
 void InsetList::increasePosAfterPos(pos_type pos)
 {
-	InsetTable search_elem(pos, 0);
-	List::iterator end = list.end();
-	List::iterator it = lower_bound(list.begin(),
-					end,
-					search_elem, MatchIt());
+	List::iterator end = list_.end();
+	List::iterator it = insetIterator(pos);
 	for (; it != end; ++it) {
 		++it->pos;
 	}
@@ -166,43 +130,9 @@ void InsetList::increasePosAfterPos(pos_type pos)
 
 void InsetList::decreasePosAfterPos(pos_type pos)
 {
-	InsetTable search_elem(pos, 0);
-	List::iterator end = list.end();
-	List::iterator it = upper_bound(list.begin(),
-					end,
-					search_elem, MatchIt());
+	List::iterator end = list_.end();
+	List::iterator it = insetIterator(pos);
 	for (; it != end; ++it) {
 		--it->pos;
 	}
 }
-
-
-void InsetList::deleteInsetsLyXText(BufferView * bv)
-{
-	List::iterator it = list.begin();
-	List::iterator end = list.end();
-	for (; it != end; ++it) {
-		if (it->inset)
-			it->inset->deleteLyXText(bv);
-	}
-}
-
-
-void InsetList::insetsOpenCloseBranch(BufferView * bv)
-{
-	BufferParams bp = bv->buffer()->params();
-	List::iterator it = list.begin();
-	List::iterator end = list.end();
-	for (; it != end; ++it) {
-		if (it->inset && it->inset->lyxCode() == InsetOld::BRANCH_CODE) {
-			InsetBranch * inset = static_cast<InsetBranch *>(it->inset);
-			if (bp.branchlist().selected(inset->params().branch)) {
-				inset->open(bv);
-			} else {
-				inset->close(bv);
-			}
-		}
-	}
-}
-
-