commit 79bcdddefb3985893144cc6c365940c030d54333
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Feb 20 15:38:23 2026 +0100
rename values that overshadow the name of their variable
---
src/Format.cpp | 4 ++--
src/Paragraph.cpp | 2 +-
src/frontends/qt/GuiDelimiter.cpp | 4 ++--
src/frontends/qt/Toolbars.h | 4 ++--
src/mathed/InsetMathDecoration.cpp | 4 ++--
src/support/Changer.h | 2 +-
src/support/unicode.cpp | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/Format.cpp b/src/Format.cpp
index f851b9a57a..e55242f650 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -482,8 +482,8 @@ string Formats::getFormatFromExtension(string const & ext)
const
struct ZippedInfo {
bool zipped;
std::time_t timestamp;
- ZippedInfo(bool zipped, std::time_t timestamp)
- : zipped(zipped), timestamp(timestamp) { }
+ ZippedInfo(bool z, std::time_t ts)
+ : zipped(z), timestamp(ts) { }
};
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 7449faad4f..11b9e28237 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3462,7 +3462,7 @@ public:
bool has_value;
OptionalFontType(): ft(xml::FT_EMPH), has_value(false) {} // A possible
value at random for ft.
- OptionalFontType(xml::FontTypes ft): ft(ft), has_value(true) {}
+ OptionalFontType(xml::FontTypes ftt): ft(ftt), has_value(true) {}
};
OptionalFontType fontShapeToXml(FontShape fs)
diff --git a/src/frontends/qt/GuiDelimiter.cpp
b/src/frontends/qt/GuiDelimiter.cpp
index 7b361add9a..21e5cf84c7 100644
--- a/src/frontends/qt/GuiDelimiter.cpp
+++ b/src/frontends/qt/GuiDelimiter.cpp
@@ -78,8 +78,8 @@ static docstring fix_name(string const & str, bool big)
}
struct MathSymbol {
- MathSymbol(char_type uc = '?', string const & icon = string())
- : unicode(uc), icon(icon)
+ MathSymbol(char_type uc = '?', string const & icn = string())
+ : unicode(uc), icon(icn)
{}
char_type unicode;
string icon;
diff --git a/src/frontends/qt/Toolbars.h b/src/frontends/qt/Toolbars.h
index e6989b183d..67bd25e97a 100644
--- a/src/frontends/qt/Toolbars.h
+++ b/src/frontends/qt/Toolbars.h
@@ -80,8 +80,8 @@ public:
typedef Items::const_iterator item_iterator;
- explicit ToolbarInfo(std::string const & name = std::string())
- : name(name), allow_auto(false) {}
+ explicit ToolbarInfo(std::string const & name_in = std::string())
+ : name(name_in), allow_auto(false) {}
/// toolbar name
std::string name;
diff --git a/src/mathed/InsetMathDecoration.cpp
b/src/mathed/InsetMathDecoration.cpp
index 75b1c1922f..b753af503a 100644
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -214,8 +214,8 @@ void InsetMathDecoration::infoize(odocstream & os) const
namespace {
struct Attributes {
Attributes() : over(false) {}
- Attributes(bool o, string const & entity)
- : over(o), entity(entity) {}
+ Attributes(bool o, string const & e)
+ : over(o), entity(e) {}
bool over;
string entity;
};
diff --git a/src/support/Changer.h b/src/support/Changer.h
index 8cd04894c8..0a5d14b8a3 100644
--- a/src/support/Changer.h
+++ b/src/support/Changer.h
@@ -37,7 +37,7 @@ using Changer = std::unique_ptr<Revertible>;
template<typename X>
class RevertibleRef : public Revertible {
public:
- RevertibleRef(X & ref) : ref(ref), old(ref), enabled(true) {}
+ RevertibleRef(X & rf) : ref(rf), old(rf), enabled(true) {}
//
~RevertibleRef() override { revert(); }
//
diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp
index 073b7e818d..a9154e0163 100644
--- a/src/support/unicode.cpp
+++ b/src/support/unicode.cpp
@@ -51,7 +51,7 @@ namespace lyx {
struct IconvProcessor::Handler {
// assumes cd is valid
- explicit Handler(iconv_t const cd) : cd(cd) {}
+ explicit Handler(iconv_t const cd_in) : cd(cd_in) {}
~Handler() {
if (iconv_close(cd) == -1)
LYXERR0("Error returned from iconv_close(" << errno <<
')');
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
