#include <config.h>
#include "InsetList.h"
-#include "BufferView.h"
+
#include "buffer.h"
+#include "bufferparams.h"
+#include "BranchList.h"
+#include "BufferView.h"
#include "debug.h"
#include "insets/insetbranch.h"
-
using lyx::pos_type;
-using std::lower_bound;
-using std::upper_bound;
using std::endl;
+using std::lower_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;
}
}
-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;
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;
}
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) {
- if (it->inset->isTextInset()) {
- static_cast<UpdatableInset*>
- (it->inset)->deleteLyXText(bv, true);
- }
- }
- }
-}
-
-
-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);
- }
- }
- }
-}
-
-
projects / lyx.git / blobdiff