[LyX/2.3.x] Fix more unintended copies in range-based for loops

Jean-Marc Lasgouttes lasgouttes at lyx.org
Fri Oct 15 15:48:35 UTC 2021


commit 09b340a45e4563d11a9a132c86693fb44f898b81
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Fri Oct 15 17:41:01 2021 +0200

    Fix more unintended copies in range-based for loops
    
    Spotted by g++ 11.
---
 src/Encoding.cpp               |    2 +-
 src/TocBackend.cpp             |    2 +-
 src/frontends/qt4/TocModel.cpp |    2 +-
 src/insets/InsetInclude.cpp    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 35a93b4..d0046ec 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -267,7 +267,7 @@ vector<char_type> Encoding::symbolsList() const
 	// add all encodable characters
 	copy(encodable_.begin(), encodable_.end(), back_inserter(symbols));
 	// now the ones from the unicodesymbols file that are not already there
-	for (pair<char_type, CharInfo> const & elem : unicodesymbols) {
+	for (pair<const char_type, CharInfo> const & elem : unicodesymbols) {
 		if (find(symbols.begin(), symbols.end(), elem.first) == symbols.end())
 			symbols.push_back(elem.first);
 	}
diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index a253d57..4bb9181 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -272,7 +272,7 @@ void TocBackend::resetOutlinerNames()
 {
 	outliner_names_.clear();
 	// names from this document class
-	for (pair<string, docstring> const & name
+	for (pair<const string, docstring> const & name
 		     : buffer_->params().documentClass().outlinerNames())
 		addName(name.first, translateIfPossible(name.second));
 	// Hardcoded types
diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 0733c1f..a5b5bc5 100644
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -353,7 +353,7 @@ void TocModels::reset(BufferView const * bv)
 	names_->insertColumns(0, 1);
 	// In the outliner, add Tocs from the master document
 	TocBackend const & backend = bv->buffer().masterBuffer()->tocBackend();
-	for (pair<string, shared_ptr<Toc>> const & toc : backend.tocs()) {
+	for (pair<const string, shared_ptr<Toc>> const & toc : backend.tocs()) {
 		QString const type = toqstr(toc.first);
 
 		// First, fill in the toc models.
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 7bf2329..dcfa73b 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -1288,7 +1288,7 @@ void InsetInclude::addToToc(DocIterator const & cpit, bool output_active,
 		//Copy missing outliner names (though the user has been warned against
 		//having different document class and module selection between master
 		//and child).
-		for (pair<string, docstring> const & name
+		for (pair<const string, docstring> const & name
 			     : childbuffer->params().documentClass().outlinerNames())
 			backend.addName(name.first, translateIfPossible(name.second));
 	}


More information about the lyx-cvs mailing list