#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;
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;
{
// 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::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());
}
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)
+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);
}
}
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;
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;
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;
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;
}
}
+
+
+} // namespace lyx