Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

[lyx.git] / src / InsetList.cpp

diff --git a/src/InsetList.cpp b/src/InsetList.cpp
index 50cf8e9d2c00390c23b9d3b0aa1faf05f03372ac..f32612c5ddf00182d316dd8a8a414343c260aab1 100644 (file)
--- a/src/InsetList.cpp
+++ b/src/InsetList.cpp
@@ -26,9 +26,9 @@ namespace lyx {
 
 namespace {
 
-typedef InsetList::InsetTable Table;
+typedef InsetList::Element Table;
 
-struct InsetTablePosLess
+struct ElementPosLess
 {
        bool operator()(Table const & t1, Table const & t2) const
        {
@@ -41,68 +41,58 @@ struct InsetTablePosLess
 
 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();
+       for (auto & i : list_)
+               i.inset = i.inset->clone();
 }
 
 
 InsetList::InsetList(InsetList const & il, pos_type beg, pos_type end)
 {
-       InsetList::const_iterator cit = il.begin();
-       InsetList::const_iterator cend = il.end();
-       for (; cit != cend; ++cit) {
-               if (cit->pos < beg)
+       for (auto const & ci : il) {
+               if (ci.pos < beg)
                        continue;
-               if (cit->pos >= end)
+               if (ci.pos >= end)
                        break;
                // Add a new entry in the insetlist_.
-               insert(cit->inset->clone(), cit->pos - beg);
+               insert(ci.inset->clone(), ci.pos - beg);
        }
 }
 
 
 InsetList::~InsetList()
 {
-       List::iterator it = list_.begin();
-       List::iterator end = list_.end();
-       for (; it != end; ++it)
-               delete it->inset;
+       for (auto & i : list_)
+               delete i.inset;
 }
 
 
 void InsetList::setBuffer(Buffer & b)
 {
-       List::iterator it = list_.begin();
-       List::iterator end = list_.end();
-       for (; it != end; ++it)
-               it->inset->setBuffer(b);
+       for (auto & i : list_)
+               i.inset->setBuffer(b);
 }
 
 
 void InsetList::resetBuffer()
 {
-       List::iterator it = list_.begin();
-       List::iterator end = list_.end();
-       for (; it != end; ++it)
-               it->inset->resetBuffer();
+       for (auto & i : list_)
+               i.inset->resetBuffer();
 }
 
 
 InsetList::iterator InsetList::insetIterator(pos_type pos)
 {
-       InsetTable search_elem(pos, 0);
+       Element search_elem(pos, nullptr);
        return lower_bound(list_.begin(), list_.end(), search_elem,
-                          InsetTablePosLess());
+                          ElementPosLess());
 }
 
 
 InsetList::const_iterator InsetList::insetIterator(pos_type pos) const
 {
-       InsetTable search_elem(pos, 0);
+       Element search_elem(pos, nullptr);
        return lower_bound(list_.begin(), list_.end(), search_elem,
-                          InsetTablePosLess());
+                          ElementPosLess());
 }
 
 
@@ -114,7 +104,7 @@ void InsetList::insert(Inset * inset, pos_type pos)
                LYXERR0("ERROR (InsetList::insert): "
                       << "There is an inset in position: " << pos);
        } else {
-               list_.insert(it, InsetTable(pos, inset));
+               list_.insert(it, Element(pos, inset));
        }
 }
 
@@ -136,10 +126,10 @@ Inset * InsetList::release(pos_type pos)
        List::iterator it = insetIterator(pos);
        if (it != end && it->pos == pos) {
                Inset * tmp = it->inset;
-               it->inset = 0;
+               it->inset = nullptr;
                return tmp;
        }
-       return 0;
+       return nullptr;
 }
 
 
@@ -149,7 +139,7 @@ Inset * InsetList::get(pos_type pos) const
        List::const_iterator it = insetIterator(pos);
        if (it != end && it->pos == pos)
                return it->inset;
-       return 0;
+       return nullptr;
 }