[LyX/master] Rename iterators that shadow general ones

Juergen Spitzmueller spitz at lyx.org
Fri Feb 20 14:39:30 UTC 2026


commit 9259699542d5c94f5a19688b15bbb56b476b7900
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Fri Feb 20 15:32:35 2026 +0100

    Rename iterators that shadow general ones
---
 src/tex2lyx/Preamble.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 3c5d998bd7..e51be6f218 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -3261,10 +3261,10 @@ void Preamble::parse(Parser & p, string const & forceclass,
 			string const fsize_format = tc.fontsizeformat();
 			for (auto const & fsize : class_fsizes) {
 				string latexsize = subst(fsize_format, "$$s", fsize);
-				vector<string>::iterator it = find(opts.begin(), opts.end(), latexsize);
-				if (it != opts.end()) {
+				vector<string>::iterator itt = find(opts.begin(), opts.end(), latexsize);
+				if (itt != opts.end()) {
 					h_paperfontsize = fsize;
-					opts.erase(it);
+					opts.erase(itt);
 					break;
 				}
 			}
@@ -3327,10 +3327,10 @@ void Preamble::parse(Parser & p, string const & forceclass,
 			string const psize_format = tc.pagesizeformat();
 			for (auto const & psize : class_psizes) {
 				string latexsize = subst(psize_format, "$$s", psize);
-				vector<string>::iterator it = find(opts.begin(), opts.end(), latexsize);
-				if (it != opts.end()) {
+				vector<string>::iterator itt = find(opts.begin(), opts.end(), latexsize);
+				if (itt != opts.end()) {
 					h_papersize = psize;
-					opts.erase(it);
+					opts.erase(itt);
 					break;
 				}
 				if (psize_format == "$$spaper")
@@ -3338,10 +3338,10 @@ void Preamble::parse(Parser & p, string const & forceclass,
 				// Also try with the default format since this is understood by
 				// most classes
 				latexsize = psize + "paper";
-				it = find(opts.begin(), opts.end(), latexsize);
-				if (it != opts.end()) {
+				itt = find(opts.begin(), opts.end(), latexsize);
+				if (itt != opts.end()) {
 					h_papersize = psize;
-					opts.erase(it);
+					opts.erase(itt);
 					break;
 				}
 			}


More information about the lyx-cvs mailing list