From 0936a3cd34949a5438ade4d1eed666ccb932f8b5 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Wed, 11 Jun 2025 10:23:28 +0200
Subject: [PATCH 1/2] Hotfix #5426 - fix cppcheck warnings

---
 src/model/StandardGlazing.cpp      | 10 ----------
 src/model/StandardGlazing.hpp      |  4 ++--
 src/model/ThermochromicGlazing.cpp |  6 +++---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/model/StandardGlazing.cpp b/src/model/StandardGlazing.cpp
index 7ee640ee27..3776612cd0 100644
--- a/src/model/StandardGlazing.cpp
+++ b/src/model/StandardGlazing.cpp
@@ -502,11 +502,6 @@ namespace model {
     return getImpl<detail::StandardGlazing_Impl>()->solarTransmittance();
   }
 
-  // cppcheck-suppress [duplInheritedMember] for documentation purposes
-  double StandardGlazing::thickness() const {
-    return getImpl<detail::StandardGlazing_Impl>()->thickness();
-  }
-
   boost::optional<double> StandardGlazing::solarTransmittanceatNormalIncidence() const {
     return getImpl<detail::StandardGlazing_Impl>()->solarTransmittanceatNormalIncidence();
   }
@@ -607,11 +602,6 @@ namespace model {
     return getImpl<detail::StandardGlazing_Impl>()->setSolarTransmittance(value);
   }
 
-  // cppcheck-suppress [duplInheritedMember] for documentation purposes
-  bool StandardGlazing::setThickness(double thickness) {
-    return getImpl<detail::StandardGlazing_Impl>()->setThickness(thickness);
-  }
-
   bool StandardGlazing::setSolarTransmittanceatNormalIncidence(double solarTransmittanceatNormalIncidence) {
     return getImpl<detail::StandardGlazing_Impl>()->setSolarTransmittanceatNormalIncidence(solarTransmittanceatNormalIncidence);
   }
diff --git a/src/model/StandardGlazing.hpp b/src/model/StandardGlazing.hpp
index 5dca51cf9b..7e03ff75e0 100644
--- a/src/model/StandardGlazing.hpp
+++ b/src/model/StandardGlazing.hpp
@@ -50,7 +50,7 @@ namespace model {
 
     std::string opticalDataType() const;
 
-    double thickness() const;
+    // double thickness() const; // inherited from Glazing < FenestrationMaterial < Material
 
     /** deprecated **/
     boost::optional<std::string> windowGlassSpectralDataSetName() const;
@@ -111,7 +111,7 @@ namespace model {
     bool setWindowGlassSpectralDataSet(const MaterialPropertyGlazingSpectralData& spectralData);
     void resetWindowGlassSpectralDataSet();
 
-    bool setThickness(double thickness);
+    // bool setThickness(double thickness); // inherited from Glazing < FenestrationMaterial < Material
 
     bool setSolarTransmittance(double value);
 
diff --git a/src/model/ThermochromicGlazing.cpp b/src/model/ThermochromicGlazing.cpp
index ca0939b9d1..4144c5a0ff 100644
--- a/src/model/ThermochromicGlazing.cpp
+++ b/src/model/ThermochromicGlazing.cpp
@@ -54,9 +54,9 @@ namespace model {
     return opticalDataTemperature() >= other.opticalDataTemperature();
   }
 
-  std::ostream& operator<<(std::ostream& out, const openstudio::model::ThermochromicGroup& ThermochromicGroup) {
-    out << "(StandardGlazing = '" << ThermochromicGroup.standardGlazing().nameString()
-        << "', Optional Data Temperature = " << ThermochromicGroup.opticalDataTemperature() << ")";
+  std::ostream& operator<<(std::ostream& out, const openstudio::model::ThermochromicGroup& thermochromicGroup) {
+    out << "(StandardGlazing = '" << thermochromicGroup.standardGlazing().nameString()
+        << "', Optional Data Temperature = " << thermochromicGroup.opticalDataTemperature() << ")";
     return out;
   }
 

From a6734bf0daa2a06701f44ec78284333de65829a5 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Wed, 11 Jun 2025 10:24:16 +0200
Subject: [PATCH 2/2] Unrelated but clarify cppcheck version in workflow

---
 .github/workflows/cppcheck.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 962f911a4e..4817459438 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Install cppcheck
       shell: bash
       run: |
-        # I made a PPA on launchpad where I built cppcheck 2.3 for focal
+        # I made a PPA on launchpad where I built cppcheck 2.15 for 24.04
         sudo add-apt-repository ppa:jmarrec/ppa
         sudo apt update
         sudo apt install -y cppcheck