From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Sun, 4 Dec 2022 05:02:51 +0000 (-0500)
Subject: Use ranges
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=eb949f1d056484b1a4015af814c7cfb2dbaff0e5;p=features.git

Use ranges
---

diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index a429d2d5bc..46b5b4fcd9 100644
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -158,18 +158,16 @@ void InsetTOC::makeTOCEntry(XMLStream & xs,
 void InsetTOC::makeTOCWithDepth(XMLStream & xs,
 		Toc const & toc, OutputParams const & op) const
 {
-	Toc::const_iterator it = toc.begin();
-	Toc::const_iterator const en = toc.end();
 	int lastdepth = 0;
-	for (; it != en; ++it) {
+	for (auto const & tocitem : toc) {
 		// do not output entries that are not actually included in the output,
 		// e.g., stuff in non-active branches or notes or whatever.
-		if (!it->isOutput())
+		if (!tocitem.isOutput())
 			continue;
 
 		// First, we need to manage increases and decreases of depth
 		// If there's no depth to deal with, we artificially set it to 1.
-		int const depth = it->depth();
+		int const depth = tocitem.depth();
 
 		// Ignore stuff above the tocdepth
 		if (depth > buffer().params().tocdepth)
@@ -205,7 +203,7 @@ void InsetTOC::makeTOCWithDepth(XMLStream & xs,
 		}
 
 		// Now output TOC info for this entry
-		Paragraph const & par = it->dit().innerParagraph();
+		Paragraph const & par = tocitem.dit().innerParagraph();
 		makeTOCEntry(xs, par, op);
 	}
 	for (int i = lastdepth; i > 0; --i)
@@ -216,17 +214,15 @@ void InsetTOC::makeTOCWithDepth(XMLStream & xs,
 void InsetTOC::makeTOCNoDepth(XMLStream & xs,
 		Toc const & toc, const OutputParams & op) const
 {
-	Toc::const_iterator it = toc.begin();
-	Toc::const_iterator const en = toc.end();
-	for (; it != en; ++it) {
+	for (auto const & tocitem : toc) {
 		// do not output entries that are not actually included in the output,
 		// e.g., stuff in non-active branches or notes or whatever.
-		if (!it->isOutput())
+		if (!tocitem.isOutput())
 			continue;
 
 		xs << xml::StartTag("div", "class='lyxtoc-flat'") << xml::CR();
 
-		Paragraph const & par = it->dit().innerParagraph();
+		Paragraph const & par = tocitem.dit().innerParagraph();
 		makeTOCEntry(xs, par, op);
 
 		xs << xml::EndTag("div");