Only create a new view for lyxfiles-open if no view is open (#12894)

[lyx.git] / src / InsetList.cpp

diff --git a/src/InsetList.cpp b/src/InsetList.cpp
index d69211dbd4bb6eaaa343c6326521d3a0a276d4e2..f32612c5ddf00182d316dd8a8a414343c260aab1 100644 (file)
--- a/src/InsetList.cpp
+++ b/src/InsetList.cpp
@@ -3,25 +3,22 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Martin Vermeer
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
-#include <algorithm>
 
 #include "InsetList.h"
 
-#include "Buffer.h"
-#include "BufferParams.h"
-#include "BranchList.h"
-
-#include "insets/InsetBranch.h"
+#include "insets/Inset.h"
 
 #include "support/debug.h"
 
+#include <algorithm>
+
 using namespace std;
 
 namespace lyx {
@@ -29,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
        {
@@ -39,65 +36,63 @@ struct InsetTablePosLess
        }
 };
 
-} // namespace anon
+} // namespace
 
 
-InsetList::InsetList(InsetList const & il)
+InsetList::InsetList(InsetList const & il) : list_(il.list_)
 {
-       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()
+{
+       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());
 }
 
 
@@ -109,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));
        }
 }
 
@@ -131,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;
 }
 
 
@@ -144,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;
 }