X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FInsetList.C;h=22e9273ab6223783af9b0baa739fc8431fe96186;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=df45a985db02a0c7919a02b469f440fe92527b1b;hpb=1cad117882dc393b2d55174c6f2ab67920a54ce1;p=lyx.git
diff --git a/src/InsetList.C b/src/InsetList.C
index df45a985db..22e9273ab6 100644
--- a/src/InsetList.C
+++ b/src/InsetList.C
@@ -16,12 +16,12 @@
#include "buffer.h"
#include "bufferparams.h"
#include "BranchList.h"
-#include "BufferView.h"
#include "debug.h"
#include "insets/insetbranch.h"
-using lyx::pos_type;
+
+namespace lyx {
using std::endl;
using std::lower_bound;
@@ -29,25 +29,26 @@ using std::lower_bound;
namespace {
-struct MatchIt {
- /// used by lower_bound
- inline
- int operator()(InsetList::InsetTable const & a,
- InsetList::InsetTable const & b) const
+typedef InsetList::InsetTable Table;
+
+class InsetTablePosLess : public std::binary_function
{
+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;
}
@@ -57,47 +58,49 @@ InsetList::~InsetList()
InsetList::iterator InsetList::insetIterator(pos_type pos)
{
InsetTable search_elem(pos, 0);
- return lower_bound(list.begin(), list.end(), search_elem, MatchIt());
+ return lower_bound(list_.begin(), list_.end(), search_elem,
+ InsetTablePosLess());
}
InsetList::const_iterator InsetList::insetIterator(pos_type pos) const
{
InsetTable search_elem(pos, 0);
- return lower_bound(list.begin(), list.end(), search_elem, MatchIt());
+ return lower_bound(list_.begin(), list_.end(), search_elem,
+ InsetTablePosLess());
}
-void InsetList::insert(InsetOld * inset, lyx::pos_type pos)
+void InsetList::insert(InsetBase * inset, 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);
}
}
-InsetOld * InsetList::release(pos_type pos)
+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) {
- InsetOld * tmp = it->inset;
+ InsetBase * tmp = it->inset;
it->inset = 0;
return tmp;
}
@@ -105,9 +108,9 @@ InsetOld * InsetList::release(pos_type pos)
}
-InsetOld * InsetList::get(pos_type pos) const
+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;
@@ -117,7 +120,7 @@ InsetOld * 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;
@@ -127,7 +130,7 @@ 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;
@@ -135,20 +138,4 @@ void InsetList::decreasePosAfterPos(pos_type pos)
}
-void InsetList::insetsOpenCloseBranch(Buffer const & buf)
-{
- List::iterator it = list.begin();
- List::iterator end = list.end();
- for (; it != end; ++it) {
- if (!it->inset ||
- it->inset->lyxCode() != InsetOld::BRANCH_CODE)
- continue;
-
- InsetBranch * inset = static_cast(it->inset);
- if (inset->isBranchSelected(buf.params().branchlist())) {
- inset->open();
- } else {
- inset->close();
- }
- }
-}
+} // namespace lyx