#include "InsetList.h"
#include "debug.h"
-#include "insets/inset.h"
+#include "insets/updatableinset.h"
#include <algorithm>
/// used by lower_bound and upper_bound
inline
int operator()(InsetList::InsetTable const & a,
- InsetList::InsetTable const & b) const {
+ InsetList::InsetTable const & b) const
+ {
return a.pos < b.pos;
}
};
-}
-
-
-InsetList::iterator::iterator(InsetList::List::iterator const & iter)
- : it(iter)
-{}
-
-
-InsetList::iterator & InsetList::iterator::operator++()
-{
- ++it;
- return *this;
-}
-
-
-InsetList::iterator InsetList::iterator::operator++(int)
-{
- iterator tmp = *this;
- ++*this;
- return tmp;
-}
+} // namespace anon
-pos_type InsetList::iterator::getPos() const
-{
- return it->pos;
-}
-
-
-Inset * InsetList::iterator::getInset() const
-{
- return it->inset;
-}
-
-
-void InsetList::iterator::setInset(Inset * inset)
-{
- it->inset = inset;
-}
-
-
-InsetList::~InsetList()
+InsetList::~InsetList()
{
// If we begin storing a shared_ptr in the List
// this code can be removed. (Lgb)
InsetList::iterator InsetList::begin()
{
- return iterator(list.begin());
+ return list.begin();
}
InsetList::iterator InsetList::end()
{
- return iterator(list.end());
+ return list.end();
}
-InsetList::iterator InsetList::begin() const
+InsetList::const_iterator InsetList::begin() const
{
- return iterator(const_cast<InsetList*>(this)->list.begin());
+ return list.begin();
}
-InsetList::iterator InsetList::end() const
+InsetList::const_iterator InsetList::end() const
{
- return iterator(const_cast<InsetList*>(this)->list.end());
+ return list.end();
}
List::iterator it = lower_bound(list.begin(),
list.end(),
search_elem, MatchIt());
- return iterator(it);
+ return it;
}
-void InsetList::insert(Inset * inset, lyx::pos_type pos)
+void InsetList::insert(InsetOld * inset, lyx::pos_type pos)
{
InsetTable search_elem(pos, 0);
+ List::iterator end = list.end();
List::iterator it = lower_bound(list.begin(),
- list.end(),
+ end,
search_elem, MatchIt());
- if (it != list.end() && it->pos == pos) {
+ if (it != end && it->pos == pos) {
lyxerr << "ERROR (InsetList::insert): "
<< "There is an inset in position: " << pos << endl;
} else {
void InsetList::erase(pos_type pos)
{
InsetTable search_elem(pos, 0);
+ List::iterator end = list.end();
List::iterator it =
lower_bound(list.begin(),
- list.end(),
+ end,
search_elem, MatchIt());
- if (it != list.end() && it->pos == pos) {
+ if (it != end && it->pos == pos) {
delete it->inset;
list.erase(it);
}
}
-Inset * InsetList::release(pos_type pos)
+InsetOld * InsetList::release(pos_type pos)
{
InsetTable search_elem(pos, 0);
+ List::iterator end = list.end();
List::iterator it =
lower_bound(list.begin(),
- list.end(),
+ end,
search_elem, MatchIt());
- if (it != list.end() && it->pos == pos) {
- Inset * tmp = it->inset;
+ if (it != end && it->pos == pos) {
+ InsetOld * tmp = it->inset;
it->inset = 0;
return tmp;
}
return 0;
}
-
-Inset * InsetList::get(pos_type pos) const
+
+InsetOld * InsetList::get(pos_type pos) const
{
InsetTable search_elem(pos, 0);
- List::iterator it =
- lower_bound(const_cast<InsetList*>(this)->list.begin(),
- const_cast<InsetList*>(this)->list.end(),
+ List::const_iterator end = list.end();
+ List::const_iterator it =
+ lower_bound(list.begin(),
+ end,
search_elem, MatchIt());
- if (it != const_cast<InsetList*>(this)->list.end() && it->pos == 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(),
- list.end(),
+ end,
search_elem, MatchIt());
- List::iterator end = list.end();
for (; it != end; ++it) {
++it->pos;
}
}
}
}
-
-
-
-bool operator==(InsetList::iterator const & i1,
- InsetList::iterator const & i2)
-{
- return i1.it == i2.it;
-
-}
-
-
-bool operator!=(InsetList::iterator const & i1,
- InsetList::iterator const & i2)
-{
- return !(i1 == i2);
-}