X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FInsetList.cpp;h=6b8e1fae4cc75a4b7e6c2a03ee6324448e39c0ff;hb=3f7d2a66f522a45583e0a8b0ba734bb71f0ddde0;hp=a18c8b636712559eb0f491226cf9066af7037c90;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git diff --git a/src/InsetList.cpp b/src/InsetList.cpp index a18c8b6367..6b8e1fae4c 100644 --- a/src/InsetList.cpp +++ b/src/InsetList.cpp @@ -16,12 +16,12 @@ #include "Buffer.h" #include "BufferParams.h" #include "BranchList.h" -#include "support/debug.h" #include "insets/InsetBranch.h" -using std::lower_bound; +#include "support/debug.h" +using namespace std; namespace lyx { @@ -41,16 +41,22 @@ struct InsetTablePosLess } // 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; - } } @@ -121,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; - } } @@ -131,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; }