[LyX/master] Prevent value shadowing
Juergen Spitzmueller <[email protected]> Sat, 25 Jul 2026 07:59:01 +0000
| Newsgroups | gmane.editors.lyx.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 1c688d8b8dcabb3bff72618385a800f11539dc12 Author: Juergen Spitzmueller <[email protected]> Date: Sat Jul 25 09:55:22 2026 +0200 Prevent value shadowing --- src/ListingLanguage.cpp | 14 +++++++------- src/ListingLanguage.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ListingLanguage.cpp b/src/ListingLanguage.cpp index a44bb884f1..ef7b57f86a 100644 --- a/src/ListingLanguage.cpp +++ b/src/ListingLanguage.cpp @@ -166,20 +166,20 @@ bool ListingLanguage::isSupported(string const & package) const } -bool ListingLanguage::isDefaultDialect(std::string const & dialect) const +bool ListingLanguage::isDefaultDialect(std::string const & dia) const { for (auto const & d : dialects_) { - if (d.first == dialect && d.second.listingsdefault) + if (d.first == dia && d.second.listingsdefault) return true; } return false; } -bool ListingLanguage::isMintedDialect(std::string const & dialect) const +bool ListingLanguage::isMintedDialect(std::string const & dia) const { for (auto const & d : dialects_) { - if (d.first == dialect && !d.second.mintedname.empty()) { + if (d.first == dia && !d.second.mintedname.empty()) { return true; } } @@ -187,14 +187,14 @@ bool ListingLanguage::isMintedDialect(std::string const & dialect) const } -string ListingLanguage::getMintedLang(string const & dialect) const +string ListingLanguage::getMintedLang(string const & dia) const { string const mlang = minted_lang_.empty() ? lang_ : minted_lang_; - if (dialect.empty()) + if (dia.empty()) return mlang; for (auto const & d : dialects_) { - if (d.first == dialect && !d.second.mintedname.empty()) + if (d.first == dia && !d.second.mintedname.empty()) return d.second.mintedname.empty() ? mlang : d.second.mintedname; } diff --git a/src/ListingLanguage.h b/src/ListingLanguage.h index 40740fccfe..4823988be5 100644 --- a/src/ListingLanguage.h +++ b/src/ListingLanguage.h @@ -67,11 +67,11 @@ public: /// DialectMap getDialects() const { return dialects_; } /// - bool isDefaultDialect(std::string const & dialect) const; + bool isDefaultDialect(std::string const & dia) const; /// - bool isMintedDialect(std::string const & dialect) const; + bool isMintedDialect(std::string const & dia) const; /// - std::string getMintedLang(std::string const & dialect = std::string()) const; + std::string getMintedLang(std::string const & dia = std::string()) const; private: /// trivstring lang_; -- lyx-cvs mailing list [email protected] https://lists.lyx.org/mailman/listinfo/lyx-cvs