anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings and use ranges.

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-02-29 00:21:02 -05:00
parent 9afc001fc5
commit 585823704a
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/InsetList.cpp
View File

@ -41,58 +41,48 @@ struct ElementPosLess
InsetList::InsetList(InsetList const & il) : list_(il.list_) InsetList::InsetList(InsetList const & il) : list_(il.list_)
{ {
List::iterator it = list_.begin(); for (auto & i : list_)
List::iterator end = list_.end(); i.inset = i.inset->clone();
for (; it != end; ++it)
it->inset = it->inset->clone();
} }
InsetList::InsetList(InsetList const & il, pos_type beg, pos_type end) InsetList::InsetList(InsetList const & il, pos_type beg, pos_type end)
{ {
InsetList::const_iterator cit = il.begin(); for (auto const & ci : il) {
InsetList::const_iterator cend = il.end(); if (ci.pos < beg)
for (; cit != cend; ++cit) {
if (cit->pos < beg)
continue; continue;
if (cit->pos >= end) if (ci.pos >= end)
break; break;
// Add a new entry in the insetlist_. // Add a new entry in the insetlist_.
insert(cit->inset->clone(), cit->pos - beg); insert(ci.inset->clone(), ci.pos - beg);
} }
} }
InsetList::~InsetList() InsetList::~InsetList()
{ {
List::iterator it = list_.begin(); for (auto & i : list_)
List::iterator end = list_.end(); delete i.inset;
for (; it != end; ++it)
delete it->inset;
} }
void InsetList::setBuffer(Buffer & b) void InsetList::setBuffer(Buffer & b)
{ {
List::iterator it = list_.begin(); for (auto & i : list_)
List::iterator end = list_.end(); i.inset->setBuffer(b);
for (; it != end; ++it)
it->inset->setBuffer(b);
} }
void InsetList::resetBuffer() void InsetList::resetBuffer()
{ {
List::iterator it = list_.begin(); for (auto & i : list_)
List::iterator end = list_.end(); i.inset->resetBuffer();
for (; it != end; ++it)
it->inset->resetBuffer();
} }
InsetList::iterator InsetList::insetIterator(pos_type pos) InsetList::iterator InsetList::insetIterator(pos_type pos)
{ {
Element search_elem(pos, 0); Element search_elem(pos, nullptr);
return lower_bound(list_.begin(), list_.end(), search_elem, return lower_bound(list_.begin(), list_.end(), search_elem,
ElementPosLess()); ElementPosLess());
} }
@ -100,7 +90,7 @@ InsetList::iterator InsetList::insetIterator(pos_type pos)
InsetList::const_iterator InsetList::insetIterator(pos_type pos) const InsetList::const_iterator InsetList::insetIterator(pos_type pos) const
{ {
Element search_elem(pos, 0); Element search_elem(pos, nullptr);
return lower_bound(list_.begin(), list_.end(), search_elem, return lower_bound(list_.begin(), list_.end(), search_elem,
ElementPosLess()); ElementPosLess());
} }
@ -136,10 +126,10 @@ Inset * InsetList::release(pos_type pos)
List::iterator it = insetIterator(pos); List::iterator it = insetIterator(pos);
if (it != end && it->pos == pos) { if (it != end && it->pos == pos) {
Inset * tmp = it->inset; Inset * tmp = it->inset;
it->inset = 0; it->inset = nullptr;
return tmp; return tmp;
} }
return 0; return nullptr;
} }
@ -149,7 +139,7 @@ Inset * InsetList::get(pos_type pos) const
List::const_iterator it = insetIterator(pos); List::const_iterator it = insetIterator(pos);
if (it != end && it->pos == pos) if (it != end && it->pos == pos)
return it->inset; return it->inset;
return 0; return nullptr;
} }