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

diff --git a/src/InsetList.C b/src/InsetList.C
index d9d90d5591..5cd85c14da 100644
--- a/src/InsetList.C
+++ b/src/InsetList.C
@@ -31,7 +31,8 @@ namespace {
 
 typedef InsetList::InsetTable Table;
 
-struct InsetTablePosLess : public std::binary_function<Table, Table, bool> {
+class InsetTablePosLess : public std::binary_function<Table, Table, bool> {
+public:
 	bool operator()(Table const & t1, Table const & t2) const
 	{
 		return t1.pos < t2.pos;
@@ -46,8 +47,8 @@ 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;
 	}
@@ -57,7 +58,7 @@ InsetList::~InsetList()
 InsetList::iterator InsetList::insetIterator(pos_type pos)
 {
 	InsetTable search_elem(pos, 0);
-	return lower_bound(list.begin(), list.end(), search_elem,
+	return lower_bound(list_.begin(), list_.end(), search_elem,
 			   InsetTablePosLess());
 }
 
@@ -65,38 +66,38 @@ InsetList::iterator InsetList::insetIterator(pos_type pos)
 InsetList::const_iterator InsetList::insetIterator(pos_type pos) const
 {
 	InsetTable search_elem(pos, 0);
-	return lower_bound(list.begin(), list.end(), search_elem,
+	return lower_bound(list_.begin(), list_.end(), search_elem,
 			   InsetTablePosLess());
 }
 
 
 void InsetList::insert(InsetBase * inset, lyx::pos_type pos)
 {
-	List::iterator end = list.end();
+	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)
 {
-	List::iterator end = list.end();
+	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);
 	}
 }
 
 
 InsetBase * InsetList::release(pos_type pos)
 {
-	List::iterator end = list.end();
+	List::iterator end = list_.end();
 	List::iterator it = insetIterator(pos);
 	if (it != end && it->pos == pos) {
 		InsetBase * tmp = it->inset;
@@ -109,7 +110,7 @@ InsetBase * InsetList::release(pos_type pos)
 
 InsetBase * InsetList::get(pos_type pos) const
 {
-	List::const_iterator end = list.end();
+	List::const_iterator end = list_.end();
 	List::const_iterator it = insetIterator(pos);
 	if (it != end && it->pos == pos)
 		return it->inset;
@@ -119,7 +120,7 @@ InsetBase * InsetList::get(pos_type pos) const
 
 void InsetList::increasePosAfterPos(pos_type pos)
 {
-	List::iterator end = list.end();
+	List::iterator end = list_.end();
 	List::iterator it = insetIterator(pos);
 	for (; it != end; ++it) {
 		++it->pos;
@@ -129,29 +130,9 @@ void InsetList::increasePosAfterPos(pos_type pos)
 
 void InsetList::decreasePosAfterPos(pos_type pos)
 {
-	List::iterator end = list.end();
+	List::iterator end = list_.end();
 	List::iterator it = insetIterator(pos);
 	for (; it != end; ++it) {
 		--it->pos;
 	}
 }
-
-
-void InsetList::insetsOpenCloseBranch(Buffer const & buf)
-{
-	List::iterator it = list.begin();
-	List::iterator end = list.end();
-	for (; it != end; ++it) {
-		if (!it->inset)
-			continue;
-		if (it->inset->lyxCode() != InsetBase::BRANCH_CODE)
-			continue;
-
-		InsetBranch * inset = static_cast<InsetBranch *>(it->inset);
-		if (inset->isBranchSelected(buf.params().branchlist())) {
-			inset->open();
-		} else {
-			inset->close();
-		}
-	}
-}