X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FInsetList.cpp;h=6b8e1fae4cc75a4b7e6c2a03ee6324448e39c0ff;hb=3f7d2a66f522a45583e0a8b0ba734bb71f0ddde0;hp=5f6398b48c56d5eb62c923f5fa2b1ac314edf0fa;hpb=1026a87b72ee7f2b2e3fe69577b68c228ebbde88;p=lyx.git
diff --git a/src/InsetList.cpp b/src/InsetList.cpp
index 5f6398b48c..6b8e1fae4c 100644
--- a/src/InsetList.cpp
+++ b/src/InsetList.cpp
@@ -16,13 +16,12 @@
#include "Buffer.h"
#include "BufferParams.h"
#include "BranchList.h"
-#include "debug.h"
#include "insets/InsetBranch.h"
-using std::endl;
-using std::lower_bound;
+#include "support/debug.h"
+using namespace std;
namespace lyx {
@@ -31,8 +30,8 @@ namespace {
typedef InsetList::InsetTable Table;
-class InsetTablePosLess : public std::binary_function
{
-public:
+struct InsetTablePosLess
+{
bool operator()(Table const & t1, Table const & t2) const
{
return t1.pos < t2.pos;
@@ -42,16 +41,22 @@ public:
} // namespace anon
+InsetList::InsetList(InsetList const & il)
+{
+ list_ = il.list_;
+ List::iterator it = list_.begin();
+ List::iterator end = list_.end();
+ for (; it != end; ++it)
+ it->inset = it->inset->clone();
+}
+
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();
- for (; it != end; ++it) {
+ for (; it != end; ++it)
delete it->inset;
- }
}
@@ -76,8 +81,8 @@ void InsetList::insert(Inset * inset, pos_type pos)
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;
+ LYXERR0("ERROR (InsetList::insert): "
+ << "There is an inset in position: " << pos);
} else {
list_.insert(it, InsetTable(pos, inset));
}
@@ -122,9 +127,8 @@ void InsetList::increasePosAfterPos(pos_type pos)
{
List::iterator end = list_.end();
List::iterator it = insetIterator(pos);
- for (; it != end; ++it) {
+ for (; it != end; ++it)
++it->pos;
- }
}
@@ -132,19 +136,8 @@ void InsetList::decreasePosAfterPos(pos_type pos)
{
List::iterator end = list_.end();
List::iterator it = insetIterator(pos);
- for (; it != end; ++it) {
- --it->pos;
- }
-}
-
-
-InsetList::InsetList(InsetList const & il)
-{
- list_ = il.list_;
- List::iterator it = list_.begin();
- List::iterator end = list_.end();
for (; it != end; ++it)
- it->inset = it->inset->clone();
+ --it->pos;
}