[LyX/master] rename more values that overshadow the name of their variable

Juergen Spitzmueller spitz at lyx.org
Fri Feb 20 14:49:01 UTC 2026


commit 20668bb3e3002855d5a4876205bafe82044a9552
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Fri Feb 20 15:42:54 2026 +0100

    rename more values that overshadow the name of their variable
---
 src/frontends/qt/Toolbars.cpp   | 10 +++++-----
 src/graphics/GraphicsLoader.cpp |  4 ++--
 src/graphics/PreviewLoader.cpp  |  4 ++--
 src/insets/RenderPreview.cpp    |  4 ++--
 src/output_docbook.cpp          |  8 ++++----
 src/support/FileMonitor.cpp     |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/frontends/qt/Toolbars.cpp b/src/frontends/qt/Toolbars.cpp
index e36ff6d6f5..6573b2207b 100644
--- a/src/frontends/qt/Toolbars.cpp
+++ b/src/frontends/qt/Toolbars.cpp
@@ -44,9 +44,9 @@ ToolbarItem::ToolbarItem(Type t, FuncRequest const & f,
 }
 
 
-ToolbarItem::ToolbarItem(Type type, string const & name,
-                         docstring const & label)
-	: type(type), func(make_shared<FuncRequest>()), label(label), name(name)
+ToolbarItem::ToolbarItem(Type typ, string const & nam,
+                         docstring const & lab)
+	: type(typ), func(make_shared<FuncRequest>()), label(lab), name(nam)
 {
 }
 
@@ -174,10 +174,10 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 
 		case TO_DYNAMICMENU: {
 			if (lex.next(true)) {
-				string const name = lex.getString();
+				string const mname = lex.getString();
 				lex.next(true);
 				docstring const label = lex.getDocString();
-				add(ToolbarItem(ToolbarItem::DYNAMICMENU, name, label));
+				add(ToolbarItem(ToolbarItem::DYNAMICMENU, mname, label));
 			}
 			break;
 		}
diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index dc3f7c5e35..614f57f76f 100644
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -364,9 +364,9 @@ void Loader::setDisplayPixelRatio(double scale)
 }
 
 
-connection Loader::connect(slot const & slot) const
+connection Loader::connect(slot const & sl) const
 {
-	return pimpl_->signal_.connect(slot);
+	return pimpl_->signal_.connect(sl);
 }
 
 
diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 25dcb2fd61..7fa7dfb456 100644
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -282,9 +282,9 @@ void PreviewLoader::refreshPreviews()
 }
 
 
-connection PreviewLoader::connect(slot const & slot) const
+connection PreviewLoader::connect(slot const & sl) const
 {
-	return pimpl_->imageReady.connect(slot);
+	return pimpl_->imageReady.connect(sl);
 }
 
 
diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 48d471c3c5..dea9aaae09 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -288,9 +288,9 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y, bool const) co
 }
 
 
-connection RenderMonitoredPreview::connect(slot const & slot)
+connection RenderMonitoredPreview::connect(slot const & sl)
 {
-	return changed_.connect(slot);
+	return changed_.connect(sl);
 }
 
 
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 3ab34e3361..d5a5b2debb 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -753,10 +753,10 @@ struct DocBookInfoTag
 	pit_type bpit;
 	pit_type epit;
 
-	DocBookInfoTag(const set<pit_type> & shouldBeInInfo, const set<pit_type> & mustBeInInfo,
-				   const set<pit_type> & abstract, bool abstractLayout, pit_type bpit, pit_type epit) :
-				   shouldBeInInfo(shouldBeInInfo), mustBeInInfo(mustBeInInfo), abstract(abstract),
-				   abstractLayout(abstractLayout), bpit(bpit), epit(epit) {}
+	DocBookInfoTag(const set<pit_type> & shdBeInInfo, const set<pit_type> & mstBeInInfo,
+				   const set<pit_type> & abs, bool absLayout, pit_type bpit_in, pit_type epit_in) :
+				   shouldBeInInfo(shdBeInInfo), mustBeInInfo(mstBeInInfo), abstract(abs),
+				   abstractLayout(absLayout), bpit(bpit_in), epit(epit_in) {}
 };
 
 
diff --git a/src/support/FileMonitor.cpp b/src/support/FileMonitor.cpp
index e692f89cb1..cdaeac0c8b 100644
--- a/src/support/FileMonitor.cpp
+++ b/src/support/FileMonitor.cpp
@@ -179,9 +179,9 @@ void FileMonitor::connectToFileMonitorGuard()
 }
 
 
-connection FileMonitor::connect(slot const & slot)
+connection FileMonitor::connect(slot const & sl)
 {
-	return fileChanged_.connect(slot);
+	return fileChanged_.connect(sl);
 }
 
 


More information about the lyx-cvs mailing list