diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 9b65d8cd550..962f911a4e3 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 # That container is too old to work with the actions that are on node20 now... #container: # image: nrel/cppcheck:2.3 @@ -36,6 +36,11 @@ jobs: --suppress=useStlAlgorithm \ --suppress=unmatchedSuppression \ --suppress=unusedPrivateFunction \ + --suppress=missingIncludeSystem \ + --suppress=normalCheckLevelMaxBranches \ + --suppress=returnByReference \ + --suppress=shadowFunction \ + --suppress=checkersReport \ --suppress=functionStatic:src/utilities/core/EnumBase.hpp \ --suppress=functionStatic:src/utilities/core/StaticInitializer.hpp \ --suppress=functionStatic:src/utilities/units/QuantityFactory.hpp \ @@ -55,11 +60,11 @@ jobs: --template='[{file}:{line}]:({severity}),[{id}],{message}' \ -j $(nproc) \ --max-configs=1 \ - -i src/cli/test \ - -i src/airflow/contam \ - -i src/polypartition \ - -i src/nano \ - ./src \ + -i src/cli/test/ \ + -i src/airflow/contam/ \ + -i src/polypartition/ \ + -i src/nano/ \ + . \ 3>&1 1>&2 2>&3 | tee cppcheck.txt - name: Parse and colorize cppcheck diff --git a/.gitignore b/.gitignore index ed2f730c382..a1ea0bbe9d7 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,6 @@ coverage.xml .pytest_cache/ junit.xml +.cppcheck*/ + CMakeUserPresets.json diff --git a/ci/colorize_cppcheck_results.py b/ci/colorize_cppcheck_results.py index e74f9bdcf2a..02ae16411bf 100755 --- a/ci/colorize_cppcheck_results.py +++ b/ci/colorize_cppcheck_results.py @@ -1,6 +1,9 @@ import re from collections import Counter +EXCLUSIONS = { + 'duplInheritedMember': ["defines member function with name 'iddObjectType' also defined in its parent class"] +} def colorize(lines): def bold(s): @@ -64,6 +67,9 @@ def format_severity(txt, severity): m = re_message.match(line) if m: d = m.groupdict() + if d['id'] in EXCLUSIONS: + if any([x in d['message'] for x in EXCLUSIONS[d['id']]]): + continue matched_messages.append(d) else: colored_lines.append(red(line)) diff --git a/embedded/CreateEmbeddedSource.cpp b/embedded/CreateEmbeddedSource.cpp index e1d54759d20..f7e975b8d92 100644 --- a/embedded/CreateEmbeddedSource.cpp +++ b/embedded/CreateEmbeddedSource.cpp @@ -26,13 +26,11 @@ int main(int argc, char* argv[]) { return 1; } - auto* infile = argv[1]; + const auto* infile = argv[1]; auto* outfile = argv[2]; - auto* filenum = argv[3]; - auto* embeddedname = argv[4]; + const auto* filenum = argv[3]; + const auto* embeddedname = argv[4]; - int ret, flush; - unsigned have; z_stream strm; unsigned char in[CHUNK]; unsigned char out[CHUNK]; @@ -41,7 +39,7 @@ int main(int argc, char* argv[]) { strm.zalloc = Z_NULL; strm.zfree = Z_NULL; strm.opaque = Z_NULL; - ret = deflateInit(&strm, Z_DEFAULT_COMPRESSION); + int ret = deflateInit(&strm, Z_DEFAULT_COMPRESSION); if (ret != Z_OK) return 1; FILE* source = fopen(infile, "rb"); @@ -52,11 +50,11 @@ int main(int argc, char* argv[]) { std::fstream outstream(outfile, std::fstream::out | std::fstream::trunc); - // This is the compressed length in chars; - unsigned length = 0; - if (outstream.is_open()) { outstream << "static const uint8_t embedded_file_" << filenum << "[] = {"; + int flush = 0; + // This is the compressed length in chars; + unsigned length = 0; do { strm.avail_in = fread(in, 1, CHUNK, source); if (ferror(source)) { @@ -73,7 +71,7 @@ int main(int argc, char* argv[]) { strm.next_out = out; ret = deflate(&strm, flush); /* no bad return value */ assert(ret != Z_STREAM_ERROR); /* state not clobbered */ - have = CHUNK - strm.avail_out; + unsigned have = CHUNK - strm.avail_out; for (unsigned i = 0; i != have; ++i) { if (length != 0) { diff --git a/python/engine/PythonEngine.cpp b/python/engine/PythonEngine.cpp index 56773c09421..97e12250ba4 100644 --- a/python/engine/PythonEngine.cpp +++ b/python/engine/PythonEngine.cpp @@ -372,11 +372,11 @@ spec.loader.exec_module(module) return result; } -int PythonEngine::numberOfArguments(ScriptObject& classInstanceObject, std::string_view methodName) { +int PythonEngine::numberOfArguments(ScriptObject& methodObject, std::string_view methodName) { int numberOfArguments = -1; - auto val = std::any_cast(classInstanceObject.object); + auto val = std::any_cast(methodObject.object); if (PyObject_HasAttrString(val.obj_, methodName.data()) == 0) { // FAILED return numberOfArguments; @@ -386,13 +386,15 @@ int PythonEngine::numberOfArguments(ScriptObject& classInstanceObject, std::stri if (PyMethod_Check(method)) { PyObject* func = PyMethod_Function(method); // Borrowed if (auto* code = PyFunction_GetCode(func)) { // Borrowed - auto* co = (PyCodeObject*)code; + // cppcheck-suppress cstyleCast + const auto* co = (PyCodeObject*)code; numberOfArguments = co->co_argcount - 1; // This includes `self` } } else if (PyFunction_Check(method)) { // Shouldn't enter this block here - if (auto code = PyFunction_GetCode(method)) { - auto* co = (PyCodeObject*)code; + if (auto * code = PyFunction_GetCode(method)) { + // cppcheck-suppress cstyleCast + const auto* co = (PyCodeObject*)code; numberOfArguments = co->co_argcount; } } diff --git a/python/engine/test/PythonEngine_GTest.cpp b/python/engine/test/PythonEngine_GTest.cpp index 862bda37311..f2add2b1ba8 100644 --- a/python/engine/test/PythonEngine_GTest.cpp +++ b/python/engine/test/PythonEngine_GTest.cpp @@ -5,12 +5,12 @@ #include -#include "measure/ModelMeasure.hpp" -#include "measure/OSArgument.hpp" -#include "measure/OSMeasure.hpp" -#include "measure/OSRunner.hpp" -#include "model/Model.hpp" -#include "scriptengine/ScriptEngine.hpp" +#include "../../../src/measure/ModelMeasure.hpp" +#include "../../../src/measure/OSArgument.hpp" +#include "../../../src/measure/OSMeasure.hpp" +#include "../../../src/measure/OSRunner.hpp" +#include "../../../src/model/Model.hpp" +#include "../../../src/scriptengine/ScriptEngine.hpp" #include diff --git a/ruby/bindings/InitRubyBindings.cpp b/ruby/bindings/InitRubyBindings.cpp index 88dade6b234..daf5ab6d7c5 100644 --- a/ruby/bindings/InitRubyBindings.cpp +++ b/ruby/bindings/InitRubyBindings.cpp @@ -4,7 +4,7 @@ ***********************************************************************************************************************/ #include "InitRubyBindings.hpp" -#include "RubyEval.hpp" +#include "../interpreter/RubyEval.hpp" // #define HAVE_ISFINITE 1 #include diff --git a/ruby/engine/RubyEngine.cpp b/ruby/engine/RubyEngine.cpp index d6db8c4b6aa..7db74faec66 100644 --- a/ruby/engine/RubyEngine.cpp +++ b/ruby/engine/RubyEngine.cpp @@ -4,8 +4,8 @@ ***********************************************************************************************************************/ #include "RubyEngine.hpp" -#include "InitRubyBindings.hpp" -#include "RubyException.hpp" +#include "../bindings/InitRubyBindings.hpp" +#include "../interpreter/RubyException.hpp" #include #include #include diff --git a/ruby/engine/test/RubyEngine_GTest.cpp b/ruby/engine/test/RubyEngine_GTest.cpp index 57eff7f4bfc..89f71c30be8 100644 --- a/ruby/engine/test/RubyEngine_GTest.cpp +++ b/ruby/engine/test/RubyEngine_GTest.cpp @@ -5,11 +5,11 @@ #include -#include "measure/ModelMeasure.hpp" -#include "measure/OSArgument.hpp" -#include "measure/OSMeasure.hpp" -#include "model/Model.hpp" -#include "scriptengine/ScriptEngine.hpp" +#include "../../../src/measure/ModelMeasure.hpp" +#include "../../../src/measure/OSArgument.hpp" +#include "../../../src/measure/OSMeasure.hpp" +#include "../../../src/model/Model.hpp" +#include "../../../src/scriptengine/ScriptEngine.hpp" #include diff --git a/ruby/interpreter/RubyEval.hpp b/ruby/interpreter/RubyEval.hpp index 6312f862418..ac724097bd6 100644 --- a/ruby/interpreter/RubyEval.hpp +++ b/ruby/interpreter/RubyEval.hpp @@ -6,8 +6,8 @@ #ifndef RUBYEVAL_included #define RUBYEVAL_included -#include "ruby.h" -#include "./RubyException.hpp" +#include +#include "RubyException.hpp" namespace openstudio { @@ -49,7 +49,7 @@ inline VALUE evalString(const std::string& t_str) { // Generally speaking, the backtrace is there, but not for the case where it's a stack too deep error const ID ID_backtrace = rb_intern_const("backtrace"); if (exception_class != rb_eSysStackError && rb_respond_to(errinfo, ID_backtrace)) { - std::vector backtrace_lines; + // std::vector backtrace_lines; std::string btlines; /*volatile*/ VALUE backtrace; if (!NIL_P(backtrace = rb_funcall(errinfo, ID_backtrace, 0))) { @@ -57,13 +57,13 @@ inline VALUE evalString(const std::string& t_str) { btlines = StringValuePtr(backtracejoin); // Get the backing C array of the ruby array - VALUE* elements = RARRAY_PTR(backtrace); - for (long c = 0; c < RARRAY_LEN(backtrace); ++c) { - VALUE entry = elements[c]; - [[maybe_unused]] char* backtrace_line = RSTRING_PTR(entry); - char* backtrace_line2 = StringValuePtr(entry); - backtrace_lines.emplace_back(backtrace_line2); - } + // VALUE* elements = RARRAY_PTR(backtrace); + // for (long c = 0; c < RARRAY_LEN(backtrace); ++c) { + // VALUE entry = elements[c]; + // [[maybe_unused]] char* backtrace_line = RSTRING_PTR(entry); + // char* backtrace_line2 = StringValuePtr(entry); + // backtrace_lines.emplace_back(backtrace_line2); + // } } if (!btlines.empty()) { diff --git a/ruby/module/openstudio_rb.cpp b/ruby/module/openstudio_rb.cpp index 7afd5563f54..4c4bf5072eb 100644 --- a/ruby/module/openstudio_rb.cpp +++ b/ruby/module/openstudio_rb.cpp @@ -3,7 +3,7 @@ * See also https://openstudio.net/license ***********************************************************************************************************************/ -#include "InitRubyBindings.hpp" +#include "../bindings/InitRubyBindings.hpp" #include #include #include diff --git a/src/airflow/contam/PrjAirflowElements.hpp b/src/airflow/contam/PrjAirflowElements.hpp index 25d8326d743..db9536af113 100644 --- a/src/airflow/contam/PrjAirflowElements.hpp +++ b/src/airflow/contam/PrjAirflowElements.hpp @@ -93,7 +93,7 @@ namespace contam { /** Create a new object from another object. */ PlrOrf(const PlrOrf& other); /** Destroy the object. */ - ~PlrOrf() = default; + virtual ~PlrOrf() override = default; //@} /** @name Operators */ @@ -217,7 +217,7 @@ namespace contam { /** Create a new object from another object. */ PlrLeak(const PlrLeak& other); /** Destroy the object. */ - ~PlrLeak() = default; + virtual ~PlrLeak() override = default; //@} /** @name Operators */ @@ -352,7 +352,7 @@ namespace contam { //** Create a new object from another object. */ //PlrLeak(const PlrLeak &other); /** Destroy the object. */ - ~PlrLeak1() = default; + virtual ~PlrLeak1() override = default; //@} /** @name Getters and Setters */ @@ -390,7 +390,7 @@ namespace contam { //** Create a new object from another object. */ //PlrLeak(const PlrLeak &other); /** Destroy the object. */ - ~PlrLeak2() = default; + virtual ~PlrLeak2() override = default; //@} /** @name Getters and Setters */ @@ -423,7 +423,7 @@ namespace contam { //** Create a new object from another object. */ //PlrLeak(const PlrLeak &other); /** Destroy the object. */ - ~PlrLeak3() = default; + virtual ~PlrLeak3() override = default; //@} /** @name Getters and Setters */ @@ -455,7 +455,7 @@ namespace contam { /** Create a new object from another object. */ PlrConn(const PlrConn& other); /** Destroy the object. */ - ~PlrConn() = default; + virtual ~PlrConn() override = default; //@} /** @name Operators */ @@ -561,7 +561,7 @@ namespace contam { /** Create a new object from another object. */ PlrGeneral(const PlrGeneral& other); /** Destroy the object. */ - ~PlrGeneral() = default; + virtual ~PlrGeneral() override = default; //@} /** @name Operators */ @@ -649,7 +649,7 @@ namespace contam { //** Create a new object from another object. */ //PlrQcn(const PlrQcn &other); /** Destroy the object. */ - ~PlrQcn() = default; + virtual ~PlrQcn() override = default; //@} /** @name Getters and Setters */ @@ -680,7 +680,7 @@ namespace contam { //** Create a new object from another object. */ //PlrQcn(const PlrQcn &other); /** Destroy the object. */ - ~PlrFcn() = default; + virtual ~PlrFcn() override = default; //@} /** @name Getters and Setters */ @@ -716,7 +716,7 @@ namespace contam { /** Create a new object from another object. */ PlrTest1(const PlrTest1& other); /** Destroy the object. */ - ~PlrTest1() = default; + virtual ~PlrTest1() override = default; //@} /** @name Operators */ @@ -828,7 +828,7 @@ namespace contam { /** Create a new object from another object. */ PlrTest2(const PlrTest2& other); /** Destroy the object. */ - ~PlrTest2() = default; + virtual ~PlrTest2() override = default; //@} /** @name Operators */ @@ -960,7 +960,7 @@ namespace contam { /** Create a new object from another object. */ PlrCrack(const PlrCrack& other); /** Destroy the object. */ - ~PlrCrack() = default; + virtual ~PlrCrack() override = default; //@} /** @name Operators */ @@ -1072,7 +1072,7 @@ namespace contam { /** Create a new object from another object. */ PlrStair(const PlrStair& other); /** Destroy the object. */ - ~PlrStair() = default; + virtual ~PlrStair() override = default; //@} /** @name Operators */ @@ -1194,7 +1194,7 @@ namespace contam { /** Create a new object from another object. */ PlrShaft(const PlrShaft& other); /** Destroy the object. */ - ~PlrShaft() = default; + virtual ~PlrShaft() override = default; //@} /** @name Operators */ @@ -1324,7 +1324,7 @@ namespace contam { /** Create a new object from another object. */ PlrBackDamper(const PlrBackDamper& other); /** Destroy the object. */ - ~PlrBackDamper() = default; + virtual ~PlrBackDamper() override = default; //@} /** @name Operators */ @@ -1422,7 +1422,7 @@ namespace contam { /** Create a new object from another object. */ //PlrBdq(const PlrBdq &other); /** Destroy the object. */ - ~PlrBdq() = default; + virtual ~PlrBdq() override = default; //@} /** @name Getters and Setters */ @@ -1452,7 +1452,7 @@ namespace contam { /** Create a new object from another object. */ //PlrBdf(const PlrBdf &other); /** Destroy the object. */ - ~PlrBdf() = default; + virtual ~PlrBdf() override = default; //@} /** @name Getters and Setters */ @@ -1482,7 +1482,7 @@ namespace contam { /** Create a new object from another object. */ QfrGeneral(const QfrGeneral& other); /** Destroy the object. */ - ~QfrGeneral() = default; + virtual ~QfrGeneral() override = default; //@} /** @name Operators */ @@ -1562,7 +1562,7 @@ namespace contam { /** Create a new object from another object. */ //QfrQab(const QfrQab &other); /** Destroy the object. */ - ~QfrQab() = default; + virtual ~QfrQab() override = default; //@} /** @name Getters and Setters */ @@ -1593,7 +1593,7 @@ namespace contam { /** Create a new object from another object. */ //QfrFab(const QfrFab &other); /** Destroy the object. */ - ~QfrFab() = default; + virtual ~QfrFab() override = default; //@} /** @name Getters and Setters */ @@ -1626,7 +1626,7 @@ namespace contam { /** Create a new object from another object. */ QfrCrack(const QfrCrack& other); /** Destroy the object. */ - ~QfrCrack() = default; + virtual ~QfrCrack() override = default; //@} /** @name Operators */ @@ -1744,7 +1744,7 @@ namespace contam { /** Create a new object from another object. */ QfrTest2(const QfrTest2& other); /** Destroy the object. */ - ~QfrTest2() = default; + virtual ~QfrTest2() override = default; //@} /** @name Operators */ @@ -1868,7 +1868,7 @@ namespace contam { /** Create a new object from another object. */ AfeDor(const AfeDor& other); /** Destroy the object. */ - ~AfeDor() = default; + virtual ~AfeDor() override = default; //@} /** @name Operators */ @@ -1994,7 +1994,7 @@ namespace contam { /** Create a new object from another object. */ DrPl2(const DrPl2& other); /** Destroy the object. */ - ~DrPl2() = default; + virtual ~DrPl2() override = default; //@} /** @name Operators */ @@ -2114,7 +2114,7 @@ namespace contam { /** Create a new object from another object. */ AfeFlow(const AfeFlow& other); /** Destroy the object. */ - ~AfeFlow() = default; + virtual ~AfeFlow() override = default; //@} /** @name Operators */ @@ -2192,7 +2192,7 @@ namespace contam { /** Create a new object from another object. */ //AfeCmf(const AfeCmf &other); /** Destroy the object. */ - ~AfeCmf() = default; + virtual ~AfeCmf() override = default; //@} /** @name Getters and Setters */ @@ -2222,7 +2222,7 @@ namespace contam { /** Create a new object from another object. */ //AfeCvf(const AfeCvf &other); /** Destroy the object. */ - ~AfeCvf() = default; + virtual ~AfeCvf() override = default; //@} /** @name Getters and Setters */ @@ -2255,7 +2255,7 @@ namespace contam { /** Create a new object from another object. */ AfeFan(const AfeFan& other); /** Destroy the object. */ - ~AfeFan() = default; + virtual ~AfeFan() override = default; //@} /** @name Operators */ @@ -2385,7 +2385,7 @@ namespace contam { /** Create a new object from another object. */ AfeCsf(const AfeCsf& other); /** Destroy the object. */ - ~AfeCsf() = default; + virtual ~AfeCsf() override = default; //@} /** @name Operators */ @@ -2461,7 +2461,7 @@ namespace contam { /** Create a new object from another object. */ //AfeFsp(const AfeCsf &other); /** Destroy the object. */ - ~AfeFsp() = default; + virtual ~AfeFsp() override = default; //@} //@} @@ -2491,7 +2491,7 @@ namespace contam { /** Create a new object from another object. */ //AfeQsp(const AfeCsf &other); /** Destroy the object. */ - ~AfeQsp() = default; + virtual ~AfeQsp() override = default; //@} //@} @@ -2521,7 +2521,7 @@ namespace contam { /** Create a new object from another object. */ //AfePsf(const AfePsf &other); /** Destroy the object. */ - ~AfePsf() = default; + virtual ~AfePsf() override = default; //@} //@} @@ -2551,7 +2551,7 @@ namespace contam { /** Create a new object from another object. */ //AfePsq(const AfePsq &other); /** Destroy the object. */ - ~AfePsq() = default; + virtual ~AfePsq() override = default; //@} //@} @@ -2581,7 +2581,7 @@ namespace contam { /** Create a new object from another object. */ AfeSup(const AfeSup& other); /** Destroy the object. */ - ~AfeSup() = default; + virtual ~AfeSup() override = default; //@} /** @name Operators */ diff --git a/src/airflow/contam/PrjObjects.hpp b/src/airflow/contam/PrjObjects.hpp index 690dafd5998..2f3a714bf0d 100644 --- a/src/airflow/contam/PrjObjects.hpp +++ b/src/airflow/contam/PrjObjects.hpp @@ -1598,7 +1598,7 @@ namespace contam { /** Create a new object from another object. */ CdvDat(const CdvDat& other); /** Destroy the object. */ - ~CdvDat() = default; + virtual ~CdvDat() override = default; //@} /** @name Operators */ diff --git a/src/airflow/contam/PrjReader.hpp b/src/airflow/contam/PrjReader.hpp index dd9a10a3de7..c61484eec73 100644 --- a/src/airflow/contam/PrjReader.hpp +++ b/src/airflow/contam/PrjReader.hpp @@ -39,7 +39,7 @@ namespace contam { } template - std::vector readSectionVector(std::string name = std::string()); + std::vector readSectionVector(const std::string& name = std::string()); std::vector readIntVector(bool terminated = false); // std::vector readIntStdVector(bool terminated=false); @@ -49,7 +49,7 @@ namespace contam { // template QVector readSectionQVector(STRING name=STRING_INIT); // template std::vector readSectionStdVector(STRING name=STRING_INIT); template - std::vector> readElementVector(std::string name = std::string()); + std::vector> readElementVector(const std::string& name = std::string()); template T read(); template @@ -67,7 +67,7 @@ namespace contam { }; template - std::vector Reader::readSectionVector(std::string name) { + std::vector Reader::readSectionVector(const std::string& name) { int n = readInt(); std::vector vector; for (int i = 0; i < n; i++) { @@ -162,7 +162,7 @@ namespace contam { //} template - std::vector> Reader::readElementVector(std::string name) { + std::vector> Reader::readElementVector(const std::string& name) { int n = readInt(); std::vector> vector; for (int i = 0; i < n; i++) { diff --git a/src/alfalfa/AlfalfaJSON.cpp b/src/alfalfa/AlfalfaJSON.cpp index 8ae7d5d90e1..518b09946a7 100644 --- a/src/alfalfa/AlfalfaJSON.cpp +++ b/src/alfalfa/AlfalfaJSON.cpp @@ -42,7 +42,7 @@ namespace alfalfa { m_points.push_back(point); } - std::vector AlfalfaJSON_Impl::points() { + std::vector AlfalfaJSON_Impl::points() const { return m_points; } @@ -201,7 +201,7 @@ namespace alfalfa { return m_impl->toJSON(); } - std::vector AlfalfaJSON::points() { + std::vector AlfalfaJSON::points() const { return m_impl->points(); } diff --git a/src/alfalfa/AlfalfaJSON.hpp b/src/alfalfa/AlfalfaJSON.hpp index 86afb57169c..3b92b531d2d 100644 --- a/src/alfalfa/AlfalfaJSON.hpp +++ b/src/alfalfa/AlfalfaJSON.hpp @@ -100,7 +100,7 @@ namespace alfalfa { /** * Get a vector of all points currently exported to the Alfalfa API */ - std::vector points(); + std::vector points() const; private: static boost::optional getName(const openstudio::IdfObject& idf_object); diff --git a/src/alfalfa/AlfalfaJSON_Impl.hpp b/src/alfalfa/AlfalfaJSON_Impl.hpp index 7f79793e479..38a544f6041 100644 --- a/src/alfalfa/AlfalfaJSON_Impl.hpp +++ b/src/alfalfa/AlfalfaJSON_Impl.hpp @@ -30,7 +30,7 @@ namespace alfalfa { void exposePoint(const AlfalfaPoint& point); - std::vector points(); + std::vector points() const; private: openstudio::path m_JSONPath; diff --git a/src/cli/MeasureManager.cpp b/src/cli/MeasureManager.cpp index ffad89faecf..c72ea444cee 100644 --- a/src/cli/MeasureManager.cpp +++ b/src/cli/MeasureManager.cpp @@ -4,12 +4,11 @@ #include "../utilities/core/Checksum.hpp" #include "../utilities/core/Filesystem.hpp" #include "../utilities/core/FilesystemHelpers.hpp" -#include "../src/utilities/core/StringHelpers.hpp" +#include "../utilities/core/StringHelpers.hpp" #include "../osversion/VersionTranslator.hpp" #include "../energyplus/ForwardTranslator.hpp" -#include "energyplus/ForwardTranslator.hpp" -#include "utilities/bcl/LocalBCL.hpp" -#include "utilities/idf/ValidityEnums.hpp" +#include "../utilities/bcl/LocalBCL.hpp" +#include "../utilities/idf/ValidityEnums.hpp" #include #include "../measure/OSMeasure.hpp" #include "../measure/ModelMeasure.hpp" diff --git a/src/cli/main.cpp b/src/cli/main.cpp index 3a13e0fb0de..e02f5039a98 100644 --- a/src/cli/main.cpp +++ b/src/cli/main.cpp @@ -4,6 +4,8 @@ ***********************************************************************************************************************/ #include "RubyCLI.hpp" +#include "MeasureUpdateCommand.hpp" +#include "RunCommand.hpp" #include "UpdateCommand.hpp" #include "../scriptengine/ScriptEngine.hpp" #include "../workflow/OSWorkflow.hpp" @@ -14,10 +16,7 @@ #include "../measure/ModelMeasure.hpp" #include "../measure/EnergyPlusMeasure.hpp" #include "../measure/ReportingMeasure.hpp" - -#include "RunCommand.hpp" -#include "MeasureUpdateCommand.hpp" -#include "measure/OSMeasureInfoGetter.hpp" +#include "../measure/OSMeasureInfoGetter.hpp" #include diff --git a/src/energyplus/ForwardTranslator/ForwardTranslateElectricLoadCenterDistribution.cpp b/src/energyplus/ForwardTranslator/ForwardTranslateElectricLoadCenterDistribution.cpp index bed58bc7178..d2ed54cac86 100644 --- a/src/energyplus/ForwardTranslator/ForwardTranslateElectricLoadCenterDistribution.cpp +++ b/src/energyplus/ForwardTranslator/ForwardTranslateElectricLoadCenterDistribution.cpp @@ -16,12 +16,12 @@ #include "../../model/ElectricLoadCenterTransformer.hpp" #include "../../model/ElectricLoadCenterTransformer_Impl.hpp" +#include "../../utilities/core/Compare.hpp" #include "../../utilities/idf/IdfExtensibleGroup.hpp" +#include "../../utilities/idd/IddEnums.hpp" #include #include -#include "../../utilities/idd/IddEnums.hpp" -#include "utilities/core/Compare.hpp" #include using namespace openstudio::model; diff --git a/src/energyplus/ForwardTranslator/ForwardTranslateSizingZone.cpp b/src/energyplus/ForwardTranslator/ForwardTranslateSizingZone.cpp index 9a69a72fa28..0b7bff140e5 100644 --- a/src/energyplus/ForwardTranslator/ForwardTranslateSizingZone.cpp +++ b/src/energyplus/ForwardTranslator/ForwardTranslateSizingZone.cpp @@ -21,16 +21,17 @@ #include "../../model/ThermalZone_Impl.hpp" #include "../../model/Schedule.hpp" -#include "../../utilities/core/Logger.hpp" #include "../../utilities/core/Assert.hpp" +#include "../../utilities/core/Compare.hpp" +#include "../../utilities/core/Logger.hpp" +#include "../../utilities/idd/IddEnums.hpp" +#include "../../utilities/idf/IdfExtensibleGroup.hpp" + #include #include #include -#include "../../utilities/idd/IddEnums.hpp" #include #include -#include "../../utilities/idf/IdfExtensibleGroup.hpp" -#include "utilities/core/Compare.hpp" using namespace openstudio::model; diff --git a/src/energyplus/Test/AirLoopHVAC_GTest.cpp b/src/energyplus/Test/AirLoopHVAC_GTest.cpp index c18db3189d2..42508c4f0f8 100644 --- a/src/energyplus/Test/AirLoopHVAC_GTest.cpp +++ b/src/energyplus/Test/AirLoopHVAC_GTest.cpp @@ -36,7 +36,7 @@ #include "../../model/HumidifierSteamElectric.hpp" #include "../../model/ScheduleConstant.hpp" -#include "../../utilities/geometry/Point3d.hpp" +#include "../../utilities/core/Compare.hpp" #include #include @@ -51,9 +51,6 @@ #include #include "../../utilities/idf/IdfExtensibleGroup.hpp" -#include "../../utilities/core/Logger.hpp" -#include "utilities/core/Compare.hpp" - using namespace openstudio::energyplus; using namespace openstudio::model; using namespace openstudio; diff --git a/src/energyplus/Test/ResultsTranslator_GTest.cpp b/src/energyplus/Test/ResultsTranslator_GTest.cpp deleted file mode 100644 index 2a084f534ea..00000000000 --- a/src/energyplus/Test/ResultsTranslator_GTest.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/*********************************************************************************************************************** -* OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC. -* See also https://openstudio.net/license -***********************************************************************************************************************/ - -#include -#include "EnergyPlusFixture.hpp" - -#include "../ErrorFile.hpp" -#include "../ForwardTranslator.hpp" -#include "../ReverseTranslator.hpp" -#include "../ResultsTranslator.hpp" - -#include "../../model/Model.hpp" - -#include "../../utilities/core/Optional.hpp" -#include "../../utilities/core/Checksum.hpp" -#include "../../utilities/core/Logger.hpp" -#include "../../utilities/sql/SqlFile.hpp" - -#include - -#include - -using openstudio::model::OptionalModel; -using openstudio::energyplus::ForwardTranslator; -using openstudio::energyplus::ReverseTranslator; -using openstudio::energyplus::ResultsTranslator; -using openstudio::energyplus::ErrorFile; -using openstudio::IdfFile; -using openstudio::Workspace; -using openstudio::OptionalWorkspace; -using openstudio::SqlFile; -using openstudio::OptionalInt; - -// DLM@20101005: deprecated as of E+ 6 -/* -TEST_F(EnergyPlusFixture,ResultsTranslator_5ZoneAirCooled_NoErrorsNoWarnings) -{ - openstudio::path epDir = resourcesPath() / openstudio::toPath("energyplus/5ZoneAirCooled/"); - openstudio::path origSqlPath = epDir / openstudio::toPath("eplusout.sql"); - openstudio::path testSqlPath = epDir / openstudio::toPath("eplusout_NoErrorsNoWarnings.sql"); - openstudio::filesystem::copy_file(origSqlPath,testSqlPath,openstudio::filesystem::copy_options::overwrite_existing); - openstudio::path errorPath = resourcesPath() / openstudio::toPath("energyplus/ErrorFiles/NoErrorsNoWarnings.err"); - - SqlFile sqlFile(testSqlPath); - ErrorFile errorFile(errorPath); - - ASSERT_TRUE(sqlFile.connectionOpen()); - - ResultsTranslator resultsTranslator(sqlFile); - - // import error file content - ASSERT_TRUE(resultsTranslator.importErrorFile(errorFile)); - - ASSERT_TRUE(sqlFile.connectionOpen()); - - OptionalInt completed = sqlFile.execAndReturnFirstInt("SELECT Completed FROM simulations"); - ASSERT_TRUE(completed); - EXPECT_TRUE(errorFile.completed()); - EXPECT_EQ(1, *completed); - - OptionalInt completedSuccessfully = sqlFile.execAndReturnFirstInt("SELECT CompletedSuccessfully FROM simulations"); - ASSERT_TRUE(completedSuccessfully); - EXPECT_TRUE(errorFile.completedSuccessfully()); - EXPECT_EQ(1, *completedSuccessfully); -} - -TEST_F(EnergyPlusFixture,ResultsTranslator_5ZoneAirCooled_WarningsAndSevere) -{ - openstudio::path epDir = resourcesPath() / openstudio::toPath("energyplus/5ZoneAirCooled/"); - openstudio::path origSqlPath = epDir / openstudio::toPath("eplusout.sql"); - openstudio::path testSqlPath = epDir / openstudio::toPath("eplusout_WarningsAndSevere.sql"); - openstudio::filesystem::copy_file(origSqlPath, testSqlPath, openstudio::filesystem::copy_options::overwrite_existing); - openstudio::path errorPath = resourcesPath() / openstudio::toPath("energyplus/ErrorFiles/WarningsAndSevere.err"); - - SqlFile sqlFile(testSqlPath); - ErrorFile errorFile(errorPath); - - ASSERT_TRUE(sqlFile.connectionOpen()); - - ResultsTranslator resultsTranslator(sqlFile); - - // import error file content - ASSERT_TRUE(resultsTranslator.importErrorFile(errorFile)); - - ASSERT_TRUE(sqlFile.connectionOpen()); - - OptionalInt completed = sqlFile.execAndReturnFirstInt("SELECT Completed FROM simulations"); - ASSERT_TRUE(completed); - EXPECT_TRUE(errorFile.completed()); - EXPECT_EQ(1, *completed); - - OptionalInt completedSuccessfully = sqlFile.execAndReturnFirstInt("SELECT CompletedSuccessfully FROM simulations"); - ASSERT_TRUE(completedSuccessfully); - EXPECT_FALSE(errorFile.completedSuccessfully()); - EXPECT_EQ(0, *completedSuccessfully); -} - -TEST_F(EnergyPlusFixture,ResultsTranslator_5ZoneAirCooled_WarningsAndCrash) -{ - openstudio::path epDir = resourcesPath() / openstudio::toPath("energyplus/5ZoneAirCooled/"); - openstudio::path origSqlPath = epDir / openstudio::toPath("eplusout.sql"); - openstudio::path testSqlPath = epDir / openstudio::toPath("eplusout_WarningsAndCrash.sql"); - openstudio::filesystem::copy_file(origSqlPath,testSqlPath,openstudio::filesystem::copy_options::overwrite_existing); - openstudio::path errorPath = resourcesPath() / openstudio::toPath("energyplus/ErrorFiles/WarningsAndCrash.err"); - - SqlFile sqlFile(testSqlPath); - ErrorFile errorFile(errorPath); - - ASSERT_TRUE(sqlFile.connectionOpen()); - - ResultsTranslator resultsTranslator(sqlFile); - - // import error file content - ASSERT_TRUE(resultsTranslator.importErrorFile(errorFile)); - - ASSERT_TRUE(sqlFile.connectionOpen()); - - OptionalInt completed = sqlFile.execAndReturnFirstInt("SELECT Completed FROM simulations"); - ASSERT_TRUE(completed); - EXPECT_FALSE(errorFile.completed()); - EXPECT_EQ(0, *completed); - - OptionalInt completedSuccessfully = sqlFile.execAndReturnFirstInt("SELECT CompletedSuccessfully FROM simulations"); - ASSERT_TRUE(completedSuccessfully); - EXPECT_FALSE(errorFile.completedSuccessfully()); - EXPECT_EQ(0, *completedSuccessfully); -} -*/ diff --git a/src/energyplus/Test/Space_GTest.cpp b/src/energyplus/Test/Space_GTest.cpp index eee80f1a278..3d965566468 100644 --- a/src/energyplus/Test/Space_GTest.cpp +++ b/src/energyplus/Test/Space_GTest.cpp @@ -50,7 +50,7 @@ #include "../../utilities/idf/IdfExtensibleGroup.hpp" #include "../../utilities/idf/WorkspaceExtensibleGroup.hpp" -#include "utilities/core/Compare.hpp" +#include "../../utilities/core/Compare.hpp" #include diff --git a/src/gbxml/Test/ForwardTranslator_GTest.cpp b/src/gbxml/Test/ForwardTranslator_GTest.cpp index b3a1049c2a0..6b591f9cfa6 100644 --- a/src/gbxml/Test/ForwardTranslator_GTest.cpp +++ b/src/gbxml/Test/ForwardTranslator_GTest.cpp @@ -47,16 +47,18 @@ #include "../../model/YearDescription.hpp" #include "../../model/YearDescription_Impl.hpp" -#include "utilities/core/Compare.hpp" -#include "utilities/geometry/BoundingBox.hpp" -#include "utilities/xml/XMLValidator.hpp" +#include "../../utilities/core/Compare.hpp" +#include "../../utilities/geometry/BoundingBox.hpp" +#include "../../utilities/xml/XMLValidator.hpp" + #include -#include -#include -#include #include +#include +#include +#include + using namespace openstudio::model; using namespace openstudio::gbxml; using namespace openstudio; diff --git a/src/gbxml/Test/ReverseTranslator_GTest.cpp b/src/gbxml/Test/ReverseTranslator_GTest.cpp index 02c1c07af20..fe74884f09c 100644 --- a/src/gbxml/Test/ReverseTranslator_GTest.cpp +++ b/src/gbxml/Test/ReverseTranslator_GTest.cpp @@ -47,15 +47,15 @@ #include "../../model/YearDescription.hpp" #include "../../model/YearDescription_Impl.hpp" -#include "utilities/idf/Workspace.hpp" -#include "utilities/core/Optional.hpp" -#include "utilities/geometry/Plane.hpp" -#include "utilities/time/Date.hpp" -#include "utilities/xml/XMLValidator.hpp" -#include +#include "../../utilities/idf/Workspace.hpp" +#include "../../utilities/core/Optional.hpp" +#include "../../utilities/geometry/Plane.hpp" +#include "../../utilities/time/Date.hpp" +#include "../../utilities/xml/XMLValidator.hpp" #include #include +#include #include #include diff --git a/src/generateiddfactory/GenerateIddFactory.cpp b/src/generateiddfactory/GenerateIddFactory.cpp index e0c384da579..5166904396e 100644 --- a/src/generateiddfactory/GenerateIddFactory.cpp +++ b/src/generateiddfactory/GenerateIddFactory.cpp @@ -234,7 +234,7 @@ void initializeOutFiles(GenerateIddFactoryOutFiles& outFiles, const std::vector< << "}" << '\n'; // start other IddFactory cxx files - for (std::shared_ptr& cxxFile : outFiles.iddFactoryIddFileCxxs) { + for (const std::shared_ptr& cxxFile : outFiles.iddFactoryIddFileCxxs) { cxxFile->tempFile << "#include " << '\n' << "#include " << '\n' << '\n' @@ -751,7 +751,7 @@ void completeOutFiles(const IddFileFactoryDataVector& iddFiles, GenerateIddFacto outFiles.iddFactoryCxx.tempFile << '\n' << "} // openstudio" << '\n'; // close out other IddFactory cxx files - for (std::shared_ptr& cxxFile : outFiles.iddFactoryIddFileCxxs) { + for (const std::shared_ptr& cxxFile : outFiles.iddFactoryIddFileCxxs) { cxxFile->tempFile << '\n' << "} // openstudio" << '\n'; } diff --git a/src/generateiddfactory/WriteEnums.hpp b/src/generateiddfactory/WriteEnums.hpp index 8473c5eb4b6..50812c25995 100644 --- a/src/generateiddfactory/WriteEnums.hpp +++ b/src/generateiddfactory/WriteEnums.hpp @@ -92,7 +92,7 @@ void writeEnumFast(std::ostream& t_os, const std::string& t_name, const Containe << " : EnumBase<" << t_name << ">(t_value) {} " << '\n' << " static std::string enumName() " << '\n' << " { return \"" << t_name << "\"; }" << '\n' - << " domain value() const { return static_cast(EnumBase<" << t_name << ">::value()); }" << '\n' + << " domain value() const { return static_cast(EnumBase<" << t_name << ">::integer_value()); }" << '\n' << " private:" << '\n' diff --git a/src/gltf/GltfModelObjectMetaData.cpp b/src/gltf/GltfModelObjectMetaData.cpp index 33c98afe5c8..c123e1dade8 100644 --- a/src/gltf/GltfModelObjectMetaData.cpp +++ b/src/gltf/GltfModelObjectMetaData.cpp @@ -14,7 +14,7 @@ #include "../model/Space.hpp" #include "../model/RenderingColor.hpp" -#include "utilities/core/UUID.hpp" +#include "../utilities/core/UUID.hpp" #include diff --git a/src/gltf/GltfUtils.cpp b/src/gltf/GltfUtils.cpp index 7b4ae5d56b2..8b441f77477 100644 --- a/src/gltf/GltfUtils.cpp +++ b/src/gltf/GltfUtils.cpp @@ -110,7 +110,7 @@ namespace gltf { // Creates Coordinates / Normal Buffers and Accessors. // returns : index - int createBuffers(std::vector& values, std::vector& coordinatesBuffer, std::vector& accessors) { + int createBuffers(const std::vector& values, std::vector& coordinatesBuffer, std::vector& accessors) { // Fixes ACCESSOR_TOTAL_OFFSET_ALIGNMENT // Accessor's total byteOffset XXXX isn't a multiple of componentType length 4. auto _padding = coordinatesBuffer.size() % 4; diff --git a/src/gltf/GltfUtils.hpp b/src/gltf/GltfUtils.hpp index 4536f1afeba..76b4b709210 100644 --- a/src/gltf/GltfUtils.hpp +++ b/src/gltf/GltfUtils.hpp @@ -58,7 +58,7 @@ namespace gltf { // std::vector& accessors); // int addNormals(const std::vector& normalVectors, std::vector& coordinatesBuffer, // std::vector& accessors); - // int createBuffers(std::vector& values, std::vector& coordinatesBuffer, std::vector& accessors); + // int createBuffers(const std::vector& values, std::vector& coordinatesBuffer, std::vector& accessors); }; } // namespace detail diff --git a/src/install_utility/main.cpp b/src/install_utility/main.cpp index 1d3cc4a42f1..8c8edd9b029 100644 --- a/src/install_utility/main.cpp +++ b/src/install_utility/main.cpp @@ -38,13 +38,12 @@ inline std::string applicationFilePath() { return {}; } -int main(int argc, char* argv[]) { +int main(int argc, const char* argv[]) { #ifdef __APPLE__ if (argc > 1u) { openstudio::filesystem::path appDir = openstudio::filesystem::path(applicationFilePath()).parent_path(); openstudio::filesystem::path cliPath = appDir / "openstudio"; - openstudio::filesystem::path appPath = appDir.parent_path() / "OpenStudioApp.app"; if (std::string(argv[1]) == "Install") { try { diff --git a/src/isomodel/SimModel.cpp b/src/isomodel/SimModel.cpp index c8ec7a96db6..43d29ad491b 100644 --- a/src/isomodel/SimModel.cpp +++ b/src/isomodel/SimModel.cpp @@ -6,6 +6,7 @@ #include "SimModel.hpp" #include +#include #if _DEBUG || (__GNUC__ && !NDEBUG) # define DEBUG_ISO_MODEL_SIMULATION @@ -577,7 +578,7 @@ v_wall_alpha_sc =In.wall_solar_alpha; %wall solar absorption coefficient double n_win_ff = 0.25; Vector v_win_ff = Vector(vsize); - double n_win_SDF_table[] = {0.5, 0.35, 1.0}; + constexpr std::array n_win_SDF_table = {0.5, 0.35, 1.0}; Vector v_win_SDF = Vector(vsize); Vector v_win_SDF_frac = Vector(vsize); @@ -734,7 +735,7 @@ end for (size_t i = 0; i < theta_er.size(); i++) { theta_er[i] = 11.0; } - double n_v_env_form_factors[] = {0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 1}; + constexpr std::array n_v_env_form_factors = {0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 1}; Vector v_wall_phi_r = mult(mult(mult(mult(v_wall_R_sc, v_wall_U), v_wall_A), v_win_hr), theta_er); Vector v_wall_phi_sol(12); @@ -1840,11 +1841,11 @@ v_Qcl_gas_tot = v_Qcl_DC_abs; % total gas cooliing energy */ Vector v_frac_tot = div(sum(v_Qneed_ht, v_Qneed_cl), Qneed_ht_yr + Qneed_cl_yr); - double frac_total = sum(v_frac_tot); - double Q_pumps_tot = Q_pumps_ht + Q_pumps_cl; if (Q_pumps_ht == 0 || Q_pumps_cl == 0) { v_Q_pump_tot = sum(v_Q_pumps_ht, v_Q_pumps_cl); } else { + const double Q_pumps_tot = Q_pumps_ht + Q_pumps_cl; + const double frac_total = sum(v_frac_tot); v_Q_pump_tot = div(mult(v_frac_tot, Q_pumps_tot), frac_total); } /* diff --git a/src/isomodel/SolarRadiation.cpp b/src/isomodel/SolarRadiation.cpp index 75b85885f8c..7cff8ff5092 100644 --- a/src/isomodel/SolarRadiation.cpp +++ b/src/isomodel/SolarRadiation.cpp @@ -174,6 +174,7 @@ namespace isomodel { //std::stringstream ss; for (int s = 0; s < NUM_SURFACES; s++) { + // cppcheck-suppress negativeContainerIndex m_monthlySolarRadiation[midx][s] += m_eglobe[i][s]; //ss << s << " " << m_monthlySolarRadiation[midx][s] << " " << m_eglobe[i][s] << " "; } diff --git a/src/isomodel/UserModel.cpp b/src/isomodel/UserModel.cpp index e721dec3615..87c7cd0fb86 100644 --- a/src/isomodel/UserModel.cpp +++ b/src/isomodel/UserModel.cpp @@ -543,9 +543,9 @@ namespace isomodel { } } void UserModel::loadBuilding(const openstudio::path& t_buildingFile) { - string line; ifstream inputFile(openstudio::toSystemFilename(t_buildingFile)); if (inputFile.is_open()) { + std::string line; while (inputFile.good()) { getline(inputFile, line); if (!line.empty() && line[0] == '#') { diff --git a/src/model/AdditionalProperties.hpp b/src/model/AdditionalProperties.hpp index 366fa01209a..4533f72d911 100644 --- a/src/model/AdditionalProperties.hpp +++ b/src/model/AdditionalProperties.hpp @@ -27,7 +27,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~AdditionalProperties() = default; + virtual ~AdditionalProperties() override = default; // Default the copy and move operators because the virtual dtor is explicit AdditionalProperties(const AdditionalProperties& other) = default; AdditionalProperties(AdditionalProperties&& other) = default; diff --git a/src/model/AdditionalProperties_Impl.hpp b/src/model/AdditionalProperties_Impl.hpp index c325e04fdfc..b10e4e3147e 100644 --- a/src/model/AdditionalProperties_Impl.hpp +++ b/src/model/AdditionalProperties_Impl.hpp @@ -28,7 +28,7 @@ namespace model { AdditionalProperties_Impl(const AdditionalProperties_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AdditionalProperties_Impl() = default; + virtual ~AdditionalProperties_Impl() override = default; //@} diff --git a/src/model/AirConditionerVariableRefrigerantFlow.hpp b/src/model/AirConditionerVariableRefrigerantFlow.hpp index 669b9a92098..6bc50e6dcbc 100644 --- a/src/model/AirConditionerVariableRefrigerantFlow.hpp +++ b/src/model/AirConditionerVariableRefrigerantFlow.hpp @@ -32,7 +32,7 @@ namespace model { public: explicit AirConditionerVariableRefrigerantFlow(const Model& model); - virtual ~AirConditionerVariableRefrigerantFlow() = default; + virtual ~AirConditionerVariableRefrigerantFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit AirConditionerVariableRefrigerantFlow(const AirConditionerVariableRefrigerantFlow& other) = default; AirConditionerVariableRefrigerantFlow(AirConditionerVariableRefrigerantFlow&& other) = default; diff --git a/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControl.hpp b/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControl.hpp index 471a83d2ee7..af595061950 100644 --- a/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControl.hpp +++ b/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControl.hpp @@ -35,7 +35,7 @@ namespace model { explicit AirConditionerVariableRefrigerantFlowFluidTemperatureControl(const Model& model); - virtual ~AirConditionerVariableRefrigerantFlowFluidTemperatureControl() = default; + virtual ~AirConditionerVariableRefrigerantFlowFluidTemperatureControl() override = default; // Default the copy and move operators because the virtual dtor is explicit AirConditionerVariableRefrigerantFlowFluidTemperatureControl(const AirConditionerVariableRefrigerantFlowFluidTemperatureControl& other) = default; AirConditionerVariableRefrigerantFlowFluidTemperatureControl(AirConditionerVariableRefrigerantFlowFluidTemperatureControl&& other) = default; diff --git a/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR.hpp b/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR.hpp index a368226b7e5..0825284e68e 100644 --- a/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR.hpp +++ b/src/model/AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR.hpp @@ -35,7 +35,7 @@ namespace model { explicit AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR(const Model& model); - virtual ~AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR() = default; + virtual ~AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR() override = default; // Default the copy and move operators because the virtual dtor is explicit AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR(const AirConditionerVariableRefrigerantFlowFluidTemperatureControlHR& other) = default; diff --git a/src/model/AirConditionerVariableRefrigerantFlow_Impl.hpp b/src/model/AirConditionerVariableRefrigerantFlow_Impl.hpp index 8dcee04b5c8..003a4788e18 100644 --- a/src/model/AirConditionerVariableRefrigerantFlow_Impl.hpp +++ b/src/model/AirConditionerVariableRefrigerantFlow_Impl.hpp @@ -35,7 +35,7 @@ namespace model { /** @name Virtual Methods */ //@{ - virtual ~AirConditionerVariableRefrigerantFlow_Impl() = default; + virtual ~AirConditionerVariableRefrigerantFlow_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/AirGap.cpp b/src/model/AirGap.cpp index e4e8babe44c..8e087a0e959 100644 --- a/src/model/AirGap.cpp +++ b/src/model/AirGap.cpp @@ -178,10 +178,12 @@ namespace model { return {IddObjectType::OS_Material_AirGap}; } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double AirGap::thermalResistance() const { return getImpl()->thermalResistance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool AirGap::setThermalResistance(double thermalResistance) { return getImpl()->setThermalResistance(thermalResistance); } diff --git a/src/model/AirGap.hpp b/src/model/AirGap.hpp index f25084881e4..0ae90572d5a 100644 --- a/src/model/AirGap.hpp +++ b/src/model/AirGap.hpp @@ -28,7 +28,7 @@ namespace model { explicit AirGap(const Model& model, double thermalResistance = 0.1); - virtual ~AirGap() = default; + virtual ~AirGap() override = default; // Default the copy and move operators because the virtual dtor is explicit AirGap(const AirGap& other) = default; AirGap(AirGap&& other) = default; diff --git a/src/model/AirGap_Impl.hpp b/src/model/AirGap_Impl.hpp index 9f17dde6cc2..4e26b2b8670 100644 --- a/src/model/AirGap_Impl.hpp +++ b/src/model/AirGap_Impl.hpp @@ -28,7 +28,7 @@ namespace model { AirGap_Impl(const AirGap_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirGap_Impl() = default; + virtual ~AirGap_Impl() override = default; //@} diff --git a/src/model/AirLoopHVAC.hpp b/src/model/AirLoopHVAC.hpp index 37cfe9fdddd..5646726c820 100644 --- a/src/model/AirLoopHVAC.hpp +++ b/src/model/AirLoopHVAC.hpp @@ -59,7 +59,7 @@ namespace model { */ explicit AirLoopHVAC(Model& model, bool dualDuct = false); - virtual ~AirLoopHVAC() = default; + virtual ~AirLoopHVAC() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVAC(const AirLoopHVAC& other) = default; AirLoopHVAC(AirLoopHVAC&& other) = default; diff --git a/src/model/AirLoopHVACDedicatedOutdoorAirSystem.hpp b/src/model/AirLoopHVACDedicatedOutdoorAirSystem.hpp index d70f8d58e48..47dcabafda9 100644 --- a/src/model/AirLoopHVACDedicatedOutdoorAirSystem.hpp +++ b/src/model/AirLoopHVACDedicatedOutdoorAirSystem.hpp @@ -31,7 +31,7 @@ namespace model { //@{ explicit AirLoopHVACDedicatedOutdoorAirSystem(const AirLoopHVACOutdoorAirSystem& oaSystem); - virtual ~AirLoopHVACDedicatedOutdoorAirSystem() = default; + virtual ~AirLoopHVACDedicatedOutdoorAirSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACDedicatedOutdoorAirSystem(const AirLoopHVACDedicatedOutdoorAirSystem& other) = default; AirLoopHVACDedicatedOutdoorAirSystem(AirLoopHVACDedicatedOutdoorAirSystem&& other) = default; diff --git a/src/model/AirLoopHVACDedicatedOutdoorAirSystem_Impl.hpp b/src/model/AirLoopHVACDedicatedOutdoorAirSystem_Impl.hpp index 2d01b1c53cc..5450bace5e7 100644 --- a/src/model/AirLoopHVACDedicatedOutdoorAirSystem_Impl.hpp +++ b/src/model/AirLoopHVACDedicatedOutdoorAirSystem_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirLoopHVACDedicatedOutdoorAirSystem_Impl(const AirLoopHVACDedicatedOutdoorAirSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACDedicatedOutdoorAirSystem_Impl() = default; + virtual ~AirLoopHVACDedicatedOutdoorAirSystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirLoopHVACOutdoorAirSystem.hpp b/src/model/AirLoopHVACOutdoorAirSystem.hpp index a65f597e1b8..26b26df1c04 100644 --- a/src/model/AirLoopHVACOutdoorAirSystem.hpp +++ b/src/model/AirLoopHVACOutdoorAirSystem.hpp @@ -42,7 +42,7 @@ namespace model { /** A default ControllerOutdoorAir will be created for you */ explicit AirLoopHVACOutdoorAirSystem(Model& model); - virtual ~AirLoopHVACOutdoorAirSystem() = default; + virtual ~AirLoopHVACOutdoorAirSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACOutdoorAirSystem(const AirLoopHVACOutdoorAirSystem& other) = default; AirLoopHVACOutdoorAirSystem(AirLoopHVACOutdoorAirSystem&& other) = default; diff --git a/src/model/AirLoopHVACOutdoorAirSystem_Impl.hpp b/src/model/AirLoopHVACOutdoorAirSystem_Impl.hpp index 67feff40763..6deffe6da89 100644 --- a/src/model/AirLoopHVACOutdoorAirSystem_Impl.hpp +++ b/src/model/AirLoopHVACOutdoorAirSystem_Impl.hpp @@ -34,7 +34,7 @@ namespace model { AirLoopHVACOutdoorAirSystem_Impl(const AirLoopHVACOutdoorAirSystem_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~AirLoopHVACOutdoorAirSystem_Impl() = default; + virtual ~AirLoopHVACOutdoorAirSystem_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/AirLoopHVACReturnPlenum.hpp b/src/model/AirLoopHVACReturnPlenum.hpp index 5d8b0552617..4f9d5abeb69 100644 --- a/src/model/AirLoopHVACReturnPlenum.hpp +++ b/src/model/AirLoopHVACReturnPlenum.hpp @@ -26,7 +26,7 @@ namespace model { public: explicit AirLoopHVACReturnPlenum(const Model& model); - virtual ~AirLoopHVACReturnPlenum() = default; + virtual ~AirLoopHVACReturnPlenum() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACReturnPlenum(const AirLoopHVACReturnPlenum& other) = default; AirLoopHVACReturnPlenum(AirLoopHVACReturnPlenum&& other) = default; diff --git a/src/model/AirLoopHVACReturnPlenum_Impl.hpp b/src/model/AirLoopHVACReturnPlenum_Impl.hpp index 49e6166a482..f246f6f1ff8 100644 --- a/src/model/AirLoopHVACReturnPlenum_Impl.hpp +++ b/src/model/AirLoopHVACReturnPlenum_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AirLoopHVACReturnPlenum_Impl(const AirLoopHVACReturnPlenum_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACReturnPlenum_Impl() = default; + virtual ~AirLoopHVACReturnPlenum_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/AirLoopHVACSupplyPlenum.hpp b/src/model/AirLoopHVACSupplyPlenum.hpp index 9978eb95e7a..5634f5229a3 100644 --- a/src/model/AirLoopHVACSupplyPlenum.hpp +++ b/src/model/AirLoopHVACSupplyPlenum.hpp @@ -26,7 +26,7 @@ namespace model { public: explicit AirLoopHVACSupplyPlenum(const Model& model); - virtual ~AirLoopHVACSupplyPlenum() = default; + virtual ~AirLoopHVACSupplyPlenum() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACSupplyPlenum(const AirLoopHVACSupplyPlenum& other) = default; AirLoopHVACSupplyPlenum(AirLoopHVACSupplyPlenum&& other) = default; diff --git a/src/model/AirLoopHVACSupplyPlenum_Impl.hpp b/src/model/AirLoopHVACSupplyPlenum_Impl.hpp index fc603fb3f21..74b36b4ddd8 100644 --- a/src/model/AirLoopHVACSupplyPlenum_Impl.hpp +++ b/src/model/AirLoopHVACSupplyPlenum_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirLoopHVACSupplyPlenum_Impl(const AirLoopHVACSupplyPlenum_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACSupplyPlenum_Impl() = default; + virtual ~AirLoopHVACSupplyPlenum_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.hpp b/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.hpp index f208202035b..cb663938d88 100644 --- a/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.hpp +++ b/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.hpp @@ -32,7 +32,7 @@ namespace model { explicit AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass(const Model& model, const HVACComponent& fan, const HVACComponent& coolingCoil, const HVACComponent& heatingCoil); - virtual ~AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass() = default; + virtual ~AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass(const AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass& other) = default; AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass(AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass&& other) = default; diff --git a/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl.hpp b/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl.hpp index 6d851c1c099..efb2f49bcbf 100644 --- a/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl.hpp +++ b/src/model/AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl(const AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl() = default; + virtual ~AirLoopHVACUnitaryHeatCoolVAVChangeoverBypass_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirLoopHVACUnitaryHeatPumpAirToAir.hpp b/src/model/AirLoopHVACUnitaryHeatPumpAirToAir.hpp index ece049df67f..533e53585be 100644 --- a/src/model/AirLoopHVACUnitaryHeatPumpAirToAir.hpp +++ b/src/model/AirLoopHVACUnitaryHeatPumpAirToAir.hpp @@ -36,7 +36,7 @@ namespace model { AirLoopHVACUnitaryHeatPumpAirToAir(const Model& model, Schedule& availabilitySchedule, HVACComponent& supplyFan, HVACComponent& heatingCoil, HVACComponent& coolingCoil, HVACComponent& supplementalHeatingCoil); - virtual ~AirLoopHVACUnitaryHeatPumpAirToAir() = default; + virtual ~AirLoopHVACUnitaryHeatPumpAirToAir() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACUnitaryHeatPumpAirToAir(const AirLoopHVACUnitaryHeatPumpAirToAir& other) = default; AirLoopHVACUnitaryHeatPumpAirToAir(AirLoopHVACUnitaryHeatPumpAirToAir&& other) = default; diff --git a/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.hpp b/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.hpp index 246485c1632..8c0d7c99a3f 100644 --- a/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.hpp +++ b/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed.hpp @@ -32,7 +32,7 @@ namespace model { explicit AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed(const Model& model, const HVACComponent& fan, const HVACComponent& heatingCoil, const HVACComponent& coolingCoil, const HVACComponent& supplementalHeatingCoil); - virtual ~AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed() = default; + virtual ~AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed(const AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed& other) = default; AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed(AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed&& other) = default; diff --git a/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl.hpp b/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl.hpp index ff45b6da4da..e56caa78b4d 100644 --- a/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl.hpp +++ b/src/model/AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl(const AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl() = default; + virtual ~AirLoopHVACUnitaryHeatPumpAirToAirMultiSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirLoopHVACUnitaryHeatPumpAirToAir_Impl.hpp b/src/model/AirLoopHVACUnitaryHeatPumpAirToAir_Impl.hpp index 34d2d9e9e70..424b9644dee 100644 --- a/src/model/AirLoopHVACUnitaryHeatPumpAirToAir_Impl.hpp +++ b/src/model/AirLoopHVACUnitaryHeatPumpAirToAir_Impl.hpp @@ -36,7 +36,7 @@ namespace model { AirLoopHVACUnitaryHeatPumpAirToAir_Impl(const AirLoopHVACUnitaryHeatPumpAirToAir_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACUnitaryHeatPumpAirToAir_Impl() = default; + virtual ~AirLoopHVACUnitaryHeatPumpAirToAir_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirLoopHVACUnitarySystem.hpp b/src/model/AirLoopHVACUnitarySystem.hpp index 224261514bc..dd6efb3719f 100644 --- a/src/model/AirLoopHVACUnitarySystem.hpp +++ b/src/model/AirLoopHVACUnitarySystem.hpp @@ -35,7 +35,7 @@ namespace model { explicit AirLoopHVACUnitarySystem(const Model& model); - virtual ~AirLoopHVACUnitarySystem() = default; + virtual ~AirLoopHVACUnitarySystem() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACUnitarySystem(const AirLoopHVACUnitarySystem& other) = default; AirLoopHVACUnitarySystem(AirLoopHVACUnitarySystem&& other) = default; diff --git a/src/model/AirLoopHVACUnitarySystem_Impl.hpp b/src/model/AirLoopHVACUnitarySystem_Impl.hpp index efc0a129506..c5525b88a9b 100644 --- a/src/model/AirLoopHVACUnitarySystem_Impl.hpp +++ b/src/model/AirLoopHVACUnitarySystem_Impl.hpp @@ -33,7 +33,7 @@ namespace model { AirLoopHVACUnitarySystem_Impl(const AirLoopHVACUnitarySystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVACUnitarySystem_Impl() = default; + virtual ~AirLoopHVACUnitarySystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirLoopHVACZoneMixer.cpp b/src/model/AirLoopHVACZoneMixer.cpp index aeac3383abd..d1a6f79cd87 100644 --- a/src/model/AirLoopHVACZoneMixer.cpp +++ b/src/model/AirLoopHVACZoneMixer.cpp @@ -141,10 +141,11 @@ namespace model { OS_ASSERT(getImpl()); } - AirLoopHVACZoneMixer::AirLoopHVACZoneMixer(std::shared_ptr p) : Mixer(std::move(p)) {} + AirLoopHVACZoneMixer::AirLoopHVACZoneMixer(std::shared_ptr impl) : Mixer(std::move(impl)) {} - std::vector AirLoopHVACZoneMixer::remove() { - return getImpl()->remove(); + IddObjectType AirLoopHVACZoneMixer::iddObjectType() { + IddObjectType result(IddObjectType::OS_AirLoopHVAC_ZoneMixer); + return result; } unsigned AirLoopHVACZoneMixer::outletPort() const { @@ -159,23 +160,6 @@ namespace model { return getImpl()->nextInletPort(); } - bool AirLoopHVACZoneMixer::addToNode(Node& node) { - return getImpl()->addToNode(node); - } - - ModelObject AirLoopHVACZoneMixer::clone(Model model) const { - return getImpl()->clone(model); - } - - void AirLoopHVACZoneMixer::disconnect() { - return getImpl()->disconnect(); - } - - IddObjectType AirLoopHVACZoneMixer::iddObjectType() { - IddObjectType result(IddObjectType::OS_AirLoopHVAC_ZoneMixer); - return result; - } - AirflowNetworkDistributionNode AirLoopHVACZoneMixer::getAirflowNetworkDistributionNode() { return getImpl()->getAirflowNetworkDistributionNode(); } diff --git a/src/model/AirLoopHVACZoneMixer.hpp b/src/model/AirLoopHVACZoneMixer.hpp index b420aa6c82d..d8b3af4f4f0 100644 --- a/src/model/AirLoopHVACZoneMixer.hpp +++ b/src/model/AirLoopHVACZoneMixer.hpp @@ -32,7 +32,7 @@ namespace model { /** Constructs a new AirLoopHVACZoneMixer object and places it inside the model. */ explicit AirLoopHVACZoneMixer(const Model& model); - virtual ~AirLoopHVACZoneMixer() = default; + virtual ~AirLoopHVACZoneMixer() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACZoneMixer(const AirLoopHVACZoneMixer& other) = default; AirLoopHVACZoneMixer(AirLoopHVACZoneMixer&& other) = default; @@ -45,14 +45,6 @@ namespace model { unsigned nextInletPort() const override; - bool addToNode(Node& node); - - std::vector remove(); - - ModelObject clone(Model model) const; - - void disconnect(); - AirflowNetworkDistributionNode getAirflowNetworkDistributionNode(); boost::optional airflowNetworkDistributionNode() const; diff --git a/src/model/AirLoopHVACZoneMixer_Impl.hpp b/src/model/AirLoopHVACZoneMixer_Impl.hpp index fa7030f21e4..0dbf63d64c3 100644 --- a/src/model/AirLoopHVACZoneMixer_Impl.hpp +++ b/src/model/AirLoopHVACZoneMixer_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AirLoopHVACZoneMixer_Impl(const AirLoopHVACZoneMixer_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~AirLoopHVACZoneMixer_Impl() = default; + virtual ~AirLoopHVACZoneMixer_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/AirLoopHVACZoneSplitter.cpp b/src/model/AirLoopHVACZoneSplitter.cpp index 2b8caa003d1..f62a1fb6eec 100644 --- a/src/model/AirLoopHVACZoneSplitter.cpp +++ b/src/model/AirLoopHVACZoneSplitter.cpp @@ -167,11 +167,7 @@ namespace model { OS_ASSERT(getImpl()); } - AirLoopHVACZoneSplitter::AirLoopHVACZoneSplitter(std::shared_ptr p) : Splitter(std::move(p)) {} - - std::vector AirLoopHVACZoneSplitter::remove() { - return getImpl()->remove(); - } + AirLoopHVACZoneSplitter::AirLoopHVACZoneSplitter(std::shared_ptr impl) : Splitter(std::move(impl)) {} unsigned AirLoopHVACZoneSplitter::inletPort() const { return getImpl()->inletPort(); @@ -194,10 +190,6 @@ namespace model { return getImpl()->thermalZones(); } - void AirLoopHVACZoneSplitter::disconnect() { - return getImpl()->disconnect(); - } - AirflowNetworkDistributionNode AirLoopHVACZoneSplitter::getAirflowNetworkDistributionNode() { return getImpl()->getAirflowNetworkDistributionNode(); } diff --git a/src/model/AirLoopHVACZoneSplitter.hpp b/src/model/AirLoopHVACZoneSplitter.hpp index e41b9d0dfdf..c84fee368bc 100644 --- a/src/model/AirLoopHVACZoneSplitter.hpp +++ b/src/model/AirLoopHVACZoneSplitter.hpp @@ -33,7 +33,7 @@ namespace model { /** Constructs a new AirLoopHVACZoneSplitter object and places it inside the model. */ explicit AirLoopHVACZoneSplitter(const Model& model); - virtual ~AirLoopHVACZoneSplitter() = default; + virtual ~AirLoopHVACZoneSplitter() override = default; // Default the copy and move operators because the virtual dtor is explicit AirLoopHVACZoneSplitter(const AirLoopHVACZoneSplitter& other) = default; AirLoopHVACZoneSplitter(AirLoopHVACZoneSplitter&& other) = default; @@ -60,10 +60,6 @@ namespace model { */ std::vector thermalZones(); - std::vector remove(); - - void disconnect(); - AirflowNetworkDistributionNode getAirflowNetworkDistributionNode(); boost::optional airflowNetworkDistributionNode() const; diff --git a/src/model/AirLoopHVACZoneSplitter_Impl.hpp b/src/model/AirLoopHVACZoneSplitter_Impl.hpp index a8d07e00036..28e28b6ceab 100644 --- a/src/model/AirLoopHVACZoneSplitter_Impl.hpp +++ b/src/model/AirLoopHVACZoneSplitter_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AirLoopHVACZoneSplitter_Impl(const AirLoopHVACZoneSplitter_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~AirLoopHVACZoneSplitter_Impl() = default; + virtual ~AirLoopHVACZoneSplitter_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/AirLoopHVAC_Impl.hpp b/src/model/AirLoopHVAC_Impl.hpp index 316dcff4078..f01153fca9b 100644 --- a/src/model/AirLoopHVAC_Impl.hpp +++ b/src/model/AirLoopHVAC_Impl.hpp @@ -42,7 +42,7 @@ namespace model { AirLoopHVAC_Impl(const AirLoopHVAC_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirLoopHVAC_Impl() = default; + virtual ~AirLoopHVAC_Impl() override = default; boost::optional designSupplyAirFlowRate() const; diff --git a/src/model/AirTerminalDualDuctConstantVolume.hpp b/src/model/AirTerminalDualDuctConstantVolume.hpp index 69d4b63c50e..2aaf682f1d0 100644 --- a/src/model/AirTerminalDualDuctConstantVolume.hpp +++ b/src/model/AirTerminalDualDuctConstantVolume.hpp @@ -31,7 +31,7 @@ namespace model { explicit AirTerminalDualDuctConstantVolume(const Model& model); - virtual ~AirTerminalDualDuctConstantVolume() = default; + virtual ~AirTerminalDualDuctConstantVolume() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalDualDuctConstantVolume(const AirTerminalDualDuctConstantVolume& other) = default; AirTerminalDualDuctConstantVolume(AirTerminalDualDuctConstantVolume&& other) = default; diff --git a/src/model/AirTerminalDualDuctConstantVolume_Impl.hpp b/src/model/AirTerminalDualDuctConstantVolume_Impl.hpp index aac22a039d6..dea3c8c578b 100644 --- a/src/model/AirTerminalDualDuctConstantVolume_Impl.hpp +++ b/src/model/AirTerminalDualDuctConstantVolume_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirTerminalDualDuctConstantVolume_Impl(const AirTerminalDualDuctConstantVolume_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalDualDuctConstantVolume_Impl() = default; + virtual ~AirTerminalDualDuctConstantVolume_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalDualDuctVAV.hpp b/src/model/AirTerminalDualDuctVAV.hpp index a5bf74cd6bc..15423a598da 100644 --- a/src/model/AirTerminalDualDuctVAV.hpp +++ b/src/model/AirTerminalDualDuctVAV.hpp @@ -32,7 +32,7 @@ namespace model { explicit AirTerminalDualDuctVAV(const Model& model); - virtual ~AirTerminalDualDuctVAV() = default; + virtual ~AirTerminalDualDuctVAV() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalDualDuctVAV(const AirTerminalDualDuctVAV& other) = default; AirTerminalDualDuctVAV(AirTerminalDualDuctVAV&& other) = default; diff --git a/src/model/AirTerminalDualDuctVAVOutdoorAir.hpp b/src/model/AirTerminalDualDuctVAVOutdoorAir.hpp index cb386dbe61c..2868da9d52b 100644 --- a/src/model/AirTerminalDualDuctVAVOutdoorAir.hpp +++ b/src/model/AirTerminalDualDuctVAVOutdoorAir.hpp @@ -32,7 +32,7 @@ namespace model { explicit AirTerminalDualDuctVAVOutdoorAir(const Model& model); - virtual ~AirTerminalDualDuctVAVOutdoorAir() = default; + virtual ~AirTerminalDualDuctVAVOutdoorAir() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalDualDuctVAVOutdoorAir(const AirTerminalDualDuctVAVOutdoorAir& other) = default; AirTerminalDualDuctVAVOutdoorAir(AirTerminalDualDuctVAVOutdoorAir&& other) = default; diff --git a/src/model/AirTerminalDualDuctVAVOutdoorAir_Impl.hpp b/src/model/AirTerminalDualDuctVAVOutdoorAir_Impl.hpp index 0b08aed2765..016f62e9096 100644 --- a/src/model/AirTerminalDualDuctVAVOutdoorAir_Impl.hpp +++ b/src/model/AirTerminalDualDuctVAVOutdoorAir_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirTerminalDualDuctVAVOutdoorAir_Impl(const AirTerminalDualDuctVAVOutdoorAir_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalDualDuctVAVOutdoorAir_Impl() = default; + virtual ~AirTerminalDualDuctVAVOutdoorAir_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalDualDuctVAV_Impl.hpp b/src/model/AirTerminalDualDuctVAV_Impl.hpp index 055a2b6117b..18d6401fd0e 100644 --- a/src/model/AirTerminalDualDuctVAV_Impl.hpp +++ b/src/model/AirTerminalDualDuctVAV_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirTerminalDualDuctVAV_Impl(const AirTerminalDualDuctVAV_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalDualDuctVAV_Impl() = default; + virtual ~AirTerminalDualDuctVAV_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam.hpp b/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam.hpp index fd7c948be52..8a747e2b16a 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam.hpp @@ -35,7 +35,7 @@ namespace model { explicit AirTerminalSingleDuctConstantVolumeCooledBeam(const Model& model, Schedule& availabilitySchedule, HVACComponent& coilCoolingCooledBeam); - virtual ~AirTerminalSingleDuctConstantVolumeCooledBeam() = default; + virtual ~AirTerminalSingleDuctConstantVolumeCooledBeam() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctConstantVolumeCooledBeam(const AirTerminalSingleDuctConstantVolumeCooledBeam& other) = default; AirTerminalSingleDuctConstantVolumeCooledBeam(AirTerminalSingleDuctConstantVolumeCooledBeam&& other) = default; diff --git a/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam_Impl.hpp b/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam_Impl.hpp index 3405e1d5cec..eed3417e851 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam_Impl.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeCooledBeam_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirTerminalSingleDuctConstantVolumeCooledBeam_Impl(const AirTerminalSingleDuctConstantVolumeCooledBeam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctConstantVolumeCooledBeam_Impl() = default; + virtual ~AirTerminalSingleDuctConstantVolumeCooledBeam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam.hpp b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam.hpp index 5d2e676d2aa..ad69170e3e6 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam.hpp @@ -39,7 +39,7 @@ namespace model { * for this object to be ForwardTranslated, so you will have to do it manually and use setCoolingCoil and/or setHeatingCoil */ AirTerminalSingleDuctConstantVolumeFourPipeBeam(const Model& model); - virtual ~AirTerminalSingleDuctConstantVolumeFourPipeBeam() = default; + virtual ~AirTerminalSingleDuctConstantVolumeFourPipeBeam() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctConstantVolumeFourPipeBeam(const AirTerminalSingleDuctConstantVolumeFourPipeBeam& other) = default; AirTerminalSingleDuctConstantVolumeFourPipeBeam(AirTerminalSingleDuctConstantVolumeFourPipeBeam&& other) = default; diff --git a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl.hpp b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl.hpp index e4d2cdf5de9..58e48b3126b 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl.hpp @@ -34,7 +34,7 @@ namespace model { AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl(const AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl() = default; + virtual ~AirTerminalSingleDuctConstantVolumeFourPipeBeam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction.hpp b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction.hpp index 55ed3b773f0..39b76b97f1f 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction.hpp @@ -31,7 +31,7 @@ namespace model { explicit AirTerminalSingleDuctConstantVolumeFourPipeInduction(const Model& model, HVACComponent& heatingCoil); - virtual ~AirTerminalSingleDuctConstantVolumeFourPipeInduction() = default; + virtual ~AirTerminalSingleDuctConstantVolumeFourPipeInduction() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctConstantVolumeFourPipeInduction(const AirTerminalSingleDuctConstantVolumeFourPipeInduction& other) = default; AirTerminalSingleDuctConstantVolumeFourPipeInduction(AirTerminalSingleDuctConstantVolumeFourPipeInduction&& other) = default; diff --git a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl.hpp b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl.hpp index 2c4d443bca3..1678a8cffff 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl(const AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl() = default; + virtual ~AirTerminalSingleDuctConstantVolumeFourPipeInduction_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctConstantVolumeNoReheat.hpp b/src/model/AirTerminalSingleDuctConstantVolumeNoReheat.hpp index 9b89bb0825b..fdba03e5c81 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeNoReheat.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeNoReheat.hpp @@ -40,7 +40,7 @@ namespace model { * model. The object is fully initialized with all companion objects. */ AirTerminalSingleDuctConstantVolumeNoReheat(const Model& model, Schedule& availabilitySchedule); - virtual ~AirTerminalSingleDuctConstantVolumeNoReheat() = default; + virtual ~AirTerminalSingleDuctConstantVolumeNoReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctConstantVolumeNoReheat(const AirTerminalSingleDuctConstantVolumeNoReheat& other) = default; AirTerminalSingleDuctConstantVolumeNoReheat(AirTerminalSingleDuctConstantVolumeNoReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctConstantVolumeNoReheat_Impl.hpp b/src/model/AirTerminalSingleDuctConstantVolumeNoReheat_Impl.hpp index 781ff410390..73e4d99ad56 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeNoReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeNoReheat_Impl.hpp @@ -31,7 +31,7 @@ namespace model { bool keepHandle); // virtual destructor - virtual ~AirTerminalSingleDuctConstantVolumeNoReheat_Impl() = default; + virtual ~AirTerminalSingleDuctConstantVolumeNoReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctConstantVolumeReheat.hpp b/src/model/AirTerminalSingleDuctConstantVolumeReheat.hpp index 4a9e2303fd3..7d44ddab4d1 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeReheat.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeReheat.hpp @@ -33,7 +33,7 @@ namespace model { explicit AirTerminalSingleDuctConstantVolumeReheat(const Model& model, Schedule& availabilitySchedule, HVACComponent& coil); - virtual ~AirTerminalSingleDuctConstantVolumeReheat() = default; + virtual ~AirTerminalSingleDuctConstantVolumeReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctConstantVolumeReheat(const AirTerminalSingleDuctConstantVolumeReheat& other) = default; AirTerminalSingleDuctConstantVolumeReheat(AirTerminalSingleDuctConstantVolumeReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctConstantVolumeReheat_Impl.hpp b/src/model/AirTerminalSingleDuctConstantVolumeReheat_Impl.hpp index 0397af43d90..5a8c0267281 100644 --- a/src/model/AirTerminalSingleDuctConstantVolumeReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctConstantVolumeReheat_Impl.hpp @@ -32,7 +32,7 @@ namespace model { AirTerminalSingleDuctConstantVolumeReheat_Impl(const AirTerminalSingleDuctConstantVolumeReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctConstantVolumeReheat_Impl() = default; + virtual ~AirTerminalSingleDuctConstantVolumeReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctInletSideMixer.hpp b/src/model/AirTerminalSingleDuctInletSideMixer.hpp index e52a12475ef..e32fb20924f 100644 --- a/src/model/AirTerminalSingleDuctInletSideMixer.hpp +++ b/src/model/AirTerminalSingleDuctInletSideMixer.hpp @@ -28,7 +28,7 @@ namespace model { explicit AirTerminalSingleDuctInletSideMixer(const Model& model); - virtual ~AirTerminalSingleDuctInletSideMixer() = default; + virtual ~AirTerminalSingleDuctInletSideMixer() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctInletSideMixer(const AirTerminalSingleDuctInletSideMixer& other) = default; AirTerminalSingleDuctInletSideMixer(AirTerminalSingleDuctInletSideMixer&& other) = default; diff --git a/src/model/AirTerminalSingleDuctInletSideMixer_Impl.hpp b/src/model/AirTerminalSingleDuctInletSideMixer_Impl.hpp index a6806c4fb7e..dac80845522 100644 --- a/src/model/AirTerminalSingleDuctInletSideMixer_Impl.hpp +++ b/src/model/AirTerminalSingleDuctInletSideMixer_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirTerminalSingleDuctInletSideMixer_Impl(const AirTerminalSingleDuctInletSideMixer_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctInletSideMixer_Impl() = default; + virtual ~AirTerminalSingleDuctInletSideMixer_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctParallelPIUReheat.hpp b/src/model/AirTerminalSingleDuctParallelPIUReheat.hpp index 157a0601174..5369809cee4 100644 --- a/src/model/AirTerminalSingleDuctParallelPIUReheat.hpp +++ b/src/model/AirTerminalSingleDuctParallelPIUReheat.hpp @@ -31,7 +31,7 @@ namespace model { explicit AirTerminalSingleDuctParallelPIUReheat(const Model& model, Schedule& schedule, HVACComponent& fan, HVACComponent& reheatCoil); - virtual ~AirTerminalSingleDuctParallelPIUReheat() = default; + virtual ~AirTerminalSingleDuctParallelPIUReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctParallelPIUReheat(const AirTerminalSingleDuctParallelPIUReheat& other) = default; AirTerminalSingleDuctParallelPIUReheat(AirTerminalSingleDuctParallelPIUReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctParallelPIUReheat_Impl.hpp b/src/model/AirTerminalSingleDuctParallelPIUReheat_Impl.hpp index 88be80abb82..2f9eeef13c7 100644 --- a/src/model/AirTerminalSingleDuctParallelPIUReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctParallelPIUReheat_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirTerminalSingleDuctParallelPIUReheat_Impl(const AirTerminalSingleDuctParallelPIUReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctParallelPIUReheat_Impl() = default; + virtual ~AirTerminalSingleDuctParallelPIUReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctSeriesPIUReheat.hpp b/src/model/AirTerminalSingleDuctSeriesPIUReheat.hpp index 09c4169fe2a..efbf3affce2 100644 --- a/src/model/AirTerminalSingleDuctSeriesPIUReheat.hpp +++ b/src/model/AirTerminalSingleDuctSeriesPIUReheat.hpp @@ -31,7 +31,7 @@ namespace model { explicit AirTerminalSingleDuctSeriesPIUReheat(const Model& model, HVACComponent& fan, HVACComponent& reheatCoil); - virtual ~AirTerminalSingleDuctSeriesPIUReheat() = default; + virtual ~AirTerminalSingleDuctSeriesPIUReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctSeriesPIUReheat(const AirTerminalSingleDuctSeriesPIUReheat& other) = default; AirTerminalSingleDuctSeriesPIUReheat(AirTerminalSingleDuctSeriesPIUReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctSeriesPIUReheat_Impl.hpp b/src/model/AirTerminalSingleDuctSeriesPIUReheat_Impl.hpp index 9fbf75b9e8b..0034e98f1ee 100644 --- a/src/model/AirTerminalSingleDuctSeriesPIUReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctSeriesPIUReheat_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirTerminalSingleDuctSeriesPIUReheat_Impl(const AirTerminalSingleDuctSeriesPIUReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctSeriesPIUReheat_Impl() = default; + virtual ~AirTerminalSingleDuctSeriesPIUReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat.hpp b/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat.hpp index c18a4791920..7e38a0625f6 100644 --- a/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat.hpp +++ b/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat.hpp @@ -30,7 +30,7 @@ namespace model { explicit AirTerminalSingleDuctVAVHeatAndCoolNoReheat(const Model& model); - virtual ~AirTerminalSingleDuctVAVHeatAndCoolNoReheat() = default; + virtual ~AirTerminalSingleDuctVAVHeatAndCoolNoReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctVAVHeatAndCoolNoReheat(const AirTerminalSingleDuctVAVHeatAndCoolNoReheat& other) = default; AirTerminalSingleDuctVAVHeatAndCoolNoReheat(AirTerminalSingleDuctVAVHeatAndCoolNoReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl.hpp b/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl.hpp index 27e49105f8c..8c437932e97 100644 --- a/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl(const AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl() = default; + virtual ~AirTerminalSingleDuctVAVHeatAndCoolNoReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat.hpp b/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat.hpp index 734d5017944..e4ede64d2a7 100644 --- a/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat.hpp +++ b/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat.hpp @@ -31,7 +31,7 @@ namespace model { explicit AirTerminalSingleDuctVAVHeatAndCoolReheat(const Model& model, const HVACComponent& reheatCoil); - virtual ~AirTerminalSingleDuctVAVHeatAndCoolReheat() = default; + virtual ~AirTerminalSingleDuctVAVHeatAndCoolReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctVAVHeatAndCoolReheat(const AirTerminalSingleDuctVAVHeatAndCoolReheat& other) = default; AirTerminalSingleDuctVAVHeatAndCoolReheat(AirTerminalSingleDuctVAVHeatAndCoolReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl.hpp b/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl.hpp index 86f64fa5e74..a950141514d 100644 --- a/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl(const AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl() = default; + virtual ~AirTerminalSingleDuctVAVHeatAndCoolReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirTerminalSingleDuctVAVNoReheat.hpp b/src/model/AirTerminalSingleDuctVAVNoReheat.hpp index c6b23365bb7..d6eb7fdad1a 100644 --- a/src/model/AirTerminalSingleDuctVAVNoReheat.hpp +++ b/src/model/AirTerminalSingleDuctVAVNoReheat.hpp @@ -30,7 +30,7 @@ namespace model { explicit AirTerminalSingleDuctVAVNoReheat(const Model& model, Schedule& schedule); - virtual ~AirTerminalSingleDuctVAVNoReheat() = default; + virtual ~AirTerminalSingleDuctVAVNoReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctVAVNoReheat(const AirTerminalSingleDuctVAVNoReheat& other) = default; AirTerminalSingleDuctVAVNoReheat(AirTerminalSingleDuctVAVNoReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctVAVNoReheat_Impl.hpp b/src/model/AirTerminalSingleDuctVAVNoReheat_Impl.hpp index 9552e6c1ebf..d500d2658ea 100644 --- a/src/model/AirTerminalSingleDuctVAVNoReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctVAVNoReheat_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirTerminalSingleDuctVAVNoReheat_Impl(const AirTerminalSingleDuctVAVNoReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctVAVNoReheat_Impl() = default; + virtual ~AirTerminalSingleDuctVAVNoReheat_Impl() override = default; //@} diff --git a/src/model/AirTerminalSingleDuctVAVReheat.hpp b/src/model/AirTerminalSingleDuctVAVReheat.hpp index 914bd58de2e..b14cc93c99b 100644 --- a/src/model/AirTerminalSingleDuctVAVReheat.hpp +++ b/src/model/AirTerminalSingleDuctVAVReheat.hpp @@ -30,7 +30,7 @@ namespace model { public: explicit AirTerminalSingleDuctVAVReheat(const Model& model, Schedule& availabilitySchedule, HVACComponent& coil); - virtual ~AirTerminalSingleDuctVAVReheat() = default; + virtual ~AirTerminalSingleDuctVAVReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit AirTerminalSingleDuctVAVReheat(const AirTerminalSingleDuctVAVReheat& other) = default; AirTerminalSingleDuctVAVReheat(AirTerminalSingleDuctVAVReheat&& other) = default; diff --git a/src/model/AirTerminalSingleDuctVAVReheat_Impl.hpp b/src/model/AirTerminalSingleDuctVAVReheat_Impl.hpp index f822bee7ac1..b5623590812 100644 --- a/src/model/AirTerminalSingleDuctVAVReheat_Impl.hpp +++ b/src/model/AirTerminalSingleDuctVAVReheat_Impl.hpp @@ -26,7 +26,7 @@ namespace model { AirTerminalSingleDuctVAVReheat_Impl(const AirTerminalSingleDuctVAVReheat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirTerminalSingleDuctVAVReheat_Impl() = default; + virtual ~AirTerminalSingleDuctVAVReheat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirToAirComponent.hpp b/src/model/AirToAirComponent.hpp index 4e3dc3a8da0..00138aba8ff 100644 --- a/src/model/AirToAirComponent.hpp +++ b/src/model/AirToAirComponent.hpp @@ -29,7 +29,7 @@ namespace model { public: AirToAirComponent(IddObjectType type, const Model& model); - virtual ~AirToAirComponent() = default; + virtual ~AirToAirComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit AirToAirComponent(const AirToAirComponent& other) = default; AirToAirComponent(AirToAirComponent&& other) = default; diff --git a/src/model/AirToAirComponent_Impl.hpp b/src/model/AirToAirComponent_Impl.hpp index fa7dede8a8c..98bbb2fe590 100644 --- a/src/model/AirToAirComponent_Impl.hpp +++ b/src/model/AirToAirComponent_Impl.hpp @@ -26,7 +26,7 @@ namespace model { AirToAirComponent_Impl(const AirToAirComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~AirToAirComponent_Impl() = default; + virtual ~AirToAirComponent_Impl() override = default; virtual unsigned primaryAirInletPort() const = 0; diff --git a/src/model/AirflowNetworkComponent.hpp b/src/model/AirflowNetworkComponent.hpp index 9a47ffce593..d7d5685274d 100644 --- a/src/model/AirflowNetworkComponent.hpp +++ b/src/model/AirflowNetworkComponent.hpp @@ -25,7 +25,7 @@ namespace model { public: AirflowNetworkComponent(IddObjectType type, const Model& model); - virtual ~AirflowNetworkComponent() = default; + virtual ~AirflowNetworkComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkComponent(const AirflowNetworkComponent& other) = default; AirflowNetworkComponent(AirflowNetworkComponent&& other) = default; diff --git a/src/model/AirflowNetworkComponent_Impl.hpp b/src/model/AirflowNetworkComponent_Impl.hpp index 6cc9f68acf0..e815db8da4a 100644 --- a/src/model/AirflowNetworkComponent_Impl.hpp +++ b/src/model/AirflowNetworkComponent_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkComponent_Impl(const AirflowNetworkComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~AirflowNetworkComponent_Impl() = default; + virtual ~AirflowNetworkComponent_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkConstantPressureDrop.hpp b/src/model/AirflowNetworkConstantPressureDrop.hpp index 16b03074f1b..22accefb895 100644 --- a/src/model/AirflowNetworkConstantPressureDrop.hpp +++ b/src/model/AirflowNetworkConstantPressureDrop.hpp @@ -30,7 +30,7 @@ namespace model { /** Construct a constant pressure drop object. */ AirflowNetworkConstantPressureDrop(const Model& model, double pressureDrop); - virtual ~AirflowNetworkConstantPressureDrop() = default; + virtual ~AirflowNetworkConstantPressureDrop() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkConstantPressureDrop(const AirflowNetworkConstantPressureDrop& other) = default; AirflowNetworkConstantPressureDrop(AirflowNetworkConstantPressureDrop&& other) = default; diff --git a/src/model/AirflowNetworkConstantPressureDrop_Impl.hpp b/src/model/AirflowNetworkConstantPressureDrop_Impl.hpp index d2be9994a67..98197c2960e 100644 --- a/src/model/AirflowNetworkConstantPressureDrop_Impl.hpp +++ b/src/model/AirflowNetworkConstantPressureDrop_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkConstantPressureDrop_Impl(const AirflowNetworkConstantPressureDrop_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkConstantPressureDrop_Impl() = default; + virtual ~AirflowNetworkConstantPressureDrop_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkCrack.hpp b/src/model/AirflowNetworkCrack.hpp index eadb844f5c4..02a2509030e 100644 --- a/src/model/AirflowNetworkCrack.hpp +++ b/src/model/AirflowNetworkCrack.hpp @@ -36,7 +36,7 @@ namespace model { AirflowNetworkCrack(const Model& model, double massFlowCoefficient, double massFlowExponent, const AirflowNetworkReferenceCrackConditions& referenceCrackConditions); - virtual ~AirflowNetworkCrack() = default; + virtual ~AirflowNetworkCrack() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkCrack(const AirflowNetworkCrack& other) = default; AirflowNetworkCrack(AirflowNetworkCrack&& other) = default; diff --git a/src/model/AirflowNetworkCrack_Impl.hpp b/src/model/AirflowNetworkCrack_Impl.hpp index 035498dfbfb..188211d129b 100644 --- a/src/model/AirflowNetworkCrack_Impl.hpp +++ b/src/model/AirflowNetworkCrack_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AirflowNetworkCrack_Impl(const AirflowNetworkCrack_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkCrack_Impl() = default; + virtual ~AirflowNetworkCrack_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkDetailedOpening.cpp b/src/model/AirflowNetworkDetailedOpening.cpp index 0aeb07a452f..41169cc3758 100644 --- a/src/model/AirflowNetworkDetailedOpening.cpp +++ b/src/model/AirflowNetworkDetailedOpening.cpp @@ -211,7 +211,7 @@ namespace model { OS_ASSERT(result); } - bool AirflowNetworkDetailedOpening_Impl::setOpeningFactors(std::vector& factors) { + bool AirflowNetworkDetailedOpening_Impl::setOpeningFactors(const std::vector& factors) { // Number of Sets of Opening Factor Data if (factors.size() < 2) { LOG(Error, "Insufficient data in opening factors vector, minimum number of factors is 2"); @@ -254,7 +254,7 @@ namespace model { double massFlowExponentWhenOpeningisClosed, const std::string& typeofRectangularLargeVerticalOpening, double extraCrackLengthorHeightofPivotingAxis, - std::vector& openingFactors) + const std::vector& openingFactors) : AirflowNetworkComponent(AirflowNetworkDetailedOpening::iddObjectType(), model) { OS_ASSERT(getImpl()); @@ -271,7 +271,7 @@ namespace model { } AirflowNetworkDetailedOpening::AirflowNetworkDetailedOpening(const Model& model, double massFlowCoefficientWhenOpeningisClosed, - std::vector& openingFactors) + const std::vector& openingFactors) : AirflowNetworkComponent(AirflowNetworkDetailedOpening::iddObjectType(), model) { OS_ASSERT(getImpl()); @@ -351,13 +351,13 @@ namespace model { getImpl()->resetExtraCrackLengthorHeightofPivotingAxis(); } - bool AirflowNetworkDetailedOpening::setOpeningFactors(std::vector& factors) { + bool AirflowNetworkDetailedOpening::setOpeningFactors(const std::vector& factors) { return getImpl()->setOpeningFactors(factors); } /// @cond AirflowNetworkDetailedOpening::AirflowNetworkDetailedOpening(std::shared_ptr impl) - : AirflowNetworkComponent(impl) {} + : AirflowNetworkComponent(std::move(impl)) {} /// @endcond } // namespace model diff --git a/src/model/AirflowNetworkDetailedOpening.hpp b/src/model/AirflowNetworkDetailedOpening.hpp index b64a9d75da4..c3366175ce9 100644 --- a/src/model/AirflowNetworkDetailedOpening.hpp +++ b/src/model/AirflowNetworkDetailedOpening.hpp @@ -82,12 +82,12 @@ namespace model { /** Construct a detailed opening object. */ AirflowNetworkDetailedOpening(const Model& model, double massFlowCoefficientWhenOpeningisClosed, double massFlowExponentWhenOpeningisClosed, const std::string& typeofRectangularLargeVerticalOpening, double extraCrackLengthorHeightofPivotingAxis, - std::vector& openingFactors); + const std::vector& openingFactors); /** Construct a detailed opening object with defaulted values. */ AirflowNetworkDetailedOpening(const Model& model, double massFlowCoefficientWhenOpeningisClosed, - std::vector& openingFactors); + const std::vector& openingFactors); - virtual ~AirflowNetworkDetailedOpening() = default; + virtual ~AirflowNetworkDetailedOpening() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkDetailedOpening(const AirflowNetworkDetailedOpening& other) = default; AirflowNetworkDetailedOpening(AirflowNetworkDetailedOpening&& other) = default; @@ -137,7 +137,7 @@ namespace model { /** Resets the extra crack length or height of pivoting axis. */ void resetExtraCrackLengthorHeightofPivotingAxis(); /** Sets the opening factor data. */ - bool setOpeningFactors(std::vector& factors); + bool setOpeningFactors(const std::vector& factors); //@} protected: diff --git a/src/model/AirflowNetworkDetailedOpening_Impl.hpp b/src/model/AirflowNetworkDetailedOpening_Impl.hpp index 682532ee9da..173347dda22 100644 --- a/src/model/AirflowNetworkDetailedOpening_Impl.hpp +++ b/src/model/AirflowNetworkDetailedOpening_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirflowNetworkDetailedOpening_Impl(const AirflowNetworkDetailedOpening_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkDetailedOpening_Impl() = default; + virtual ~AirflowNetworkDetailedOpening_Impl() override = default; //@} /** @name Virtual Methods */ @@ -78,7 +78,7 @@ namespace model { void resetExtraCrackLengthorHeightofPivotingAxis(); - bool setOpeningFactors(std::vector& factors); + bool setOpeningFactors(const std::vector& factors); //@} protected: diff --git a/src/model/AirflowNetworkDistributionLinkage.hpp b/src/model/AirflowNetworkDistributionLinkage.hpp index 4c187526b24..99ca098702f 100644 --- a/src/model/AirflowNetworkDistributionLinkage.hpp +++ b/src/model/AirflowNetworkDistributionLinkage.hpp @@ -36,7 +36,7 @@ namespace model { AirflowNetworkDistributionLinkage(const Model& model, const AirflowNetworkNode& node1, const AirflowNetworkNode& node2, const AirflowNetworkComponent& component); - virtual ~AirflowNetworkDistributionLinkage() = default; + virtual ~AirflowNetworkDistributionLinkage() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkDistributionLinkage(const AirflowNetworkDistributionLinkage& other) = default; AirflowNetworkDistributionLinkage(AirflowNetworkDistributionLinkage&& other) = default; diff --git a/src/model/AirflowNetworkDistributionLinkage_Impl.hpp b/src/model/AirflowNetworkDistributionLinkage_Impl.hpp index 0ba48166cc4..f65a2f49468 100644 --- a/src/model/AirflowNetworkDistributionLinkage_Impl.hpp +++ b/src/model/AirflowNetworkDistributionLinkage_Impl.hpp @@ -33,7 +33,7 @@ namespace model { AirflowNetworkDistributionLinkage_Impl(const AirflowNetworkDistributionLinkage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkDistributionLinkage_Impl() = default; + virtual ~AirflowNetworkDistributionLinkage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkDistributionNode.hpp b/src/model/AirflowNetworkDistributionNode.hpp index f3065677ffa..5e344beeb6f 100644 --- a/src/model/AirflowNetworkDistributionNode.hpp +++ b/src/model/AirflowNetworkDistributionNode.hpp @@ -41,7 +41,7 @@ namespace model { AirflowNetworkDistributionNode(const Model& model); - virtual ~AirflowNetworkDistributionNode() = default; + virtual ~AirflowNetworkDistributionNode() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkDistributionNode(const AirflowNetworkDistributionNode& other) = default; AirflowNetworkDistributionNode(AirflowNetworkDistributionNode&& other) = default; diff --git a/src/model/AirflowNetworkDistributionNode_Impl.hpp b/src/model/AirflowNetworkDistributionNode_Impl.hpp index 4af4e539198..16297932c46 100644 --- a/src/model/AirflowNetworkDistributionNode_Impl.hpp +++ b/src/model/AirflowNetworkDistributionNode_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirflowNetworkDistributionNode_Impl(const AirflowNetworkDistributionNode_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkDistributionNode_Impl() = default; + virtual ~AirflowNetworkDistributionNode_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkDuct.hpp b/src/model/AirflowNetworkDuct.hpp index ebcb0cd00b7..6b3ac500662 100644 --- a/src/model/AirflowNetworkDuct.hpp +++ b/src/model/AirflowNetworkDuct.hpp @@ -28,7 +28,7 @@ namespace model { explicit AirflowNetworkDuct(const Model& model); - virtual ~AirflowNetworkDuct() = default; + virtual ~AirflowNetworkDuct() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkDuct(const AirflowNetworkDuct& other) = default; AirflowNetworkDuct(AirflowNetworkDuct&& other) = default; diff --git a/src/model/AirflowNetworkDuctViewFactors.hpp b/src/model/AirflowNetworkDuctViewFactors.hpp index f05571be816..0c7e9d11221 100644 --- a/src/model/AirflowNetworkDuctViewFactors.hpp +++ b/src/model/AirflowNetworkDuctViewFactors.hpp @@ -50,7 +50,7 @@ namespace model { explicit AirflowNetworkDuctViewFactors(const Model& model); - virtual ~AirflowNetworkDuctViewFactors() = default; + virtual ~AirflowNetworkDuctViewFactors() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkDuctViewFactors(const AirflowNetworkDuctViewFactors& other) = default; AirflowNetworkDuctViewFactors(AirflowNetworkDuctViewFactors&& other) = default; diff --git a/src/model/AirflowNetworkDuctViewFactors_Impl.hpp b/src/model/AirflowNetworkDuctViewFactors_Impl.hpp index 701d3164784..89091cf6151 100644 --- a/src/model/AirflowNetworkDuctViewFactors_Impl.hpp +++ b/src/model/AirflowNetworkDuctViewFactors_Impl.hpp @@ -32,7 +32,7 @@ namespace model { AirflowNetworkDuctViewFactors_Impl(const AirflowNetworkDuctViewFactors_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkDuctViewFactors_Impl() = default; + virtual ~AirflowNetworkDuctViewFactors_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkDuct_Impl.hpp b/src/model/AirflowNetworkDuct_Impl.hpp index 33016830cd6..15b7ddd0e9b 100644 --- a/src/model/AirflowNetworkDuct_Impl.hpp +++ b/src/model/AirflowNetworkDuct_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkDuct_Impl(const AirflowNetworkDuct_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkDuct_Impl() = default; + virtual ~AirflowNetworkDuct_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkEffectiveLeakageArea.hpp b/src/model/AirflowNetworkEffectiveLeakageArea.hpp index 0dedffb7fd5..e0b9e473731 100644 --- a/src/model/AirflowNetworkEffectiveLeakageArea.hpp +++ b/src/model/AirflowNetworkEffectiveLeakageArea.hpp @@ -32,7 +32,7 @@ namespace model { AirflowNetworkEffectiveLeakageArea(const Model& model, double effectiveLeakageArea, double dischargeCoefficient, double referencePressureDifference, double massFlowExponent); - virtual ~AirflowNetworkEffectiveLeakageArea() = default; + virtual ~AirflowNetworkEffectiveLeakageArea() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkEffectiveLeakageArea(const AirflowNetworkEffectiveLeakageArea& other) = default; AirflowNetworkEffectiveLeakageArea(AirflowNetworkEffectiveLeakageArea&& other) = default; diff --git a/src/model/AirflowNetworkEffectiveLeakageArea_Impl.hpp b/src/model/AirflowNetworkEffectiveLeakageArea_Impl.hpp index a98da21f06e..f55762eed37 100644 --- a/src/model/AirflowNetworkEffectiveLeakageArea_Impl.hpp +++ b/src/model/AirflowNetworkEffectiveLeakageArea_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkEffectiveLeakageArea_Impl(const AirflowNetworkEffectiveLeakageArea_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkEffectiveLeakageArea_Impl() = default; + virtual ~AirflowNetworkEffectiveLeakageArea_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkEquivalentDuct.hpp b/src/model/AirflowNetworkEquivalentDuct.hpp index 0b144dd93a2..dc8b73902fc 100644 --- a/src/model/AirflowNetworkEquivalentDuct.hpp +++ b/src/model/AirflowNetworkEquivalentDuct.hpp @@ -49,7 +49,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~AirflowNetworkEquivalentDuct() = default; + virtual ~AirflowNetworkEquivalentDuct() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkEquivalentDuct(const AirflowNetworkEquivalentDuct& other) = default; AirflowNetworkEquivalentDuct(AirflowNetworkEquivalentDuct&& other) = default; diff --git a/src/model/AirflowNetworkEquivalentDuct_Impl.hpp b/src/model/AirflowNetworkEquivalentDuct_Impl.hpp index 54c272c8030..5bfc9ed33d1 100644 --- a/src/model/AirflowNetworkEquivalentDuct_Impl.hpp +++ b/src/model/AirflowNetworkEquivalentDuct_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AirflowNetworkEquivalentDuct_Impl(const AirflowNetworkEquivalentDuct_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkEquivalentDuct_Impl() = default; + virtual ~AirflowNetworkEquivalentDuct_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkExternalNode.hpp b/src/model/AirflowNetworkExternalNode.hpp index 1dda612fe79..e508d8d6d2a 100644 --- a/src/model/AirflowNetworkExternalNode.hpp +++ b/src/model/AirflowNetworkExternalNode.hpp @@ -33,7 +33,7 @@ namespace model { /** Construct an external node with a specified wind pressure curve. */ explicit AirflowNetworkExternalNode(const Model& model, const Curve& curve); - virtual ~AirflowNetworkExternalNode() = default; + virtual ~AirflowNetworkExternalNode() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkExternalNode(const AirflowNetworkExternalNode& other) = default; AirflowNetworkExternalNode(AirflowNetworkExternalNode&& other) = default; diff --git a/src/model/AirflowNetworkExternalNode_Impl.hpp b/src/model/AirflowNetworkExternalNode_Impl.hpp index 3e3736ba2b4..ad8a5da2e64 100644 --- a/src/model/AirflowNetworkExternalNode_Impl.hpp +++ b/src/model/AirflowNetworkExternalNode_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirflowNetworkExternalNode_Impl(const AirflowNetworkExternalNode_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkExternalNode_Impl() = default; + virtual ~AirflowNetworkExternalNode_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkFan.hpp b/src/model/AirflowNetworkFan.hpp index bb2326d32e1..05592a888a1 100644 --- a/src/model/AirflowNetworkFan.hpp +++ b/src/model/AirflowNetworkFan.hpp @@ -35,7 +35,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~AirflowNetworkFan() = default; + virtual ~AirflowNetworkFan() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkFan(const AirflowNetworkFan& other) = default; AirflowNetworkFan(AirflowNetworkFan&& other) = default; diff --git a/src/model/AirflowNetworkFan_Impl.hpp b/src/model/AirflowNetworkFan_Impl.hpp index bb4480ceff8..53ac322d0cd 100644 --- a/src/model/AirflowNetworkFan_Impl.hpp +++ b/src/model/AirflowNetworkFan_Impl.hpp @@ -33,7 +33,7 @@ namespace model { AirflowNetworkFan_Impl(const AirflowNetworkFan_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkFan_Impl() = default; + virtual ~AirflowNetworkFan_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkHorizontalOpening.hpp b/src/model/AirflowNetworkHorizontalOpening.hpp index 799fe78932a..cfc03f63354 100644 --- a/src/model/AirflowNetworkHorizontalOpening.hpp +++ b/src/model/AirflowNetworkHorizontalOpening.hpp @@ -31,7 +31,7 @@ namespace model { AirflowNetworkHorizontalOpening(const Model& model, double massFlowCoefficientWhenOpeningisClosed, double massFlowExponentWhenOpeningisClosed, double slopingPlaneAngle, double dischargeCoefficient); - virtual ~AirflowNetworkHorizontalOpening() = default; + virtual ~AirflowNetworkHorizontalOpening() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkHorizontalOpening(const AirflowNetworkHorizontalOpening& other) = default; AirflowNetworkHorizontalOpening(AirflowNetworkHorizontalOpening&& other) = default; diff --git a/src/model/AirflowNetworkHorizontalOpening_Impl.hpp b/src/model/AirflowNetworkHorizontalOpening_Impl.hpp index 8f53fff8c4d..aa306d6c1fc 100644 --- a/src/model/AirflowNetworkHorizontalOpening_Impl.hpp +++ b/src/model/AirflowNetworkHorizontalOpening_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkHorizontalOpening_Impl(const AirflowNetworkHorizontalOpening_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkHorizontalOpening_Impl() = default; + virtual ~AirflowNetworkHorizontalOpening_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkLeakageRatio.hpp b/src/model/AirflowNetworkLeakageRatio.hpp index 286355a32ad..b3c4b9a4fea 100644 --- a/src/model/AirflowNetworkLeakageRatio.hpp +++ b/src/model/AirflowNetworkLeakageRatio.hpp @@ -28,7 +28,7 @@ namespace model { explicit AirflowNetworkLeakageRatio(const Model& model); - virtual ~AirflowNetworkLeakageRatio() = default; + virtual ~AirflowNetworkLeakageRatio() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkLeakageRatio(const AirflowNetworkLeakageRatio& other) = default; AirflowNetworkLeakageRatio(AirflowNetworkLeakageRatio&& other) = default; diff --git a/src/model/AirflowNetworkLeakageRatio_Impl.hpp b/src/model/AirflowNetworkLeakageRatio_Impl.hpp index cbb3d62c89f..9b30a1c185f 100644 --- a/src/model/AirflowNetworkLeakageRatio_Impl.hpp +++ b/src/model/AirflowNetworkLeakageRatio_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkLeakageRatio_Impl(const AirflowNetworkLeakageRatio_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkLeakageRatio_Impl() = default; + virtual ~AirflowNetworkLeakageRatio_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkLinkage.hpp b/src/model/AirflowNetworkLinkage.hpp index e5a3b6a88a7..a500d02501e 100644 --- a/src/model/AirflowNetworkLinkage.hpp +++ b/src/model/AirflowNetworkLinkage.hpp @@ -28,7 +28,7 @@ namespace model { AirflowNetworkLinkage(IddObjectType type, const Model& model); - virtual ~AirflowNetworkLinkage() = default; + virtual ~AirflowNetworkLinkage() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkLinkage(const AirflowNetworkLinkage& other) = default; AirflowNetworkLinkage(AirflowNetworkLinkage&& other) = default; diff --git a/src/model/AirflowNetworkLinkage_Impl.hpp b/src/model/AirflowNetworkLinkage_Impl.hpp index 5569b947be2..bc59defd3e1 100644 --- a/src/model/AirflowNetworkLinkage_Impl.hpp +++ b/src/model/AirflowNetworkLinkage_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkLinkage_Impl(const AirflowNetworkLinkage_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~AirflowNetworkLinkage_Impl() = default; + virtual ~AirflowNetworkLinkage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkNode.hpp b/src/model/AirflowNetworkNode.hpp index 70bb8cad1e7..81f424c5ccb 100644 --- a/src/model/AirflowNetworkNode.hpp +++ b/src/model/AirflowNetworkNode.hpp @@ -25,7 +25,7 @@ namespace model { public: AirflowNetworkNode(IddObjectType type, const Model& model); - virtual ~AirflowNetworkNode() = default; + virtual ~AirflowNetworkNode() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkNode(const AirflowNetworkNode& other) = default; AirflowNetworkNode(AirflowNetworkNode&& other) = default; diff --git a/src/model/AirflowNetworkNode_Impl.hpp b/src/model/AirflowNetworkNode_Impl.hpp index 51420e43d65..6ccf3c98b5d 100644 --- a/src/model/AirflowNetworkNode_Impl.hpp +++ b/src/model/AirflowNetworkNode_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AirflowNetworkNode_Impl(const AirflowNetworkNode_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~AirflowNetworkNode_Impl() = default; + virtual ~AirflowNetworkNode_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkOccupantVentilationControl.hpp b/src/model/AirflowNetworkOccupantVentilationControl.hpp index baf1c39ff66..88e75ab6524 100644 --- a/src/model/AirflowNetworkOccupantVentilationControl.hpp +++ b/src/model/AirflowNetworkOccupantVentilationControl.hpp @@ -34,7 +34,7 @@ namespace model { /** Construct an occupant ventilation control object with a low temperature curve. */ AirflowNetworkOccupantVentilationControl(const Model& model, const Curve& curve); - virtual ~AirflowNetworkOccupantVentilationControl() = default; + virtual ~AirflowNetworkOccupantVentilationControl() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkOccupantVentilationControl(const AirflowNetworkOccupantVentilationControl& other) = default; AirflowNetworkOccupantVentilationControl(AirflowNetworkOccupantVentilationControl&& other) = default; diff --git a/src/model/AirflowNetworkOccupantVentilationControl_Impl.hpp b/src/model/AirflowNetworkOccupantVentilationControl_Impl.hpp index 58a76f01557..1ac2ed673d6 100644 --- a/src/model/AirflowNetworkOccupantVentilationControl_Impl.hpp +++ b/src/model/AirflowNetworkOccupantVentilationControl_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirflowNetworkOccupantVentilationControl_Impl(const AirflowNetworkOccupantVentilationControl_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkOccupantVentilationControl_Impl() = default; + virtual ~AirflowNetworkOccupantVentilationControl_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkOutdoorAirflow.hpp b/src/model/AirflowNetworkOutdoorAirflow.hpp index dba1f4543a5..2a26984c142 100644 --- a/src/model/AirflowNetworkOutdoorAirflow.hpp +++ b/src/model/AirflowNetworkOutdoorAirflow.hpp @@ -29,7 +29,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~AirflowNetworkOutdoorAirflow() = default; + virtual ~AirflowNetworkOutdoorAirflow() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkOutdoorAirflow(const AirflowNetworkOutdoorAirflow& other) = default; AirflowNetworkOutdoorAirflow(AirflowNetworkOutdoorAirflow&& other) = default; diff --git a/src/model/AirflowNetworkOutdoorAirflow_Impl.hpp b/src/model/AirflowNetworkOutdoorAirflow_Impl.hpp index f4482b441d1..384b7c325ae 100644 --- a/src/model/AirflowNetworkOutdoorAirflow_Impl.hpp +++ b/src/model/AirflowNetworkOutdoorAirflow_Impl.hpp @@ -31,7 +31,7 @@ namespace model { AirflowNetworkOutdoorAirflow_Impl(const AirflowNetworkOutdoorAirflow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkOutdoorAirflow_Impl() = default; + virtual ~AirflowNetworkOutdoorAirflow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkReferenceCrackConditions.hpp b/src/model/AirflowNetworkReferenceCrackConditions.hpp index 189feda4462..8fb167fa737 100644 --- a/src/model/AirflowNetworkReferenceCrackConditions.hpp +++ b/src/model/AirflowNetworkReferenceCrackConditions.hpp @@ -30,7 +30,7 @@ namespace model { /** Construct a reference crack conditions object with specified temperature, pressure, and barometric pressure. */ AirflowNetworkReferenceCrackConditions(const Model& model, double temperature, double barometricPressure, double humidityRatio); - virtual ~AirflowNetworkReferenceCrackConditions() = default; + virtual ~AirflowNetworkReferenceCrackConditions() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkReferenceCrackConditions(const AirflowNetworkReferenceCrackConditions& other) = default; AirflowNetworkReferenceCrackConditions(AirflowNetworkReferenceCrackConditions&& other) = default; diff --git a/src/model/AirflowNetworkReferenceCrackConditions_Impl.hpp b/src/model/AirflowNetworkReferenceCrackConditions_Impl.hpp index 25aa46b7d1f..3cdde355b3e 100644 --- a/src/model/AirflowNetworkReferenceCrackConditions_Impl.hpp +++ b/src/model/AirflowNetworkReferenceCrackConditions_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkReferenceCrackConditions_Impl(const AirflowNetworkReferenceCrackConditions_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkReferenceCrackConditions_Impl() = default; + virtual ~AirflowNetworkReferenceCrackConditions_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkSimpleOpening.hpp b/src/model/AirflowNetworkSimpleOpening.hpp index b3c4792bf33..9a205336357 100644 --- a/src/model/AirflowNetworkSimpleOpening.hpp +++ b/src/model/AirflowNetworkSimpleOpening.hpp @@ -33,7 +33,7 @@ namespace model { AirflowNetworkSimpleOpening(const Model& model, double massFlowCoefficientWhenOpeningisClosed, double massFlowExponentWhenOpeningisClosed, double minimumDensityDifferenceforTwoWayFlow, double dischargeCoefficient); - virtual ~AirflowNetworkSimpleOpening() = default; + virtual ~AirflowNetworkSimpleOpening() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkSimpleOpening(const AirflowNetworkSimpleOpening& other) = default; AirflowNetworkSimpleOpening(AirflowNetworkSimpleOpening&& other) = default; diff --git a/src/model/AirflowNetworkSimpleOpening_Impl.hpp b/src/model/AirflowNetworkSimpleOpening_Impl.hpp index fda8f2f04f1..99e4e3fc4f0 100644 --- a/src/model/AirflowNetworkSimpleOpening_Impl.hpp +++ b/src/model/AirflowNetworkSimpleOpening_Impl.hpp @@ -28,7 +28,7 @@ namespace model { AirflowNetworkSimpleOpening_Impl(const AirflowNetworkSimpleOpening_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkSimpleOpening_Impl() = default; + virtual ~AirflowNetworkSimpleOpening_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkSimulationControl.hpp b/src/model/AirflowNetworkSimulationControl.hpp index 0b811a57dc1..2a3226bc3b8 100644 --- a/src/model/AirflowNetworkSimulationControl.hpp +++ b/src/model/AirflowNetworkSimulationControl.hpp @@ -28,7 +28,7 @@ namespace model { class MODEL_API AirflowNetworkSimulationControl : public ParentObject { public: - virtual ~AirflowNetworkSimulationControl() = default; + virtual ~AirflowNetworkSimulationControl() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkSimulationControl(const AirflowNetworkSimulationControl& other) = default; AirflowNetworkSimulationControl(AirflowNetworkSimulationControl&& other) = default; diff --git a/src/model/AirflowNetworkSimulationControl_Impl.hpp b/src/model/AirflowNetworkSimulationControl_Impl.hpp index 31598d6634e..3ee2ad44bde 100644 --- a/src/model/AirflowNetworkSimulationControl_Impl.hpp +++ b/src/model/AirflowNetworkSimulationControl_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirflowNetworkSimulationControl_Impl(const AirflowNetworkSimulationControl_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~AirflowNetworkSimulationControl_Impl() = default; + virtual ~AirflowNetworkSimulationControl_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkSpecifiedFlowRate.hpp b/src/model/AirflowNetworkSpecifiedFlowRate.hpp index 4cf62afdaab..951abc5e178 100644 --- a/src/model/AirflowNetworkSpecifiedFlowRate.hpp +++ b/src/model/AirflowNetworkSpecifiedFlowRate.hpp @@ -31,7 +31,7 @@ namespace model { /** Construct a specified flow rate object with a specified airflow value. */ AirflowNetworkSpecifiedFlowRate(const Model& model, double airFlowValue); - virtual ~AirflowNetworkSpecifiedFlowRate() = default; + virtual ~AirflowNetworkSpecifiedFlowRate() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkSpecifiedFlowRate(const AirflowNetworkSpecifiedFlowRate& other) = default; AirflowNetworkSpecifiedFlowRate(AirflowNetworkSpecifiedFlowRate&& other) = default; diff --git a/src/model/AirflowNetworkSpecifiedFlowRate_Impl.hpp b/src/model/AirflowNetworkSpecifiedFlowRate_Impl.hpp index e7bff6e9560..af08f951ec6 100644 --- a/src/model/AirflowNetworkSpecifiedFlowRate_Impl.hpp +++ b/src/model/AirflowNetworkSpecifiedFlowRate_Impl.hpp @@ -27,7 +27,7 @@ namespace model { AirflowNetworkSpecifiedFlowRate_Impl(const AirflowNetworkSpecifiedFlowRate_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkSpecifiedFlowRate_Impl() = default; + virtual ~AirflowNetworkSpecifiedFlowRate_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkSurface.hpp b/src/model/AirflowNetworkSurface.hpp index b0d8b7cb903..ae20e8a8158 100644 --- a/src/model/AirflowNetworkSurface.hpp +++ b/src/model/AirflowNetworkSurface.hpp @@ -46,7 +46,7 @@ namespace model { /** Construct a surface with a model subsurface to be linked to and a leakage component. */ //AirflowNetworkSurface(const Model& model, const SubSurface &surface, const AirflowNetworkComponent &component); - virtual ~AirflowNetworkSurface() = default; + virtual ~AirflowNetworkSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkSurface(const AirflowNetworkSurface& other) = default; AirflowNetworkSurface(AirflowNetworkSurface&& other) = default; diff --git a/src/model/AirflowNetworkSurface_Impl.hpp b/src/model/AirflowNetworkSurface_Impl.hpp index 4ec52073d45..47d6b05a29c 100644 --- a/src/model/AirflowNetworkSurface_Impl.hpp +++ b/src/model/AirflowNetworkSurface_Impl.hpp @@ -33,7 +33,7 @@ namespace model { AirflowNetworkSurface_Impl(const AirflowNetworkSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkSurface_Impl() = default; + virtual ~AirflowNetworkSurface_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkZone.hpp b/src/model/AirflowNetworkZone.hpp index d0779671e65..7e303c90f4c 100644 --- a/src/model/AirflowNetworkZone.hpp +++ b/src/model/AirflowNetworkZone.hpp @@ -34,7 +34,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~AirflowNetworkZone() = default; + virtual ~AirflowNetworkZone() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkZone(const AirflowNetworkZone& other) = default; AirflowNetworkZone(AirflowNetworkZone&& other) = default; diff --git a/src/model/AirflowNetworkZoneExhaustFan.hpp b/src/model/AirflowNetworkZoneExhaustFan.hpp index 8d5c1c3e0db..7ab5b71964c 100644 --- a/src/model/AirflowNetworkZoneExhaustFan.hpp +++ b/src/model/AirflowNetworkZoneExhaustFan.hpp @@ -29,7 +29,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~AirflowNetworkZoneExhaustFan() = default; + virtual ~AirflowNetworkZoneExhaustFan() override = default; // Default the copy and move operators because the virtual dtor is explicit AirflowNetworkZoneExhaustFan(const AirflowNetworkZoneExhaustFan& other) = default; AirflowNetworkZoneExhaustFan(AirflowNetworkZoneExhaustFan&& other) = default; diff --git a/src/model/AirflowNetworkZoneExhaustFan_Impl.hpp b/src/model/AirflowNetworkZoneExhaustFan_Impl.hpp index 94a7fa667a0..8816903b149 100644 --- a/src/model/AirflowNetworkZoneExhaustFan_Impl.hpp +++ b/src/model/AirflowNetworkZoneExhaustFan_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AirflowNetworkZoneExhaustFan_Impl(const AirflowNetworkZoneExhaustFan_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkZoneExhaustFan_Impl() = default; + virtual ~AirflowNetworkZoneExhaustFan_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AirflowNetworkZone_Impl.hpp b/src/model/AirflowNetworkZone_Impl.hpp index 29f03363e99..1e2d50b9ad4 100644 --- a/src/model/AirflowNetworkZone_Impl.hpp +++ b/src/model/AirflowNetworkZone_Impl.hpp @@ -32,7 +32,7 @@ namespace model { AirflowNetworkZone_Impl(const AirflowNetworkZone_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AirflowNetworkZone_Impl() = default; + virtual ~AirflowNetworkZone_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManager.hpp b/src/model/AvailabilityManager.hpp index cc6e5bc3969..754842efc12 100644 --- a/src/model/AvailabilityManager.hpp +++ b/src/model/AvailabilityManager.hpp @@ -24,7 +24,7 @@ namespace model { public: AvailabilityManager(IddObjectType type, const Model& model); - virtual ~AvailabilityManager() = default; + virtual ~AvailabilityManager() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManager(const AvailabilityManager& other) = default; AvailabilityManager(AvailabilityManager&& other) = default; diff --git a/src/model/AvailabilityManagerAssignmentList.hpp b/src/model/AvailabilityManagerAssignmentList.hpp index df53e0def8f..515fd5b8144 100644 --- a/src/model/AvailabilityManagerAssignmentList.hpp +++ b/src/model/AvailabilityManagerAssignmentList.hpp @@ -39,7 +39,7 @@ namespace model { */ explicit AvailabilityManagerAssignmentList(const Loop& loop); - virtual ~AvailabilityManagerAssignmentList() = default; + virtual ~AvailabilityManagerAssignmentList() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerAssignmentList(const AvailabilityManagerAssignmentList& other) = default; AvailabilityManagerAssignmentList(AvailabilityManagerAssignmentList&& other) = default; diff --git a/src/model/AvailabilityManagerAssignmentList_Impl.hpp b/src/model/AvailabilityManagerAssignmentList_Impl.hpp index fefef900149..44b440a1a88 100644 --- a/src/model/AvailabilityManagerAssignmentList_Impl.hpp +++ b/src/model/AvailabilityManagerAssignmentList_Impl.hpp @@ -34,7 +34,7 @@ namespace model { AvailabilityManagerAssignmentList_Impl(const AvailabilityManagerAssignmentList_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerAssignmentList_Impl() = default; + virtual ~AvailabilityManagerAssignmentList_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerDifferentialThermostat.hpp b/src/model/AvailabilityManagerDifferentialThermostat.hpp index af24dd272c3..a7eb8a221e5 100644 --- a/src/model/AvailabilityManagerDifferentialThermostat.hpp +++ b/src/model/AvailabilityManagerDifferentialThermostat.hpp @@ -30,7 +30,7 @@ namespace model { explicit AvailabilityManagerDifferentialThermostat(const Model& model); - virtual ~AvailabilityManagerDifferentialThermostat() = default; + virtual ~AvailabilityManagerDifferentialThermostat() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerDifferentialThermostat(const AvailabilityManagerDifferentialThermostat& other) = default; AvailabilityManagerDifferentialThermostat(AvailabilityManagerDifferentialThermostat&& other) = default; diff --git a/src/model/AvailabilityManagerDifferentialThermostat_Impl.hpp b/src/model/AvailabilityManagerDifferentialThermostat_Impl.hpp index fece329b521..4cd5c281527 100644 --- a/src/model/AvailabilityManagerDifferentialThermostat_Impl.hpp +++ b/src/model/AvailabilityManagerDifferentialThermostat_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerDifferentialThermostat_Impl(const AvailabilityManagerDifferentialThermostat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerDifferentialThermostat_Impl() = default; + virtual ~AvailabilityManagerDifferentialThermostat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerHighTemperatureTurnOff.hpp b/src/model/AvailabilityManagerHighTemperatureTurnOff.hpp index d08a6c92849..a3874d06b5d 100644 --- a/src/model/AvailabilityManagerHighTemperatureTurnOff.hpp +++ b/src/model/AvailabilityManagerHighTemperatureTurnOff.hpp @@ -30,7 +30,7 @@ namespace model { explicit AvailabilityManagerHighTemperatureTurnOff(const Model& model); - virtual ~AvailabilityManagerHighTemperatureTurnOff() = default; + virtual ~AvailabilityManagerHighTemperatureTurnOff() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerHighTemperatureTurnOff(const AvailabilityManagerHighTemperatureTurnOff& other) = default; AvailabilityManagerHighTemperatureTurnOff(AvailabilityManagerHighTemperatureTurnOff&& other) = default; diff --git a/src/model/AvailabilityManagerHighTemperatureTurnOff_Impl.hpp b/src/model/AvailabilityManagerHighTemperatureTurnOff_Impl.hpp index 442b5d27ae1..2d0dd4bbb3c 100644 --- a/src/model/AvailabilityManagerHighTemperatureTurnOff_Impl.hpp +++ b/src/model/AvailabilityManagerHighTemperatureTurnOff_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerHighTemperatureTurnOff_Impl(const AvailabilityManagerHighTemperatureTurnOff_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerHighTemperatureTurnOff_Impl() = default; + virtual ~AvailabilityManagerHighTemperatureTurnOff_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerHighTemperatureTurnOn.hpp b/src/model/AvailabilityManagerHighTemperatureTurnOn.hpp index 4ffbf739e98..688e00fb467 100644 --- a/src/model/AvailabilityManagerHighTemperatureTurnOn.hpp +++ b/src/model/AvailabilityManagerHighTemperatureTurnOn.hpp @@ -30,7 +30,7 @@ namespace model { explicit AvailabilityManagerHighTemperatureTurnOn(const Model& model); - virtual ~AvailabilityManagerHighTemperatureTurnOn() = default; + virtual ~AvailabilityManagerHighTemperatureTurnOn() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerHighTemperatureTurnOn(const AvailabilityManagerHighTemperatureTurnOn& other) = default; AvailabilityManagerHighTemperatureTurnOn(AvailabilityManagerHighTemperatureTurnOn&& other) = default; diff --git a/src/model/AvailabilityManagerHighTemperatureTurnOn_Impl.hpp b/src/model/AvailabilityManagerHighTemperatureTurnOn_Impl.hpp index 09d5180cf5f..9ffd89274cd 100644 --- a/src/model/AvailabilityManagerHighTemperatureTurnOn_Impl.hpp +++ b/src/model/AvailabilityManagerHighTemperatureTurnOn_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerHighTemperatureTurnOn_Impl(const AvailabilityManagerHighTemperatureTurnOn_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerHighTemperatureTurnOn_Impl() = default; + virtual ~AvailabilityManagerHighTemperatureTurnOn_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerHybridVentilation.hpp b/src/model/AvailabilityManagerHybridVentilation.hpp index 8377122e799..04204c61050 100644 --- a/src/model/AvailabilityManagerHybridVentilation.hpp +++ b/src/model/AvailabilityManagerHybridVentilation.hpp @@ -46,7 +46,7 @@ namespace model { explicit AvailabilityManagerHybridVentilation(const Model& model, Schedule& ventilationControlModeSchedule, Schedule& minimumOutdoorVentilationAirSchedule); - virtual ~AvailabilityManagerHybridVentilation() = default; + virtual ~AvailabilityManagerHybridVentilation() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerHybridVentilation(const AvailabilityManagerHybridVentilation& other) = default; AvailabilityManagerHybridVentilation(AvailabilityManagerHybridVentilation&& other) = default; diff --git a/src/model/AvailabilityManagerHybridVentilation_Impl.hpp b/src/model/AvailabilityManagerHybridVentilation_Impl.hpp index d7ff35c0bc4..e4c5d279697 100644 --- a/src/model/AvailabilityManagerHybridVentilation_Impl.hpp +++ b/src/model/AvailabilityManagerHybridVentilation_Impl.hpp @@ -32,7 +32,7 @@ namespace model { AvailabilityManagerHybridVentilation_Impl(const AvailabilityManagerHybridVentilation_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerHybridVentilation_Impl() = default; + virtual ~AvailabilityManagerHybridVentilation_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerLowTemperatureTurnOff.hpp b/src/model/AvailabilityManagerLowTemperatureTurnOff.hpp index 0d74ee932a9..23d713448cd 100644 --- a/src/model/AvailabilityManagerLowTemperatureTurnOff.hpp +++ b/src/model/AvailabilityManagerLowTemperatureTurnOff.hpp @@ -31,7 +31,7 @@ namespace model { explicit AvailabilityManagerLowTemperatureTurnOff(const Model& model); - virtual ~AvailabilityManagerLowTemperatureTurnOff() = default; + virtual ~AvailabilityManagerLowTemperatureTurnOff() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerLowTemperatureTurnOff(const AvailabilityManagerLowTemperatureTurnOff& other) = default; AvailabilityManagerLowTemperatureTurnOff(AvailabilityManagerLowTemperatureTurnOff&& other) = default; diff --git a/src/model/AvailabilityManagerLowTemperatureTurnOff_Impl.hpp b/src/model/AvailabilityManagerLowTemperatureTurnOff_Impl.hpp index f66640499f7..3bc02a8037d 100644 --- a/src/model/AvailabilityManagerLowTemperatureTurnOff_Impl.hpp +++ b/src/model/AvailabilityManagerLowTemperatureTurnOff_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AvailabilityManagerLowTemperatureTurnOff_Impl(const AvailabilityManagerLowTemperatureTurnOff_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerLowTemperatureTurnOff_Impl() = default; + virtual ~AvailabilityManagerLowTemperatureTurnOff_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerLowTemperatureTurnOn.hpp b/src/model/AvailabilityManagerLowTemperatureTurnOn.hpp index 3d953459e1a..b70cb9ad2c9 100644 --- a/src/model/AvailabilityManagerLowTemperatureTurnOn.hpp +++ b/src/model/AvailabilityManagerLowTemperatureTurnOn.hpp @@ -30,7 +30,7 @@ namespace model { explicit AvailabilityManagerLowTemperatureTurnOn(const Model& model); - virtual ~AvailabilityManagerLowTemperatureTurnOn() = default; + virtual ~AvailabilityManagerLowTemperatureTurnOn() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerLowTemperatureTurnOn(const AvailabilityManagerLowTemperatureTurnOn& other) = default; AvailabilityManagerLowTemperatureTurnOn(AvailabilityManagerLowTemperatureTurnOn&& other) = default; diff --git a/src/model/AvailabilityManagerLowTemperatureTurnOn_Impl.hpp b/src/model/AvailabilityManagerLowTemperatureTurnOn_Impl.hpp index 43618bb24ef..f46ef6b3a31 100644 --- a/src/model/AvailabilityManagerLowTemperatureTurnOn_Impl.hpp +++ b/src/model/AvailabilityManagerLowTemperatureTurnOn_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerLowTemperatureTurnOn_Impl(const AvailabilityManagerLowTemperatureTurnOn_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerLowTemperatureTurnOn_Impl() = default; + virtual ~AvailabilityManagerLowTemperatureTurnOn_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerNightCycle.hpp b/src/model/AvailabilityManagerNightCycle.hpp index c422308857b..57e96b39f60 100644 --- a/src/model/AvailabilityManagerNightCycle.hpp +++ b/src/model/AvailabilityManagerNightCycle.hpp @@ -29,7 +29,7 @@ namespace model { public: explicit AvailabilityManagerNightCycle(const Model& model); - virtual ~AvailabilityManagerNightCycle() = default; + virtual ~AvailabilityManagerNightCycle() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerNightCycle(const AvailabilityManagerNightCycle& other) = default; AvailabilityManagerNightCycle(AvailabilityManagerNightCycle&& other) = default; diff --git a/src/model/AvailabilityManagerNightCycle_Impl.hpp b/src/model/AvailabilityManagerNightCycle_Impl.hpp index f440d08b09c..c63e029a8c4 100644 --- a/src/model/AvailabilityManagerNightCycle_Impl.hpp +++ b/src/model/AvailabilityManagerNightCycle_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AvailabilityManagerNightCycle_Impl(const AvailabilityManagerNightCycle_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerNightCycle_Impl() = default; + virtual ~AvailabilityManagerNightCycle_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/AvailabilityManagerNightVentilation.hpp b/src/model/AvailabilityManagerNightVentilation.hpp index 2b84476f210..8c4f9c2261d 100644 --- a/src/model/AvailabilityManagerNightVentilation.hpp +++ b/src/model/AvailabilityManagerNightVentilation.hpp @@ -31,7 +31,7 @@ namespace model { explicit AvailabilityManagerNightVentilation(const Model& model); - virtual ~AvailabilityManagerNightVentilation() = default; + virtual ~AvailabilityManagerNightVentilation() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerNightVentilation(const AvailabilityManagerNightVentilation& other) = default; AvailabilityManagerNightVentilation(AvailabilityManagerNightVentilation&& other) = default; diff --git a/src/model/AvailabilityManagerNightVentilation_Impl.hpp b/src/model/AvailabilityManagerNightVentilation_Impl.hpp index a5f5bef81ff..cd5284c3b13 100644 --- a/src/model/AvailabilityManagerNightVentilation_Impl.hpp +++ b/src/model/AvailabilityManagerNightVentilation_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AvailabilityManagerNightVentilation_Impl(const AvailabilityManagerNightVentilation_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerNightVentilation_Impl() = default; + virtual ~AvailabilityManagerNightVentilation_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerOptimumStart.hpp b/src/model/AvailabilityManagerOptimumStart.hpp index 21c245bde1f..bed91387058 100644 --- a/src/model/AvailabilityManagerOptimumStart.hpp +++ b/src/model/AvailabilityManagerOptimumStart.hpp @@ -31,7 +31,7 @@ namespace model { explicit AvailabilityManagerOptimumStart(const Model& model); - virtual ~AvailabilityManagerOptimumStart() = default; + virtual ~AvailabilityManagerOptimumStart() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerOptimumStart(const AvailabilityManagerOptimumStart& other) = default; AvailabilityManagerOptimumStart(AvailabilityManagerOptimumStart&& other) = default; diff --git a/src/model/AvailabilityManagerOptimumStart_Impl.hpp b/src/model/AvailabilityManagerOptimumStart_Impl.hpp index 04598b5b87f..1640d91f9d7 100644 --- a/src/model/AvailabilityManagerOptimumStart_Impl.hpp +++ b/src/model/AvailabilityManagerOptimumStart_Impl.hpp @@ -30,7 +30,7 @@ namespace model { AvailabilityManagerOptimumStart_Impl(const AvailabilityManagerOptimumStart_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerOptimumStart_Impl() = default; + virtual ~AvailabilityManagerOptimumStart_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerScheduled.hpp b/src/model/AvailabilityManagerScheduled.hpp index 27540bb53d5..7ee303a9902 100644 --- a/src/model/AvailabilityManagerScheduled.hpp +++ b/src/model/AvailabilityManagerScheduled.hpp @@ -29,7 +29,7 @@ namespace model { explicit AvailabilityManagerScheduled(const Model& model); - virtual ~AvailabilityManagerScheduled() = default; + virtual ~AvailabilityManagerScheduled() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerScheduled(const AvailabilityManagerScheduled& other) = default; AvailabilityManagerScheduled(AvailabilityManagerScheduled&& other) = default; diff --git a/src/model/AvailabilityManagerScheduledOff.hpp b/src/model/AvailabilityManagerScheduledOff.hpp index e06e1619671..611d569abc4 100644 --- a/src/model/AvailabilityManagerScheduledOff.hpp +++ b/src/model/AvailabilityManagerScheduledOff.hpp @@ -29,7 +29,7 @@ namespace model { explicit AvailabilityManagerScheduledOff(const Model& model); - virtual ~AvailabilityManagerScheduledOff() = default; + virtual ~AvailabilityManagerScheduledOff() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerScheduledOff(const AvailabilityManagerScheduledOff& other) = default; AvailabilityManagerScheduledOff(AvailabilityManagerScheduledOff&& other) = default; diff --git a/src/model/AvailabilityManagerScheduledOff_Impl.hpp b/src/model/AvailabilityManagerScheduledOff_Impl.hpp index 40d109675f1..7283475038f 100644 --- a/src/model/AvailabilityManagerScheduledOff_Impl.hpp +++ b/src/model/AvailabilityManagerScheduledOff_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerScheduledOff_Impl(const AvailabilityManagerScheduledOff_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerScheduledOff_Impl() = default; + virtual ~AvailabilityManagerScheduledOff_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerScheduledOn.hpp b/src/model/AvailabilityManagerScheduledOn.hpp index 21cbb41a681..0cee9fcc0bc 100644 --- a/src/model/AvailabilityManagerScheduledOn.hpp +++ b/src/model/AvailabilityManagerScheduledOn.hpp @@ -29,7 +29,7 @@ namespace model { explicit AvailabilityManagerScheduledOn(const Model& model); - virtual ~AvailabilityManagerScheduledOn() = default; + virtual ~AvailabilityManagerScheduledOn() override = default; // Default the copy and move operators because the virtual dtor is explicit AvailabilityManagerScheduledOn(const AvailabilityManagerScheduledOn& other) = default; AvailabilityManagerScheduledOn(AvailabilityManagerScheduledOn&& other) = default; diff --git a/src/model/AvailabilityManagerScheduledOn_Impl.hpp b/src/model/AvailabilityManagerScheduledOn_Impl.hpp index ceea0913f73..122e9614c52 100644 --- a/src/model/AvailabilityManagerScheduledOn_Impl.hpp +++ b/src/model/AvailabilityManagerScheduledOn_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerScheduledOn_Impl(const AvailabilityManagerScheduledOn_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerScheduledOn_Impl() = default; + virtual ~AvailabilityManagerScheduledOn_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManagerScheduled_Impl.hpp b/src/model/AvailabilityManagerScheduled_Impl.hpp index 4c7cbe8634e..5fa77f6fbb5 100644 --- a/src/model/AvailabilityManagerScheduled_Impl.hpp +++ b/src/model/AvailabilityManagerScheduled_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManagerScheduled_Impl(const AvailabilityManagerScheduled_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~AvailabilityManagerScheduled_Impl() = default; + virtual ~AvailabilityManagerScheduled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/AvailabilityManager_Impl.hpp b/src/model/AvailabilityManager_Impl.hpp index e5d96260fb2..b4a9ba4c0b7 100644 --- a/src/model/AvailabilityManager_Impl.hpp +++ b/src/model/AvailabilityManager_Impl.hpp @@ -29,7 +29,7 @@ namespace model { AvailabilityManager_Impl(const AvailabilityManager_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~AvailabilityManager_Impl() = default; + virtual ~AvailabilityManager_Impl() override = default; boost::optional loop() const; diff --git a/src/model/Blind.hpp b/src/model/Blind.hpp index f4dcc0a30e4..5bbb09efd5a 100644 --- a/src/model/Blind.hpp +++ b/src/model/Blind.hpp @@ -30,7 +30,7 @@ namespace model { double backSideSlatBeamSolarReflectance = 0.5, double frontSideSlatDiffuseSolarReflectance = 0.5, double backSideSlatDiffuseSolarReflectance = 0.5, double slatBeamVisibleTransmittance = 0.0); - virtual ~Blind() = default; + virtual ~Blind() override = default; // Default the copy and move operators because the virtual dtor is explicit Blind(const Blind& other) = default; Blind(Blind&& other) = default; diff --git a/src/model/Blind_Impl.hpp b/src/model/Blind_Impl.hpp index d276f16de1a..5ea35f993bd 100644 --- a/src/model/Blind_Impl.hpp +++ b/src/model/Blind_Impl.hpp @@ -28,7 +28,7 @@ namespace model { Blind_Impl(const Blind_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Blind_Impl() = default; + virtual ~Blind_Impl() override = default; //@} diff --git a/src/model/BoilerHotWater.hpp b/src/model/BoilerHotWater.hpp index 39910f91d18..5d65f177aed 100644 --- a/src/model/BoilerHotWater.hpp +++ b/src/model/BoilerHotWater.hpp @@ -32,7 +32,7 @@ namespace model { explicit BoilerHotWater(const Model& model); - virtual ~BoilerHotWater() = default; + virtual ~BoilerHotWater() override = default; // Default the copy and move operators because the virtual dtor is explicit BoilerHotWater(const BoilerHotWater& other) = default; BoilerHotWater(BoilerHotWater&& other) = default; diff --git a/src/model/BoilerHotWater_Impl.hpp b/src/model/BoilerHotWater_Impl.hpp index 7d4d4dcdf5c..cee976bfc9e 100644 --- a/src/model/BoilerHotWater_Impl.hpp +++ b/src/model/BoilerHotWater_Impl.hpp @@ -29,7 +29,7 @@ namespace model { BoilerHotWater_Impl(const BoilerHotWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~BoilerHotWater_Impl() = default; + virtual ~BoilerHotWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/BoilerSteam.hpp b/src/model/BoilerSteam.hpp index cdd8034b086..02d6ced6cb8 100644 --- a/src/model/BoilerSteam.hpp +++ b/src/model/BoilerSteam.hpp @@ -26,7 +26,7 @@ namespace model { public: explicit BoilerSteam(const Model& model); - virtual ~BoilerSteam() = default; + virtual ~BoilerSteam() override = default; // Default the copy and move operators because the virtual dtor is explicit BoilerSteam(const BoilerSteam& other) = default; BoilerSteam(BoilerSteam&& other) = default; diff --git a/src/model/BoilerSteam_Impl.hpp b/src/model/BoilerSteam_Impl.hpp index 081f7f32f6a..d2bdc9d819c 100644 --- a/src/model/BoilerSteam_Impl.hpp +++ b/src/model/BoilerSteam_Impl.hpp @@ -30,7 +30,7 @@ namespace model { BoilerSteam_Impl(const BoilerSteam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~BoilerSteam_Impl() = default; + virtual ~BoilerSteam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Building.hpp b/src/model/Building.hpp index 1e2691eb755..652c131bc38 100644 --- a/src/model/Building.hpp +++ b/src/model/Building.hpp @@ -48,7 +48,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~Building() = default; + virtual ~Building() override = default; // Default the copy and move operators because the virtual dtor is explicit Building(const Building& other) = default; Building(Building&& other) = default; diff --git a/src/model/BuildingStory.hpp b/src/model/BuildingStory.hpp index 9e2fab9f679..b8319b5ca5d 100644 --- a/src/model/BuildingStory.hpp +++ b/src/model/BuildingStory.hpp @@ -37,7 +37,7 @@ namespace model { explicit BuildingStory(const Model& model); - virtual ~BuildingStory() = default; + virtual ~BuildingStory() override = default; // Default the copy and move operators because the virtual dtor is explicit BuildingStory(const BuildingStory& other) = default; BuildingStory(BuildingStory&& other) = default; diff --git a/src/model/BuildingStory_Impl.hpp b/src/model/BuildingStory_Impl.hpp index de3263093c5..a93000941b0 100644 --- a/src/model/BuildingStory_Impl.hpp +++ b/src/model/BuildingStory_Impl.hpp @@ -38,7 +38,7 @@ namespace model { BuildingStory_Impl(const BuildingStory_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~BuildingStory_Impl() = default; + virtual ~BuildingStory_Impl() override = default; //@} diff --git a/src/model/BuildingUnit.hpp b/src/model/BuildingUnit.hpp index e4d222117f6..082247ec6ef 100644 --- a/src/model/BuildingUnit.hpp +++ b/src/model/BuildingUnit.hpp @@ -30,7 +30,7 @@ namespace model { explicit BuildingUnit(const Model& model); - virtual ~BuildingUnit() = default; + virtual ~BuildingUnit() override = default; // Default the copy and move operators because the virtual dtor is explicit BuildingUnit(const BuildingUnit& other) = default; BuildingUnit(BuildingUnit&& other) = default; diff --git a/src/model/BuildingUnit_Impl.hpp b/src/model/BuildingUnit_Impl.hpp index c012916a39f..d8f1feadb59 100644 --- a/src/model/BuildingUnit_Impl.hpp +++ b/src/model/BuildingUnit_Impl.hpp @@ -29,7 +29,7 @@ namespace model { BuildingUnit_Impl(const BuildingUnit_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~BuildingUnit_Impl() = default; + virtual ~BuildingUnit_Impl() override = default; //@} diff --git a/src/model/Building_Impl.hpp b/src/model/Building_Impl.hpp index 3fbf7ec2269..7b36806a38b 100644 --- a/src/model/Building_Impl.hpp +++ b/src/model/Building_Impl.hpp @@ -44,7 +44,7 @@ namespace model { Building_Impl(const Building_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Building_Impl() = default; + virtual ~Building_Impl() override = default; //@} diff --git a/src/model/CFactorUndergroundWallConstruction.hpp b/src/model/CFactorUndergroundWallConstruction.hpp index bb230d5305c..ebc770151ad 100644 --- a/src/model/CFactorUndergroundWallConstruction.hpp +++ b/src/model/CFactorUndergroundWallConstruction.hpp @@ -27,7 +27,7 @@ namespace model { /** TODO default values should be reviewed */ explicit CFactorUndergroundWallConstruction(const Model& model, double cFactor = 0.1, double height = 0.1); - virtual ~CFactorUndergroundWallConstruction() = default; + virtual ~CFactorUndergroundWallConstruction() override = default; // Default the copy and move operators because the virtual dtor is explicit CFactorUndergroundWallConstruction(const CFactorUndergroundWallConstruction& other) = default; CFactorUndergroundWallConstruction(CFactorUndergroundWallConstruction&& other) = default; diff --git a/src/model/CFactorUndergroundWallConstruction_Impl.hpp b/src/model/CFactorUndergroundWallConstruction_Impl.hpp index a1700322645..3d38eff11a2 100644 --- a/src/model/CFactorUndergroundWallConstruction_Impl.hpp +++ b/src/model/CFactorUndergroundWallConstruction_Impl.hpp @@ -25,7 +25,7 @@ namespace model { CFactorUndergroundWallConstruction_Impl(const CFactorUndergroundWallConstruction_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~CFactorUndergroundWallConstruction_Impl() = default; + virtual ~CFactorUndergroundWallConstruction_Impl() override = default; /** Get all output variables names that could be associated with this object. These variables * may or may not be available for each simulation, need to check report variable dictionary diff --git a/src/model/CentralHeatPumpSystem.hpp b/src/model/CentralHeatPumpSystem.hpp index fd8a5b07d41..5f5d5cdf4af 100644 --- a/src/model/CentralHeatPumpSystem.hpp +++ b/src/model/CentralHeatPumpSystem.hpp @@ -35,7 +35,7 @@ namespace model { */ explicit CentralHeatPumpSystem(const Model& model); - virtual ~CentralHeatPumpSystem() = default; + virtual ~CentralHeatPumpSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit CentralHeatPumpSystem(const CentralHeatPumpSystem& other) = default; CentralHeatPumpSystem(CentralHeatPumpSystem&& other) = default; diff --git a/src/model/CentralHeatPumpSystemModule.hpp b/src/model/CentralHeatPumpSystemModule.hpp index c2453eeef94..b0f9cfceea1 100644 --- a/src/model/CentralHeatPumpSystemModule.hpp +++ b/src/model/CentralHeatPumpSystemModule.hpp @@ -31,7 +31,7 @@ namespace model { explicit CentralHeatPumpSystemModule(const Model& model); - virtual ~CentralHeatPumpSystemModule() = default; + virtual ~CentralHeatPumpSystemModule() override = default; // Default the copy and move operators because the virtual dtor is explicit CentralHeatPumpSystemModule(const CentralHeatPumpSystemModule& other) = default; CentralHeatPumpSystemModule(CentralHeatPumpSystemModule&& other) = default; diff --git a/src/model/CentralHeatPumpSystemModule_Impl.hpp b/src/model/CentralHeatPumpSystemModule_Impl.hpp index 6706335c6d6..a860f813c9b 100644 --- a/src/model/CentralHeatPumpSystemModule_Impl.hpp +++ b/src/model/CentralHeatPumpSystemModule_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CentralHeatPumpSystemModule_Impl(const CentralHeatPumpSystemModule_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CentralHeatPumpSystemModule_Impl() = default; + virtual ~CentralHeatPumpSystemModule_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CentralHeatPumpSystem_Impl.hpp b/src/model/CentralHeatPumpSystem_Impl.hpp index c92e8282160..b338497aadf 100644 --- a/src/model/CentralHeatPumpSystem_Impl.hpp +++ b/src/model/CentralHeatPumpSystem_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CentralHeatPumpSystem_Impl(const CentralHeatPumpSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CentralHeatPumpSystem_Impl() = default; + virtual ~CentralHeatPumpSystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ChillerAbsorption.hpp b/src/model/ChillerAbsorption.hpp index 5da2eb7069c..cc2dd223904 100644 --- a/src/model/ChillerAbsorption.hpp +++ b/src/model/ChillerAbsorption.hpp @@ -28,7 +28,7 @@ namespace model { explicit ChillerAbsorption(const Model& model); - virtual ~ChillerAbsorption() = default; + virtual ~ChillerAbsorption() override = default; // Default the copy and move operators because the virtual dtor is explicit ChillerAbsorption(const ChillerAbsorption& other) = default; ChillerAbsorption(ChillerAbsorption&& other) = default; diff --git a/src/model/ChillerAbsorptionIndirect.hpp b/src/model/ChillerAbsorptionIndirect.hpp index 093557cad19..b3f10fc206b 100644 --- a/src/model/ChillerAbsorptionIndirect.hpp +++ b/src/model/ChillerAbsorptionIndirect.hpp @@ -30,7 +30,7 @@ namespace model { explicit ChillerAbsorptionIndirect(const Model& model); - virtual ~ChillerAbsorptionIndirect() = default; + virtual ~ChillerAbsorptionIndirect() override = default; // Default the copy and move operators because the virtual dtor is explicit ChillerAbsorptionIndirect(const ChillerAbsorptionIndirect& other) = default; ChillerAbsorptionIndirect(ChillerAbsorptionIndirect&& other) = default; diff --git a/src/model/ChillerAbsorptionIndirect_Impl.hpp b/src/model/ChillerAbsorptionIndirect_Impl.hpp index 25a4194fe40..b189bd243b6 100644 --- a/src/model/ChillerAbsorptionIndirect_Impl.hpp +++ b/src/model/ChillerAbsorptionIndirect_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ChillerAbsorptionIndirect_Impl(const ChillerAbsorptionIndirect_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ChillerAbsorptionIndirect_Impl() = default; + virtual ~ChillerAbsorptionIndirect_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ChillerAbsorption_Impl.hpp b/src/model/ChillerAbsorption_Impl.hpp index d22f7882d1b..986e00e6862 100644 --- a/src/model/ChillerAbsorption_Impl.hpp +++ b/src/model/ChillerAbsorption_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ChillerAbsorption_Impl(const ChillerAbsorption_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ChillerAbsorption_Impl() = default; + virtual ~ChillerAbsorption_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ChillerElectricASHRAE205.hpp b/src/model/ChillerElectricASHRAE205.hpp index 27371d95386..a8660e3ce16 100644 --- a/src/model/ChillerElectricASHRAE205.hpp +++ b/src/model/ChillerElectricASHRAE205.hpp @@ -33,7 +33,7 @@ namespace model { explicit ChillerElectricASHRAE205(const ExternalFile& representationFile); - virtual ~ChillerElectricASHRAE205() = default; + virtual ~ChillerElectricASHRAE205() override = default; // Default the copy and move operators because the virtual dtor is explicit ChillerElectricASHRAE205(const ChillerElectricASHRAE205& other) = default; ChillerElectricASHRAE205(ChillerElectricASHRAE205&& other) = default; diff --git a/src/model/ChillerElectricASHRAE205_Impl.hpp b/src/model/ChillerElectricASHRAE205_Impl.hpp index 611c4b607d3..ce10139817d 100644 --- a/src/model/ChillerElectricASHRAE205_Impl.hpp +++ b/src/model/ChillerElectricASHRAE205_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ChillerElectricASHRAE205_Impl(const ChillerElectricASHRAE205_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ChillerElectricASHRAE205_Impl() = default; + virtual ~ChillerElectricASHRAE205_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ChillerElectricEIR.hpp b/src/model/ChillerElectricEIR.hpp index 0c1d69f5cce..f8937a5c0ba 100644 --- a/src/model/ChillerElectricEIR.hpp +++ b/src/model/ChillerElectricEIR.hpp @@ -39,7 +39,7 @@ namespace model { explicit ChillerElectricEIR(const Model& model); - virtual ~ChillerElectricEIR() = default; + virtual ~ChillerElectricEIR() override = default; // Default the copy and move operators because the virtual dtor is explicit ChillerElectricEIR(const ChillerElectricEIR& other) = default; ChillerElectricEIR(ChillerElectricEIR&& other) = default; diff --git a/src/model/ChillerElectricEIR_Impl.hpp b/src/model/ChillerElectricEIR_Impl.hpp index 34db4fee965..4c91500a978 100644 --- a/src/model/ChillerElectricEIR_Impl.hpp +++ b/src/model/ChillerElectricEIR_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ChillerElectricEIR_Impl(const ChillerElectricEIR_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ChillerElectricEIR_Impl() = default; + virtual ~ChillerElectricEIR_Impl() override = default; /** @name Virtual Methods */ //@{ diff --git a/src/model/ChillerElectricReformulatedEIR.hpp b/src/model/ChillerElectricReformulatedEIR.hpp index e7dce67db57..221286416b2 100644 --- a/src/model/ChillerElectricReformulatedEIR.hpp +++ b/src/model/ChillerElectricReformulatedEIR.hpp @@ -39,7 +39,7 @@ namespace model { explicit ChillerElectricReformulatedEIR(const Model& model); - virtual ~ChillerElectricReformulatedEIR() = default; + virtual ~ChillerElectricReformulatedEIR() override = default; // Default the copy and move operators because the virtual dtor is explicit ChillerElectricReformulatedEIR(const ChillerElectricReformulatedEIR& other) = default; ChillerElectricReformulatedEIR(ChillerElectricReformulatedEIR&& other) = default; diff --git a/src/model/ChillerElectricReformulatedEIR_Impl.hpp b/src/model/ChillerElectricReformulatedEIR_Impl.hpp index 46fd60b1931..403c9e70979 100644 --- a/src/model/ChillerElectricReformulatedEIR_Impl.hpp +++ b/src/model/ChillerElectricReformulatedEIR_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ChillerElectricReformulatedEIR_Impl(const ChillerElectricReformulatedEIR_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ChillerElectricReformulatedEIR_Impl() = default; + virtual ~ChillerElectricReformulatedEIR_Impl() override = default; /** @name Virtual Methods */ //@{ diff --git a/src/model/ChillerHeaterPerformanceElectricEIR.hpp b/src/model/ChillerHeaterPerformanceElectricEIR.hpp index ff37ca48fd2..a1dc514b628 100644 --- a/src/model/ChillerHeaterPerformanceElectricEIR.hpp +++ b/src/model/ChillerHeaterPerformanceElectricEIR.hpp @@ -36,7 +36,7 @@ namespace model { const Curve& chillerHeaterClgEIRFPLR, const Curve& chillerHeaterHtgCapFT, const Curve& chillerHeaterHtgEIRFT, const Curve& chillerHeaterHtgEIRFPLR); - virtual ~ChillerHeaterPerformanceElectricEIR() = default; + virtual ~ChillerHeaterPerformanceElectricEIR() override = default; // Default the copy and move operators because the virtual dtor is explicit ChillerHeaterPerformanceElectricEIR(const ChillerHeaterPerformanceElectricEIR& other) = default; ChillerHeaterPerformanceElectricEIR(ChillerHeaterPerformanceElectricEIR&& other) = default; diff --git a/src/model/ChillerHeaterPerformanceElectricEIR_Impl.hpp b/src/model/ChillerHeaterPerformanceElectricEIR_Impl.hpp index aace9dd0625..c8f277391f0 100644 --- a/src/model/ChillerHeaterPerformanceElectricEIR_Impl.hpp +++ b/src/model/ChillerHeaterPerformanceElectricEIR_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ChillerHeaterPerformanceElectricEIR_Impl(const ChillerHeaterPerformanceElectricEIR_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ChillerHeaterPerformanceElectricEIR_Impl() = default; + virtual ~ChillerHeaterPerformanceElectricEIR_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ClimateZones.hpp b/src/model/ClimateZones.hpp index c933ce5e130..47b5d9087f3 100644 --- a/src/model/ClimateZones.hpp +++ b/src/model/ClimateZones.hpp @@ -87,7 +87,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ClimateZones() = default; + virtual ~ClimateZones() override = default; // Default the copy and move operators because the virtual dtor is explicit ClimateZones(const ClimateZones& other) = default; ClimateZones(ClimateZones&& other) = default; diff --git a/src/model/ClimateZones_Impl.hpp b/src/model/ClimateZones_Impl.hpp index b55665611b0..8bfc3a7440d 100644 --- a/src/model/ClimateZones_Impl.hpp +++ b/src/model/ClimateZones_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ClimateZones_Impl(const ClimateZones_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ClimateZones_Impl() = default; + virtual ~ClimateZones_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/CoilCoolingCooledBeam.hpp b/src/model/CoilCoolingCooledBeam.hpp index 90401a35b7c..bdca07aca83 100644 --- a/src/model/CoilCoolingCooledBeam.hpp +++ b/src/model/CoilCoolingCooledBeam.hpp @@ -28,7 +28,7 @@ namespace model { explicit CoilCoolingCooledBeam(const Model& model); - virtual ~CoilCoolingCooledBeam() = default; + virtual ~CoilCoolingCooledBeam() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingCooledBeam(const CoilCoolingCooledBeam& other) = default; CoilCoolingCooledBeam(CoilCoolingCooledBeam&& other) = default; diff --git a/src/model/CoilCoolingCooledBeam_Impl.hpp b/src/model/CoilCoolingCooledBeam_Impl.hpp index 629c5c9f3a9..eeb2de7bc85 100644 --- a/src/model/CoilCoolingCooledBeam_Impl.hpp +++ b/src/model/CoilCoolingCooledBeam_Impl.hpp @@ -27,7 +27,7 @@ namespace model { CoilCoolingCooledBeam_Impl(const CoilCoolingCooledBeam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingCooledBeam_Impl() = default; + virtual ~CoilCoolingCooledBeam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDX.hpp b/src/model/CoilCoolingDX.hpp index 5a62769e5eb..4c5992ddaf3 100644 --- a/src/model/CoilCoolingDX.hpp +++ b/src/model/CoilCoolingDX.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoilCoolingDX(const Model& model, const CoilCoolingDXCurveFitPerformance& coilCoolingDXCurveFitPerformance); - virtual ~CoilCoolingDX() = default; + virtual ~CoilCoolingDX() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDX(const CoilCoolingDX& other) = default; CoilCoolingDX(CoilCoolingDX&& other) = default; diff --git a/src/model/CoilCoolingDXCurveFitOperatingMode.hpp b/src/model/CoilCoolingDXCurveFitOperatingMode.hpp index 92502072707..19c7208de73 100644 --- a/src/model/CoilCoolingDXCurveFitOperatingMode.hpp +++ b/src/model/CoilCoolingDXCurveFitOperatingMode.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoilCoolingDXCurveFitOperatingMode(const Model& model); - virtual ~CoilCoolingDXCurveFitOperatingMode() = default; + virtual ~CoilCoolingDXCurveFitOperatingMode() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXCurveFitOperatingMode(const CoilCoolingDXCurveFitOperatingMode& other) = default; CoilCoolingDXCurveFitOperatingMode(CoilCoolingDXCurveFitOperatingMode&& other) = default; diff --git a/src/model/CoilCoolingDXCurveFitOperatingMode_Impl.hpp b/src/model/CoilCoolingDXCurveFitOperatingMode_Impl.hpp index 1d29179305e..3ebdf1a75b0 100644 --- a/src/model/CoilCoolingDXCurveFitOperatingMode_Impl.hpp +++ b/src/model/CoilCoolingDXCurveFitOperatingMode_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilCoolingDXCurveFitOperatingMode_Impl(const CoilCoolingDXCurveFitOperatingMode_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXCurveFitOperatingMode_Impl() = default; + virtual ~CoilCoolingDXCurveFitOperatingMode_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXCurveFitPerformance.hpp b/src/model/CoilCoolingDXCurveFitPerformance.hpp index 4e97634ae77..b54d874ae14 100644 --- a/src/model/CoilCoolingDXCurveFitPerformance.hpp +++ b/src/model/CoilCoolingDXCurveFitPerformance.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilCoolingDXCurveFitPerformance(const Model& model, const CoilCoolingDXCurveFitOperatingMode& baseOperatingMode); - virtual ~CoilCoolingDXCurveFitPerformance() = default; + virtual ~CoilCoolingDXCurveFitPerformance() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXCurveFitPerformance(const CoilCoolingDXCurveFitPerformance& other) = default; CoilCoolingDXCurveFitPerformance(CoilCoolingDXCurveFitPerformance&& other) = default; diff --git a/src/model/CoilCoolingDXCurveFitPerformance_Impl.hpp b/src/model/CoilCoolingDXCurveFitPerformance_Impl.hpp index ef5c715acdc..b443156218a 100644 --- a/src/model/CoilCoolingDXCurveFitPerformance_Impl.hpp +++ b/src/model/CoilCoolingDXCurveFitPerformance_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CoilCoolingDXCurveFitPerformance_Impl(const CoilCoolingDXCurveFitPerformance_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXCurveFitPerformance_Impl() = default; + virtual ~CoilCoolingDXCurveFitPerformance_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXCurveFitSpeed.hpp b/src/model/CoilCoolingDXCurveFitSpeed.hpp index a6bb0a9f2c9..f11e000790a 100644 --- a/src/model/CoilCoolingDXCurveFitSpeed.hpp +++ b/src/model/CoilCoolingDXCurveFitSpeed.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilCoolingDXCurveFitSpeed(const Model& model); - virtual ~CoilCoolingDXCurveFitSpeed() = default; + virtual ~CoilCoolingDXCurveFitSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXCurveFitSpeed(const CoilCoolingDXCurveFitSpeed& other) = default; CoilCoolingDXCurveFitSpeed(CoilCoolingDXCurveFitSpeed&& other) = default; diff --git a/src/model/CoilCoolingDXCurveFitSpeed_Impl.hpp b/src/model/CoilCoolingDXCurveFitSpeed_Impl.hpp index 44a53db71d7..bc907b85cfb 100644 --- a/src/model/CoilCoolingDXCurveFitSpeed_Impl.hpp +++ b/src/model/CoilCoolingDXCurveFitSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilCoolingDXCurveFitSpeed_Impl(const CoilCoolingDXCurveFitSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXCurveFitSpeed_Impl() = default; + virtual ~CoilCoolingDXCurveFitSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXMultiSpeed.hpp b/src/model/CoilCoolingDXMultiSpeed.hpp index 8f4901dea23..d2e238ac233 100644 --- a/src/model/CoilCoolingDXMultiSpeed.hpp +++ b/src/model/CoilCoolingDXMultiSpeed.hpp @@ -34,7 +34,7 @@ namespace model { explicit CoilCoolingDXMultiSpeed(const Model& model); - virtual ~CoilCoolingDXMultiSpeed() = default; + virtual ~CoilCoolingDXMultiSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXMultiSpeed(const CoilCoolingDXMultiSpeed& other) = default; CoilCoolingDXMultiSpeed(CoilCoolingDXMultiSpeed&& other) = default; diff --git a/src/model/CoilCoolingDXMultiSpeedStageData.hpp b/src/model/CoilCoolingDXMultiSpeedStageData.hpp index 9cec5a0d1c6..d28a7c7df89 100644 --- a/src/model/CoilCoolingDXMultiSpeedStageData.hpp +++ b/src/model/CoilCoolingDXMultiSpeedStageData.hpp @@ -38,7 +38,7 @@ namespace model { /** Create CoilCoolingDXMultiSpeedStageData with default curves **/ explicit CoilCoolingDXMultiSpeedStageData(const Model& model); - virtual ~CoilCoolingDXMultiSpeedStageData() = default; + virtual ~CoilCoolingDXMultiSpeedStageData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXMultiSpeedStageData(const CoilCoolingDXMultiSpeedStageData& other) = default; CoilCoolingDXMultiSpeedStageData(CoilCoolingDXMultiSpeedStageData&& other) = default; diff --git a/src/model/CoilCoolingDXMultiSpeedStageData_Impl.hpp b/src/model/CoilCoolingDXMultiSpeedStageData_Impl.hpp index d8a6fac696a..bcbc51b29aa 100644 --- a/src/model/CoilCoolingDXMultiSpeedStageData_Impl.hpp +++ b/src/model/CoilCoolingDXMultiSpeedStageData_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilCoolingDXMultiSpeedStageData_Impl(const CoilCoolingDXMultiSpeedStageData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXMultiSpeedStageData_Impl() = default; + virtual ~CoilCoolingDXMultiSpeedStageData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXMultiSpeed_Impl.hpp b/src/model/CoilCoolingDXMultiSpeed_Impl.hpp index 46cc2a89801..d5104129a2a 100644 --- a/src/model/CoilCoolingDXMultiSpeed_Impl.hpp +++ b/src/model/CoilCoolingDXMultiSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilCoolingDXMultiSpeed_Impl(const CoilCoolingDXMultiSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXMultiSpeed_Impl() = default; + virtual ~CoilCoolingDXMultiSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXSingleSpeed.hpp b/src/model/CoilCoolingDXSingleSpeed.hpp index c4ccda82174..a923d4b9866 100644 --- a/src/model/CoilCoolingDXSingleSpeed.hpp +++ b/src/model/CoilCoolingDXSingleSpeed.hpp @@ -52,7 +52,7 @@ namespace model { explicit CoilCoolingDXSingleSpeed(const Model& model); - virtual ~CoilCoolingDXSingleSpeed() = default; + virtual ~CoilCoolingDXSingleSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXSingleSpeed(const CoilCoolingDXSingleSpeed& other) = default; CoilCoolingDXSingleSpeed(CoilCoolingDXSingleSpeed&& other) = default; diff --git a/src/model/CoilCoolingDXSingleSpeedThermalStorage.hpp b/src/model/CoilCoolingDXSingleSpeedThermalStorage.hpp index e2fcb788246..f2340d596d6 100644 --- a/src/model/CoilCoolingDXSingleSpeedThermalStorage.hpp +++ b/src/model/CoilCoolingDXSingleSpeedThermalStorage.hpp @@ -55,7 +55,7 @@ namespace model { explicit CoilCoolingDXSingleSpeedThermalStorage(const Model& model); - virtual ~CoilCoolingDXSingleSpeedThermalStorage() = default; + virtual ~CoilCoolingDXSingleSpeedThermalStorage() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXSingleSpeedThermalStorage(const CoilCoolingDXSingleSpeedThermalStorage& other) = default; CoilCoolingDXSingleSpeedThermalStorage(CoilCoolingDXSingleSpeedThermalStorage&& other) = default; diff --git a/src/model/CoilCoolingDXSingleSpeedThermalStorage_Impl.hpp b/src/model/CoilCoolingDXSingleSpeedThermalStorage_Impl.hpp index ec00d5fb006..52d91e59931 100644 --- a/src/model/CoilCoolingDXSingleSpeedThermalStorage_Impl.hpp +++ b/src/model/CoilCoolingDXSingleSpeedThermalStorage_Impl.hpp @@ -54,7 +54,7 @@ namespace model { CoilCoolingDXSingleSpeedThermalStorage_Impl(const CoilCoolingDXSingleSpeedThermalStorage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXSingleSpeedThermalStorage_Impl() = default; + virtual ~CoilCoolingDXSingleSpeedThermalStorage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXSingleSpeed_Impl.hpp b/src/model/CoilCoolingDXSingleSpeed_Impl.hpp index bcb60bf0c4b..af34ad26a3d 100644 --- a/src/model/CoilCoolingDXSingleSpeed_Impl.hpp +++ b/src/model/CoilCoolingDXSingleSpeed_Impl.hpp @@ -34,7 +34,7 @@ namespace model { // copy constructor CoilCoolingDXSingleSpeed_Impl(const CoilCoolingDXSingleSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXSingleSpeed_Impl() = default; + virtual ~CoilCoolingDXSingleSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXTwoSpeed.hpp b/src/model/CoilCoolingDXTwoSpeed.hpp index c336da28d1a..90f42aaf799 100644 --- a/src/model/CoilCoolingDXTwoSpeed.hpp +++ b/src/model/CoilCoolingDXTwoSpeed.hpp @@ -53,7 +53,7 @@ namespace model { CoilCoolingDXTwoSpeed(const Model& model); - virtual ~CoilCoolingDXTwoSpeed() = default; + virtual ~CoilCoolingDXTwoSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXTwoSpeed(const CoilCoolingDXTwoSpeed& other) = default; CoilCoolingDXTwoSpeed(CoilCoolingDXTwoSpeed&& other) = default; diff --git a/src/model/CoilCoolingDXTwoSpeed_Impl.hpp b/src/model/CoilCoolingDXTwoSpeed_Impl.hpp index d0d85f85196..2f2846eb22d 100644 --- a/src/model/CoilCoolingDXTwoSpeed_Impl.hpp +++ b/src/model/CoilCoolingDXTwoSpeed_Impl.hpp @@ -33,7 +33,7 @@ namespace model { // copy constructor CoilCoolingDXTwoSpeed_Impl(const CoilCoolingDXTwoSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXTwoSpeed_Impl() = default; + virtual ~CoilCoolingDXTwoSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXTwoStageWithHumidityControlMode.hpp b/src/model/CoilCoolingDXTwoStageWithHumidityControlMode.hpp index 6f145f2fb0b..f6ebfdef188 100644 --- a/src/model/CoilCoolingDXTwoStageWithHumidityControlMode.hpp +++ b/src/model/CoilCoolingDXTwoStageWithHumidityControlMode.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilCoolingDXTwoStageWithHumidityControlMode(const Model& model); - virtual ~CoilCoolingDXTwoStageWithHumidityControlMode() = default; + virtual ~CoilCoolingDXTwoStageWithHumidityControlMode() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXTwoStageWithHumidityControlMode(const CoilCoolingDXTwoStageWithHumidityControlMode& other) = default; CoilCoolingDXTwoStageWithHumidityControlMode(CoilCoolingDXTwoStageWithHumidityControlMode&& other) = default; diff --git a/src/model/CoilCoolingDXTwoStageWithHumidityControlMode_Impl.hpp b/src/model/CoilCoolingDXTwoStageWithHumidityControlMode_Impl.hpp index 1a42fa65166..1b68cef7f67 100644 --- a/src/model/CoilCoolingDXTwoStageWithHumidityControlMode_Impl.hpp +++ b/src/model/CoilCoolingDXTwoStageWithHumidityControlMode_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CoilCoolingDXTwoStageWithHumidityControlMode_Impl(const CoilCoolingDXTwoStageWithHumidityControlMode_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXTwoStageWithHumidityControlMode_Impl() = default; + virtual ~CoilCoolingDXTwoStageWithHumidityControlMode_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXVariableRefrigerantFlow.hpp b/src/model/CoilCoolingDXVariableRefrigerantFlow.hpp index 161b7f593a8..847cc38c59d 100644 --- a/src/model/CoilCoolingDXVariableRefrigerantFlow.hpp +++ b/src/model/CoilCoolingDXVariableRefrigerantFlow.hpp @@ -29,7 +29,7 @@ namespace model { public: explicit CoilCoolingDXVariableRefrigerantFlow(const Model& model); - virtual ~CoilCoolingDXVariableRefrigerantFlow() = default; + virtual ~CoilCoolingDXVariableRefrigerantFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXVariableRefrigerantFlow(const CoilCoolingDXVariableRefrigerantFlow& other) = default; CoilCoolingDXVariableRefrigerantFlow(CoilCoolingDXVariableRefrigerantFlow&& other) = default; diff --git a/src/model/CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl.hpp b/src/model/CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl.hpp index b1acdefac72..bb8a99ff4a4 100644 --- a/src/model/CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl.hpp +++ b/src/model/CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl(const Model& model); - virtual ~CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl() = default; + virtual ~CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl(const CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl& other) = default; CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl(CoilCoolingDXVariableRefrigerantFlowFluidTemperatureControl&& other) = default; diff --git a/src/model/CoilCoolingDXVariableRefrigerantFlow_Impl.hpp b/src/model/CoilCoolingDXVariableRefrigerantFlow_Impl.hpp index 797050c9d8a..093cdf7cbd7 100644 --- a/src/model/CoilCoolingDXVariableRefrigerantFlow_Impl.hpp +++ b/src/model/CoilCoolingDXVariableRefrigerantFlow_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilCoolingDXVariableRefrigerantFlow_Impl(const CoilCoolingDXVariableRefrigerantFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXVariableRefrigerantFlow_Impl() = default; + virtual ~CoilCoolingDXVariableRefrigerantFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXVariableSpeed.hpp b/src/model/CoilCoolingDXVariableSpeed.hpp index a1cfaa3ca61..7a415fc15d4 100644 --- a/src/model/CoilCoolingDXVariableSpeed.hpp +++ b/src/model/CoilCoolingDXVariableSpeed.hpp @@ -35,7 +35,7 @@ namespace model { explicit CoilCoolingDXVariableSpeed(const Model& model, const Curve& partLoadFraction); - virtual ~CoilCoolingDXVariableSpeed() = default; + virtual ~CoilCoolingDXVariableSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXVariableSpeed(const CoilCoolingDXVariableSpeed& other) = default; CoilCoolingDXVariableSpeed(CoilCoolingDXVariableSpeed&& other) = default; diff --git a/src/model/CoilCoolingDXVariableSpeedSpeedData.hpp b/src/model/CoilCoolingDXVariableSpeedSpeedData.hpp index 947c1d5da79..5a4046c6aad 100644 --- a/src/model/CoilCoolingDXVariableSpeedSpeedData.hpp +++ b/src/model/CoilCoolingDXVariableSpeedSpeedData.hpp @@ -35,7 +35,7 @@ namespace model { const Curve& energyInputRatioFunctionofTemperatureCurve, const Curve& energyInputRatioFunctionofAirFlowFractionCurve); - virtual ~CoilCoolingDXVariableSpeedSpeedData() = default; + virtual ~CoilCoolingDXVariableSpeedSpeedData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingDXVariableSpeedSpeedData(const CoilCoolingDXVariableSpeedSpeedData& other) = default; CoilCoolingDXVariableSpeedSpeedData(CoilCoolingDXVariableSpeedSpeedData&& other) = default; diff --git a/src/model/CoilCoolingDXVariableSpeedSpeedData_Impl.hpp b/src/model/CoilCoolingDXVariableSpeedSpeedData_Impl.hpp index a70ea4874dc..e3e8667d83e 100644 --- a/src/model/CoilCoolingDXVariableSpeedSpeedData_Impl.hpp +++ b/src/model/CoilCoolingDXVariableSpeedSpeedData_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilCoolingDXVariableSpeedSpeedData_Impl(const CoilCoolingDXVariableSpeedSpeedData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXVariableSpeedSpeedData_Impl() = default; + virtual ~CoilCoolingDXVariableSpeedSpeedData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDXVariableSpeed_Impl.hpp b/src/model/CoilCoolingDXVariableSpeed_Impl.hpp index e3f67543c9b..72f2e40104c 100644 --- a/src/model/CoilCoolingDXVariableSpeed_Impl.hpp +++ b/src/model/CoilCoolingDXVariableSpeed_Impl.hpp @@ -33,7 +33,7 @@ namespace model { CoilCoolingDXVariableSpeed_Impl(const CoilCoolingDXVariableSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDXVariableSpeed_Impl() = default; + virtual ~CoilCoolingDXVariableSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingDX_Impl.hpp b/src/model/CoilCoolingDX_Impl.hpp index a95f0d5ce31..7c0a606f5a2 100644 --- a/src/model/CoilCoolingDX_Impl.hpp +++ b/src/model/CoilCoolingDX_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilCoolingDX_Impl(const CoilCoolingDX_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingDX_Impl() = default; + virtual ~CoilCoolingDX_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingFourPipeBeam.hpp b/src/model/CoilCoolingFourPipeBeam.hpp index 939fca76628..bec15f817c0 100644 --- a/src/model/CoilCoolingFourPipeBeam.hpp +++ b/src/model/CoilCoolingFourPipeBeam.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilCoolingFourPipeBeam(const Model& model); - virtual ~CoilCoolingFourPipeBeam() = default; + virtual ~CoilCoolingFourPipeBeam() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingFourPipeBeam(const CoilCoolingFourPipeBeam& other) = default; CoilCoolingFourPipeBeam(CoilCoolingFourPipeBeam&& other) = default; diff --git a/src/model/CoilCoolingFourPipeBeam_Impl.hpp b/src/model/CoilCoolingFourPipeBeam_Impl.hpp index e9598c5dd1f..e800586eb1c 100644 --- a/src/model/CoilCoolingFourPipeBeam_Impl.hpp +++ b/src/model/CoilCoolingFourPipeBeam_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilCoolingFourPipeBeam_Impl(const CoilCoolingFourPipeBeam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingFourPipeBeam_Impl() = default; + virtual ~CoilCoolingFourPipeBeam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingLowTempRadiantConstFlow.hpp b/src/model/CoilCoolingLowTempRadiantConstFlow.hpp index 1e9a71f5970..953f74f2192 100644 --- a/src/model/CoilCoolingLowTempRadiantConstFlow.hpp +++ b/src/model/CoilCoolingLowTempRadiantConstFlow.hpp @@ -32,7 +32,7 @@ namespace model { Schedule& coolingLowWaterTemperatureSchedule, Schedule& coolingHighControlTemperatureSchedule, Schedule& coolingLowControlTemperatureSchedule); - virtual ~CoilCoolingLowTempRadiantConstFlow() = default; + virtual ~CoilCoolingLowTempRadiantConstFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingLowTempRadiantConstFlow(const CoilCoolingLowTempRadiantConstFlow& other) = default; CoilCoolingLowTempRadiantConstFlow(CoilCoolingLowTempRadiantConstFlow&& other) = default; diff --git a/src/model/CoilCoolingLowTempRadiantConstFlow_Impl.hpp b/src/model/CoilCoolingLowTempRadiantConstFlow_Impl.hpp index 38c0c0e36d7..4d127745b7d 100644 --- a/src/model/CoilCoolingLowTempRadiantConstFlow_Impl.hpp +++ b/src/model/CoilCoolingLowTempRadiantConstFlow_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilCoolingLowTempRadiantConstFlow_Impl(const CoilCoolingLowTempRadiantConstFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingLowTempRadiantConstFlow_Impl() = default; + virtual ~CoilCoolingLowTempRadiantConstFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingLowTempRadiantVarFlow.hpp b/src/model/CoilCoolingLowTempRadiantVarFlow.hpp index 3226c1b8d19..1be0c076a98 100644 --- a/src/model/CoilCoolingLowTempRadiantVarFlow.hpp +++ b/src/model/CoilCoolingLowTempRadiantVarFlow.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilCoolingLowTempRadiantVarFlow(const Model& model, Schedule& coolingControlTemperatureSchedule); - virtual ~CoilCoolingLowTempRadiantVarFlow() = default; + virtual ~CoilCoolingLowTempRadiantVarFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingLowTempRadiantVarFlow(const CoilCoolingLowTempRadiantVarFlow& other) = default; CoilCoolingLowTempRadiantVarFlow(CoilCoolingLowTempRadiantVarFlow&& other) = default; diff --git a/src/model/CoilCoolingLowTempRadiantVarFlow_Impl.hpp b/src/model/CoilCoolingLowTempRadiantVarFlow_Impl.hpp index 9604da176dc..28c31f4b720 100644 --- a/src/model/CoilCoolingLowTempRadiantVarFlow_Impl.hpp +++ b/src/model/CoilCoolingLowTempRadiantVarFlow_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilCoolingLowTempRadiantVarFlow_Impl(const CoilCoolingLowTempRadiantVarFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingLowTempRadiantVarFlow_Impl() = default; + virtual ~CoilCoolingLowTempRadiantVarFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingWater.hpp b/src/model/CoilCoolingWater.hpp index 6a0a5e7f402..22759866869 100644 --- a/src/model/CoilCoolingWater.hpp +++ b/src/model/CoilCoolingWater.hpp @@ -47,7 +47,7 @@ namespace model { CoilCoolingWater(const Model& model); - virtual ~CoilCoolingWater() = default; + virtual ~CoilCoolingWater() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingWater(const CoilCoolingWater& other) = default; CoilCoolingWater(CoilCoolingWater&& other) = default; diff --git a/src/model/CoilCoolingWaterPanelRadiant.hpp b/src/model/CoilCoolingWaterPanelRadiant.hpp index f23c7fb6a29..13eb5cbd1d0 100644 --- a/src/model/CoilCoolingWaterPanelRadiant.hpp +++ b/src/model/CoilCoolingWaterPanelRadiant.hpp @@ -28,7 +28,7 @@ namespace model { explicit CoilCoolingWaterPanelRadiant(const Model& model); - virtual ~CoilCoolingWaterPanelRadiant() = default; + virtual ~CoilCoolingWaterPanelRadiant() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingWaterPanelRadiant(const CoilCoolingWaterPanelRadiant& other) = default; CoilCoolingWaterPanelRadiant(CoilCoolingWaterPanelRadiant&& other) = default; diff --git a/src/model/CoilCoolingWaterPanelRadiant_Impl.hpp b/src/model/CoilCoolingWaterPanelRadiant_Impl.hpp index 2e5d10d863b..68f60e7aa7c 100644 --- a/src/model/CoilCoolingWaterPanelRadiant_Impl.hpp +++ b/src/model/CoilCoolingWaterPanelRadiant_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilCoolingWaterPanelRadiant_Impl(const CoilCoolingWaterPanelRadiant_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingWaterPanelRadiant_Impl() = default; + virtual ~CoilCoolingWaterPanelRadiant_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp index 72dede279f2..22dc182c7b1 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp @@ -34,7 +34,7 @@ namespace model { /** Constructs a new CoilCoolingWaterToAirHeatPumpEquationFit object and places it inside the model. The coil is fully initialized with all companion objects. */ CoilCoolingWaterToAirHeatPumpEquationFit(const Model& model); - virtual ~CoilCoolingWaterToAirHeatPumpEquationFit() = default; + virtual ~CoilCoolingWaterToAirHeatPumpEquationFit() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingWaterToAirHeatPumpEquationFit(const CoilCoolingWaterToAirHeatPumpEquationFit& other) = default; CoilCoolingWaterToAirHeatPumpEquationFit(CoilCoolingWaterToAirHeatPumpEquationFit&& other) = default; diff --git a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit_Impl.hpp b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit_Impl.hpp index 688cc79c7bd..8251adff6e8 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit_Impl.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CoilCoolingWaterToAirHeatPumpEquationFit_Impl(const CoilCoolingWaterToAirHeatPumpEquationFit_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingWaterToAirHeatPumpEquationFit_Impl() = default; + virtual ~CoilCoolingWaterToAirHeatPumpEquationFit_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit.hpp b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit.hpp index b256140e54e..011a550db0d 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit(const Model& model, const Curve& partLoadFraction); - virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit() = default; + virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit(const CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit& other) = default; CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit(CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit&& other) = default; diff --git a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp index 623bd9fd6e4..f610d603f27 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp @@ -36,7 +36,7 @@ namespace model { const Curve& energyInputRatioFunctionofAirFlowFraction, const Curve& energyInputRatioFunctionofWaterFlowFraction, const Curve& wasteHeatFunctionofTemperature); - virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData() = default; + virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData(const CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData& other) = default; diff --git a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp index 5715909a2ad..5982a776c27 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl( const CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl() = default; + virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp index 23bba8b6be2..456ad36fa4a 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp @@ -33,7 +33,7 @@ namespace model { CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl(const CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl() = default; + virtual ~CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilCoolingWater_Impl.hpp b/src/model/CoilCoolingWater_Impl.hpp index a1d3702eba3..27586aedf62 100644 --- a/src/model/CoilCoolingWater_Impl.hpp +++ b/src/model/CoilCoolingWater_Impl.hpp @@ -27,7 +27,7 @@ namespace model { CoilCoolingWater_Impl(const CoilCoolingWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilCoolingWater_Impl() = default; + virtual ~CoilCoolingWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDXMultiSpeed.hpp b/src/model/CoilHeatingDXMultiSpeed.hpp index 0bd1ddaf846..c7b78cc00ab 100644 --- a/src/model/CoilHeatingDXMultiSpeed.hpp +++ b/src/model/CoilHeatingDXMultiSpeed.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilHeatingDXMultiSpeed(const Model& model); - virtual ~CoilHeatingDXMultiSpeed() = default; + virtual ~CoilHeatingDXMultiSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXMultiSpeed(const CoilHeatingDXMultiSpeed& other) = default; CoilHeatingDXMultiSpeed(CoilHeatingDXMultiSpeed&& other) = default; diff --git a/src/model/CoilHeatingDXMultiSpeedStageData.hpp b/src/model/CoilHeatingDXMultiSpeedStageData.hpp index ec25389b3c2..6123a356e73 100644 --- a/src/model/CoilHeatingDXMultiSpeedStageData.hpp +++ b/src/model/CoilHeatingDXMultiSpeedStageData.hpp @@ -37,7 +37,7 @@ namespace model { const Curve& energyInputRatioFunctionofFlowFraction, const Curve& partLoadFractionCorrelation, const Curve& wasteHeatFunctionofTemperature); - virtual ~CoilHeatingDXMultiSpeedStageData() = default; + virtual ~CoilHeatingDXMultiSpeedStageData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXMultiSpeedStageData(const CoilHeatingDXMultiSpeedStageData& other) = default; CoilHeatingDXMultiSpeedStageData(CoilHeatingDXMultiSpeedStageData&& other) = default; diff --git a/src/model/CoilHeatingDXMultiSpeedStageData_Impl.hpp b/src/model/CoilHeatingDXMultiSpeedStageData_Impl.hpp index 2e357196069..1513462e875 100644 --- a/src/model/CoilHeatingDXMultiSpeedStageData_Impl.hpp +++ b/src/model/CoilHeatingDXMultiSpeedStageData_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingDXMultiSpeedStageData_Impl(const CoilHeatingDXMultiSpeedStageData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDXMultiSpeedStageData_Impl() = default; + virtual ~CoilHeatingDXMultiSpeedStageData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDXMultiSpeed_Impl.hpp b/src/model/CoilHeatingDXMultiSpeed_Impl.hpp index 1749697a945..c5731a8abc0 100644 --- a/src/model/CoilHeatingDXMultiSpeed_Impl.hpp +++ b/src/model/CoilHeatingDXMultiSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilHeatingDXMultiSpeed_Impl(const CoilHeatingDXMultiSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDXMultiSpeed_Impl() = default; + virtual ~CoilHeatingDXMultiSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDXSingleSpeed.hpp b/src/model/CoilHeatingDXSingleSpeed.hpp index 1432054dafb..f6cc30b0c84 100644 --- a/src/model/CoilHeatingDXSingleSpeed.hpp +++ b/src/model/CoilHeatingDXSingleSpeed.hpp @@ -38,7 +38,7 @@ namespace model { explicit CoilHeatingDXSingleSpeed(const Model& model); - virtual ~CoilHeatingDXSingleSpeed() = default; + virtual ~CoilHeatingDXSingleSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXSingleSpeed(const CoilHeatingDXSingleSpeed& other) = default; CoilHeatingDXSingleSpeed(CoilHeatingDXSingleSpeed&& other) = default; diff --git a/src/model/CoilHeatingDXSingleSpeed_Impl.hpp b/src/model/CoilHeatingDXSingleSpeed_Impl.hpp index 19b2217b2a6..feb1b69e43d 100644 --- a/src/model/CoilHeatingDXSingleSpeed_Impl.hpp +++ b/src/model/CoilHeatingDXSingleSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingDXSingleSpeed_Impl(const CoilHeatingDXSingleSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDXSingleSpeed_Impl() = default; + virtual ~CoilHeatingDXSingleSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDXVariableRefrigerantFlow.hpp b/src/model/CoilHeatingDXVariableRefrigerantFlow.hpp index 9afc3f76240..ec54232f462 100644 --- a/src/model/CoilHeatingDXVariableRefrigerantFlow.hpp +++ b/src/model/CoilHeatingDXVariableRefrigerantFlow.hpp @@ -28,7 +28,7 @@ namespace model { public: explicit CoilHeatingDXVariableRefrigerantFlow(const Model& model); - virtual ~CoilHeatingDXVariableRefrigerantFlow() = default; + virtual ~CoilHeatingDXVariableRefrigerantFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXVariableRefrigerantFlow(const CoilHeatingDXVariableRefrigerantFlow& other) = default; CoilHeatingDXVariableRefrigerantFlow(CoilHeatingDXVariableRefrigerantFlow&& other) = default; diff --git a/src/model/CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl.hpp b/src/model/CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl.hpp index e8f2a6e1355..ac55119c8e5 100644 --- a/src/model/CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl.hpp +++ b/src/model/CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl(const Model& model); - virtual ~CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl() = default; + virtual ~CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl(const CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl& other) = default; CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl(CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl&& other) = default; diff --git a/src/model/CoilHeatingDXVariableRefrigerantFlow_Impl.hpp b/src/model/CoilHeatingDXVariableRefrigerantFlow_Impl.hpp index 2d0577d9f0b..f37b87943c1 100644 --- a/src/model/CoilHeatingDXVariableRefrigerantFlow_Impl.hpp +++ b/src/model/CoilHeatingDXVariableRefrigerantFlow_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CoilHeatingDXVariableRefrigerantFlow_Impl(const CoilHeatingDXVariableRefrigerantFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDXVariableRefrigerantFlow_Impl() = default; + virtual ~CoilHeatingDXVariableRefrigerantFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDXVariableSpeed.hpp b/src/model/CoilHeatingDXVariableSpeed.hpp index 317866903d2..9771dc21c90 100644 --- a/src/model/CoilHeatingDXVariableSpeed.hpp +++ b/src/model/CoilHeatingDXVariableSpeed.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilHeatingDXVariableSpeed(const Model& model, const Curve& partLoadFraction); - virtual ~CoilHeatingDXVariableSpeed() = default; + virtual ~CoilHeatingDXVariableSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXVariableSpeed(const CoilHeatingDXVariableSpeed& other) = default; CoilHeatingDXVariableSpeed(CoilHeatingDXVariableSpeed&& other) = default; diff --git a/src/model/CoilHeatingDXVariableSpeedSpeedData.hpp b/src/model/CoilHeatingDXVariableSpeedSpeedData.hpp index 28006e2c9ce..4ab1c3d0df5 100644 --- a/src/model/CoilHeatingDXVariableSpeedSpeedData.hpp +++ b/src/model/CoilHeatingDXVariableSpeedSpeedData.hpp @@ -35,7 +35,7 @@ namespace model { const Curve& energyInputRatioFunctionofTemperatureCurve, const Curve& energyInputRatioFunctionofAirFlowFractionCurve); - virtual ~CoilHeatingDXVariableSpeedSpeedData() = default; + virtual ~CoilHeatingDXVariableSpeedSpeedData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDXVariableSpeedSpeedData(const CoilHeatingDXVariableSpeedSpeedData& other) = default; CoilHeatingDXVariableSpeedSpeedData(CoilHeatingDXVariableSpeedSpeedData&& other) = default; diff --git a/src/model/CoilHeatingDXVariableSpeedSpeedData_Impl.hpp b/src/model/CoilHeatingDXVariableSpeedSpeedData_Impl.hpp index d1877136bd9..ace8024bfb7 100644 --- a/src/model/CoilHeatingDXVariableSpeedSpeedData_Impl.hpp +++ b/src/model/CoilHeatingDXVariableSpeedSpeedData_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilHeatingDXVariableSpeedSpeedData_Impl(const CoilHeatingDXVariableSpeedSpeedData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDXVariableSpeedSpeedData_Impl() = default; + virtual ~CoilHeatingDXVariableSpeedSpeedData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDXVariableSpeed_Impl.hpp b/src/model/CoilHeatingDXVariableSpeed_Impl.hpp index 123b790f621..c057967601b 100644 --- a/src/model/CoilHeatingDXVariableSpeed_Impl.hpp +++ b/src/model/CoilHeatingDXVariableSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilHeatingDXVariableSpeed_Impl(const CoilHeatingDXVariableSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDXVariableSpeed_Impl() = default; + virtual ~CoilHeatingDXVariableSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingDesuperheater.hpp b/src/model/CoilHeatingDesuperheater.hpp index 2c134aa5da7..c6b343901df 100644 --- a/src/model/CoilHeatingDesuperheater.hpp +++ b/src/model/CoilHeatingDesuperheater.hpp @@ -40,7 +40,7 @@ namespace model { explicit CoilHeatingDesuperheater(const Model& model); - virtual ~CoilHeatingDesuperheater() = default; + virtual ~CoilHeatingDesuperheater() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingDesuperheater(const CoilHeatingDesuperheater& other) = default; CoilHeatingDesuperheater(CoilHeatingDesuperheater&& other) = default; diff --git a/src/model/CoilHeatingDesuperheater_Impl.hpp b/src/model/CoilHeatingDesuperheater_Impl.hpp index c3e8d46a43f..2322aff7029 100644 --- a/src/model/CoilHeatingDesuperheater_Impl.hpp +++ b/src/model/CoilHeatingDesuperheater_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingDesuperheater_Impl(const CoilHeatingDesuperheater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingDesuperheater_Impl() = default; + virtual ~CoilHeatingDesuperheater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingElectric.hpp b/src/model/CoilHeatingElectric.hpp index 91f05378ca6..469cd07d956 100644 --- a/src/model/CoilHeatingElectric.hpp +++ b/src/model/CoilHeatingElectric.hpp @@ -34,7 +34,7 @@ namespace model { CoilHeatingElectric(const Model& model); - virtual ~CoilHeatingElectric() = default; + virtual ~CoilHeatingElectric() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingElectric(const CoilHeatingElectric& other) = default; CoilHeatingElectric(CoilHeatingElectric&& other) = default; diff --git a/src/model/CoilHeatingElectricMultiStage.hpp b/src/model/CoilHeatingElectricMultiStage.hpp index 389b4539d38..fdd9ef80e1c 100644 --- a/src/model/CoilHeatingElectricMultiStage.hpp +++ b/src/model/CoilHeatingElectricMultiStage.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilHeatingElectricMultiStage(const Model& model); - virtual ~CoilHeatingElectricMultiStage() = default; + virtual ~CoilHeatingElectricMultiStage() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingElectricMultiStage(const CoilHeatingElectricMultiStage& other) = default; CoilHeatingElectricMultiStage(CoilHeatingElectricMultiStage&& other) = default; diff --git a/src/model/CoilHeatingElectricMultiStageStageData.hpp b/src/model/CoilHeatingElectricMultiStageStageData.hpp index dcd25af22c6..dd0e4ecd112 100644 --- a/src/model/CoilHeatingElectricMultiStageStageData.hpp +++ b/src/model/CoilHeatingElectricMultiStageStageData.hpp @@ -29,7 +29,7 @@ namespace model { explicit CoilHeatingElectricMultiStageStageData(const Model& model); - virtual ~CoilHeatingElectricMultiStageStageData() = default; + virtual ~CoilHeatingElectricMultiStageStageData() override = default; CoilHeatingElectricMultiStageStageData(const CoilHeatingElectricMultiStageStageData& other) = default; CoilHeatingElectricMultiStageStageData(CoilHeatingElectricMultiStageStageData&& other) = default; CoilHeatingElectricMultiStageStageData& operator=(const CoilHeatingElectricMultiStageStageData&) = default; diff --git a/src/model/CoilHeatingElectricMultiStageStageData_Impl.hpp b/src/model/CoilHeatingElectricMultiStageStageData_Impl.hpp index 304fd568f97..e8c1f186311 100644 --- a/src/model/CoilHeatingElectricMultiStageStageData_Impl.hpp +++ b/src/model/CoilHeatingElectricMultiStageStageData_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilHeatingElectricMultiStageStageData_Impl(const CoilHeatingElectricMultiStageStageData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingElectricMultiStageStageData_Impl() = default; + virtual ~CoilHeatingElectricMultiStageStageData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingElectricMultiStage_Impl.hpp b/src/model/CoilHeatingElectricMultiStage_Impl.hpp index 5a940e1d98b..d825887fedb 100644 --- a/src/model/CoilHeatingElectricMultiStage_Impl.hpp +++ b/src/model/CoilHeatingElectricMultiStage_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingElectricMultiStage_Impl(const CoilHeatingElectricMultiStage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingElectricMultiStage_Impl() = default; + virtual ~CoilHeatingElectricMultiStage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingElectric_Impl.hpp b/src/model/CoilHeatingElectric_Impl.hpp index 86b58556abc..b7f968cae9d 100644 --- a/src/model/CoilHeatingElectric_Impl.hpp +++ b/src/model/CoilHeatingElectric_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CoilHeatingElectric_Impl(const CoilHeatingElectric_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingElectric_Impl() = default; + virtual ~CoilHeatingElectric_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingFourPipeBeam.hpp b/src/model/CoilHeatingFourPipeBeam.hpp index 548f229387e..f4086c4247e 100644 --- a/src/model/CoilHeatingFourPipeBeam.hpp +++ b/src/model/CoilHeatingFourPipeBeam.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilHeatingFourPipeBeam(const Model& model); - virtual ~CoilHeatingFourPipeBeam() = default; + virtual ~CoilHeatingFourPipeBeam() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingFourPipeBeam(const CoilHeatingFourPipeBeam& other) = default; CoilHeatingFourPipeBeam(CoilHeatingFourPipeBeam&& other) = default; diff --git a/src/model/CoilHeatingFourPipeBeam_Impl.hpp b/src/model/CoilHeatingFourPipeBeam_Impl.hpp index b393376fadc..42cfa4baa8d 100644 --- a/src/model/CoilHeatingFourPipeBeam_Impl.hpp +++ b/src/model/CoilHeatingFourPipeBeam_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilHeatingFourPipeBeam_Impl(const CoilHeatingFourPipeBeam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingFourPipeBeam_Impl() = default; + virtual ~CoilHeatingFourPipeBeam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingGas.hpp b/src/model/CoilHeatingGas.hpp index c9da1d25a13..f39d795b830 100644 --- a/src/model/CoilHeatingGas.hpp +++ b/src/model/CoilHeatingGas.hpp @@ -49,7 +49,7 @@ namespace model { explicit CoilHeatingGas(const Model& model); - virtual ~CoilHeatingGas() = default; + virtual ~CoilHeatingGas() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingGas(const CoilHeatingGas& other) = default; CoilHeatingGas(CoilHeatingGas&& other) = default; diff --git a/src/model/CoilHeatingGasMultiStage.hpp b/src/model/CoilHeatingGasMultiStage.hpp index 557723c3c95..14b469ea180 100644 --- a/src/model/CoilHeatingGasMultiStage.hpp +++ b/src/model/CoilHeatingGasMultiStage.hpp @@ -34,7 +34,7 @@ namespace model { explicit CoilHeatingGasMultiStage(const Model& model); - virtual ~CoilHeatingGasMultiStage() = default; + virtual ~CoilHeatingGasMultiStage() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingGasMultiStage(const CoilHeatingGasMultiStage& other) = default; CoilHeatingGasMultiStage(CoilHeatingGasMultiStage&& other) = default; diff --git a/src/model/CoilHeatingGasMultiStageStageData.hpp b/src/model/CoilHeatingGasMultiStageStageData.hpp index be28e464d9c..5eb1cf5d1a0 100644 --- a/src/model/CoilHeatingGasMultiStageStageData.hpp +++ b/src/model/CoilHeatingGasMultiStageStageData.hpp @@ -30,7 +30,7 @@ namespace model { explicit CoilHeatingGasMultiStageStageData(const Model& model); - virtual ~CoilHeatingGasMultiStageStageData() = default; + virtual ~CoilHeatingGasMultiStageStageData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingGasMultiStageStageData(const CoilHeatingGasMultiStageStageData& other) = default; CoilHeatingGasMultiStageStageData(CoilHeatingGasMultiStageStageData&& other) = default; diff --git a/src/model/CoilHeatingGasMultiStageStageData_Impl.hpp b/src/model/CoilHeatingGasMultiStageStageData_Impl.hpp index c3161bec36f..dc1a3f884ac 100644 --- a/src/model/CoilHeatingGasMultiStageStageData_Impl.hpp +++ b/src/model/CoilHeatingGasMultiStageStageData_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilHeatingGasMultiStageStageData_Impl(const CoilHeatingGasMultiStageStageData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingGasMultiStageStageData_Impl() = default; + virtual ~CoilHeatingGasMultiStageStageData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingGasMultiStage_Impl.hpp b/src/model/CoilHeatingGasMultiStage_Impl.hpp index 47d2ed6011a..872f5e8a631 100644 --- a/src/model/CoilHeatingGasMultiStage_Impl.hpp +++ b/src/model/CoilHeatingGasMultiStage_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilHeatingGasMultiStage_Impl(const CoilHeatingGasMultiStage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingGasMultiStage_Impl() = default; + virtual ~CoilHeatingGasMultiStage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingGas_Impl.hpp b/src/model/CoilHeatingGas_Impl.hpp index 3add765904d..c8737939e99 100644 --- a/src/model/CoilHeatingGas_Impl.hpp +++ b/src/model/CoilHeatingGas_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilHeatingGas_Impl(const CoilHeatingGas_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~CoilHeatingGas_Impl() = default; + virtual ~CoilHeatingGas_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingLowTempRadiantConstFlow.hpp b/src/model/CoilHeatingLowTempRadiantConstFlow.hpp index a26cdbee687..811b0806ec8 100644 --- a/src/model/CoilHeatingLowTempRadiantConstFlow.hpp +++ b/src/model/CoilHeatingLowTempRadiantConstFlow.hpp @@ -39,7 +39,7 @@ namespace model { Schedule& heatingLowWaterTemperatureSchedule, Schedule& heatingHighControlTemperatureSchedule, Schedule& heatingLowControlTemperatureSchedule); - virtual ~CoilHeatingLowTempRadiantConstFlow() = default; + virtual ~CoilHeatingLowTempRadiantConstFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingLowTempRadiantConstFlow(const CoilHeatingLowTempRadiantConstFlow& other) = default; CoilHeatingLowTempRadiantConstFlow(CoilHeatingLowTempRadiantConstFlow&& other) = default; diff --git a/src/model/CoilHeatingLowTempRadiantConstFlow_Impl.hpp b/src/model/CoilHeatingLowTempRadiantConstFlow_Impl.hpp index f769100a081..592c09367c7 100644 --- a/src/model/CoilHeatingLowTempRadiantConstFlow_Impl.hpp +++ b/src/model/CoilHeatingLowTempRadiantConstFlow_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingLowTempRadiantConstFlow_Impl(const CoilHeatingLowTempRadiantConstFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingLowTempRadiantConstFlow_Impl() = default; + virtual ~CoilHeatingLowTempRadiantConstFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingLowTempRadiantVarFlow.hpp b/src/model/CoilHeatingLowTempRadiantVarFlow.hpp index d5e5356d63a..a4cc54d8fec 100644 --- a/src/model/CoilHeatingLowTempRadiantVarFlow.hpp +++ b/src/model/CoilHeatingLowTempRadiantVarFlow.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilHeatingLowTempRadiantVarFlow(const Model& model, Schedule& heatingControlTemperature); - virtual ~CoilHeatingLowTempRadiantVarFlow() = default; + virtual ~CoilHeatingLowTempRadiantVarFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingLowTempRadiantVarFlow(const CoilHeatingLowTempRadiantVarFlow& other) = default; CoilHeatingLowTempRadiantVarFlow(CoilHeatingLowTempRadiantVarFlow&& other) = default; diff --git a/src/model/CoilHeatingLowTempRadiantVarFlow_Impl.hpp b/src/model/CoilHeatingLowTempRadiantVarFlow_Impl.hpp index 81e4c0dba5a..86eeae51e8e 100644 --- a/src/model/CoilHeatingLowTempRadiantVarFlow_Impl.hpp +++ b/src/model/CoilHeatingLowTempRadiantVarFlow_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingLowTempRadiantVarFlow_Impl(const CoilHeatingLowTempRadiantVarFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingLowTempRadiantVarFlow_Impl() = default; + virtual ~CoilHeatingLowTempRadiantVarFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingWater.hpp b/src/model/CoilHeatingWater.hpp index 3464aafc02b..7dc610cb799 100644 --- a/src/model/CoilHeatingWater.hpp +++ b/src/model/CoilHeatingWater.hpp @@ -44,7 +44,7 @@ namespace model { CoilHeatingWater(const Model& model); - virtual ~CoilHeatingWater() = default; + virtual ~CoilHeatingWater() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingWater(const CoilHeatingWater& other) = default; CoilHeatingWater(CoilHeatingWater&& other) = default; diff --git a/src/model/CoilHeatingWaterBaseboard.hpp b/src/model/CoilHeatingWaterBaseboard.hpp index d74260a261d..2aec2b93ae4 100644 --- a/src/model/CoilHeatingWaterBaseboard.hpp +++ b/src/model/CoilHeatingWaterBaseboard.hpp @@ -28,7 +28,7 @@ namespace model { CoilHeatingWaterBaseboard(const Model& model); - virtual ~CoilHeatingWaterBaseboard() = default; + virtual ~CoilHeatingWaterBaseboard() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingWaterBaseboard(const CoilHeatingWaterBaseboard& other) = default; CoilHeatingWaterBaseboard(CoilHeatingWaterBaseboard&& other) = default; diff --git a/src/model/CoilHeatingWaterBaseboardRadiant.hpp b/src/model/CoilHeatingWaterBaseboardRadiant.hpp index ca53f23050d..0ca719e0bb9 100644 --- a/src/model/CoilHeatingWaterBaseboardRadiant.hpp +++ b/src/model/CoilHeatingWaterBaseboardRadiant.hpp @@ -28,7 +28,7 @@ namespace model { explicit CoilHeatingWaterBaseboardRadiant(const Model& model); - virtual ~CoilHeatingWaterBaseboardRadiant() = default; + virtual ~CoilHeatingWaterBaseboardRadiant() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingWaterBaseboardRadiant(const CoilHeatingWaterBaseboardRadiant& other) = default; CoilHeatingWaterBaseboardRadiant(CoilHeatingWaterBaseboardRadiant&& other) = default; diff --git a/src/model/CoilHeatingWaterBaseboardRadiant_Impl.hpp b/src/model/CoilHeatingWaterBaseboardRadiant_Impl.hpp index 154a61fc3e3..1a7178c565c 100644 --- a/src/model/CoilHeatingWaterBaseboardRadiant_Impl.hpp +++ b/src/model/CoilHeatingWaterBaseboardRadiant_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilHeatingWaterBaseboardRadiant_Impl(const CoilHeatingWaterBaseboardRadiant_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingWaterBaseboardRadiant_Impl() = default; + virtual ~CoilHeatingWaterBaseboardRadiant_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingWaterBaseboard_Impl.hpp b/src/model/CoilHeatingWaterBaseboard_Impl.hpp index 798f477ffd0..51960678724 100644 --- a/src/model/CoilHeatingWaterBaseboard_Impl.hpp +++ b/src/model/CoilHeatingWaterBaseboard_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilHeatingWaterBaseboard_Impl(const CoilHeatingWaterBaseboard_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingWaterBaseboard_Impl() = default; + virtual ~CoilHeatingWaterBaseboard_Impl() override = default; //@} diff --git a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp index 327db8416ca..da88aa5949d 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp @@ -35,7 +35,7 @@ namespace model { CoilHeatingWaterToAirHeatPumpEquationFit(const Model& model); - virtual ~CoilHeatingWaterToAirHeatPumpEquationFit() = default; + virtual ~CoilHeatingWaterToAirHeatPumpEquationFit() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingWaterToAirHeatPumpEquationFit(const CoilHeatingWaterToAirHeatPumpEquationFit& other) = default; CoilHeatingWaterToAirHeatPumpEquationFit(CoilHeatingWaterToAirHeatPumpEquationFit&& other) = default; diff --git a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit_Impl.hpp b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit_Impl.hpp index faf83108188..7cdcc4fb12a 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit_Impl.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilHeatingWaterToAirHeatPumpEquationFit_Impl(const CoilHeatingWaterToAirHeatPumpEquationFit_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingWaterToAirHeatPumpEquationFit_Impl() = default; + virtual ~CoilHeatingWaterToAirHeatPumpEquationFit_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit.hpp b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit.hpp index f5a3a4168d1..a0545f71d11 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit(const Model& model, const Curve& partLoadFraction); - virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit() = default; + virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit(const CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit& other) = default; CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit(CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit&& other) = default; diff --git a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp index 0a08b709c70..7d935e9a6b7 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData.hpp @@ -38,7 +38,7 @@ namespace model { const Curve& energyInputRatioFunctionofWaterFlowFraction, const Curve& wasteHeatFunctionofTemperature); - virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData() = default; + virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData(const CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData& other) = default; diff --git a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp index ab8e89b8881..1605ab02f0c 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl( const CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl() = default; + virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFitSpeedData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp index 78fc18e2f3f..cc5faf7b51d 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl.hpp @@ -33,7 +33,7 @@ namespace model { CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl(const CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl() = default; + virtual ~CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilHeatingWater_Impl.hpp b/src/model/CoilHeatingWater_Impl.hpp index f8650887e10..ac13e28b72f 100644 --- a/src/model/CoilHeatingWater_Impl.hpp +++ b/src/model/CoilHeatingWater_Impl.hpp @@ -27,7 +27,7 @@ namespace model { CoilHeatingWater_Impl(const CoilHeatingWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilHeatingWater_Impl() = default; + virtual ~CoilHeatingWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilPerformanceDXCooling.hpp b/src/model/CoilPerformanceDXCooling.hpp index 4e1cdc26652..e18805778de 100644 --- a/src/model/CoilPerformanceDXCooling.hpp +++ b/src/model/CoilPerformanceDXCooling.hpp @@ -35,7 +35,7 @@ namespace model { const Curve& coolingCapacityFunctionofFlowFraction, const Curve& energyInputRatioFunctionofTemperature, const Curve& energyInputRatioFunctionofFlowFraction, const Curve& partLoadFractionCorrelation); - virtual ~CoilPerformanceDXCooling() = default; + virtual ~CoilPerformanceDXCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilPerformanceDXCooling(const CoilPerformanceDXCooling& other) = default; CoilPerformanceDXCooling(CoilPerformanceDXCooling&& other) = default; diff --git a/src/model/CoilPerformanceDXCooling_Impl.hpp b/src/model/CoilPerformanceDXCooling_Impl.hpp index 89316dcea36..c521b8e4b47 100644 --- a/src/model/CoilPerformanceDXCooling_Impl.hpp +++ b/src/model/CoilPerformanceDXCooling_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoilPerformanceDXCooling_Impl(const CoilPerformanceDXCooling_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilPerformanceDXCooling_Impl() = default; + virtual ~CoilPerformanceDXCooling_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilSystemCoolingDXHeatExchangerAssisted.hpp b/src/model/CoilSystemCoolingDXHeatExchangerAssisted.hpp index a406483cafe..53fd51e68a0 100644 --- a/src/model/CoilSystemCoolingDXHeatExchangerAssisted.hpp +++ b/src/model/CoilSystemCoolingDXHeatExchangerAssisted.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoilSystemCoolingDXHeatExchangerAssisted(const Model& model, const AirToAirComponent& heatExchanger); - virtual ~CoilSystemCoolingDXHeatExchangerAssisted() = default; + virtual ~CoilSystemCoolingDXHeatExchangerAssisted() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilSystemCoolingDXHeatExchangerAssisted(const CoilSystemCoolingDXHeatExchangerAssisted& other) = default; CoilSystemCoolingDXHeatExchangerAssisted(CoilSystemCoolingDXHeatExchangerAssisted&& other) = default; diff --git a/src/model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp b/src/model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp index a73198768fc..6cb8dfe9621 100644 --- a/src/model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp +++ b/src/model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilSystemCoolingDXHeatExchangerAssisted_Impl(const CoilSystemCoolingDXHeatExchangerAssisted_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilSystemCoolingDXHeatExchangerAssisted_Impl() = default; + virtual ~CoilSystemCoolingDXHeatExchangerAssisted_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilSystemCoolingWaterHeatExchangerAssisted.hpp b/src/model/CoilSystemCoolingWaterHeatExchangerAssisted.hpp index 080ca8d177c..b1c7f2e43da 100644 --- a/src/model/CoilSystemCoolingWaterHeatExchangerAssisted.hpp +++ b/src/model/CoilSystemCoolingWaterHeatExchangerAssisted.hpp @@ -33,7 +33,7 @@ namespace model { explicit CoilSystemCoolingWaterHeatExchangerAssisted(const Model& model, const AirToAirComponent& heatExchanger); - virtual ~CoilSystemCoolingWaterHeatExchangerAssisted() = default; + virtual ~CoilSystemCoolingWaterHeatExchangerAssisted() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilSystemCoolingWaterHeatExchangerAssisted(const CoilSystemCoolingWaterHeatExchangerAssisted& other) = default; CoilSystemCoolingWaterHeatExchangerAssisted(CoilSystemCoolingWaterHeatExchangerAssisted&& other) = default; diff --git a/src/model/CoilSystemCoolingWaterHeatExchangerAssisted_Impl.hpp b/src/model/CoilSystemCoolingWaterHeatExchangerAssisted_Impl.hpp index 45e9a9e0c7a..85bb4ef471c 100644 --- a/src/model/CoilSystemCoolingWaterHeatExchangerAssisted_Impl.hpp +++ b/src/model/CoilSystemCoolingWaterHeatExchangerAssisted_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilSystemCoolingWaterHeatExchangerAssisted_Impl(const CoilSystemCoolingWaterHeatExchangerAssisted_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilSystemCoolingWaterHeatExchangerAssisted_Impl() = default; + virtual ~CoilSystemCoolingWaterHeatExchangerAssisted_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilSystemIntegratedHeatPumpAirSource.hpp b/src/model/CoilSystemIntegratedHeatPumpAirSource.hpp index 5d09118ff68..3c9bbc6a751 100644 --- a/src/model/CoilSystemIntegratedHeatPumpAirSource.hpp +++ b/src/model/CoilSystemIntegratedHeatPumpAirSource.hpp @@ -37,7 +37,7 @@ namespace model { const HVACComponent& scdwhWaterHeatingCoil, const StraightComponent& shdwhHeatingCoil, const HVACComponent& shdwhWaterHeatingCoil); - virtual ~CoilSystemIntegratedHeatPumpAirSource() = default; + virtual ~CoilSystemIntegratedHeatPumpAirSource() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilSystemIntegratedHeatPumpAirSource(const CoilSystemIntegratedHeatPumpAirSource& other) = default; CoilSystemIntegratedHeatPumpAirSource(CoilSystemIntegratedHeatPumpAirSource&& other) = default; diff --git a/src/model/CoilSystemIntegratedHeatPumpAirSource_Impl.hpp b/src/model/CoilSystemIntegratedHeatPumpAirSource_Impl.hpp index a55fbee2b68..2509b914d56 100644 --- a/src/model/CoilSystemIntegratedHeatPumpAirSource_Impl.hpp +++ b/src/model/CoilSystemIntegratedHeatPumpAirSource_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilSystemIntegratedHeatPumpAirSource_Impl(const CoilSystemIntegratedHeatPumpAirSource_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilSystemIntegratedHeatPumpAirSource_Impl() = default; + virtual ~CoilSystemIntegratedHeatPumpAirSource_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilUserDefined.hpp b/src/model/CoilUserDefined.hpp index 08471b5b41a..467475caf01 100644 --- a/src/model/CoilUserDefined.hpp +++ b/src/model/CoilUserDefined.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilUserDefined(const Model& model); - virtual ~CoilUserDefined() = default; + virtual ~CoilUserDefined() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilUserDefined(const CoilUserDefined& other) = default; CoilUserDefined(CoilUserDefined&& other) = default; diff --git a/src/model/CoilUserDefined_Impl.hpp b/src/model/CoilUserDefined_Impl.hpp index 6458ae2d717..d8d224171ff 100644 --- a/src/model/CoilUserDefined_Impl.hpp +++ b/src/model/CoilUserDefined_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CoilUserDefined_Impl(const CoilUserDefined_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilUserDefined_Impl() = default; + virtual ~CoilUserDefined_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPump.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPump.hpp index 22a7bd22c65..5ab9ce81027 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPump.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPump.hpp @@ -38,7 +38,7 @@ namespace model { Curve& heatingCOPFunctionofAirFlowFractionCurve, Curve& heatingCOPFunctionofWaterFlowFractionCurve, Curve& partLoadFractionCorrelationCurve); - virtual ~CoilWaterHeatingAirToWaterHeatPump() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPump() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilWaterHeatingAirToWaterHeatPump(const CoilWaterHeatingAirToWaterHeatPump& other) = default; CoilWaterHeatingAirToWaterHeatPump(CoilWaterHeatingAirToWaterHeatPump&& other) = default; diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed.hpp index f7828c8ba1e..96c13e29191 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoilWaterHeatingAirToWaterHeatPumpVariableSpeed(const Model& model); - virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeed() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilWaterHeatingAirToWaterHeatPumpVariableSpeed(const CoilWaterHeatingAirToWaterHeatPumpVariableSpeed& other) = default; CoilWaterHeatingAirToWaterHeatPumpVariableSpeed(CoilWaterHeatingAirToWaterHeatPumpVariableSpeed&& other) = default; diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData.hpp index 52740dd30d4..7396ed78717 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData.hpp @@ -30,7 +30,7 @@ namespace model { explicit CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData(const Model& model); - virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData(const CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData& other) = default; CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData(CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData&& other) = default; diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl.hpp index 649ca73fe46..4fc47e12ccd 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl(const CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeedSpeedData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl.hpp index 3511cb77ce2..a8638ae0090 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl(const CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPumpVariableSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped.hpp index 15930427455..47733451b75 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped.hpp @@ -30,7 +30,7 @@ namespace model { explicit CoilWaterHeatingAirToWaterHeatPumpWrapped(const Model& model); - virtual ~CoilWaterHeatingAirToWaterHeatPumpWrapped() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPumpWrapped() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilWaterHeatingAirToWaterHeatPumpWrapped(const CoilWaterHeatingAirToWaterHeatPumpWrapped& other) = default; CoilWaterHeatingAirToWaterHeatPumpWrapped(CoilWaterHeatingAirToWaterHeatPumpWrapped&& other) = default; diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl.hpp index 8301f4b33d5..58637bbd87d 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl(const CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPumpWrapped_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilWaterHeatingAirToWaterHeatPump_Impl.hpp b/src/model/CoilWaterHeatingAirToWaterHeatPump_Impl.hpp index bb769fb9c9c..7ab7f46be39 100644 --- a/src/model/CoilWaterHeatingAirToWaterHeatPump_Impl.hpp +++ b/src/model/CoilWaterHeatingAirToWaterHeatPump_Impl.hpp @@ -29,7 +29,7 @@ namespace model { CoilWaterHeatingAirToWaterHeatPump_Impl(const CoilWaterHeatingAirToWaterHeatPump_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilWaterHeatingAirToWaterHeatPump_Impl() = default; + virtual ~CoilWaterHeatingAirToWaterHeatPump_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoilWaterHeatingDesuperheater.hpp b/src/model/CoilWaterHeatingDesuperheater.hpp index b0eff9dec1f..16aa85a0195 100644 --- a/src/model/CoilWaterHeatingDesuperheater.hpp +++ b/src/model/CoilWaterHeatingDesuperheater.hpp @@ -32,7 +32,7 @@ namespace model { explicit CoilWaterHeatingDesuperheater(const Model& model, Schedule& setpointTemperatureSchedule); - virtual ~CoilWaterHeatingDesuperheater() = default; + virtual ~CoilWaterHeatingDesuperheater() override = default; // Default the copy and move operators because the virtual dtor is explicit CoilWaterHeatingDesuperheater(const CoilWaterHeatingDesuperheater& other) = default; CoilWaterHeatingDesuperheater(CoilWaterHeatingDesuperheater&& other) = default; diff --git a/src/model/CoilWaterHeatingDesuperheater_Impl.hpp b/src/model/CoilWaterHeatingDesuperheater_Impl.hpp index 0d44663bf34..852caf50da2 100644 --- a/src/model/CoilWaterHeatingDesuperheater_Impl.hpp +++ b/src/model/CoilWaterHeatingDesuperheater_Impl.hpp @@ -31,7 +31,7 @@ namespace model { CoilWaterHeatingDesuperheater_Impl(const CoilWaterHeatingDesuperheater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoilWaterHeatingDesuperheater_Impl() = default; + virtual ~CoilWaterHeatingDesuperheater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Component.hpp b/src/model/Component.hpp index 3df423522e6..52fd25ae8d6 100644 --- a/src/model/Component.hpp +++ b/src/model/Component.hpp @@ -40,7 +40,7 @@ namespace model { * list in ComponentData must exactly match the contents of idfFile. */ explicit Component(const openstudio::IdfFile& idfFile); - virtual ~Component() = default; + virtual ~Component() override = default; // Default the copy and move operators because the virtual dtor is explicit Component(const Component& other) = default; Component(Component&& other) = default; diff --git a/src/model/ComponentCostAdjustments.hpp b/src/model/ComponentCostAdjustments.hpp index 5df47d8b83d..0ff8c30744e 100644 --- a/src/model/ComponentCostAdjustments.hpp +++ b/src/model/ComponentCostAdjustments.hpp @@ -32,7 +32,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ComponentCostAdjustments() = default; + virtual ~ComponentCostAdjustments() override = default; // Default the copy and move operators because the virtual dtor is explicit ComponentCostAdjustments(const ComponentCostAdjustments& other) = default; ComponentCostAdjustments(ComponentCostAdjustments&& other) = default; diff --git a/src/model/ComponentCostAdjustments_Impl.hpp b/src/model/ComponentCostAdjustments_Impl.hpp index c547522ea8a..e5c2521744e 100644 --- a/src/model/ComponentCostAdjustments_Impl.hpp +++ b/src/model/ComponentCostAdjustments_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ComponentCostAdjustments_Impl(const ComponentCostAdjustments_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ComponentCostAdjustments_Impl() = default; + virtual ~ComponentCostAdjustments_Impl() override = default; boost::optional miscellaneousCostPerConditionedArea() const; bool setMiscellaneousCostPerConditionedArea(double num); diff --git a/src/model/ComponentData.hpp b/src/model/ComponentData.hpp index 0894b6e6741..2780f8cf336 100644 --- a/src/model/ComponentData.hpp +++ b/src/model/ComponentData.hpp @@ -29,7 +29,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ComponentData() = default; + virtual ~ComponentData() override = default; // Default the copy and move operators because the virtual dtor is explicit ComponentData(const ComponentData& other) = default; ComponentData(ComponentData&& other) = default; diff --git a/src/model/ComponentData_Impl.hpp b/src/model/ComponentData_Impl.hpp index 42e9cd67654..a227a76b634 100644 --- a/src/model/ComponentData_Impl.hpp +++ b/src/model/ComponentData_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ComponentData_Impl(const ComponentData_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ComponentData_Impl() = default; + virtual ~ComponentData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Component_Impl.hpp b/src/model/Component_Impl.hpp index d47138f2b64..9ecac7dedae 100644 --- a/src/model/Component_Impl.hpp +++ b/src/model/Component_Impl.hpp @@ -46,7 +46,7 @@ namespace model { // no swap method here because no component-level data - virtual ~Component_Impl() = default; + virtual ~Component_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/Connection.hpp b/src/model/Connection.hpp index 277cd96ca78..bbb76ec1e1c 100644 --- a/src/model/Connection.hpp +++ b/src/model/Connection.hpp @@ -23,7 +23,7 @@ namespace model { // constructor explicit Connection(const Model& model); - virtual ~Connection() = default; + virtual ~Connection() override = default; // Default the copy and move operators because the virtual dtor is explicit Connection(const Connection& other) = default; Connection(Connection&& other) = default; diff --git a/src/model/Connection_Impl.hpp b/src/model/Connection_Impl.hpp index 977277078d0..633e58177fc 100644 --- a/src/model/Connection_Impl.hpp +++ b/src/model/Connection_Impl.hpp @@ -22,7 +22,7 @@ namespace model { Connection_Impl(const Connection_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Connection_Impl() = default; + virtual ~Connection_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ConnectorMixer.hpp b/src/model/ConnectorMixer.hpp index d7a9d30eb3d..1d891beb1b3 100644 --- a/src/model/ConnectorMixer.hpp +++ b/src/model/ConnectorMixer.hpp @@ -30,7 +30,7 @@ namespace model { /** Constructs a new Mixer object and places it inside the model. */ explicit ConnectorMixer(const Model& model); - virtual ~ConnectorMixer() = default; + virtual ~ConnectorMixer() override = default; // Default the copy and move operators because the virtual dtor is explicit ConnectorMixer(const ConnectorMixer& other) = default; ConnectorMixer(ConnectorMixer&& other) = default; diff --git a/src/model/ConnectorMixer_Impl.hpp b/src/model/ConnectorMixer_Impl.hpp index 6660c1ead59..ed773967a1d 100644 --- a/src/model/ConnectorMixer_Impl.hpp +++ b/src/model/ConnectorMixer_Impl.hpp @@ -23,7 +23,7 @@ namespace model { ConnectorMixer_Impl(const ConnectorMixer_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ConnectorMixer_Impl() = default; + virtual ~ConnectorMixer_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ConnectorSplitter.hpp b/src/model/ConnectorSplitter.hpp index f6ab000cc31..7fd17e10d31 100644 --- a/src/model/ConnectorSplitter.hpp +++ b/src/model/ConnectorSplitter.hpp @@ -30,7 +30,7 @@ namespace model { /** Constructs a new Splitter object and places it inside the model. */ explicit ConnectorSplitter(const Model& model); - virtual ~ConnectorSplitter() = default; + virtual ~ConnectorSplitter() override = default; // Default the copy and move operators because the virtual dtor is explicit ConnectorSplitter(const ConnectorSplitter& other) = default; ConnectorSplitter(ConnectorSplitter&& other) = default; diff --git a/src/model/ConnectorSplitter_Impl.hpp b/src/model/ConnectorSplitter_Impl.hpp index 21a63a95324..07265965b7b 100644 --- a/src/model/ConnectorSplitter_Impl.hpp +++ b/src/model/ConnectorSplitter_Impl.hpp @@ -22,7 +22,7 @@ namespace model { ConnectorSplitter_Impl(const ConnectorSplitter_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ConnectorSplitter_Impl() = default; + virtual ~ConnectorSplitter_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/Construction.hpp b/src/model/Construction.hpp index 6e2dafd64af..9323978bd0c 100644 --- a/src/model/Construction.hpp +++ b/src/model/Construction.hpp @@ -35,7 +35,7 @@ namespace model { explicit Construction(const ModelPartitionMaterial& modelPartitionMaterial); - virtual ~Construction() = default; + virtual ~Construction() override = default; // Default the copy and move operators because the virtual dtor is explicit Construction(const Construction& other) = default; Construction(Construction&& other) = default; diff --git a/src/model/ConstructionAirBoundary.hpp b/src/model/ConstructionAirBoundary.hpp index f7ad182f6ef..a80f4a5ca22 100644 --- a/src/model/ConstructionAirBoundary.hpp +++ b/src/model/ConstructionAirBoundary.hpp @@ -32,7 +32,7 @@ namespace model { explicit ConstructionAirBoundary(const Model& model); - virtual ~ConstructionAirBoundary() = default; + virtual ~ConstructionAirBoundary() override = default; // Default the copy and move operators because the virtual dtor is explicit ConstructionAirBoundary(const ConstructionAirBoundary& other) = default; ConstructionAirBoundary(ConstructionAirBoundary&& other) = default; diff --git a/src/model/ConstructionAirBoundary_Impl.hpp b/src/model/ConstructionAirBoundary_Impl.hpp index 72319e564cc..9e2c2b0e3c5 100644 --- a/src/model/ConstructionAirBoundary_Impl.hpp +++ b/src/model/ConstructionAirBoundary_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ConstructionAirBoundary_Impl(const ConstructionAirBoundary_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ConstructionAirBoundary_Impl() = default; + virtual ~ConstructionAirBoundary_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ConstructionBase.hpp b/src/model/ConstructionBase.hpp index 5f2bdbef4ac..c9fbb2197af 100644 --- a/src/model/ConstructionBase.hpp +++ b/src/model/ConstructionBase.hpp @@ -27,7 +27,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ConstructionBase() = default; + virtual ~ConstructionBase() override = default; // Default the copy and move operators because the virtual dtor is explicit ConstructionBase(const ConstructionBase& other) = default; ConstructionBase(ConstructionBase&& other) = default; diff --git a/src/model/ConstructionBase_Impl.hpp b/src/model/ConstructionBase_Impl.hpp index 45fb3edd16a..c8503c3b3e3 100644 --- a/src/model/ConstructionBase_Impl.hpp +++ b/src/model/ConstructionBase_Impl.hpp @@ -40,7 +40,7 @@ namespace model { // Clone copy constructor. ConstructionBase_Impl(const ConstructionBase_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ConstructionBase_Impl() = default; + virtual ~ConstructionBase_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/ConstructionWithInternalSource.hpp b/src/model/ConstructionWithInternalSource.hpp index e119d6f5d3b..5ce65da5a9a 100644 --- a/src/model/ConstructionWithInternalSource.hpp +++ b/src/model/ConstructionWithInternalSource.hpp @@ -33,7 +33,7 @@ namespace model { /// Constructor with vector of material layers, throws if opaqueMaterials size < 2. explicit ConstructionWithInternalSource(const std::vector& opaqueMaterials); - virtual ~ConstructionWithInternalSource() = default; + virtual ~ConstructionWithInternalSource() override = default; // Default the copy and move operators because the virtual dtor is explicit ConstructionWithInternalSource(const ConstructionWithInternalSource& other) = default; ConstructionWithInternalSource(ConstructionWithInternalSource&& other) = default; diff --git a/src/model/ConstructionWithInternalSource_Impl.hpp b/src/model/ConstructionWithInternalSource_Impl.hpp index e9cbaa5bee3..72caa706497 100644 --- a/src/model/ConstructionWithInternalSource_Impl.hpp +++ b/src/model/ConstructionWithInternalSource_Impl.hpp @@ -25,7 +25,7 @@ namespace model { ConstructionWithInternalSource_Impl(const ConstructionWithInternalSource_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ConstructionWithInternalSource_Impl() = default; + virtual ~ConstructionWithInternalSource_Impl() override = default; /** Get all output variables names that could be associated with this object. These variables * may or may not be available for each simulation, need to check report variable dictionary diff --git a/src/model/Construction_Impl.hpp b/src/model/Construction_Impl.hpp index aa2dea68f89..aff5bcd820a 100644 --- a/src/model/Construction_Impl.hpp +++ b/src/model/Construction_Impl.hpp @@ -25,7 +25,7 @@ namespace model { Construction_Impl(const Construction_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~Construction_Impl() = default; + virtual ~Construction_Impl() override = default; /** Get all output variables names that could be associated with this object. These variables * may or may not be available for each simulation, need to check report variable dictionary diff --git a/src/model/ControllerMechanicalVentilation.hpp b/src/model/ControllerMechanicalVentilation.hpp index b34eeab3944..ab3e150e2af 100644 --- a/src/model/ControllerMechanicalVentilation.hpp +++ b/src/model/ControllerMechanicalVentilation.hpp @@ -27,7 +27,7 @@ namespace model { public: explicit ControllerMechanicalVentilation(const Model& model); - virtual ~ControllerMechanicalVentilation() = default; + virtual ~ControllerMechanicalVentilation() override = default; // Default the copy and move operators because the virtual dtor is explicit ControllerMechanicalVentilation(const ControllerMechanicalVentilation& other) = default; ControllerMechanicalVentilation(ControllerMechanicalVentilation&& other) = default; diff --git a/src/model/ControllerMechanicalVentilation_Impl.hpp b/src/model/ControllerMechanicalVentilation_Impl.hpp index b46d585aad4..a3858192afc 100644 --- a/src/model/ControllerMechanicalVentilation_Impl.hpp +++ b/src/model/ControllerMechanicalVentilation_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ControllerMechanicalVentilation_Impl(const ControllerMechanicalVentilation_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ControllerMechanicalVentilation_Impl() = default; + virtual ~ControllerMechanicalVentilation_Impl() override = default; //@} diff --git a/src/model/ControllerOutdoorAir.hpp b/src/model/ControllerOutdoorAir.hpp index aaf95cc0cb5..f5601060fa3 100644 --- a/src/model/ControllerOutdoorAir.hpp +++ b/src/model/ControllerOutdoorAir.hpp @@ -33,7 +33,7 @@ namespace model { public: explicit ControllerOutdoorAir(const Model& model); - virtual ~ControllerOutdoorAir() = default; + virtual ~ControllerOutdoorAir() override = default; // Default the copy and move operators because the virtual dtor is explicit ControllerOutdoorAir(const ControllerOutdoorAir& other) = default; ControllerOutdoorAir(ControllerOutdoorAir&& other) = default; diff --git a/src/model/ControllerOutdoorAir_Impl.hpp b/src/model/ControllerOutdoorAir_Impl.hpp index 04a4b4b0f7d..688e18a3c27 100644 --- a/src/model/ControllerOutdoorAir_Impl.hpp +++ b/src/model/ControllerOutdoorAir_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ControllerOutdoorAir_Impl(const ControllerOutdoorAir_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ControllerOutdoorAir_Impl() = default; + virtual ~ControllerOutdoorAir_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ControllerWaterCoil.hpp b/src/model/ControllerWaterCoil.hpp index 52664514b52..b1e99d71d6f 100644 --- a/src/model/ControllerWaterCoil.hpp +++ b/src/model/ControllerWaterCoil.hpp @@ -32,7 +32,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ControllerWaterCoil() = default; + virtual ~ControllerWaterCoil() override = default; // Default the copy and move operators because the virtual dtor is explicit ControllerWaterCoil(const ControllerWaterCoil& other) = default; ControllerWaterCoil(ControllerWaterCoil&& other) = default; diff --git a/src/model/ControllerWaterCoil_Impl.hpp b/src/model/ControllerWaterCoil_Impl.hpp index 9d6aec6d0a5..1af7ec8f2b1 100644 --- a/src/model/ControllerWaterCoil_Impl.hpp +++ b/src/model/ControllerWaterCoil_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ControllerWaterCoil_Impl(const ControllerWaterCoil_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ControllerWaterCoil_Impl() = default; + virtual ~ControllerWaterCoil_Impl() override = default; //@} virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ConvergenceLimits.hpp b/src/model/ConvergenceLimits.hpp index 0887c0c7478..941fe216a5a 100644 --- a/src/model/ConvergenceLimits.hpp +++ b/src/model/ConvergenceLimits.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ConvergenceLimits() = default; + virtual ~ConvergenceLimits() override = default; // Default the copy and move operators because the virtual dtor is explicit ConvergenceLimits(const ConvergenceLimits& other) = default; ConvergenceLimits(ConvergenceLimits&& other) = default; diff --git a/src/model/ConvergenceLimits_Impl.hpp b/src/model/ConvergenceLimits_Impl.hpp index 52db5e4fdc8..e3984a9e082 100644 --- a/src/model/ConvergenceLimits_Impl.hpp +++ b/src/model/ConvergenceLimits_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ConvergenceLimits_Impl(const ConvergenceLimits_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ConvergenceLimits_Impl() = default; + virtual ~ConvergenceLimits_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoolingTowerPerformanceCoolTools.hpp b/src/model/CoolingTowerPerformanceCoolTools.hpp index df3b66ddcf3..5dfe0f149ea 100644 --- a/src/model/CoolingTowerPerformanceCoolTools.hpp +++ b/src/model/CoolingTowerPerformanceCoolTools.hpp @@ -28,7 +28,7 @@ namespace model { explicit CoolingTowerPerformanceCoolTools(const Model& model); - virtual ~CoolingTowerPerformanceCoolTools() = default; + virtual ~CoolingTowerPerformanceCoolTools() override = default; // Default the copy and move operators because the virtual dtor is explicit CoolingTowerPerformanceCoolTools(const CoolingTowerPerformanceCoolTools& other) = default; CoolingTowerPerformanceCoolTools(CoolingTowerPerformanceCoolTools&& other) = default; diff --git a/src/model/CoolingTowerPerformanceCoolTools_Impl.hpp b/src/model/CoolingTowerPerformanceCoolTools_Impl.hpp index bb1c54a32ac..ad3f08cf0d0 100644 --- a/src/model/CoolingTowerPerformanceCoolTools_Impl.hpp +++ b/src/model/CoolingTowerPerformanceCoolTools_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CoolingTowerPerformanceCoolTools_Impl(const CoolingTowerPerformanceCoolTools_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoolingTowerPerformanceCoolTools_Impl() = default; + virtual ~CoolingTowerPerformanceCoolTools_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoolingTowerPerformanceYorkCalc.hpp b/src/model/CoolingTowerPerformanceYorkCalc.hpp index 74da98ef747..1771fb383e2 100644 --- a/src/model/CoolingTowerPerformanceYorkCalc.hpp +++ b/src/model/CoolingTowerPerformanceYorkCalc.hpp @@ -28,7 +28,7 @@ namespace model { explicit CoolingTowerPerformanceYorkCalc(const Model& model); - virtual ~CoolingTowerPerformanceYorkCalc() = default; + virtual ~CoolingTowerPerformanceYorkCalc() override = default; // Default the copy and move operators because the virtual dtor is explicit CoolingTowerPerformanceYorkCalc(const CoolingTowerPerformanceYorkCalc& other) = default; CoolingTowerPerformanceYorkCalc(CoolingTowerPerformanceYorkCalc&& other) = default; diff --git a/src/model/CoolingTowerPerformanceYorkCalc_Impl.hpp b/src/model/CoolingTowerPerformanceYorkCalc_Impl.hpp index ecf63c5856d..10648ec601f 100644 --- a/src/model/CoolingTowerPerformanceYorkCalc_Impl.hpp +++ b/src/model/CoolingTowerPerformanceYorkCalc_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CoolingTowerPerformanceYorkCalc_Impl(const CoolingTowerPerformanceYorkCalc_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoolingTowerPerformanceYorkCalc_Impl() = default; + virtual ~CoolingTowerPerformanceYorkCalc_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoolingTowerSingleSpeed.hpp b/src/model/CoolingTowerSingleSpeed.hpp index 42b796cc8a4..3eb800cb3c3 100644 --- a/src/model/CoolingTowerSingleSpeed.hpp +++ b/src/model/CoolingTowerSingleSpeed.hpp @@ -31,7 +31,7 @@ namespace model { explicit CoolingTowerSingleSpeed(const Model& model); - virtual ~CoolingTowerSingleSpeed() = default; + virtual ~CoolingTowerSingleSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoolingTowerSingleSpeed(const CoolingTowerSingleSpeed& other) = default; CoolingTowerSingleSpeed(CoolingTowerSingleSpeed&& other) = default; diff --git a/src/model/CoolingTowerSingleSpeed_Impl.hpp b/src/model/CoolingTowerSingleSpeed_Impl.hpp index ab95dcc5210..7a2640a97f5 100644 --- a/src/model/CoolingTowerSingleSpeed_Impl.hpp +++ b/src/model/CoolingTowerSingleSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoolingTowerSingleSpeed_Impl(const CoolingTowerSingleSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoolingTowerSingleSpeed_Impl() = default; + virtual ~CoolingTowerSingleSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoolingTowerTwoSpeed.hpp b/src/model/CoolingTowerTwoSpeed.hpp index 5d58fdcc605..5449469a4bf 100644 --- a/src/model/CoolingTowerTwoSpeed.hpp +++ b/src/model/CoolingTowerTwoSpeed.hpp @@ -30,7 +30,7 @@ namespace model { explicit CoolingTowerTwoSpeed(const Model& model); - virtual ~CoolingTowerTwoSpeed() = default; + virtual ~CoolingTowerTwoSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoolingTowerTwoSpeed(const CoolingTowerTwoSpeed& other) = default; CoolingTowerTwoSpeed(CoolingTowerTwoSpeed&& other) = default; diff --git a/src/model/CoolingTowerTwoSpeed_Impl.hpp b/src/model/CoolingTowerTwoSpeed_Impl.hpp index 528980bd67b..ea645030272 100644 --- a/src/model/CoolingTowerTwoSpeed_Impl.hpp +++ b/src/model/CoolingTowerTwoSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { CoolingTowerTwoSpeed_Impl(const CoolingTowerTwoSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoolingTowerTwoSpeed_Impl() = default; + virtual ~CoolingTowerTwoSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CoolingTowerVariableSpeed.hpp b/src/model/CoolingTowerVariableSpeed.hpp index af6e970d1eb..ae1744dc320 100644 --- a/src/model/CoolingTowerVariableSpeed.hpp +++ b/src/model/CoolingTowerVariableSpeed.hpp @@ -28,7 +28,7 @@ namespace model { public: explicit CoolingTowerVariableSpeed(const Model& model); - virtual ~CoolingTowerVariableSpeed() = default; + virtual ~CoolingTowerVariableSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit CoolingTowerVariableSpeed(const CoolingTowerVariableSpeed& other) = default; CoolingTowerVariableSpeed(CoolingTowerVariableSpeed&& other) = default; diff --git a/src/model/CoolingTowerVariableSpeed_Impl.hpp b/src/model/CoolingTowerVariableSpeed_Impl.hpp index d69e4764136..48cb7b4f4ca 100644 --- a/src/model/CoolingTowerVariableSpeed_Impl.hpp +++ b/src/model/CoolingTowerVariableSpeed_Impl.hpp @@ -32,7 +32,7 @@ namespace model { CoolingTowerVariableSpeed_Impl(const CoolingTowerVariableSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CoolingTowerVariableSpeed_Impl() = default; + virtual ~CoolingTowerVariableSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurrencyType.hpp b/src/model/CurrencyType.hpp index ae070d5d3e1..561f710d6f9 100644 --- a/src/model/CurrencyType.hpp +++ b/src/model/CurrencyType.hpp @@ -26,7 +26,7 @@ namespace model { { public: - virtual ~CurrencyType() = default; + virtual ~CurrencyType() override = default; // Default the copy and move operators because the virtual dtor is explicit CurrencyType(const CurrencyType& other) = default; CurrencyType(CurrencyType&& other) = default; diff --git a/src/model/CurrencyType_Impl.hpp b/src/model/CurrencyType_Impl.hpp index 5464d6abf06..749a667cffd 100644 --- a/src/model/CurrencyType_Impl.hpp +++ b/src/model/CurrencyType_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurrencyType_Impl(const CurrencyType_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~CurrencyType_Impl() = default; + virtual ~CurrencyType_Impl() override = default; OptionalString monetaryUnit() const; bool setMonetaryUnit(const std::string& str); diff --git a/src/model/Curve.hpp b/src/model/Curve.hpp index 2ae7dd9395b..a69ba0a1dbe 100644 --- a/src/model/Curve.hpp +++ b/src/model/Curve.hpp @@ -28,7 +28,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~Curve() = default; + virtual ~Curve() override = default; // Default the copy and move operators because the virtual dtor is explicit Curve(const Curve& other) = default; Curve(Curve&& other) = default; diff --git a/src/model/CurveBicubic.hpp b/src/model/CurveBicubic.hpp index a47c493eb5f..c2cef782c03 100644 --- a/src/model/CurveBicubic.hpp +++ b/src/model/CurveBicubic.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes all coefficients to 0.0, and bounds x and y within [0.0,1.0]. */ explicit CurveBicubic(const Model& model); - virtual ~CurveBicubic() = default; + virtual ~CurveBicubic() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveBicubic(const CurveBicubic& other) = default; CurveBicubic(CurveBicubic&& other) = default; diff --git a/src/model/CurveBicubic_Impl.hpp b/src/model/CurveBicubic_Impl.hpp index 75a4b017041..6891b959c06 100644 --- a/src/model/CurveBicubic_Impl.hpp +++ b/src/model/CurveBicubic_Impl.hpp @@ -27,7 +27,7 @@ namespace model { CurveBicubic_Impl(const CurveBicubic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveBicubic_Impl() = default; + virtual ~CurveBicubic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveBiquadratic.hpp b/src/model/CurveBiquadratic.hpp index b12272f088a..a1e6588eba3 100644 --- a/src/model/CurveBiquadratic.hpp +++ b/src/model/CurveBiquadratic.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes all coefficients to 0.0, and sets the bounds on x and y to [0.0,1.0]. */ explicit CurveBiquadratic(const Model& model); - virtual ~CurveBiquadratic() = default; + virtual ~CurveBiquadratic() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveBiquadratic(const CurveBiquadratic& other) = default; CurveBiquadratic(CurveBiquadratic&& other) = default; diff --git a/src/model/CurveBiquadratic_Impl.hpp b/src/model/CurveBiquadratic_Impl.hpp index 9a5c9b01e31..fe86145e388 100644 --- a/src/model/CurveBiquadratic_Impl.hpp +++ b/src/model/CurveBiquadratic_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveBiquadratic_Impl(const CurveBiquadratic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveBiquadratic_Impl() = default; + virtual ~CurveBiquadratic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveCubic.hpp b/src/model/CurveCubic.hpp index 2b6ae2b9d52..d3b7953a813 100644 --- a/src/model/CurveCubic.hpp +++ b/src/model/CurveCubic.hpp @@ -29,7 +29,7 @@ namespace model { /** Sets \f$c_1 = c_2 = c_3 = 0.0,\ c_4 = 1.0\f$, and sets the range for x at [0.0,1.0]. */ explicit CurveCubic(const Model& model); - virtual ~CurveCubic() = default; + virtual ~CurveCubic() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveCubic(const CurveCubic& other) = default; CurveCubic(CurveCubic&& other) = default; diff --git a/src/model/CurveCubic_Impl.hpp b/src/model/CurveCubic_Impl.hpp index 4747ac8db13..b9e7eb9176e 100644 --- a/src/model/CurveCubic_Impl.hpp +++ b/src/model/CurveCubic_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveCubic_Impl(const CurveCubic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveCubic_Impl() = default; + virtual ~CurveCubic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveDoubleExponentialDecay.hpp b/src/model/CurveDoubleExponentialDecay.hpp index 1be259d51bb..63a9399fed0 100644 --- a/src/model/CurveDoubleExponentialDecay.hpp +++ b/src/model/CurveDoubleExponentialDecay.hpp @@ -30,7 +30,7 @@ namespace model { /** Sets all coefficients to 0.0 and sets the range for x to [0.0,1.0]. */ explicit CurveDoubleExponentialDecay(const Model& model); - virtual ~CurveDoubleExponentialDecay() = default; + virtual ~CurveDoubleExponentialDecay() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveDoubleExponentialDecay(const CurveDoubleExponentialDecay& other) = default; CurveDoubleExponentialDecay(CurveDoubleExponentialDecay&& other) = default; diff --git a/src/model/CurveDoubleExponentialDecay_Impl.hpp b/src/model/CurveDoubleExponentialDecay_Impl.hpp index b3823f8f3d1..043ef816d52 100644 --- a/src/model/CurveDoubleExponentialDecay_Impl.hpp +++ b/src/model/CurveDoubleExponentialDecay_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveDoubleExponentialDecay_Impl(const CurveDoubleExponentialDecay_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveDoubleExponentialDecay_Impl() = default; + virtual ~CurveDoubleExponentialDecay_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveExponent.hpp b/src/model/CurveExponent.hpp index 5d7509a3a19..159cfd1ad49 100644 --- a/src/model/CurveExponent.hpp +++ b/src/model/CurveExponent.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes \f$c_1 = 0.0,\ c_2 = c_3 = 1.0\f$. Sets the range for x to [0.0,1.0]. */ explicit CurveExponent(const Model& model); - virtual ~CurveExponent() = default; + virtual ~CurveExponent() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveExponent(const CurveExponent& other) = default; CurveExponent(CurveExponent&& other) = default; diff --git a/src/model/CurveExponent_Impl.hpp b/src/model/CurveExponent_Impl.hpp index ef957e1cf24..b3cb060e12d 100644 --- a/src/model/CurveExponent_Impl.hpp +++ b/src/model/CurveExponent_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveExponent_Impl(const CurveExponent_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveExponent_Impl() = default; + virtual ~CurveExponent_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveExponentialDecay.hpp b/src/model/CurveExponentialDecay.hpp index c099b385ec0..dad286ba457 100644 --- a/src/model/CurveExponentialDecay.hpp +++ b/src/model/CurveExponentialDecay.hpp @@ -29,7 +29,7 @@ namespace model { /** Sets \f$c_1 = 0.0,\ c_2 = 1.0,\ c_3 = -1.0\f$, and bounds x within [0.0,1.0]. */ explicit CurveExponentialDecay(const Model& model); - virtual ~CurveExponentialDecay() = default; + virtual ~CurveExponentialDecay() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveExponentialDecay(const CurveExponentialDecay& other) = default; CurveExponentialDecay(CurveExponentialDecay&& other) = default; diff --git a/src/model/CurveExponentialDecay_Impl.hpp b/src/model/CurveExponentialDecay_Impl.hpp index 7b8cd4177f4..85f216f1f12 100644 --- a/src/model/CurveExponentialDecay_Impl.hpp +++ b/src/model/CurveExponentialDecay_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveExponentialDecay_Impl(const CurveExponentialDecay_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveExponentialDecay_Impl() = default; + virtual ~CurveExponentialDecay_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveExponentialSkewNormal.hpp b/src/model/CurveExponentialSkewNormal.hpp index 360a0c7fbad..31c5a88cf91 100644 --- a/src/model/CurveExponentialSkewNormal.hpp +++ b/src/model/CurveExponentialSkewNormal.hpp @@ -29,7 +29,7 @@ namespace model { /** Sets \f$c_1 = c_2 = c_4 = 1.0,\ c_3 = -1.0\f$, x within [-1.0,1.0]. */ explicit CurveExponentialSkewNormal(const Model& model); - virtual ~CurveExponentialSkewNormal() = default; + virtual ~CurveExponentialSkewNormal() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveExponentialSkewNormal(const CurveExponentialSkewNormal& other) = default; CurveExponentialSkewNormal(CurveExponentialSkewNormal&& other) = default; diff --git a/src/model/CurveExponentialSkewNormal_Impl.hpp b/src/model/CurveExponentialSkewNormal_Impl.hpp index 8022e5f2543..1bb3d116e3c 100644 --- a/src/model/CurveExponentialSkewNormal_Impl.hpp +++ b/src/model/CurveExponentialSkewNormal_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveExponentialSkewNormal_Impl(const CurveExponentialSkewNormal_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveExponentialSkewNormal_Impl() = default; + virtual ~CurveExponentialSkewNormal_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveFanPressureRise.hpp b/src/model/CurveFanPressureRise.hpp index b9579afb903..139791bc7bd 100644 --- a/src/model/CurveFanPressureRise.hpp +++ b/src/model/CurveFanPressureRise.hpp @@ -29,7 +29,7 @@ namespace model { /** Sets \f$c_1 = c_2 = c_3 = c_4 = 1.0,\ Q_{fan}\ \text{within}\ [0.0,10.0], P_{sm}\ \text{within}\ [0.0,500.0]\f$ */ explicit CurveFanPressureRise(const Model& model); - virtual ~CurveFanPressureRise() = default; + virtual ~CurveFanPressureRise() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveFanPressureRise(const CurveFanPressureRise& other) = default; CurveFanPressureRise(CurveFanPressureRise&& other) = default; diff --git a/src/model/CurveFanPressureRise_Impl.hpp b/src/model/CurveFanPressureRise_Impl.hpp index cd48a17ac8c..26e94bee8f6 100644 --- a/src/model/CurveFanPressureRise_Impl.hpp +++ b/src/model/CurveFanPressureRise_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveFanPressureRise_Impl(const CurveFanPressureRise_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveFanPressureRise_Impl() = default; + virtual ~CurveFanPressureRise_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveFunctionalPressureDrop.hpp b/src/model/CurveFunctionalPressureDrop.hpp index 82a4b32ff79..8d6e9215c4a 100644 --- a/src/model/CurveFunctionalPressureDrop.hpp +++ b/src/model/CurveFunctionalPressureDrop.hpp @@ -38,7 +38,7 @@ namespace model { /** Sets \f$D = 0.05\f$ */ explicit CurveFunctionalPressureDrop(const Model& model); - virtual ~CurveFunctionalPressureDrop() = default; + virtual ~CurveFunctionalPressureDrop() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveFunctionalPressureDrop(const CurveFunctionalPressureDrop& other) = default; CurveFunctionalPressureDrop(CurveFunctionalPressureDrop&& other) = default; diff --git a/src/model/CurveFunctionalPressureDrop_Impl.hpp b/src/model/CurveFunctionalPressureDrop_Impl.hpp index 711e9cd3d96..87061bea8d2 100644 --- a/src/model/CurveFunctionalPressureDrop_Impl.hpp +++ b/src/model/CurveFunctionalPressureDrop_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveFunctionalPressureDrop_Impl(const CurveFunctionalPressureDrop_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveFunctionalPressureDrop_Impl() = default; + virtual ~CurveFunctionalPressureDrop_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveLinear.hpp b/src/model/CurveLinear.hpp index bec9befa569..00c27c13ae1 100644 --- a/src/model/CurveLinear.hpp +++ b/src/model/CurveLinear.hpp @@ -29,7 +29,7 @@ namespace model { /** Sets \f$c_1 = 0,\ c_2 = 1.0,\ x\ \text{within}\ [0.0,1.0]\f$ */ explicit CurveLinear(const Model& model); - virtual ~CurveLinear() = default; + virtual ~CurveLinear() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveLinear(const CurveLinear& other) = default; CurveLinear(CurveLinear&& other) = default; diff --git a/src/model/CurveLinear_Impl.hpp b/src/model/CurveLinear_Impl.hpp index 6359ba86975..1e80e1f2d3a 100644 --- a/src/model/CurveLinear_Impl.hpp +++ b/src/model/CurveLinear_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveLinear_Impl(const CurveLinear_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveLinear_Impl() = default; + virtual ~CurveLinear_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveQuadLinear.hpp b/src/model/CurveQuadLinear.hpp index 21cea7030af..d05b7e8313f 100644 --- a/src/model/CurveQuadLinear.hpp +++ b/src/model/CurveQuadLinear.hpp @@ -29,7 +29,7 @@ namespace model { explicit CurveQuadLinear(const Model& model); - virtual ~CurveQuadLinear() = default; + virtual ~CurveQuadLinear() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveQuadLinear(const CurveQuadLinear& other) = default; CurveQuadLinear(CurveQuadLinear&& other) = default; diff --git a/src/model/CurveQuadLinear_Impl.hpp b/src/model/CurveQuadLinear_Impl.hpp index 7af7056907f..5af807f10c4 100644 --- a/src/model/CurveQuadLinear_Impl.hpp +++ b/src/model/CurveQuadLinear_Impl.hpp @@ -27,7 +27,7 @@ namespace model { CurveQuadLinear_Impl(const CurveQuadLinear_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveQuadLinear_Impl() = default; + virtual ~CurveQuadLinear_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveQuadratic.hpp b/src/model/CurveQuadratic.hpp index b0f10cc1577..123d9acc803 100644 --- a/src/model/CurveQuadratic.hpp +++ b/src/model/CurveQuadratic.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes \f$c_1 = c_2 = 0.0,\ c_3 = 1.0,\ xmin = 0,\ xmax = 1\f$ */ explicit CurveQuadratic(const Model& model); - virtual ~CurveQuadratic() = default; + virtual ~CurveQuadratic() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveQuadratic(const CurveQuadratic& other) = default; CurveQuadratic(CurveQuadratic&& other) = default; diff --git a/src/model/CurveQuadraticLinear.hpp b/src/model/CurveQuadraticLinear.hpp index 1ee1e2da96f..957769bd260 100644 --- a/src/model/CurveQuadraticLinear.hpp +++ b/src/model/CurveQuadraticLinear.hpp @@ -30,7 +30,7 @@ namespace model { /** Initializes \f$c_1 = c_2 = c_3 = c_4 = c_5 = 0.0,\ c_6 = 1.0,\ x\ \text{and}\ y\ \text{within}\ [0.0,1.0]\f$ */ explicit CurveQuadraticLinear(const Model& model); - virtual ~CurveQuadraticLinear() = default; + virtual ~CurveQuadraticLinear() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveQuadraticLinear(const CurveQuadraticLinear& other) = default; CurveQuadraticLinear(CurveQuadraticLinear&& other) = default; diff --git a/src/model/CurveQuadraticLinear_Impl.hpp b/src/model/CurveQuadraticLinear_Impl.hpp index 5f62b6b25c7..cb2688429d1 100644 --- a/src/model/CurveQuadraticLinear_Impl.hpp +++ b/src/model/CurveQuadraticLinear_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveQuadraticLinear_Impl(const CurveQuadraticLinear_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveQuadraticLinear_Impl() = default; + virtual ~CurveQuadraticLinear_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveQuadratic_Impl.hpp b/src/model/CurveQuadratic_Impl.hpp index 7f265408ad2..251794aa2ae 100644 --- a/src/model/CurveQuadratic_Impl.hpp +++ b/src/model/CurveQuadratic_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveQuadratic_Impl(const CurveQuadratic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveQuadratic_Impl() = default; + virtual ~CurveQuadratic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveQuartic.hpp b/src/model/CurveQuartic.hpp index b8370fc18b9..4e5ae83fd03 100644 --- a/src/model/CurveQuartic.hpp +++ b/src/model/CurveQuartic.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes \f$c_1 = c_2 = c_3 = c_4 = 0.0,\ c_5 = 1.0,\ x\ \text{in}\ [0.0,1.0]\f$ */ explicit CurveQuartic(const Model& model); - virtual ~CurveQuartic() = default; + virtual ~CurveQuartic() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveQuartic(const CurveQuartic& other) = default; CurveQuartic(CurveQuartic&& other) = default; diff --git a/src/model/CurveQuartic_Impl.hpp b/src/model/CurveQuartic_Impl.hpp index 4c55b712015..f2c7b883e71 100644 --- a/src/model/CurveQuartic_Impl.hpp +++ b/src/model/CurveQuartic_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveQuartic_Impl(const CurveQuartic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveQuartic_Impl() = default; + virtual ~CurveQuartic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveQuintLinear.hpp b/src/model/CurveQuintLinear.hpp index c60421f0130..b93ac88c7eb 100644 --- a/src/model/CurveQuintLinear.hpp +++ b/src/model/CurveQuintLinear.hpp @@ -29,7 +29,7 @@ namespace model { explicit CurveQuintLinear(const Model& model); - virtual ~CurveQuintLinear() = default; + virtual ~CurveQuintLinear() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveQuintLinear(const CurveQuintLinear& other) = default; CurveQuintLinear(CurveQuintLinear&& other) = default; diff --git a/src/model/CurveQuintLinear_Impl.hpp b/src/model/CurveQuintLinear_Impl.hpp index fe68d07ce55..934a91b4925 100644 --- a/src/model/CurveQuintLinear_Impl.hpp +++ b/src/model/CurveQuintLinear_Impl.hpp @@ -27,7 +27,7 @@ namespace model { CurveQuintLinear_Impl(const CurveQuintLinear_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveQuintLinear_Impl() = default; + virtual ~CurveQuintLinear_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveRectangularHyperbola1.hpp b/src/model/CurveRectangularHyperbola1.hpp index 9f2268ea8e4..c3582d47d6f 100644 --- a/src/model/CurveRectangularHyperbola1.hpp +++ b/src/model/CurveRectangularHyperbola1.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes \f$c_1 = c_2 = 1.0,\ c_3 = 0.0,\ xmin = 0.0,\ xmax = 1.0\f$ */ explicit CurveRectangularHyperbola1(const Model& model); - virtual ~CurveRectangularHyperbola1() = default; + virtual ~CurveRectangularHyperbola1() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveRectangularHyperbola1(const CurveRectangularHyperbola1& other) = default; CurveRectangularHyperbola1(CurveRectangularHyperbola1&& other) = default; diff --git a/src/model/CurveRectangularHyperbola1_Impl.hpp b/src/model/CurveRectangularHyperbola1_Impl.hpp index 2e0404e548b..66ae42106bd 100644 --- a/src/model/CurveRectangularHyperbola1_Impl.hpp +++ b/src/model/CurveRectangularHyperbola1_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveRectangularHyperbola1_Impl(const CurveRectangularHyperbola1_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveRectangularHyperbola1_Impl() = default; + virtual ~CurveRectangularHyperbola1_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveRectangularHyperbola2.hpp b/src/model/CurveRectangularHyperbola2.hpp index b52132f9b81..749f7375423 100644 --- a/src/model/CurveRectangularHyperbola2.hpp +++ b/src/model/CurveRectangularHyperbola2.hpp @@ -30,7 +30,7 @@ namespace model { /** Initializes /f$c_1 = c_2 = c_3 = 1.0,\ xmin = 0.0,\ xmax = 1.0/f$ */ explicit CurveRectangularHyperbola2(const Model& model); - virtual ~CurveRectangularHyperbola2() = default; + virtual ~CurveRectangularHyperbola2() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveRectangularHyperbola2(const CurveRectangularHyperbola2& other) = default; CurveRectangularHyperbola2(CurveRectangularHyperbola2&& other) = default; diff --git a/src/model/CurveRectangularHyperbola2_Impl.hpp b/src/model/CurveRectangularHyperbola2_Impl.hpp index c5772af5921..0c913ec80bb 100644 --- a/src/model/CurveRectangularHyperbola2_Impl.hpp +++ b/src/model/CurveRectangularHyperbola2_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveRectangularHyperbola2_Impl(const CurveRectangularHyperbola2_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveRectangularHyperbola2_Impl() = default; + virtual ~CurveRectangularHyperbola2_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveSigmoid.hpp b/src/model/CurveSigmoid.hpp index 2fd1cae7bb9..e0c2c3aa5b7 100644 --- a/src/model/CurveSigmoid.hpp +++ b/src/model/CurveSigmoid.hpp @@ -29,7 +29,7 @@ namespace model { /** Initializes \f$c_1 = 0.0,\ c_2 = c_3 = c_4 = c_5 = 1.0,\ xmin = 0.0,\ xmax = 1.0\f$ */ explicit CurveSigmoid(const Model& model); - virtual ~CurveSigmoid() = default; + virtual ~CurveSigmoid() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveSigmoid(const CurveSigmoid& other) = default; CurveSigmoid(CurveSigmoid&& other) = default; diff --git a/src/model/CurveSigmoid_Impl.hpp b/src/model/CurveSigmoid_Impl.hpp index f6337dd5965..898b8320d28 100644 --- a/src/model/CurveSigmoid_Impl.hpp +++ b/src/model/CurveSigmoid_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveSigmoid_Impl(const CurveSigmoid_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveSigmoid_Impl() = default; + virtual ~CurveSigmoid_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/CurveTriquadratic.hpp b/src/model/CurveTriquadratic.hpp index 0e8d56ea6b2..80783979be2 100644 --- a/src/model/CurveTriquadratic.hpp +++ b/src/model/CurveTriquadratic.hpp @@ -35,7 +35,7 @@ namespace model { explicit CurveTriquadratic(const Model& model); - virtual ~CurveTriquadratic() = default; + virtual ~CurveTriquadratic() override = default; // Default the copy and move operators because the virtual dtor is explicit CurveTriquadratic(const CurveTriquadratic& other) = default; CurveTriquadratic(CurveTriquadratic&& other) = default; diff --git a/src/model/CurveTriquadratic_Impl.hpp b/src/model/CurveTriquadratic_Impl.hpp index 0eeb8310725..b2ce6c6515a 100644 --- a/src/model/CurveTriquadratic_Impl.hpp +++ b/src/model/CurveTriquadratic_Impl.hpp @@ -28,7 +28,7 @@ namespace model { CurveTriquadratic_Impl(const CurveTriquadratic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~CurveTriquadratic_Impl() = default; + virtual ~CurveTriquadratic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Curve_Impl.hpp b/src/model/Curve_Impl.hpp index 59285dc7256..8b4022caeae 100644 --- a/src/model/Curve_Impl.hpp +++ b/src/model/Curve_Impl.hpp @@ -32,7 +32,7 @@ namespace model { // Clone copy constructor. Curve_Impl(const Curve_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Curve_Impl() = default; + virtual ~Curve_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/DaylightRedirectionDevice.hpp b/src/model/DaylightRedirectionDevice.hpp index 6021fe57e76..54ed8abed49 100644 --- a/src/model/DaylightRedirectionDevice.hpp +++ b/src/model/DaylightRedirectionDevice.hpp @@ -30,7 +30,7 @@ namespace model { explicit DaylightRedirectionDevice(const Model& model); - virtual ~DaylightRedirectionDevice() = default; + virtual ~DaylightRedirectionDevice() override = default; // Default the copy and move operators because the virtual dtor is explicit DaylightRedirectionDevice(const DaylightRedirectionDevice& other) = default; DaylightRedirectionDevice(DaylightRedirectionDevice&& other) = default; diff --git a/src/model/DaylightRedirectionDevice_Impl.hpp b/src/model/DaylightRedirectionDevice_Impl.hpp index 9728136c33a..3c045b238f8 100644 --- a/src/model/DaylightRedirectionDevice_Impl.hpp +++ b/src/model/DaylightRedirectionDevice_Impl.hpp @@ -26,7 +26,7 @@ namespace model { DaylightRedirectionDevice_Impl(const DaylightRedirectionDevice_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DaylightRedirectionDevice_Impl() = default; + virtual ~DaylightRedirectionDevice_Impl() override = default; //@} diff --git a/src/model/DaylightingControl.hpp b/src/model/DaylightingControl.hpp index c3e338a536e..93aba9a0d78 100644 --- a/src/model/DaylightingControl.hpp +++ b/src/model/DaylightingControl.hpp @@ -31,7 +31,7 @@ namespace model { explicit DaylightingControl(const Model& model); - virtual ~DaylightingControl() = default; + virtual ~DaylightingControl() override = default; // Default the copy and move operators because the virtual dtor is explicit DaylightingControl(const DaylightingControl& other) = default; DaylightingControl(DaylightingControl&& other) = default; diff --git a/src/model/DaylightingControl_Impl.hpp b/src/model/DaylightingControl_Impl.hpp index 8129640bd80..66282ab5941 100644 --- a/src/model/DaylightingControl_Impl.hpp +++ b/src/model/DaylightingControl_Impl.hpp @@ -34,7 +34,7 @@ namespace model { DaylightingControl_Impl(const DaylightingControl_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DaylightingControl_Impl() = default; + virtual ~DaylightingControl_Impl() override = default; //@} diff --git a/src/model/DaylightingDeviceLightWell.hpp b/src/model/DaylightingDeviceLightWell.hpp index ebac794e36a..f8606d2b353 100644 --- a/src/model/DaylightingDeviceLightWell.hpp +++ b/src/model/DaylightingDeviceLightWell.hpp @@ -34,7 +34,7 @@ namespace model { explicit DaylightingDeviceLightWell(const SubSurface& subSurface); - virtual ~DaylightingDeviceLightWell() = default; + virtual ~DaylightingDeviceLightWell() override = default; // Default the copy and move operators because the virtual dtor is explicit DaylightingDeviceLightWell(const DaylightingDeviceLightWell& other) = default; DaylightingDeviceLightWell(DaylightingDeviceLightWell&& other) = default; diff --git a/src/model/DaylightingDeviceLightWell_Impl.hpp b/src/model/DaylightingDeviceLightWell_Impl.hpp index 8c7a5332a35..b5c4e24ed12 100644 --- a/src/model/DaylightingDeviceLightWell_Impl.hpp +++ b/src/model/DaylightingDeviceLightWell_Impl.hpp @@ -29,7 +29,7 @@ namespace model { DaylightingDeviceLightWell_Impl(const DaylightingDeviceLightWell_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DaylightingDeviceLightWell_Impl() = default; + virtual ~DaylightingDeviceLightWell_Impl() override = default; //@} diff --git a/src/model/DaylightingDeviceShelf.hpp b/src/model/DaylightingDeviceShelf.hpp index f62fd358447..1ac43d6c37d 100644 --- a/src/model/DaylightingDeviceShelf.hpp +++ b/src/model/DaylightingDeviceShelf.hpp @@ -31,7 +31,7 @@ namespace model { explicit DaylightingDeviceShelf(const SubSurface& subSurface); - virtual ~DaylightingDeviceShelf() = default; + virtual ~DaylightingDeviceShelf() override = default; // Default the copy and move operators because the virtual dtor is explicit DaylightingDeviceShelf(const DaylightingDeviceShelf& other) = default; DaylightingDeviceShelf(DaylightingDeviceShelf&& other) = default; diff --git a/src/model/DaylightingDeviceShelf_Impl.hpp b/src/model/DaylightingDeviceShelf_Impl.hpp index 3da0878d3f1..eaf21bd5e8d 100644 --- a/src/model/DaylightingDeviceShelf_Impl.hpp +++ b/src/model/DaylightingDeviceShelf_Impl.hpp @@ -32,7 +32,7 @@ namespace model { DaylightingDeviceShelf_Impl(const DaylightingDeviceShelf_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DaylightingDeviceShelf_Impl() = default; + virtual ~DaylightingDeviceShelf_Impl() override = default; //@} diff --git a/src/model/DaylightingDeviceTubular.hpp b/src/model/DaylightingDeviceTubular.hpp index c065eeb10a7..db31c053f04 100644 --- a/src/model/DaylightingDeviceTubular.hpp +++ b/src/model/DaylightingDeviceTubular.hpp @@ -40,7 +40,7 @@ namespace model { explicit DaylightingDeviceTubular(const SubSurface& dome, const SubSurface& diffuser, const ConstructionBase& construction); - virtual ~DaylightingDeviceTubular() = default; + virtual ~DaylightingDeviceTubular() override = default; // Default the copy and move operators because the virtual dtor is explicit DaylightingDeviceTubular(const DaylightingDeviceTubular& other) = default; DaylightingDeviceTubular(DaylightingDeviceTubular&& other) = default; diff --git a/src/model/DaylightingDeviceTubular_Impl.hpp b/src/model/DaylightingDeviceTubular_Impl.hpp index 524c138ed11..683ff9e29f2 100644 --- a/src/model/DaylightingDeviceTubular_Impl.hpp +++ b/src/model/DaylightingDeviceTubular_Impl.hpp @@ -32,7 +32,7 @@ namespace model { DaylightingDeviceTubular_Impl(const DaylightingDeviceTubular_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DaylightingDeviceTubular_Impl() = default; + virtual ~DaylightingDeviceTubular_Impl() override = default; //@} diff --git a/src/model/DefaultConstructionSet.hpp b/src/model/DefaultConstructionSet.hpp index 2f96137febc..9ab7c0e1594 100644 --- a/src/model/DefaultConstructionSet.hpp +++ b/src/model/DefaultConstructionSet.hpp @@ -32,7 +32,7 @@ namespace model { explicit DefaultConstructionSet(const Model& model); - virtual ~DefaultConstructionSet() = default; + virtual ~DefaultConstructionSet() override = default; // Default the copy and move operators because the virtual dtor is explicit DefaultConstructionSet(const DefaultConstructionSet& other) = default; DefaultConstructionSet(DefaultConstructionSet&& other) = default; diff --git a/src/model/DefaultConstructionSet_Impl.hpp b/src/model/DefaultConstructionSet_Impl.hpp index a96f0940b00..f67da31c727 100644 --- a/src/model/DefaultConstructionSet_Impl.hpp +++ b/src/model/DefaultConstructionSet_Impl.hpp @@ -34,7 +34,7 @@ namespace model { DefaultConstructionSet_Impl(const DefaultConstructionSet_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DefaultConstructionSet_Impl() = default; + virtual ~DefaultConstructionSet_Impl() override = default; //@} diff --git a/src/model/DefaultScheduleSet.hpp b/src/model/DefaultScheduleSet.hpp index 6c071c57c1d..3ce621ac84f 100644 --- a/src/model/DefaultScheduleSet.hpp +++ b/src/model/DefaultScheduleSet.hpp @@ -51,7 +51,7 @@ namespace model { explicit DefaultScheduleSet(const Model& model); - virtual ~DefaultScheduleSet() = default; + virtual ~DefaultScheduleSet() override = default; // Default the copy and move operators because the virtual dtor is explicit DefaultScheduleSet(const DefaultScheduleSet& other) = default; DefaultScheduleSet(DefaultScheduleSet&& other) = default; diff --git a/src/model/DefaultScheduleSet_Impl.hpp b/src/model/DefaultScheduleSet_Impl.hpp index 5395fe6687a..0861cfd4604 100644 --- a/src/model/DefaultScheduleSet_Impl.hpp +++ b/src/model/DefaultScheduleSet_Impl.hpp @@ -32,7 +32,7 @@ namespace model { DefaultScheduleSet_Impl(const DefaultScheduleSet_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DefaultScheduleSet_Impl() = default; + virtual ~DefaultScheduleSet_Impl() override = default; //@} diff --git a/src/model/DefaultSubSurfaceConstructions.hpp b/src/model/DefaultSubSurfaceConstructions.hpp index d91e0432620..e016ffc89b2 100644 --- a/src/model/DefaultSubSurfaceConstructions.hpp +++ b/src/model/DefaultSubSurfaceConstructions.hpp @@ -29,7 +29,7 @@ namespace model { explicit DefaultSubSurfaceConstructions(const Model& model); - virtual ~DefaultSubSurfaceConstructions() = default; + virtual ~DefaultSubSurfaceConstructions() override = default; // Default the copy and move operators because the virtual dtor is explicit DefaultSubSurfaceConstructions(const DefaultSubSurfaceConstructions& other) = default; DefaultSubSurfaceConstructions(DefaultSubSurfaceConstructions&& other) = default; diff --git a/src/model/DefaultSubSurfaceConstructions_Impl.hpp b/src/model/DefaultSubSurfaceConstructions_Impl.hpp index 9a57314fbc9..e4603fc6594 100644 --- a/src/model/DefaultSubSurfaceConstructions_Impl.hpp +++ b/src/model/DefaultSubSurfaceConstructions_Impl.hpp @@ -31,7 +31,7 @@ namespace model { DefaultSubSurfaceConstructions_Impl(const DefaultSubSurfaceConstructions_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DefaultSubSurfaceConstructions_Impl() = default; + virtual ~DefaultSubSurfaceConstructions_Impl() override = default; //@} diff --git a/src/model/DefaultSurfaceConstructions.hpp b/src/model/DefaultSurfaceConstructions.hpp index 2681da3a6ee..e8f1c883fa2 100644 --- a/src/model/DefaultSurfaceConstructions.hpp +++ b/src/model/DefaultSurfaceConstructions.hpp @@ -29,7 +29,7 @@ namespace model { explicit DefaultSurfaceConstructions(const Model& model); - virtual ~DefaultSurfaceConstructions() = default; + virtual ~DefaultSurfaceConstructions() override = default; // Default the copy and move operators because the virtual dtor is explicit DefaultSurfaceConstructions(const DefaultSurfaceConstructions& other) = default; DefaultSurfaceConstructions(DefaultSurfaceConstructions&& other) = default; diff --git a/src/model/DefaultSurfaceConstructions_Impl.hpp b/src/model/DefaultSurfaceConstructions_Impl.hpp index 999ad8c8137..47734367216 100644 --- a/src/model/DefaultSurfaceConstructions_Impl.hpp +++ b/src/model/DefaultSurfaceConstructions_Impl.hpp @@ -31,7 +31,7 @@ namespace model { DefaultSurfaceConstructions_Impl(const DefaultSurfaceConstructions_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DefaultSurfaceConstructions_Impl() = default; + virtual ~DefaultSurfaceConstructions_Impl() override = default; //@} diff --git a/src/model/DesignDay.hpp b/src/model/DesignDay.hpp index 2cc3443ec83..b3f622615d2 100644 --- a/src/model/DesignDay.hpp +++ b/src/model/DesignDay.hpp @@ -300,7 +300,7 @@ namespace model { //@} - virtual ~DesignDay() = default; + virtual ~DesignDay() override = default; // Default the copy and move operators because the virtual dtor is explicit DesignDay(const DesignDay& other) = default; DesignDay(DesignDay&& other) = default; diff --git a/src/model/DesignDay_Impl.hpp b/src/model/DesignDay_Impl.hpp index 78b9526a2a9..f968bc1575a 100644 --- a/src/model/DesignDay_Impl.hpp +++ b/src/model/DesignDay_Impl.hpp @@ -29,7 +29,7 @@ namespace model { DesignDay_Impl(const DesignDay_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~DesignDay_Impl() = default; + virtual ~DesignDay_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/DesignSpecificationOutdoorAir.hpp b/src/model/DesignSpecificationOutdoorAir.hpp index 2e75c07f4a8..9a89179f765 100644 --- a/src/model/DesignSpecificationOutdoorAir.hpp +++ b/src/model/DesignSpecificationOutdoorAir.hpp @@ -30,7 +30,7 @@ namespace model { explicit DesignSpecificationOutdoorAir(const Model& model); - virtual ~DesignSpecificationOutdoorAir() = default; + virtual ~DesignSpecificationOutdoorAir() override = default; // Default the copy and move operators because the virtual dtor is explicit DesignSpecificationOutdoorAir(const DesignSpecificationOutdoorAir& other) = default; DesignSpecificationOutdoorAir(DesignSpecificationOutdoorAir&& other) = default; diff --git a/src/model/DesignSpecificationOutdoorAir_Impl.hpp b/src/model/DesignSpecificationOutdoorAir_Impl.hpp index 84b79be117b..6f10516c226 100644 --- a/src/model/DesignSpecificationOutdoorAir_Impl.hpp +++ b/src/model/DesignSpecificationOutdoorAir_Impl.hpp @@ -31,7 +31,7 @@ namespace model { DesignSpecificationOutdoorAir_Impl(const DesignSpecificationOutdoorAir_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DesignSpecificationOutdoorAir_Impl() = default; + virtual ~DesignSpecificationOutdoorAir_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/DesignSpecificationZoneAirDistribution.hpp b/src/model/DesignSpecificationZoneAirDistribution.hpp index 0e3bb23577a..65bd7e87ff2 100644 --- a/src/model/DesignSpecificationZoneAirDistribution.hpp +++ b/src/model/DesignSpecificationZoneAirDistribution.hpp @@ -27,7 +27,7 @@ namespace model { public: explicit DesignSpecificationZoneAirDistribution(const Model& model); - virtual ~DesignSpecificationZoneAirDistribution() = default; + virtual ~DesignSpecificationZoneAirDistribution() override = default; // Default the copy and move operators because the virtual dtor is explicit DesignSpecificationZoneAirDistribution(const DesignSpecificationZoneAirDistribution& other) = default; DesignSpecificationZoneAirDistribution(DesignSpecificationZoneAirDistribution&& other) = default; diff --git a/src/model/DesignSpecificationZoneAirDistribution_Impl.hpp b/src/model/DesignSpecificationZoneAirDistribution_Impl.hpp index 5af2b299eba..5f459d127b1 100644 --- a/src/model/DesignSpecificationZoneAirDistribution_Impl.hpp +++ b/src/model/DesignSpecificationZoneAirDistribution_Impl.hpp @@ -30,7 +30,7 @@ namespace model { DesignSpecificationZoneAirDistribution_Impl(const DesignSpecificationZoneAirDistribution_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DesignSpecificationZoneAirDistribution_Impl() = default; + virtual ~DesignSpecificationZoneAirDistribution_Impl() override = default; //@} diff --git a/src/model/DistrictCooling.hpp b/src/model/DistrictCooling.hpp index ecd5f3c6a99..68f5490485e 100644 --- a/src/model/DistrictCooling.hpp +++ b/src/model/DistrictCooling.hpp @@ -33,7 +33,7 @@ namespace model { // The capacityFractionSchedule is defaulted to alwaysOnContinuousSchedule explicit DistrictCooling(const Model& model); - virtual ~DistrictCooling() = default; + virtual ~DistrictCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit DistrictCooling(const DistrictCooling& other) = default; DistrictCooling(DistrictCooling&& other) = default; diff --git a/src/model/DistrictCooling_Impl.hpp b/src/model/DistrictCooling_Impl.hpp index 0ef719ea371..2682f03ae4b 100644 --- a/src/model/DistrictCooling_Impl.hpp +++ b/src/model/DistrictCooling_Impl.hpp @@ -32,7 +32,7 @@ namespace model { DistrictCooling_Impl(const DistrictCooling_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DistrictCooling_Impl() = default; + virtual ~DistrictCooling_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/DistrictHeatingSteam.hpp b/src/model/DistrictHeatingSteam.hpp index 6b9ad97e1d2..9ff820535fc 100644 --- a/src/model/DistrictHeatingSteam.hpp +++ b/src/model/DistrictHeatingSteam.hpp @@ -33,7 +33,7 @@ namespace model { // The capacityFractionSchedule is defaulted to alwaysOnContinuousSchedule explicit DistrictHeatingSteam(const Model& model); - virtual ~DistrictHeatingSteam() = default; + virtual ~DistrictHeatingSteam() override = default; // Default the copy and move operators because the virtual dtor is explicit DistrictHeatingSteam(const DistrictHeatingSteam& other) = default; DistrictHeatingSteam(DistrictHeatingSteam&& other) = default; diff --git a/src/model/DistrictHeatingSteam_Impl.hpp b/src/model/DistrictHeatingSteam_Impl.hpp index 407363839e7..0a85328ece0 100644 --- a/src/model/DistrictHeatingSteam_Impl.hpp +++ b/src/model/DistrictHeatingSteam_Impl.hpp @@ -32,7 +32,7 @@ namespace model { DistrictHeatingSteam_Impl(const DistrictHeatingSteam_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DistrictHeatingSteam_Impl() = default; + virtual ~DistrictHeatingSteam_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/DistrictHeatingWater.hpp b/src/model/DistrictHeatingWater.hpp index 6cc19d59275..bfe1ddff676 100644 --- a/src/model/DistrictHeatingWater.hpp +++ b/src/model/DistrictHeatingWater.hpp @@ -33,7 +33,7 @@ namespace model { // The capacityFractionSchedule is defaulted to alwaysOnContinuousSchedule explicit DistrictHeatingWater(const Model& model); - virtual ~DistrictHeatingWater() = default; + virtual ~DistrictHeatingWater() override = default; // Default the copy and move operators because the virtual dtor is explicit DistrictHeatingWater(const DistrictHeatingWater& other) = default; DistrictHeatingWater(DistrictHeatingWater&& other) = default; diff --git a/src/model/DistrictHeatingWater_Impl.hpp b/src/model/DistrictHeatingWater_Impl.hpp index 14fea33cde9..fa8081e12a6 100644 --- a/src/model/DistrictHeatingWater_Impl.hpp +++ b/src/model/DistrictHeatingWater_Impl.hpp @@ -32,7 +32,7 @@ namespace model { DistrictHeatingWater_Impl(const DistrictHeatingWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~DistrictHeatingWater_Impl() = default; + virtual ~DistrictHeatingWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Duct.hpp b/src/model/Duct.hpp index 7ee74993946..c2af6a812b2 100644 --- a/src/model/Duct.hpp +++ b/src/model/Duct.hpp @@ -26,7 +26,7 @@ namespace model { explicit Duct(const Model& model); - virtual ~Duct() = default; + virtual ~Duct() override = default; // Default the copy and move operators because the virtual dtor is explicit Duct(const Duct& other) = default; Duct(Duct&& other) = default; diff --git a/src/model/Duct_Impl.hpp b/src/model/Duct_Impl.hpp index 480933fd761..9bbbdffcd9b 100644 --- a/src/model/Duct_Impl.hpp +++ b/src/model/Duct_Impl.hpp @@ -27,7 +27,7 @@ namespace model { Duct_Impl(const Duct_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Duct_Impl() = default; + virtual ~Duct_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricEquipment.hpp b/src/model/ElectricEquipment.hpp index ba34775a146..b7481f6dd41 100644 --- a/src/model/ElectricEquipment.hpp +++ b/src/model/ElectricEquipment.hpp @@ -32,7 +32,7 @@ namespace model { explicit ElectricEquipment(const ElectricEquipmentDefinition& electricEquipmentDefinition); - virtual ~ElectricEquipment() = default; + virtual ~ElectricEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricEquipment(const ElectricEquipment& other) = default; ElectricEquipment(ElectricEquipment&& other) = default; diff --git a/src/model/ElectricEquipmentDefinition.hpp b/src/model/ElectricEquipmentDefinition.hpp index d29d8ba729d..bad64eb026e 100644 --- a/src/model/ElectricEquipmentDefinition.hpp +++ b/src/model/ElectricEquipmentDefinition.hpp @@ -30,7 +30,7 @@ namespace model { explicit ElectricEquipmentDefinition(const Model& model); - virtual ~ElectricEquipmentDefinition() = default; + virtual ~ElectricEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricEquipmentDefinition(const ElectricEquipmentDefinition& other) = default; ElectricEquipmentDefinition(ElectricEquipmentDefinition&& other) = default; diff --git a/src/model/ElectricEquipmentDefinition_Impl.hpp b/src/model/ElectricEquipmentDefinition_Impl.hpp index f28d2206dbb..c0f987d77b8 100644 --- a/src/model/ElectricEquipmentDefinition_Impl.hpp +++ b/src/model/ElectricEquipmentDefinition_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricEquipmentDefinition_Impl(const ElectricEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricEquipmentDefinition_Impl() = default; + virtual ~ElectricEquipmentDefinition_Impl() override = default; //@} diff --git a/src/model/ElectricEquipmentITEAirCooled.hpp b/src/model/ElectricEquipmentITEAirCooled.hpp index 59715563b11..20dd472402d 100644 --- a/src/model/ElectricEquipmentITEAirCooled.hpp +++ b/src/model/ElectricEquipmentITEAirCooled.hpp @@ -35,7 +35,7 @@ namespace model { explicit ElectricEquipmentITEAirCooled(const ElectricEquipmentITEAirCooledDefinition& electricEquipmentITEAirCooledDefinition); - virtual ~ElectricEquipmentITEAirCooled() = default; + virtual ~ElectricEquipmentITEAirCooled() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricEquipmentITEAirCooled(const ElectricEquipmentITEAirCooled& other) = default; ElectricEquipmentITEAirCooled(ElectricEquipmentITEAirCooled&& other) = default; @@ -150,4 +150,3 @@ namespace model { } // namespace openstudio #endif // MODEL_ELECTRICEQUIPMENTITEAIRCOOLED_HPP - diff --git a/src/model/ElectricEquipmentITEAirCooledDefinition.hpp b/src/model/ElectricEquipmentITEAirCooledDefinition.hpp index d3649af9dc1..fa3fcb6d769 100644 --- a/src/model/ElectricEquipmentITEAirCooledDefinition.hpp +++ b/src/model/ElectricEquipmentITEAirCooledDefinition.hpp @@ -39,7 +39,7 @@ namespace model { /** Create ElectricEquipmentITEAirCooledDefinition with default curves **/ explicit ElectricEquipmentITEAirCooledDefinition(const Model& model); - virtual ~ElectricEquipmentITEAirCooledDefinition() = default; + virtual ~ElectricEquipmentITEAirCooledDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricEquipmentITEAirCooledDefinition(const ElectricEquipmentITEAirCooledDefinition& other) = default; ElectricEquipmentITEAirCooledDefinition(ElectricEquipmentITEAirCooledDefinition&& other) = default; diff --git a/src/model/ElectricEquipmentITEAirCooledDefinition_Impl.hpp b/src/model/ElectricEquipmentITEAirCooledDefinition_Impl.hpp index daf897f82b1..8889c24ed1b 100644 --- a/src/model/ElectricEquipmentITEAirCooledDefinition_Impl.hpp +++ b/src/model/ElectricEquipmentITEAirCooledDefinition_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ElectricEquipmentITEAirCooledDefinition_Impl(const ElectricEquipmentITEAirCooledDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricEquipmentITEAirCooledDefinition_Impl() = default; + virtual ~ElectricEquipmentITEAirCooledDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricEquipmentITEAirCooled_Impl.hpp b/src/model/ElectricEquipmentITEAirCooled_Impl.hpp index 76bb97e1d17..f418f426dfa 100644 --- a/src/model/ElectricEquipmentITEAirCooled_Impl.hpp +++ b/src/model/ElectricEquipmentITEAirCooled_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ElectricEquipmentITEAirCooled_Impl(const ElectricEquipmentITEAirCooled_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricEquipmentITEAirCooled_Impl() = default; + virtual ~ElectricEquipmentITEAirCooled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricEquipment_Impl.hpp b/src/model/ElectricEquipment_Impl.hpp index 53309dc7c00..5eb1ea35f30 100644 --- a/src/model/ElectricEquipment_Impl.hpp +++ b/src/model/ElectricEquipment_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ElectricEquipment_Impl(const ElectricEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricEquipment_Impl() = default; + virtual ~ElectricEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterDistribution.hpp b/src/model/ElectricLoadCenterDistribution.hpp index 9723d3b8acf..f720015f833 100644 --- a/src/model/ElectricLoadCenterDistribution.hpp +++ b/src/model/ElectricLoadCenterDistribution.hpp @@ -40,7 +40,7 @@ namespace model { explicit ElectricLoadCenterDistribution(const Model& model); - virtual ~ElectricLoadCenterDistribution() = default; + virtual ~ElectricLoadCenterDistribution() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterDistribution(const ElectricLoadCenterDistribution& other) = default; ElectricLoadCenterDistribution(ElectricLoadCenterDistribution&& other) = default; diff --git a/src/model/ElectricLoadCenterDistribution_Impl.hpp b/src/model/ElectricLoadCenterDistribution_Impl.hpp index f3273b2deb3..b2546edab44 100644 --- a/src/model/ElectricLoadCenterDistribution_Impl.hpp +++ b/src/model/ElectricLoadCenterDistribution_Impl.hpp @@ -36,7 +36,7 @@ namespace model { ElectricLoadCenterDistribution_Impl(const ElectricLoadCenterDistribution_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterDistribution_Impl() = default; + virtual ~ElectricLoadCenterDistribution_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterInverterLookUpTable.hpp b/src/model/ElectricLoadCenterInverterLookUpTable.hpp index c6f7401370c..e5c65fb6aa4 100644 --- a/src/model/ElectricLoadCenterInverterLookUpTable.hpp +++ b/src/model/ElectricLoadCenterInverterLookUpTable.hpp @@ -31,7 +31,7 @@ namespace model { explicit ElectricLoadCenterInverterLookUpTable(const Model& model); - virtual ~ElectricLoadCenterInverterLookUpTable() = default; + virtual ~ElectricLoadCenterInverterLookUpTable() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterInverterLookUpTable(const ElectricLoadCenterInverterLookUpTable& other) = default; ElectricLoadCenterInverterLookUpTable(ElectricLoadCenterInverterLookUpTable&& other) = default; diff --git a/src/model/ElectricLoadCenterInverterLookUpTable_Impl.hpp b/src/model/ElectricLoadCenterInverterLookUpTable_Impl.hpp index c1c860662de..78683d5eeaa 100644 --- a/src/model/ElectricLoadCenterInverterLookUpTable_Impl.hpp +++ b/src/model/ElectricLoadCenterInverterLookUpTable_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricLoadCenterInverterLookUpTable_Impl(const ElectricLoadCenterInverterLookUpTable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterInverterLookUpTable_Impl() = default; + virtual ~ElectricLoadCenterInverterLookUpTable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterInverterPVWatts.hpp b/src/model/ElectricLoadCenterInverterPVWatts.hpp index befb2e37281..4650e2987df 100644 --- a/src/model/ElectricLoadCenterInverterPVWatts.hpp +++ b/src/model/ElectricLoadCenterInverterPVWatts.hpp @@ -31,7 +31,7 @@ namespace model { explicit ElectricLoadCenterInverterPVWatts(const Model& model); - virtual ~ElectricLoadCenterInverterPVWatts() = default; + virtual ~ElectricLoadCenterInverterPVWatts() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterInverterPVWatts(const ElectricLoadCenterInverterPVWatts& other) = default; ElectricLoadCenterInverterPVWatts(ElectricLoadCenterInverterPVWatts&& other) = default; diff --git a/src/model/ElectricLoadCenterInverterPVWatts_Impl.hpp b/src/model/ElectricLoadCenterInverterPVWatts_Impl.hpp index cec7e598564..470945f4ed5 100644 --- a/src/model/ElectricLoadCenterInverterPVWatts_Impl.hpp +++ b/src/model/ElectricLoadCenterInverterPVWatts_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricLoadCenterInverterPVWatts_Impl(const ElectricLoadCenterInverterPVWatts_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterInverterPVWatts_Impl() = default; + virtual ~ElectricLoadCenterInverterPVWatts_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterInverterSimple.hpp b/src/model/ElectricLoadCenterInverterSimple.hpp index 941ff05ba3b..d9f361d7dc5 100644 --- a/src/model/ElectricLoadCenterInverterSimple.hpp +++ b/src/model/ElectricLoadCenterInverterSimple.hpp @@ -31,7 +31,7 @@ namespace model { explicit ElectricLoadCenterInverterSimple(const Model& model); - virtual ~ElectricLoadCenterInverterSimple() = default; + virtual ~ElectricLoadCenterInverterSimple() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterInverterSimple(const ElectricLoadCenterInverterSimple& other) = default; ElectricLoadCenterInverterSimple(ElectricLoadCenterInverterSimple&& other) = default; diff --git a/src/model/ElectricLoadCenterInverterSimple_Impl.hpp b/src/model/ElectricLoadCenterInverterSimple_Impl.hpp index 386dc09d2bc..ff4044c1a9a 100644 --- a/src/model/ElectricLoadCenterInverterSimple_Impl.hpp +++ b/src/model/ElectricLoadCenterInverterSimple_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricLoadCenterInverterSimple_Impl(const ElectricLoadCenterInverterSimple_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterInverterSimple_Impl() = default; + virtual ~ElectricLoadCenterInverterSimple_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterStorageConverter.hpp b/src/model/ElectricLoadCenterStorageConverter.hpp index 55f722c2d1f..6b63d843f9f 100644 --- a/src/model/ElectricLoadCenterStorageConverter.hpp +++ b/src/model/ElectricLoadCenterStorageConverter.hpp @@ -33,7 +33,7 @@ namespace model { explicit ElectricLoadCenterStorageConverter(const Model& model); - virtual ~ElectricLoadCenterStorageConverter() = default; + virtual ~ElectricLoadCenterStorageConverter() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterStorageConverter(const ElectricLoadCenterStorageConverter& other) = default; ElectricLoadCenterStorageConverter(ElectricLoadCenterStorageConverter&& other) = default; diff --git a/src/model/ElectricLoadCenterStorageConverter_Impl.hpp b/src/model/ElectricLoadCenterStorageConverter_Impl.hpp index 82ce8a9d80a..b64a9b270f6 100644 --- a/src/model/ElectricLoadCenterStorageConverter_Impl.hpp +++ b/src/model/ElectricLoadCenterStorageConverter_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ElectricLoadCenterStorageConverter_Impl(const ElectricLoadCenterStorageConverter_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterStorageConverter_Impl() = default; + virtual ~ElectricLoadCenterStorageConverter_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterStorageLiIonNMCBattery.hpp b/src/model/ElectricLoadCenterStorageLiIonNMCBattery.hpp index 54e5b567c19..21c95af3fad 100644 --- a/src/model/ElectricLoadCenterStorageLiIonNMCBattery.hpp +++ b/src/model/ElectricLoadCenterStorageLiIonNMCBattery.hpp @@ -34,7 +34,7 @@ namespace model { explicit ElectricLoadCenterStorageLiIonNMCBattery(const Model& model, const int numberofCellsinSeries, const int numberofStringsinParallel, const double batteryMass, const double batterySurfaceArea); - virtual ~ElectricLoadCenterStorageLiIonNMCBattery() = default; + virtual ~ElectricLoadCenterStorageLiIonNMCBattery() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterStorageLiIonNMCBattery(const ElectricLoadCenterStorageLiIonNMCBattery& other) = default; ElectricLoadCenterStorageLiIonNMCBattery(ElectricLoadCenterStorageLiIonNMCBattery&& other) = default; diff --git a/src/model/ElectricLoadCenterStorageLiIonNMCBattery_Impl.hpp b/src/model/ElectricLoadCenterStorageLiIonNMCBattery_Impl.hpp index 5bcc3c826a2..c296965e285 100644 --- a/src/model/ElectricLoadCenterStorageLiIonNMCBattery_Impl.hpp +++ b/src/model/ElectricLoadCenterStorageLiIonNMCBattery_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricLoadCenterStorageLiIonNMCBattery_Impl(const ElectricLoadCenterStorageLiIonNMCBattery_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterStorageLiIonNMCBattery_Impl() = default; + virtual ~ElectricLoadCenterStorageLiIonNMCBattery_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterStorageSimple.hpp b/src/model/ElectricLoadCenterStorageSimple.hpp index 1d20bfec201..fc1fbdb28f8 100644 --- a/src/model/ElectricLoadCenterStorageSimple.hpp +++ b/src/model/ElectricLoadCenterStorageSimple.hpp @@ -31,7 +31,7 @@ namespace model { explicit ElectricLoadCenterStorageSimple(const Model& model); - virtual ~ElectricLoadCenterStorageSimple() = default; + virtual ~ElectricLoadCenterStorageSimple() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterStorageSimple(const ElectricLoadCenterStorageSimple& other) = default; ElectricLoadCenterStorageSimple(ElectricLoadCenterStorageSimple&& other) = default; diff --git a/src/model/ElectricLoadCenterStorageSimple_Impl.hpp b/src/model/ElectricLoadCenterStorageSimple_Impl.hpp index 45bc5373859..c61403f2be7 100644 --- a/src/model/ElectricLoadCenterStorageSimple_Impl.hpp +++ b/src/model/ElectricLoadCenterStorageSimple_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricLoadCenterStorageSimple_Impl(const ElectricLoadCenterStorageSimple_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterStorageSimple_Impl() = default; + virtual ~ElectricLoadCenterStorageSimple_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricLoadCenterTransformer.hpp b/src/model/ElectricLoadCenterTransformer.hpp index f748be806b5..cf9e6447aab 100644 --- a/src/model/ElectricLoadCenterTransformer.hpp +++ b/src/model/ElectricLoadCenterTransformer.hpp @@ -32,7 +32,7 @@ namespace model { explicit ElectricLoadCenterTransformer(const Model& model); - virtual ~ElectricLoadCenterTransformer() = default; + virtual ~ElectricLoadCenterTransformer() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricLoadCenterTransformer(const ElectricLoadCenterTransformer& other) = default; ElectricLoadCenterTransformer(ElectricLoadCenterTransformer&& other) = default; diff --git a/src/model/ElectricLoadCenterTransformer_Impl.hpp b/src/model/ElectricLoadCenterTransformer_Impl.hpp index 6343f56283c..ac2c5690408 100644 --- a/src/model/ElectricLoadCenterTransformer_Impl.hpp +++ b/src/model/ElectricLoadCenterTransformer_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ElectricLoadCenterTransformer_Impl(const ElectricLoadCenterTransformer_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ElectricLoadCenterTransformer_Impl() = default; + virtual ~ElectricLoadCenterTransformer_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ElectricalStorage.hpp b/src/model/ElectricalStorage.hpp index ee86f9c6d9d..2bcd02ceabe 100644 --- a/src/model/ElectricalStorage.hpp +++ b/src/model/ElectricalStorage.hpp @@ -27,7 +27,7 @@ It is the Base Class of ElectricLoadCenterStorageSimple, ElectricLoadCenterStora public: ElectricalStorage(IddObjectType type, const Model& model); - virtual ~ElectricalStorage() = default; + virtual ~ElectricalStorage() override = default; // Default the copy and move operators because the virtual dtor is explicit ElectricalStorage(const ElectricalStorage& other) = default; ElectricalStorage(ElectricalStorage&& other) = default; diff --git a/src/model/ElectricalStorage_Impl.hpp b/src/model/ElectricalStorage_Impl.hpp index 74b647c814f..d7ee60c7d44 100644 --- a/src/model/ElectricalStorage_Impl.hpp +++ b/src/model/ElectricalStorage_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ElectricalStorage_Impl(const ElectricalStorage_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~ElectricalStorage_Impl() = default; + virtual ~ElectricalStorage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemActuator.hpp b/src/model/EnergyManagementSystemActuator.hpp index 16a2336d73c..dd52ca6d58e 100644 --- a/src/model/EnergyManagementSystemActuator.hpp +++ b/src/model/EnergyManagementSystemActuator.hpp @@ -56,7 +56,7 @@ namespace model { explicit EnergyManagementSystemActuator(const ModelObject& actuatedComponent, const std::string& actuatedComponentType, const std::string& actuatedComponentControlType, const ThermalZone& thermalZone); - virtual ~EnergyManagementSystemActuator() = default; + virtual ~EnergyManagementSystemActuator() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemActuator(const EnergyManagementSystemActuator& other) = default; EnergyManagementSystemActuator(EnergyManagementSystemActuator&& other) = default; diff --git a/src/model/EnergyManagementSystemActuator_Impl.hpp b/src/model/EnergyManagementSystemActuator_Impl.hpp index 8a5c2791a64..6ec33b2ea28 100644 --- a/src/model/EnergyManagementSystemActuator_Impl.hpp +++ b/src/model/EnergyManagementSystemActuator_Impl.hpp @@ -30,7 +30,7 @@ namespace model { EnergyManagementSystemActuator_Impl(const EnergyManagementSystemActuator_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemActuator_Impl() = default; + virtual ~EnergyManagementSystemActuator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemConstructionIndexVariable.hpp b/src/model/EnergyManagementSystemConstructionIndexVariable.hpp index c97d4eddc51..2806e22272d 100644 --- a/src/model/EnergyManagementSystemConstructionIndexVariable.hpp +++ b/src/model/EnergyManagementSystemConstructionIndexVariable.hpp @@ -32,7 +32,7 @@ namespace model { explicit EnergyManagementSystemConstructionIndexVariable(const Model& model); - virtual ~EnergyManagementSystemConstructionIndexVariable() = default; + virtual ~EnergyManagementSystemConstructionIndexVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemConstructionIndexVariable(const EnergyManagementSystemConstructionIndexVariable& other) = default; EnergyManagementSystemConstructionIndexVariable(EnergyManagementSystemConstructionIndexVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemConstructionIndexVariable_Impl.hpp b/src/model/EnergyManagementSystemConstructionIndexVariable_Impl.hpp index 0bf4a9fc079..4e8034a80a8 100644 --- a/src/model/EnergyManagementSystemConstructionIndexVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemConstructionIndexVariable_Impl.hpp @@ -31,7 +31,7 @@ namespace model { EnergyManagementSystemConstructionIndexVariable_Impl(const EnergyManagementSystemConstructionIndexVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemConstructionIndexVariable_Impl() = default; + virtual ~EnergyManagementSystemConstructionIndexVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemCurveOrTableIndexVariable.hpp b/src/model/EnergyManagementSystemCurveOrTableIndexVariable.hpp index 83bd7aa9349..c503bd00ab9 100644 --- a/src/model/EnergyManagementSystemCurveOrTableIndexVariable.hpp +++ b/src/model/EnergyManagementSystemCurveOrTableIndexVariable.hpp @@ -31,7 +31,7 @@ namespace model { explicit EnergyManagementSystemCurveOrTableIndexVariable(const Model& model); - virtual ~EnergyManagementSystemCurveOrTableIndexVariable() = default; + virtual ~EnergyManagementSystemCurveOrTableIndexVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemCurveOrTableIndexVariable(const EnergyManagementSystemCurveOrTableIndexVariable& other) = default; EnergyManagementSystemCurveOrTableIndexVariable(EnergyManagementSystemCurveOrTableIndexVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemCurveOrTableIndexVariable_Impl.hpp b/src/model/EnergyManagementSystemCurveOrTableIndexVariable_Impl.hpp index 90c338f2a4c..58cd7ddf090 100644 --- a/src/model/EnergyManagementSystemCurveOrTableIndexVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemCurveOrTableIndexVariable_Impl.hpp @@ -30,7 +30,7 @@ namespace model { EnergyManagementSystemCurveOrTableIndexVariable_Impl(const EnergyManagementSystemCurveOrTableIndexVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemCurveOrTableIndexVariable_Impl() = default; + virtual ~EnergyManagementSystemCurveOrTableIndexVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemGlobalVariable.hpp b/src/model/EnergyManagementSystemGlobalVariable.hpp index a028dba0a5f..bdc61a2f82b 100644 --- a/src/model/EnergyManagementSystemGlobalVariable.hpp +++ b/src/model/EnergyManagementSystemGlobalVariable.hpp @@ -27,7 +27,7 @@ namespace model { explicit EnergyManagementSystemGlobalVariable(const Model& model, const std::string& variableName); - virtual ~EnergyManagementSystemGlobalVariable() = default; + virtual ~EnergyManagementSystemGlobalVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemGlobalVariable(const EnergyManagementSystemGlobalVariable& other) = default; EnergyManagementSystemGlobalVariable(EnergyManagementSystemGlobalVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemGlobalVariable_Impl.hpp b/src/model/EnergyManagementSystemGlobalVariable_Impl.hpp index d6bad270b62..bc001d41270 100644 --- a/src/model/EnergyManagementSystemGlobalVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemGlobalVariable_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnergyManagementSystemGlobalVariable_Impl(const EnergyManagementSystemGlobalVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemGlobalVariable_Impl() = default; + virtual ~EnergyManagementSystemGlobalVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemInternalVariable.hpp b/src/model/EnergyManagementSystemInternalVariable.hpp index e65629ad9b2..4b669877e4c 100644 --- a/src/model/EnergyManagementSystemInternalVariable.hpp +++ b/src/model/EnergyManagementSystemInternalVariable.hpp @@ -31,7 +31,7 @@ namespace model { //@{ explicit EnergyManagementSystemInternalVariable(const Model& model, const std::string& internalDataType); - virtual ~EnergyManagementSystemInternalVariable() = default; + virtual ~EnergyManagementSystemInternalVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemInternalVariable(const EnergyManagementSystemInternalVariable& other) = default; EnergyManagementSystemInternalVariable(EnergyManagementSystemInternalVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemInternalVariable_Impl.hpp b/src/model/EnergyManagementSystemInternalVariable_Impl.hpp index c59f9d3f994..ff43cd130aa 100644 --- a/src/model/EnergyManagementSystemInternalVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemInternalVariable_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnergyManagementSystemInternalVariable_Impl(const EnergyManagementSystemInternalVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemInternalVariable_Impl() = default; + virtual ~EnergyManagementSystemInternalVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemMeteredOutputVariable.hpp b/src/model/EnergyManagementSystemMeteredOutputVariable.hpp index 2ddee65062f..b46470a06fa 100644 --- a/src/model/EnergyManagementSystemMeteredOutputVariable.hpp +++ b/src/model/EnergyManagementSystemMeteredOutputVariable.hpp @@ -55,7 +55,7 @@ namespace model { explicit EnergyManagementSystemMeteredOutputVariable(const Model& model, const EnergyManagementSystemConstructionIndexVariable& object); - virtual ~EnergyManagementSystemMeteredOutputVariable() = default; + virtual ~EnergyManagementSystemMeteredOutputVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemMeteredOutputVariable(const EnergyManagementSystemMeteredOutputVariable& other) = default; EnergyManagementSystemMeteredOutputVariable(EnergyManagementSystemMeteredOutputVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemMeteredOutputVariable_Impl.hpp b/src/model/EnergyManagementSystemMeteredOutputVariable_Impl.hpp index c11843d73d0..c834ca327e4 100644 --- a/src/model/EnergyManagementSystemMeteredOutputVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemMeteredOutputVariable_Impl.hpp @@ -30,7 +30,7 @@ namespace model { EnergyManagementSystemMeteredOutputVariable_Impl(const EnergyManagementSystemMeteredOutputVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemMeteredOutputVariable_Impl() = default; + virtual ~EnergyManagementSystemMeteredOutputVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemOutputVariable.hpp b/src/model/EnergyManagementSystemOutputVariable.hpp index 3ef53e66fa1..080a8ab2e9c 100644 --- a/src/model/EnergyManagementSystemOutputVariable.hpp +++ b/src/model/EnergyManagementSystemOutputVariable.hpp @@ -54,7 +54,7 @@ namespace model { explicit EnergyManagementSystemOutputVariable(const Model& model, const EnergyManagementSystemConstructionIndexVariable& object); - virtual ~EnergyManagementSystemOutputVariable() = default; + virtual ~EnergyManagementSystemOutputVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemOutputVariable(const EnergyManagementSystemOutputVariable& other) = default; EnergyManagementSystemOutputVariable(EnergyManagementSystemOutputVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemOutputVariable_Impl.hpp b/src/model/EnergyManagementSystemOutputVariable_Impl.hpp index aeec88b699e..c8f3d51ade4 100644 --- a/src/model/EnergyManagementSystemOutputVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemOutputVariable_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnergyManagementSystemOutputVariable_Impl(const EnergyManagementSystemOutputVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemOutputVariable_Impl() = default; + virtual ~EnergyManagementSystemOutputVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemProgram.hpp b/src/model/EnergyManagementSystemProgram.hpp index effc28a1621..ab802e2acec 100644 --- a/src/model/EnergyManagementSystemProgram.hpp +++ b/src/model/EnergyManagementSystemProgram.hpp @@ -27,7 +27,7 @@ namespace model { explicit EnergyManagementSystemProgram(const Model& model); - virtual ~EnergyManagementSystemProgram() = default; + virtual ~EnergyManagementSystemProgram() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemProgram(const EnergyManagementSystemProgram& other) = default; EnergyManagementSystemProgram(EnergyManagementSystemProgram&& other) = default; diff --git a/src/model/EnergyManagementSystemProgramCallingManager.hpp b/src/model/EnergyManagementSystemProgramCallingManager.hpp index 3819704e13d..df0cb150fd9 100644 --- a/src/model/EnergyManagementSystemProgramCallingManager.hpp +++ b/src/model/EnergyManagementSystemProgramCallingManager.hpp @@ -28,7 +28,7 @@ namespace model { explicit EnergyManagementSystemProgramCallingManager(const Model& model); - virtual ~EnergyManagementSystemProgramCallingManager() = default; + virtual ~EnergyManagementSystemProgramCallingManager() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemProgramCallingManager(const EnergyManagementSystemProgramCallingManager& other) = default; EnergyManagementSystemProgramCallingManager(EnergyManagementSystemProgramCallingManager&& other) = default; diff --git a/src/model/EnergyManagementSystemProgramCallingManager_Impl.hpp b/src/model/EnergyManagementSystemProgramCallingManager_Impl.hpp index 22677bd39de..3224a1f1727 100644 --- a/src/model/EnergyManagementSystemProgramCallingManager_Impl.hpp +++ b/src/model/EnergyManagementSystemProgramCallingManager_Impl.hpp @@ -31,7 +31,7 @@ namespace model { EnergyManagementSystemProgramCallingManager_Impl(const EnergyManagementSystemProgramCallingManager_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemProgramCallingManager_Impl() = default; + virtual ~EnergyManagementSystemProgramCallingManager_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemProgram_Impl.hpp b/src/model/EnergyManagementSystemProgram_Impl.hpp index 30fb107aeea..0bda13fe503 100644 --- a/src/model/EnergyManagementSystemProgram_Impl.hpp +++ b/src/model/EnergyManagementSystemProgram_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnergyManagementSystemProgram_Impl(const EnergyManagementSystemProgram_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemProgram_Impl() = default; + virtual ~EnergyManagementSystemProgram_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemSensor.hpp b/src/model/EnergyManagementSystemSensor.hpp index ff140640fbc..a02430e77f3 100644 --- a/src/model/EnergyManagementSystemSensor.hpp +++ b/src/model/EnergyManagementSystemSensor.hpp @@ -43,7 +43,7 @@ namespace model { explicit EnergyManagementSystemSensor(const Model& model, const std::string& outputVariableOrMeterName); - virtual ~EnergyManagementSystemSensor() = default; + virtual ~EnergyManagementSystemSensor() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemSensor(const EnergyManagementSystemSensor& other) = default; EnergyManagementSystemSensor(EnergyManagementSystemSensor&& other) = default; diff --git a/src/model/EnergyManagementSystemSensor_Impl.hpp b/src/model/EnergyManagementSystemSensor_Impl.hpp index 43ebdc13cbb..0566d3e96b1 100644 --- a/src/model/EnergyManagementSystemSensor_Impl.hpp +++ b/src/model/EnergyManagementSystemSensor_Impl.hpp @@ -34,7 +34,7 @@ namespace model { EnergyManagementSystemSensor_Impl(const EnergyManagementSystemSensor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemSensor_Impl() = default; + virtual ~EnergyManagementSystemSensor_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemSubroutine.hpp b/src/model/EnergyManagementSystemSubroutine.hpp index 755a05f87cb..3c918c79405 100644 --- a/src/model/EnergyManagementSystemSubroutine.hpp +++ b/src/model/EnergyManagementSystemSubroutine.hpp @@ -27,7 +27,7 @@ namespace model { explicit EnergyManagementSystemSubroutine(const Model& model); - virtual ~EnergyManagementSystemSubroutine() = default; + virtual ~EnergyManagementSystemSubroutine() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemSubroutine(const EnergyManagementSystemSubroutine& other) = default; EnergyManagementSystemSubroutine(EnergyManagementSystemSubroutine&& other) = default; diff --git a/src/model/EnergyManagementSystemSubroutine_Impl.hpp b/src/model/EnergyManagementSystemSubroutine_Impl.hpp index 35e0f5fd047..fce2863360d 100644 --- a/src/model/EnergyManagementSystemSubroutine_Impl.hpp +++ b/src/model/EnergyManagementSystemSubroutine_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnergyManagementSystemSubroutine_Impl(const EnergyManagementSystemSubroutine_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemSubroutine_Impl() = default; + virtual ~EnergyManagementSystemSubroutine_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnergyManagementSystemTrendVariable.hpp b/src/model/EnergyManagementSystemTrendVariable.hpp index 31f5a59583f..c073215c328 100644 --- a/src/model/EnergyManagementSystemTrendVariable.hpp +++ b/src/model/EnergyManagementSystemTrendVariable.hpp @@ -52,7 +52,7 @@ namespace model { explicit EnergyManagementSystemTrendVariable(const Model& model, const EnergyManagementSystemConstructionIndexVariable& object); - virtual ~EnergyManagementSystemTrendVariable() = default; + virtual ~EnergyManagementSystemTrendVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit EnergyManagementSystemTrendVariable(const EnergyManagementSystemTrendVariable& other) = default; EnergyManagementSystemTrendVariable(EnergyManagementSystemTrendVariable&& other) = default; diff --git a/src/model/EnergyManagementSystemTrendVariable_Impl.hpp b/src/model/EnergyManagementSystemTrendVariable_Impl.hpp index ea71a987377..c6c4e2eda2d 100644 --- a/src/model/EnergyManagementSystemTrendVariable_Impl.hpp +++ b/src/model/EnergyManagementSystemTrendVariable_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnergyManagementSystemTrendVariable_Impl(const EnergyManagementSystemTrendVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnergyManagementSystemTrendVariable_Impl() = default; + virtual ~EnergyManagementSystemTrendVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EnvironmentalImpactFactors.hpp b/src/model/EnvironmentalImpactFactors.hpp index f2f51e32230..62267b0b918 100644 --- a/src/model/EnvironmentalImpactFactors.hpp +++ b/src/model/EnvironmentalImpactFactors.hpp @@ -28,7 +28,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~EnvironmentalImpactFactors() = default; + virtual ~EnvironmentalImpactFactors() override = default; // Default the copy and move operators because the virtual dtor is explicit EnvironmentalImpactFactors(const EnvironmentalImpactFactors& other) = default; EnvironmentalImpactFactors(EnvironmentalImpactFactors&& other) = default; diff --git a/src/model/EnvironmentalImpactFactors_Impl.hpp b/src/model/EnvironmentalImpactFactors_Impl.hpp index 5e543d2a2dc..d04db28edbb 100644 --- a/src/model/EnvironmentalImpactFactors_Impl.hpp +++ b/src/model/EnvironmentalImpactFactors_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EnvironmentalImpactFactors_Impl(const EnvironmentalImpactFactors_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EnvironmentalImpactFactors_Impl() = default; + virtual ~EnvironmentalImpactFactors_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EvaporativeCoolerDirectResearchSpecial.hpp b/src/model/EvaporativeCoolerDirectResearchSpecial.hpp index 8b176109c2c..8104b3bb49a 100644 --- a/src/model/EvaporativeCoolerDirectResearchSpecial.hpp +++ b/src/model/EvaporativeCoolerDirectResearchSpecial.hpp @@ -34,7 +34,7 @@ namespace model { */ explicit EvaporativeCoolerDirectResearchSpecial(const Model& model, Schedule& schedule); - virtual ~EvaporativeCoolerDirectResearchSpecial() = default; + virtual ~EvaporativeCoolerDirectResearchSpecial() override = default; // Default the copy and move operators because the virtual dtor is explicit EvaporativeCoolerDirectResearchSpecial(const EvaporativeCoolerDirectResearchSpecial& other) = default; EvaporativeCoolerDirectResearchSpecial(EvaporativeCoolerDirectResearchSpecial&& other) = default; diff --git a/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp b/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp index a2819bd4fe7..922fc352657 100644 --- a/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp +++ b/src/model/EvaporativeCoolerDirectResearchSpecial_Impl.hpp @@ -27,7 +27,7 @@ namespace model { EvaporativeCoolerDirectResearchSpecial_Impl(const EvaporativeCoolerDirectResearchSpecial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EvaporativeCoolerDirectResearchSpecial_Impl() = default; + virtual ~EvaporativeCoolerDirectResearchSpecial_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EvaporativeCoolerIndirectResearchSpecial.hpp b/src/model/EvaporativeCoolerIndirectResearchSpecial.hpp index 3dd716237e0..091582d9318 100644 --- a/src/model/EvaporativeCoolerIndirectResearchSpecial.hpp +++ b/src/model/EvaporativeCoolerIndirectResearchSpecial.hpp @@ -31,7 +31,7 @@ namespace model { explicit EvaporativeCoolerIndirectResearchSpecial(const Model& model); - virtual ~EvaporativeCoolerIndirectResearchSpecial() = default; + virtual ~EvaporativeCoolerIndirectResearchSpecial() override = default; // Default the copy and move operators because the virtual dtor is explicit EvaporativeCoolerIndirectResearchSpecial(const EvaporativeCoolerIndirectResearchSpecial& other) = default; EvaporativeCoolerIndirectResearchSpecial(EvaporativeCoolerIndirectResearchSpecial&& other) = default; diff --git a/src/model/EvaporativeCoolerIndirectResearchSpecial_Impl.hpp b/src/model/EvaporativeCoolerIndirectResearchSpecial_Impl.hpp index bd25952956b..5b01c4acc3a 100644 --- a/src/model/EvaporativeCoolerIndirectResearchSpecial_Impl.hpp +++ b/src/model/EvaporativeCoolerIndirectResearchSpecial_Impl.hpp @@ -30,7 +30,7 @@ namespace model { EvaporativeCoolerIndirectResearchSpecial_Impl(const EvaporativeCoolerIndirectResearchSpecial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EvaporativeCoolerIndirectResearchSpecial_Impl() = default; + virtual ~EvaporativeCoolerIndirectResearchSpecial_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/EvaporativeFluidCoolerSingleSpeed.hpp b/src/model/EvaporativeFluidCoolerSingleSpeed.hpp index 2387d983fd1..ad937ec818b 100644 --- a/src/model/EvaporativeFluidCoolerSingleSpeed.hpp +++ b/src/model/EvaporativeFluidCoolerSingleSpeed.hpp @@ -30,7 +30,7 @@ namespace model { explicit EvaporativeFluidCoolerSingleSpeed(const Model& model); - virtual ~EvaporativeFluidCoolerSingleSpeed() = default; + virtual ~EvaporativeFluidCoolerSingleSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit EvaporativeFluidCoolerSingleSpeed(const EvaporativeFluidCoolerSingleSpeed& other) = default; EvaporativeFluidCoolerSingleSpeed(EvaporativeFluidCoolerSingleSpeed&& other) = default; diff --git a/src/model/EvaporativeFluidCoolerSingleSpeed_Impl.hpp b/src/model/EvaporativeFluidCoolerSingleSpeed_Impl.hpp index 9729e17b560..e6607cdf825 100644 --- a/src/model/EvaporativeFluidCoolerSingleSpeed_Impl.hpp +++ b/src/model/EvaporativeFluidCoolerSingleSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { EvaporativeFluidCoolerSingleSpeed_Impl(const EvaporativeFluidCoolerSingleSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EvaporativeFluidCoolerSingleSpeed_Impl() = default; + virtual ~EvaporativeFluidCoolerSingleSpeed_Impl() override = default; //@} diff --git a/src/model/EvaporativeFluidCoolerTwoSpeed.hpp b/src/model/EvaporativeFluidCoolerTwoSpeed.hpp index e70da54e57d..3cd13bb5a82 100644 --- a/src/model/EvaporativeFluidCoolerTwoSpeed.hpp +++ b/src/model/EvaporativeFluidCoolerTwoSpeed.hpp @@ -31,7 +31,7 @@ namespace model { explicit EvaporativeFluidCoolerTwoSpeed(const Model& model); - virtual ~EvaporativeFluidCoolerTwoSpeed() = default; + virtual ~EvaporativeFluidCoolerTwoSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit EvaporativeFluidCoolerTwoSpeed(const EvaporativeFluidCoolerTwoSpeed& other) = default; EvaporativeFluidCoolerTwoSpeed(EvaporativeFluidCoolerTwoSpeed&& other) = default; diff --git a/src/model/EvaporativeFluidCoolerTwoSpeed_Impl.hpp b/src/model/EvaporativeFluidCoolerTwoSpeed_Impl.hpp index 7608effe673..5979b35aaa9 100644 --- a/src/model/EvaporativeFluidCoolerTwoSpeed_Impl.hpp +++ b/src/model/EvaporativeFluidCoolerTwoSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { EvaporativeFluidCoolerTwoSpeed_Impl(const EvaporativeFluidCoolerTwoSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~EvaporativeFluidCoolerTwoSpeed_Impl() = default; + virtual ~EvaporativeFluidCoolerTwoSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExteriorFuelEquipment.hpp b/src/model/ExteriorFuelEquipment.hpp index 370fc797a04..39ea112d341 100644 --- a/src/model/ExteriorFuelEquipment.hpp +++ b/src/model/ExteriorFuelEquipment.hpp @@ -40,7 +40,7 @@ namespace model { /** This constructor requires a user-specified schedule. */ ExteriorFuelEquipment(const ExteriorFuelEquipmentDefinition& definition, Schedule& schedule); - virtual ~ExteriorFuelEquipment() = default; + virtual ~ExteriorFuelEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorFuelEquipment(const ExteriorFuelEquipment& other) = default; ExteriorFuelEquipment(ExteriorFuelEquipment&& other) = default; diff --git a/src/model/ExteriorFuelEquipmentDefinition.hpp b/src/model/ExteriorFuelEquipmentDefinition.hpp index 6a84d56270b..b41bb315639 100644 --- a/src/model/ExteriorFuelEquipmentDefinition.hpp +++ b/src/model/ExteriorFuelEquipmentDefinition.hpp @@ -29,7 +29,7 @@ namespace model { /** Defaults design level to 0.0 W. */ explicit ExteriorFuelEquipmentDefinition(const Model& model); - virtual ~ExteriorFuelEquipmentDefinition() = default; + virtual ~ExteriorFuelEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorFuelEquipmentDefinition(const ExteriorFuelEquipmentDefinition& other) = default; ExteriorFuelEquipmentDefinition(ExteriorFuelEquipmentDefinition&& other) = default; diff --git a/src/model/ExteriorFuelEquipmentDefinition_Impl.hpp b/src/model/ExteriorFuelEquipmentDefinition_Impl.hpp index 70d652ec909..d49dd002662 100644 --- a/src/model/ExteriorFuelEquipmentDefinition_Impl.hpp +++ b/src/model/ExteriorFuelEquipmentDefinition_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExteriorFuelEquipmentDefinition_Impl(const ExteriorFuelEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorFuelEquipmentDefinition_Impl() = default; + virtual ~ExteriorFuelEquipmentDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExteriorFuelEquipment_Impl.hpp b/src/model/ExteriorFuelEquipment_Impl.hpp index 0a853703dcb..533eeb166e8 100644 --- a/src/model/ExteriorFuelEquipment_Impl.hpp +++ b/src/model/ExteriorFuelEquipment_Impl.hpp @@ -35,7 +35,7 @@ namespace model { ExteriorFuelEquipment_Impl(const ExteriorFuelEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorFuelEquipment_Impl() = default; + virtual ~ExteriorFuelEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExteriorLights.hpp b/src/model/ExteriorLights.hpp index d8b895f6ed1..78b801b0439 100644 --- a/src/model/ExteriorLights.hpp +++ b/src/model/ExteriorLights.hpp @@ -38,7 +38,7 @@ namespace model { /** This constructor requires a user-specified schedule. */ ExteriorLights(const ExteriorLightsDefinition& definition, Schedule& schedule); - virtual ~ExteriorLights() = default; + virtual ~ExteriorLights() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorLights(const ExteriorLights& other) = default; ExteriorLights(ExteriorLights&& other) = default; diff --git a/src/model/ExteriorLightsDefinition.hpp b/src/model/ExteriorLightsDefinition.hpp index 12c399fd314..5c4acde7733 100644 --- a/src/model/ExteriorLightsDefinition.hpp +++ b/src/model/ExteriorLightsDefinition.hpp @@ -29,7 +29,7 @@ namespace model { /** Defaults design level to 0.0 W. */ explicit ExteriorLightsDefinition(const Model& model); - virtual ~ExteriorLightsDefinition() = default; + virtual ~ExteriorLightsDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorLightsDefinition(const ExteriorLightsDefinition& other) = default; ExteriorLightsDefinition(ExteriorLightsDefinition&& other) = default; diff --git a/src/model/ExteriorLightsDefinition_Impl.hpp b/src/model/ExteriorLightsDefinition_Impl.hpp index 45f4bceedab..1ff3fc85a14 100644 --- a/src/model/ExteriorLightsDefinition_Impl.hpp +++ b/src/model/ExteriorLightsDefinition_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExteriorLightsDefinition_Impl(const ExteriorLightsDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorLightsDefinition_Impl() = default; + virtual ~ExteriorLightsDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExteriorLights_Impl.hpp b/src/model/ExteriorLights_Impl.hpp index 31ba9f2b42d..c5979f9b8d1 100644 --- a/src/model/ExteriorLights_Impl.hpp +++ b/src/model/ExteriorLights_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ExteriorLights_Impl(const ExteriorLights_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorLights_Impl() = default; + virtual ~ExteriorLights_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExteriorLoadDefinition.hpp b/src/model/ExteriorLoadDefinition.hpp index e32ea904c84..92cd4611828 100644 --- a/src/model/ExteriorLoadDefinition.hpp +++ b/src/model/ExteriorLoadDefinition.hpp @@ -24,7 +24,7 @@ namespace model { class MODEL_API ExteriorLoadDefinition : public ResourceObject { public: - virtual ~ExteriorLoadDefinition() = default; + virtual ~ExteriorLoadDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorLoadDefinition(const ExteriorLoadDefinition& other) = default; ExteriorLoadDefinition(ExteriorLoadDefinition&& other) = default; diff --git a/src/model/ExteriorLoadDefinition_Impl.hpp b/src/model/ExteriorLoadDefinition_Impl.hpp index 3892db86953..24c5b25774d 100644 --- a/src/model/ExteriorLoadDefinition_Impl.hpp +++ b/src/model/ExteriorLoadDefinition_Impl.hpp @@ -30,7 +30,7 @@ namespace model { // Clone copy constructor. ExteriorLoadDefinition_Impl(const ExteriorLoadDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorLoadDefinition_Impl() = default; + virtual ~ExteriorLoadDefinition_Impl() override = default; /// Removes the definition and all instances. virtual std::vector remove() override; diff --git a/src/model/ExteriorLoadInstance.hpp b/src/model/ExteriorLoadInstance.hpp index efcb9c9b762..b69313b7130 100644 --- a/src/model/ExteriorLoadInstance.hpp +++ b/src/model/ExteriorLoadInstance.hpp @@ -25,7 +25,7 @@ namespace model { class MODEL_API ExteriorLoadInstance : public ModelObject { public: - virtual ~ExteriorLoadInstance() = default; + virtual ~ExteriorLoadInstance() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorLoadInstance(const ExteriorLoadInstance& other) = default; ExteriorLoadInstance(ExteriorLoadInstance&& other) = default; diff --git a/src/model/ExteriorLoadInstance_Impl.hpp b/src/model/ExteriorLoadInstance_Impl.hpp index 7689bf6ee1e..63a48ca196e 100644 --- a/src/model/ExteriorLoadInstance_Impl.hpp +++ b/src/model/ExteriorLoadInstance_Impl.hpp @@ -31,7 +31,7 @@ namespace model { // Clone copy constructor. ExteriorLoadInstance_Impl(const ExteriorLoadInstance_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorLoadInstance_Impl() = default; + virtual ~ExteriorLoadInstance_Impl() override = default; /** Returns the definition of this instance. */ ExteriorLoadDefinition definition() const; diff --git a/src/model/ExteriorWaterEquipment.hpp b/src/model/ExteriorWaterEquipment.hpp index c40772cab6a..25663cd9815 100644 --- a/src/model/ExteriorWaterEquipment.hpp +++ b/src/model/ExteriorWaterEquipment.hpp @@ -37,7 +37,7 @@ namespace model { /** This constructor requires a user-specified schedule. */ ExteriorWaterEquipment(const ExteriorWaterEquipmentDefinition& definition, Schedule& schedule); - virtual ~ExteriorWaterEquipment() = default; + virtual ~ExteriorWaterEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorWaterEquipment(const ExteriorWaterEquipment& other) = default; ExteriorWaterEquipment(ExteriorWaterEquipment&& other) = default; diff --git a/src/model/ExteriorWaterEquipmentDefinition.hpp b/src/model/ExteriorWaterEquipmentDefinition.hpp index 6d69f004b59..39950dc1c65 100644 --- a/src/model/ExteriorWaterEquipmentDefinition.hpp +++ b/src/model/ExteriorWaterEquipmentDefinition.hpp @@ -29,7 +29,7 @@ namespace model { /** Defaults design level to 0.0 W. */ explicit ExteriorWaterEquipmentDefinition(const Model& model); - virtual ~ExteriorWaterEquipmentDefinition() = default; + virtual ~ExteriorWaterEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit ExteriorWaterEquipmentDefinition(const ExteriorWaterEquipmentDefinition& other) = default; ExteriorWaterEquipmentDefinition(ExteriorWaterEquipmentDefinition&& other) = default; diff --git a/src/model/ExteriorWaterEquipmentDefinition_Impl.hpp b/src/model/ExteriorWaterEquipmentDefinition_Impl.hpp index c3d0829d4d4..56938ce5514 100644 --- a/src/model/ExteriorWaterEquipmentDefinition_Impl.hpp +++ b/src/model/ExteriorWaterEquipmentDefinition_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExteriorWaterEquipmentDefinition_Impl(const ExteriorWaterEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorWaterEquipmentDefinition_Impl() = default; + virtual ~ExteriorWaterEquipmentDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExteriorWaterEquipment_Impl.hpp b/src/model/ExteriorWaterEquipment_Impl.hpp index 0362dee3841..3786f202321 100644 --- a/src/model/ExteriorWaterEquipment_Impl.hpp +++ b/src/model/ExteriorWaterEquipment_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ExteriorWaterEquipment_Impl(const ExteriorWaterEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExteriorWaterEquipment_Impl() = default; + virtual ~ExteriorWaterEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalFile.hpp b/src/model/ExternalFile.hpp index 1ca91b1da14..01213980cd2 100644 --- a/src/model/ExternalFile.hpp +++ b/src/model/ExternalFile.hpp @@ -32,7 +32,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ExternalFile() = default; + virtual ~ExternalFile() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalFile(const ExternalFile& other) = default; ExternalFile(ExternalFile&& other) = default; diff --git a/src/model/ExternalFile_Impl.hpp b/src/model/ExternalFile_Impl.hpp index 706f2a812f8..75377e322d2 100644 --- a/src/model/ExternalFile_Impl.hpp +++ b/src/model/ExternalFile_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ExternalFile_Impl(const ExternalFile_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalFile_Impl() = default; + virtual ~ExternalFile_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterface.hpp b/src/model/ExternalInterface.hpp index 56c744673a7..9a069164405 100644 --- a/src/model/ExternalInterface.hpp +++ b/src/model/ExternalInterface.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ExternalInterface() = default; + virtual ~ExternalInterface() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterface(const ExternalInterface& other) = default; ExternalInterface(ExternalInterface&& other) = default; diff --git a/src/model/ExternalInterfaceActuator.hpp b/src/model/ExternalInterfaceActuator.hpp index 8cae583881c..15e471ec123 100644 --- a/src/model/ExternalInterfaceActuator.hpp +++ b/src/model/ExternalInterfaceActuator.hpp @@ -31,7 +31,7 @@ namespace model { explicit ExternalInterfaceActuator(const ModelObject& modelObject, const std::string actuatedComponentType, const std::string actuatedComponentControlType); - virtual ~ExternalInterfaceActuator() = default; + virtual ~ExternalInterfaceActuator() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceActuator(const ExternalInterfaceActuator& other) = default; ExternalInterfaceActuator(ExternalInterfaceActuator&& other) = default; diff --git a/src/model/ExternalInterfaceActuator_Impl.hpp b/src/model/ExternalInterfaceActuator_Impl.hpp index 7f634b6b9f0..f2867e1293e 100644 --- a/src/model/ExternalInterfaceActuator_Impl.hpp +++ b/src/model/ExternalInterfaceActuator_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExternalInterfaceActuator_Impl(const ExternalInterfaceActuator_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceActuator_Impl() = default; + virtual ~ExternalInterfaceActuator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable.hpp index e03fc020d63..c7943a800f2 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable.hpp @@ -28,7 +28,7 @@ namespace model { explicit ExternalInterfaceFunctionalMockupUnitExportFromVariable(const Model& model, const std::string& outputVariableIndexKeyName, const std::string& outputVariableName, const std::string& fMUVariableName); - virtual ~ExternalInterfaceFunctionalMockupUnitExportFromVariable() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportFromVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitExportFromVariable(const ExternalInterfaceFunctionalMockupUnitExportFromVariable& other) = default; ExternalInterfaceFunctionalMockupUnitExportFromVariable(ExternalInterfaceFunctionalMockupUnitExportFromVariable&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl.hpp index 09eb642988a..9002f9892d5 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl(const ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportFromVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator.hpp index 290a2b466bd..6c28af330c8 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator.hpp @@ -30,7 +30,7 @@ namespace model { const std::string& actuatedComponentControlType, const std::string& fMUVariableName, double initialValue); - virtual ~ExternalInterfaceFunctionalMockupUnitExportToActuator() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportToActuator() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitExportToActuator(const ExternalInterfaceFunctionalMockupUnitExportToActuator& other) = default; ExternalInterfaceFunctionalMockupUnitExportToActuator(ExternalInterfaceFunctionalMockupUnitExportToActuator&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl.hpp index 5a3c0b4c74c..2733fb21a3f 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl(const ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportToActuator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule.hpp index 0dd9af0bdeb..c86377e01e5 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule.hpp @@ -28,7 +28,7 @@ namespace model { explicit ExternalInterfaceFunctionalMockupUnitExportToSchedule(const Model& model, const std::string& fMUVariableName, double initialValue); - virtual ~ExternalInterfaceFunctionalMockupUnitExportToSchedule() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportToSchedule() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitExportToSchedule(const ExternalInterfaceFunctionalMockupUnitExportToSchedule& other) = default; ExternalInterfaceFunctionalMockupUnitExportToSchedule(ExternalInterfaceFunctionalMockupUnitExportToSchedule&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl.hpp index 6c781c0ddaa..a417c4eaa3b 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl(const ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportToSchedule_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable.hpp index afe5fe18b38..e72ff2e182c 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable.hpp @@ -28,7 +28,7 @@ namespace model { explicit ExternalInterfaceFunctionalMockupUnitExportToVariable(const Model& model, const std::string& fMUVariableName, double initialValue); - virtual ~ExternalInterfaceFunctionalMockupUnitExportToVariable() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportToVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitExportToVariable(const ExternalInterfaceFunctionalMockupUnitExportToVariable& other) = default; ExternalInterfaceFunctionalMockupUnitExportToVariable(ExternalInterfaceFunctionalMockupUnitExportToVariable&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl.hpp index c57ab36ecc0..dad43a05e9b 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl(const ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitExportToVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImport.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImport.hpp index 9f9ea8c32c5..abf4a80b127 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImport.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImport.hpp @@ -28,7 +28,7 @@ namespace model { explicit ExternalInterfaceFunctionalMockupUnitImport(const Model& model, const std::string& fmuName); - virtual ~ExternalInterfaceFunctionalMockupUnitImport() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImport() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitImport(const ExternalInterfaceFunctionalMockupUnitImport& other) = default; ExternalInterfaceFunctionalMockupUnitImport(ExternalInterfaceFunctionalMockupUnitImport&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable.hpp index 609a186c6f1..79d3a0a0683 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable.hpp @@ -32,7 +32,7 @@ namespace model { const ExternalInterfaceFunctionalMockupUnitImport& fMUFile, const std::string& fMUInstanceName, const std::string& fMUVariableName); - virtual ~ExternalInterfaceFunctionalMockupUnitImportFromVariable() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportFromVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitImportFromVariable(const ExternalInterfaceFunctionalMockupUnitImportFromVariable& other) = default; ExternalInterfaceFunctionalMockupUnitImportFromVariable(ExternalInterfaceFunctionalMockupUnitImportFromVariable&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl.hpp index bd981ced6b4..e2d6f27b87c 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl(const ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportFromVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator.hpp index 62987554bc8..e8fc44b4bfb 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator.hpp @@ -35,7 +35,7 @@ namespace model { const std::string& fMUInstanceName, const std::string& fMUVariableName, double initialValue); - virtual ~ExternalInterfaceFunctionalMockupUnitImportToActuator() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportToActuator() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitImportToActuator(const ExternalInterfaceFunctionalMockupUnitImportToActuator& other) = default; ExternalInterfaceFunctionalMockupUnitImportToActuator(ExternalInterfaceFunctionalMockupUnitImportToActuator&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl.hpp index 2a016c9d50f..de1205d68b7 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl(const ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportToActuator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule.hpp index 054ae1a146e..141d6c46b41 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule.hpp @@ -33,7 +33,7 @@ namespace model { const std::string& fMUInstanceName, const std::string& fMUVariableName, double initialValue); - virtual ~ExternalInterfaceFunctionalMockupUnitImportToSchedule() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportToSchedule() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitImportToSchedule(const ExternalInterfaceFunctionalMockupUnitImportToSchedule& other) = default; ExternalInterfaceFunctionalMockupUnitImportToSchedule(ExternalInterfaceFunctionalMockupUnitImportToSchedule&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl.hpp index dbcc49ff0ab..80ad43e8978 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl(const ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportToSchedule_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable.hpp index 0365845b7a3..e5590a6d3db 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable.hpp @@ -33,7 +33,7 @@ namespace model { const std::string& fMUInstanceName, const std::string& fMUVariableName, double initialValue); - virtual ~ExternalInterfaceFunctionalMockupUnitImportToVariable() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportToVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceFunctionalMockupUnitImportToVariable(const ExternalInterfaceFunctionalMockupUnitImportToVariable& other) = default; ExternalInterfaceFunctionalMockupUnitImportToVariable(ExternalInterfaceFunctionalMockupUnitImportToVariable&& other) = default; diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl.hpp index 0afbdecaa8a..5a11b2569a5 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl(const ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImportToVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceFunctionalMockupUnitImport_Impl.hpp b/src/model/ExternalInterfaceFunctionalMockupUnitImport_Impl.hpp index 190d7df9942..9b7b5f395d7 100644 --- a/src/model/ExternalInterfaceFunctionalMockupUnitImport_Impl.hpp +++ b/src/model/ExternalInterfaceFunctionalMockupUnitImport_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ExternalInterfaceFunctionalMockupUnitImport_Impl(const ExternalInterfaceFunctionalMockupUnitImport_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceFunctionalMockupUnitImport_Impl() = default; + virtual ~ExternalInterfaceFunctionalMockupUnitImport_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterfaceSchedule.hpp b/src/model/ExternalInterfaceSchedule.hpp index d42bc8860af..db59f578de6 100644 --- a/src/model/ExternalInterfaceSchedule.hpp +++ b/src/model/ExternalInterfaceSchedule.hpp @@ -30,7 +30,7 @@ namespace model { explicit ExternalInterfaceSchedule(const Model& model); - virtual ~ExternalInterfaceSchedule() = default; + virtual ~ExternalInterfaceSchedule() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceSchedule(const ExternalInterfaceSchedule& other) = default; ExternalInterfaceSchedule(ExternalInterfaceSchedule&& other) = default; diff --git a/src/model/ExternalInterfaceSchedule_Impl.hpp b/src/model/ExternalInterfaceSchedule_Impl.hpp index 8b6b64141d3..7375733fd12 100644 --- a/src/model/ExternalInterfaceSchedule_Impl.hpp +++ b/src/model/ExternalInterfaceSchedule_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExternalInterfaceSchedule_Impl(const ExternalInterfaceSchedule_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceSchedule_Impl() = default; + virtual ~ExternalInterfaceSchedule_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/ExternalInterfaceVariable.hpp b/src/model/ExternalInterfaceVariable.hpp index 0c9dba9026d..da9a3af3753 100644 --- a/src/model/ExternalInterfaceVariable.hpp +++ b/src/model/ExternalInterfaceVariable.hpp @@ -28,7 +28,7 @@ namespace model { explicit ExternalInterfaceVariable(const Model& model, const std::string& variableName, double initialValue); - virtual ~ExternalInterfaceVariable() = default; + virtual ~ExternalInterfaceVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit ExternalInterfaceVariable(const ExternalInterfaceVariable& other) = default; ExternalInterfaceVariable(ExternalInterfaceVariable&& other) = default; diff --git a/src/model/ExternalInterfaceVariable_Impl.hpp b/src/model/ExternalInterfaceVariable_Impl.hpp index 3d267d09682..d9063aca257 100644 --- a/src/model/ExternalInterfaceVariable_Impl.hpp +++ b/src/model/ExternalInterfaceVariable_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExternalInterfaceVariable_Impl(const ExternalInterfaceVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterfaceVariable_Impl() = default; + virtual ~ExternalInterfaceVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ExternalInterface_Impl.hpp b/src/model/ExternalInterface_Impl.hpp index 23220eeb839..6a0f05e1064 100644 --- a/src/model/ExternalInterface_Impl.hpp +++ b/src/model/ExternalInterface_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ExternalInterface_Impl(const ExternalInterface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ExternalInterface_Impl() = default; + virtual ~ExternalInterface_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FFactorGroundFloorConstruction.hpp b/src/model/FFactorGroundFloorConstruction.hpp index 6f14b96f57a..3eb39b84278 100644 --- a/src/model/FFactorGroundFloorConstruction.hpp +++ b/src/model/FFactorGroundFloorConstruction.hpp @@ -27,7 +27,7 @@ namespace model { explicit FFactorGroundFloorConstruction(const Model& model, double fFactor = 0.1, double area = 0.1, double perimeterExposed = 0.1); - virtual ~FFactorGroundFloorConstruction() = default; + virtual ~FFactorGroundFloorConstruction() override = default; // Default the copy and move operators because the virtual dtor is explicit FFactorGroundFloorConstruction(const FFactorGroundFloorConstruction& other) = default; FFactorGroundFloorConstruction(FFactorGroundFloorConstruction&& other) = default; diff --git a/src/model/FFactorGroundFloorConstruction_Impl.hpp b/src/model/FFactorGroundFloorConstruction_Impl.hpp index ebd21422d21..00a4093c363 100644 --- a/src/model/FFactorGroundFloorConstruction_Impl.hpp +++ b/src/model/FFactorGroundFloorConstruction_Impl.hpp @@ -25,7 +25,7 @@ namespace model { FFactorGroundFloorConstruction_Impl(const FFactorGroundFloorConstruction_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~FFactorGroundFloorConstruction_Impl() = default; + virtual ~FFactorGroundFloorConstruction_Impl() override = default; /** Get all output variables names that could be associated with this object. These variables * may or may not be available for each simulation, need to check report variable dictionary diff --git a/src/model/Facility.hpp b/src/model/Facility.hpp index 16cd7d5d3a0..6c59744f526 100644 --- a/src/model/Facility.hpp +++ b/src/model/Facility.hpp @@ -45,7 +45,7 @@ namespace model { { public: - virtual ~Facility() = default; + virtual ~Facility() override = default; // Default the copy and move operators because the virtual dtor is explicit Facility(const Facility& other) = default; Facility(Facility&& other) = default; diff --git a/src/model/Facility_Impl.hpp b/src/model/Facility_Impl.hpp index 2798954a832..f8c10d398dc 100644 --- a/src/model/Facility_Impl.hpp +++ b/src/model/Facility_Impl.hpp @@ -39,7 +39,7 @@ namespace model { Facility_Impl(const Facility_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Facility_Impl() = default; + virtual ~Facility_Impl() override = default; //@} diff --git a/src/model/FanComponentModel.hpp b/src/model/FanComponentModel.hpp index ef5188ed36b..408e296df10 100644 --- a/src/model/FanComponentModel.hpp +++ b/src/model/FanComponentModel.hpp @@ -42,7 +42,7 @@ namespace model { const Curve& normalizedDimensionlessAirflowCurveNonStallRegion, const Curve& normalizedDimensionlessAirflowCurveStallRegion); - virtual ~FanComponentModel() = default; + virtual ~FanComponentModel() override = default; // Default the copy and move operators because the virtual dtor is explicit FanComponentModel(const FanComponentModel& other) = default; FanComponentModel(FanComponentModel&& other) = default; diff --git a/src/model/FanComponentModel_Impl.hpp b/src/model/FanComponentModel_Impl.hpp index 19d3636dc8e..cfca7b12691 100644 --- a/src/model/FanComponentModel_Impl.hpp +++ b/src/model/FanComponentModel_Impl.hpp @@ -31,7 +31,7 @@ namespace model { FanComponentModel_Impl(const FanComponentModel_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FanComponentModel_Impl() = default; + virtual ~FanComponentModel_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FanConstantVolume.hpp b/src/model/FanConstantVolume.hpp index eb2c01a3939..6c5c1492f7c 100644 --- a/src/model/FanConstantVolume.hpp +++ b/src/model/FanConstantVolume.hpp @@ -35,7 +35,7 @@ namespace model { FanConstantVolume(const Model& model); - virtual ~FanConstantVolume() = default; + virtual ~FanConstantVolume() override = default; // Default the copy and move operators because the virtual dtor is explicit FanConstantVolume(const FanConstantVolume& other) = default; FanConstantVolume(FanConstantVolume&& other) = default; diff --git a/src/model/FanConstantVolume_Impl.hpp b/src/model/FanConstantVolume_Impl.hpp index ec6a76a6c3b..885ea91ea8f 100644 --- a/src/model/FanConstantVolume_Impl.hpp +++ b/src/model/FanConstantVolume_Impl.hpp @@ -33,7 +33,7 @@ namespace model { FanConstantVolume_Impl(const FanConstantVolume_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~FanConstantVolume_Impl() = default; + virtual ~FanConstantVolume_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FanOnOff.hpp b/src/model/FanOnOff.hpp index 55c6098de8c..08506fb2247 100644 --- a/src/model/FanOnOff.hpp +++ b/src/model/FanOnOff.hpp @@ -38,7 +38,7 @@ namespace model { explicit FanOnOff(const Model& model); - virtual ~FanOnOff() = default; + virtual ~FanOnOff() override = default; // Default the copy and move operators because the virtual dtor is explicit FanOnOff(const FanOnOff& other) = default; FanOnOff(FanOnOff&& other) = default; diff --git a/src/model/FanOnOff_Impl.hpp b/src/model/FanOnOff_Impl.hpp index 366b3a79b38..adf21295cb8 100644 --- a/src/model/FanOnOff_Impl.hpp +++ b/src/model/FanOnOff_Impl.hpp @@ -31,7 +31,7 @@ namespace model { FanOnOff_Impl(const FanOnOff_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FanOnOff_Impl() = default; + virtual ~FanOnOff_Impl() override = default; //@} diff --git a/src/model/FanSystemModel.hpp b/src/model/FanSystemModel.hpp index 3845329bb9f..969dbea62b6 100644 --- a/src/model/FanSystemModel.hpp +++ b/src/model/FanSystemModel.hpp @@ -55,7 +55,7 @@ namespace model { explicit FanSystemModel(const Model& model); - virtual ~FanSystemModel() = default; + virtual ~FanSystemModel() override = default; // Default the copy and move operators because the virtual dtor is explicit FanSystemModel(const FanSystemModel& other) = default; FanSystemModel(FanSystemModel&& other) = default; diff --git a/src/model/FanSystemModel_Impl.hpp b/src/model/FanSystemModel_Impl.hpp index 8307fb5294a..7acae138172 100644 --- a/src/model/FanSystemModel_Impl.hpp +++ b/src/model/FanSystemModel_Impl.hpp @@ -33,7 +33,7 @@ namespace model { FanSystemModel_Impl(const FanSystemModel_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FanSystemModel_Impl() = default; + virtual ~FanSystemModel_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FanVariableVolume.hpp b/src/model/FanVariableVolume.hpp index 0d8ba3d33f1..300b6f45043 100644 --- a/src/model/FanVariableVolume.hpp +++ b/src/model/FanVariableVolume.hpp @@ -35,7 +35,7 @@ namespace model { FanVariableVolume(const Model& model); - virtual ~FanVariableVolume() = default; + virtual ~FanVariableVolume() override = default; // Default the copy and move operators because the virtual dtor is explicit FanVariableVolume(const FanVariableVolume& other) = default; FanVariableVolume(FanVariableVolume&& other) = default; diff --git a/src/model/FanVariableVolume_Impl.hpp b/src/model/FanVariableVolume_Impl.hpp index 5acf328dc00..9c08513da9f 100644 --- a/src/model/FanVariableVolume_Impl.hpp +++ b/src/model/FanVariableVolume_Impl.hpp @@ -33,7 +33,7 @@ namespace model { FanVariableVolume_Impl(const FanVariableVolume_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FanVariableVolume_Impl() = default; + virtual ~FanVariableVolume_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FanZoneExhaust.hpp b/src/model/FanZoneExhaust.hpp index 381ffe2ffc4..e8fec27cb79 100644 --- a/src/model/FanZoneExhaust.hpp +++ b/src/model/FanZoneExhaust.hpp @@ -32,7 +32,7 @@ namespace model { explicit FanZoneExhaust(const Model& model); - virtual ~FanZoneExhaust() = default; + virtual ~FanZoneExhaust() override = default; // Default the copy and move operators because the virtual dtor is explicit FanZoneExhaust(const FanZoneExhaust& other) = default; FanZoneExhaust(FanZoneExhaust&& other) = default; diff --git a/src/model/FanZoneExhaust_Impl.hpp b/src/model/FanZoneExhaust_Impl.hpp index 8785ded79e3..98f6a6b808c 100644 --- a/src/model/FanZoneExhaust_Impl.hpp +++ b/src/model/FanZoneExhaust_Impl.hpp @@ -29,7 +29,7 @@ namespace model { FanZoneExhaust_Impl(const FanZoneExhaust_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FanZoneExhaust_Impl() = default; + virtual ~FanZoneExhaust_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FenestrationMaterial.hpp b/src/model/FenestrationMaterial.hpp index 5850c65a499..5bca3912d71 100644 --- a/src/model/FenestrationMaterial.hpp +++ b/src/model/FenestrationMaterial.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~FenestrationMaterial() = default; + virtual ~FenestrationMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit FenestrationMaterial(const FenestrationMaterial& other) = default; FenestrationMaterial(FenestrationMaterial&& other) = default; diff --git a/src/model/FenestrationMaterial_Impl.hpp b/src/model/FenestrationMaterial_Impl.hpp index 25dd3f19994..cd1e6a68a52 100644 --- a/src/model/FenestrationMaterial_Impl.hpp +++ b/src/model/FenestrationMaterial_Impl.hpp @@ -32,7 +32,7 @@ namespace model { // Clone copy constructor. FenestrationMaterial_Impl(const FenestrationMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FenestrationMaterial_Impl() = default; + virtual ~FenestrationMaterial_Impl() override = default; //@} diff --git a/src/model/FluidCoolerSingleSpeed.hpp b/src/model/FluidCoolerSingleSpeed.hpp index 0fbe39046b3..a546f2bb163 100644 --- a/src/model/FluidCoolerSingleSpeed.hpp +++ b/src/model/FluidCoolerSingleSpeed.hpp @@ -30,7 +30,7 @@ namespace model { explicit FluidCoolerSingleSpeed(const Model& model); - virtual ~FluidCoolerSingleSpeed() = default; + virtual ~FluidCoolerSingleSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit FluidCoolerSingleSpeed(const FluidCoolerSingleSpeed& other) = default; FluidCoolerSingleSpeed(FluidCoolerSingleSpeed&& other) = default; diff --git a/src/model/FluidCoolerSingleSpeed_Impl.hpp b/src/model/FluidCoolerSingleSpeed_Impl.hpp index 35487dfc5e0..5d6716c69bb 100644 --- a/src/model/FluidCoolerSingleSpeed_Impl.hpp +++ b/src/model/FluidCoolerSingleSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { FluidCoolerSingleSpeed_Impl(const FluidCoolerSingleSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FluidCoolerSingleSpeed_Impl() = default; + virtual ~FluidCoolerSingleSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FluidCoolerTwoSpeed.hpp b/src/model/FluidCoolerTwoSpeed.hpp index 3a1486dd40f..a1cb92337a5 100644 --- a/src/model/FluidCoolerTwoSpeed.hpp +++ b/src/model/FluidCoolerTwoSpeed.hpp @@ -30,7 +30,7 @@ namespace model { explicit FluidCoolerTwoSpeed(const Model& model); - virtual ~FluidCoolerTwoSpeed() = default; + virtual ~FluidCoolerTwoSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit FluidCoolerTwoSpeed(const FluidCoolerTwoSpeed& other) = default; FluidCoolerTwoSpeed(FluidCoolerTwoSpeed&& other) = default; diff --git a/src/model/FluidCoolerTwoSpeed_Impl.hpp b/src/model/FluidCoolerTwoSpeed_Impl.hpp index fe28364c880..9e270294fbb 100644 --- a/src/model/FluidCoolerTwoSpeed_Impl.hpp +++ b/src/model/FluidCoolerTwoSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { FluidCoolerTwoSpeed_Impl(const FluidCoolerTwoSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FluidCoolerTwoSpeed_Impl() = default; + virtual ~FluidCoolerTwoSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FoundationKiva.hpp b/src/model/FoundationKiva.hpp index 90cac011d79..8159f861a7e 100644 --- a/src/model/FoundationKiva.hpp +++ b/src/model/FoundationKiva.hpp @@ -61,7 +61,7 @@ namespace model { explicit FoundationKiva(Model& model); - virtual ~FoundationKiva() = default; + virtual ~FoundationKiva() override = default; // Default the copy and move operators because the virtual dtor is explicit FoundationKiva(const FoundationKiva& other) = default; FoundationKiva(FoundationKiva&& other) = default; diff --git a/src/model/FoundationKivaSettings.hpp b/src/model/FoundationKivaSettings.hpp index e77c569663d..d8c4c43cf69 100644 --- a/src/model/FoundationKivaSettings.hpp +++ b/src/model/FoundationKivaSettings.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~FoundationKivaSettings() = default; + virtual ~FoundationKivaSettings() override = default; // Default the copy and move operators because the virtual dtor is explicit FoundationKivaSettings(const FoundationKivaSettings& other) = default; FoundationKivaSettings(FoundationKivaSettings&& other) = default; diff --git a/src/model/FoundationKivaSettings_Impl.hpp b/src/model/FoundationKivaSettings_Impl.hpp index 2bbc573474b..1bb84f5a6df 100644 --- a/src/model/FoundationKivaSettings_Impl.hpp +++ b/src/model/FoundationKivaSettings_Impl.hpp @@ -29,7 +29,7 @@ namespace model { FoundationKivaSettings_Impl(const FoundationKivaSettings_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FoundationKivaSettings_Impl() = default; + virtual ~FoundationKivaSettings_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FoundationKiva_Impl.hpp b/src/model/FoundationKiva_Impl.hpp index bd030e8bc92..50d2e64b665 100644 --- a/src/model/FoundationKiva_Impl.hpp +++ b/src/model/FoundationKiva_Impl.hpp @@ -34,7 +34,7 @@ namespace model { FoundationKiva_Impl(const FoundationKiva_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FoundationKiva_Impl() = default; + virtual ~FoundationKiva_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/FuelFactors.hpp b/src/model/FuelFactors.hpp index e419e52bf56..19d95614269 100644 --- a/src/model/FuelFactors.hpp +++ b/src/model/FuelFactors.hpp @@ -30,7 +30,7 @@ namespace model { explicit FuelFactors(const Model& model); - virtual ~FuelFactors() = default; + virtual ~FuelFactors() override = default; // Default the copy and move operators because the virtual dtor is explicit FuelFactors(const FuelFactors& other) = default; FuelFactors(FuelFactors&& other) = default; diff --git a/src/model/FuelFactors_Impl.hpp b/src/model/FuelFactors_Impl.hpp index ecf3d6b84d4..232fb44f206 100644 --- a/src/model/FuelFactors_Impl.hpp +++ b/src/model/FuelFactors_Impl.hpp @@ -29,7 +29,7 @@ namespace model { FuelFactors_Impl(const FuelFactors_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~FuelFactors_Impl() = default; + virtual ~FuelFactors_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Gas.hpp b/src/model/Gas.hpp index 21e908e2080..7031ff4ac94 100644 --- a/src/model/Gas.hpp +++ b/src/model/Gas.hpp @@ -28,7 +28,7 @@ namespace model { explicit Gas(const Model& model, std::string gasType = "Air", double thickness = 0.003); - virtual ~Gas() = default; + virtual ~Gas() override = default; // Default the copy and move operators because the virtual dtor is explicit Gas(const Gas& other) = default; Gas(Gas&& other) = default; diff --git a/src/model/GasEquipment.hpp b/src/model/GasEquipment.hpp index 5605cac7a93..008efdf5d4a 100644 --- a/src/model/GasEquipment.hpp +++ b/src/model/GasEquipment.hpp @@ -31,7 +31,7 @@ namespace model { explicit GasEquipment(const GasEquipmentDefinition& gasEquipmentDefinition); - virtual ~GasEquipment() = default; + virtual ~GasEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit GasEquipment(const GasEquipment& other) = default; GasEquipment(GasEquipment&& other) = default; diff --git a/src/model/GasEquipmentDefinition.hpp b/src/model/GasEquipmentDefinition.hpp index 57b8ae53ac1..f3db1891868 100644 --- a/src/model/GasEquipmentDefinition.hpp +++ b/src/model/GasEquipmentDefinition.hpp @@ -30,7 +30,7 @@ namespace model { explicit GasEquipmentDefinition(const Model& model); - virtual ~GasEquipmentDefinition() = default; + virtual ~GasEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit GasEquipmentDefinition(const GasEquipmentDefinition& other) = default; GasEquipmentDefinition(GasEquipmentDefinition&& other) = default; diff --git a/src/model/GasEquipmentDefinition_Impl.hpp b/src/model/GasEquipmentDefinition_Impl.hpp index 27bd30dca18..18127ef48d5 100644 --- a/src/model/GasEquipmentDefinition_Impl.hpp +++ b/src/model/GasEquipmentDefinition_Impl.hpp @@ -30,7 +30,7 @@ namespace model { GasEquipmentDefinition_Impl(const GasEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GasEquipmentDefinition_Impl() = default; + virtual ~GasEquipmentDefinition_Impl() override = default; //@} diff --git a/src/model/GasEquipment_Impl.hpp b/src/model/GasEquipment_Impl.hpp index d431e9738ff..d2a64ffa2fa 100644 --- a/src/model/GasEquipment_Impl.hpp +++ b/src/model/GasEquipment_Impl.hpp @@ -32,7 +32,7 @@ namespace model { GasEquipment_Impl(const GasEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GasEquipment_Impl() = default; + virtual ~GasEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GasLayer.hpp b/src/model/GasLayer.hpp index 1b81cdb61a5..8af34d21601 100644 --- a/src/model/GasLayer.hpp +++ b/src/model/GasLayer.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~GasLayer() = default; + virtual ~GasLayer() override = default; // Default the copy and move operators because the virtual dtor is explicit GasLayer(const GasLayer& other) = default; GasLayer(GasLayer&& other) = default; diff --git a/src/model/GasLayer_Impl.hpp b/src/model/GasLayer_Impl.hpp index e2d542f9da3..226cc6d0ebc 100644 --- a/src/model/GasLayer_Impl.hpp +++ b/src/model/GasLayer_Impl.hpp @@ -32,7 +32,7 @@ namespace model { // Clone copy constructor. GasLayer_Impl(const GasLayer_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GasLayer_Impl() = default; + virtual ~GasLayer_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/GasMixture.hpp b/src/model/GasMixture.hpp index b1af49e24a0..28cd4759c1a 100644 --- a/src/model/GasMixture.hpp +++ b/src/model/GasMixture.hpp @@ -31,7 +31,7 @@ namespace model { std::string gas1Type = "Air", double gas1Fraction = .97, std::string gas2Type = "Argon", double gas2Fraction = 0.01, std::string gas3Type = "Krypton", double gas3Fraction = 0.01, std::string gas4Type = "Xenon", double gas4Fraction = 0.01); - virtual ~GasMixture() = default; + virtual ~GasMixture() override = default; // Default the copy and move operators because the virtual dtor is explicit GasMixture(const GasMixture& other) = default; GasMixture(GasMixture&& other) = default; diff --git a/src/model/GasMixture_Impl.hpp b/src/model/GasMixture_Impl.hpp index 2c422a64976..a9ccc742ab9 100644 --- a/src/model/GasMixture_Impl.hpp +++ b/src/model/GasMixture_Impl.hpp @@ -28,7 +28,7 @@ namespace model { GasMixture_Impl(const GasMixture_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GasMixture_Impl() = default; + virtual ~GasMixture_Impl() override = default; //@} diff --git a/src/model/Gas_Impl.hpp b/src/model/Gas_Impl.hpp index baebbbe7f2c..72edb315c22 100644 --- a/src/model/Gas_Impl.hpp +++ b/src/model/Gas_Impl.hpp @@ -28,7 +28,7 @@ namespace model { Gas_Impl(const Gas_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Gas_Impl() = default; + virtual ~Gas_Impl() override = default; //@} diff --git a/src/model/Generator.hpp b/src/model/Generator.hpp index 6c477d3c5e0..0b306ef82ce 100644 --- a/src/model/Generator.hpp +++ b/src/model/Generator.hpp @@ -28,7 +28,7 @@ namespace model { public: Generator(IddObjectType type, const Model& model); - virtual ~Generator() = default; + virtual ~Generator() override = default; // Default the copy and move operators because the virtual dtor is explicit Generator(const Generator& other) = default; Generator(Generator&& other) = default; diff --git a/src/model/GeneratorFuelCell.hpp b/src/model/GeneratorFuelCell.hpp index d2ed2d7ce3f..efabe01659d 100644 --- a/src/model/GeneratorFuelCell.hpp +++ b/src/model/GeneratorFuelCell.hpp @@ -61,7 +61,7 @@ namespace model { explicit GeneratorFuelCell(const Model& model); - virtual ~GeneratorFuelCell() = default; + virtual ~GeneratorFuelCell() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCell(const GeneratorFuelCell& other) = default; GeneratorFuelCell(GeneratorFuelCell&& other) = default; diff --git a/src/model/GeneratorFuelCellAirSupply.hpp b/src/model/GeneratorFuelCellAirSupply.hpp index d2706073322..4743ddfb8b9 100644 --- a/src/model/GeneratorFuelCellAirSupply.hpp +++ b/src/model/GeneratorFuelCellAirSupply.hpp @@ -63,7 +63,7 @@ namespace model { explicit GeneratorFuelCellAirSupply(const Model& model, const Node& airInletNode, const CurveQuadratic& electricPowerCurve, const CurveQuadratic& fuelRateCurve, const CurveCubic& blowerPowerCurve); - virtual ~GeneratorFuelCellAirSupply() = default; + virtual ~GeneratorFuelCellAirSupply() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellAirSupply(const GeneratorFuelCellAirSupply& other) = default; GeneratorFuelCellAirSupply(GeneratorFuelCellAirSupply&& other) = default; diff --git a/src/model/GeneratorFuelCellAirSupply_Impl.hpp b/src/model/GeneratorFuelCellAirSupply_Impl.hpp index 889bd949a32..694f003a393 100644 --- a/src/model/GeneratorFuelCellAirSupply_Impl.hpp +++ b/src/model/GeneratorFuelCellAirSupply_Impl.hpp @@ -33,7 +33,7 @@ namespace model { GeneratorFuelCellAirSupply_Impl(const GeneratorFuelCellAirSupply_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellAirSupply_Impl() = default; + virtual ~GeneratorFuelCellAirSupply_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellAuxiliaryHeater.hpp b/src/model/GeneratorFuelCellAuxiliaryHeater.hpp index c247736e5dd..d4702b43147 100644 --- a/src/model/GeneratorFuelCellAuxiliaryHeater.hpp +++ b/src/model/GeneratorFuelCellAuxiliaryHeater.hpp @@ -31,7 +31,7 @@ namespace model { explicit GeneratorFuelCellAuxiliaryHeater(const Model& model); - virtual ~GeneratorFuelCellAuxiliaryHeater() = default; + virtual ~GeneratorFuelCellAuxiliaryHeater() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellAuxiliaryHeater(const GeneratorFuelCellAuxiliaryHeater& other) = default; GeneratorFuelCellAuxiliaryHeater(GeneratorFuelCellAuxiliaryHeater&& other) = default; diff --git a/src/model/GeneratorFuelCellAuxiliaryHeater_Impl.hpp b/src/model/GeneratorFuelCellAuxiliaryHeater_Impl.hpp index 494340dc08d..b670599f29a 100644 --- a/src/model/GeneratorFuelCellAuxiliaryHeater_Impl.hpp +++ b/src/model/GeneratorFuelCellAuxiliaryHeater_Impl.hpp @@ -30,7 +30,7 @@ namespace model { GeneratorFuelCellAuxiliaryHeater_Impl(const GeneratorFuelCellAuxiliaryHeater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellAuxiliaryHeater_Impl() = default; + virtual ~GeneratorFuelCellAuxiliaryHeater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellElectricalStorage.hpp b/src/model/GeneratorFuelCellElectricalStorage.hpp index e15ab6633d8..ecc19134b22 100644 --- a/src/model/GeneratorFuelCellElectricalStorage.hpp +++ b/src/model/GeneratorFuelCellElectricalStorage.hpp @@ -30,7 +30,7 @@ namespace model { explicit GeneratorFuelCellElectricalStorage(const Model& model); - virtual ~GeneratorFuelCellElectricalStorage() = default; + virtual ~GeneratorFuelCellElectricalStorage() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellElectricalStorage(const GeneratorFuelCellElectricalStorage& other) = default; GeneratorFuelCellElectricalStorage(GeneratorFuelCellElectricalStorage&& other) = default; diff --git a/src/model/GeneratorFuelCellElectricalStorage_Impl.hpp b/src/model/GeneratorFuelCellElectricalStorage_Impl.hpp index 6b0295f1c5d..8108b458b75 100644 --- a/src/model/GeneratorFuelCellElectricalStorage_Impl.hpp +++ b/src/model/GeneratorFuelCellElectricalStorage_Impl.hpp @@ -29,7 +29,7 @@ namespace model { GeneratorFuelCellElectricalStorage_Impl(const GeneratorFuelCellElectricalStorage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellElectricalStorage_Impl() = default; + virtual ~GeneratorFuelCellElectricalStorage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger.hpp b/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger.hpp index bf37814ce59..8db03746778 100644 --- a/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger.hpp +++ b/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger.hpp @@ -34,7 +34,7 @@ namespace model { explicit GeneratorFuelCellExhaustGasToWaterHeatExchanger(const Model& model, const Node& exhaustOutletAirNode); - virtual ~GeneratorFuelCellExhaustGasToWaterHeatExchanger() = default; + virtual ~GeneratorFuelCellExhaustGasToWaterHeatExchanger() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellExhaustGasToWaterHeatExchanger(const GeneratorFuelCellExhaustGasToWaterHeatExchanger& other) = default; GeneratorFuelCellExhaustGasToWaterHeatExchanger(GeneratorFuelCellExhaustGasToWaterHeatExchanger&& other) = default; diff --git a/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl.hpp b/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl.hpp index 84caf9d48a0..0b9d5edf69a 100644 --- a/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl.hpp +++ b/src/model/GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl.hpp @@ -33,7 +33,7 @@ namespace model { GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl(const GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl() = default; + virtual ~GeneratorFuelCellExhaustGasToWaterHeatExchanger_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellInverter.hpp b/src/model/GeneratorFuelCellInverter.hpp index d3c78a1003f..18b6b992e83 100644 --- a/src/model/GeneratorFuelCellInverter.hpp +++ b/src/model/GeneratorFuelCellInverter.hpp @@ -33,7 +33,7 @@ namespace model { explicit GeneratorFuelCellInverter(const Model& model, const CurveQuadratic& powerCurve); - virtual ~GeneratorFuelCellInverter() = default; + virtual ~GeneratorFuelCellInverter() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellInverter(const GeneratorFuelCellInverter& other) = default; GeneratorFuelCellInverter(GeneratorFuelCellInverter&& other) = default; diff --git a/src/model/GeneratorFuelCellInverter_Impl.hpp b/src/model/GeneratorFuelCellInverter_Impl.hpp index 0ccb9318b6f..5b9777db629 100644 --- a/src/model/GeneratorFuelCellInverter_Impl.hpp +++ b/src/model/GeneratorFuelCellInverter_Impl.hpp @@ -30,7 +30,7 @@ namespace model { GeneratorFuelCellInverter_Impl(const GeneratorFuelCellInverter_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellInverter_Impl() = default; + virtual ~GeneratorFuelCellInverter_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellPowerModule.hpp b/src/model/GeneratorFuelCellPowerModule.hpp index 28de1e9ba4f..b707f21a293 100644 --- a/src/model/GeneratorFuelCellPowerModule.hpp +++ b/src/model/GeneratorFuelCellPowerModule.hpp @@ -46,7 +46,7 @@ namespace model { explicit GeneratorFuelCellPowerModule(const Model& model); - virtual ~GeneratorFuelCellPowerModule() = default; + virtual ~GeneratorFuelCellPowerModule() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellPowerModule(const GeneratorFuelCellPowerModule& other) = default; GeneratorFuelCellPowerModule(GeneratorFuelCellPowerModule&& other) = default; diff --git a/src/model/GeneratorFuelCellPowerModule_Impl.hpp b/src/model/GeneratorFuelCellPowerModule_Impl.hpp index e2bc6945ef1..b6660d9f9b2 100644 --- a/src/model/GeneratorFuelCellPowerModule_Impl.hpp +++ b/src/model/GeneratorFuelCellPowerModule_Impl.hpp @@ -32,7 +32,7 @@ namespace model { GeneratorFuelCellPowerModule_Impl(const GeneratorFuelCellPowerModule_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellPowerModule_Impl() = default; + virtual ~GeneratorFuelCellPowerModule_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellStackCooler.hpp b/src/model/GeneratorFuelCellStackCooler.hpp index e5999243a39..e874b3b60d4 100644 --- a/src/model/GeneratorFuelCellStackCooler.hpp +++ b/src/model/GeneratorFuelCellStackCooler.hpp @@ -31,7 +31,7 @@ namespace model { explicit GeneratorFuelCellStackCooler(const Model& model); - virtual ~GeneratorFuelCellStackCooler() = default; + virtual ~GeneratorFuelCellStackCooler() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellStackCooler(const GeneratorFuelCellStackCooler& other) = default; GeneratorFuelCellStackCooler(GeneratorFuelCellStackCooler&& other) = default; diff --git a/src/model/GeneratorFuelCellStackCooler_Impl.hpp b/src/model/GeneratorFuelCellStackCooler_Impl.hpp index b57dc830c5b..3b1c17b5c4d 100644 --- a/src/model/GeneratorFuelCellStackCooler_Impl.hpp +++ b/src/model/GeneratorFuelCellStackCooler_Impl.hpp @@ -30,7 +30,7 @@ namespace model { GeneratorFuelCellStackCooler_Impl(const GeneratorFuelCellStackCooler_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellStackCooler_Impl() = default; + virtual ~GeneratorFuelCellStackCooler_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCellWaterSupply.hpp b/src/model/GeneratorFuelCellWaterSupply.hpp index bc93fd6b462..36905b3d197 100644 --- a/src/model/GeneratorFuelCellWaterSupply.hpp +++ b/src/model/GeneratorFuelCellWaterSupply.hpp @@ -42,7 +42,7 @@ namespace model { explicit GeneratorFuelCellWaterSupply(const Model& model, const CurveQuadratic& flowRateCurve, const CurveCubic& pumpPowerCurve, const Node& waterTempNode, const std::string& waterTempMode); - virtual ~GeneratorFuelCellWaterSupply() = default; + virtual ~GeneratorFuelCellWaterSupply() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelCellWaterSupply(const GeneratorFuelCellWaterSupply& other) = default; GeneratorFuelCellWaterSupply(GeneratorFuelCellWaterSupply&& other) = default; diff --git a/src/model/GeneratorFuelCellWaterSupply_Impl.hpp b/src/model/GeneratorFuelCellWaterSupply_Impl.hpp index a4e73a234a9..c33abc43c7a 100644 --- a/src/model/GeneratorFuelCellWaterSupply_Impl.hpp +++ b/src/model/GeneratorFuelCellWaterSupply_Impl.hpp @@ -33,7 +33,7 @@ namespace model { GeneratorFuelCellWaterSupply_Impl(const GeneratorFuelCellWaterSupply_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCellWaterSupply_Impl() = default; + virtual ~GeneratorFuelCellWaterSupply_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelCell_Impl.hpp b/src/model/GeneratorFuelCell_Impl.hpp index f84340703f8..e8b963bd9c9 100644 --- a/src/model/GeneratorFuelCell_Impl.hpp +++ b/src/model/GeneratorFuelCell_Impl.hpp @@ -37,7 +37,7 @@ namespace model { GeneratorFuelCell_Impl(const GeneratorFuelCell_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelCell_Impl() = default; + virtual ~GeneratorFuelCell_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorFuelSupply.hpp b/src/model/GeneratorFuelSupply.hpp index f8a73b9744f..a82b1079b47 100644 --- a/src/model/GeneratorFuelSupply.hpp +++ b/src/model/GeneratorFuelSupply.hpp @@ -57,7 +57,7 @@ namespace model { explicit GeneratorFuelSupply(const Model& model, Schedule& tempSchedule, const CurveCubic& powerCurve); - virtual ~GeneratorFuelSupply() = default; + virtual ~GeneratorFuelSupply() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorFuelSupply(const GeneratorFuelSupply& other) = default; GeneratorFuelSupply(GeneratorFuelSupply&& other) = default; diff --git a/src/model/GeneratorFuelSupply_Impl.hpp b/src/model/GeneratorFuelSupply_Impl.hpp index a8ae8a64709..ee7da4c455d 100644 --- a/src/model/GeneratorFuelSupply_Impl.hpp +++ b/src/model/GeneratorFuelSupply_Impl.hpp @@ -33,7 +33,7 @@ namespace model { GeneratorFuelSupply_Impl(const GeneratorFuelSupply_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorFuelSupply_Impl() = default; + virtual ~GeneratorFuelSupply_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorMicroTurbine.hpp b/src/model/GeneratorMicroTurbine.hpp index 28867db296b..d835a849b29 100644 --- a/src/model/GeneratorMicroTurbine.hpp +++ b/src/model/GeneratorMicroTurbine.hpp @@ -41,7 +41,7 @@ namespace model { explicit GeneratorMicroTurbine(const Model& model); - virtual ~GeneratorMicroTurbine() = default; + virtual ~GeneratorMicroTurbine() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorMicroTurbine(const GeneratorMicroTurbine& other) = default; GeneratorMicroTurbine(GeneratorMicroTurbine&& other) = default; diff --git a/src/model/GeneratorMicroTurbineHeatRecovery.hpp b/src/model/GeneratorMicroTurbineHeatRecovery.hpp index 1cb9a1f33ea..d47132549d6 100644 --- a/src/model/GeneratorMicroTurbineHeatRecovery.hpp +++ b/src/model/GeneratorMicroTurbineHeatRecovery.hpp @@ -32,7 +32,7 @@ namespace model { // Constructs a new GeneratorMicroTurbineHeatRecovery object in the model, given a GeneratorMicroTurbine explicit GeneratorMicroTurbineHeatRecovery(const Model& model, GeneratorMicroTurbine& mchp); - virtual ~GeneratorMicroTurbineHeatRecovery() = default; + virtual ~GeneratorMicroTurbineHeatRecovery() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorMicroTurbineHeatRecovery(const GeneratorMicroTurbineHeatRecovery& other) = default; GeneratorMicroTurbineHeatRecovery(GeneratorMicroTurbineHeatRecovery&& other) = default; diff --git a/src/model/GeneratorMicroTurbineHeatRecovery_Impl.hpp b/src/model/GeneratorMicroTurbineHeatRecovery_Impl.hpp index f79a52cc854..41e5933b79d 100644 --- a/src/model/GeneratorMicroTurbineHeatRecovery_Impl.hpp +++ b/src/model/GeneratorMicroTurbineHeatRecovery_Impl.hpp @@ -32,7 +32,7 @@ namespace model { GeneratorMicroTurbineHeatRecovery_Impl(const GeneratorMicroTurbineHeatRecovery_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorMicroTurbineHeatRecovery_Impl() = default; + virtual ~GeneratorMicroTurbineHeatRecovery_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorMicroTurbine_Impl.hpp b/src/model/GeneratorMicroTurbine_Impl.hpp index cd60a378c5b..5a7782c9e3c 100644 --- a/src/model/GeneratorMicroTurbine_Impl.hpp +++ b/src/model/GeneratorMicroTurbine_Impl.hpp @@ -37,7 +37,7 @@ namespace model { GeneratorMicroTurbine_Impl(const GeneratorMicroTurbine_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorMicroTurbine_Impl() = default; + virtual ~GeneratorMicroTurbine_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorPVWatts.hpp b/src/model/GeneratorPVWatts.hpp index fc586b9b585..90f2accdc14 100644 --- a/src/model/GeneratorPVWatts.hpp +++ b/src/model/GeneratorPVWatts.hpp @@ -34,7 +34,7 @@ namespace model { explicit GeneratorPVWatts(const Model& model, const PlanarSurface& surface, double dcSystemCapacity); - virtual ~GeneratorPVWatts() = default; + virtual ~GeneratorPVWatts() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorPVWatts(const GeneratorPVWatts& other) = default; GeneratorPVWatts(GeneratorPVWatts&& other) = default; diff --git a/src/model/GeneratorPVWatts_Impl.hpp b/src/model/GeneratorPVWatts_Impl.hpp index e86908f6e87..9473101db41 100644 --- a/src/model/GeneratorPVWatts_Impl.hpp +++ b/src/model/GeneratorPVWatts_Impl.hpp @@ -30,7 +30,7 @@ namespace model { GeneratorPVWatts_Impl(const GeneratorPVWatts_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorPVWatts_Impl() = default; + virtual ~GeneratorPVWatts_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorPhotovoltaic.hpp b/src/model/GeneratorPhotovoltaic.hpp index 7db72646c64..385ddd32d41 100644 --- a/src/model/GeneratorPhotovoltaic.hpp +++ b/src/model/GeneratorPhotovoltaic.hpp @@ -44,7 +44,7 @@ namespace model { // to look up the valid names as it will throw if it cannot find it static GeneratorPhotovoltaic fromSandiaDatabase(const Model& model, const std::string& sandiaModulePerformanceName); - virtual ~GeneratorPhotovoltaic() = default; + virtual ~GeneratorPhotovoltaic() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorPhotovoltaic(const GeneratorPhotovoltaic& other) = default; GeneratorPhotovoltaic(GeneratorPhotovoltaic&& other) = default; diff --git a/src/model/GeneratorPhotovoltaic_Impl.hpp b/src/model/GeneratorPhotovoltaic_Impl.hpp index ce14f31cf5f..c3a3cb5e6ec 100644 --- a/src/model/GeneratorPhotovoltaic_Impl.hpp +++ b/src/model/GeneratorPhotovoltaic_Impl.hpp @@ -34,7 +34,7 @@ namespace model { GeneratorPhotovoltaic_Impl(const GeneratorPhotovoltaic_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorPhotovoltaic_Impl() = default; + virtual ~GeneratorPhotovoltaic_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GeneratorWindTurbine.hpp b/src/model/GeneratorWindTurbine.hpp index aadc735af88..640342abae6 100644 --- a/src/model/GeneratorWindTurbine.hpp +++ b/src/model/GeneratorWindTurbine.hpp @@ -28,7 +28,7 @@ namespace model { explicit GeneratorWindTurbine(const Model& model); - virtual ~GeneratorWindTurbine() = default; + virtual ~GeneratorWindTurbine() override = default; // Default the copy and move operators because the virtual dtor is explicit GeneratorWindTurbine(const GeneratorWindTurbine& other) = default; GeneratorWindTurbine(GeneratorWindTurbine&& other) = default; diff --git a/src/model/GeneratorWindTurbine_Impl.hpp b/src/model/GeneratorWindTurbine_Impl.hpp index ebb6270a853..73d66cdc86c 100644 --- a/src/model/GeneratorWindTurbine_Impl.hpp +++ b/src/model/GeneratorWindTurbine_Impl.hpp @@ -28,7 +28,7 @@ namespace model { GeneratorWindTurbine_Impl(const GeneratorWindTurbine_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GeneratorWindTurbine_Impl() = default; + virtual ~GeneratorWindTurbine_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Generator_Impl.hpp b/src/model/Generator_Impl.hpp index 730a4f2570f..b8b17def261 100644 --- a/src/model/Generator_Impl.hpp +++ b/src/model/Generator_Impl.hpp @@ -27,7 +27,7 @@ namespace model { Generator_Impl(const Generator_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~Generator_Impl() = default; + virtual ~Generator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GenericModelObject.hpp b/src/model/GenericModelObject.hpp index 4ba73fc65c2..6487a33bddf 100644 --- a/src/model/GenericModelObject.hpp +++ b/src/model/GenericModelObject.hpp @@ -33,7 +33,7 @@ namespace model { class MODEL_API GenericModelObject : public ModelObject { public: - virtual ~GenericModelObject() = default; + virtual ~GenericModelObject() override = default; // Default the copy and move operators because the virtual dtor is explicit GenericModelObject(const GenericModelObject& other) = default; GenericModelObject(GenericModelObject&& other) = default; diff --git a/src/model/GenericModelObject_Impl.hpp b/src/model/GenericModelObject_Impl.hpp index 30168c5049d..8c0f957c3ab 100644 --- a/src/model/GenericModelObject_Impl.hpp +++ b/src/model/GenericModelObject_Impl.hpp @@ -25,7 +25,7 @@ namespace model { // copy constructor GenericModelObject_Impl(const GenericModelObject_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GenericModelObject_Impl() = default; + virtual ~GenericModelObject_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/GlareSensor.hpp b/src/model/GlareSensor.hpp index 8a7e49d05db..786188ff173 100644 --- a/src/model/GlareSensor.hpp +++ b/src/model/GlareSensor.hpp @@ -31,7 +31,7 @@ namespace model { explicit GlareSensor(const Model& model); - virtual ~GlareSensor() = default; + virtual ~GlareSensor() override = default; // Default the copy and move operators because the virtual dtor is explicit GlareSensor(const GlareSensor& other) = default; GlareSensor(GlareSensor&& other) = default; diff --git a/src/model/GlareSensor_Impl.hpp b/src/model/GlareSensor_Impl.hpp index 5debfc89d8a..f8d4af013ab 100644 --- a/src/model/GlareSensor_Impl.hpp +++ b/src/model/GlareSensor_Impl.hpp @@ -34,7 +34,7 @@ namespace model { GlareSensor_Impl(const GlareSensor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GlareSensor_Impl() = default; + virtual ~GlareSensor_Impl() override = default; //@} diff --git a/src/model/Glazing.hpp b/src/model/Glazing.hpp index 5ee72b7a3c6..2215d388793 100644 --- a/src/model/Glazing.hpp +++ b/src/model/Glazing.hpp @@ -24,7 +24,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~Glazing() = default; + virtual ~Glazing() override = default; // Default the copy and move operators because the virtual dtor is explicit Glazing(const Glazing& other) = default; Glazing(Glazing&& other) = default; diff --git a/src/model/Glazing_Impl.hpp b/src/model/Glazing_Impl.hpp index 5a19571e3ec..b1f34c3a281 100644 --- a/src/model/Glazing_Impl.hpp +++ b/src/model/Glazing_Impl.hpp @@ -32,7 +32,7 @@ namespace model { // Clone copy constructor. Glazing_Impl(const Glazing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Glazing_Impl() = default; + virtual ~Glazing_Impl() override = default; //@} diff --git a/src/model/GroundHeatExchangerHorizontalTrench.hpp b/src/model/GroundHeatExchangerHorizontalTrench.hpp index 97d50fa3611..6d791909609 100644 --- a/src/model/GroundHeatExchangerHorizontalTrench.hpp +++ b/src/model/GroundHeatExchangerHorizontalTrench.hpp @@ -31,7 +31,7 @@ namespace model { explicit GroundHeatExchangerHorizontalTrench(const Model& model, const ModelObject& undisturbedGroundTemperatureModel); - virtual ~GroundHeatExchangerHorizontalTrench() = default; + virtual ~GroundHeatExchangerHorizontalTrench() override = default; // Default the copy and move operators because the virtual dtor is explicit GroundHeatExchangerHorizontalTrench(const GroundHeatExchangerHorizontalTrench& other) = default; GroundHeatExchangerHorizontalTrench(GroundHeatExchangerHorizontalTrench&& other) = default; diff --git a/src/model/GroundHeatExchangerHorizontalTrench_Impl.hpp b/src/model/GroundHeatExchangerHorizontalTrench_Impl.hpp index ebe49f8136c..01f17bf2d23 100644 --- a/src/model/GroundHeatExchangerHorizontalTrench_Impl.hpp +++ b/src/model/GroundHeatExchangerHorizontalTrench_Impl.hpp @@ -28,7 +28,7 @@ namespace model { GroundHeatExchangerHorizontalTrench_Impl(const GroundHeatExchangerHorizontalTrench_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GroundHeatExchangerHorizontalTrench_Impl() = default; + virtual ~GroundHeatExchangerHorizontalTrench_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/GroundHeatExchangerVertical.hpp b/src/model/GroundHeatExchangerVertical.hpp index 54eb7e2c703..984621e2a97 100644 --- a/src/model/GroundHeatExchangerVertical.hpp +++ b/src/model/GroundHeatExchangerVertical.hpp @@ -41,7 +41,7 @@ namespace model { explicit GroundHeatExchangerVertical(const Model& model, const ModelObject& undisturbedGroundTemperatureModel); - virtual ~GroundHeatExchangerVertical() = default; + virtual ~GroundHeatExchangerVertical() override = default; // Default the copy and move operators because the virtual dtor is explicit GroundHeatExchangerVertical(const GroundHeatExchangerVertical& other) = default; GroundHeatExchangerVertical(GroundHeatExchangerVertical&& other) = default; diff --git a/src/model/GroundHeatExchangerVertical_Impl.hpp b/src/model/GroundHeatExchangerVertical_Impl.hpp index 20e318982bd..307b508d2d1 100644 --- a/src/model/GroundHeatExchangerVertical_Impl.hpp +++ b/src/model/GroundHeatExchangerVertical_Impl.hpp @@ -27,7 +27,7 @@ namespace model { GroundHeatExchangerVertical_Impl(const GroundHeatExchangerVertical_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~GroundHeatExchangerVertical_Impl() = default; + virtual ~GroundHeatExchangerVertical_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HVACComponent.cpp b/src/model/HVACComponent.cpp index 88e43aaad64..ea532a33b9e 100644 --- a/src/model/HVACComponent.cpp +++ b/src/model/HVACComponent.cpp @@ -485,10 +485,6 @@ namespace model { return getImpl()->addToNode(node); } - std::vector HVACComponent::children() const { - return getImpl()->children(); - } - bool HVACComponent::addToSplitter(Splitter& splitter) { return getImpl()->addToSplitter(splitter); } diff --git a/src/model/HVACComponent.hpp b/src/model/HVACComponent.hpp index 1635b888a8a..24ee0124ec3 100644 --- a/src/model/HVACComponent.hpp +++ b/src/model/HVACComponent.hpp @@ -38,26 +38,26 @@ namespace model { }; /** HVACComponent is the base class for objects related to HVAC systems. - * - * HVACComponent provides the ability to connect multiple HVACComponents together through ports. - * Connections are directional and they are created by identifying a source HVACComponent and port - * as well as a target HVACComponent object and port. Once a connection is made, it is easy to access the HVACComponent - * connected to a particular port using the member functions of HVACComponent. - * - * New Connections are made using the openstudio::model::Model::connect function. - * - * Connections and ports together form similar functionality as EnergyPlus nodes, however a connection between ports is more general - * then a node connection in Energyplus. Indeed, in the OpenStudio model connections are used to describe what is a node connection - * in EnergyPlus, but connections can be applied to other contexts then just EnergyPlus nodes. OpenStudio's connections and ports - * can be used anytime one "component" can be arbitrarily connected to another "component". For example EnergyPlus EMS sensors and - * actuaters could be thought of as source and target ports, where a connection can be made between the two. - * - */ + * + * HVACComponent provides the ability to connect multiple HVACComponents together through ports. + * Connections are directional and they are created by identifying a source HVACComponent and port + * as well as a target HVACComponent object and port. Once a connection is made, it is easy to access the HVACComponent + * connected to a particular port using the member functions of HVACComponent. + * + * New Connections are made using the openstudio::model::Model::connect function. + * + * Connections and ports together form similar functionality as EnergyPlus nodes, however a connection between ports is more general + * then a node connection in Energyplus. Indeed, in the OpenStudio model connections are used to describe what is a node connection + * in EnergyPlus, but connections can be applied to other contexts then just EnergyPlus nodes. OpenStudio's connections and ports + * can be used anytime one "component" can be arbitrarily connected to another "component". For example EnergyPlus EMS sensors and + * actuaters could be thought of as source and target ports, where a connection can be made between the two. + * + */ class MODEL_API HVACComponent : public ParentObject { public: - virtual ~HVACComponent() = default; + virtual ~HVACComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit HVACComponent(const HVACComponent& other) = default; HVACComponent(HVACComponent&& other) = default; @@ -65,78 +65,78 @@ namespace model { HVACComponent& operator=(HVACComponent&&) = default; /** Returns the optional Loop object that the HVAC component is attached to. - * If the component is part of an outdoor air system, the containing AirLoopHVAC will be returned. - * If the component is attached to multiple loops, the optional will be false. - */ + * If the component is part of an outdoor air system, the containing AirLoopHVAC will be returned. + * If the component is attached to multiple loops, the optional will be false. + */ boost::optional loop() const; /** Returns the optional AirLoopHVAC object that the HVAC component is attached to. - * If the component is part of an outdoor air system, the containing AirLoopHVAC will be returned. - * If the HVAC component is not associated with an air loop then the optional will be false. - */ + * If the component is part of an outdoor air system, the containing AirLoopHVAC will be returned. + * If the HVAC component is not associated with an air loop then the optional will be false. + */ boost::optional airLoopHVAC() const; /** Returns the optional PlantLoop object that the HVAC component is attached to. - * - * If the HVAC component is not associated with a plant loop then the optional will be false. - */ + * + * If the HVAC component is not associated with a plant loop then the optional will be false. + */ boost::optional plantLoop() const; /** Returns the optional AirLoopHVACOutdoorAirSystem that the HVAC component is attached to. - * - * If the HVAC component is not associated with an outdoor air system then the optional will be false. - */ + * + * If the HVAC component is not associated with an outdoor air system then the optional will be false. + */ boost::optional airLoopHVACOutdoorAirSystem() const; /** EnergyPlus unitary equipment and air terminals are typically composed of other HVAC components. - * This method returns any such component containing this component. In OpenStudio, AirLoopHVAC, - * PlantLoop, and AirLoopHVACOutdoorAirSystem are treated as systems, not unitary equipment, thus - * they are not returned by this method. See plantLoop(), airLoop(), and airLoopHVACOutdoorAirSystem() - * to access those systems. - */ + * This method returns any such component containing this component. In OpenStudio, AirLoopHVAC, + * PlantLoop, and AirLoopHVACOutdoorAirSystem are treated as systems, not unitary equipment, thus + * they are not returned by this method. See plantLoop(), airLoop(), and airLoopHVACOutdoorAirSystem() + * to access those systems. + */ boost::optional containingHVACComponent() const; /** Returns any ZoneHVACComponent that contains this HVACComponent. - */ + */ boost::optional containingZoneHVACComponent() const; boost::optional containingStraightComponent() const; /** Adds this object to a new system node and returns a boolean indicating if the addition was successful. - * - * This method is reimplemented in many of the derived classes to do the right thing based on the - * context of the node a particular object is added to. For example if a specific HVACComoponent is not allowed - * on an air loop and this interface is used to attempt to add the HVAC component to a node on an - * air loop the method will return false and the object will not be added. - * - * Normally, this method will add this HVAC component immediatly after the node specified. There are exceptions, - * such as when a component is dropped on an outlet node such as the supply outlet node of an air loop. In - * this case the method will do the only thing possible and add this component before the outlet node. - */ + * + * This method is reimplemented in many of the derived classes to do the right thing based on the + * context of the node a particular object is added to. For example if a specific HVACComoponent is not allowed + * on an air loop and this interface is used to attempt to add the HVAC component to a node on an + * air loop the method will return false and the object will not be added. + * + * Normally, this method will add this HVAC component immediatly after the node specified. There are exceptions, + * such as when a component is dropped on an outlet node such as the supply outlet node of an air loop. In + * this case the method will do the only thing possible and add this component before the outlet node. + */ bool addToNode(Node& node); /** Adds this object to a splitter by creating a new branch. - * Returns true if the operation was succesfull. - * - * This method is reimplemented in many of the derived class to do the right thing based on the - * context of the splitter a particular object is added to. - */ + * Returns true if the operation was succesfull. + * + * This method is reimplemented in many of the derived class to do the right thing based on the + * context of the splitter a particular object is added to. + */ bool addToSplitter(Splitter& splitter); /** Removes all connections to other HVACComponent objects - */ + */ void disconnect(); /** Indicates if the HVACComponent can be removed from the model. - * One reason a component could not be removed is because it is attached to a loop and - * removing it would destroy the integrity of the loop. Zone splitters and mixers are - * examples of this, since they are required components of an air loop. In such a case, - * the HVACComponent must be disconnected before it can be removed. - */ + * One reason a component could not be removed is because it is attached to a loop and + * removing it would destroy the integrity of the loop. Zone splitters and mixers are + * examples of this, since they are required components of an air loop. In such a case, + * the HVACComponent must be disconnected before it can be removed. + */ bool isRemovable() const; /** Removes the HVACComponent from the model only if isRemovable() return true. - */ - std::vector remove(); + */ + std::vector remove(); // cppcheck-suppress [duplInheritedMember] for documentation purposes ///** Returns the optional ModelObject connected to this object's port. **/ //virtual boost::optional connectedObject(unsigned port); @@ -169,8 +169,6 @@ namespace model { explicit HVACComponent(std::shared_ptr impl); - virtual std::vector children() const; - private: REGISTER_LOGGER("openstudio.model.HVACComponent"); }; diff --git a/src/model/HVACComponent_Impl.hpp b/src/model/HVACComponent_Impl.hpp index 7ca664afb0c..1c22cc5478b 100644 --- a/src/model/HVACComponent_Impl.hpp +++ b/src/model/HVACComponent_Impl.hpp @@ -38,7 +38,7 @@ namespace model { HVACComponent_Impl(const HVACComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~HVACComponent_Impl() = default; + virtual ~HVACComponent_Impl() override = default; virtual boost::optional airLoopHVAC() const; diff --git a/src/model/HeaderedPumpsConstantSpeed.hpp b/src/model/HeaderedPumpsConstantSpeed.hpp index 8e6a4edae09..ebae218debc 100644 --- a/src/model/HeaderedPumpsConstantSpeed.hpp +++ b/src/model/HeaderedPumpsConstantSpeed.hpp @@ -31,7 +31,7 @@ namespace model { explicit HeaderedPumpsConstantSpeed(const Model& model); - virtual ~HeaderedPumpsConstantSpeed() = default; + virtual ~HeaderedPumpsConstantSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit HeaderedPumpsConstantSpeed(const HeaderedPumpsConstantSpeed& other) = default; HeaderedPumpsConstantSpeed(HeaderedPumpsConstantSpeed&& other) = default; diff --git a/src/model/HeaderedPumpsConstantSpeed_Impl.hpp b/src/model/HeaderedPumpsConstantSpeed_Impl.hpp index b9bfda7a671..117ca784527 100644 --- a/src/model/HeaderedPumpsConstantSpeed_Impl.hpp +++ b/src/model/HeaderedPumpsConstantSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { HeaderedPumpsConstantSpeed_Impl(const HeaderedPumpsConstantSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeaderedPumpsConstantSpeed_Impl() = default; + virtual ~HeaderedPumpsConstantSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeaderedPumpsVariableSpeed.hpp b/src/model/HeaderedPumpsVariableSpeed.hpp index 9ce8bbed865..2ec6107df6b 100644 --- a/src/model/HeaderedPumpsVariableSpeed.hpp +++ b/src/model/HeaderedPumpsVariableSpeed.hpp @@ -31,7 +31,7 @@ namespace model { explicit HeaderedPumpsVariableSpeed(const Model& model); - virtual ~HeaderedPumpsVariableSpeed() = default; + virtual ~HeaderedPumpsVariableSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit HeaderedPumpsVariableSpeed(const HeaderedPumpsVariableSpeed& other) = default; HeaderedPumpsVariableSpeed(HeaderedPumpsVariableSpeed&& other) = default; diff --git a/src/model/HeaderedPumpsVariableSpeed_Impl.hpp b/src/model/HeaderedPumpsVariableSpeed_Impl.hpp index bdd425bdfcf..7a086165bf0 100644 --- a/src/model/HeaderedPumpsVariableSpeed_Impl.hpp +++ b/src/model/HeaderedPumpsVariableSpeed_Impl.hpp @@ -30,7 +30,7 @@ namespace model { HeaderedPumpsVariableSpeed_Impl(const HeaderedPumpsVariableSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeaderedPumpsVariableSpeed_Impl() = default; + virtual ~HeaderedPumpsVariableSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatBalanceAlgorithm.hpp b/src/model/HeatBalanceAlgorithm.hpp index 4198f3e2e4e..1e16148b08d 100644 --- a/src/model/HeatBalanceAlgorithm.hpp +++ b/src/model/HeatBalanceAlgorithm.hpp @@ -32,7 +32,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~HeatBalanceAlgorithm() = default; + virtual ~HeatBalanceAlgorithm() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatBalanceAlgorithm(const HeatBalanceAlgorithm& other) = default; HeatBalanceAlgorithm(HeatBalanceAlgorithm&& other) = default; diff --git a/src/model/HeatBalanceAlgorithm_Impl.hpp b/src/model/HeatBalanceAlgorithm_Impl.hpp index a32e34e62eb..7ec91e361d2 100644 --- a/src/model/HeatBalanceAlgorithm_Impl.hpp +++ b/src/model/HeatBalanceAlgorithm_Impl.hpp @@ -32,7 +32,7 @@ namespace model { HeatBalanceAlgorithm_Impl(const HeatBalanceAlgorithm_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~HeatBalanceAlgorithm_Impl() = default; + virtual ~HeatBalanceAlgorithm_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/HeatExchangerAirToAirSensibleAndLatent.hpp b/src/model/HeatExchangerAirToAirSensibleAndLatent.hpp index 6dcbdb69ce5..2840da54d96 100644 --- a/src/model/HeatExchangerAirToAirSensibleAndLatent.hpp +++ b/src/model/HeatExchangerAirToAirSensibleAndLatent.hpp @@ -38,7 +38,7 @@ namespace model { * defaults for Sensible/Latent Effectiveness at 75% Heating/Cooling airflow */ explicit HeatExchangerAirToAirSensibleAndLatent(const Model& model); - virtual ~HeatExchangerAirToAirSensibleAndLatent() = default; + virtual ~HeatExchangerAirToAirSensibleAndLatent() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatExchangerAirToAirSensibleAndLatent(const HeatExchangerAirToAirSensibleAndLatent& other) = default; HeatExchangerAirToAirSensibleAndLatent(HeatExchangerAirToAirSensibleAndLatent&& other) = default; diff --git a/src/model/HeatExchangerAirToAirSensibleAndLatent_Impl.hpp b/src/model/HeatExchangerAirToAirSensibleAndLatent_Impl.hpp index f25df1e29f2..4ca66baed38 100644 --- a/src/model/HeatExchangerAirToAirSensibleAndLatent_Impl.hpp +++ b/src/model/HeatExchangerAirToAirSensibleAndLatent_Impl.hpp @@ -32,7 +32,7 @@ namespace model { HeatExchangerAirToAirSensibleAndLatent_Impl(const HeatExchangerAirToAirSensibleAndLatent_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatExchangerAirToAirSensibleAndLatent_Impl() = default; + virtual ~HeatExchangerAirToAirSensibleAndLatent_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatExchangerDesiccantBalancedFlow.hpp b/src/model/HeatExchangerDesiccantBalancedFlow.hpp index a2098b71b9d..c9807f30d6c 100644 --- a/src/model/HeatExchangerDesiccantBalancedFlow.hpp +++ b/src/model/HeatExchangerDesiccantBalancedFlow.hpp @@ -33,7 +33,7 @@ namespace model { explicit HeatExchangerDesiccantBalancedFlow(const Model& model, const HeatExchangerDesiccantBalancedFlowPerformanceDataType1& heatExchangerPerformance); - virtual ~HeatExchangerDesiccantBalancedFlow() = default; + virtual ~HeatExchangerDesiccantBalancedFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatExchangerDesiccantBalancedFlow(const HeatExchangerDesiccantBalancedFlow& other) = default; HeatExchangerDesiccantBalancedFlow(HeatExchangerDesiccantBalancedFlow&& other) = default; diff --git a/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1.hpp b/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1.hpp index ec9ade0db54..cb60f20385e 100644 --- a/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1.hpp +++ b/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1.hpp @@ -30,7 +30,7 @@ namespace model { explicit HeatExchangerDesiccantBalancedFlowPerformanceDataType1(const Model& model); - virtual ~HeatExchangerDesiccantBalancedFlowPerformanceDataType1() = default; + virtual ~HeatExchangerDesiccantBalancedFlowPerformanceDataType1() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatExchangerDesiccantBalancedFlowPerformanceDataType1(const HeatExchangerDesiccantBalancedFlowPerformanceDataType1& other) = default; HeatExchangerDesiccantBalancedFlowPerformanceDataType1(HeatExchangerDesiccantBalancedFlowPerformanceDataType1&& other) = default; diff --git a/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl.hpp b/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl.hpp index 68dddec1da0..2edbc2552b3 100644 --- a/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl.hpp +++ b/src/model/HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl(const HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl() = default; + virtual ~HeatExchangerDesiccantBalancedFlowPerformanceDataType1_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatExchangerDesiccantBalancedFlow_Impl.hpp b/src/model/HeatExchangerDesiccantBalancedFlow_Impl.hpp index 470eb95af21..b7d806cef6b 100644 --- a/src/model/HeatExchangerDesiccantBalancedFlow_Impl.hpp +++ b/src/model/HeatExchangerDesiccantBalancedFlow_Impl.hpp @@ -32,7 +32,7 @@ namespace model { HeatExchangerDesiccantBalancedFlow_Impl(const HeatExchangerDesiccantBalancedFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatExchangerDesiccantBalancedFlow_Impl() = default; + virtual ~HeatExchangerDesiccantBalancedFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatExchangerFluidToFluid.hpp b/src/model/HeatExchangerFluidToFluid.hpp index e2bc542d8c9..c16d49e8c87 100644 --- a/src/model/HeatExchangerFluidToFluid.hpp +++ b/src/model/HeatExchangerFluidToFluid.hpp @@ -31,7 +31,7 @@ namespace model { explicit HeatExchangerFluidToFluid(const Model& model); - virtual ~HeatExchangerFluidToFluid() = default; + virtual ~HeatExchangerFluidToFluid() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatExchangerFluidToFluid(const HeatExchangerFluidToFluid& other) = default; HeatExchangerFluidToFluid(HeatExchangerFluidToFluid&& other) = default; diff --git a/src/model/HeatExchangerFluidToFluid_Impl.hpp b/src/model/HeatExchangerFluidToFluid_Impl.hpp index 7595c5227ca..ddbcb620bc2 100644 --- a/src/model/HeatExchangerFluidToFluid_Impl.hpp +++ b/src/model/HeatExchangerFluidToFluid_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HeatExchangerFluidToFluid_Impl(const HeatExchangerFluidToFluid_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatExchangerFluidToFluid_Impl() = default; + virtual ~HeatExchangerFluidToFluid_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatPumpAirToWaterFuelFiredCooling.hpp b/src/model/HeatPumpAirToWaterFuelFiredCooling.hpp index 0311fe946ad..e3b14040577 100644 --- a/src/model/HeatPumpAirToWaterFuelFiredCooling.hpp +++ b/src/model/HeatPumpAirToWaterFuelFiredCooling.hpp @@ -36,7 +36,7 @@ namespace model { const Curve& fuelEnergyInputRatioFunctionofTemperatureCurve, const Curve& fuelEnergyInputRatioFunctionofPLRCurve); - virtual ~HeatPumpAirToWaterFuelFiredCooling() = default; + virtual ~HeatPumpAirToWaterFuelFiredCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatPumpAirToWaterFuelFiredCooling(const HeatPumpAirToWaterFuelFiredCooling& other) = default; HeatPumpAirToWaterFuelFiredCooling(HeatPumpAirToWaterFuelFiredCooling&& other) = default; diff --git a/src/model/HeatPumpAirToWaterFuelFiredHeating.hpp b/src/model/HeatPumpAirToWaterFuelFiredHeating.hpp index 0cf5811bad5..92a136af4b7 100644 --- a/src/model/HeatPumpAirToWaterFuelFiredHeating.hpp +++ b/src/model/HeatPumpAirToWaterFuelFiredHeating.hpp @@ -36,7 +36,7 @@ namespace model { const Curve& fuelEnergyInputRatioFunctionofTemperatureCurve, const Curve& fuelEnergyInputRatioFunctionofPLRCurve); - virtual ~HeatPumpAirToWaterFuelFiredHeating() = default; + virtual ~HeatPumpAirToWaterFuelFiredHeating() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatPumpAirToWaterFuelFiredHeating(const HeatPumpAirToWaterFuelFiredHeating& other) = default; HeatPumpAirToWaterFuelFiredHeating(HeatPumpAirToWaterFuelFiredHeating&& other) = default; diff --git a/src/model/HeatPumpPlantLoopEIRCooling.hpp b/src/model/HeatPumpPlantLoopEIRCooling.hpp index 31157067d59..74841f0602f 100644 --- a/src/model/HeatPumpPlantLoopEIRCooling.hpp +++ b/src/model/HeatPumpPlantLoopEIRCooling.hpp @@ -35,7 +35,7 @@ namespace model { explicit HeatPumpPlantLoopEIRCooling(const Model& model); - virtual ~HeatPumpPlantLoopEIRCooling() = default; + virtual ~HeatPumpPlantLoopEIRCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatPumpPlantLoopEIRCooling(const HeatPumpPlantLoopEIRCooling& other) = default; HeatPumpPlantLoopEIRCooling(HeatPumpPlantLoopEIRCooling&& other) = default; diff --git a/src/model/HeatPumpPlantLoopEIRCooling_Impl.hpp b/src/model/HeatPumpPlantLoopEIRCooling_Impl.hpp index 7dd579611eb..403db49ec6d 100644 --- a/src/model/HeatPumpPlantLoopEIRCooling_Impl.hpp +++ b/src/model/HeatPumpPlantLoopEIRCooling_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HeatPumpPlantLoopEIRCooling_Impl(const HeatPumpPlantLoopEIRCooling_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatPumpPlantLoopEIRCooling_Impl() = default; + virtual ~HeatPumpPlantLoopEIRCooling_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatPumpPlantLoopEIRHeating.hpp b/src/model/HeatPumpPlantLoopEIRHeating.hpp index 867a24d186e..6346af377fc 100644 --- a/src/model/HeatPumpPlantLoopEIRHeating.hpp +++ b/src/model/HeatPumpPlantLoopEIRHeating.hpp @@ -35,7 +35,7 @@ namespace model { explicit HeatPumpPlantLoopEIRHeating(const Model& model); - virtual ~HeatPumpPlantLoopEIRHeating() = default; + virtual ~HeatPumpPlantLoopEIRHeating() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatPumpPlantLoopEIRHeating(const HeatPumpPlantLoopEIRHeating& other) = default; HeatPumpPlantLoopEIRHeating(HeatPumpPlantLoopEIRHeating&& other) = default; diff --git a/src/model/HeatPumpPlantLoopEIRHeating_Impl.hpp b/src/model/HeatPumpPlantLoopEIRHeating_Impl.hpp index b990a1472e9..6d2a1089511 100644 --- a/src/model/HeatPumpPlantLoopEIRHeating_Impl.hpp +++ b/src/model/HeatPumpPlantLoopEIRHeating_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HeatPumpPlantLoopEIRHeating_Impl(const HeatPumpPlantLoopEIRHeating_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatPumpPlantLoopEIRHeating_Impl() = default; + virtual ~HeatPumpPlantLoopEIRHeating_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp b/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp index c0f8263b6df..1ff02d9afc8 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp +++ b/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp @@ -36,7 +36,7 @@ namespace model { explicit HeatPumpWaterToWaterEquationFitCooling(const Model& model); - virtual ~HeatPumpWaterToWaterEquationFitCooling() = default; + virtual ~HeatPumpWaterToWaterEquationFitCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatPumpWaterToWaterEquationFitCooling(const HeatPumpWaterToWaterEquationFitCooling& other) = default; HeatPumpWaterToWaterEquationFitCooling(HeatPumpWaterToWaterEquationFitCooling&& other) = default; diff --git a/src/model/HeatPumpWaterToWaterEquationFitCooling_Impl.hpp b/src/model/HeatPumpWaterToWaterEquationFitCooling_Impl.hpp index 4230eb5f642..26c295eec38 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitCooling_Impl.hpp +++ b/src/model/HeatPumpWaterToWaterEquationFitCooling_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HeatPumpWaterToWaterEquationFitCooling_Impl(const HeatPumpWaterToWaterEquationFitCooling_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatPumpWaterToWaterEquationFitCooling_Impl() = default; + virtual ~HeatPumpWaterToWaterEquationFitCooling_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp b/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp index 424abc7e9df..771d5946d38 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp +++ b/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp @@ -36,7 +36,7 @@ namespace model { explicit HeatPumpWaterToWaterEquationFitHeating(const Model& model); - virtual ~HeatPumpWaterToWaterEquationFitHeating() = default; + virtual ~HeatPumpWaterToWaterEquationFitHeating() override = default; // Default the copy and move operators because the virtual dtor is explicit HeatPumpWaterToWaterEquationFitHeating(const HeatPumpWaterToWaterEquationFitHeating& other) = default; HeatPumpWaterToWaterEquationFitHeating(HeatPumpWaterToWaterEquationFitHeating&& other) = default; diff --git a/src/model/HeatPumpWaterToWaterEquationFitHeating_Impl.hpp b/src/model/HeatPumpWaterToWaterEquationFitHeating_Impl.hpp index b87df1e3779..1e0c690ba0f 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitHeating_Impl.hpp +++ b/src/model/HeatPumpWaterToWaterEquationFitHeating_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HeatPumpWaterToWaterEquationFitHeating_Impl(const HeatPumpWaterToWaterEquationFitHeating_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HeatPumpWaterToWaterEquationFitHeating_Impl() = default; + virtual ~HeatPumpWaterToWaterEquationFitHeating_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HotWaterEquipment.hpp b/src/model/HotWaterEquipment.hpp index 22ba0573934..48a5c0df60e 100644 --- a/src/model/HotWaterEquipment.hpp +++ b/src/model/HotWaterEquipment.hpp @@ -33,7 +33,7 @@ namespace model { explicit HotWaterEquipment(const HotWaterEquipmentDefinition& hotWaterEquipmentDefinition); - virtual ~HotWaterEquipment() = default; + virtual ~HotWaterEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit HotWaterEquipment(const HotWaterEquipment& other) = default; HotWaterEquipment(HotWaterEquipment&& other) = default; diff --git a/src/model/HotWaterEquipmentDefinition.hpp b/src/model/HotWaterEquipmentDefinition.hpp index 24e1903c9bc..a14cd5d2c64 100644 --- a/src/model/HotWaterEquipmentDefinition.hpp +++ b/src/model/HotWaterEquipmentDefinition.hpp @@ -31,7 +31,7 @@ namespace model { explicit HotWaterEquipmentDefinition(const Model& model); - virtual ~HotWaterEquipmentDefinition() = default; + virtual ~HotWaterEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit HotWaterEquipmentDefinition(const HotWaterEquipmentDefinition& other) = default; HotWaterEquipmentDefinition(HotWaterEquipmentDefinition&& other) = default; diff --git a/src/model/HotWaterEquipmentDefinition_Impl.hpp b/src/model/HotWaterEquipmentDefinition_Impl.hpp index cb76e93312f..dc930b5b50f 100644 --- a/src/model/HotWaterEquipmentDefinition_Impl.hpp +++ b/src/model/HotWaterEquipmentDefinition_Impl.hpp @@ -29,7 +29,7 @@ namespace model { HotWaterEquipmentDefinition_Impl(const HotWaterEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HotWaterEquipmentDefinition_Impl() = default; + virtual ~HotWaterEquipmentDefinition_Impl() override = default; //@} diff --git a/src/model/HotWaterEquipment_Impl.hpp b/src/model/HotWaterEquipment_Impl.hpp index a579865f256..f02986562b0 100644 --- a/src/model/HotWaterEquipment_Impl.hpp +++ b/src/model/HotWaterEquipment_Impl.hpp @@ -31,7 +31,7 @@ namespace model { HotWaterEquipment_Impl(const HotWaterEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HotWaterEquipment_Impl() = default; + virtual ~HotWaterEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HumidifierSteamElectric.hpp b/src/model/HumidifierSteamElectric.hpp index 54d3f2d9b88..8ac921dc0a7 100644 --- a/src/model/HumidifierSteamElectric.hpp +++ b/src/model/HumidifierSteamElectric.hpp @@ -30,7 +30,7 @@ namespace model { explicit HumidifierSteamElectric(const Model& model); - virtual ~HumidifierSteamElectric() = default; + virtual ~HumidifierSteamElectric() override = default; // Default the copy and move operators because the virtual dtor is explicit HumidifierSteamElectric(const HumidifierSteamElectric& other) = default; HumidifierSteamElectric(HumidifierSteamElectric&& other) = default; diff --git a/src/model/HumidifierSteamElectric_Impl.hpp b/src/model/HumidifierSteamElectric_Impl.hpp index 78f3fabf222..3fc01317003 100644 --- a/src/model/HumidifierSteamElectric_Impl.hpp +++ b/src/model/HumidifierSteamElectric_Impl.hpp @@ -29,7 +29,7 @@ namespace model { HumidifierSteamElectric_Impl(const HumidifierSteamElectric_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HumidifierSteamElectric_Impl() = default; + virtual ~HumidifierSteamElectric_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/HumidifierSteamGas.hpp b/src/model/HumidifierSteamGas.hpp index aa09c4f393b..c6f081d141e 100644 --- a/src/model/HumidifierSteamGas.hpp +++ b/src/model/HumidifierSteamGas.hpp @@ -31,7 +31,7 @@ namespace model { explicit HumidifierSteamGas(const Model& model); - virtual ~HumidifierSteamGas() = default; + virtual ~HumidifierSteamGas() override = default; // Default the copy and move operators because the virtual dtor is explicit HumidifierSteamGas(const HumidifierSteamGas& other) = default; HumidifierSteamGas(HumidifierSteamGas&& other) = default; diff --git a/src/model/HumidifierSteamGas_Impl.hpp b/src/model/HumidifierSteamGas_Impl.hpp index 3e7bbc06931..5434e7f2745 100644 --- a/src/model/HumidifierSteamGas_Impl.hpp +++ b/src/model/HumidifierSteamGas_Impl.hpp @@ -30,7 +30,7 @@ namespace model { HumidifierSteamGas_Impl(const HumidifierSteamGas_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~HumidifierSteamGas_Impl() = default; + virtual ~HumidifierSteamGas_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/IlluminanceMap.hpp b/src/model/IlluminanceMap.hpp index acc96943d08..808a467196a 100644 --- a/src/model/IlluminanceMap.hpp +++ b/src/model/IlluminanceMap.hpp @@ -37,7 +37,7 @@ namespace model { explicit IlluminanceMap(const Model& model); - virtual ~IlluminanceMap() = default; + virtual ~IlluminanceMap() override = default; // Default the copy and move operators because the virtual dtor is explicit IlluminanceMap(const IlluminanceMap& other) = default; IlluminanceMap(IlluminanceMap&& other) = default; diff --git a/src/model/IlluminanceMap_Impl.hpp b/src/model/IlluminanceMap_Impl.hpp index 4c21311c00b..9784c66c032 100644 --- a/src/model/IlluminanceMap_Impl.hpp +++ b/src/model/IlluminanceMap_Impl.hpp @@ -34,7 +34,7 @@ namespace model { IlluminanceMap_Impl(const IlluminanceMap_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~IlluminanceMap_Impl() = default; + virtual ~IlluminanceMap_Impl() override = default; //@} diff --git a/src/model/InfraredTransparentMaterial.hpp b/src/model/InfraredTransparentMaterial.hpp index 30d346ad4e5..85186d68ee6 100644 --- a/src/model/InfraredTransparentMaterial.hpp +++ b/src/model/InfraredTransparentMaterial.hpp @@ -27,7 +27,7 @@ namespace model { explicit InfraredTransparentMaterial(const Model& model); - virtual ~InfraredTransparentMaterial() = default; + virtual ~InfraredTransparentMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit InfraredTransparentMaterial(const InfraredTransparentMaterial& other) = default; InfraredTransparentMaterial(InfraredTransparentMaterial&& other) = default; diff --git a/src/model/InfraredTransparentMaterial_Impl.hpp b/src/model/InfraredTransparentMaterial_Impl.hpp index d5f33aa3e54..86c67f20989 100644 --- a/src/model/InfraredTransparentMaterial_Impl.hpp +++ b/src/model/InfraredTransparentMaterial_Impl.hpp @@ -27,7 +27,7 @@ namespace model { InfraredTransparentMaterial_Impl(const InfraredTransparentMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~InfraredTransparentMaterial_Impl() = default; + virtual ~InfraredTransparentMaterial_Impl() override = default; //@} diff --git a/src/model/InsideSurfaceConvectionAlgorithm.hpp b/src/model/InsideSurfaceConvectionAlgorithm.hpp index ffe411ffde2..a58de829126 100644 --- a/src/model/InsideSurfaceConvectionAlgorithm.hpp +++ b/src/model/InsideSurfaceConvectionAlgorithm.hpp @@ -27,7 +27,7 @@ namespace model { class MODEL_API InsideSurfaceConvectionAlgorithm : public ModelObject { public: - virtual ~InsideSurfaceConvectionAlgorithm() = default; + virtual ~InsideSurfaceConvectionAlgorithm() override = default; // Default the copy and move operators because the virtual dtor is explicit InsideSurfaceConvectionAlgorithm(const InsideSurfaceConvectionAlgorithm& other) = default; InsideSurfaceConvectionAlgorithm(InsideSurfaceConvectionAlgorithm&& other) = default; diff --git a/src/model/InsideSurfaceConvectionAlgorithm_Impl.hpp b/src/model/InsideSurfaceConvectionAlgorithm_Impl.hpp index 80b5af1db4c..2baafc3a791 100644 --- a/src/model/InsideSurfaceConvectionAlgorithm_Impl.hpp +++ b/src/model/InsideSurfaceConvectionAlgorithm_Impl.hpp @@ -30,7 +30,7 @@ namespace model { InsideSurfaceConvectionAlgorithm_Impl(const InsideSurfaceConvectionAlgorithm_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~InsideSurfaceConvectionAlgorithm_Impl() = default; + virtual ~InsideSurfaceConvectionAlgorithm_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/InteriorPartitionSurface.hpp b/src/model/InteriorPartitionSurface.hpp index 8c3c8912bd4..d2642f02740 100644 --- a/src/model/InteriorPartitionSurface.hpp +++ b/src/model/InteriorPartitionSurface.hpp @@ -30,7 +30,7 @@ namespace model { explicit InteriorPartitionSurface(const std::vector& vertices, const Model& model); - virtual ~InteriorPartitionSurface() = default; + virtual ~InteriorPartitionSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit InteriorPartitionSurface(const InteriorPartitionSurface& other) = default; InteriorPartitionSurface(InteriorPartitionSurface&& other) = default; diff --git a/src/model/InteriorPartitionSurfaceGroup.hpp b/src/model/InteriorPartitionSurfaceGroup.hpp index c5ee77eeab7..8dd204e7651 100644 --- a/src/model/InteriorPartitionSurfaceGroup.hpp +++ b/src/model/InteriorPartitionSurfaceGroup.hpp @@ -33,7 +33,7 @@ namespace model { explicit InteriorPartitionSurfaceGroup(const Model& model); - virtual ~InteriorPartitionSurfaceGroup() = default; + virtual ~InteriorPartitionSurfaceGroup() override = default; // Default the copy and move operators because the virtual dtor is explicit InteriorPartitionSurfaceGroup(const InteriorPartitionSurfaceGroup& other) = default; InteriorPartitionSurfaceGroup(InteriorPartitionSurfaceGroup&& other) = default; diff --git a/src/model/InteriorPartitionSurfaceGroup_Impl.hpp b/src/model/InteriorPartitionSurfaceGroup_Impl.hpp index cd33884b4b6..1c6ee92791f 100644 --- a/src/model/InteriorPartitionSurfaceGroup_Impl.hpp +++ b/src/model/InteriorPartitionSurfaceGroup_Impl.hpp @@ -35,7 +35,7 @@ namespace model { InteriorPartitionSurfaceGroup_Impl(const InteriorPartitionSurfaceGroup_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~InteriorPartitionSurfaceGroup_Impl() = default; + virtual ~InteriorPartitionSurfaceGroup_Impl() override = default; //@} diff --git a/src/model/InteriorPartitionSurface_Impl.hpp b/src/model/InteriorPartitionSurface_Impl.hpp index 70dcc05ee13..c7c9ee3ecfc 100644 --- a/src/model/InteriorPartitionSurface_Impl.hpp +++ b/src/model/InteriorPartitionSurface_Impl.hpp @@ -32,7 +32,7 @@ namespace model { InteriorPartitionSurface_Impl(const InteriorPartitionSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~InteriorPartitionSurface_Impl() = default; + virtual ~InteriorPartitionSurface_Impl() override = default; //@} diff --git a/src/model/InternalMass.hpp b/src/model/InternalMass.hpp index 19caa91def4..9208a5794d6 100644 --- a/src/model/InternalMass.hpp +++ b/src/model/InternalMass.hpp @@ -33,7 +33,7 @@ namespace model { explicit InternalMass(const InternalMassDefinition& internalMassDefinition); - virtual ~InternalMass() = default; + virtual ~InternalMass() override = default; // Default the copy and move operators because the virtual dtor is explicit InternalMass(const InternalMass& other) = default; InternalMass(InternalMass&& other) = default; diff --git a/src/model/InternalMassDefinition.hpp b/src/model/InternalMassDefinition.hpp index e886f974388..23e82cd0e14 100644 --- a/src/model/InternalMassDefinition.hpp +++ b/src/model/InternalMassDefinition.hpp @@ -33,7 +33,7 @@ namespace model { explicit InternalMassDefinition(const Model& model); - virtual ~InternalMassDefinition() = default; + virtual ~InternalMassDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit InternalMassDefinition(const InternalMassDefinition& other) = default; InternalMassDefinition(InternalMassDefinition&& other) = default; diff --git a/src/model/InternalMassDefinition_Impl.hpp b/src/model/InternalMassDefinition_Impl.hpp index fd5d4cfc633..048f9cf842c 100644 --- a/src/model/InternalMassDefinition_Impl.hpp +++ b/src/model/InternalMassDefinition_Impl.hpp @@ -31,7 +31,7 @@ namespace model { InternalMassDefinition_Impl(const InternalMassDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~InternalMassDefinition_Impl() = default; + virtual ~InternalMassDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/InternalMass_Impl.hpp b/src/model/InternalMass_Impl.hpp index fed41febb02..c4d669b37ff 100644 --- a/src/model/InternalMass_Impl.hpp +++ b/src/model/InternalMass_Impl.hpp @@ -32,7 +32,7 @@ namespace model { InternalMass_Impl(const InternalMass_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~InternalMass_Impl() = default; + virtual ~InternalMass_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Inverter.hpp b/src/model/Inverter.hpp index f39caabdcbf..8f539e07ede 100644 --- a/src/model/Inverter.hpp +++ b/src/model/Inverter.hpp @@ -27,7 +27,7 @@ namespace model { public: Inverter(IddObjectType type, const Model& model); - virtual ~Inverter() = default; + virtual ~Inverter() override = default; // Default the copy and move operators because the virtual dtor is explicit Inverter(const Inverter& other) = default; Inverter(Inverter&& other) = default; diff --git a/src/model/Inverter_Impl.hpp b/src/model/Inverter_Impl.hpp index a9c16de05f2..f4e353adf76 100644 --- a/src/model/Inverter_Impl.hpp +++ b/src/model/Inverter_Impl.hpp @@ -28,7 +28,7 @@ namespace model { Inverter_Impl(const Inverter_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~Inverter_Impl() = default; + virtual ~Inverter_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/LayeredConstruction.hpp b/src/model/LayeredConstruction.hpp index f3563a30597..e645b559f39 100644 --- a/src/model/LayeredConstruction.hpp +++ b/src/model/LayeredConstruction.hpp @@ -29,7 +29,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~LayeredConstruction() = default; + virtual ~LayeredConstruction() override = default; // Default the copy and move operators because the virtual dtor is explicit LayeredConstruction(const LayeredConstruction& other) = default; LayeredConstruction(LayeredConstruction&& other) = default; diff --git a/src/model/LayeredConstruction_Impl.hpp b/src/model/LayeredConstruction_Impl.hpp index 529bb29351f..3585a57ee31 100644 --- a/src/model/LayeredConstruction_Impl.hpp +++ b/src/model/LayeredConstruction_Impl.hpp @@ -42,7 +42,7 @@ namespace model { // Clone copy constructor. LayeredConstruction_Impl(const LayeredConstruction_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LayeredConstruction_Impl() = default; + virtual ~LayeredConstruction_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/LifeCycleCost.hpp b/src/model/LifeCycleCost.hpp index 1d37a586d1d..bc007e04582 100644 --- a/src/model/LifeCycleCost.hpp +++ b/src/model/LifeCycleCost.hpp @@ -35,7 +35,7 @@ namespace model { /// This will throw if the object type is not known explicit LifeCycleCost(const ModelObject& modelObject); - virtual ~LifeCycleCost() = default; + virtual ~LifeCycleCost() override = default; // Default the copy and move operators because the virtual dtor is explicit LifeCycleCost(const LifeCycleCost& other) = default; LifeCycleCost(LifeCycleCost&& other) = default; diff --git a/src/model/LifeCycleCostParameters.hpp b/src/model/LifeCycleCostParameters.hpp index 9bde6cf76de..d9c733b0b50 100644 --- a/src/model/LifeCycleCostParameters.hpp +++ b/src/model/LifeCycleCostParameters.hpp @@ -31,7 +31,7 @@ namespace model { public: /** @name Constructors and Destructors */ //@{ - virtual ~LifeCycleCostParameters() = default; + virtual ~LifeCycleCostParameters() override = default; // Default the copy and move operators because the virtual dtor is explicit LifeCycleCostParameters(const LifeCycleCostParameters& other) = default; LifeCycleCostParameters(LifeCycleCostParameters&& other) = default; diff --git a/src/model/LifeCycleCostParameters_Impl.hpp b/src/model/LifeCycleCostParameters_Impl.hpp index e4452664c5c..7d5235e60b5 100644 --- a/src/model/LifeCycleCostParameters_Impl.hpp +++ b/src/model/LifeCycleCostParameters_Impl.hpp @@ -34,7 +34,7 @@ namespace model { LifeCycleCostParameters_Impl(const LifeCycleCostParameters_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~LifeCycleCostParameters_Impl() = default; + virtual ~LifeCycleCostParameters_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/LifeCycleCostUsePriceEscalation.hpp b/src/model/LifeCycleCostUsePriceEscalation.hpp index e31d823c2ba..0d274f366f1 100644 --- a/src/model/LifeCycleCostUsePriceEscalation.hpp +++ b/src/model/LifeCycleCostUsePriceEscalation.hpp @@ -27,7 +27,7 @@ namespace model { public: /** @name Constructors and Destructors */ //@{ - virtual ~LifeCycleCostUsePriceEscalation() = default; + virtual ~LifeCycleCostUsePriceEscalation() override = default; // Default the copy and move operators because the virtual dtor is explicit LifeCycleCostUsePriceEscalation(const LifeCycleCostUsePriceEscalation& other) = default; LifeCycleCostUsePriceEscalation(LifeCycleCostUsePriceEscalation&& other) = default; diff --git a/src/model/LifeCycleCostUsePriceEscalation_Impl.hpp b/src/model/LifeCycleCostUsePriceEscalation_Impl.hpp index 480cbeff715..3fa940f69da 100644 --- a/src/model/LifeCycleCostUsePriceEscalation_Impl.hpp +++ b/src/model/LifeCycleCostUsePriceEscalation_Impl.hpp @@ -27,7 +27,7 @@ namespace model { LifeCycleCostUsePriceEscalation_Impl(const LifeCycleCostUsePriceEscalation_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~LifeCycleCostUsePriceEscalation_Impl() = default; + virtual ~LifeCycleCostUsePriceEscalation_Impl() override = default; OptionalString resource() const; bool setResource(const std::string& str); diff --git a/src/model/LifeCycleCost_Impl.hpp b/src/model/LifeCycleCost_Impl.hpp index ffdaf4e1362..3097323fb29 100644 --- a/src/model/LifeCycleCost_Impl.hpp +++ b/src/model/LifeCycleCost_Impl.hpp @@ -32,7 +32,7 @@ namespace model { LifeCycleCost_Impl(const LifeCycleCost_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~LifeCycleCost_Impl() = default; + virtual ~LifeCycleCost_Impl() override = default; virtual IddObjectType iddObjectType() const override { return LifeCycleCost::iddObjectType(); diff --git a/src/model/LightingDesignDay.hpp b/src/model/LightingDesignDay.hpp index e5fd02117ad..9a6cba9cee7 100644 --- a/src/model/LightingDesignDay.hpp +++ b/src/model/LightingDesignDay.hpp @@ -32,7 +32,7 @@ namespace model { LightingDesignDay(const std::string& cieSkyModel, const openstudio::Date& date, const Model& model); - virtual ~LightingDesignDay() = default; + virtual ~LightingDesignDay() override = default; // Default the copy and move operators because the virtual dtor is explicit LightingDesignDay(const LightingDesignDay& other) = default; LightingDesignDay(LightingDesignDay&& other) = default; diff --git a/src/model/LightingDesignDay_Impl.hpp b/src/model/LightingDesignDay_Impl.hpp index 7206babad92..4ddba21b247 100644 --- a/src/model/LightingDesignDay_Impl.hpp +++ b/src/model/LightingDesignDay_Impl.hpp @@ -33,7 +33,7 @@ namespace model { LightingDesignDay_Impl(const LightingDesignDay_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LightingDesignDay_Impl() = default; + virtual ~LightingDesignDay_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/LightingSimulationControl.hpp b/src/model/LightingSimulationControl.hpp index efb52afe2f3..534151e206b 100644 --- a/src/model/LightingSimulationControl.hpp +++ b/src/model/LightingSimulationControl.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~LightingSimulationControl() = default; + virtual ~LightingSimulationControl() override = default; // Default the copy and move operators because the virtual dtor is explicit LightingSimulationControl(const LightingSimulationControl& other) = default; LightingSimulationControl(LightingSimulationControl&& other) = default; diff --git a/src/model/LightingSimulationControl_Impl.hpp b/src/model/LightingSimulationControl_Impl.hpp index 75c4891285f..7e56899aba3 100644 --- a/src/model/LightingSimulationControl_Impl.hpp +++ b/src/model/LightingSimulationControl_Impl.hpp @@ -28,7 +28,7 @@ namespace model { LightingSimulationControl_Impl(const LightingSimulationControl_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LightingSimulationControl_Impl() = default; + virtual ~LightingSimulationControl_Impl() override = default; //@} virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/LightingSimulationZone.hpp b/src/model/LightingSimulationZone.hpp index 0d66a3a7b47..ae5f1ab14d5 100644 --- a/src/model/LightingSimulationZone.hpp +++ b/src/model/LightingSimulationZone.hpp @@ -33,7 +33,7 @@ namespace model { explicit LightingSimulationZone(const Model& model); - virtual ~LightingSimulationZone() = default; + virtual ~LightingSimulationZone() override = default; // Default the copy and move operators because the virtual dtor is explicit LightingSimulationZone(const LightingSimulationZone& other) = default; LightingSimulationZone(LightingSimulationZone&& other) = default; diff --git a/src/model/LightingSimulationZone_Impl.hpp b/src/model/LightingSimulationZone_Impl.hpp index 8550e45da57..054e42979da 100644 --- a/src/model/LightingSimulationZone_Impl.hpp +++ b/src/model/LightingSimulationZone_Impl.hpp @@ -31,7 +31,7 @@ namespace model { LightingSimulationZone_Impl(const LightingSimulationZone_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LightingSimulationZone_Impl() = default; + virtual ~LightingSimulationZone_Impl() override = default; //@} virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/Lights.hpp b/src/model/Lights.hpp index 24ad1481e98..8f446da7df9 100644 --- a/src/model/Lights.hpp +++ b/src/model/Lights.hpp @@ -31,7 +31,7 @@ namespace model { explicit Lights(const LightsDefinition& lightsDefinition); - virtual ~Lights() = default; + virtual ~Lights() override = default; // Default the copy and move operators because the virtual dtor is explicit Lights(const Lights& other) = default; Lights(Lights&& other) = default; diff --git a/src/model/LightsDefinition.hpp b/src/model/LightsDefinition.hpp index aa509c69540..7cdce955b91 100644 --- a/src/model/LightsDefinition.hpp +++ b/src/model/LightsDefinition.hpp @@ -31,7 +31,7 @@ namespace model { explicit LightsDefinition(const Model& model); - virtual ~LightsDefinition() = default; + virtual ~LightsDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit LightsDefinition(const LightsDefinition& other) = default; LightsDefinition(LightsDefinition&& other) = default; diff --git a/src/model/LightsDefinition_Impl.hpp b/src/model/LightsDefinition_Impl.hpp index 432e13dbcd8..e258e4d6fb0 100644 --- a/src/model/LightsDefinition_Impl.hpp +++ b/src/model/LightsDefinition_Impl.hpp @@ -30,7 +30,7 @@ namespace model { LightsDefinition_Impl(const LightsDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LightsDefinition_Impl() = default; + virtual ~LightsDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Lights_Impl.hpp b/src/model/Lights_Impl.hpp index 91de589f43a..d5935fff67c 100644 --- a/src/model/Lights_Impl.hpp +++ b/src/model/Lights_Impl.hpp @@ -31,7 +31,7 @@ namespace model { Lights_Impl(const Lights_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Lights_Impl() = default; + virtual ~Lights_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/LoadProfilePlant.hpp b/src/model/LoadProfilePlant.hpp index 6101e24891d..0f0dc59a8a0 100644 --- a/src/model/LoadProfilePlant.hpp +++ b/src/model/LoadProfilePlant.hpp @@ -32,7 +32,7 @@ namespace model { explicit LoadProfilePlant(const Model& model, Schedule& loadSchedule, Schedule& flowRateFractionSchedule); - virtual ~LoadProfilePlant() = default; + virtual ~LoadProfilePlant() override = default; // Default the copy and move operators because the virtual dtor is explicit LoadProfilePlant(const LoadProfilePlant& other) = default; LoadProfilePlant(LoadProfilePlant&& other) = default; diff --git a/src/model/LoadProfilePlant_Impl.hpp b/src/model/LoadProfilePlant_Impl.hpp index f825468ee79..69f99da2686 100644 --- a/src/model/LoadProfilePlant_Impl.hpp +++ b/src/model/LoadProfilePlant_Impl.hpp @@ -30,7 +30,7 @@ namespace model { LoadProfilePlant_Impl(const LoadProfilePlant_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LoadProfilePlant_Impl() = default; + virtual ~LoadProfilePlant_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/LoadingIndex.hpp b/src/model/LoadingIndex.hpp index 0f65c2e9b9a..c4943a52ae9 100644 --- a/src/model/LoadingIndex.hpp +++ b/src/model/LoadingIndex.hpp @@ -31,7 +31,7 @@ namespace model { explicit LoadingIndex(const Model& model, double compressorSpeed, const Curve& evaporativeCapacityMultiplierFunctionofTemperatureCurve, const Curve& compressorPowerMultiplierFunctionofTemperatureCurve); - virtual ~LoadingIndex() = default; + virtual ~LoadingIndex() override = default; // Default the copy and move operators because the virtual dtor is explicit LoadingIndex(const LoadingIndex& other) = default; LoadingIndex(LoadingIndex&& other) = default; diff --git a/src/model/LoadingIndex_Impl.hpp b/src/model/LoadingIndex_Impl.hpp index b378d6ef122..a3ecfbcf1e6 100644 --- a/src/model/LoadingIndex_Impl.hpp +++ b/src/model/LoadingIndex_Impl.hpp @@ -29,7 +29,7 @@ namespace model { LoadingIndex_Impl(const LoadingIndex_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LoadingIndex_Impl() = default; + virtual ~LoadingIndex_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Loop.hpp b/src/model/Loop.hpp index 939845ffc7d..7b027fca835 100644 --- a/src/model/Loop.hpp +++ b/src/model/Loop.hpp @@ -97,7 +97,7 @@ waterCoolingCoil.addToSplitter( plantLoop.demandSplitter() ); class MODEL_API Loop : public ParentObject { public: - virtual ~Loop() = default; + virtual ~Loop() override = default; // Default the copy and move operators because the virtual dtor is explicit Loop(const Loop& other) = default; Loop(Loop&& other) = default; diff --git a/src/model/Loop_Impl.hpp b/src/model/Loop_Impl.hpp index f6c9b0e9c63..0d59abdda0a 100644 --- a/src/model/Loop_Impl.hpp +++ b/src/model/Loop_Impl.hpp @@ -38,7 +38,7 @@ namespace model { Loop_Impl(const Loop_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~Loop_Impl() = default; + virtual ~Loop_Impl() override = default; /** This pure virtual method is intended to be overriden by child classes (namely PlantLoop and AirLoopHVAC) to create the basic topology of the * loop, that is to create the supply/demand inlet/outlet nodes, splitters and mixers as appropriate */ diff --git a/src/model/Luminaire.hpp b/src/model/Luminaire.hpp index 73d8bad70fc..bb45e5fa0e5 100644 --- a/src/model/Luminaire.hpp +++ b/src/model/Luminaire.hpp @@ -35,7 +35,7 @@ namespace model { explicit Luminaire(const LuminaireDefinition& luminaireDefinition); - virtual ~Luminaire() = default; + virtual ~Luminaire() override = default; // Default the copy and move operators because the virtual dtor is explicit Luminaire(const Luminaire& other) = default; Luminaire(Luminaire&& other) = default; diff --git a/src/model/LuminaireDefinition.hpp b/src/model/LuminaireDefinition.hpp index e9092675127..88d7d3b0ae7 100644 --- a/src/model/LuminaireDefinition.hpp +++ b/src/model/LuminaireDefinition.hpp @@ -29,7 +29,7 @@ namespace model { explicit LuminaireDefinition(const Model& model); - virtual ~LuminaireDefinition() = default; + virtual ~LuminaireDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit LuminaireDefinition(const LuminaireDefinition& other) = default; LuminaireDefinition(LuminaireDefinition&& other) = default; diff --git a/src/model/LuminaireDefinition_Impl.hpp b/src/model/LuminaireDefinition_Impl.hpp index 01003a30c2e..5cd65bb699e 100644 --- a/src/model/LuminaireDefinition_Impl.hpp +++ b/src/model/LuminaireDefinition_Impl.hpp @@ -30,7 +30,7 @@ namespace model { LuminaireDefinition_Impl(const LuminaireDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~LuminaireDefinition_Impl() = default; + virtual ~LuminaireDefinition_Impl() override = default; //@} diff --git a/src/model/Luminaire_Impl.hpp b/src/model/Luminaire_Impl.hpp index cdb6683af2f..885853a89cc 100644 --- a/src/model/Luminaire_Impl.hpp +++ b/src/model/Luminaire_Impl.hpp @@ -36,7 +36,7 @@ namespace model { Luminaire_Impl(const Luminaire_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Luminaire_Impl() = default; + virtual ~Luminaire_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/MasslessOpaqueMaterial.cpp b/src/model/MasslessOpaqueMaterial.cpp index 02410efac6c..278843cef2a 100644 --- a/src/model/MasslessOpaqueMaterial.cpp +++ b/src/model/MasslessOpaqueMaterial.cpp @@ -405,21 +405,25 @@ namespace model { return getImpl()->roughness(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional MasslessOpaqueMaterial::thermalAbsorptance() const { OptionalDouble result = getImpl()->thermalAbsorptance(); return result; } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional MasslessOpaqueMaterial::solarAbsorptance() const { OptionalDouble result = getImpl()->solarAbsorptance(); return result; } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional MasslessOpaqueMaterial::visibleAbsorptance() const { OptionalDouble result = getImpl()->visibleAbsorptance(); return result; } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double MasslessOpaqueMaterial::thermalResistance() const { return getImpl()->thermalResistance(); } @@ -440,10 +444,12 @@ namespace model { return getImpl()->setRoughness(roughness); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool MasslessOpaqueMaterial::setThermalResistance(double thermalResistance) { return getImpl()->setThermalResistance(thermalResistance); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool MasslessOpaqueMaterial::setThermalAbsorptance(double thermalAbsorptance) { return getImpl()->setThermalAbsorptance(thermalAbsorptance); } diff --git a/src/model/MasslessOpaqueMaterial.hpp b/src/model/MasslessOpaqueMaterial.hpp index 9a149f5dea4..5cd79a29a0b 100644 --- a/src/model/MasslessOpaqueMaterial.hpp +++ b/src/model/MasslessOpaqueMaterial.hpp @@ -39,7 +39,7 @@ namespace model { explicit MasslessOpaqueMaterial(const Model& model, const std::string& roughness = "Smooth", double thermalResistance = 0.1); - virtual ~MasslessOpaqueMaterial() = default; + virtual ~MasslessOpaqueMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit MasslessOpaqueMaterial(const MasslessOpaqueMaterial& other) = default; MasslessOpaqueMaterial(MasslessOpaqueMaterial&& other) = default; diff --git a/src/model/MasslessOpaqueMaterial_Impl.hpp b/src/model/MasslessOpaqueMaterial_Impl.hpp index 578141ba093..2ad077754c5 100644 --- a/src/model/MasslessOpaqueMaterial_Impl.hpp +++ b/src/model/MasslessOpaqueMaterial_Impl.hpp @@ -28,7 +28,7 @@ namespace model { MasslessOpaqueMaterial_Impl(const MasslessOpaqueMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~MasslessOpaqueMaterial_Impl() = default; + virtual ~MasslessOpaqueMaterial_Impl() override = default; //@} diff --git a/src/model/Material.hpp b/src/model/Material.hpp index 136c5c01787..7a41db23bdc 100644 --- a/src/model/Material.hpp +++ b/src/model/Material.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~Material() = default; + virtual ~Material() override = default; // Default the copy and move operators because the virtual dtor is explicit Material(const Material& other) = default; Material(Material&& other) = default; diff --git a/src/model/MaterialPropertyGlazingSpectralData.hpp b/src/model/MaterialPropertyGlazingSpectralData.hpp index 3a5cb40a57a..369506e2716 100644 --- a/src/model/MaterialPropertyGlazingSpectralData.hpp +++ b/src/model/MaterialPropertyGlazingSpectralData.hpp @@ -44,7 +44,7 @@ namespace model { explicit MaterialPropertyGlazingSpectralData(const Model& model); - virtual ~MaterialPropertyGlazingSpectralData() = default; + virtual ~MaterialPropertyGlazingSpectralData() override = default; // Default the copy and move operators because the virtual dtor is explicit MaterialPropertyGlazingSpectralData(const MaterialPropertyGlazingSpectralData& other) = default; MaterialPropertyGlazingSpectralData(MaterialPropertyGlazingSpectralData&& other) = default; diff --git a/src/model/MaterialPropertyGlazingSpectralData_Impl.hpp b/src/model/MaterialPropertyGlazingSpectralData_Impl.hpp index 7eebaffe46f..4dfa20d07e5 100644 --- a/src/model/MaterialPropertyGlazingSpectralData_Impl.hpp +++ b/src/model/MaterialPropertyGlazingSpectralData_Impl.hpp @@ -30,7 +30,7 @@ namespace model { MaterialPropertyGlazingSpectralData_Impl(const MaterialPropertyGlazingSpectralData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~MaterialPropertyGlazingSpectralData_Impl() = default; + virtual ~MaterialPropertyGlazingSpectralData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/MaterialPropertyMoisturePenetrationDepthSettings.hpp b/src/model/MaterialPropertyMoisturePenetrationDepthSettings.hpp index 222966a3345..d39a5411081 100644 --- a/src/model/MaterialPropertyMoisturePenetrationDepthSettings.hpp +++ b/src/model/MaterialPropertyMoisturePenetrationDepthSettings.hpp @@ -40,7 +40,7 @@ namespace model { double moistureEquationCoefficientC, double moistureEquationCoefficientD, double coatingLayerThickness, double coatingLayerWaterVaporDiffusionResistanceFactor); - virtual ~MaterialPropertyMoisturePenetrationDepthSettings() = default; + virtual ~MaterialPropertyMoisturePenetrationDepthSettings() override = default; // Default the copy and move operators because the virtual dtor is explicit MaterialPropertyMoisturePenetrationDepthSettings(const MaterialPropertyMoisturePenetrationDepthSettings& other) = default; MaterialPropertyMoisturePenetrationDepthSettings(MaterialPropertyMoisturePenetrationDepthSettings&& other) = default; diff --git a/src/model/MaterialPropertyMoisturePenetrationDepthSettings_Impl.hpp b/src/model/MaterialPropertyMoisturePenetrationDepthSettings_Impl.hpp index 5e9b77affb1..489fa6f9e40 100644 --- a/src/model/MaterialPropertyMoisturePenetrationDepthSettings_Impl.hpp +++ b/src/model/MaterialPropertyMoisturePenetrationDepthSettings_Impl.hpp @@ -33,7 +33,7 @@ namespace model { MaterialPropertyMoisturePenetrationDepthSettings_Impl(const MaterialPropertyMoisturePenetrationDepthSettings_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~MaterialPropertyMoisturePenetrationDepthSettings_Impl() = default; + virtual ~MaterialPropertyMoisturePenetrationDepthSettings_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/MaterialPropertyPhaseChange.hpp b/src/model/MaterialPropertyPhaseChange.hpp index 68c57f50034..218e2122a7e 100644 --- a/src/model/MaterialPropertyPhaseChange.hpp +++ b/src/model/MaterialPropertyPhaseChange.hpp @@ -56,7 +56,7 @@ namespace model { explicit MaterialPropertyPhaseChange(MasslessOpaqueMaterial& material, const std::vector& temperatureEnthalpys); - virtual ~MaterialPropertyPhaseChange() = default; + virtual ~MaterialPropertyPhaseChange() override = default; //@} diff --git a/src/model/MaterialPropertyPhaseChangeHysteresis.hpp b/src/model/MaterialPropertyPhaseChangeHysteresis.hpp index b6b46c4e503..34b03df0179 100644 --- a/src/model/MaterialPropertyPhaseChangeHysteresis.hpp +++ b/src/model/MaterialPropertyPhaseChangeHysteresis.hpp @@ -34,7 +34,7 @@ namespace model { explicit MaterialPropertyPhaseChangeHysteresis(MasslessOpaqueMaterial& material); - virtual ~MaterialPropertyPhaseChangeHysteresis() = default; + virtual ~MaterialPropertyPhaseChangeHysteresis() override = default; //@} diff --git a/src/model/MaterialPropertyPhaseChangeHysteresis_Impl.hpp b/src/model/MaterialPropertyPhaseChangeHysteresis_Impl.hpp index 55f9766b782..11146291edf 100644 --- a/src/model/MaterialPropertyPhaseChangeHysteresis_Impl.hpp +++ b/src/model/MaterialPropertyPhaseChangeHysteresis_Impl.hpp @@ -31,7 +31,7 @@ namespace model { MaterialPropertyPhaseChangeHysteresis_Impl(const MaterialPropertyPhaseChangeHysteresis_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~MaterialPropertyPhaseChangeHysteresis_Impl() = default; + virtual ~MaterialPropertyPhaseChangeHysteresis_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/MaterialPropertyPhaseChange_Impl.hpp b/src/model/MaterialPropertyPhaseChange_Impl.hpp index 1def2d37dba..e18bec20ef9 100644 --- a/src/model/MaterialPropertyPhaseChange_Impl.hpp +++ b/src/model/MaterialPropertyPhaseChange_Impl.hpp @@ -32,7 +32,7 @@ namespace model { MaterialPropertyPhaseChange_Impl(const MaterialPropertyPhaseChange_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~MaterialPropertyPhaseChange_Impl() = default; + virtual ~MaterialPropertyPhaseChange_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Material_Impl.hpp b/src/model/Material_Impl.hpp index 409a5b8dd7e..070daf90728 100644 --- a/src/model/Material_Impl.hpp +++ b/src/model/Material_Impl.hpp @@ -34,7 +34,7 @@ namespace model { // Clone copy constructor. Material_Impl(const Material_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Material_Impl() = default; + virtual ~Material_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/MeterCustom.hpp b/src/model/MeterCustom.hpp index 3c374600139..fea1a75a963 100644 --- a/src/model/MeterCustom.hpp +++ b/src/model/MeterCustom.hpp @@ -33,7 +33,7 @@ namespace model { // Constructs a new MeterCustom object in the model. explicit MeterCustom(const Model& model); - virtual ~MeterCustom() = default; + virtual ~MeterCustom() override = default; // Default the copy and move operators because the virtual dtor is explicit MeterCustom(const MeterCustom& other) = default; MeterCustom(MeterCustom&& other) = default; diff --git a/src/model/MeterCustomDecrement.hpp b/src/model/MeterCustomDecrement.hpp index 1d5d8fb5968..9e740db69e8 100644 --- a/src/model/MeterCustomDecrement.hpp +++ b/src/model/MeterCustomDecrement.hpp @@ -33,7 +33,7 @@ namespace model { // Constructs a new MeterCustomDecrement object in the model. explicit MeterCustomDecrement(const Model& model, const std::string& sourceMeterName); - virtual ~MeterCustomDecrement() = default; + virtual ~MeterCustomDecrement() override = default; // Default the copy and move operators because the virtual dtor is explicit MeterCustomDecrement(const MeterCustomDecrement& other) = default; MeterCustomDecrement(MeterCustomDecrement&& other) = default; diff --git a/src/model/MeterCustomDecrement_Impl.hpp b/src/model/MeterCustomDecrement_Impl.hpp index 06e4dc423d5..3a5fb2e650d 100644 --- a/src/model/MeterCustomDecrement_Impl.hpp +++ b/src/model/MeterCustomDecrement_Impl.hpp @@ -35,7 +35,7 @@ namespace model { MeterCustomDecrement_Impl(const MeterCustomDecrement_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~MeterCustomDecrement_Impl() = default; + virtual ~MeterCustomDecrement_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/MeterCustom_Impl.hpp b/src/model/MeterCustom_Impl.hpp index 7237e21c057..8fb467c739c 100644 --- a/src/model/MeterCustom_Impl.hpp +++ b/src/model/MeterCustom_Impl.hpp @@ -35,7 +35,7 @@ namespace model { MeterCustom_Impl(const MeterCustom_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~MeterCustom_Impl() = default; + virtual ~MeterCustom_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Mixer.cpp b/src/model/Mixer.cpp index 82bdd5a774c..7fd25996f36 100644 --- a/src/model/Mixer.cpp +++ b/src/model/Mixer.cpp @@ -60,7 +60,7 @@ namespace model { return inletPort(branchIndex++); } - unsigned Mixer_Impl::branchIndexForInletModelObject(ModelObject modelObject) const { + unsigned Mixer_Impl::branchIndexForInletModelObject(const ModelObject& modelObject) const { unsigned stop = nextBranchIndex(); for (unsigned i = 0; i < stop; i++) { @@ -160,7 +160,7 @@ namespace model { return getImpl()->newInletPortAfterBranch(branchIndex); } - unsigned Mixer::branchIndexForInletModelObject(ModelObject modelObject) const { + unsigned Mixer::branchIndexForInletModelObject(const ModelObject& modelObject) const { return getImpl()->branchIndexForInletModelObject(modelObject); } @@ -172,10 +172,6 @@ namespace model { return getImpl()->removePortForBranch(branchIndex); } - bool Mixer::isRemovable() const { - return getImpl()->isRemovable(); - } - } // namespace model } // namespace openstudio diff --git a/src/model/Mixer.hpp b/src/model/Mixer.hpp index b35a0953d25..a762009b387 100644 --- a/src/model/Mixer.hpp +++ b/src/model/Mixer.hpp @@ -20,7 +20,7 @@ namespace model { class MODEL_API Mixer : public HVACComponent { public: - virtual ~Mixer() = default; + virtual ~Mixer() override = default; // Default the copy and move operators because the virtual dtor is explicit Mixer(const Mixer& other) = default; Mixer(Mixer&& other) = default; @@ -66,7 +66,7 @@ namespace model { /** Returns the branch index for the ModelObject specified by modelObject. * The specified object must be connected to an inlet port of the mixer. */ - virtual unsigned branchIndexForInletModelObject(ModelObject modelObject) const; + virtual unsigned branchIndexForInletModelObject(const ModelObject& modelObject) const; /** Returns the index of the next available branch */ virtual unsigned nextBranchIndex() const; @@ -78,8 +78,6 @@ namespace model { */ virtual void removePortForBranch(unsigned branchIndex); - bool isRemovable() const; - protected: Mixer(IddObjectType type, const Model& model); diff --git a/src/model/Mixer_Impl.hpp b/src/model/Mixer_Impl.hpp index 5665c68310e..283e1c09c0e 100644 --- a/src/model/Mixer_Impl.hpp +++ b/src/model/Mixer_Impl.hpp @@ -25,7 +25,7 @@ namespace model { Mixer_Impl(const Mixer_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~Mixer_Impl() = default; + virtual ~Mixer_Impl() override = default; virtual unsigned outletPort() const = 0; @@ -43,7 +43,7 @@ namespace model { virtual unsigned newInletPortAfterBranch(unsigned branchIndex); - virtual unsigned branchIndexForInletModelObject(ModelObject modelObject) const; + virtual unsigned branchIndexForInletModelObject(const ModelObject& modelObject) const; virtual unsigned nextBranchIndex() const; diff --git a/src/model/Model.hpp b/src/model/Model.hpp index 962082bb174..9732ac54fb8 100644 --- a/src/model/Model.hpp +++ b/src/model/Model.hpp @@ -115,7 +115,7 @@ namespace model { * Any unwrapped IDD types will be wrapped with GenericModelObject. */ explicit Model(const openstudio::Workspace& workspace); - virtual ~Model() = default; + virtual ~Model() override = default; // Default the copy and move operators because the virtual dtor is explicit Model(const Model& other) = default; Model(Model&& other) = default; diff --git a/src/model/ModelExtensibleGroup.hpp b/src/model/ModelExtensibleGroup.hpp index 3ed3230b693..93e5e84147b 100644 --- a/src/model/ModelExtensibleGroup.hpp +++ b/src/model/ModelExtensibleGroup.hpp @@ -29,7 +29,7 @@ namespace model { class MODEL_API ModelExtensibleGroup : public WorkspaceExtensibleGroup { public: - virtual ~ModelExtensibleGroup() = default; + virtual ~ModelExtensibleGroup() override = default; // Default the copy and move operators because the virtual dtor is explicit ModelExtensibleGroup(const ModelExtensibleGroup& other) = default; ModelExtensibleGroup(ModelExtensibleGroup&& other) = default; diff --git a/src/model/ModelObject.hpp b/src/model/ModelObject.hpp index 70855e00d9f..ba3d195649a 100644 --- a/src/model/ModelObject.hpp +++ b/src/model/ModelObject.hpp @@ -63,7 +63,7 @@ namespace model { public: /** @name Constructors and Destructors */ //@{ - virtual ~ModelObject() = default; + virtual ~ModelObject() override = default; // Default the copy and move operators because the virtual dtor is explicit ModelObject(const ModelObject& other) = default; ModelObject(ModelObject&& other) = default; diff --git a/src/model/ModelObjectList.hpp b/src/model/ModelObjectList.hpp index e6aa51abd34..905fe18c5a4 100644 --- a/src/model/ModelObjectList.hpp +++ b/src/model/ModelObjectList.hpp @@ -27,7 +27,7 @@ namespace model { explicit ModelObjectList(const Model& model); - virtual ~ModelObjectList() = default; + virtual ~ModelObjectList() override = default; // Default the copy and move operators because the virtual dtor is explicit ModelObjectList(const ModelObjectList& other) = default; ModelObjectList(ModelObjectList&& other) = default; diff --git a/src/model/ModelObjectList_Impl.hpp b/src/model/ModelObjectList_Impl.hpp index f020e330831..69ee7f55be9 100644 --- a/src/model/ModelObjectList_Impl.hpp +++ b/src/model/ModelObjectList_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ModelObjectList_Impl(const ModelObjectList_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ModelObjectList_Impl() = default; + virtual ~ModelObjectList_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ModelObject_Impl.hpp b/src/model/ModelObject_Impl.hpp index 4827771a05e..7431e47fe73 100644 --- a/src/model/ModelObject_Impl.hpp +++ b/src/model/ModelObject_Impl.hpp @@ -69,7 +69,7 @@ namespace model { * new handle is assigned, and it is placed in model. */ virtual ModelObject clone(Model model) const; - virtual ~ModelObject_Impl() = default; + virtual ~ModelObject_Impl() override = default; /// remove the object from the model, also removes any cost objects associated with this object /// return std::vector containing any removed object(s) diff --git a/src/model/ModelPartitionMaterial.hpp b/src/model/ModelPartitionMaterial.hpp index 8ccaccf3257..73a6d0f6ba6 100644 --- a/src/model/ModelPartitionMaterial.hpp +++ b/src/model/ModelPartitionMaterial.hpp @@ -28,7 +28,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ModelPartitionMaterial() = default; + virtual ~ModelPartitionMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit ModelPartitionMaterial(const ModelPartitionMaterial& other) = default; ModelPartitionMaterial(ModelPartitionMaterial&& other) = default; diff --git a/src/model/ModelPartitionMaterial_Impl.hpp b/src/model/ModelPartitionMaterial_Impl.hpp index b0dadf50097..e3d8f2c46af 100644 --- a/src/model/ModelPartitionMaterial_Impl.hpp +++ b/src/model/ModelPartitionMaterial_Impl.hpp @@ -32,7 +32,7 @@ namespace model { // Clone copy constructor. ModelPartitionMaterial_Impl(const ModelPartitionMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ModelPartitionMaterial_Impl() = default; + virtual ~ModelPartitionMaterial_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/Model_Impl.hpp b/src/model/Model_Impl.hpp index 5b8e2483afe..bb0ab20adbf 100644 --- a/src/model/Model_Impl.hpp +++ b/src/model/Model_Impl.hpp @@ -129,7 +129,7 @@ namespace model { /** Swaps underlying data between this workspace and other. */ virtual void swap(Workspace& other) override; - virtual ~Model_Impl() = default; + virtual ~Model_Impl() override = default; /** Creates ComponentWatchers for each ComponentData object. Should be called as part of * construction from IdfFile or Workspace. */ diff --git a/src/model/Node.cpp b/src/model/Node.cpp index 796d0f77b5e..4604bc6d202 100644 --- a/src/model/Node.cpp +++ b/src/model/Node.cpp @@ -247,28 +247,12 @@ namespace model { OS_ASSERT(getImpl()); } - Node::Node(std::shared_ptr p) : StraightComponent(std::move(p)) {} + Node::Node(std::shared_ptr impl) : StraightComponent(std::move(impl)) {} std::vector Node::setpointManagers() const { return getImpl()->setpointManagers(); } - bool Node::addToNode(Node& node) { - return getImpl()->addToNode(node); - } - - bool Node::isRemovable() const { - return getImpl()->isRemovable(); - } - - std::vector Node::remove() { - return getImpl()->remove(); - } - - ModelObject Node::clone(Model model) const { - return getImpl()->clone(model); - } - IddObjectType Node::iddObjectType() { IddObjectType result(IddObjectType::OS_Node); return result; diff --git a/src/model/Node.hpp b/src/model/Node.hpp index f07c79aaa81..1914b3aa82c 100644 --- a/src/model/Node.hpp +++ b/src/model/Node.hpp @@ -47,7 +47,7 @@ namespace model { */ explicit Node(const Model& model); - virtual ~Node() = default; + virtual ~Node() override = default; // Default the copy and move operators because the virtual dtor is explicit Node(const Node& other) = default; Node(Node&& other) = default; @@ -56,14 +56,6 @@ namespace model { std::vector setpointManagers() const; - bool addToNode(Node& node); - - ModelObject clone(Model model) const; - - bool isRemovable() const; - - std::vector remove(); - static IddObjectType iddObjectType(); AirflowNetworkDistributionNode getAirflowNetworkDistributionNode(); diff --git a/src/model/Node_Impl.hpp b/src/model/Node_Impl.hpp index 7421eb46a93..b8a5112d28f 100644 --- a/src/model/Node_Impl.hpp +++ b/src/model/Node_Impl.hpp @@ -37,7 +37,7 @@ namespace model { Node_Impl(const Node_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~Node_Impl() = default; + virtual ~Node_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/OpaqueMaterial.hpp b/src/model/OpaqueMaterial.hpp index 3e3703a60f7..0643bf27848 100644 --- a/src/model/OpaqueMaterial.hpp +++ b/src/model/OpaqueMaterial.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OpaqueMaterial() = default; + virtual ~OpaqueMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit OpaqueMaterial(const OpaqueMaterial& other) = default; OpaqueMaterial(OpaqueMaterial&& other) = default; diff --git a/src/model/OpaqueMaterial_Impl.hpp b/src/model/OpaqueMaterial_Impl.hpp index 5c1b9d96548..a8ef61122c4 100644 --- a/src/model/OpaqueMaterial_Impl.hpp +++ b/src/model/OpaqueMaterial_Impl.hpp @@ -30,7 +30,7 @@ namespace model { // Clone copy constructor. OpaqueMaterial_Impl(const OpaqueMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OpaqueMaterial_Impl() = default; + virtual ~OpaqueMaterial_Impl() override = default; /** @name Getters */ //@{ diff --git a/src/model/OtherEquipment.cpp b/src/model/OtherEquipment.cpp index 74c24b6c0fd..f37ace7a58d 100644 --- a/src/model/OtherEquipment.cpp +++ b/src/model/OtherEquipment.cpp @@ -19,15 +19,14 @@ #include "LifeCycleCost.hpp" #include "Model.hpp" +#include "../utilities/core/Assert.hpp" +#include "../utilities/core/Compare.hpp" #include "../utilities/data/DataEnums.hpp" #include #include #include -#include "../utilities/core/Assert.hpp" -#include "utilities/core/Compare.hpp" - namespace openstudio { namespace model { diff --git a/src/model/OtherEquipment.hpp b/src/model/OtherEquipment.hpp index a7ab7240cd2..5723846d01c 100644 --- a/src/model/OtherEquipment.hpp +++ b/src/model/OtherEquipment.hpp @@ -34,7 +34,7 @@ namespace model { explicit OtherEquipment(const OtherEquipmentDefinition& definition); - virtual ~OtherEquipment() = default; + virtual ~OtherEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit OtherEquipment(const OtherEquipment& other) = default; OtherEquipment(OtherEquipment&& other) = default; diff --git a/src/model/OtherEquipmentDefinition.hpp b/src/model/OtherEquipmentDefinition.hpp index ca2c6727a5e..a88b33b4f02 100644 --- a/src/model/OtherEquipmentDefinition.hpp +++ b/src/model/OtherEquipmentDefinition.hpp @@ -33,7 +33,7 @@ namespace model { explicit OtherEquipmentDefinition(const Model& model); - virtual ~OtherEquipmentDefinition() = default; + virtual ~OtherEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit OtherEquipmentDefinition(const OtherEquipmentDefinition& other) = default; OtherEquipmentDefinition(OtherEquipmentDefinition&& other) = default; diff --git a/src/model/OtherEquipmentDefinition_Impl.hpp b/src/model/OtherEquipmentDefinition_Impl.hpp index 7b430447522..caa89d6cd44 100644 --- a/src/model/OtherEquipmentDefinition_Impl.hpp +++ b/src/model/OtherEquipmentDefinition_Impl.hpp @@ -28,7 +28,7 @@ namespace model { OtherEquipmentDefinition_Impl(const OtherEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OtherEquipmentDefinition_Impl() = default; + virtual ~OtherEquipmentDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OtherEquipment_Impl.hpp b/src/model/OtherEquipment_Impl.hpp index 533748522fa..f1ce7eb6022 100644 --- a/src/model/OtherEquipment_Impl.hpp +++ b/src/model/OtherEquipment_Impl.hpp @@ -33,7 +33,7 @@ namespace model { OtherEquipment_Impl(const OtherEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OtherEquipment_Impl() = default; + virtual ~OtherEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputConstructions.hpp b/src/model/OutputConstructions.hpp index 5351de9e7ab..ac78c73d70d 100644 --- a/src/model/OutputConstructions.hpp +++ b/src/model/OutputConstructions.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputConstructions() = default; + virtual ~OutputConstructions() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputConstructions(const OutputConstructions& other) = default; OutputConstructions(OutputConstructions&& other) = default; diff --git a/src/model/OutputConstructions_Impl.hpp b/src/model/OutputConstructions_Impl.hpp index 2b77527b2e3..bfc1f982676 100644 --- a/src/model/OutputConstructions_Impl.hpp +++ b/src/model/OutputConstructions_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputConstructions_Impl(const OutputConstructions_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputConstructions_Impl() = default; + virtual ~OutputConstructions_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputControlFiles.hpp b/src/model/OutputControlFiles.hpp index 131970f42ba..42559f76ab9 100644 --- a/src/model/OutputControlFiles.hpp +++ b/src/model/OutputControlFiles.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputControlFiles() = default; + virtual ~OutputControlFiles() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputControlFiles(const OutputControlFiles& other) = default; OutputControlFiles(OutputControlFiles&& other) = default; diff --git a/src/model/OutputControlFiles_Impl.hpp b/src/model/OutputControlFiles_Impl.hpp index 0f0991b1c51..de721d9b0ab 100644 --- a/src/model/OutputControlFiles_Impl.hpp +++ b/src/model/OutputControlFiles_Impl.hpp @@ -28,7 +28,7 @@ namespace model { OutputControlFiles_Impl(const OutputControlFiles_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputControlFiles_Impl() = default; + virtual ~OutputControlFiles_Impl() override = default; //@} diff --git a/src/model/OutputControlReportingTolerances.hpp b/src/model/OutputControlReportingTolerances.hpp index 15216511f96..7f91be4ac94 100644 --- a/src/model/OutputControlReportingTolerances.hpp +++ b/src/model/OutputControlReportingTolerances.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputControlReportingTolerances() = default; + virtual ~OutputControlReportingTolerances() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputControlReportingTolerances(const OutputControlReportingTolerances& other) = default; OutputControlReportingTolerances(OutputControlReportingTolerances&& other) = default; diff --git a/src/model/OutputControlReportingTolerances_Impl.hpp b/src/model/OutputControlReportingTolerances_Impl.hpp index aa1723da7c6..3e66a65b906 100644 --- a/src/model/OutputControlReportingTolerances_Impl.hpp +++ b/src/model/OutputControlReportingTolerances_Impl.hpp @@ -28,7 +28,7 @@ namespace model { OutputControlReportingTolerances_Impl(const OutputControlReportingTolerances_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputControlReportingTolerances_Impl() = default; + virtual ~OutputControlReportingTolerances_Impl() override = default; //@} diff --git a/src/model/OutputControlTableStyle.hpp b/src/model/OutputControlTableStyle.hpp index cb479a1c863..2037b53805b 100644 --- a/src/model/OutputControlTableStyle.hpp +++ b/src/model/OutputControlTableStyle.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputControlTableStyle() = default; + virtual ~OutputControlTableStyle() override = default; //@} diff --git a/src/model/OutputControlTableStyle_Impl.hpp b/src/model/OutputControlTableStyle_Impl.hpp index d2da911dc19..39509772c7b 100644 --- a/src/model/OutputControlTableStyle_Impl.hpp +++ b/src/model/OutputControlTableStyle_Impl.hpp @@ -28,7 +28,7 @@ namespace model { OutputControlTableStyle_Impl(const OutputControlTableStyle_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputControlTableStyle_Impl() = default; + virtual ~OutputControlTableStyle_Impl() override = default; //@} diff --git a/src/model/OutputControlTimestamp.hpp b/src/model/OutputControlTimestamp.hpp index 0e267293dc1..4a92d924b52 100644 --- a/src/model/OutputControlTimestamp.hpp +++ b/src/model/OutputControlTimestamp.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputControlTimestamp() = default; + virtual ~OutputControlTimestamp() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputControlTimestamp(const OutputControlTimestamp& other) = default; OutputControlTimestamp(OutputControlTimestamp&& other) = default; diff --git a/src/model/OutputControlTimestamp_Impl.hpp b/src/model/OutputControlTimestamp_Impl.hpp index ccbcf797b42..84a84491116 100644 --- a/src/model/OutputControlTimestamp_Impl.hpp +++ b/src/model/OutputControlTimestamp_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputControlTimestamp_Impl(const OutputControlTimestamp_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputControlTimestamp_Impl() = default; + virtual ~OutputControlTimestamp_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputDebuggingData.hpp b/src/model/OutputDebuggingData.hpp index dd9971815dc..88978a517b8 100644 --- a/src/model/OutputDebuggingData.hpp +++ b/src/model/OutputDebuggingData.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputDebuggingData() = default; + virtual ~OutputDebuggingData() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputDebuggingData(const OutputDebuggingData& other) = default; OutputDebuggingData(OutputDebuggingData&& other) = default; diff --git a/src/model/OutputDebuggingData_Impl.hpp b/src/model/OutputDebuggingData_Impl.hpp index d7369b86213..27b7f8d143c 100644 --- a/src/model/OutputDebuggingData_Impl.hpp +++ b/src/model/OutputDebuggingData_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputDebuggingData_Impl(const OutputDebuggingData_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputDebuggingData_Impl() = default; + virtual ~OutputDebuggingData_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputDiagnostics.hpp b/src/model/OutputDiagnostics.hpp index 45a73638faf..cc0bfb5b81f 100644 --- a/src/model/OutputDiagnostics.hpp +++ b/src/model/OutputDiagnostics.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputDiagnostics() = default; + virtual ~OutputDiagnostics() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputDiagnostics(const OutputDiagnostics& other) = default; OutputDiagnostics(OutputDiagnostics&& other) = default; diff --git a/src/model/OutputDiagnostics_Impl.hpp b/src/model/OutputDiagnostics_Impl.hpp index c8f6d2a1bbf..776cb2ebfe3 100644 --- a/src/model/OutputDiagnostics_Impl.hpp +++ b/src/model/OutputDiagnostics_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputDiagnostics_Impl(const OutputDiagnostics_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputDiagnostics_Impl() = default; + virtual ~OutputDiagnostics_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputEnergyManagementSystem.hpp b/src/model/OutputEnergyManagementSystem.hpp index 228391558ad..9b3c0a15b22 100644 --- a/src/model/OutputEnergyManagementSystem.hpp +++ b/src/model/OutputEnergyManagementSystem.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputEnergyManagementSystem() = default; + virtual ~OutputEnergyManagementSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputEnergyManagementSystem(const OutputEnergyManagementSystem& other) = default; OutputEnergyManagementSystem(OutputEnergyManagementSystem&& other) = default; diff --git a/src/model/OutputEnergyManagementSystem_Impl.hpp b/src/model/OutputEnergyManagementSystem_Impl.hpp index c68b4451dae..ca5774e8826 100644 --- a/src/model/OutputEnergyManagementSystem_Impl.hpp +++ b/src/model/OutputEnergyManagementSystem_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputEnergyManagementSystem_Impl(const OutputEnergyManagementSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputEnergyManagementSystem_Impl() = default; + virtual ~OutputEnergyManagementSystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputEnvironmentalImpactFactors.hpp b/src/model/OutputEnvironmentalImpactFactors.hpp index eccd829f7e2..6cf1abd2478 100644 --- a/src/model/OutputEnvironmentalImpactFactors.hpp +++ b/src/model/OutputEnvironmentalImpactFactors.hpp @@ -27,7 +27,7 @@ namespace model { explicit OutputEnvironmentalImpactFactors(const Model& model); - virtual ~OutputEnvironmentalImpactFactors() = default; + virtual ~OutputEnvironmentalImpactFactors() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputEnvironmentalImpactFactors(const OutputEnvironmentalImpactFactors& other) = default; OutputEnvironmentalImpactFactors(OutputEnvironmentalImpactFactors&& other) = default; diff --git a/src/model/OutputEnvironmentalImpactFactors_Impl.hpp b/src/model/OutputEnvironmentalImpactFactors_Impl.hpp index 219ddc41cc5..8e655ea1e30 100644 --- a/src/model/OutputEnvironmentalImpactFactors_Impl.hpp +++ b/src/model/OutputEnvironmentalImpactFactors_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputEnvironmentalImpactFactors_Impl(const OutputEnvironmentalImpactFactors_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputEnvironmentalImpactFactors_Impl() = default; + virtual ~OutputEnvironmentalImpactFactors_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputJSON.hpp b/src/model/OutputJSON.hpp index 24320aa011d..c7aada2eebc 100644 --- a/src/model/OutputJSON.hpp +++ b/src/model/OutputJSON.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputJSON() = default; + virtual ~OutputJSON() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputJSON(const OutputJSON& other) = default; OutputJSON(OutputJSON&& other) = default; diff --git a/src/model/OutputJSON_Impl.hpp b/src/model/OutputJSON_Impl.hpp index 81dfbf2f9b4..a7a42d9a793 100644 --- a/src/model/OutputJSON_Impl.hpp +++ b/src/model/OutputJSON_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputJSON_Impl(const OutputJSON_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputJSON_Impl() = default; + virtual ~OutputJSON_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputMeter.hpp b/src/model/OutputMeter.hpp index a730918a6f9..d21bc449881 100644 --- a/src/model/OutputMeter.hpp +++ b/src/model/OutputMeter.hpp @@ -42,7 +42,7 @@ namespace model { explicit OutputMeter(const Model& model); - virtual ~OutputMeter() = default; + virtual ~OutputMeter() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputMeter(const OutputMeter& other) = default; OutputMeter(OutputMeter&& other) = default; diff --git a/src/model/OutputMeter_Impl.hpp b/src/model/OutputMeter_Impl.hpp index 49dd430436e..7098e64c0df 100644 --- a/src/model/OutputMeter_Impl.hpp +++ b/src/model/OutputMeter_Impl.hpp @@ -39,7 +39,7 @@ namespace model { OutputMeter_Impl(const OutputMeter_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputMeter_Impl() = default; + virtual ~OutputMeter_Impl() override = default; //@} diff --git a/src/model/OutputSQLite.hpp b/src/model/OutputSQLite.hpp index 10f0e56c56f..ce588d9d73b 100644 --- a/src/model/OutputSQLite.hpp +++ b/src/model/OutputSQLite.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputSQLite() = default; + virtual ~OutputSQLite() override = default; //@} diff --git a/src/model/OutputSQLite_Impl.hpp b/src/model/OutputSQLite_Impl.hpp index 4176157c174..385cfb1e3d5 100644 --- a/src/model/OutputSQLite_Impl.hpp +++ b/src/model/OutputSQLite_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputSQLite_Impl(const OutputSQLite_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputSQLite_Impl() = default; + virtual ~OutputSQLite_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputSchedules.hpp b/src/model/OutputSchedules.hpp index 99d85374a3b..27e47d84619 100644 --- a/src/model/OutputSchedules.hpp +++ b/src/model/OutputSchedules.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputSchedules() = default; + virtual ~OutputSchedules() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputSchedules(const OutputSchedules& other) = default; OutputSchedules(OutputSchedules&& other) = default; diff --git a/src/model/OutputSchedules_Impl.hpp b/src/model/OutputSchedules_Impl.hpp index b03a035f4e6..a2e8d3ed60b 100644 --- a/src/model/OutputSchedules_Impl.hpp +++ b/src/model/OutputSchedules_Impl.hpp @@ -27,7 +27,7 @@ namespace model { OutputSchedules_Impl(const OutputSchedules_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputSchedules_Impl() = default; + virtual ~OutputSchedules_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputTableSummaryReports.hpp b/src/model/OutputTableSummaryReports.hpp index 7b0eeaa00e7..e11d7315320 100644 --- a/src/model/OutputTableSummaryReports.hpp +++ b/src/model/OutputTableSummaryReports.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~OutputTableSummaryReports() = default; + virtual ~OutputTableSummaryReports() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputTableSummaryReports(const OutputTableSummaryReports& other) = default; OutputTableSummaryReports(OutputTableSummaryReports&& other) = default; diff --git a/src/model/OutputTableSummaryReports_Impl.hpp b/src/model/OutputTableSummaryReports_Impl.hpp index cdbf26967a3..593a07423d9 100644 --- a/src/model/OutputTableSummaryReports_Impl.hpp +++ b/src/model/OutputTableSummaryReports_Impl.hpp @@ -29,7 +29,7 @@ namespace model { OutputTableSummaryReports_Impl(const OutputTableSummaryReports_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~OutputTableSummaryReports_Impl() = default; + virtual ~OutputTableSummaryReports_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutputVariable.hpp b/src/model/OutputVariable.hpp index fbddf302c22..e295f6f17bf 100644 --- a/src/model/OutputVariable.hpp +++ b/src/model/OutputVariable.hpp @@ -35,7 +35,7 @@ namespace model { class MODEL_API OutputVariable : public ModelObject { public: - virtual ~OutputVariable() = default; + virtual ~OutputVariable() override = default; // Default the copy and move operators because the virtual dtor is explicit OutputVariable(const OutputVariable& other) = default; OutputVariable(OutputVariable&& other) = default; diff --git a/src/model/OutputVariable_Impl.hpp b/src/model/OutputVariable_Impl.hpp index 1f02364327a..a3466788575 100644 --- a/src/model/OutputVariable_Impl.hpp +++ b/src/model/OutputVariable_Impl.hpp @@ -35,7 +35,7 @@ namespace model { OutputVariable_Impl(const OutputVariable_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~OutputVariable_Impl() = default; + virtual ~OutputVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/OutsideSurfaceConvectionAlgorithm.hpp b/src/model/OutsideSurfaceConvectionAlgorithm.hpp index 7522a081d73..cf7c091bcaa 100644 --- a/src/model/OutsideSurfaceConvectionAlgorithm.hpp +++ b/src/model/OutsideSurfaceConvectionAlgorithm.hpp @@ -27,7 +27,7 @@ namespace model { class MODEL_API OutsideSurfaceConvectionAlgorithm : public ModelObject { public: - virtual ~OutsideSurfaceConvectionAlgorithm() = default; + virtual ~OutsideSurfaceConvectionAlgorithm() override = default; // Default the copy and move operators because the virtual dtor is explicit OutsideSurfaceConvectionAlgorithm(const OutsideSurfaceConvectionAlgorithm& other) = default; OutsideSurfaceConvectionAlgorithm(OutsideSurfaceConvectionAlgorithm&& other) = default; diff --git a/src/model/OutsideSurfaceConvectionAlgorithm_Impl.hpp b/src/model/OutsideSurfaceConvectionAlgorithm_Impl.hpp index d0c2f8f646c..98a12f1ca0e 100644 --- a/src/model/OutsideSurfaceConvectionAlgorithm_Impl.hpp +++ b/src/model/OutsideSurfaceConvectionAlgorithm_Impl.hpp @@ -30,7 +30,7 @@ namespace model { OutsideSurfaceConvectionAlgorithm_Impl(const OutsideSurfaceConvectionAlgorithm_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~OutsideSurfaceConvectionAlgorithm_Impl() = default; + virtual ~OutsideSurfaceConvectionAlgorithm_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ParentObject.hpp b/src/model/ParentObject.hpp index 4e33aa6053a..471b9ecd33c 100644 --- a/src/model/ParentObject.hpp +++ b/src/model/ParentObject.hpp @@ -24,7 +24,7 @@ namespace model { class MODEL_API ParentObject : public ModelObject { public: - virtual ~ParentObject() = default; + virtual ~ParentObject() override = default; // Default the copy and move operators because the virtual dtor is explicit ParentObject(const ParentObject& other) = default; ParentObject(ParentObject&& other) = default; diff --git a/src/model/ParentObject_Impl.hpp b/src/model/ParentObject_Impl.hpp index 838688f068c..92af3c5c17b 100644 --- a/src/model/ParentObject_Impl.hpp +++ b/src/model/ParentObject_Impl.hpp @@ -28,7 +28,7 @@ namespace model { // clone copy constructor ParentObject_Impl(const ParentObject_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ParentObject_Impl() = default; + virtual ~ParentObject_Impl() override = default; /// return direct child objects in the hierarchy virtual std::vector children() const; diff --git a/src/model/People.hpp b/src/model/People.hpp index 0a92bfeb6ff..3f950b41187 100644 --- a/src/model/People.hpp +++ b/src/model/People.hpp @@ -32,7 +32,7 @@ namespace model { explicit People(const PeopleDefinition& peopleDefinition); - virtual ~People() = default; + virtual ~People() override = default; // Default the copy and move operators because the virtual dtor is explicit People(const People& other) = default; People(People&& other) = default; diff --git a/src/model/PeopleDefinition.hpp b/src/model/PeopleDefinition.hpp index d0613cc0bd4..22a06447b6d 100644 --- a/src/model/PeopleDefinition.hpp +++ b/src/model/PeopleDefinition.hpp @@ -30,7 +30,7 @@ namespace model { explicit PeopleDefinition(const Model& model); - virtual ~PeopleDefinition() = default; + virtual ~PeopleDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit PeopleDefinition(const PeopleDefinition& other) = default; PeopleDefinition(PeopleDefinition&& other) = default; diff --git a/src/model/PeopleDefinition_Impl.hpp b/src/model/PeopleDefinition_Impl.hpp index 503c1046893..216d5dfdf98 100644 --- a/src/model/PeopleDefinition_Impl.hpp +++ b/src/model/PeopleDefinition_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PeopleDefinition_Impl(const PeopleDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PeopleDefinition_Impl() = default; + virtual ~PeopleDefinition_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/People_Impl.hpp b/src/model/People_Impl.hpp index e3751845260..dac316e1b69 100644 --- a/src/model/People_Impl.hpp +++ b/src/model/People_Impl.hpp @@ -31,7 +31,7 @@ namespace model { People_Impl(const People_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~People_Impl() = default; + virtual ~People_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PerformancePrecisionTradeoffs.hpp b/src/model/PerformancePrecisionTradeoffs.hpp index 3f827715725..7d83553059e 100644 --- a/src/model/PerformancePrecisionTradeoffs.hpp +++ b/src/model/PerformancePrecisionTradeoffs.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~PerformancePrecisionTradeoffs() = default; + virtual ~PerformancePrecisionTradeoffs() override = default; // Default the copy and move operators because the virtual dtor is explicit PerformancePrecisionTradeoffs(const PerformancePrecisionTradeoffs& other) = default; PerformancePrecisionTradeoffs(PerformancePrecisionTradeoffs&& other) = default; diff --git a/src/model/PerformancePrecisionTradeoffs_Impl.hpp b/src/model/PerformancePrecisionTradeoffs_Impl.hpp index 99d40e7ac8f..0daf046ca95 100644 --- a/src/model/PerformancePrecisionTradeoffs_Impl.hpp +++ b/src/model/PerformancePrecisionTradeoffs_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PerformancePrecisionTradeoffs_Impl(const PerformancePrecisionTradeoffs_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PerformancePrecisionTradeoffs_Impl() = default; + virtual ~PerformancePrecisionTradeoffs_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PhotovoltaicPerformance.hpp b/src/model/PhotovoltaicPerformance.hpp index 55997a52fad..bbb805fa9f2 100644 --- a/src/model/PhotovoltaicPerformance.hpp +++ b/src/model/PhotovoltaicPerformance.hpp @@ -24,7 +24,7 @@ namespace model { public: PhotovoltaicPerformance(IddObjectType type, const Model& model); - virtual ~PhotovoltaicPerformance() = default; + virtual ~PhotovoltaicPerformance() override = default; // Default the copy and move operators because the virtual dtor is explicit PhotovoltaicPerformance(const PhotovoltaicPerformance& other) = default; PhotovoltaicPerformance(PhotovoltaicPerformance&& other) = default; diff --git a/src/model/PhotovoltaicPerformanceEquivalentOneDiode.hpp b/src/model/PhotovoltaicPerformanceEquivalentOneDiode.hpp index 52db916fa4c..c882ddca7f4 100644 --- a/src/model/PhotovoltaicPerformanceEquivalentOneDiode.hpp +++ b/src/model/PhotovoltaicPerformanceEquivalentOneDiode.hpp @@ -28,7 +28,7 @@ namespace model { explicit PhotovoltaicPerformanceEquivalentOneDiode(const Model& model); - virtual ~PhotovoltaicPerformanceEquivalentOneDiode() = default; + virtual ~PhotovoltaicPerformanceEquivalentOneDiode() override = default; // Default the copy and move operators because the virtual dtor is explicit PhotovoltaicPerformanceEquivalentOneDiode(const PhotovoltaicPerformanceEquivalentOneDiode& other) = default; PhotovoltaicPerformanceEquivalentOneDiode(PhotovoltaicPerformanceEquivalentOneDiode&& other) = default; diff --git a/src/model/PhotovoltaicPerformanceEquivalentOneDiode_Impl.hpp b/src/model/PhotovoltaicPerformanceEquivalentOneDiode_Impl.hpp index 128d1de6786..64666358669 100644 --- a/src/model/PhotovoltaicPerformanceEquivalentOneDiode_Impl.hpp +++ b/src/model/PhotovoltaicPerformanceEquivalentOneDiode_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PhotovoltaicPerformanceEquivalentOneDiode_Impl(const PhotovoltaicPerformanceEquivalentOneDiode_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PhotovoltaicPerformanceEquivalentOneDiode_Impl() = default; + virtual ~PhotovoltaicPerformanceEquivalentOneDiode_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PhotovoltaicPerformanceSandia.hpp b/src/model/PhotovoltaicPerformanceSandia.hpp index b7299c0c8ef..94fe83acaec 100644 --- a/src/model/PhotovoltaicPerformanceSandia.hpp +++ b/src/model/PhotovoltaicPerformanceSandia.hpp @@ -46,7 +46,7 @@ namespace model { // as it will throw if it cannot find it static PhotovoltaicPerformanceSandia fromSandiaDatabase(const Model& model, const std::string& sandiaModulePerformanceName); - virtual ~PhotovoltaicPerformanceSandia() = default; + virtual ~PhotovoltaicPerformanceSandia() override = default; // Default the copy and move operators because the virtual dtor is explicit PhotovoltaicPerformanceSandia(const PhotovoltaicPerformanceSandia& other) = default; PhotovoltaicPerformanceSandia(PhotovoltaicPerformanceSandia&& other) = default; diff --git a/src/model/PhotovoltaicPerformanceSandia_Impl.hpp b/src/model/PhotovoltaicPerformanceSandia_Impl.hpp index 9df52a3044a..30e44311a5b 100644 --- a/src/model/PhotovoltaicPerformanceSandia_Impl.hpp +++ b/src/model/PhotovoltaicPerformanceSandia_Impl.hpp @@ -31,7 +31,7 @@ namespace model { PhotovoltaicPerformanceSandia_Impl(const PhotovoltaicPerformanceSandia_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PhotovoltaicPerformanceSandia_Impl() = default; + virtual ~PhotovoltaicPerformanceSandia_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PhotovoltaicPerformanceSimple.hpp b/src/model/PhotovoltaicPerformanceSimple.hpp index e9f0805f571..ef5162fe4c9 100644 --- a/src/model/PhotovoltaicPerformanceSimple.hpp +++ b/src/model/PhotovoltaicPerformanceSimple.hpp @@ -30,7 +30,7 @@ namespace model { explicit PhotovoltaicPerformanceSimple(const Model& model); - virtual ~PhotovoltaicPerformanceSimple() = default; + virtual ~PhotovoltaicPerformanceSimple() override = default; // Default the copy and move operators because the virtual dtor is explicit PhotovoltaicPerformanceSimple(const PhotovoltaicPerformanceSimple& other) = default; PhotovoltaicPerformanceSimple(PhotovoltaicPerformanceSimple&& other) = default; diff --git a/src/model/PhotovoltaicPerformanceSimple_Impl.hpp b/src/model/PhotovoltaicPerformanceSimple_Impl.hpp index 937f9a89d3b..1b775ff2ef0 100644 --- a/src/model/PhotovoltaicPerformanceSimple_Impl.hpp +++ b/src/model/PhotovoltaicPerformanceSimple_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PhotovoltaicPerformanceSimple_Impl(const PhotovoltaicPerformanceSimple_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PhotovoltaicPerformanceSimple_Impl() = default; + virtual ~PhotovoltaicPerformanceSimple_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PhotovoltaicPerformance_Impl.hpp b/src/model/PhotovoltaicPerformance_Impl.hpp index b0852b7849e..567299f39cd 100644 --- a/src/model/PhotovoltaicPerformance_Impl.hpp +++ b/src/model/PhotovoltaicPerformance_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PhotovoltaicPerformance_Impl(const PhotovoltaicPerformance_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~PhotovoltaicPerformance_Impl() = default; + virtual ~PhotovoltaicPerformance_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PipeAdiabatic.hpp b/src/model/PipeAdiabatic.hpp index 5cb0a7a3ca7..ee98202a78d 100644 --- a/src/model/PipeAdiabatic.hpp +++ b/src/model/PipeAdiabatic.hpp @@ -32,7 +32,7 @@ namespace model { */ explicit PipeAdiabatic(const Model& model); - virtual ~PipeAdiabatic() = default; + virtual ~PipeAdiabatic() override = default; // Default the copy and move operators because the virtual dtor is explicit PipeAdiabatic(const PipeAdiabatic& other) = default; PipeAdiabatic(PipeAdiabatic&& other) = default; diff --git a/src/model/PipeAdiabatic_Impl.hpp b/src/model/PipeAdiabatic_Impl.hpp index 759dff7ca82..4bc1f45a352 100644 --- a/src/model/PipeAdiabatic_Impl.hpp +++ b/src/model/PipeAdiabatic_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PipeAdiabatic_Impl(const PipeAdiabatic_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~PipeAdiabatic_Impl() = default; + virtual ~PipeAdiabatic_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/PipeIndoor.hpp b/src/model/PipeIndoor.hpp index bc58679eb55..a8c7a26bc50 100644 --- a/src/model/PipeIndoor.hpp +++ b/src/model/PipeIndoor.hpp @@ -32,7 +32,7 @@ namespace model { explicit PipeIndoor(const Model& model); - virtual ~PipeIndoor() = default; + virtual ~PipeIndoor() override = default; // Default the copy and move operators because the virtual dtor is explicit PipeIndoor(const PipeIndoor& other) = default; PipeIndoor(PipeIndoor&& other) = default; diff --git a/src/model/PipeIndoor_Impl.hpp b/src/model/PipeIndoor_Impl.hpp index ee0559ec4fd..9a3fae0ca16 100644 --- a/src/model/PipeIndoor_Impl.hpp +++ b/src/model/PipeIndoor_Impl.hpp @@ -31,7 +31,7 @@ namespace model { PipeIndoor_Impl(const PipeIndoor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PipeIndoor_Impl() = default; + virtual ~PipeIndoor_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PipeOutdoor.hpp b/src/model/PipeOutdoor.hpp index d04014ca31d..9e99cdc4d70 100644 --- a/src/model/PipeOutdoor.hpp +++ b/src/model/PipeOutdoor.hpp @@ -31,7 +31,7 @@ namespace model { explicit PipeOutdoor(const Model& model); - virtual ~PipeOutdoor() = default; + virtual ~PipeOutdoor() override = default; // Default the copy and move operators because the virtual dtor is explicit PipeOutdoor(const PipeOutdoor& other) = default; PipeOutdoor(PipeOutdoor&& other) = default; diff --git a/src/model/PipeOutdoor_Impl.hpp b/src/model/PipeOutdoor_Impl.hpp index 25116e3f3eb..56a4701acbc 100644 --- a/src/model/PipeOutdoor_Impl.hpp +++ b/src/model/PipeOutdoor_Impl.hpp @@ -30,7 +30,7 @@ namespace model { PipeOutdoor_Impl(const PipeOutdoor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PipeOutdoor_Impl() = default; + virtual ~PipeOutdoor_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlanarSurface.hpp b/src/model/PlanarSurface.hpp index 7d880f2fe69..17a6ae02413 100644 --- a/src/model/PlanarSurface.hpp +++ b/src/model/PlanarSurface.hpp @@ -58,7 +58,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~PlanarSurface() = default; + virtual ~PlanarSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit PlanarSurface(const PlanarSurface& other) = default; PlanarSurface(PlanarSurface&& other) = default; diff --git a/src/model/PlanarSurfaceGroup.hpp b/src/model/PlanarSurfaceGroup.hpp index 60e3cc0f1c9..e2d28e99984 100644 --- a/src/model/PlanarSurfaceGroup.hpp +++ b/src/model/PlanarSurfaceGroup.hpp @@ -26,7 +26,7 @@ namespace model { class MODEL_API PlanarSurfaceGroup : public ParentObject { public: - virtual ~PlanarSurfaceGroup() = default; + virtual ~PlanarSurfaceGroup() override = default; // Default the copy and move operators because the virtual dtor is explicit PlanarSurfaceGroup(const PlanarSurfaceGroup& other) = default; PlanarSurfaceGroup(PlanarSurfaceGroup&& other) = default; diff --git a/src/model/PlanarSurfaceGroup_Impl.hpp b/src/model/PlanarSurfaceGroup_Impl.hpp index 3aa43af76f8..c70b4aeb2ea 100644 --- a/src/model/PlanarSurfaceGroup_Impl.hpp +++ b/src/model/PlanarSurfaceGroup_Impl.hpp @@ -34,7 +34,7 @@ namespace model { PlanarSurfaceGroup_Impl(const PlanarSurfaceGroup_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~PlanarSurfaceGroup_Impl() = default; + virtual ~PlanarSurfaceGroup_Impl() override = default; virtual double directionofRelativeNorth() const = 0; diff --git a/src/model/PlanarSurface_Impl.hpp b/src/model/PlanarSurface_Impl.hpp index 91504dec958..849f16bb315 100644 --- a/src/model/PlanarSurface_Impl.hpp +++ b/src/model/PlanarSurface_Impl.hpp @@ -61,7 +61,7 @@ namespace model { // clone copy constructor PlanarSurface_Impl(const PlanarSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlanarSurface_Impl() = default; + virtual ~PlanarSurface_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/PlantComponentTemperatureSource.hpp b/src/model/PlantComponentTemperatureSource.hpp index e3d7659532f..4d9d1fba701 100644 --- a/src/model/PlantComponentTemperatureSource.hpp +++ b/src/model/PlantComponentTemperatureSource.hpp @@ -30,7 +30,7 @@ namespace model { explicit PlantComponentTemperatureSource(const Model& model); - virtual ~PlantComponentTemperatureSource() = default; + virtual ~PlantComponentTemperatureSource() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantComponentTemperatureSource(const PlantComponentTemperatureSource& other) = default; PlantComponentTemperatureSource(PlantComponentTemperatureSource&& other) = default; diff --git a/src/model/PlantComponentTemperatureSource_Impl.hpp b/src/model/PlantComponentTemperatureSource_Impl.hpp index 1167e8a0122..da2d505911f 100644 --- a/src/model/PlantComponentTemperatureSource_Impl.hpp +++ b/src/model/PlantComponentTemperatureSource_Impl.hpp @@ -30,7 +30,7 @@ namespace model { PlantComponentTemperatureSource_Impl(const PlantComponentTemperatureSource_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantComponentTemperatureSource_Impl() = default; + virtual ~PlantComponentTemperatureSource_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantComponentUserDefined.hpp b/src/model/PlantComponentUserDefined.hpp index 1654914af30..0c366fec309 100644 --- a/src/model/PlantComponentUserDefined.hpp +++ b/src/model/PlantComponentUserDefined.hpp @@ -40,7 +40,7 @@ namespace model { explicit PlantComponentUserDefined(const Model& model); - virtual ~PlantComponentUserDefined() = default; + virtual ~PlantComponentUserDefined() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantComponentUserDefined(const PlantComponentUserDefined& other) = default; PlantComponentUserDefined(PlantComponentUserDefined&& other) = default; diff --git a/src/model/PlantComponentUserDefined_Impl.hpp b/src/model/PlantComponentUserDefined_Impl.hpp index 5fe2e4400f2..bcb94cf10fd 100644 --- a/src/model/PlantComponentUserDefined_Impl.hpp +++ b/src/model/PlantComponentUserDefined_Impl.hpp @@ -41,7 +41,7 @@ namespace model { PlantComponentUserDefined_Impl(const PlantComponentUserDefined_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantComponentUserDefined_Impl() = default; + virtual ~PlantComponentUserDefined_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationCoolingLoad.hpp b/src/model/PlantEquipmentOperationCoolingLoad.hpp index 73bf54bbd17..f3035c0b2e5 100644 --- a/src/model/PlantEquipmentOperationCoolingLoad.hpp +++ b/src/model/PlantEquipmentOperationCoolingLoad.hpp @@ -27,7 +27,7 @@ namespace model { explicit PlantEquipmentOperationCoolingLoad(const Model& model); - virtual ~PlantEquipmentOperationCoolingLoad() = default; + virtual ~PlantEquipmentOperationCoolingLoad() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationCoolingLoad(const PlantEquipmentOperationCoolingLoad& other) = default; PlantEquipmentOperationCoolingLoad(PlantEquipmentOperationCoolingLoad&& other) = default; diff --git a/src/model/PlantEquipmentOperationCoolingLoad_Impl.hpp b/src/model/PlantEquipmentOperationCoolingLoad_Impl.hpp index 510ddb65263..faa688c2392 100644 --- a/src/model/PlantEquipmentOperationCoolingLoad_Impl.hpp +++ b/src/model/PlantEquipmentOperationCoolingLoad_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PlantEquipmentOperationCoolingLoad_Impl(const PlantEquipmentOperationCoolingLoad_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationCoolingLoad_Impl() = default; + virtual ~PlantEquipmentOperationCoolingLoad_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationHeatingLoad.hpp b/src/model/PlantEquipmentOperationHeatingLoad.hpp index 420824b192c..47d9dd63f97 100644 --- a/src/model/PlantEquipmentOperationHeatingLoad.hpp +++ b/src/model/PlantEquipmentOperationHeatingLoad.hpp @@ -27,7 +27,7 @@ namespace model { explicit PlantEquipmentOperationHeatingLoad(const Model& model); - virtual ~PlantEquipmentOperationHeatingLoad() = default; + virtual ~PlantEquipmentOperationHeatingLoad() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationHeatingLoad(const PlantEquipmentOperationHeatingLoad& other) = default; PlantEquipmentOperationHeatingLoad(PlantEquipmentOperationHeatingLoad&& other) = default; diff --git a/src/model/PlantEquipmentOperationHeatingLoad_Impl.hpp b/src/model/PlantEquipmentOperationHeatingLoad_Impl.hpp index 8e9a4f0d8f7..50bf8cadf26 100644 --- a/src/model/PlantEquipmentOperationHeatingLoad_Impl.hpp +++ b/src/model/PlantEquipmentOperationHeatingLoad_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PlantEquipmentOperationHeatingLoad_Impl(const PlantEquipmentOperationHeatingLoad_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationHeatingLoad_Impl() = default; + virtual ~PlantEquipmentOperationHeatingLoad_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorDewpoint.hpp b/src/model/PlantEquipmentOperationOutdoorDewpoint.hpp index 4d6b630b81c..ad40ebf4c45 100644 --- a/src/model/PlantEquipmentOperationOutdoorDewpoint.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDewpoint.hpp @@ -27,7 +27,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorDewpoint(const Model& model); - virtual ~PlantEquipmentOperationOutdoorDewpoint() = default; + virtual ~PlantEquipmentOperationOutdoorDewpoint() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorDewpoint(const PlantEquipmentOperationOutdoorDewpoint& other) = default; PlantEquipmentOperationOutdoorDewpoint(PlantEquipmentOperationOutdoorDewpoint&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorDewpointDifference.hpp b/src/model/PlantEquipmentOperationOutdoorDewpointDifference.hpp index b5f68571f55..787c8d2ccc7 100644 --- a/src/model/PlantEquipmentOperationOutdoorDewpointDifference.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDewpointDifference.hpp @@ -29,7 +29,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorDewpointDifference(const Model& model); - virtual ~PlantEquipmentOperationOutdoorDewpointDifference() = default; + virtual ~PlantEquipmentOperationOutdoorDewpointDifference() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorDewpointDifference(const PlantEquipmentOperationOutdoorDewpointDifference& other) = default; PlantEquipmentOperationOutdoorDewpointDifference(PlantEquipmentOperationOutdoorDewpointDifference&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorDewpointDifference_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorDewpointDifference_Impl.hpp index 9531a7060f4..ae7c6d18786 100644 --- a/src/model/PlantEquipmentOperationOutdoorDewpointDifference_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDewpointDifference_Impl.hpp @@ -31,7 +31,7 @@ namespace model { PlantEquipmentOperationOutdoorDewpointDifference_Impl(const PlantEquipmentOperationOutdoorDewpointDifference_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorDewpointDifference_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorDewpointDifference_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorDewpoint_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorDewpoint_Impl.hpp index 1b326853d77..635182e3b14 100644 --- a/src/model/PlantEquipmentOperationOutdoorDewpoint_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDewpoint_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PlantEquipmentOperationOutdoorDewpoint_Impl(const PlantEquipmentOperationOutdoorDewpoint_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorDewpoint_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorDewpoint_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorDryBulb.hpp b/src/model/PlantEquipmentOperationOutdoorDryBulb.hpp index 0ec801a5277..bf762cbc693 100644 --- a/src/model/PlantEquipmentOperationOutdoorDryBulb.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDryBulb.hpp @@ -27,7 +27,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorDryBulb(const Model& model); - virtual ~PlantEquipmentOperationOutdoorDryBulb() = default; + virtual ~PlantEquipmentOperationOutdoorDryBulb() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorDryBulb(const PlantEquipmentOperationOutdoorDryBulb& other) = default; PlantEquipmentOperationOutdoorDryBulb(PlantEquipmentOperationOutdoorDryBulb&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorDryBulbDifference.hpp b/src/model/PlantEquipmentOperationOutdoorDryBulbDifference.hpp index d25764b1fc4..d04c63767cc 100644 --- a/src/model/PlantEquipmentOperationOutdoorDryBulbDifference.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDryBulbDifference.hpp @@ -29,7 +29,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorDryBulbDifference(const Model& model); - virtual ~PlantEquipmentOperationOutdoorDryBulbDifference() = default; + virtual ~PlantEquipmentOperationOutdoorDryBulbDifference() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorDryBulbDifference(const PlantEquipmentOperationOutdoorDryBulbDifference& other) = default; PlantEquipmentOperationOutdoorDryBulbDifference(PlantEquipmentOperationOutdoorDryBulbDifference&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorDryBulbDifference_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorDryBulbDifference_Impl.hpp index 2f40b6b5396..4c72644c706 100644 --- a/src/model/PlantEquipmentOperationOutdoorDryBulbDifference_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDryBulbDifference_Impl.hpp @@ -30,7 +30,7 @@ namespace model { PlantEquipmentOperationOutdoorDryBulbDifference_Impl(const PlantEquipmentOperationOutdoorDryBulbDifference_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorDryBulbDifference_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorDryBulbDifference_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorDryBulb_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorDryBulb_Impl.hpp index 47a5944bdc3..5221cd317d1 100644 --- a/src/model/PlantEquipmentOperationOutdoorDryBulb_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorDryBulb_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PlantEquipmentOperationOutdoorDryBulb_Impl(const PlantEquipmentOperationOutdoorDryBulb_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorDryBulb_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorDryBulb_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorRelativeHumidity.hpp b/src/model/PlantEquipmentOperationOutdoorRelativeHumidity.hpp index c5bbe9438f5..412a1fb94ca 100644 --- a/src/model/PlantEquipmentOperationOutdoorRelativeHumidity.hpp +++ b/src/model/PlantEquipmentOperationOutdoorRelativeHumidity.hpp @@ -27,7 +27,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorRelativeHumidity(const Model& model); - virtual ~PlantEquipmentOperationOutdoorRelativeHumidity() = default; + virtual ~PlantEquipmentOperationOutdoorRelativeHumidity() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorRelativeHumidity(const PlantEquipmentOperationOutdoorRelativeHumidity& other) = default; PlantEquipmentOperationOutdoorRelativeHumidity(PlantEquipmentOperationOutdoorRelativeHumidity&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorRelativeHumidity_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorRelativeHumidity_Impl.hpp index f78d757025a..097f014c078 100644 --- a/src/model/PlantEquipmentOperationOutdoorRelativeHumidity_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorRelativeHumidity_Impl.hpp @@ -28,7 +28,7 @@ namespace model { PlantEquipmentOperationOutdoorRelativeHumidity_Impl(const PlantEquipmentOperationOutdoorRelativeHumidity_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorRelativeHumidity_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorRelativeHumidity_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorWetBulb.hpp b/src/model/PlantEquipmentOperationOutdoorWetBulb.hpp index 511f2429bed..274b14ae84a 100644 --- a/src/model/PlantEquipmentOperationOutdoorWetBulb.hpp +++ b/src/model/PlantEquipmentOperationOutdoorWetBulb.hpp @@ -27,7 +27,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorWetBulb(const Model& model); - virtual ~PlantEquipmentOperationOutdoorWetBulb() = default; + virtual ~PlantEquipmentOperationOutdoorWetBulb() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorWetBulb(const PlantEquipmentOperationOutdoorWetBulb& other) = default; PlantEquipmentOperationOutdoorWetBulb(PlantEquipmentOperationOutdoorWetBulb&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorWetBulbDifference.hpp b/src/model/PlantEquipmentOperationOutdoorWetBulbDifference.hpp index 0d81af79b60..b53cf8921f8 100644 --- a/src/model/PlantEquipmentOperationOutdoorWetBulbDifference.hpp +++ b/src/model/PlantEquipmentOperationOutdoorWetBulbDifference.hpp @@ -29,7 +29,7 @@ namespace model { explicit PlantEquipmentOperationOutdoorWetBulbDifference(const Model& model); - virtual ~PlantEquipmentOperationOutdoorWetBulbDifference() = default; + virtual ~PlantEquipmentOperationOutdoorWetBulbDifference() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationOutdoorWetBulbDifference(const PlantEquipmentOperationOutdoorWetBulbDifference& other) = default; PlantEquipmentOperationOutdoorWetBulbDifference(PlantEquipmentOperationOutdoorWetBulbDifference&& other) = default; diff --git a/src/model/PlantEquipmentOperationOutdoorWetBulbDifference_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorWetBulbDifference_Impl.hpp index b21dd7de4d6..86fe2f40a9a 100644 --- a/src/model/PlantEquipmentOperationOutdoorWetBulbDifference_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorWetBulbDifference_Impl.hpp @@ -30,7 +30,7 @@ namespace model { PlantEquipmentOperationOutdoorWetBulbDifference_Impl(const PlantEquipmentOperationOutdoorWetBulbDifference_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorWetBulbDifference_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorWetBulbDifference_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationOutdoorWetBulb_Impl.hpp b/src/model/PlantEquipmentOperationOutdoorWetBulb_Impl.hpp index 0c8da632901..0eec091622e 100644 --- a/src/model/PlantEquipmentOperationOutdoorWetBulb_Impl.hpp +++ b/src/model/PlantEquipmentOperationOutdoorWetBulb_Impl.hpp @@ -27,7 +27,7 @@ namespace model { PlantEquipmentOperationOutdoorWetBulb_Impl(const PlantEquipmentOperationOutdoorWetBulb_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantEquipmentOperationOutdoorWetBulb_Impl() = default; + virtual ~PlantEquipmentOperationOutdoorWetBulb_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PlantEquipmentOperationRangeBasedScheme.hpp b/src/model/PlantEquipmentOperationRangeBasedScheme.hpp index 582810a5630..5fe4331e225 100644 --- a/src/model/PlantEquipmentOperationRangeBasedScheme.hpp +++ b/src/model/PlantEquipmentOperationRangeBasedScheme.hpp @@ -32,7 +32,7 @@ namespace model { public: PlantEquipmentOperationRangeBasedScheme(IddObjectType type, const Model& model); - virtual ~PlantEquipmentOperationRangeBasedScheme() = default; + virtual ~PlantEquipmentOperationRangeBasedScheme() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationRangeBasedScheme(const PlantEquipmentOperationRangeBasedScheme& other) = default; PlantEquipmentOperationRangeBasedScheme(PlantEquipmentOperationRangeBasedScheme&& other) = default; diff --git a/src/model/PlantEquipmentOperationRangeBasedScheme_Impl.hpp b/src/model/PlantEquipmentOperationRangeBasedScheme_Impl.hpp index 89a639b536e..9ec8a1faaad 100644 --- a/src/model/PlantEquipmentOperationRangeBasedScheme_Impl.hpp +++ b/src/model/PlantEquipmentOperationRangeBasedScheme_Impl.hpp @@ -26,7 +26,7 @@ namespace model { PlantEquipmentOperationRangeBasedScheme_Impl(const PlantEquipmentOperationRangeBasedScheme_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~PlantEquipmentOperationRangeBasedScheme_Impl() = default; + virtual ~PlantEquipmentOperationRangeBasedScheme_Impl() override = default; bool addLoadRange(double upperLimit, const std::vector& equipment); diff --git a/src/model/PlantEquipmentOperationScheme.hpp b/src/model/PlantEquipmentOperationScheme.hpp index c793070e6fa..3acfa7144f5 100644 --- a/src/model/PlantEquipmentOperationScheme.hpp +++ b/src/model/PlantEquipmentOperationScheme.hpp @@ -24,7 +24,7 @@ namespace model { public: PlantEquipmentOperationScheme(IddObjectType type, const Model& model); - virtual ~PlantEquipmentOperationScheme() = default; + virtual ~PlantEquipmentOperationScheme() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantEquipmentOperationScheme(const PlantEquipmentOperationScheme& other) = default; PlantEquipmentOperationScheme(PlantEquipmentOperationScheme&& other) = default; diff --git a/src/model/PlantEquipmentOperationScheme_Impl.hpp b/src/model/PlantEquipmentOperationScheme_Impl.hpp index d69326c36d5..689baf7b597 100644 --- a/src/model/PlantEquipmentOperationScheme_Impl.hpp +++ b/src/model/PlantEquipmentOperationScheme_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PlantEquipmentOperationScheme_Impl(const PlantEquipmentOperationScheme_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~PlantEquipmentOperationScheme_Impl() = default; + virtual ~PlantEquipmentOperationScheme_Impl() override = default; boost::optional plantLoop() const; diff --git a/src/model/PlantLoop.hpp b/src/model/PlantLoop.hpp index 411c58f93c2..f0b0dd1c68a 100644 --- a/src/model/PlantLoop.hpp +++ b/src/model/PlantLoop.hpp @@ -43,7 +43,7 @@ namespace model { */ explicit PlantLoop(Model& model); - virtual ~PlantLoop() = default; + virtual ~PlantLoop() override = default; // Default the copy and move operators because the virtual dtor is explicit PlantLoop(const PlantLoop& other) = default; PlantLoop(PlantLoop&& other) = default; @@ -218,10 +218,10 @@ namespace model { Splitter supplySplitter() const; /** Returns the demand side Mixer. **/ - Mixer demandMixer(); + Mixer demandMixer(); // cppcheck-suppress [duplInheritedMember] for documentation purposes /** Returns the demand side Splitter. **/ - Splitter demandSplitter(); + Splitter demandSplitter(); // cppcheck-suppress [duplInheritedMember] for documentation purposes /** Adds a new demand branch for component and returns a bool indicating success. */ diff --git a/src/model/PlantLoop_Impl.hpp b/src/model/PlantLoop_Impl.hpp index 97d3d726958..e070c815d97 100644 --- a/src/model/PlantLoop_Impl.hpp +++ b/src/model/PlantLoop_Impl.hpp @@ -36,7 +36,7 @@ namespace model { PlantLoop_Impl(const PlantLoop_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PlantLoop_Impl() = default; + virtual ~PlantLoop_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PortList.hpp b/src/model/PortList.hpp index 2529f76ab50..68ece56a479 100644 --- a/src/model/PortList.hpp +++ b/src/model/PortList.hpp @@ -33,7 +33,7 @@ namespace model { public: explicit PortList(const HVACComponent& comp); - virtual ~PortList() = default; + virtual ~PortList() override = default; // Default the copy and move operators because the virtual dtor is explicit PortList(const PortList& other) = default; PortList(PortList&& other) = default; diff --git a/src/model/PortList_Impl.hpp b/src/model/PortList_Impl.hpp index c7604efdb89..228542b674b 100644 --- a/src/model/PortList_Impl.hpp +++ b/src/model/PortList_Impl.hpp @@ -31,7 +31,7 @@ namespace model { PortList_Impl(const PortList_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PortList_Impl() = default; + virtual ~PortList_Impl() override = default; unsigned port(unsigned portIndex) const; diff --git a/src/model/ProgramControl.hpp b/src/model/ProgramControl.hpp index e34906587b8..11d682bd4dd 100644 --- a/src/model/ProgramControl.hpp +++ b/src/model/ProgramControl.hpp @@ -27,7 +27,7 @@ namespace model { explicit ProgramControl(const Model& model); - virtual ~ProgramControl() = default; + virtual ~ProgramControl() override = default; // Default the copy and move operators because the virtual dtor is explicit ProgramControl(const ProgramControl& other) = default; ProgramControl(ProgramControl&& other) = default; diff --git a/src/model/ProgramControl_Impl.hpp b/src/model/ProgramControl_Impl.hpp index d67f45d410b..8f118075393 100644 --- a/src/model/ProgramControl_Impl.hpp +++ b/src/model/ProgramControl_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ProgramControl_Impl(const ProgramControl_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ProgramControl_Impl() = default; + virtual ~ProgramControl_Impl() override = default; //@} diff --git a/src/model/PumpConstantSpeed.hpp b/src/model/PumpConstantSpeed.hpp index bc293cee90f..7d6d48ce01b 100644 --- a/src/model/PumpConstantSpeed.hpp +++ b/src/model/PumpConstantSpeed.hpp @@ -29,7 +29,7 @@ namespace model { public: explicit PumpConstantSpeed(const Model& model); - virtual ~PumpConstantSpeed() = default; + virtual ~PumpConstantSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit PumpConstantSpeed(const PumpConstantSpeed& other) = default; PumpConstantSpeed(PumpConstantSpeed&& other) = default; diff --git a/src/model/PumpConstantSpeed_Impl.hpp b/src/model/PumpConstantSpeed_Impl.hpp index 710da69eef0..6a8f2c1744f 100644 --- a/src/model/PumpConstantSpeed_Impl.hpp +++ b/src/model/PumpConstantSpeed_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PumpConstantSpeed_Impl(const PumpConstantSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PumpConstantSpeed_Impl() = default; + virtual ~PumpConstantSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PumpVariableSpeed.hpp b/src/model/PumpVariableSpeed.hpp index 6eef3ff9f4f..9c93ad967bf 100644 --- a/src/model/PumpVariableSpeed.hpp +++ b/src/model/PumpVariableSpeed.hpp @@ -32,7 +32,7 @@ namespace model { explicit PumpVariableSpeed(const Model& model); - virtual ~PumpVariableSpeed() = default; + virtual ~PumpVariableSpeed() override = default; // Default the copy and move operators because the virtual dtor is explicit PumpVariableSpeed(const PumpVariableSpeed& other) = default; PumpVariableSpeed(PumpVariableSpeed&& other) = default; diff --git a/src/model/PumpVariableSpeed_Impl.hpp b/src/model/PumpVariableSpeed_Impl.hpp index 7482b6af7c5..ab08c2f240d 100644 --- a/src/model/PumpVariableSpeed_Impl.hpp +++ b/src/model/PumpVariableSpeed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { PumpVariableSpeed_Impl(const PumpVariableSpeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PumpVariableSpeed_Impl() = default; + virtual ~PumpVariableSpeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PythonPluginInstance.hpp b/src/model/PythonPluginInstance.hpp index 67d03dde2d1..051d9952f8d 100644 --- a/src/model/PythonPluginInstance.hpp +++ b/src/model/PythonPluginInstance.hpp @@ -30,7 +30,7 @@ namespace model { PythonPluginInstance(const ExternalFile& externalfile, const std::string& pluginClassName); - virtual ~PythonPluginInstance() = default; + virtual ~PythonPluginInstance() override = default; //@} diff --git a/src/model/PythonPluginInstance_Impl.hpp b/src/model/PythonPluginInstance_Impl.hpp index 11eb5811181..5a759f69d94 100644 --- a/src/model/PythonPluginInstance_Impl.hpp +++ b/src/model/PythonPluginInstance_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PythonPluginInstance_Impl(const PythonPluginInstance_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PythonPluginInstance_Impl() = default; + virtual ~PythonPluginInstance_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PythonPluginOutputVariable.hpp b/src/model/PythonPluginOutputVariable.hpp index feec2b452f7..8c54c5b58d4 100644 --- a/src/model/PythonPluginOutputVariable.hpp +++ b/src/model/PythonPluginOutputVariable.hpp @@ -29,7 +29,7 @@ namespace model { explicit PythonPluginOutputVariable(const PythonPluginVariable& pythonPluginVariable); - virtual ~PythonPluginOutputVariable() = default; + virtual ~PythonPluginOutputVariable() override = default; //@} diff --git a/src/model/PythonPluginOutputVariable_Impl.hpp b/src/model/PythonPluginOutputVariable_Impl.hpp index 9be0900a8be..f6a166f5b2d 100644 --- a/src/model/PythonPluginOutputVariable_Impl.hpp +++ b/src/model/PythonPluginOutputVariable_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PythonPluginOutputVariable_Impl(const PythonPluginOutputVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PythonPluginOutputVariable_Impl() = default; + virtual ~PythonPluginOutputVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PythonPluginTrendVariable.hpp b/src/model/PythonPluginTrendVariable.hpp index 48a6d9e98f8..618ab5717f4 100644 --- a/src/model/PythonPluginTrendVariable.hpp +++ b/src/model/PythonPluginTrendVariable.hpp @@ -31,7 +31,7 @@ namespace model { explicit PythonPluginTrendVariable(const PythonPluginVariable& pythonPluginVariable); - virtual ~PythonPluginTrendVariable() = default; + virtual ~PythonPluginTrendVariable() override = default; //@} diff --git a/src/model/PythonPluginTrendVariable_Impl.hpp b/src/model/PythonPluginTrendVariable_Impl.hpp index 2830359e8c6..a54a2e5ea0d 100644 --- a/src/model/PythonPluginTrendVariable_Impl.hpp +++ b/src/model/PythonPluginTrendVariable_Impl.hpp @@ -29,7 +29,7 @@ namespace model { PythonPluginTrendVariable_Impl(const PythonPluginTrendVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PythonPluginTrendVariable_Impl() = default; + virtual ~PythonPluginTrendVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/PythonPluginVariable.hpp b/src/model/PythonPluginVariable.hpp index d33d793c416..d3dfd2af470 100644 --- a/src/model/PythonPluginVariable.hpp +++ b/src/model/PythonPluginVariable.hpp @@ -30,7 +30,7 @@ namespace model { explicit PythonPluginVariable(const Model& model); - virtual ~PythonPluginVariable() = default; + virtual ~PythonPluginVariable() override = default; //@} diff --git a/src/model/PythonPluginVariable_Impl.hpp b/src/model/PythonPluginVariable_Impl.hpp index 979643af537..561d387eef0 100644 --- a/src/model/PythonPluginVariable_Impl.hpp +++ b/src/model/PythonPluginVariable_Impl.hpp @@ -30,7 +30,7 @@ namespace model { PythonPluginVariable_Impl(const PythonPluginVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~PythonPluginVariable_Impl() = default; + virtual ~PythonPluginVariable_Impl() override = default; /** Removes all PythonPluginTrendVariable and PythonPluginOutputVariable attached to it */ virtual std::vector remove() override; diff --git a/src/model/RadianceParameters.hpp b/src/model/RadianceParameters.hpp index 35b46fb3d0f..80ac8cfaf8d 100644 --- a/src/model/RadianceParameters.hpp +++ b/src/model/RadianceParameters.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~RadianceParameters() = default; + virtual ~RadianceParameters() override = default; // Default the copy and move operators because the virtual dtor is explicit RadianceParameters(const RadianceParameters& other) = default; RadianceParameters(RadianceParameters&& other) = default; diff --git a/src/model/RadianceParameters_Impl.hpp b/src/model/RadianceParameters_Impl.hpp index f9648065a94..b8a8a971737 100644 --- a/src/model/RadianceParameters_Impl.hpp +++ b/src/model/RadianceParameters_Impl.hpp @@ -28,7 +28,7 @@ namespace model { RadianceParameters_Impl(const RadianceParameters_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RadianceParameters_Impl(); + virtual ~RadianceParameters_Impl() override; //@} diff --git a/src/model/RefractionExtinctionGlazing.cpp b/src/model/RefractionExtinctionGlazing.cpp index b72a61dbfb8..720bb0630bc 100644 --- a/src/model/RefractionExtinctionGlazing.cpp +++ b/src/model/RefractionExtinctionGlazing.cpp @@ -340,6 +340,7 @@ namespace model { return getImpl()->setThermalTransmittance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double RefractionExtinctionGlazing::thickness() const { return getImpl()->thickness(); } @@ -400,6 +401,7 @@ namespace model { return getImpl()->isSolarDiffusingDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool RefractionExtinctionGlazing::setThickness(double thickness) { return getImpl()->setThickness(thickness); } diff --git a/src/model/RefractionExtinctionGlazing.hpp b/src/model/RefractionExtinctionGlazing.hpp index b84f2df34ab..82f9a5263a6 100644 --- a/src/model/RefractionExtinctionGlazing.hpp +++ b/src/model/RefractionExtinctionGlazing.hpp @@ -31,7 +31,7 @@ namespace model { double visibleExtinctionCoefficient = 0.1); //double dirtCorrectionFactorforSolarandVisibleTransmittance = 0.1); - virtual ~RefractionExtinctionGlazing() = default; + virtual ~RefractionExtinctionGlazing() override = default; // Default the copy and move operators because the virtual dtor is explicit RefractionExtinctionGlazing(const RefractionExtinctionGlazing& other) = default; RefractionExtinctionGlazing(RefractionExtinctionGlazing&& other) = default; diff --git a/src/model/RefractionExtinctionGlazing_Impl.hpp b/src/model/RefractionExtinctionGlazing_Impl.hpp index c5869a4a0e9..16730ba5be4 100644 --- a/src/model/RefractionExtinctionGlazing_Impl.hpp +++ b/src/model/RefractionExtinctionGlazing_Impl.hpp @@ -28,7 +28,7 @@ namespace model { RefractionExtinctionGlazing_Impl(const RefractionExtinctionGlazing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefractionExtinctionGlazing_Impl() = default; + virtual ~RefractionExtinctionGlazing_Impl() override = default; //@} diff --git a/src/model/RefrigerationAirChiller.hpp b/src/model/RefrigerationAirChiller.hpp index b6b7431bc3d..422d7601a1c 100644 --- a/src/model/RefrigerationAirChiller.hpp +++ b/src/model/RefrigerationAirChiller.hpp @@ -37,7 +37,7 @@ namespace model { explicit RefrigerationAirChiller(const Model& model, Schedule& defrostSchedule); - virtual ~RefrigerationAirChiller() = default; + virtual ~RefrigerationAirChiller() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationAirChiller(const RefrigerationAirChiller& other) = default; RefrigerationAirChiller(RefrigerationAirChiller&& other) = default; diff --git a/src/model/RefrigerationAirChiller_Impl.hpp b/src/model/RefrigerationAirChiller_Impl.hpp index 8526a165ea2..62a99150874 100644 --- a/src/model/RefrigerationAirChiller_Impl.hpp +++ b/src/model/RefrigerationAirChiller_Impl.hpp @@ -33,7 +33,7 @@ namespace model { RefrigerationAirChiller_Impl(const RefrigerationAirChiller_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationAirChiller_Impl() = default; + virtual ~RefrigerationAirChiller_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCase.hpp b/src/model/RefrigerationCase.hpp index bb8a88dc21b..b78a5d6cb90 100644 --- a/src/model/RefrigerationCase.hpp +++ b/src/model/RefrigerationCase.hpp @@ -37,7 +37,7 @@ namespace model { explicit RefrigerationCase(const Model& model, Schedule& caseDefrostSchedule); - virtual ~RefrigerationCase() = default; + virtual ~RefrigerationCase() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCase(const RefrigerationCase& other) = default; RefrigerationCase(RefrigerationCase&& other) = default; diff --git a/src/model/RefrigerationCase_Impl.hpp b/src/model/RefrigerationCase_Impl.hpp index 54d768f6d3d..9bfbf5e963f 100644 --- a/src/model/RefrigerationCase_Impl.hpp +++ b/src/model/RefrigerationCase_Impl.hpp @@ -38,7 +38,7 @@ namespace model { RefrigerationCase_Impl(const RefrigerationCase_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCase_Impl() = default; + virtual ~RefrigerationCase_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCompressor.hpp b/src/model/RefrigerationCompressor.hpp index 0bed1d47e8d..97d6252b80d 100644 --- a/src/model/RefrigerationCompressor.hpp +++ b/src/model/RefrigerationCompressor.hpp @@ -31,7 +31,7 @@ namespace model { explicit RefrigerationCompressor(const Model& model); - virtual ~RefrigerationCompressor() = default; + virtual ~RefrigerationCompressor() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCompressor(const RefrigerationCompressor& other) = default; RefrigerationCompressor(RefrigerationCompressor&& other) = default; diff --git a/src/model/RefrigerationCompressorRack.hpp b/src/model/RefrigerationCompressorRack.hpp index 70608f48259..77858b7beb3 100644 --- a/src/model/RefrigerationCompressorRack.hpp +++ b/src/model/RefrigerationCompressorRack.hpp @@ -35,7 +35,7 @@ namespace model { explicit RefrigerationCompressorRack(const Model& model); - virtual ~RefrigerationCompressorRack() = default; + virtual ~RefrigerationCompressorRack() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCompressorRack(const RefrigerationCompressorRack& other) = default; RefrigerationCompressorRack(RefrigerationCompressorRack&& other) = default; diff --git a/src/model/RefrigerationCompressorRack_Impl.hpp b/src/model/RefrigerationCompressorRack_Impl.hpp index c634dce99ba..f13355d3c51 100644 --- a/src/model/RefrigerationCompressorRack_Impl.hpp +++ b/src/model/RefrigerationCompressorRack_Impl.hpp @@ -35,7 +35,7 @@ namespace model { RefrigerationCompressorRack_Impl(const RefrigerationCompressorRack_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCompressorRack_Impl() = default; + virtual ~RefrigerationCompressorRack_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCompressor_Impl.hpp b/src/model/RefrigerationCompressor_Impl.hpp index 7a4014a0605..abe4f0555b1 100644 --- a/src/model/RefrigerationCompressor_Impl.hpp +++ b/src/model/RefrigerationCompressor_Impl.hpp @@ -30,7 +30,7 @@ namespace model { RefrigerationCompressor_Impl(const RefrigerationCompressor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCompressor_Impl() = default; + virtual ~RefrigerationCompressor_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCondenserAirCooled.hpp b/src/model/RefrigerationCondenserAirCooled.hpp index 13a0fe5502b..699c2d3d3f7 100644 --- a/src/model/RefrigerationCondenserAirCooled.hpp +++ b/src/model/RefrigerationCondenserAirCooled.hpp @@ -32,7 +32,7 @@ namespace model { explicit RefrigerationCondenserAirCooled(const Model& model); - virtual ~RefrigerationCondenserAirCooled() = default; + virtual ~RefrigerationCondenserAirCooled() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCondenserAirCooled(const RefrigerationCondenserAirCooled& other) = default; RefrigerationCondenserAirCooled(RefrigerationCondenserAirCooled&& other) = default; diff --git a/src/model/RefrigerationCondenserAirCooled_Impl.hpp b/src/model/RefrigerationCondenserAirCooled_Impl.hpp index 76b90c754fa..90449e7fa6c 100644 --- a/src/model/RefrigerationCondenserAirCooled_Impl.hpp +++ b/src/model/RefrigerationCondenserAirCooled_Impl.hpp @@ -31,7 +31,7 @@ namespace model { RefrigerationCondenserAirCooled_Impl(const RefrigerationCondenserAirCooled_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCondenserAirCooled_Impl() = default; + virtual ~RefrigerationCondenserAirCooled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCondenserCascade.hpp b/src/model/RefrigerationCondenserCascade.hpp index 68dd8ac7394..8d83a916895 100644 --- a/src/model/RefrigerationCondenserCascade.hpp +++ b/src/model/RefrigerationCondenserCascade.hpp @@ -30,7 +30,7 @@ namespace model { explicit RefrigerationCondenserCascade(const Model& model); - virtual ~RefrigerationCondenserCascade() = default; + virtual ~RefrigerationCondenserCascade() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCondenserCascade(const RefrigerationCondenserCascade& other) = default; RefrigerationCondenserCascade(RefrigerationCondenserCascade&& other) = default; diff --git a/src/model/RefrigerationCondenserCascade_Impl.hpp b/src/model/RefrigerationCondenserCascade_Impl.hpp index ebd5eef4acc..77e87257304 100644 --- a/src/model/RefrigerationCondenserCascade_Impl.hpp +++ b/src/model/RefrigerationCondenserCascade_Impl.hpp @@ -29,7 +29,7 @@ namespace model { RefrigerationCondenserCascade_Impl(const RefrigerationCondenserCascade_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCondenserCascade_Impl() = default; + virtual ~RefrigerationCondenserCascade_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCondenserEvaporativeCooled.hpp b/src/model/RefrigerationCondenserEvaporativeCooled.hpp index 76d049a95d0..2e6d228075a 100644 --- a/src/model/RefrigerationCondenserEvaporativeCooled.hpp +++ b/src/model/RefrigerationCondenserEvaporativeCooled.hpp @@ -33,7 +33,7 @@ namespace model { explicit RefrigerationCondenserEvaporativeCooled(const Model& model); - virtual ~RefrigerationCondenserEvaporativeCooled() = default; + virtual ~RefrigerationCondenserEvaporativeCooled() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCondenserEvaporativeCooled(const RefrigerationCondenserEvaporativeCooled& other) = default; RefrigerationCondenserEvaporativeCooled(RefrigerationCondenserEvaporativeCooled&& other) = default; diff --git a/src/model/RefrigerationCondenserEvaporativeCooled_Impl.hpp b/src/model/RefrigerationCondenserEvaporativeCooled_Impl.hpp index 65b51f14b2e..4670c9ab52a 100644 --- a/src/model/RefrigerationCondenserEvaporativeCooled_Impl.hpp +++ b/src/model/RefrigerationCondenserEvaporativeCooled_Impl.hpp @@ -32,7 +32,7 @@ namespace model { RefrigerationCondenserEvaporativeCooled_Impl(const RefrigerationCondenserEvaporativeCooled_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCondenserEvaporativeCooled_Impl() = default; + virtual ~RefrigerationCondenserEvaporativeCooled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationCondenserWaterCooled.hpp b/src/model/RefrigerationCondenserWaterCooled.hpp index c0ca2be6369..194d39ef591 100644 --- a/src/model/RefrigerationCondenserWaterCooled.hpp +++ b/src/model/RefrigerationCondenserWaterCooled.hpp @@ -31,7 +31,7 @@ namespace model { explicit RefrigerationCondenserWaterCooled(const Model& model); - virtual ~RefrigerationCondenserWaterCooled() = default; + virtual ~RefrigerationCondenserWaterCooled() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationCondenserWaterCooled(const RefrigerationCondenserWaterCooled& other) = default; RefrigerationCondenserWaterCooled(RefrigerationCondenserWaterCooled&& other) = default; diff --git a/src/model/RefrigerationCondenserWaterCooled_Impl.hpp b/src/model/RefrigerationCondenserWaterCooled_Impl.hpp index d8e5bb0902b..831c541db6c 100644 --- a/src/model/RefrigerationCondenserWaterCooled_Impl.hpp +++ b/src/model/RefrigerationCondenserWaterCooled_Impl.hpp @@ -30,7 +30,7 @@ namespace model { RefrigerationCondenserWaterCooled_Impl(const RefrigerationCondenserWaterCooled_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationCondenserWaterCooled_Impl() = default; + virtual ~RefrigerationCondenserWaterCooled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationDefrostCycleParameters.hpp b/src/model/RefrigerationDefrostCycleParameters.hpp index 1a31befa76b..966e1e1bffc 100644 --- a/src/model/RefrigerationDefrostCycleParameters.hpp +++ b/src/model/RefrigerationDefrostCycleParameters.hpp @@ -27,7 +27,7 @@ namespace model { explicit RefrigerationDefrostCycleParameters(const Model& model); - virtual ~RefrigerationDefrostCycleParameters() = default; + virtual ~RefrigerationDefrostCycleParameters() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationDefrostCycleParameters(const RefrigerationDefrostCycleParameters& other) = default; RefrigerationDefrostCycleParameters(RefrigerationDefrostCycleParameters&& other) = default; diff --git a/src/model/RefrigerationDefrostCycleParameters_Impl.hpp b/src/model/RefrigerationDefrostCycleParameters_Impl.hpp index af1bace9907..f0826316592 100644 --- a/src/model/RefrigerationDefrostCycleParameters_Impl.hpp +++ b/src/model/RefrigerationDefrostCycleParameters_Impl.hpp @@ -30,7 +30,7 @@ namespace model { RefrigerationDefrostCycleParameters_Impl(const RefrigerationDefrostCycleParameters_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationDefrostCycleParameters_Impl() = default; + virtual ~RefrigerationDefrostCycleParameters_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationGasCoolerAirCooled.hpp b/src/model/RefrigerationGasCoolerAirCooled.hpp index e0d28125c47..e6fc2c2dc72 100644 --- a/src/model/RefrigerationGasCoolerAirCooled.hpp +++ b/src/model/RefrigerationGasCoolerAirCooled.hpp @@ -31,7 +31,7 @@ namespace model { explicit RefrigerationGasCoolerAirCooled(const Model& model); - virtual ~RefrigerationGasCoolerAirCooled() = default; + virtual ~RefrigerationGasCoolerAirCooled() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationGasCoolerAirCooled(const RefrigerationGasCoolerAirCooled& other) = default; RefrigerationGasCoolerAirCooled(RefrigerationGasCoolerAirCooled&& other) = default; diff --git a/src/model/RefrigerationGasCoolerAirCooled_Impl.hpp b/src/model/RefrigerationGasCoolerAirCooled_Impl.hpp index ddee86c91b2..4ffce7e0a8a 100644 --- a/src/model/RefrigerationGasCoolerAirCooled_Impl.hpp +++ b/src/model/RefrigerationGasCoolerAirCooled_Impl.hpp @@ -31,7 +31,7 @@ namespace model { RefrigerationGasCoolerAirCooled_Impl(const RefrigerationGasCoolerAirCooled_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationGasCoolerAirCooled_Impl() = default; + virtual ~RefrigerationGasCoolerAirCooled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationSecondarySystem.hpp b/src/model/RefrigerationSecondarySystem.hpp index d38d925c610..b7564276a2d 100644 --- a/src/model/RefrigerationSecondarySystem.hpp +++ b/src/model/RefrigerationSecondarySystem.hpp @@ -35,7 +35,7 @@ namespace model { explicit RefrigerationSecondarySystem(const Model& model); - virtual ~RefrigerationSecondarySystem() = default; + virtual ~RefrigerationSecondarySystem() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationSecondarySystem(const RefrigerationSecondarySystem& other) = default; RefrigerationSecondarySystem(RefrigerationSecondarySystem&& other) = default; diff --git a/src/model/RefrigerationSecondarySystem_Impl.hpp b/src/model/RefrigerationSecondarySystem_Impl.hpp index a5a1454f805..b536e981259 100644 --- a/src/model/RefrigerationSecondarySystem_Impl.hpp +++ b/src/model/RefrigerationSecondarySystem_Impl.hpp @@ -35,7 +35,7 @@ namespace model { RefrigerationSecondarySystem_Impl(const RefrigerationSecondarySystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationSecondarySystem_Impl() = default; + virtual ~RefrigerationSecondarySystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationSubcoolerLiquidSuction.hpp b/src/model/RefrigerationSubcoolerLiquidSuction.hpp index edae2775d61..15b8c61f657 100644 --- a/src/model/RefrigerationSubcoolerLiquidSuction.hpp +++ b/src/model/RefrigerationSubcoolerLiquidSuction.hpp @@ -30,7 +30,7 @@ namespace model { explicit RefrigerationSubcoolerLiquidSuction(const Model& model); - virtual ~RefrigerationSubcoolerLiquidSuction() = default; + virtual ~RefrigerationSubcoolerLiquidSuction() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationSubcoolerLiquidSuction(const RefrigerationSubcoolerLiquidSuction& other) = default; RefrigerationSubcoolerLiquidSuction(RefrigerationSubcoolerLiquidSuction&& other) = default; diff --git a/src/model/RefrigerationSubcoolerLiquidSuction_Impl.hpp b/src/model/RefrigerationSubcoolerLiquidSuction_Impl.hpp index c6e16969205..71ad1329643 100644 --- a/src/model/RefrigerationSubcoolerLiquidSuction_Impl.hpp +++ b/src/model/RefrigerationSubcoolerLiquidSuction_Impl.hpp @@ -29,7 +29,7 @@ namespace model { RefrigerationSubcoolerLiquidSuction_Impl(const RefrigerationSubcoolerLiquidSuction_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationSubcoolerLiquidSuction_Impl() = default; + virtual ~RefrigerationSubcoolerLiquidSuction_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationSubcoolerMechanical.hpp b/src/model/RefrigerationSubcoolerMechanical.hpp index ef06614530c..4194098f5c6 100644 --- a/src/model/RefrigerationSubcoolerMechanical.hpp +++ b/src/model/RefrigerationSubcoolerMechanical.hpp @@ -30,7 +30,7 @@ namespace model { explicit RefrigerationSubcoolerMechanical(const Model& model); - virtual ~RefrigerationSubcoolerMechanical() = default; + virtual ~RefrigerationSubcoolerMechanical() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationSubcoolerMechanical(const RefrigerationSubcoolerMechanical& other) = default; RefrigerationSubcoolerMechanical(RefrigerationSubcoolerMechanical&& other) = default; diff --git a/src/model/RefrigerationSubcoolerMechanical_Impl.hpp b/src/model/RefrigerationSubcoolerMechanical_Impl.hpp index c49068179fa..8dc62b4afb8 100644 --- a/src/model/RefrigerationSubcoolerMechanical_Impl.hpp +++ b/src/model/RefrigerationSubcoolerMechanical_Impl.hpp @@ -29,7 +29,7 @@ namespace model { RefrigerationSubcoolerMechanical_Impl(const RefrigerationSubcoolerMechanical_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationSubcoolerMechanical_Impl() = default; + virtual ~RefrigerationSubcoolerMechanical_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationSystem.cpp b/src/model/RefrigerationSystem.cpp index fb9300b4fce..74ae767fc32 100644 --- a/src/model/RefrigerationSystem.cpp +++ b/src/model/RefrigerationSystem.cpp @@ -848,14 +848,6 @@ namespace model { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_Refrigeration_SystemFields::IntercoolerType); } - std::vector RefrigerationSystem::remove() { - return getImpl()->remove(); - } - - ModelObject RefrigerationSystem::clone(Model model) const { - return getImpl()->clone(model); - } - std::vector RefrigerationSystem::cases() const { return getImpl()->cases(); } diff --git a/src/model/RefrigerationSystem.hpp b/src/model/RefrigerationSystem.hpp index 36cbe6c0166..d6a1627120f 100644 --- a/src/model/RefrigerationSystem.hpp +++ b/src/model/RefrigerationSystem.hpp @@ -38,7 +38,7 @@ namespace model { explicit RefrigerationSystem(const Model& model); - virtual ~RefrigerationSystem() = default; + virtual ~RefrigerationSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationSystem(const RefrigerationSystem& other) = default; RefrigerationSystem(RefrigerationSystem&& other) = default; @@ -55,10 +55,6 @@ namespace model { static std::vector intercoolerTypeValues(); - std::vector remove(); - - ModelObject clone(Model model) const; - // RefrigerationCase will be removed from any ModelObjectList it is already on. Clone the case if you want it on several. bool addCase(const RefrigerationCase& refrigerationCase); diff --git a/src/model/RefrigerationSystem_Impl.hpp b/src/model/RefrigerationSystem_Impl.hpp index f47f7a588fb..61ef8ad8db9 100644 --- a/src/model/RefrigerationSystem_Impl.hpp +++ b/src/model/RefrigerationSystem_Impl.hpp @@ -38,7 +38,7 @@ namespace model { RefrigerationSystem_Impl(const RefrigerationSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationSystem_Impl() = default; + virtual ~RefrigerationSystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationTranscriticalSystem.hpp b/src/model/RefrigerationTranscriticalSystem.hpp index e004c862d34..0caf03a08fe 100644 --- a/src/model/RefrigerationTranscriticalSystem.hpp +++ b/src/model/RefrigerationTranscriticalSystem.hpp @@ -34,7 +34,7 @@ namespace model { explicit RefrigerationTranscriticalSystem(const Model& model); - virtual ~RefrigerationTranscriticalSystem() = default; + virtual ~RefrigerationTranscriticalSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationTranscriticalSystem(const RefrigerationTranscriticalSystem& other) = default; RefrigerationTranscriticalSystem(RefrigerationTranscriticalSystem&& other) = default; diff --git a/src/model/RefrigerationTranscriticalSystem_Impl.hpp b/src/model/RefrigerationTranscriticalSystem_Impl.hpp index a753f3efc08..6a31320e11e 100644 --- a/src/model/RefrigerationTranscriticalSystem_Impl.hpp +++ b/src/model/RefrigerationTranscriticalSystem_Impl.hpp @@ -34,7 +34,7 @@ namespace model { RefrigerationTranscriticalSystem_Impl(const RefrigerationTranscriticalSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationTranscriticalSystem_Impl() = default; + virtual ~RefrigerationTranscriticalSystem_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationWalkIn.hpp b/src/model/RefrigerationWalkIn.hpp index 7f3c60943ba..f7cead6b110 100644 --- a/src/model/RefrigerationWalkIn.hpp +++ b/src/model/RefrigerationWalkIn.hpp @@ -38,7 +38,7 @@ namespace model { explicit RefrigerationWalkIn(const Model& model, Schedule& walkinDefrostSchedule); - virtual ~RefrigerationWalkIn() = default; + virtual ~RefrigerationWalkIn() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationWalkIn(const RefrigerationWalkIn& other) = default; RefrigerationWalkIn(RefrigerationWalkIn&& other) = default; diff --git a/src/model/RefrigerationWalkInZoneBoundary.hpp b/src/model/RefrigerationWalkInZoneBoundary.hpp index a489dea6b06..0b3daecb2ba 100644 --- a/src/model/RefrigerationWalkInZoneBoundary.hpp +++ b/src/model/RefrigerationWalkInZoneBoundary.hpp @@ -31,7 +31,7 @@ namespace model { explicit RefrigerationWalkInZoneBoundary(const Model& model); - virtual ~RefrigerationWalkInZoneBoundary() = default; + virtual ~RefrigerationWalkInZoneBoundary() override = default; // Default the copy and move operators because the virtual dtor is explicit RefrigerationWalkInZoneBoundary(const RefrigerationWalkInZoneBoundary& other) = default; RefrigerationWalkInZoneBoundary(RefrigerationWalkInZoneBoundary&& other) = default; diff --git a/src/model/RefrigerationWalkInZoneBoundary_Impl.hpp b/src/model/RefrigerationWalkInZoneBoundary_Impl.hpp index 893393286bc..9868b3e11e4 100644 --- a/src/model/RefrigerationWalkInZoneBoundary_Impl.hpp +++ b/src/model/RefrigerationWalkInZoneBoundary_Impl.hpp @@ -30,7 +30,7 @@ namespace model { RefrigerationWalkInZoneBoundary_Impl(const RefrigerationWalkInZoneBoundary_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationWalkInZoneBoundary_Impl() = default; + virtual ~RefrigerationWalkInZoneBoundary_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RefrigerationWalkIn_Impl.hpp b/src/model/RefrigerationWalkIn_Impl.hpp index 546384c115f..faa04b480ae 100644 --- a/src/model/RefrigerationWalkIn_Impl.hpp +++ b/src/model/RefrigerationWalkIn_Impl.hpp @@ -39,7 +39,7 @@ namespace model { RefrigerationWalkIn_Impl(const RefrigerationWalkIn_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RefrigerationWalkIn_Impl() = default; + virtual ~RefrigerationWalkIn_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/RenderingColor.hpp b/src/model/RenderingColor.hpp index 55acbb77662..e8684758902 100644 --- a/src/model/RenderingColor.hpp +++ b/src/model/RenderingColor.hpp @@ -42,7 +42,7 @@ namespace model { explicit RenderingColor(const Model& model); - virtual ~RenderingColor() = default; + virtual ~RenderingColor() override = default; // Default the copy and move operators because the virtual dtor is explicit RenderingColor(const RenderingColor& other) = default; RenderingColor(RenderingColor&& other) = default; diff --git a/src/model/RenderingColor_Impl.hpp b/src/model/RenderingColor_Impl.hpp index e14ebe8571b..6b9389881a7 100644 --- a/src/model/RenderingColor_Impl.hpp +++ b/src/model/RenderingColor_Impl.hpp @@ -30,7 +30,7 @@ namespace model { RenderingColor_Impl(const RenderingColor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RenderingColor_Impl() = default; + virtual ~RenderingColor_Impl() override = default; //@} virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ResourceObject.hpp b/src/model/ResourceObject.hpp index d67eb7e1e1c..e4a962bc31d 100644 --- a/src/model/ResourceObject.hpp +++ b/src/model/ResourceObject.hpp @@ -41,7 +41,7 @@ namespace model { * If excludeChildren is true then children of this object do not contribute to the use count.*/ unsigned nonResourceObjectUseCount(bool excludeChildren = false) const; - virtual ~ResourceObject() = default; + virtual ~ResourceObject() override = default; // Default the copy and move operators because the virtual dtor is explicit ResourceObject(const ResourceObject& other) = default; ResourceObject(ResourceObject&& other) = default; diff --git a/src/model/ResourceObject_Impl.hpp b/src/model/ResourceObject_Impl.hpp index 081d7ba73f1..ea72563d37e 100644 --- a/src/model/ResourceObject_Impl.hpp +++ b/src/model/ResourceObject_Impl.hpp @@ -29,7 +29,7 @@ namespace model { // Clone copy constructor. ResourceObject_Impl(const ResourceObject_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ResourceObject_Impl() = default; + virtual ~ResourceObject_Impl() override = default; unsigned directUseCount(bool excludeChildren) const; diff --git a/src/model/RoofVegetation.cpp b/src/model/RoofVegetation.cpp index fabc6c07de4..ba6abf39dae 100644 --- a/src/model/RoofVegetation.cpp +++ b/src/model/RoofVegetation.cpp @@ -731,6 +731,7 @@ namespace model { return getImpl()->isRoughnessDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double RoofVegetation::thickness() const { return getImpl()->thickness(); } @@ -763,6 +764,7 @@ namespace model { return getImpl()->isSpecificHeatofDrySoilDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes OptionalDouble RoofVegetation::thermalAbsorptance() const { return getImpl()->thermalAbsorptance(); } @@ -771,6 +773,7 @@ namespace model { return getImpl()->isThermalAbsorptanceDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes OptionalDouble RoofVegetation::solarAbsorptance() const { return getImpl()->solarAbsorptance(); } @@ -779,6 +782,7 @@ namespace model { return getImpl()->isSolarAbsorptanceDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes OptionalDouble RoofVegetation::visibleAbsorptance() const { return getImpl()->visibleAbsorptance(); } @@ -899,6 +903,7 @@ namespace model { getImpl()->resetRoughness(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool RoofVegetation::setThickness(double thickness) { return getImpl()->setThickness(thickness); } @@ -931,6 +936,7 @@ namespace model { getImpl()->resetSpecificHeatofDrySoil(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool RoofVegetation::setThermalAbsorptance(double thermalAbsorptance) { return getImpl()->setThermalAbsorptance(thermalAbsorptance); } diff --git a/src/model/RoofVegetation.hpp b/src/model/RoofVegetation.hpp index 1ea16bd53ff..d13fdb9da21 100644 --- a/src/model/RoofVegetation.hpp +++ b/src/model/RoofVegetation.hpp @@ -28,7 +28,7 @@ namespace model { explicit RoofVegetation(const Model& model, const std::string& roughness = "Smooth"); - virtual ~RoofVegetation() = default; + virtual ~RoofVegetation() override = default; // Default the copy and move operators because the virtual dtor is explicit RoofVegetation(const RoofVegetation& other) = default; RoofVegetation(RoofVegetation&& other) = default; diff --git a/src/model/RoofVegetation_Impl.hpp b/src/model/RoofVegetation_Impl.hpp index 47836634b59..67b36f0082f 100644 --- a/src/model/RoofVegetation_Impl.hpp +++ b/src/model/RoofVegetation_Impl.hpp @@ -28,7 +28,7 @@ namespace model { RoofVegetation_Impl(const RoofVegetation_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RoofVegetation_Impl() = default; + virtual ~RoofVegetation_Impl() override = default; //@} diff --git a/src/model/RunPeriod.hpp b/src/model/RunPeriod.hpp index 8ba103044d7..b80f0ac59ba 100644 --- a/src/model/RunPeriod.hpp +++ b/src/model/RunPeriod.hpp @@ -27,7 +27,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~RunPeriod() = default; + virtual ~RunPeriod() override = default; // Default the copy and move operators because the virtual dtor is explicit RunPeriod(const RunPeriod& other) = default; RunPeriod(RunPeriod&& other) = default; diff --git a/src/model/RunPeriodControlDaylightSavingTime.hpp b/src/model/RunPeriodControlDaylightSavingTime.hpp index bd127757ccd..42d5b828ca6 100644 --- a/src/model/RunPeriodControlDaylightSavingTime.hpp +++ b/src/model/RunPeriodControlDaylightSavingTime.hpp @@ -31,7 +31,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~RunPeriodControlDaylightSavingTime() = default; + virtual ~RunPeriodControlDaylightSavingTime() override = default; // Default the copy and move operators because the virtual dtor is explicit RunPeriodControlDaylightSavingTime(const RunPeriodControlDaylightSavingTime& other) = default; RunPeriodControlDaylightSavingTime(RunPeriodControlDaylightSavingTime&& other) = default; diff --git a/src/model/RunPeriodControlDaylightSavingTime_Impl.hpp b/src/model/RunPeriodControlDaylightSavingTime_Impl.hpp index 9c6c9033192..f5dece0f6d8 100644 --- a/src/model/RunPeriodControlDaylightSavingTime_Impl.hpp +++ b/src/model/RunPeriodControlDaylightSavingTime_Impl.hpp @@ -33,7 +33,7 @@ namespace model { RunPeriodControlDaylightSavingTime_Impl(const RunPeriodControlDaylightSavingTime_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~RunPeriodControlDaylightSavingTime_Impl() = default; + virtual ~RunPeriodControlDaylightSavingTime_Impl() override = default; //@} diff --git a/src/model/RunPeriodControlSpecialDays.hpp b/src/model/RunPeriodControlSpecialDays.hpp index 3046c843963..02afc4d8ba5 100644 --- a/src/model/RunPeriodControlSpecialDays.hpp +++ b/src/model/RunPeriodControlSpecialDays.hpp @@ -40,7 +40,7 @@ namespace model { RunPeriodControlSpecialDays(const openstudio::NthDayOfWeekInMonth& nth, const openstudio::DayOfWeek& dayOfWeek, const openstudio::MonthOfYear& monthOfYear, Model& model); - virtual ~RunPeriodControlSpecialDays() = default; + virtual ~RunPeriodControlSpecialDays() override = default; // Default the copy and move operators because the virtual dtor is explicit RunPeriodControlSpecialDays(const RunPeriodControlSpecialDays& other) = default; RunPeriodControlSpecialDays(RunPeriodControlSpecialDays&& other) = default; diff --git a/src/model/RunPeriodControlSpecialDays_Impl.hpp b/src/model/RunPeriodControlSpecialDays_Impl.hpp index e3d58be4c7c..5f56194667f 100644 --- a/src/model/RunPeriodControlSpecialDays_Impl.hpp +++ b/src/model/RunPeriodControlSpecialDays_Impl.hpp @@ -32,7 +32,7 @@ namespace model { RunPeriodControlSpecialDays_Impl(const RunPeriodControlSpecialDays_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~RunPeriodControlSpecialDays_Impl() = default; + virtual ~RunPeriodControlSpecialDays_Impl() override = default; Date startDate() const; unsigned duration() const; diff --git a/src/model/RunPeriod_Impl.hpp b/src/model/RunPeriod_Impl.hpp index 9d47f55fe83..c9d482ad794 100644 --- a/src/model/RunPeriod_Impl.hpp +++ b/src/model/RunPeriod_Impl.hpp @@ -26,7 +26,7 @@ namespace model { RunPeriod_Impl(const RunPeriod_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~RunPeriod_Impl() = default; + virtual ~RunPeriod_Impl() override = default; int getBeginMonth() const; int getBeginDayOfMonth() const; diff --git a/src/model/Schedule.hpp b/src/model/Schedule.hpp index 2e58564c111..2b3b0aae739 100644 --- a/src/model/Schedule.hpp +++ b/src/model/Schedule.hpp @@ -37,7 +37,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~Schedule() = default; + virtual ~Schedule() override = default; // Default the copy and move operators because the virtual dtor is explicit Schedule(const Schedule& other) = default; Schedule(Schedule&& other) = default; diff --git a/src/model/ScheduleBase.hpp b/src/model/ScheduleBase.hpp index 34e29b8121f..8e273ad0476 100644 --- a/src/model/ScheduleBase.hpp +++ b/src/model/ScheduleBase.hpp @@ -32,7 +32,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ScheduleBase() = default; + virtual ~ScheduleBase() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleBase(const ScheduleBase& other) = default; ScheduleBase(ScheduleBase&& other) = default; diff --git a/src/model/ScheduleBase_Impl.hpp b/src/model/ScheduleBase_Impl.hpp index 45999256d8f..9e9bb8ed51f 100644 --- a/src/model/ScheduleBase_Impl.hpp +++ b/src/model/ScheduleBase_Impl.hpp @@ -35,7 +35,7 @@ namespace model { ScheduleBase_Impl(const ScheduleBase_Impl& other, Model_Impl* model, bool keepHandles); // virtual destructor - virtual ~ScheduleBase_Impl() = default; + virtual ~ScheduleBase_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/ScheduleCompact.hpp b/src/model/ScheduleCompact.hpp index 69eb75e1367..62f1f3a90c6 100644 --- a/src/model/ScheduleCompact.hpp +++ b/src/model/ScheduleCompact.hpp @@ -32,7 +32,7 @@ namespace model { /** Creates a ScheduleCompact with constantValue applied to the entire year, if * scheduleTypeLimits() and the units are compatible. Otherwise creates an empty * ScheduleCompact. */ - virtual ~ScheduleCompact() = default; + virtual ~ScheduleCompact() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleCompact(const ScheduleCompact& other) = default; ScheduleCompact(ScheduleCompact&& other) = default; diff --git a/src/model/ScheduleCompact_Impl.hpp b/src/model/ScheduleCompact_Impl.hpp index 84600cd0e0f..44025009f05 100644 --- a/src/model/ScheduleCompact_Impl.hpp +++ b/src/model/ScheduleCompact_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ScheduleCompact_Impl(const ScheduleCompact_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ScheduleCompact_Impl() = default; + virtual ~ScheduleCompact_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/ScheduleConstant.hpp b/src/model/ScheduleConstant.hpp index 9230d5e37d0..2da1877acc8 100644 --- a/src/model/ScheduleConstant.hpp +++ b/src/model/ScheduleConstant.hpp @@ -26,7 +26,7 @@ namespace model { /** Creates new ScheduleConstant in model and sets its value to 0.0. */ explicit ScheduleConstant(const Model& model); - virtual ~ScheduleConstant() = default; + virtual ~ScheduleConstant() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleConstant(const ScheduleConstant& other) = default; ScheduleConstant(ScheduleConstant&& other) = default; diff --git a/src/model/ScheduleConstant_Impl.hpp b/src/model/ScheduleConstant_Impl.hpp index 54efefe8cf1..45a48d3a123 100644 --- a/src/model/ScheduleConstant_Impl.hpp +++ b/src/model/ScheduleConstant_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ScheduleConstant_Impl(const ScheduleConstant_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ScheduleConstant_Impl() = default; + virtual ~ScheduleConstant_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleDay.hpp b/src/model/ScheduleDay.hpp index 70feeba5e18..73ec8d34116 100644 --- a/src/model/ScheduleDay.hpp +++ b/src/model/ScheduleDay.hpp @@ -36,7 +36,7 @@ namespace model { /** Initializes the schedule to value until 24:00. */ ScheduleDay(const Model& model, double value); - virtual ~ScheduleDay() = default; + virtual ~ScheduleDay() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleDay(const ScheduleDay& other) = default; ScheduleDay(ScheduleDay&& other) = default; diff --git a/src/model/ScheduleDay_Impl.hpp b/src/model/ScheduleDay_Impl.hpp index ff704c4ac07..3c42c7b2002 100644 --- a/src/model/ScheduleDay_Impl.hpp +++ b/src/model/ScheduleDay_Impl.hpp @@ -38,7 +38,7 @@ namespace model { ScheduleDay_Impl(const ScheduleDay_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleDay_Impl() = default; + virtual ~ScheduleDay_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleFile.hpp b/src/model/ScheduleFile.hpp index 9d95b07a27e..d654b0fb143 100644 --- a/src/model/ScheduleFile.hpp +++ b/src/model/ScheduleFile.hpp @@ -36,7 +36,7 @@ namespace model { ScheduleFile(const Model& model, const openstudio::path& filePath, int column = 1, int rowsToSkip = 0); - virtual ~ScheduleFile() = default; + virtual ~ScheduleFile() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleFile(const ScheduleFile& other) = default; ScheduleFile(ScheduleFile&& other) = default; diff --git a/src/model/ScheduleFile_Impl.hpp b/src/model/ScheduleFile_Impl.hpp index 5c125645bf0..2904163ab93 100644 --- a/src/model/ScheduleFile_Impl.hpp +++ b/src/model/ScheduleFile_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ScheduleFile_Impl(const ScheduleFile_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleFile_Impl() = default; + virtual ~ScheduleFile_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleFixedInterval.hpp b/src/model/ScheduleFixedInterval.hpp index 843d387ea84..d02316bb9eb 100644 --- a/src/model/ScheduleFixedInterval.hpp +++ b/src/model/ScheduleFixedInterval.hpp @@ -28,7 +28,7 @@ namespace model { explicit ScheduleFixedInterval(const Model& model); - virtual ~ScheduleFixedInterval() = default; + virtual ~ScheduleFixedInterval() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleFixedInterval(const ScheduleFixedInterval& other) = default; ScheduleFixedInterval(ScheduleFixedInterval&& other) = default; diff --git a/src/model/ScheduleFixedInterval_Impl.hpp b/src/model/ScheduleFixedInterval_Impl.hpp index b5f18fd4d5e..1b2f5eae587 100644 --- a/src/model/ScheduleFixedInterval_Impl.hpp +++ b/src/model/ScheduleFixedInterval_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ScheduleFixedInterval_Impl(const ScheduleFixedInterval_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleFixedInterval_Impl() = default; + virtual ~ScheduleFixedInterval_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleInterval.hpp b/src/model/ScheduleInterval.hpp index 05a51493267..6a9c6cd45d1 100644 --- a/src/model/ScheduleInterval.hpp +++ b/src/model/ScheduleInterval.hpp @@ -28,7 +28,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ScheduleInterval() = default; + virtual ~ScheduleInterval() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleInterval(const ScheduleInterval& other) = default; ScheduleInterval(ScheduleInterval&& other) = default; diff --git a/src/model/ScheduleInterval_Impl.hpp b/src/model/ScheduleInterval_Impl.hpp index 3c47121a776..3c6aed62d94 100644 --- a/src/model/ScheduleInterval_Impl.hpp +++ b/src/model/ScheduleInterval_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ScheduleInterval_Impl(const ScheduleInterval_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ScheduleInterval_Impl() = default; + virtual ~ScheduleInterval_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleRule.hpp b/src/model/ScheduleRule.hpp index 6e6be3dbe05..7d48680ee4c 100644 --- a/src/model/ScheduleRule.hpp +++ b/src/model/ScheduleRule.hpp @@ -40,7 +40,7 @@ namespace model { /// The given daySchedule is cloned and the new object is owned by (a child of) this rule. explicit ScheduleRule(ScheduleRuleset& scheduleRuleset, const ScheduleDay& daySchedule); - virtual ~ScheduleRule() = default; + virtual ~ScheduleRule() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleRule(const ScheduleRule& other) = default; ScheduleRule(ScheduleRule&& other) = default; diff --git a/src/model/ScheduleRule_Impl.hpp b/src/model/ScheduleRule_Impl.hpp index 5908249dd2f..27ff0a4705f 100644 --- a/src/model/ScheduleRule_Impl.hpp +++ b/src/model/ScheduleRule_Impl.hpp @@ -34,7 +34,7 @@ namespace model { ScheduleRule_Impl(const ScheduleRule_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleRule_Impl() = default; + virtual ~ScheduleRule_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleRuleset.hpp b/src/model/ScheduleRuleset.hpp index c0e9688d66f..6d3516a3481 100644 --- a/src/model/ScheduleRuleset.hpp +++ b/src/model/ScheduleRuleset.hpp @@ -42,7 +42,7 @@ namespace model { * and assigns it to be the defaultDaySchedule(). */ ScheduleRuleset(const Model& model, double value); - virtual ~ScheduleRuleset() = default; + virtual ~ScheduleRuleset() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleRuleset(const ScheduleRuleset& other) = default; ScheduleRuleset(ScheduleRuleset&& other) = default; diff --git a/src/model/ScheduleRuleset_Impl.hpp b/src/model/ScheduleRuleset_Impl.hpp index 13eb97e9b1b..7bf3e87e745 100644 --- a/src/model/ScheduleRuleset_Impl.hpp +++ b/src/model/ScheduleRuleset_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ScheduleRuleset_Impl(const ScheduleRuleset_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleRuleset_Impl() = default; + virtual ~ScheduleRuleset_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleTypeLimits.hpp b/src/model/ScheduleTypeLimits.hpp index 6ed3029f60b..9a850dfc59d 100644 --- a/src/model/ScheduleTypeLimits.hpp +++ b/src/model/ScheduleTypeLimits.hpp @@ -31,7 +31,7 @@ namespace model { explicit ScheduleTypeLimits(const Model& model); - virtual ~ScheduleTypeLimits() = default; + virtual ~ScheduleTypeLimits() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleTypeLimits(const ScheduleTypeLimits& other) = default; ScheduleTypeLimits(ScheduleTypeLimits&& other) = default; diff --git a/src/model/ScheduleTypeLimits_Impl.hpp b/src/model/ScheduleTypeLimits_Impl.hpp index 0f21e3d17b8..6120c6cce21 100644 --- a/src/model/ScheduleTypeLimits_Impl.hpp +++ b/src/model/ScheduleTypeLimits_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ScheduleTypeLimits_Impl(const ScheduleTypeLimits_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleTypeLimits_Impl() = default; + virtual ~ScheduleTypeLimits_Impl() override = default; //@} diff --git a/src/model/ScheduleVariableInterval.hpp b/src/model/ScheduleVariableInterval.hpp index 7c27e2bba40..8200aa8a58f 100644 --- a/src/model/ScheduleVariableInterval.hpp +++ b/src/model/ScheduleVariableInterval.hpp @@ -28,7 +28,7 @@ namespace model { explicit ScheduleVariableInterval(const Model& model); - virtual ~ScheduleVariableInterval() = default; + virtual ~ScheduleVariableInterval() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleVariableInterval(const ScheduleVariableInterval& other) = default; ScheduleVariableInterval(ScheduleVariableInterval&& other) = default; diff --git a/src/model/ScheduleVariableInterval_Impl.hpp b/src/model/ScheduleVariableInterval_Impl.hpp index d9f37388c14..5bc2a05f518 100644 --- a/src/model/ScheduleVariableInterval_Impl.hpp +++ b/src/model/ScheduleVariableInterval_Impl.hpp @@ -28,7 +28,7 @@ namespace model { ScheduleVariableInterval_Impl(const ScheduleVariableInterval_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleVariableInterval_Impl() = default; + virtual ~ScheduleVariableInterval_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ScheduleWeek.hpp b/src/model/ScheduleWeek.hpp index 445dc03c93a..a5ad49eebd2 100644 --- a/src/model/ScheduleWeek.hpp +++ b/src/model/ScheduleWeek.hpp @@ -30,7 +30,7 @@ namespace model { explicit ScheduleWeek(const Model& model); - virtual ~ScheduleWeek() = default; + virtual ~ScheduleWeek() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleWeek(const ScheduleWeek& other) = default; ScheduleWeek(ScheduleWeek&& other) = default; diff --git a/src/model/ScheduleWeek_Impl.hpp b/src/model/ScheduleWeek_Impl.hpp index 74e57c7cdd5..b0098113ad9 100644 --- a/src/model/ScheduleWeek_Impl.hpp +++ b/src/model/ScheduleWeek_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ScheduleWeek_Impl(const ScheduleWeek_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleWeek_Impl() = default; + virtual ~ScheduleWeek_Impl() override = default; //@} virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ScheduleYear.hpp b/src/model/ScheduleYear.hpp index 0cd1fde3ab0..1d4b454dcb0 100644 --- a/src/model/ScheduleYear.hpp +++ b/src/model/ScheduleYear.hpp @@ -32,7 +32,7 @@ namespace model { explicit ScheduleYear(const Model& model); - virtual ~ScheduleYear() = default; + virtual ~ScheduleYear() override = default; // Default the copy and move operators because the virtual dtor is explicit ScheduleYear(const ScheduleYear& other) = default; ScheduleYear(ScheduleYear&& other) = default; diff --git a/src/model/ScheduleYear_Impl.hpp b/src/model/ScheduleYear_Impl.hpp index a5eb79015a9..48b26f66724 100644 --- a/src/model/ScheduleYear_Impl.hpp +++ b/src/model/ScheduleYear_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ScheduleYear_Impl(const ScheduleYear_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ScheduleYear_Impl() = default; + virtual ~ScheduleYear_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Schedule_Impl.hpp b/src/model/Schedule_Impl.hpp index 3fff9fbba30..eebea3aa3a2 100644 --- a/src/model/Schedule_Impl.hpp +++ b/src/model/Schedule_Impl.hpp @@ -32,7 +32,7 @@ namespace model { Schedule_Impl(const Schedule_Impl& other, Model_Impl* model, bool keepHandles); // virtual destructor - virtual ~Schedule_Impl() = default; + virtual ~Schedule_Impl() override = default; //@} protected: diff --git a/src/model/Screen.hpp b/src/model/Screen.hpp index 023e5aa5368..190f7009772 100644 --- a/src/model/Screen.hpp +++ b/src/model/Screen.hpp @@ -29,7 +29,7 @@ namespace model { explicit Screen(const Model& model, double diffuseSolarReflectance = 0.08, double diffuseVisibleReflectance = 0.08, double screenMaterialSpacing = 0.00157, double screenMaterialDiameter = 0.000381); - virtual ~Screen() = default; + virtual ~Screen() override = default; // Default the copy and move operators because the virtual dtor is explicit Screen(const Screen& other) = default; Screen(Screen&& other) = default; diff --git a/src/model/Screen_Impl.hpp b/src/model/Screen_Impl.hpp index 6af74fb1dba..087f9c49d42 100644 --- a/src/model/Screen_Impl.hpp +++ b/src/model/Screen_Impl.hpp @@ -28,7 +28,7 @@ namespace model { Screen_Impl(const Screen_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Screen_Impl() = default; + virtual ~Screen_Impl() override = default; //@} diff --git a/src/model/SetpointManager.hpp b/src/model/SetpointManager.hpp index d72d122c3fe..6cb2fa5d1b9 100644 --- a/src/model/SetpointManager.hpp +++ b/src/model/SetpointManager.hpp @@ -28,7 +28,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~SetpointManager() = default; + virtual ~SetpointManager() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManager(const SetpointManager& other) = default; SetpointManager(SetpointManager&& other) = default; diff --git a/src/model/SetpointManagerColdest.cpp b/src/model/SetpointManagerColdest.cpp index 639982e6eb5..c8b3c1e9922 100644 --- a/src/model/SetpointManagerColdest.cpp +++ b/src/model/SetpointManagerColdest.cpp @@ -122,10 +122,6 @@ namespace model { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_SetpointManager_ColdestFields::Strategy); } - std::string SetpointManagerColdest::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerColdest::minimumSetpointTemperature() const { return getImpl()->minimumSetpointTemperature(); } @@ -138,14 +134,6 @@ namespace model { return getImpl()->strategy(); } - boost::optional SetpointManagerColdest::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerColdest::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerColdest::setMinimumSetpointTemperature(double minimumSetpointTemperature) { return getImpl()->setMinimumSetpointTemperature(minimumSetpointTemperature); } diff --git a/src/model/SetpointManagerColdest.hpp b/src/model/SetpointManagerColdest.hpp index 161471f7663..11275a41df6 100644 --- a/src/model/SetpointManagerColdest.hpp +++ b/src/model/SetpointManagerColdest.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerColdest(const Model& model); - virtual ~SetpointManagerColdest() = default; + virtual ~SetpointManagerColdest() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerColdest(const SetpointManagerColdest& other) = default; SetpointManagerColdest(SetpointManagerColdest&& other) = default; @@ -48,22 +48,16 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointTemperature() const; double maximumSetpointTemperature() const; std::string strategy() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSetpointTemperature(double minimumSetpointTemperature); bool setMaximumSetpointTemperature(double maximumSetpointTemperature); diff --git a/src/model/SetpointManagerColdest_Impl.hpp b/src/model/SetpointManagerColdest_Impl.hpp index 3a5549b9e89..5018907ac56 100644 --- a/src/model/SetpointManagerColdest_Impl.hpp +++ b/src/model/SetpointManagerColdest_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerColdest_Impl(const SetpointManagerColdest_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerColdest_Impl() = default; + virtual ~SetpointManagerColdest_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerFollowGroundTemperature.cpp b/src/model/SetpointManagerFollowGroundTemperature.cpp index 13c056bdc2d..2c7887ab4bf 100644 --- a/src/model/SetpointManagerFollowGroundTemperature.cpp +++ b/src/model/SetpointManagerFollowGroundTemperature.cpp @@ -146,10 +146,6 @@ namespace model { OS_SetpointManager_FollowGroundTemperatureFields::ReferenceGroundTemperatureObjectType); } - std::string SetpointManagerFollowGroundTemperature::controlVariable() const { - return getImpl()->controlVariable(); - } - std::string SetpointManagerFollowGroundTemperature::referenceGroundTemperatureObjectType() const { return getImpl()->referenceGroundTemperatureObjectType(); } @@ -166,14 +162,6 @@ namespace model { return getImpl()->minimumSetpointTemperature(); } - boost::optional SetpointManagerFollowGroundTemperature::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerFollowGroundTemperature::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerFollowGroundTemperature::setReferenceGroundTemperatureObjectType(const std::string& groundTemperatureObjType) { return getImpl()->setReferenceGroundTemperatureObjectType(groundTemperatureObjType); } diff --git a/src/model/SetpointManagerFollowGroundTemperature.hpp b/src/model/SetpointManagerFollowGroundTemperature.hpp index dd44d4ca62a..c5d5ae3073b 100644 --- a/src/model/SetpointManagerFollowGroundTemperature.hpp +++ b/src/model/SetpointManagerFollowGroundTemperature.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerFollowGroundTemperature(const Model& model); - virtual ~SetpointManagerFollowGroundTemperature() = default; + virtual ~SetpointManagerFollowGroundTemperature() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerFollowGroundTemperature(const SetpointManagerFollowGroundTemperature& other) = default; SetpointManagerFollowGroundTemperature(SetpointManagerFollowGroundTemperature&& other) = default; @@ -48,8 +48,6 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - std::string referenceGroundTemperatureObjectType() const; double offsetTemperatureDifference() const; @@ -58,14 +56,10 @@ namespace model { double minimumSetpointTemperature() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setReferenceGroundTemperatureObjectType(const std::string& groundTemperatureObjType); bool setOffsetTemperatureDifference(double offsetTemperatureDifference); diff --git a/src/model/SetpointManagerFollowGroundTemperature_Impl.hpp b/src/model/SetpointManagerFollowGroundTemperature_Impl.hpp index 2945d964632..4323fe16e5e 100644 --- a/src/model/SetpointManagerFollowGroundTemperature_Impl.hpp +++ b/src/model/SetpointManagerFollowGroundTemperature_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerFollowGroundTemperature_Impl(const SetpointManagerFollowGroundTemperature_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerFollowGroundTemperature_Impl() = default; + virtual ~SetpointManagerFollowGroundTemperature_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerFollowOutdoorAirTemperature.hpp b/src/model/SetpointManagerFollowOutdoorAirTemperature.hpp index a1503f0e8b4..55aeb36f402 100644 --- a/src/model/SetpointManagerFollowOutdoorAirTemperature.hpp +++ b/src/model/SetpointManagerFollowOutdoorAirTemperature.hpp @@ -37,7 +37,7 @@ namespace model { * model. */ explicit SetpointManagerFollowOutdoorAirTemperature(const Model& model); - virtual ~SetpointManagerFollowOutdoorAirTemperature() = default; + virtual ~SetpointManagerFollowOutdoorAirTemperature() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerFollowOutdoorAirTemperature(const SetpointManagerFollowOutdoorAirTemperature& other) = default; SetpointManagerFollowOutdoorAirTemperature(SetpointManagerFollowOutdoorAirTemperature&& other) = default; diff --git a/src/model/SetpointManagerFollowOutdoorAirTemperature_Impl.hpp b/src/model/SetpointManagerFollowOutdoorAirTemperature_Impl.hpp index 351c409f2da..1269e842a39 100644 --- a/src/model/SetpointManagerFollowOutdoorAirTemperature_Impl.hpp +++ b/src/model/SetpointManagerFollowOutdoorAirTemperature_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerFollowOutdoorAirTemperature_Impl(const SetpointManagerFollowOutdoorAirTemperature_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~SetpointManagerFollowOutdoorAirTemperature_Impl() = default; + virtual ~SetpointManagerFollowOutdoorAirTemperature_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerFollowSystemNodeTemperature.hpp b/src/model/SetpointManagerFollowSystemNodeTemperature.hpp index 7ae36499cc6..a0230badc56 100644 --- a/src/model/SetpointManagerFollowSystemNodeTemperature.hpp +++ b/src/model/SetpointManagerFollowSystemNodeTemperature.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerFollowSystemNodeTemperature(const Model& model); - virtual ~SetpointManagerFollowSystemNodeTemperature() = default; + virtual ~SetpointManagerFollowSystemNodeTemperature() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerFollowSystemNodeTemperature(const SetpointManagerFollowSystemNodeTemperature& other) = default; SetpointManagerFollowSystemNodeTemperature(SetpointManagerFollowSystemNodeTemperature&& other) = default; diff --git a/src/model/SetpointManagerFollowSystemNodeTemperature_Impl.hpp b/src/model/SetpointManagerFollowSystemNodeTemperature_Impl.hpp index 9544fe42c52..f8e4f4b72f4 100644 --- a/src/model/SetpointManagerFollowSystemNodeTemperature_Impl.hpp +++ b/src/model/SetpointManagerFollowSystemNodeTemperature_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerFollowSystemNodeTemperature_Impl(const SetpointManagerFollowSystemNodeTemperature_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerFollowSystemNodeTemperature_Impl() = default; + virtual ~SetpointManagerFollowSystemNodeTemperature_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerMixedAir.hpp b/src/model/SetpointManagerMixedAir.hpp index 3041c675bf1..30bd4d2d481 100644 --- a/src/model/SetpointManagerMixedAir.hpp +++ b/src/model/SetpointManagerMixedAir.hpp @@ -29,7 +29,7 @@ namespace model { class MODEL_API SetpointManagerMixedAir : public SetpointManager { public: - virtual ~SetpointManagerMixedAir() = default; + virtual ~SetpointManagerMixedAir() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMixedAir(const SetpointManagerMixedAir& other) = default; SetpointManagerMixedAir(SetpointManagerMixedAir&& other) = default; diff --git a/src/model/SetpointManagerMixedAir_Impl.hpp b/src/model/SetpointManagerMixedAir_Impl.hpp index 2ce03572b06..90fe17954dc 100644 --- a/src/model/SetpointManagerMixedAir_Impl.hpp +++ b/src/model/SetpointManagerMixedAir_Impl.hpp @@ -24,7 +24,7 @@ namespace model { SetpointManagerMixedAir_Impl(const SetpointManagerMixedAir_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~SetpointManagerMixedAir_Impl() = default; + virtual ~SetpointManagerMixedAir_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/SetpointManagerMultiZoneCoolingAverage.cpp b/src/model/SetpointManagerMultiZoneCoolingAverage.cpp index 28346e6746e..58553cca648 100644 --- a/src/model/SetpointManagerMultiZoneCoolingAverage.cpp +++ b/src/model/SetpointManagerMultiZoneCoolingAverage.cpp @@ -111,10 +111,6 @@ namespace model { OS_SetpointManager_MultiZone_Cooling_AverageFields::ControlVariable); } - std::string SetpointManagerMultiZoneCoolingAverage::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerMultiZoneCoolingAverage::minimumSetpointTemperature() const { return getImpl()->minimumSetpointTemperature(); } @@ -123,14 +119,6 @@ namespace model { return getImpl()->maximumSetpointTemperature(); } - boost::optional SetpointManagerMultiZoneCoolingAverage::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerMultiZoneCoolingAverage::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerMultiZoneCoolingAverage::setMinimumSetpointTemperature(double minimumSetpointTemperature) { return getImpl()->setMinimumSetpointTemperature(minimumSetpointTemperature); } diff --git a/src/model/SetpointManagerMultiZoneCoolingAverage.hpp b/src/model/SetpointManagerMultiZoneCoolingAverage.hpp index 7da9080e377..4406ce8f86c 100644 --- a/src/model/SetpointManagerMultiZoneCoolingAverage.hpp +++ b/src/model/SetpointManagerMultiZoneCoolingAverage.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerMultiZoneCoolingAverage(const Model& model); - virtual ~SetpointManagerMultiZoneCoolingAverage() = default; + virtual ~SetpointManagerMultiZoneCoolingAverage() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMultiZoneCoolingAverage(const SetpointManagerMultiZoneCoolingAverage& other) = default; SetpointManagerMultiZoneCoolingAverage(SetpointManagerMultiZoneCoolingAverage&& other) = default; @@ -46,20 +46,14 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointTemperature() const; double maximumSetpointTemperature() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSetpointTemperature(double minimumSetpointTemperature); bool setMaximumSetpointTemperature(double maximumSetpointTemperature); diff --git a/src/model/SetpointManagerMultiZoneCoolingAverage_Impl.hpp b/src/model/SetpointManagerMultiZoneCoolingAverage_Impl.hpp index 33ac43341af..48364b03051 100644 --- a/src/model/SetpointManagerMultiZoneCoolingAverage_Impl.hpp +++ b/src/model/SetpointManagerMultiZoneCoolingAverage_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerMultiZoneCoolingAverage_Impl(const SetpointManagerMultiZoneCoolingAverage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerMultiZoneCoolingAverage_Impl() = default; + virtual ~SetpointManagerMultiZoneCoolingAverage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerMultiZoneHeatingAverage.cpp b/src/model/SetpointManagerMultiZoneHeatingAverage.cpp index 61003783b7c..2972e30b622 100644 --- a/src/model/SetpointManagerMultiZoneHeatingAverage.cpp +++ b/src/model/SetpointManagerMultiZoneHeatingAverage.cpp @@ -110,10 +110,6 @@ namespace model { OS_SetpointManager_MultiZone_Heating_AverageFields::ControlVariable); } - std::string SetpointManagerMultiZoneHeatingAverage::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerMultiZoneHeatingAverage::minimumSetpointTemperature() const { return getImpl()->minimumSetpointTemperature(); } @@ -122,14 +118,6 @@ namespace model { return getImpl()->maximumSetpointTemperature(); } - boost::optional SetpointManagerMultiZoneHeatingAverage::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerMultiZoneHeatingAverage::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerMultiZoneHeatingAverage::setMinimumSetpointTemperature(double minimumSetpointTemperature) { return getImpl()->setMinimumSetpointTemperature(minimumSetpointTemperature); } diff --git a/src/model/SetpointManagerMultiZoneHeatingAverage.hpp b/src/model/SetpointManagerMultiZoneHeatingAverage.hpp index 0e630ec1a47..e05d9986ca1 100644 --- a/src/model/SetpointManagerMultiZoneHeatingAverage.hpp +++ b/src/model/SetpointManagerMultiZoneHeatingAverage.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerMultiZoneHeatingAverage(const Model& model); - virtual ~SetpointManagerMultiZoneHeatingAverage() = default; + virtual ~SetpointManagerMultiZoneHeatingAverage() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMultiZoneHeatingAverage(const SetpointManagerMultiZoneHeatingAverage& other) = default; SetpointManagerMultiZoneHeatingAverage(SetpointManagerMultiZoneHeatingAverage&& other) = default; @@ -46,20 +46,14 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointTemperature() const; double maximumSetpointTemperature() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSetpointTemperature(double minimumSetpointTemperature); bool setMaximumSetpointTemperature(double maximumSetpointTemperature); diff --git a/src/model/SetpointManagerMultiZoneHeatingAverage_Impl.hpp b/src/model/SetpointManagerMultiZoneHeatingAverage_Impl.hpp index ed1f83822e1..78b175494fd 100644 --- a/src/model/SetpointManagerMultiZoneHeatingAverage_Impl.hpp +++ b/src/model/SetpointManagerMultiZoneHeatingAverage_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerMultiZoneHeatingAverage_Impl(const SetpointManagerMultiZoneHeatingAverage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerMultiZoneHeatingAverage_Impl() = default; + virtual ~SetpointManagerMultiZoneHeatingAverage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerMultiZoneHumidityMaximum.cpp b/src/model/SetpointManagerMultiZoneHumidityMaximum.cpp index d8d8ce1bf57..a64df1113af 100644 --- a/src/model/SetpointManagerMultiZoneHumidityMaximum.cpp +++ b/src/model/SetpointManagerMultiZoneHumidityMaximum.cpp @@ -111,10 +111,6 @@ namespace model { OS_SetpointManager_MultiZone_Humidity_MaximumFields::ControlVariable); } - std::string SetpointManagerMultiZoneHumidityMaximum::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerMultiZoneHumidityMaximum::minimumSetpointHumidityRatio() const { return getImpl()->minimumSetpointHumidityRatio(); } @@ -123,14 +119,6 @@ namespace model { return getImpl()->maximumSetpointHumidityRatio(); } - boost::optional SetpointManagerMultiZoneHumidityMaximum::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerMultiZoneHumidityMaximum::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerMultiZoneHumidityMaximum::setMinimumSetpointHumidityRatio(double minimumSetpointHumidityRatio) { return getImpl()->setMinimumSetpointHumidityRatio(minimumSetpointHumidityRatio); } diff --git a/src/model/SetpointManagerMultiZoneHumidityMaximum.hpp b/src/model/SetpointManagerMultiZoneHumidityMaximum.hpp index 37eaf96c23d..ea426387417 100644 --- a/src/model/SetpointManagerMultiZoneHumidityMaximum.hpp +++ b/src/model/SetpointManagerMultiZoneHumidityMaximum.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerMultiZoneHumidityMaximum(const Model& model); - virtual ~SetpointManagerMultiZoneHumidityMaximum() = default; + virtual ~SetpointManagerMultiZoneHumidityMaximum() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMultiZoneHumidityMaximum(const SetpointManagerMultiZoneHumidityMaximum& other) = default; SetpointManagerMultiZoneHumidityMaximum(SetpointManagerMultiZoneHumidityMaximum&& other) = default; @@ -46,20 +46,14 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointHumidityRatio() const; double maximumSetpointHumidityRatio() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSetpointHumidityRatio(double minimumSetpointHumidityRatio); bool setMaximumSetpointHumidityRatio(double maximumSetpointHumidityRatio); diff --git a/src/model/SetpointManagerMultiZoneHumidityMaximum_Impl.hpp b/src/model/SetpointManagerMultiZoneHumidityMaximum_Impl.hpp index 56599d321ad..a0f210c4660 100644 --- a/src/model/SetpointManagerMultiZoneHumidityMaximum_Impl.hpp +++ b/src/model/SetpointManagerMultiZoneHumidityMaximum_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerMultiZoneHumidityMaximum_Impl(const SetpointManagerMultiZoneHumidityMaximum_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerMultiZoneHumidityMaximum_Impl() = default; + virtual ~SetpointManagerMultiZoneHumidityMaximum_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerMultiZoneHumidityMinimum.cpp b/src/model/SetpointManagerMultiZoneHumidityMinimum.cpp index 696696a3182..e56b97a30f2 100644 --- a/src/model/SetpointManagerMultiZoneHumidityMinimum.cpp +++ b/src/model/SetpointManagerMultiZoneHumidityMinimum.cpp @@ -146,14 +146,6 @@ namespace model { return getImpl()->isMaximumSetpointHumidityRatioDefaulted(); } - boost::optional SetpointManagerMultiZoneHumidityMinimum::setpointNode() const { - return getImpl()->setpointNode(); - } - - std::string SetpointManagerMultiZoneHumidityMinimum::controlVariable() const { - return getImpl()->controlVariable(); - } - bool SetpointManagerMultiZoneHumidityMinimum::setMinimumSetpointHumidityRatio(double minimumSetpointHumidityRatio) { return getImpl()->setMinimumSetpointHumidityRatio(minimumSetpointHumidityRatio); } @@ -170,10 +162,6 @@ namespace model { getImpl()->resetMaximumSetpointHumidityRatio(); } - bool SetpointManagerMultiZoneHumidityMinimum::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - /// @cond SetpointManagerMultiZoneHumidityMinimum::SetpointManagerMultiZoneHumidityMinimum( std::shared_ptr impl) diff --git a/src/model/SetpointManagerMultiZoneHumidityMinimum.hpp b/src/model/SetpointManagerMultiZoneHumidityMinimum.hpp index 43eaffe3ade..8bf7f579d00 100644 --- a/src/model/SetpointManagerMultiZoneHumidityMinimum.hpp +++ b/src/model/SetpointManagerMultiZoneHumidityMinimum.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerMultiZoneHumidityMinimum(const Model& model); - virtual ~SetpointManagerMultiZoneHumidityMinimum() = default; + virtual ~SetpointManagerMultiZoneHumidityMinimum() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMultiZoneHumidityMinimum(const SetpointManagerMultiZoneHumidityMinimum& other) = default; SetpointManagerMultiZoneHumidityMinimum(SetpointManagerMultiZoneHumidityMinimum&& other) = default; @@ -54,10 +54,6 @@ namespace model { bool isMaximumSetpointHumidityRatioDefaulted() const; - boost::optional setpointNode() const; - - std::string controlVariable() const; - //@} /** @name Setters */ //@{ @@ -70,8 +66,6 @@ namespace model { void resetMaximumSetpointHumidityRatio(); - bool setControlVariable(const std::string& controlVariable); - //@} /** @name Other */ //@{ diff --git a/src/model/SetpointManagerMultiZoneHumidityMinimum_Impl.hpp b/src/model/SetpointManagerMultiZoneHumidityMinimum_Impl.hpp index 0e826d5fa08..6df716b1ac0 100644 --- a/src/model/SetpointManagerMultiZoneHumidityMinimum_Impl.hpp +++ b/src/model/SetpointManagerMultiZoneHumidityMinimum_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerMultiZoneHumidityMinimum_Impl(const SetpointManagerMultiZoneHumidityMinimum_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerMultiZoneHumidityMinimum_Impl() = default; + virtual ~SetpointManagerMultiZoneHumidityMinimum_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.cpp b/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.cpp index 947294ac358..d91d6fb783b 100644 --- a/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.cpp +++ b/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.cpp @@ -112,10 +112,6 @@ namespace model { OS_SetpointManager_MultiZone_MaximumHumidity_AverageFields::ControlVariable); } - std::string SetpointManagerMultiZoneMaximumHumidityAverage::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerMultiZoneMaximumHumidityAverage::minimumSetpointHumidityRatio() const { return getImpl()->minimumSetpointHumidityRatio(); } @@ -124,14 +120,6 @@ namespace model { return getImpl()->maximumSetpointHumidityRatio(); } - boost::optional SetpointManagerMultiZoneMaximumHumidityAverage::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerMultiZoneMaximumHumidityAverage::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerMultiZoneMaximumHumidityAverage::setMinimumSetpointHumidityRatio(double minimumSetpointHumidityRatio) { return getImpl()->setMinimumSetpointHumidityRatio(minimumSetpointHumidityRatio); } diff --git a/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.hpp b/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.hpp index 48149de984b..9e19a41a0ba 100644 --- a/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.hpp +++ b/src/model/SetpointManagerMultiZoneMaximumHumidityAverage.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerMultiZoneMaximumHumidityAverage(const Model& model); - virtual ~SetpointManagerMultiZoneMaximumHumidityAverage() = default; + virtual ~SetpointManagerMultiZoneMaximumHumidityAverage() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMultiZoneMaximumHumidityAverage(const SetpointManagerMultiZoneMaximumHumidityAverage& other) = default; SetpointManagerMultiZoneMaximumHumidityAverage(SetpointManagerMultiZoneMaximumHumidityAverage&& other) = default; @@ -46,20 +46,14 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointHumidityRatio() const; double maximumSetpointHumidityRatio() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSetpointHumidityRatio(double minimumSetpointHumidityRatio); bool setMaximumSetpointHumidityRatio(double maximumSetpointHumidityRatio); diff --git a/src/model/SetpointManagerMultiZoneMaximumHumidityAverage_Impl.hpp b/src/model/SetpointManagerMultiZoneMaximumHumidityAverage_Impl.hpp index 73756ccdaa2..9942e25c931 100644 --- a/src/model/SetpointManagerMultiZoneMaximumHumidityAverage_Impl.hpp +++ b/src/model/SetpointManagerMultiZoneMaximumHumidityAverage_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerMultiZoneMaximumHumidityAverage_Impl(const SetpointManagerMultiZoneMaximumHumidityAverage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerMultiZoneMaximumHumidityAverage_Impl() = default; + virtual ~SetpointManagerMultiZoneMaximumHumidityAverage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.cpp b/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.cpp index 92ff36d465a..6b94ff55d69 100644 --- a/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.cpp +++ b/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.cpp @@ -147,14 +147,6 @@ namespace model { return getImpl()->isMaximumSetpointHumidityRatioDefaulted(); } - boost::optional SetpointManagerMultiZoneMinimumHumidityAverage::setpointNode() const { - return getImpl()->setpointNode(); - } - - std::string SetpointManagerMultiZoneMinimumHumidityAverage::controlVariable() const { - return getImpl()->controlVariable(); - } - bool SetpointManagerMultiZoneMinimumHumidityAverage::setMinimumSetpointHumidityRatio(double minimumSetpointHumidityRatio) { return getImpl()->setMinimumSetpointHumidityRatio(minimumSetpointHumidityRatio); } @@ -171,10 +163,6 @@ namespace model { getImpl()->resetMaximumSetpointHumidityRatio(); } - bool SetpointManagerMultiZoneMinimumHumidityAverage::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - /// @cond SetpointManagerMultiZoneMinimumHumidityAverage::SetpointManagerMultiZoneMinimumHumidityAverage( std::shared_ptr impl) diff --git a/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.hpp b/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.hpp index 272b25519d6..5d0fe5d7eba 100644 --- a/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.hpp +++ b/src/model/SetpointManagerMultiZoneMinimumHumidityAverage.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerMultiZoneMinimumHumidityAverage(const Model& model); - virtual ~SetpointManagerMultiZoneMinimumHumidityAverage() = default; + virtual ~SetpointManagerMultiZoneMinimumHumidityAverage() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerMultiZoneMinimumHumidityAverage(const SetpointManagerMultiZoneMinimumHumidityAverage& other) = default; SetpointManagerMultiZoneMinimumHumidityAverage(SetpointManagerMultiZoneMinimumHumidityAverage&& other) = default; @@ -54,10 +54,6 @@ namespace model { bool isMaximumSetpointHumidityRatioDefaulted() const; - boost::optional setpointNode() const; - - std::string controlVariable() const; - //@} /** @name Setters */ //@{ @@ -70,8 +66,6 @@ namespace model { void resetMaximumSetpointHumidityRatio(); - bool setControlVariable(const std::string& controlVariable); - //@} /** @name Other */ //@{ diff --git a/src/model/SetpointManagerMultiZoneMinimumHumidityAverage_Impl.hpp b/src/model/SetpointManagerMultiZoneMinimumHumidityAverage_Impl.hpp index d0d0a1da3b7..8b779433c4b 100644 --- a/src/model/SetpointManagerMultiZoneMinimumHumidityAverage_Impl.hpp +++ b/src/model/SetpointManagerMultiZoneMinimumHumidityAverage_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerMultiZoneMinimumHumidityAverage_Impl(const SetpointManagerMultiZoneMinimumHumidityAverage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerMultiZoneMinimumHumidityAverage_Impl() = default; + virtual ~SetpointManagerMultiZoneMinimumHumidityAverage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerOutdoorAirPretreat.cpp b/src/model/SetpointManagerOutdoorAirPretreat.cpp index 46d0405c849..849549c36be 100644 --- a/src/model/SetpointManagerOutdoorAirPretreat.cpp +++ b/src/model/SetpointManagerOutdoorAirPretreat.cpp @@ -226,10 +226,6 @@ namespace model { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_SetpointManager_OutdoorAirPretreatFields::ControlVariable); } - std::string SetpointManagerOutdoorAirPretreat::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerOutdoorAirPretreat::minimumSetpointTemperature() const { return getImpl()->minimumSetpointTemperature(); } @@ -278,14 +274,6 @@ namespace model { return getImpl()->returnAirStreamNode(); } - boost::optional SetpointManagerOutdoorAirPretreat::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerOutdoorAirPretreat::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - void SetpointManagerOutdoorAirPretreat::resetControlVariable() { getImpl()->resetControlVariable(); } diff --git a/src/model/SetpointManagerOutdoorAirPretreat.hpp b/src/model/SetpointManagerOutdoorAirPretreat.hpp index 21d6ec18a07..a9b0817d5ec 100644 --- a/src/model/SetpointManagerOutdoorAirPretreat.hpp +++ b/src/model/SetpointManagerOutdoorAirPretreat.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerOutdoorAirPretreat(const Model& model); - virtual ~SetpointManagerOutdoorAirPretreat() = default; + virtual ~SetpointManagerOutdoorAirPretreat() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerOutdoorAirPretreat(const SetpointManagerOutdoorAirPretreat& other) = default; SetpointManagerOutdoorAirPretreat(SetpointManagerOutdoorAirPretreat&& other) = default; @@ -46,8 +46,6 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointTemperature() const; bool isMinimumSetpointTemperatureDefaulted() const; @@ -72,14 +70,10 @@ namespace model { boost::optional returnAirStreamNode() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - void resetControlVariable(); bool setMinimumSetpointTemperature(double minimumSetpointTemperature); diff --git a/src/model/SetpointManagerOutdoorAirPretreat_Impl.hpp b/src/model/SetpointManagerOutdoorAirPretreat_Impl.hpp index 842c210195c..c86b3f8aca8 100644 --- a/src/model/SetpointManagerOutdoorAirPretreat_Impl.hpp +++ b/src/model/SetpointManagerOutdoorAirPretreat_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerOutdoorAirPretreat_Impl(const SetpointManagerOutdoorAirPretreat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerOutdoorAirPretreat_Impl() = default; + virtual ~SetpointManagerOutdoorAirPretreat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerOutdoorAirReset.hpp b/src/model/SetpointManagerOutdoorAirReset.hpp index 09042ef510b..f861f4e5bd1 100644 --- a/src/model/SetpointManagerOutdoorAirReset.hpp +++ b/src/model/SetpointManagerOutdoorAirReset.hpp @@ -28,7 +28,7 @@ namespace model { public: explicit SetpointManagerOutdoorAirReset(const Model& model); - virtual ~SetpointManagerOutdoorAirReset() = default; + virtual ~SetpointManagerOutdoorAirReset() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerOutdoorAirReset(const SetpointManagerOutdoorAirReset& other) = default; SetpointManagerOutdoorAirReset(SetpointManagerOutdoorAirReset&& other) = default; diff --git a/src/model/SetpointManagerOutdoorAirReset_Impl.hpp b/src/model/SetpointManagerOutdoorAirReset_Impl.hpp index 23c59b06711..c71a4277b56 100644 --- a/src/model/SetpointManagerOutdoorAirReset_Impl.hpp +++ b/src/model/SetpointManagerOutdoorAirReset_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SetpointManagerOutdoorAirReset_Impl(const SetpointManagerOutdoorAirReset_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerOutdoorAirReset_Impl() = default; + virtual ~SetpointManagerOutdoorAirReset_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerScheduled.hpp b/src/model/SetpointManagerScheduled.hpp index c4ff5d119e5..2c534beda26 100644 --- a/src/model/SetpointManagerScheduled.hpp +++ b/src/model/SetpointManagerScheduled.hpp @@ -42,7 +42,7 @@ namespace model { * model. */ SetpointManagerScheduled(const Model& model, const std::string& controlVariable, Schedule& setpointSchedule); - virtual ~SetpointManagerScheduled() = default; + virtual ~SetpointManagerScheduled() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerScheduled(const SetpointManagerScheduled& other) = default; SetpointManagerScheduled(SetpointManagerScheduled&& other) = default; diff --git a/src/model/SetpointManagerScheduledDualSetpoint.cpp b/src/model/SetpointManagerScheduledDualSetpoint.cpp index fb6195edc7f..3c2f6afc6ac 100644 --- a/src/model/SetpointManagerScheduledDualSetpoint.cpp +++ b/src/model/SetpointManagerScheduledDualSetpoint.cpp @@ -139,10 +139,6 @@ namespace model { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_SetpointManager_Scheduled_DualSetpointFields::ControlVariable); } - std::string SetpointManagerScheduledDualSetpoint::controlVariable() const { - return getImpl()->controlVariable(); - } - boost::optional SetpointManagerScheduledDualSetpoint::highSetpointSchedule() const { return getImpl()->highSetpointSchedule(); } @@ -151,14 +147,6 @@ namespace model { return getImpl()->lowSetpointSchedule(); } - boost::optional SetpointManagerScheduledDualSetpoint::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerScheduledDualSetpoint::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerScheduledDualSetpoint::setHighSetpointSchedule(Schedule& schedule) { return getImpl()->setHighSetpointSchedule(schedule); } diff --git a/src/model/SetpointManagerScheduledDualSetpoint.hpp b/src/model/SetpointManagerScheduledDualSetpoint.hpp index d19cee11a6c..f8e2bf0f5cc 100644 --- a/src/model/SetpointManagerScheduledDualSetpoint.hpp +++ b/src/model/SetpointManagerScheduledDualSetpoint.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerScheduledDualSetpoint(const Model& model); - virtual ~SetpointManagerScheduledDualSetpoint() = default; + virtual ~SetpointManagerScheduledDualSetpoint() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerScheduledDualSetpoint(const SetpointManagerScheduledDualSetpoint& other) = default; SetpointManagerScheduledDualSetpoint(SetpointManagerScheduledDualSetpoint&& other) = default; @@ -46,20 +46,14 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - boost::optional highSetpointSchedule() const; boost::optional lowSetpointSchedule() const; - boost::optional setpointNode() const; - //@} /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setHighSetpointSchedule(Schedule& schedule); void resetHighSetpointSchedule(); diff --git a/src/model/SetpointManagerScheduledDualSetpoint_Impl.hpp b/src/model/SetpointManagerScheduledDualSetpoint_Impl.hpp index f9ba50385b1..7681a911213 100644 --- a/src/model/SetpointManagerScheduledDualSetpoint_Impl.hpp +++ b/src/model/SetpointManagerScheduledDualSetpoint_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerScheduledDualSetpoint_Impl(const SetpointManagerScheduledDualSetpoint_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerScheduledDualSetpoint_Impl() = default; + virtual ~SetpointManagerScheduledDualSetpoint_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerScheduled_Impl.hpp b/src/model/SetpointManagerScheduled_Impl.hpp index 95693fc4fea..09dd9dee0d1 100644 --- a/src/model/SetpointManagerScheduled_Impl.hpp +++ b/src/model/SetpointManagerScheduled_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerScheduled_Impl(const SetpointManagerScheduled_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~SetpointManagerScheduled_Impl() = default; + virtual ~SetpointManagerScheduled_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneCooling.cpp b/src/model/SetpointManagerSingleZoneCooling.cpp index 6af94b01384..01df7cc6057 100644 --- a/src/model/SetpointManagerSingleZoneCooling.cpp +++ b/src/model/SetpointManagerSingleZoneCooling.cpp @@ -167,14 +167,6 @@ namespace model { getImpl()->resetControlZone(); } - bool SetpointManagerSingleZoneCooling::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - - std::string SetpointManagerSingleZoneCooling::controlVariable() const { - return getImpl()->controlVariable(); - } - /// @cond SetpointManagerSingleZoneCooling::SetpointManagerSingleZoneCooling(std::shared_ptr impl) : SetpointManager(std::move(impl)) {} diff --git a/src/model/SetpointManagerSingleZoneCooling.hpp b/src/model/SetpointManagerSingleZoneCooling.hpp index aadbc3f78c3..c534ecf7cda 100644 --- a/src/model/SetpointManagerSingleZoneCooling.hpp +++ b/src/model/SetpointManagerSingleZoneCooling.hpp @@ -31,7 +31,7 @@ namespace model { explicit SetpointManagerSingleZoneCooling(const Model& model); - virtual ~SetpointManagerSingleZoneCooling() = default; + virtual ~SetpointManagerSingleZoneCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneCooling(const SetpointManagerSingleZoneCooling& other) = default; SetpointManagerSingleZoneCooling(SetpointManagerSingleZoneCooling&& other) = default; @@ -45,8 +45,6 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSupplyAirTemperature() const; double maximumSupplyAirTemperature() const; @@ -57,8 +55,6 @@ namespace model { /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSupplyAirTemperature(double minimumSupplyAirTemperature); bool setMaximumSupplyAirTemperature(double maximumSupplyAirTemperature); diff --git a/src/model/SetpointManagerSingleZoneCooling_Impl.hpp b/src/model/SetpointManagerSingleZoneCooling_Impl.hpp index 718c2af585e..24388708349 100644 --- a/src/model/SetpointManagerSingleZoneCooling_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneCooling_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SetpointManagerSingleZoneCooling_Impl(const SetpointManagerSingleZoneCooling_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSingleZoneCooling_Impl() = default; + virtual ~SetpointManagerSingleZoneCooling_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneHeating.cpp b/src/model/SetpointManagerSingleZoneHeating.cpp index 9056f3d4c3a..1059fa804a8 100644 --- a/src/model/SetpointManagerSingleZoneHeating.cpp +++ b/src/model/SetpointManagerSingleZoneHeating.cpp @@ -167,14 +167,6 @@ namespace model { getImpl()->resetControlZone(); } - bool SetpointManagerSingleZoneHeating::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - - std::string SetpointManagerSingleZoneHeating::controlVariable() const { - return getImpl()->controlVariable(); - } - /// @cond SetpointManagerSingleZoneHeating::SetpointManagerSingleZoneHeating(std::shared_ptr impl) : SetpointManager(std::move(impl)) {} diff --git a/src/model/SetpointManagerSingleZoneHeating.hpp b/src/model/SetpointManagerSingleZoneHeating.hpp index 65b66844aa0..c6eebe3ec7f 100644 --- a/src/model/SetpointManagerSingleZoneHeating.hpp +++ b/src/model/SetpointManagerSingleZoneHeating.hpp @@ -31,7 +31,7 @@ namespace model { explicit SetpointManagerSingleZoneHeating(const Model& model); - virtual ~SetpointManagerSingleZoneHeating() = default; + virtual ~SetpointManagerSingleZoneHeating() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneHeating(const SetpointManagerSingleZoneHeating& other) = default; SetpointManagerSingleZoneHeating(SetpointManagerSingleZoneHeating&& other) = default; @@ -45,8 +45,6 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSupplyAirTemperature() const; double maximumSupplyAirTemperature() const; @@ -57,8 +55,6 @@ namespace model { /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSupplyAirTemperature(double minimumSupplyAirTemperature); bool setMaximumSupplyAirTemperature(double maximumSupplyAirTemperature); diff --git a/src/model/SetpointManagerSingleZoneHeating_Impl.hpp b/src/model/SetpointManagerSingleZoneHeating_Impl.hpp index d2040394923..331b5ae8ec6 100644 --- a/src/model/SetpointManagerSingleZoneHeating_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneHeating_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SetpointManagerSingleZoneHeating_Impl(const SetpointManagerSingleZoneHeating_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSingleZoneHeating_Impl() = default; + virtual ~SetpointManagerSingleZoneHeating_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneHumidityMaximum.hpp b/src/model/SetpointManagerSingleZoneHumidityMaximum.hpp index 74323e9bd8a..8797cdf92e4 100644 --- a/src/model/SetpointManagerSingleZoneHumidityMaximum.hpp +++ b/src/model/SetpointManagerSingleZoneHumidityMaximum.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerSingleZoneHumidityMaximum(const Model& model); - virtual ~SetpointManagerSingleZoneHumidityMaximum() = default; + virtual ~SetpointManagerSingleZoneHumidityMaximum() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneHumidityMaximum(const SetpointManagerSingleZoneHumidityMaximum& other) = default; SetpointManagerSingleZoneHumidityMaximum(SetpointManagerSingleZoneHumidityMaximum&& other) = default; diff --git a/src/model/SetpointManagerSingleZoneHumidityMaximum_Impl.hpp b/src/model/SetpointManagerSingleZoneHumidityMaximum_Impl.hpp index 197a5a63964..d94b37a7fd1 100644 --- a/src/model/SetpointManagerSingleZoneHumidityMaximum_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneHumidityMaximum_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerSingleZoneHumidityMaximum_Impl(const SetpointManagerSingleZoneHumidityMaximum_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSingleZoneHumidityMaximum_Impl() = default; + virtual ~SetpointManagerSingleZoneHumidityMaximum_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneHumidityMinimum.hpp b/src/model/SetpointManagerSingleZoneHumidityMinimum.hpp index 305709a0e07..9fcefb92851 100644 --- a/src/model/SetpointManagerSingleZoneHumidityMinimum.hpp +++ b/src/model/SetpointManagerSingleZoneHumidityMinimum.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerSingleZoneHumidityMinimum(const Model& model); - virtual ~SetpointManagerSingleZoneHumidityMinimum() = default; + virtual ~SetpointManagerSingleZoneHumidityMinimum() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneHumidityMinimum(const SetpointManagerSingleZoneHumidityMinimum& other) = default; SetpointManagerSingleZoneHumidityMinimum(SetpointManagerSingleZoneHumidityMinimum&& other) = default; diff --git a/src/model/SetpointManagerSingleZoneHumidityMinimum_Impl.hpp b/src/model/SetpointManagerSingleZoneHumidityMinimum_Impl.hpp index 6feadb05fd9..5d92143614d 100644 --- a/src/model/SetpointManagerSingleZoneHumidityMinimum_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneHumidityMinimum_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerSingleZoneHumidityMinimum_Impl(const SetpointManagerSingleZoneHumidityMinimum_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSingleZoneHumidityMinimum_Impl() = default; + virtual ~SetpointManagerSingleZoneHumidityMinimum_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneOneStageCooling.hpp b/src/model/SetpointManagerSingleZoneOneStageCooling.hpp index c18f3ab6d4a..08fc3f4f649 100644 --- a/src/model/SetpointManagerSingleZoneOneStageCooling.hpp +++ b/src/model/SetpointManagerSingleZoneOneStageCooling.hpp @@ -31,7 +31,7 @@ namespace model { explicit SetpointManagerSingleZoneOneStageCooling(const Model& model); - virtual ~SetpointManagerSingleZoneOneStageCooling() = default; + virtual ~SetpointManagerSingleZoneOneStageCooling() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneOneStageCooling(const SetpointManagerSingleZoneOneStageCooling& other) = default; SetpointManagerSingleZoneOneStageCooling(SetpointManagerSingleZoneOneStageCooling&& other) = default; diff --git a/src/model/SetpointManagerSingleZoneOneStageCooling_Impl.hpp b/src/model/SetpointManagerSingleZoneOneStageCooling_Impl.hpp index 5036ad87f38..0019fe95b12 100644 --- a/src/model/SetpointManagerSingleZoneOneStageCooling_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneOneStageCooling_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerSingleZoneOneStageCooling_Impl(const SetpointManagerSingleZoneOneStageCooling_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSingleZoneOneStageCooling_Impl() = default; + virtual ~SetpointManagerSingleZoneOneStageCooling_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneOneStageHeating.hpp b/src/model/SetpointManagerSingleZoneOneStageHeating.hpp index 6484aa5b8c2..e30a8af160c 100644 --- a/src/model/SetpointManagerSingleZoneOneStageHeating.hpp +++ b/src/model/SetpointManagerSingleZoneOneStageHeating.hpp @@ -31,7 +31,7 @@ namespace model { explicit SetpointManagerSingleZoneOneStageHeating(const Model& model); - virtual ~SetpointManagerSingleZoneOneStageHeating() = default; + virtual ~SetpointManagerSingleZoneOneStageHeating() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneOneStageHeating(const SetpointManagerSingleZoneOneStageHeating& other) = default; SetpointManagerSingleZoneOneStageHeating(SetpointManagerSingleZoneOneStageHeating&& other) = default; diff --git a/src/model/SetpointManagerSingleZoneOneStageHeating_Impl.hpp b/src/model/SetpointManagerSingleZoneOneStageHeating_Impl.hpp index 4c7f5b612bb..c700aae3e91 100644 --- a/src/model/SetpointManagerSingleZoneOneStageHeating_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneOneStageHeating_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerSingleZoneOneStageHeating_Impl(const SetpointManagerSingleZoneOneStageHeating_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSingleZoneOneStageHeating_Impl() = default; + virtual ~SetpointManagerSingleZoneOneStageHeating_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSingleZoneReheat.hpp b/src/model/SetpointManagerSingleZoneReheat.hpp index 116f4af0734..d8e818b7e6a 100644 --- a/src/model/SetpointManagerSingleZoneReheat.hpp +++ b/src/model/SetpointManagerSingleZoneReheat.hpp @@ -31,7 +31,7 @@ namespace model { { public: - virtual ~SetpointManagerSingleZoneReheat() = default; + virtual ~SetpointManagerSingleZoneReheat() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerSingleZoneReheat(const SetpointManagerSingleZoneReheat& other) = default; SetpointManagerSingleZoneReheat(SetpointManagerSingleZoneReheat&& other) = default; diff --git a/src/model/SetpointManagerSingleZoneReheat_Impl.hpp b/src/model/SetpointManagerSingleZoneReheat_Impl.hpp index b8136ee98dc..1dc656120a9 100644 --- a/src/model/SetpointManagerSingleZoneReheat_Impl.hpp +++ b/src/model/SetpointManagerSingleZoneReheat_Impl.hpp @@ -26,7 +26,7 @@ namespace model { SetpointManagerSingleZoneReheat_Impl(const SetpointManagerSingleZoneReheat_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~SetpointManagerSingleZoneReheat_Impl() = default; + virtual ~SetpointManagerSingleZoneReheat_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/SetpointManagerSystemNodeResetHumidity.hpp b/src/model/SetpointManagerSystemNodeResetHumidity.hpp index 4b88a58ec58..780b26cb5a4 100644 --- a/src/model/SetpointManagerSystemNodeResetHumidity.hpp +++ b/src/model/SetpointManagerSystemNodeResetHumidity.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerSystemNodeResetHumidity(const Model& model); - virtual ~SetpointManagerSystemNodeResetHumidity() = default; + virtual ~SetpointManagerSystemNodeResetHumidity() override = default; //@} diff --git a/src/model/SetpointManagerSystemNodeResetHumidity_Impl.hpp b/src/model/SetpointManagerSystemNodeResetHumidity_Impl.hpp index 2962386484b..265d78730c8 100644 --- a/src/model/SetpointManagerSystemNodeResetHumidity_Impl.hpp +++ b/src/model/SetpointManagerSystemNodeResetHumidity_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerSystemNodeResetHumidity_Impl(const SetpointManagerSystemNodeResetHumidity_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSystemNodeResetHumidity_Impl() = default; + virtual ~SetpointManagerSystemNodeResetHumidity_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerSystemNodeResetTemperature.hpp b/src/model/SetpointManagerSystemNodeResetTemperature.hpp index 84568cea44f..147f44dfa8f 100644 --- a/src/model/SetpointManagerSystemNodeResetTemperature.hpp +++ b/src/model/SetpointManagerSystemNodeResetTemperature.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerSystemNodeResetTemperature(const Model& model); - virtual ~SetpointManagerSystemNodeResetTemperature() = default; + virtual ~SetpointManagerSystemNodeResetTemperature() override = default; //@} diff --git a/src/model/SetpointManagerSystemNodeResetTemperature_Impl.hpp b/src/model/SetpointManagerSystemNodeResetTemperature_Impl.hpp index 29d53af7db7..4240f02b7f3 100644 --- a/src/model/SetpointManagerSystemNodeResetTemperature_Impl.hpp +++ b/src/model/SetpointManagerSystemNodeResetTemperature_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerSystemNodeResetTemperature_Impl(const SetpointManagerSystemNodeResetTemperature_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerSystemNodeResetTemperature_Impl() = default; + virtual ~SetpointManagerSystemNodeResetTemperature_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerWarmest.cpp b/src/model/SetpointManagerWarmest.cpp index 4fc986bbed6..7968a88e3e3 100644 --- a/src/model/SetpointManagerWarmest.cpp +++ b/src/model/SetpointManagerWarmest.cpp @@ -123,10 +123,6 @@ namespace model { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_SetpointManager_WarmestFields::Strategy); } - std::string SetpointManagerWarmest::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerWarmest::minimumSetpointTemperature() const { return getImpl()->minimumSetpointTemperature(); } @@ -139,14 +135,6 @@ namespace model { return getImpl()->strategy(); } - boost::optional SetpointManagerWarmest::setpointNode() const { - return getImpl()->setpointNode(); - } - - bool SetpointManagerWarmest::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerWarmest::setMinimumSetpointTemperature(double minimumSetpointTemperature) { return getImpl()->setMinimumSetpointTemperature(minimumSetpointTemperature); } diff --git a/src/model/SetpointManagerWarmest.hpp b/src/model/SetpointManagerWarmest.hpp index 60dc7e97b77..775347c32ca 100644 --- a/src/model/SetpointManagerWarmest.hpp +++ b/src/model/SetpointManagerWarmest.hpp @@ -27,7 +27,7 @@ namespace model { public: explicit SetpointManagerWarmest(const Model& model); - virtual ~SetpointManagerWarmest() = default; + virtual ~SetpointManagerWarmest() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerWarmest(const SetpointManagerWarmest& other) = default; SetpointManagerWarmest(SetpointManagerWarmest&& other) = default; @@ -40,10 +40,6 @@ namespace model { static std::vector strategyValues(); - std::string controlVariable() const; - - bool setControlVariable(const std::string& controlVariable); - double minimumSetpointTemperature() const; bool setMinimumSetpointTemperature(double minimumSetpointTemperature); @@ -56,8 +52,6 @@ namespace model { bool setStrategy(const std::string& strategy); - boost::optional setpointNode() const; - protected: /// @cond using ImplType = detail::SetpointManagerWarmest_Impl; diff --git a/src/model/SetpointManagerWarmestTemperatureFlow.cpp b/src/model/SetpointManagerWarmestTemperatureFlow.cpp index 8e84e266e5e..a3c30995ac4 100644 --- a/src/model/SetpointManagerWarmestTemperatureFlow.cpp +++ b/src/model/SetpointManagerWarmestTemperatureFlow.cpp @@ -141,10 +141,6 @@ namespace model { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_SetpointManager_WarmestTemperatureFlowFields::Strategy); } - std::string SetpointManagerWarmestTemperatureFlow::controlVariable() const { - return getImpl()->controlVariable(); - } - double SetpointManagerWarmestTemperatureFlow::minimumSetpointTemperature() const { return getImpl()->minimumSetpointTemperature(); } @@ -161,10 +157,6 @@ namespace model { return getImpl()->minimumTurndownRatio(); } - bool SetpointManagerWarmestTemperatureFlow::setControlVariable(const std::string& controlVariable) { - return getImpl()->setControlVariable(controlVariable); - } - bool SetpointManagerWarmestTemperatureFlow::setMinimumSetpointTemperature(double minimumSetpointTemperature) { return getImpl()->setMinimumSetpointTemperature(minimumSetpointTemperature); } @@ -181,10 +173,6 @@ namespace model { return getImpl()->setMinimumTurndownRatio(minimumTurndownRatio); } - boost::optional SetpointManagerWarmestTemperatureFlow::setpointNode() const { - return getImpl()->setpointNode(); - } - bool SetpointManagerWarmestTemperatureFlow::setSetpointNode(const Node& node) { return getImpl()->setSetpointNode(node); } diff --git a/src/model/SetpointManagerWarmestTemperatureFlow.hpp b/src/model/SetpointManagerWarmestTemperatureFlow.hpp index 8e5d36ab2cb..2ab011d3aee 100644 --- a/src/model/SetpointManagerWarmestTemperatureFlow.hpp +++ b/src/model/SetpointManagerWarmestTemperatureFlow.hpp @@ -30,7 +30,7 @@ namespace model { explicit SetpointManagerWarmestTemperatureFlow(const Model& model); - virtual ~SetpointManagerWarmestTemperatureFlow() = default; + virtual ~SetpointManagerWarmestTemperatureFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit SetpointManagerWarmestTemperatureFlow(const SetpointManagerWarmestTemperatureFlow& other) = default; SetpointManagerWarmestTemperatureFlow(SetpointManagerWarmestTemperatureFlow&& other) = default; @@ -48,8 +48,6 @@ namespace model { /** @name Getters */ //@{ - std::string controlVariable() const; - double minimumSetpointTemperature() const; double maximumSetpointTemperature() const; @@ -62,8 +60,6 @@ namespace model { /** @name Setters */ //@{ - bool setControlVariable(const std::string& controlVariable); - bool setMinimumSetpointTemperature(double minimumSetpointTemperature); bool setMaximumSetpointTemperature(double maximumSetpointTemperature); @@ -75,8 +71,6 @@ namespace model { //@} /** @name Other */ //@{ - boost::optional setpointNode() const; - bool setSetpointNode(const Node& node); void resetSetpointNode(); diff --git a/src/model/SetpointManagerWarmestTemperatureFlow_Impl.hpp b/src/model/SetpointManagerWarmestTemperatureFlow_Impl.hpp index dbf7a5f4ecd..c70f6fa4455 100644 --- a/src/model/SetpointManagerWarmestTemperatureFlow_Impl.hpp +++ b/src/model/SetpointManagerWarmestTemperatureFlow_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SetpointManagerWarmestTemperatureFlow_Impl(const SetpointManagerWarmestTemperatureFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerWarmestTemperatureFlow_Impl() = default; + virtual ~SetpointManagerWarmestTemperatureFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManagerWarmest_Impl.hpp b/src/model/SetpointManagerWarmest_Impl.hpp index e8bd3679aaf..9700fc339b3 100644 --- a/src/model/SetpointManagerWarmest_Impl.hpp +++ b/src/model/SetpointManagerWarmest_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SetpointManagerWarmest_Impl(const SetpointManagerWarmest_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SetpointManagerWarmest_Impl() = default; + virtual ~SetpointManagerWarmest_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SetpointManager_Impl.hpp b/src/model/SetpointManager_Impl.hpp index dcdfc3905dd..0d7f1c1da91 100644 --- a/src/model/SetpointManager_Impl.hpp +++ b/src/model/SetpointManager_Impl.hpp @@ -25,7 +25,7 @@ namespace model { SetpointManager_Impl(const SetpointManager_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~SetpointManager_Impl() = default; + virtual ~SetpointManager_Impl() override = default; /** This method will delete any existing SPM with the same controlVariable, and check if placing the SPM is allowed: *
    diff --git a/src/model/Shade.cpp b/src/model/Shade.cpp index e6b115d3f58..34c1fc850b3 100644 --- a/src/model/Shade.cpp +++ b/src/model/Shade.cpp @@ -412,6 +412,7 @@ namespace model { return getImpl()->setThermalTransmittance(thermalTransmittance); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double Shade::thickness() const { return getImpl()->thickness(); } @@ -488,6 +489,7 @@ namespace model { return getImpl()->setThermalHemisphericalEmissivity(thermalHemisphericalEmissivity); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool Shade::setThickness(double thickness) { return getImpl()->setThickness(thickness); } diff --git a/src/model/Shade.hpp b/src/model/Shade.hpp index 8c560f96fb8..fd70694f8ba 100644 --- a/src/model/Shade.hpp +++ b/src/model/Shade.hpp @@ -30,7 +30,7 @@ namespace model { double visibleReflectance = 0.5, double thermalHemisphericalEmissivity = 0.9, double thermalTransmittance = 0.0, double thickness = 0.005, double conductivity = 0.1); - virtual ~Shade() = default; + virtual ~Shade() override = default; // Default the copy and move operators because the virtual dtor is explicit Shade(const Shade& other) = default; Shade(Shade&& other) = default; diff --git a/src/model/Shade_Impl.hpp b/src/model/Shade_Impl.hpp index 22377780ee3..a7530ad198d 100644 --- a/src/model/Shade_Impl.hpp +++ b/src/model/Shade_Impl.hpp @@ -28,7 +28,7 @@ namespace model { Shade_Impl(const Shade_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Shade_Impl() = default; + virtual ~Shade_Impl() override = default; //@} diff --git a/src/model/ShadingControl.cpp b/src/model/ShadingControl.cpp index 601c74a245c..e3ec7c9c8c6 100644 --- a/src/model/ShadingControl.cpp +++ b/src/model/ShadingControl.cpp @@ -25,6 +25,8 @@ #include "Model_Impl.hpp" #include "ModelExtensibleGroup.hpp" +#include "../utilities/core/Assert.hpp" +#include "../utilities/core/Compare.hpp" #include "../utilities/idf/WorkspaceExtensibleGroup.hpp" #include @@ -32,9 +34,6 @@ #include #include -#include "../utilities/core/Assert.hpp" -#include "utilities/core/Compare.hpp" - #include #include #include diff --git a/src/model/ShadingControl.hpp b/src/model/ShadingControl.hpp index 306c9eff0a8..cf2f4c70fd5 100644 --- a/src/model/ShadingControl.hpp +++ b/src/model/ShadingControl.hpp @@ -42,7 +42,7 @@ namespace model { /// This constructor is preferred for all configurations other than switchable glazing. explicit ShadingControl(const ShadingMaterial& shadingMaterial); - virtual ~ShadingControl() = default; + virtual ~ShadingControl() override = default; // Default the copy and move operators because the virtual dtor is explicit ShadingControl(const ShadingControl& other) = default; ShadingControl(ShadingControl&& other) = default; diff --git a/src/model/ShadingControl_Impl.hpp b/src/model/ShadingControl_Impl.hpp index 5d147da9e5d..e64747dafef 100644 --- a/src/model/ShadingControl_Impl.hpp +++ b/src/model/ShadingControl_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ShadingControl_Impl(const ShadingControl_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ShadingControl_Impl() = default; + virtual ~ShadingControl_Impl() override = default; //@} diff --git a/src/model/ShadingMaterial.hpp b/src/model/ShadingMaterial.hpp index f2fcb935236..1334e27e8c5 100644 --- a/src/model/ShadingMaterial.hpp +++ b/src/model/ShadingMaterial.hpp @@ -24,7 +24,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ShadingMaterial() = default; + virtual ~ShadingMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit ShadingMaterial(const ShadingMaterial& other) = default; ShadingMaterial(ShadingMaterial&& other) = default; diff --git a/src/model/ShadingMaterial_Impl.hpp b/src/model/ShadingMaterial_Impl.hpp index b7dc6730897..a0a19b9886e 100644 --- a/src/model/ShadingMaterial_Impl.hpp +++ b/src/model/ShadingMaterial_Impl.hpp @@ -29,7 +29,7 @@ namespace model { // Clone copy constructor. ShadingMaterial_Impl(const ShadingMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ShadingMaterial_Impl() = default; + virtual ~ShadingMaterial_Impl() override = default; private: REGISTER_LOGGER("openstudio.model.ShadingMaterial"); diff --git a/src/model/ShadingSurface.hpp b/src/model/ShadingSurface.hpp index 50fdfb778a8..478f48ce2ee 100644 --- a/src/model/ShadingSurface.hpp +++ b/src/model/ShadingSurface.hpp @@ -32,7 +32,7 @@ namespace model { explicit ShadingSurface(const std::vector& vertices, const Model& model); - virtual ~ShadingSurface() = default; + virtual ~ShadingSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit ShadingSurface(const ShadingSurface& other) = default; ShadingSurface(ShadingSurface&& other) = default; diff --git a/src/model/ShadingSurfaceGroup.hpp b/src/model/ShadingSurfaceGroup.hpp index 764c7608618..8288fa8e665 100644 --- a/src/model/ShadingSurfaceGroup.hpp +++ b/src/model/ShadingSurfaceGroup.hpp @@ -35,7 +35,7 @@ namespace model { explicit ShadingSurfaceGroup(const Model& model); - virtual ~ShadingSurfaceGroup() = default; + virtual ~ShadingSurfaceGroup() override = default; // Default the copy and move operators because the virtual dtor is explicit ShadingSurfaceGroup(const ShadingSurfaceGroup& other) = default; ShadingSurfaceGroup(ShadingSurfaceGroup&& other) = default; diff --git a/src/model/ShadingSurfaceGroup_Impl.hpp b/src/model/ShadingSurfaceGroup_Impl.hpp index 2c36eede02d..ac16779391c 100644 --- a/src/model/ShadingSurfaceGroup_Impl.hpp +++ b/src/model/ShadingSurfaceGroup_Impl.hpp @@ -37,7 +37,7 @@ namespace model { ShadingSurfaceGroup_Impl(const ShadingSurfaceGroup_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ShadingSurfaceGroup_Impl() = default; + virtual ~ShadingSurfaceGroup_Impl() override = default; //@} diff --git a/src/model/ShadingSurface_Impl.hpp b/src/model/ShadingSurface_Impl.hpp index 0736e3a6072..364dc7cae88 100644 --- a/src/model/ShadingSurface_Impl.hpp +++ b/src/model/ShadingSurface_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ShadingSurface_Impl(const ShadingSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ShadingSurface_Impl() = default; + virtual ~ShadingSurface_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ShadowCalculation.hpp b/src/model/ShadowCalculation.hpp index 7b7d9afecad..6f855fcbc00 100644 --- a/src/model/ShadowCalculation.hpp +++ b/src/model/ShadowCalculation.hpp @@ -30,7 +30,7 @@ namespace model { class MODEL_API ShadowCalculation : public ModelObject { public: - virtual ~ShadowCalculation() = default; + virtual ~ShadowCalculation() override = default; // Default the copy and move operators because the virtual dtor is explicit ShadowCalculation(const ShadowCalculation& other) = default; ShadowCalculation(ShadowCalculation&& other) = default; diff --git a/src/model/ShadowCalculation_Impl.hpp b/src/model/ShadowCalculation_Impl.hpp index dcf9d6c6c81..f006aca4b77 100644 --- a/src/model/ShadowCalculation_Impl.hpp +++ b/src/model/ShadowCalculation_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ShadowCalculation_Impl(const ShadowCalculation_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ShadowCalculation_Impl() = default; + virtual ~ShadowCalculation_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/SimpleGlazing.hpp b/src/model/SimpleGlazing.hpp index 307578e87f6..0572e53e6d4 100644 --- a/src/model/SimpleGlazing.hpp +++ b/src/model/SimpleGlazing.hpp @@ -28,7 +28,7 @@ namespace model { explicit SimpleGlazing(const Model& model, double uFactor = 0.1, double solarHeatGainCoefficient = 0.1); - virtual ~SimpleGlazing() = default; + virtual ~SimpleGlazing() override = default; // Default the copy and move operators because the virtual dtor is explicit SimpleGlazing(const SimpleGlazing& other) = default; SimpleGlazing(SimpleGlazing&& other) = default; diff --git a/src/model/SimpleGlazing_Impl.hpp b/src/model/SimpleGlazing_Impl.hpp index b01375b34f6..c967bd260d5 100644 --- a/src/model/SimpleGlazing_Impl.hpp +++ b/src/model/SimpleGlazing_Impl.hpp @@ -28,7 +28,7 @@ namespace model { SimpleGlazing_Impl(const SimpleGlazing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SimpleGlazing_Impl() = default; + virtual ~SimpleGlazing_Impl() override = default; //@} diff --git a/src/model/SimulationControl.hpp b/src/model/SimulationControl.hpp index 3abf0f29ea7..66d21702975 100644 --- a/src/model/SimulationControl.hpp +++ b/src/model/SimulationControl.hpp @@ -42,7 +42,7 @@ namespace model { class MODEL_API SimulationControl : public ParentObject { public: - virtual ~SimulationControl() = default; + virtual ~SimulationControl() override = default; // Default the copy and move operators because the virtual dtor is explicit SimulationControl(const SimulationControl& other) = default; SimulationControl(SimulationControl&& other) = default; diff --git a/src/model/SimulationControl_Impl.hpp b/src/model/SimulationControl_Impl.hpp index f93e506775c..3714c245111 100644 --- a/src/model/SimulationControl_Impl.hpp +++ b/src/model/SimulationControl_Impl.hpp @@ -44,7 +44,7 @@ namespace model { SimulationControl_Impl(const SimulationControl_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~SimulationControl_Impl() = default; + virtual ~SimulationControl_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/Site.hpp b/src/model/Site.hpp index 76dac1fb1a3..3e42b0c7334 100644 --- a/src/model/Site.hpp +++ b/src/model/Site.hpp @@ -37,7 +37,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~Site() = default; + virtual ~Site() override = default; // Default the copy and move operators because the virtual dtor is explicit Site(const Site& other) = default; Site(Site&& other) = default; diff --git a/src/model/SiteGroundReflectance.hpp b/src/model/SiteGroundReflectance.hpp index becd7a3253f..3eda778acf5 100644 --- a/src/model/SiteGroundReflectance.hpp +++ b/src/model/SiteGroundReflectance.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~SiteGroundReflectance() = default; + virtual ~SiteGroundReflectance() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundReflectance(const SiteGroundReflectance& other) = default; SiteGroundReflectance(SiteGroundReflectance&& other) = default; diff --git a/src/model/SiteGroundReflectance_Impl.hpp b/src/model/SiteGroundReflectance_Impl.hpp index aac1b15125d..07ccad05dfc 100644 --- a/src/model/SiteGroundReflectance_Impl.hpp +++ b/src/model/SiteGroundReflectance_Impl.hpp @@ -28,7 +28,7 @@ namespace model { SiteGroundReflectance_Impl(const SiteGroundReflectance_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundReflectance_Impl() = default; + virtual ~SiteGroundReflectance_Impl() override = default; //@} diff --git a/src/model/SiteGroundTemperatureBuildingSurface.hpp b/src/model/SiteGroundTemperatureBuildingSurface.hpp index 58369b3040d..e9315d24574 100644 --- a/src/model/SiteGroundTemperatureBuildingSurface.hpp +++ b/src/model/SiteGroundTemperatureBuildingSurface.hpp @@ -29,7 +29,7 @@ namespace model { explicit SiteGroundTemperatureBuildingSurface(Model& model); - virtual ~SiteGroundTemperatureBuildingSurface() = default; + virtual ~SiteGroundTemperatureBuildingSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundTemperatureBuildingSurface(const SiteGroundTemperatureBuildingSurface& other) = default; SiteGroundTemperatureBuildingSurface(SiteGroundTemperatureBuildingSurface&& other) = default; diff --git a/src/model/SiteGroundTemperatureBuildingSurface_Impl.hpp b/src/model/SiteGroundTemperatureBuildingSurface_Impl.hpp index fe72ddc7706..3fd2052b167 100644 --- a/src/model/SiteGroundTemperatureBuildingSurface_Impl.hpp +++ b/src/model/SiteGroundTemperatureBuildingSurface_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteGroundTemperatureBuildingSurface_Impl(const SiteGroundTemperatureBuildingSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundTemperatureBuildingSurface_Impl() = default; + virtual ~SiteGroundTemperatureBuildingSurface_Impl() override = default; //@} diff --git a/src/model/SiteGroundTemperatureDeep.hpp b/src/model/SiteGroundTemperatureDeep.hpp index e880074757b..aae2ec358c1 100644 --- a/src/model/SiteGroundTemperatureDeep.hpp +++ b/src/model/SiteGroundTemperatureDeep.hpp @@ -29,7 +29,7 @@ namespace model { explicit SiteGroundTemperatureDeep(Model& model); - virtual ~SiteGroundTemperatureDeep() = default; + virtual ~SiteGroundTemperatureDeep() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundTemperatureDeep(const SiteGroundTemperatureDeep& other) = default; SiteGroundTemperatureDeep(SiteGroundTemperatureDeep&& other) = default; diff --git a/src/model/SiteGroundTemperatureDeep_Impl.hpp b/src/model/SiteGroundTemperatureDeep_Impl.hpp index 4ffd58192be..ec2910ae6d9 100644 --- a/src/model/SiteGroundTemperatureDeep_Impl.hpp +++ b/src/model/SiteGroundTemperatureDeep_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteGroundTemperatureDeep_Impl(const SiteGroundTemperatureDeep_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundTemperatureDeep_Impl() = default; + virtual ~SiteGroundTemperatureDeep_Impl() override = default; //@} diff --git a/src/model/SiteGroundTemperatureFCfactorMethod.hpp b/src/model/SiteGroundTemperatureFCfactorMethod.hpp index e17eddcc19c..2af059291bf 100644 --- a/src/model/SiteGroundTemperatureFCfactorMethod.hpp +++ b/src/model/SiteGroundTemperatureFCfactorMethod.hpp @@ -29,7 +29,7 @@ namespace model { explicit SiteGroundTemperatureFCfactorMethod(Model& model); - virtual ~SiteGroundTemperatureFCfactorMethod() = default; + virtual ~SiteGroundTemperatureFCfactorMethod() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundTemperatureFCfactorMethod(const SiteGroundTemperatureFCfactorMethod& other) = default; SiteGroundTemperatureFCfactorMethod(SiteGroundTemperatureFCfactorMethod&& other) = default; diff --git a/src/model/SiteGroundTemperatureFCfactorMethod_Impl.hpp b/src/model/SiteGroundTemperatureFCfactorMethod_Impl.hpp index 6aebd3f486e..b4cc7fc132d 100644 --- a/src/model/SiteGroundTemperatureFCfactorMethod_Impl.hpp +++ b/src/model/SiteGroundTemperatureFCfactorMethod_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteGroundTemperatureFCfactorMethod_Impl(const SiteGroundTemperatureFCfactorMethod_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundTemperatureFCfactorMethod_Impl() = default; + virtual ~SiteGroundTemperatureFCfactorMethod_Impl() override = default; //@} diff --git a/src/model/SiteGroundTemperatureShallow.hpp b/src/model/SiteGroundTemperatureShallow.hpp index 828ddbc0bb6..814bc9404f7 100644 --- a/src/model/SiteGroundTemperatureShallow.hpp +++ b/src/model/SiteGroundTemperatureShallow.hpp @@ -29,7 +29,7 @@ namespace model { explicit SiteGroundTemperatureShallow(Model& model); - virtual ~SiteGroundTemperatureShallow() = default; + virtual ~SiteGroundTemperatureShallow() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundTemperatureShallow(const SiteGroundTemperatureShallow& other) = default; SiteGroundTemperatureShallow(SiteGroundTemperatureShallow&& other) = default; diff --git a/src/model/SiteGroundTemperatureShallow_Impl.hpp b/src/model/SiteGroundTemperatureShallow_Impl.hpp index cfa3f4db257..abfbbb04a28 100644 --- a/src/model/SiteGroundTemperatureShallow_Impl.hpp +++ b/src/model/SiteGroundTemperatureShallow_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteGroundTemperatureShallow_Impl(const SiteGroundTemperatureShallow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundTemperatureShallow_Impl() = default; + virtual ~SiteGroundTemperatureShallow_Impl() override = default; //@} diff --git a/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach.hpp b/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach.hpp index 9d5a6513af8..0202ab5b97d 100644 --- a/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach.hpp +++ b/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach.hpp @@ -28,7 +28,7 @@ namespace model { explicit SiteGroundTemperatureUndisturbedKusudaAchenbach(const Model& model); - virtual ~SiteGroundTemperatureUndisturbedKusudaAchenbach() = default; + virtual ~SiteGroundTemperatureUndisturbedKusudaAchenbach() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundTemperatureUndisturbedKusudaAchenbach(const SiteGroundTemperatureUndisturbedKusudaAchenbach& other) = default; SiteGroundTemperatureUndisturbedKusudaAchenbach(SiteGroundTemperatureUndisturbedKusudaAchenbach&& other) = default; diff --git a/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl.hpp b/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl.hpp index 0b539624b14..8f3760f7597 100644 --- a/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl.hpp +++ b/src/model/SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl(const SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl() = default; + virtual ~SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl() override = default; //@} diff --git a/src/model/SiteGroundTemperatureUndisturbedXing.hpp b/src/model/SiteGroundTemperatureUndisturbedXing.hpp index 3f8d91e1eca..a560a9ff893 100644 --- a/src/model/SiteGroundTemperatureUndisturbedXing.hpp +++ b/src/model/SiteGroundTemperatureUndisturbedXing.hpp @@ -29,7 +29,7 @@ namespace model { explicit SiteGroundTemperatureUndisturbedXing(const Model& model); - virtual ~SiteGroundTemperatureUndisturbedXing() = default; + virtual ~SiteGroundTemperatureUndisturbedXing() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteGroundTemperatureUndisturbedXing(const SiteGroundTemperatureUndisturbedXing& other) = default; SiteGroundTemperatureUndisturbedXing(SiteGroundTemperatureUndisturbedXing&& other) = default; diff --git a/src/model/SiteGroundTemperatureUndisturbedXing_Impl.hpp b/src/model/SiteGroundTemperatureUndisturbedXing_Impl.hpp index 5763f94ac7c..6e339850bec 100644 --- a/src/model/SiteGroundTemperatureUndisturbedXing_Impl.hpp +++ b/src/model/SiteGroundTemperatureUndisturbedXing_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteGroundTemperatureUndisturbedXing_Impl(const SiteGroundTemperatureUndisturbedXing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteGroundTemperatureUndisturbedXing_Impl() = default; + virtual ~SiteGroundTemperatureUndisturbedXing_Impl() override = default; //@} diff --git a/src/model/SiteWaterMainsTemperature.hpp b/src/model/SiteWaterMainsTemperature.hpp index c5d78b538f7..ce7bd0fdd78 100644 --- a/src/model/SiteWaterMainsTemperature.hpp +++ b/src/model/SiteWaterMainsTemperature.hpp @@ -28,7 +28,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~SiteWaterMainsTemperature() = default; + virtual ~SiteWaterMainsTemperature() override = default; // Default the copy and move operators because the virtual dtor is explicit SiteWaterMainsTemperature(const SiteWaterMainsTemperature& other) = default; SiteWaterMainsTemperature(SiteWaterMainsTemperature&& other) = default; diff --git a/src/model/SiteWaterMainsTemperature_Impl.hpp b/src/model/SiteWaterMainsTemperature_Impl.hpp index b5de083c35a..3bf9296cb75 100644 --- a/src/model/SiteWaterMainsTemperature_Impl.hpp +++ b/src/model/SiteWaterMainsTemperature_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SiteWaterMainsTemperature_Impl(const SiteWaterMainsTemperature_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SiteWaterMainsTemperature_Impl() = default; + virtual ~SiteWaterMainsTemperature_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Site_Impl.hpp b/src/model/Site_Impl.hpp index ee6bf69af94..7656dc71868 100644 --- a/src/model/Site_Impl.hpp +++ b/src/model/Site_Impl.hpp @@ -42,7 +42,7 @@ namespace model { Site_Impl(const Site_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Site_Impl() = default; + virtual ~Site_Impl() override = default; //@} diff --git a/src/model/SizingParameters.hpp b/src/model/SizingParameters.hpp index b5ad0372b2c..1a01a9102c8 100644 --- a/src/model/SizingParameters.hpp +++ b/src/model/SizingParameters.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~SizingParameters() = default; + virtual ~SizingParameters() override = default; // Default the copy and move operators because the virtual dtor is explicit SizingParameters(const SizingParameters& other) = default; SizingParameters(SizingParameters&& other) = default; diff --git a/src/model/SizingParameters_Impl.hpp b/src/model/SizingParameters_Impl.hpp index 5f8a1a8bbc2..ed20ee835d4 100644 --- a/src/model/SizingParameters_Impl.hpp +++ b/src/model/SizingParameters_Impl.hpp @@ -28,7 +28,7 @@ namespace model { SizingParameters_Impl(const SizingParameters_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SizingParameters_Impl() = default; + virtual ~SizingParameters_Impl() override = default; //@} diff --git a/src/model/SizingPeriod.hpp b/src/model/SizingPeriod.hpp index de59fb02d66..6d569c2c242 100644 --- a/src/model/SizingPeriod.hpp +++ b/src/model/SizingPeriod.hpp @@ -19,7 +19,7 @@ namespace model { class MODEL_API SizingPeriod : public ParentObject { public: - virtual ~SizingPeriod() = default; + virtual ~SizingPeriod() override = default; // Default the copy and move operators because the virtual dtor is explicit SizingPeriod(const SizingPeriod& other) = default; SizingPeriod(SizingPeriod&& other) = default; diff --git a/src/model/SizingPeriod_Impl.hpp b/src/model/SizingPeriod_Impl.hpp index 1ad22a18730..5fb25ec4b34 100644 --- a/src/model/SizingPeriod_Impl.hpp +++ b/src/model/SizingPeriod_Impl.hpp @@ -26,7 +26,7 @@ namespace model { SizingPeriod_Impl(const SizingPeriod_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~SizingPeriod_Impl() = default; + virtual ~SizingPeriod_Impl() override = default; // ensure that this object does not contain the date 2/29 virtual void ensureNoLeapDays() = 0; diff --git a/src/model/SizingPlant.hpp b/src/model/SizingPlant.hpp index 3be6777458e..94a0b336c70 100644 --- a/src/model/SizingPlant.hpp +++ b/src/model/SizingPlant.hpp @@ -27,7 +27,7 @@ namespace model { public: explicit SizingPlant(const Model& model, const PlantLoop& plantLoop); - virtual ~SizingPlant() = default; + virtual ~SizingPlant() override = default; // Default the copy and move operators because the virtual dtor is explicit SizingPlant(const SizingPlant& other) = default; SizingPlant(SizingPlant&& other) = default; diff --git a/src/model/SizingPlant_Impl.hpp b/src/model/SizingPlant_Impl.hpp index a3b6781ea87..58181c92630 100644 --- a/src/model/SizingPlant_Impl.hpp +++ b/src/model/SizingPlant_Impl.hpp @@ -27,7 +27,7 @@ namespace model { SizingPlant_Impl(const SizingPlant_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SizingPlant_Impl() = default; + virtual ~SizingPlant_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/SizingSystem.hpp b/src/model/SizingSystem.hpp index edaa25685c2..20938a5c723 100644 --- a/src/model/SizingSystem.hpp +++ b/src/model/SizingSystem.hpp @@ -28,7 +28,7 @@ namespace model { public: explicit SizingSystem(const Model& model, const AirLoopHVAC& airLoopHVAC); - virtual ~SizingSystem() = default; + virtual ~SizingSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit SizingSystem(const SizingSystem& other) = default; SizingSystem(SizingSystem&& other) = default; diff --git a/src/model/SizingSystem_Impl.hpp b/src/model/SizingSystem_Impl.hpp index 5fb44ac3ce5..f11d6e1b6c4 100644 --- a/src/model/SizingSystem_Impl.hpp +++ b/src/model/SizingSystem_Impl.hpp @@ -28,7 +28,7 @@ namespace model { SizingSystem_Impl(const SizingSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SizingSystem_Impl() = default; + virtual ~SizingSystem_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/SizingZone.hpp b/src/model/SizingZone.hpp index 9b9880b4ffd..3bcf3a05708 100644 --- a/src/model/SizingZone.hpp +++ b/src/model/SizingZone.hpp @@ -31,7 +31,7 @@ namespace model { explicit SizingZone(const Model& model, const ThermalZone& thermalZone); - virtual ~SizingZone() = default; + virtual ~SizingZone() override = default; // Default the copy and move operators because the virtual dtor is explicit SizingZone(const SizingZone& other) = default; SizingZone(SizingZone&& other) = default; diff --git a/src/model/SizingZone_Impl.hpp b/src/model/SizingZone_Impl.hpp index 59e030787d9..7155e6ece5d 100644 --- a/src/model/SizingZone_Impl.hpp +++ b/src/model/SizingZone_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SizingZone_Impl(const SizingZone_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SizingZone_Impl() = default; + virtual ~SizingZone_Impl() override = default; //@} diff --git a/src/model/SkyTemperature.hpp b/src/model/SkyTemperature.hpp index 14c5b92af9b..bb8bcf81c35 100644 --- a/src/model/SkyTemperature.hpp +++ b/src/model/SkyTemperature.hpp @@ -22,7 +22,7 @@ namespace model { // constructor explicit SkyTemperature(const Model& model); - virtual ~SkyTemperature() = default; + virtual ~SkyTemperature() override = default; // Default the copy and move operators because the virtual dtor is explicit SkyTemperature(const SkyTemperature& other) = default; SkyTemperature(SkyTemperature&& other) = default; diff --git a/src/model/SkyTemperature_Impl.hpp b/src/model/SkyTemperature_Impl.hpp index d5f9d7e7b58..70afd1ddbd8 100644 --- a/src/model/SkyTemperature_Impl.hpp +++ b/src/model/SkyTemperature_Impl.hpp @@ -26,7 +26,7 @@ namespace model { SkyTemperature_Impl(const SkyTemperature_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~SkyTemperature_Impl() = default; + virtual ~SkyTemperature_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/SolarCollectorFlatPlatePhotovoltaicThermal.hpp b/src/model/SolarCollectorFlatPlatePhotovoltaicThermal.hpp index 7afa9c71c32..f1dea2aee18 100644 --- a/src/model/SolarCollectorFlatPlatePhotovoltaicThermal.hpp +++ b/src/model/SolarCollectorFlatPlatePhotovoltaicThermal.hpp @@ -35,7 +35,7 @@ namespace model { explicit SolarCollectorFlatPlatePhotovoltaicThermal(const SolarCollectorPerformancePhotovoltaicThermalBIPVT& performance); explicit SolarCollectorFlatPlatePhotovoltaicThermal(const SolarCollectorPerformancePhotovoltaicThermalSimple& performance); - virtual ~SolarCollectorFlatPlatePhotovoltaicThermal() = default; + virtual ~SolarCollectorFlatPlatePhotovoltaicThermal() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorFlatPlatePhotovoltaicThermal(const SolarCollectorFlatPlatePhotovoltaicThermal& other) = default; SolarCollectorFlatPlatePhotovoltaicThermal(SolarCollectorFlatPlatePhotovoltaicThermal&& other) = default; diff --git a/src/model/SolarCollectorFlatPlatePhotovoltaicThermal_Impl.hpp b/src/model/SolarCollectorFlatPlatePhotovoltaicThermal_Impl.hpp index 7293e6fcf04..bd2ca886de2 100644 --- a/src/model/SolarCollectorFlatPlatePhotovoltaicThermal_Impl.hpp +++ b/src/model/SolarCollectorFlatPlatePhotovoltaicThermal_Impl.hpp @@ -35,7 +35,7 @@ namespace model { SolarCollectorFlatPlatePhotovoltaicThermal_Impl(const SolarCollectorFlatPlatePhotovoltaicThermal_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorFlatPlatePhotovoltaicThermal_Impl() = default; + virtual ~SolarCollectorFlatPlatePhotovoltaicThermal_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SolarCollectorFlatPlateWater.hpp b/src/model/SolarCollectorFlatPlateWater.hpp index 65fdf8a6434..22e9dd4efca 100644 --- a/src/model/SolarCollectorFlatPlateWater.hpp +++ b/src/model/SolarCollectorFlatPlateWater.hpp @@ -32,7 +32,7 @@ namespace model { explicit SolarCollectorFlatPlateWater(const Model& model); - virtual ~SolarCollectorFlatPlateWater() = default; + virtual ~SolarCollectorFlatPlateWater() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorFlatPlateWater(const SolarCollectorFlatPlateWater& other) = default; SolarCollectorFlatPlateWater(SolarCollectorFlatPlateWater&& other) = default; diff --git a/src/model/SolarCollectorFlatPlateWater_Impl.hpp b/src/model/SolarCollectorFlatPlateWater_Impl.hpp index 17ce0130433..28d5563dc66 100644 --- a/src/model/SolarCollectorFlatPlateWater_Impl.hpp +++ b/src/model/SolarCollectorFlatPlateWater_Impl.hpp @@ -33,7 +33,7 @@ namespace model { SolarCollectorFlatPlateWater_Impl(const SolarCollectorFlatPlateWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorFlatPlateWater_Impl() = default; + virtual ~SolarCollectorFlatPlateWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SolarCollectorIntegralCollectorStorage.hpp b/src/model/SolarCollectorIntegralCollectorStorage.hpp index 147c2bd80d7..6f3e0434669 100644 --- a/src/model/SolarCollectorIntegralCollectorStorage.hpp +++ b/src/model/SolarCollectorIntegralCollectorStorage.hpp @@ -31,7 +31,7 @@ namespace model { explicit SolarCollectorIntegralCollectorStorage(const Model& model); - virtual ~SolarCollectorIntegralCollectorStorage() = default; + virtual ~SolarCollectorIntegralCollectorStorage() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorIntegralCollectorStorage(const SolarCollectorIntegralCollectorStorage& other) = default; SolarCollectorIntegralCollectorStorage(SolarCollectorIntegralCollectorStorage&& other) = default; diff --git a/src/model/SolarCollectorIntegralCollectorStorage_Impl.hpp b/src/model/SolarCollectorIntegralCollectorStorage_Impl.hpp index defbcebbb10..ed5c9ca3166 100644 --- a/src/model/SolarCollectorIntegralCollectorStorage_Impl.hpp +++ b/src/model/SolarCollectorIntegralCollectorStorage_Impl.hpp @@ -32,7 +32,7 @@ namespace model { SolarCollectorIntegralCollectorStorage_Impl(const SolarCollectorIntegralCollectorStorage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorIntegralCollectorStorage_Impl() = default; + virtual ~SolarCollectorIntegralCollectorStorage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SolarCollectorPerformanceFlatPlate.hpp b/src/model/SolarCollectorPerformanceFlatPlate.hpp index e5107ca5791..2e351b92c02 100644 --- a/src/model/SolarCollectorPerformanceFlatPlate.hpp +++ b/src/model/SolarCollectorPerformanceFlatPlate.hpp @@ -29,7 +29,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~SolarCollectorPerformanceFlatPlate() = default; + virtual ~SolarCollectorPerformanceFlatPlate() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorPerformanceFlatPlate(const SolarCollectorPerformanceFlatPlate& other) = default; SolarCollectorPerformanceFlatPlate(SolarCollectorPerformanceFlatPlate&& other) = default; diff --git a/src/model/SolarCollectorPerformanceFlatPlate_Impl.hpp b/src/model/SolarCollectorPerformanceFlatPlate_Impl.hpp index 2c0478a59e3..0e9d52811c9 100644 --- a/src/model/SolarCollectorPerformanceFlatPlate_Impl.hpp +++ b/src/model/SolarCollectorPerformanceFlatPlate_Impl.hpp @@ -28,7 +28,7 @@ namespace model { SolarCollectorPerformanceFlatPlate_Impl(const SolarCollectorPerformanceFlatPlate_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorPerformanceFlatPlate_Impl() = default; + virtual ~SolarCollectorPerformanceFlatPlate_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SolarCollectorPerformanceIntegralCollectorStorage.hpp b/src/model/SolarCollectorPerformanceIntegralCollectorStorage.hpp index 9086d55cc62..8767d4202a9 100644 --- a/src/model/SolarCollectorPerformanceIntegralCollectorStorage.hpp +++ b/src/model/SolarCollectorPerformanceIntegralCollectorStorage.hpp @@ -29,7 +29,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~SolarCollectorPerformanceIntegralCollectorStorage() = default; + virtual ~SolarCollectorPerformanceIntegralCollectorStorage() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorPerformanceIntegralCollectorStorage(const SolarCollectorPerformanceIntegralCollectorStorage& other) = default; SolarCollectorPerformanceIntegralCollectorStorage(SolarCollectorPerformanceIntegralCollectorStorage&& other) = default; diff --git a/src/model/SolarCollectorPerformanceIntegralCollectorStorage_Impl.hpp b/src/model/SolarCollectorPerformanceIntegralCollectorStorage_Impl.hpp index d763f545e57..9d0dad38721 100644 --- a/src/model/SolarCollectorPerformanceIntegralCollectorStorage_Impl.hpp +++ b/src/model/SolarCollectorPerformanceIntegralCollectorStorage_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SolarCollectorPerformanceIntegralCollectorStorage_Impl(const SolarCollectorPerformanceIntegralCollectorStorage_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorPerformanceIntegralCollectorStorage_Impl() = default; + virtual ~SolarCollectorPerformanceIntegralCollectorStorage_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT.hpp b/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT.hpp index 240d3bd131e..c65d1a097b2 100644 --- a/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT.hpp +++ b/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT.hpp @@ -32,7 +32,7 @@ namespace model { explicit SolarCollectorPerformancePhotovoltaicThermalBIPVT(const Model& model); explicit SolarCollectorPerformancePhotovoltaicThermalBIPVT(const SurfacePropertyOtherSideConditionsModel& oscm); - virtual ~SolarCollectorPerformancePhotovoltaicThermalBIPVT() = default; + virtual ~SolarCollectorPerformancePhotovoltaicThermalBIPVT() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorPerformancePhotovoltaicThermalBIPVT(const SolarCollectorPerformancePhotovoltaicThermalBIPVT& other) = default; SolarCollectorPerformancePhotovoltaicThermalBIPVT(SolarCollectorPerformancePhotovoltaicThermalBIPVT&& other) = default; diff --git a/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl.hpp b/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl.hpp index e4c395df536..eedfb37f2bd 100644 --- a/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl.hpp +++ b/src/model/SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl.hpp @@ -32,7 +32,7 @@ namespace model { SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl(const SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl() = default; + virtual ~SolarCollectorPerformancePhotovoltaicThermalBIPVT_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple.hpp b/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple.hpp index 849998c8b85..3a88b837ee4 100644 --- a/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple.hpp +++ b/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple.hpp @@ -32,7 +32,7 @@ namespace model { explicit SolarCollectorPerformancePhotovoltaicThermalSimple(const Model& model); - virtual ~SolarCollectorPerformancePhotovoltaicThermalSimple() = default; + virtual ~SolarCollectorPerformancePhotovoltaicThermalSimple() override = default; // Default the copy and move operators because the virtual dtor is explicit SolarCollectorPerformancePhotovoltaicThermalSimple(const SolarCollectorPerformancePhotovoltaicThermalSimple& other) = default; SolarCollectorPerformancePhotovoltaicThermalSimple(SolarCollectorPerformancePhotovoltaicThermalSimple&& other) = default; diff --git a/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple_Impl.hpp b/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple_Impl.hpp index acb03a9bdec..dc824c64ffd 100644 --- a/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple_Impl.hpp +++ b/src/model/SolarCollectorPerformancePhotovoltaicThermalSimple_Impl.hpp @@ -33,7 +33,7 @@ namespace model { SolarCollectorPerformancePhotovoltaicThermalSimple_Impl(const SolarCollectorPerformancePhotovoltaicThermalSimple_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SolarCollectorPerformancePhotovoltaicThermalSimple_Impl() = default; + virtual ~SolarCollectorPerformancePhotovoltaicThermalSimple_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Space.hpp b/src/model/Space.hpp index a4fe82fa6df..c794e7774d9 100644 --- a/src/model/Space.hpp +++ b/src/model/Space.hpp @@ -67,7 +67,7 @@ namespace model { /// the space inherits that by default. explicit Space(const Model& model); - virtual ~Space() = default; + virtual ~Space() override = default; // Default the copy and move operators because the virtual dtor is explicit Space(const Space& other) = default; Space(Space&& other) = default; diff --git a/src/model/SpaceInfiltrationDesignFlowRate.hpp b/src/model/SpaceInfiltrationDesignFlowRate.hpp index 54ab50263b9..d7268325691 100644 --- a/src/model/SpaceInfiltrationDesignFlowRate.hpp +++ b/src/model/SpaceInfiltrationDesignFlowRate.hpp @@ -30,7 +30,7 @@ namespace model { explicit SpaceInfiltrationDesignFlowRate(const Model& model); - virtual ~SpaceInfiltrationDesignFlowRate() = default; + virtual ~SpaceInfiltrationDesignFlowRate() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceInfiltrationDesignFlowRate(const SpaceInfiltrationDesignFlowRate& other) = default; SpaceInfiltrationDesignFlowRate(SpaceInfiltrationDesignFlowRate&& other) = default; diff --git a/src/model/SpaceInfiltrationDesignFlowRate_Impl.hpp b/src/model/SpaceInfiltrationDesignFlowRate_Impl.hpp index 12cd07ebb85..de1ebea52a0 100644 --- a/src/model/SpaceInfiltrationDesignFlowRate_Impl.hpp +++ b/src/model/SpaceInfiltrationDesignFlowRate_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SpaceInfiltrationDesignFlowRate_Impl(const SpaceInfiltrationDesignFlowRate_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceInfiltrationDesignFlowRate_Impl() = default; + virtual ~SpaceInfiltrationDesignFlowRate_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SpaceInfiltrationEffectiveLeakageArea.hpp b/src/model/SpaceInfiltrationEffectiveLeakageArea.hpp index 14dfe3a9a76..0090af90581 100644 --- a/src/model/SpaceInfiltrationEffectiveLeakageArea.hpp +++ b/src/model/SpaceInfiltrationEffectiveLeakageArea.hpp @@ -30,7 +30,7 @@ namespace model { explicit SpaceInfiltrationEffectiveLeakageArea(const Model& model); - virtual ~SpaceInfiltrationEffectiveLeakageArea() = default; + virtual ~SpaceInfiltrationEffectiveLeakageArea() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceInfiltrationEffectiveLeakageArea(const SpaceInfiltrationEffectiveLeakageArea& other) = default; SpaceInfiltrationEffectiveLeakageArea(SpaceInfiltrationEffectiveLeakageArea&& other) = default; diff --git a/src/model/SpaceInfiltrationEffectiveLeakageArea_Impl.hpp b/src/model/SpaceInfiltrationEffectiveLeakageArea_Impl.hpp index f51f7b126d7..df886e4e309 100644 --- a/src/model/SpaceInfiltrationEffectiveLeakageArea_Impl.hpp +++ b/src/model/SpaceInfiltrationEffectiveLeakageArea_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SpaceInfiltrationEffectiveLeakageArea_Impl(const SpaceInfiltrationEffectiveLeakageArea_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceInfiltrationEffectiveLeakageArea_Impl() = default; + virtual ~SpaceInfiltrationEffectiveLeakageArea_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SpaceInfiltrationFlowCoefficient.hpp b/src/model/SpaceInfiltrationFlowCoefficient.hpp index cad551b81c9..40cbc749776 100644 --- a/src/model/SpaceInfiltrationFlowCoefficient.hpp +++ b/src/model/SpaceInfiltrationFlowCoefficient.hpp @@ -29,7 +29,7 @@ namespace model { explicit SpaceInfiltrationFlowCoefficient(const Model& model); - virtual ~SpaceInfiltrationFlowCoefficient() = default; + virtual ~SpaceInfiltrationFlowCoefficient() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceInfiltrationFlowCoefficient(const SpaceInfiltrationFlowCoefficient& other) = default; SpaceInfiltrationFlowCoefficient(SpaceInfiltrationFlowCoefficient&& other) = default; diff --git a/src/model/SpaceInfiltrationFlowCoefficient_Impl.hpp b/src/model/SpaceInfiltrationFlowCoefficient_Impl.hpp index 35437e707b8..dc101c409ba 100644 --- a/src/model/SpaceInfiltrationFlowCoefficient_Impl.hpp +++ b/src/model/SpaceInfiltrationFlowCoefficient_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SpaceInfiltrationFlowCoefficient_Impl(const SpaceInfiltrationFlowCoefficient_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceInfiltrationFlowCoefficient_Impl() = default; + virtual ~SpaceInfiltrationFlowCoefficient_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SpaceItem.hpp b/src/model/SpaceItem.hpp index 47b797a0c00..40227c8edc6 100644 --- a/src/model/SpaceItem.hpp +++ b/src/model/SpaceItem.hpp @@ -23,7 +23,7 @@ namespace model { class MODEL_API SpaceItem : public ModelObject { public: - virtual ~SpaceItem() = default; + virtual ~SpaceItem() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceItem(const SpaceItem& other) = default; SpaceItem(SpaceItem&& other) = default; diff --git a/src/model/SpaceItem_Impl.hpp b/src/model/SpaceItem_Impl.hpp index 2b90633e199..ff6f2d3b88e 100644 --- a/src/model/SpaceItem_Impl.hpp +++ b/src/model/SpaceItem_Impl.hpp @@ -31,7 +31,7 @@ namespace model { // Clone copy constructor. SpaceItem_Impl(const SpaceItem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceItem_Impl() = default; + virtual ~SpaceItem_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/SpaceLoad.hpp b/src/model/SpaceLoad.hpp index b0a2a0a9aa4..b1da58abdfc 100644 --- a/src/model/SpaceLoad.hpp +++ b/src/model/SpaceLoad.hpp @@ -23,7 +23,7 @@ namespace model { class MODEL_API SpaceLoad : public SpaceItem { public: - virtual ~SpaceLoad() = default; + virtual ~SpaceLoad() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceLoad(const SpaceLoad& other) = default; SpaceLoad(SpaceLoad&& other) = default; diff --git a/src/model/SpaceLoadDefinition.hpp b/src/model/SpaceLoadDefinition.hpp index 32290835b8d..eececa79f15 100644 --- a/src/model/SpaceLoadDefinition.hpp +++ b/src/model/SpaceLoadDefinition.hpp @@ -30,7 +30,7 @@ namespace model { class MODEL_API SpaceLoadDefinition : public ResourceObject { public: - virtual ~SpaceLoadDefinition() = default; + virtual ~SpaceLoadDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceLoadDefinition(const SpaceLoadDefinition& other) = default; SpaceLoadDefinition(SpaceLoadDefinition&& other) = default; diff --git a/src/model/SpaceLoadDefinition_Impl.hpp b/src/model/SpaceLoadDefinition_Impl.hpp index f109e1d3d10..f04baec4452 100644 --- a/src/model/SpaceLoadDefinition_Impl.hpp +++ b/src/model/SpaceLoadDefinition_Impl.hpp @@ -30,7 +30,7 @@ namespace model { // Clone copy constructor. SpaceLoadDefinition_Impl(const SpaceLoadDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceLoadDefinition_Impl() = default; + virtual ~SpaceLoadDefinition_Impl() override = default; /// Removes the definition and all instances. virtual std::vector remove() override; diff --git a/src/model/SpaceLoadInstance.hpp b/src/model/SpaceLoadInstance.hpp index 49cedf27d59..0e891c4a2fe 100644 --- a/src/model/SpaceLoadInstance.hpp +++ b/src/model/SpaceLoadInstance.hpp @@ -25,7 +25,7 @@ namespace model { class MODEL_API SpaceLoadInstance : public SpaceLoad { public: - virtual ~SpaceLoadInstance() = default; + virtual ~SpaceLoadInstance() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceLoadInstance(const SpaceLoadInstance& other) = default; SpaceLoadInstance(SpaceLoadInstance&& other) = default; diff --git a/src/model/SpaceLoadInstance_Impl.hpp b/src/model/SpaceLoadInstance_Impl.hpp index bc15db34d3c..667eb599291 100644 --- a/src/model/SpaceLoadInstance_Impl.hpp +++ b/src/model/SpaceLoadInstance_Impl.hpp @@ -31,7 +31,7 @@ namespace model { // Clone copy constructor. SpaceLoadInstance_Impl(const SpaceLoadInstance_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceLoadInstance_Impl() = default; + virtual ~SpaceLoadInstance_Impl() override = default; /** Returns the definition of this instance. */ SpaceLoadDefinition definition() const; diff --git a/src/model/SpaceLoad_Impl.hpp b/src/model/SpaceLoad_Impl.hpp index 007136ad33f..5f45bf1aee2 100644 --- a/src/model/SpaceLoad_Impl.hpp +++ b/src/model/SpaceLoad_Impl.hpp @@ -31,7 +31,7 @@ namespace model { // Clone copy constructor. SpaceLoad_Impl(const SpaceLoad_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceLoad_Impl() = default; + virtual ~SpaceLoad_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/SpaceType.hpp b/src/model/SpaceType.hpp index 9d2e0d9e9b0..73351e8d687 100644 --- a/src/model/SpaceType.hpp +++ b/src/model/SpaceType.hpp @@ -49,7 +49,7 @@ namespace model { explicit SpaceType(const Model& model); - virtual ~SpaceType() = default; + virtual ~SpaceType() override = default; // Default the copy and move operators because the virtual dtor is explicit SpaceType(const SpaceType& other) = default; SpaceType(SpaceType&& other) = default; diff --git a/src/model/SpaceType_Impl.hpp b/src/model/SpaceType_Impl.hpp index c5fcacfd5cb..1c410826917 100644 --- a/src/model/SpaceType_Impl.hpp +++ b/src/model/SpaceType_Impl.hpp @@ -55,7 +55,7 @@ namespace model { SpaceType_Impl(const SpaceType_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SpaceType_Impl() = default; + virtual ~SpaceType_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Space_Impl.hpp b/src/model/Space_Impl.hpp index 329ec581917..52a81756fda 100644 --- a/src/model/Space_Impl.hpp +++ b/src/model/Space_Impl.hpp @@ -71,7 +71,7 @@ namespace model { Space_Impl(const Space_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Space_Impl() = default; + virtual ~Space_Impl() override = default; //@} diff --git a/src/model/Splitter.cpp b/src/model/Splitter.cpp index 554fbfd61e8..a9a48342768 100644 --- a/src/model/Splitter.cpp +++ b/src/model/Splitter.cpp @@ -189,10 +189,6 @@ namespace model { return getImpl()->removePortForBranch(branchIndex); } - bool Splitter::isRemovable() const { - return getImpl()->isRemovable(); - } - } // namespace model } // namespace openstudio diff --git a/src/model/Splitter.hpp b/src/model/Splitter.hpp index ecde4d9ed23..410336710a3 100644 --- a/src/model/Splitter.hpp +++ b/src/model/Splitter.hpp @@ -20,7 +20,7 @@ namespace model { class MODEL_API Splitter : public HVACComponent { public: - virtual ~Splitter() = default; + virtual ~Splitter() override = default; // Default the copy and move operators because the virtual dtor is explicit Splitter(const Splitter& other) = default; Splitter(Splitter&& other) = default; @@ -78,8 +78,6 @@ namespace model { */ virtual void removePortForBranch(unsigned branchIndex); - bool isRemovable() const; - protected: Splitter(IddObjectType type, const Model& model); diff --git a/src/model/Splitter_Impl.hpp b/src/model/Splitter_Impl.hpp index 0c238fde97c..8cbec538e96 100644 --- a/src/model/Splitter_Impl.hpp +++ b/src/model/Splitter_Impl.hpp @@ -25,7 +25,7 @@ namespace model { Splitter_Impl(const Splitter_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~Splitter_Impl() = default; + virtual ~Splitter_Impl() override = default; /** Returns the inlet port to the splitter. */ virtual unsigned inletPort() const = 0; diff --git a/src/model/StandardGlazing.cpp b/src/model/StandardGlazing.cpp index 924dfffb5de..7ee640ee27c 100644 --- a/src/model/StandardGlazing.cpp +++ b/src/model/StandardGlazing.cpp @@ -502,6 +502,7 @@ namespace model { return getImpl()->solarTransmittance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardGlazing::thickness() const { return getImpl()->thickness(); } @@ -606,6 +607,7 @@ namespace model { return getImpl()->setSolarTransmittance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardGlazing::setThickness(double thickness) { return getImpl()->setThickness(thickness); } diff --git a/src/model/StandardGlazing.hpp b/src/model/StandardGlazing.hpp index f25cda712dd..5dca51cf9b2 100644 --- a/src/model/StandardGlazing.hpp +++ b/src/model/StandardGlazing.hpp @@ -30,7 +30,7 @@ namespace model { explicit StandardGlazing(const Model& model, const std::string& opticalDataType = "SpectralAverage", double thickness = 0.1); - virtual ~StandardGlazing() = default; + virtual ~StandardGlazing() override = default; // Default the copy and move operators because the virtual dtor is explicit StandardGlazing(const StandardGlazing& other) = default; StandardGlazing(StandardGlazing&& other) = default; diff --git a/src/model/StandardGlazing_Impl.hpp b/src/model/StandardGlazing_Impl.hpp index 5facc9bb403..0925e0cd307 100644 --- a/src/model/StandardGlazing_Impl.hpp +++ b/src/model/StandardGlazing_Impl.hpp @@ -30,7 +30,7 @@ namespace model { StandardGlazing_Impl(const StandardGlazing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~StandardGlazing_Impl() = default; + virtual ~StandardGlazing_Impl() override = default; //@} diff --git a/src/model/StandardOpaqueMaterial.cpp b/src/model/StandardOpaqueMaterial.cpp index ba3aa6f2f18..189c4d2c93c 100644 --- a/src/model/StandardOpaqueMaterial.cpp +++ b/src/model/StandardOpaqueMaterial.cpp @@ -462,46 +462,57 @@ namespace model { return {IddObjectType::OS_Material}; } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::thermalConductivity() const { return getImpl()->thermalConductivity(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::thermalConductance() const { return getImpl()->thermalConductance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::thermalResistivity() const { return getImpl()->thermalResistivity(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::thermalResistance() const { return getImpl()->thermalResistance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional StandardOpaqueMaterial::thermalReflectance() const { return getImpl()->thermalReflectance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional StandardOpaqueMaterial::solarReflectance() const { return getImpl()->solarReflectance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional StandardOpaqueMaterial::visibleReflectance() const { return getImpl()->visibleReflectance(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThermalConductivity(double value) { return getImpl()->setThermalConductivity(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThermalConductance(double value) { return getImpl()->setThermalConductance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThermalResistivity(double value) { return getImpl()->setThermalResistivity(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThermalResistance(double value) { return getImpl()->setThermalResistance(value); } @@ -510,26 +521,32 @@ namespace model { return getImpl()->setThermalAbsorptance(value.get()); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThermalReflectance(boost::optional value) { return getImpl()->setThermalReflectance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setSolarAbsorptance(boost::optional value) { return getImpl()->setSolarAbsorptance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setSolarReflectance(boost::optional value) { return getImpl()->setSolarReflectance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setVisibleAbsorptance(boost::optional value) { return getImpl()->setVisibleAbsorptance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setVisibleReflectance(boost::optional value) { return getImpl()->setVisibleReflectance(value); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes boost::optional StandardOpaqueMaterial::heatCapacity() const { return getImpl()->heatCapacity(); } @@ -542,6 +559,7 @@ namespace model { return getImpl()->roughness(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::thickness() const { return getImpl()->thickness(); } @@ -558,6 +576,7 @@ namespace model { return getImpl()->specificHeat(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::thermalAbsorptance() const { return getImpl()->thermalAbsorptance(); } @@ -566,6 +585,7 @@ namespace model { return getImpl()->isThermalAbsorptanceDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::solarAbsorptance() const { return getImpl()->solarAbsorptance(); } @@ -574,6 +594,7 @@ namespace model { return getImpl()->isSolarAbsorptanceDefaulted(); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes double StandardOpaqueMaterial::visibleAbsorptance() const { return getImpl()->visibleAbsorptance(); } @@ -586,6 +607,7 @@ namespace model { return getImpl()->setRoughness(roughness); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThickness(double thickness) { return getImpl()->setThickness(thickness); } @@ -602,6 +624,7 @@ namespace model { return getImpl()->setSpecificHeat(specificHeat); } + // cppcheck-suppress [duplInheritedMember] for documentation purposes bool StandardOpaqueMaterial::setThermalAbsorptance(double thermalAbsorptance) { return getImpl()->setThermalAbsorptance(thermalAbsorptance); } diff --git a/src/model/StandardOpaqueMaterial.hpp b/src/model/StandardOpaqueMaterial.hpp index 6b33a38a0bf..f04ca180983 100644 --- a/src/model/StandardOpaqueMaterial.hpp +++ b/src/model/StandardOpaqueMaterial.hpp @@ -40,7 +40,7 @@ namespace model { explicit StandardOpaqueMaterial(const Model& model, const std::string& roughness = "Smooth", double thickness = 0.1, double conductivity = 0.1, double density = 0.1, double specificHeat = 1400); - virtual ~StandardOpaqueMaterial() = default; + virtual ~StandardOpaqueMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit StandardOpaqueMaterial(const StandardOpaqueMaterial& other) = default; StandardOpaqueMaterial(StandardOpaqueMaterial&& other) = default; diff --git a/src/model/StandardOpaqueMaterial_Impl.hpp b/src/model/StandardOpaqueMaterial_Impl.hpp index 326bc9ab88e..a3d91a25dcc 100644 --- a/src/model/StandardOpaqueMaterial_Impl.hpp +++ b/src/model/StandardOpaqueMaterial_Impl.hpp @@ -31,7 +31,7 @@ namespace model { StandardOpaqueMaterial_Impl(const StandardOpaqueMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~StandardOpaqueMaterial_Impl() = default; + virtual ~StandardOpaqueMaterial_Impl() override = default; //@} diff --git a/src/model/StandardsInformationConstruction.hpp b/src/model/StandardsInformationConstruction.hpp index 118c2e27e45..355c702481f 100644 --- a/src/model/StandardsInformationConstruction.hpp +++ b/src/model/StandardsInformationConstruction.hpp @@ -31,7 +31,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~StandardsInformationConstruction() = default; + virtual ~StandardsInformationConstruction() override = default; // Default the copy and move operators because the virtual dtor is explicit StandardsInformationConstruction(const StandardsInformationConstruction& other) = default; StandardsInformationConstruction(StandardsInformationConstruction&& other) = default; diff --git a/src/model/StandardsInformationConstruction_Impl.hpp b/src/model/StandardsInformationConstruction_Impl.hpp index 04795e93da7..a8d30128f70 100644 --- a/src/model/StandardsInformationConstruction_Impl.hpp +++ b/src/model/StandardsInformationConstruction_Impl.hpp @@ -32,7 +32,7 @@ namespace model { StandardsInformationConstruction_Impl(const StandardsInformationConstruction_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~StandardsInformationConstruction_Impl() = default; + virtual ~StandardsInformationConstruction_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/StandardsInformationMaterial.hpp b/src/model/StandardsInformationMaterial.hpp index cd325acc636..fcae6ac9554 100644 --- a/src/model/StandardsInformationMaterial.hpp +++ b/src/model/StandardsInformationMaterial.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~StandardsInformationMaterial() = default; + virtual ~StandardsInformationMaterial() override = default; // Default the copy and move operators because the virtual dtor is explicit StandardsInformationMaterial(const StandardsInformationMaterial& other) = default; StandardsInformationMaterial(StandardsInformationMaterial&& other) = default; diff --git a/src/model/StandardsInformationMaterial_Impl.hpp b/src/model/StandardsInformationMaterial_Impl.hpp index 5ada793dd49..1b7d0d2ddbc 100644 --- a/src/model/StandardsInformationMaterial_Impl.hpp +++ b/src/model/StandardsInformationMaterial_Impl.hpp @@ -32,7 +32,7 @@ namespace model { StandardsInformationMaterial_Impl(const StandardsInformationMaterial_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~StandardsInformationMaterial_Impl() = default; + virtual ~StandardsInformationMaterial_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SteamEquipment.hpp b/src/model/SteamEquipment.hpp index 46f4e047f45..22191d02d5f 100644 --- a/src/model/SteamEquipment.hpp +++ b/src/model/SteamEquipment.hpp @@ -32,7 +32,7 @@ namespace model { explicit SteamEquipment(const SteamEquipmentDefinition& definition); - virtual ~SteamEquipment() = default; + virtual ~SteamEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit SteamEquipment(const SteamEquipment& other) = default; SteamEquipment(SteamEquipment&& other) = default; diff --git a/src/model/SteamEquipmentDefinition.hpp b/src/model/SteamEquipmentDefinition.hpp index 6ffab4457ff..ffc78f252c8 100644 --- a/src/model/SteamEquipmentDefinition.hpp +++ b/src/model/SteamEquipmentDefinition.hpp @@ -32,7 +32,7 @@ namespace model { explicit SteamEquipmentDefinition(const Model& model); - virtual ~SteamEquipmentDefinition() = default; + virtual ~SteamEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit SteamEquipmentDefinition(const SteamEquipmentDefinition& other) = default; SteamEquipmentDefinition(SteamEquipmentDefinition&& other) = default; diff --git a/src/model/SteamEquipmentDefinition_Impl.hpp b/src/model/SteamEquipmentDefinition_Impl.hpp index 89701ac0404..f95b798cea8 100644 --- a/src/model/SteamEquipmentDefinition_Impl.hpp +++ b/src/model/SteamEquipmentDefinition_Impl.hpp @@ -28,7 +28,7 @@ namespace model { SteamEquipmentDefinition_Impl(const SteamEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SteamEquipmentDefinition_Impl() = default; + virtual ~SteamEquipmentDefinition_Impl() override = default; //@} diff --git a/src/model/SteamEquipment_Impl.hpp b/src/model/SteamEquipment_Impl.hpp index 3cff4e47d1f..881ede39069 100644 --- a/src/model/SteamEquipment_Impl.hpp +++ b/src/model/SteamEquipment_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SteamEquipment_Impl(const SteamEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SteamEquipment_Impl() = default; + virtual ~SteamEquipment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/StraightComponent.cpp b/src/model/StraightComponent.cpp index 89248174d04..ce921f46bb5 100644 --- a/src/model/StraightComponent.cpp +++ b/src/model/StraightComponent.cpp @@ -182,10 +182,6 @@ namespace model { return getImpl()->outletModelObject(); } - std::vector StraightComponent::remove() { - return getImpl()->remove(); - } - bool StraightComponent::removeFromLoop() { return getImpl()->removeFromLoop(); } @@ -194,18 +190,6 @@ namespace model { return getImpl()->airLoopHVAC(); } - bool StraightComponent::addToNode(Node& node) { - return getImpl()->addToNode(node); - } - - ModelObject StraightComponent::clone(Model model) const { - return getImpl()->clone(model); - } - - void StraightComponent::disconnect() { - getImpl()->disconnect(); - } - } // namespace model } // namespace openstudio diff --git a/src/model/StraightComponent.hpp b/src/model/StraightComponent.hpp index f57679ba602..88d43e88330 100644 --- a/src/model/StraightComponent.hpp +++ b/src/model/StraightComponent.hpp @@ -21,24 +21,22 @@ namespace model { } /** StraightComponent is the base class for HVACComponent objects which have precisely one inlet port and one outlet port. - * - * A StraighComponent may appear on either an AirLoopHVAC or a PlantLoop. - */ + * + * A StraighComponent may appear on either an AirLoopHVAC or a PlantLoop. + */ class MODEL_API StraightComponent : public HVACComponent { public: StraightComponent(IddObjectType type, const Model& model); - virtual ~StraightComponent() = default; + virtual ~StraightComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit StraightComponent(const StraightComponent& other) = default; StraightComponent(StraightComponent&& other) = default; StraightComponent& operator=(const StraightComponent&) = default; StraightComponent& operator=(StraightComponent&&) = default; - std::vector remove(); - bool removeFromLoop(); /** Returns the inlet port. **/ @@ -54,16 +52,10 @@ namespace model { boost::optional outletModelObject() const; /** Returns the optional AirLoopHVAC object that this AirToAirComponent is attached to. - * - * Reimplemented from HVACComponent. - */ - boost::optional airLoopHVAC() const; - - bool addToNode(Node& node); - - ModelObject clone(Model model) const; - - void disconnect(); + * + * Reimplemented from HVACComponent. + */ + boost::optional airLoopHVAC() const; // cppcheck-suppress [duplInheritedMember] for documentation purposes protected: friend class Model; diff --git a/src/model/StraightComponent_Impl.hpp b/src/model/StraightComponent_Impl.hpp index 2f7d00b1d5f..9a03fe865ed 100644 --- a/src/model/StraightComponent_Impl.hpp +++ b/src/model/StraightComponent_Impl.hpp @@ -30,7 +30,7 @@ namespace model { StraightComponent_Impl(const StraightComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~StraightComponent_Impl() = default; + virtual ~StraightComponent_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SubSurface.hpp b/src/model/SubSurface.hpp index 91b45040bdc..7a3eb8ca8c4 100644 --- a/src/model/SubSurface.hpp +++ b/src/model/SubSurface.hpp @@ -49,7 +49,7 @@ namespace model { explicit SubSurface(const std::vector& vertices, const Model& model); - virtual ~SubSurface() = default; + virtual ~SubSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit SubSurface(const SubSurface& other) = default; SubSurface(SubSurface&& other) = default; @@ -176,6 +176,7 @@ namespace model { void resetAdjacentSubSurface(); /** Returns the SurfacePropertyConvectionCoefficients, if it exists. */ + // cppcheck-suppress [duplInheritedMember] because PlanarSurface is dumb and returns a vector boost::optional surfacePropertyConvectionCoefficients() const; /** Returns the SurfacePropertyLocalEnvironment, if it exists. */ diff --git a/src/model/SubSurface_Impl.hpp b/src/model/SubSurface_Impl.hpp index 4523c438a92..068aeb08ed6 100644 --- a/src/model/SubSurface_Impl.hpp +++ b/src/model/SubSurface_Impl.hpp @@ -44,7 +44,7 @@ namespace model { SubSurface_Impl(const SubSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SubSurface_Impl() = default; + virtual ~SubSurface_Impl() override = default; //@} @@ -210,8 +210,8 @@ namespace model { void resetAdjacentSubSurface(); /** Returns the surface property convection coefficients */ + // cppcheck-suppress [duplInheritedMember] because PlanarSurface is dumb and returns a vector boost::optional surfacePropertyConvectionCoefficients() const; - boost::optional surfacePropertyLocalEnvironment() const; boost::optional surfacePropertyIncidentSolarMultiplier() const; diff --git a/src/model/Surface.hpp b/src/model/Surface.hpp index 7b20bbca0ec..12631c85c19 100644 --- a/src/model/Surface.hpp +++ b/src/model/Surface.hpp @@ -53,7 +53,7 @@ namespace model { explicit Surface(const std::vector& vertices, const Model& model); - virtual ~Surface() = default; + virtual ~Surface() override = default; // Default the copy and move operators because the virtual dtor is explicit Surface(const Surface& other) = default; Surface(Surface&& other) = default; @@ -162,6 +162,7 @@ namespace model { boost::optional surfaceControlMovableInsulation() const; /** Returns the SurfacePropertyConvectionCoefficients, if it exists. */ + // cppcheck-suppress [duplInheritedMember] because PlanarSurface is dumb and returns a vector boost::optional surfacePropertyConvectionCoefficients() const; /** Returns the SurfacePropertyLocalEnvironment, if it exists. */ diff --git a/src/model/SurfaceControlMovableInsulation.hpp b/src/model/SurfaceControlMovableInsulation.hpp index 11555539d35..f4996eb1672 100644 --- a/src/model/SurfaceControlMovableInsulation.hpp +++ b/src/model/SurfaceControlMovableInsulation.hpp @@ -33,7 +33,7 @@ namespace model { // Constructor takes required-field arguments Surface and Material. The Schedule is defaulted to alwaysOnContinuousSchedule explicit SurfaceControlMovableInsulation(const Surface& surface, const Material& material); - virtual ~SurfaceControlMovableInsulation() = default; + virtual ~SurfaceControlMovableInsulation() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfaceControlMovableInsulation(const SurfaceControlMovableInsulation& other) = default; SurfaceControlMovableInsulation(SurfaceControlMovableInsulation&& other) = default; diff --git a/src/model/SurfaceControlMovableInsulation_Impl.hpp b/src/model/SurfaceControlMovableInsulation_Impl.hpp index a71e8360c65..172e0a52f0a 100644 --- a/src/model/SurfaceControlMovableInsulation_Impl.hpp +++ b/src/model/SurfaceControlMovableInsulation_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SurfaceControlMovableInsulation_Impl(const SurfaceControlMovableInsulation_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfaceControlMovableInsulation_Impl() = default; + virtual ~SurfaceControlMovableInsulation_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyConvectionCoefficients.hpp b/src/model/SurfacePropertyConvectionCoefficients.hpp index 2eb82193651..b66e5f7616b 100644 --- a/src/model/SurfacePropertyConvectionCoefficients.hpp +++ b/src/model/SurfacePropertyConvectionCoefficients.hpp @@ -37,7 +37,7 @@ namespace model { explicit SurfacePropertyConvectionCoefficients(const InternalMass& surface); - virtual ~SurfacePropertyConvectionCoefficients() = default; + virtual ~SurfacePropertyConvectionCoefficients() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyConvectionCoefficients(const SurfacePropertyConvectionCoefficients& other) = default; SurfacePropertyConvectionCoefficients(SurfacePropertyConvectionCoefficients&& other) = default; diff --git a/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface.hpp b/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface.hpp index 940ff00541a..30b68a59606 100644 --- a/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface.hpp +++ b/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface.hpp @@ -30,7 +30,7 @@ namespace model { explicit SurfacePropertyConvectionCoefficientsMultipleSurface(const Model& model); - virtual ~SurfacePropertyConvectionCoefficientsMultipleSurface() = default; + virtual ~SurfacePropertyConvectionCoefficientsMultipleSurface() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyConvectionCoefficientsMultipleSurface(const SurfacePropertyConvectionCoefficientsMultipleSurface& other) = default; SurfacePropertyConvectionCoefficientsMultipleSurface(SurfacePropertyConvectionCoefficientsMultipleSurface&& other) = default; diff --git a/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface_Impl.hpp b/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface_Impl.hpp index dfa2d39b87a..a9c748048fd 100644 --- a/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface_Impl.hpp +++ b/src/model/SurfacePropertyConvectionCoefficientsMultipleSurface_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SurfacePropertyConvectionCoefficientsMultipleSurface_Impl(const SurfacePropertyConvectionCoefficientsMultipleSurface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyConvectionCoefficientsMultipleSurface_Impl() = default; + virtual ~SurfacePropertyConvectionCoefficientsMultipleSurface_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyConvectionCoefficients_Impl.hpp b/src/model/SurfacePropertyConvectionCoefficients_Impl.hpp index 7d8654af910..81f25ff97f3 100644 --- a/src/model/SurfacePropertyConvectionCoefficients_Impl.hpp +++ b/src/model/SurfacePropertyConvectionCoefficients_Impl.hpp @@ -29,7 +29,7 @@ namespace model { SurfacePropertyConvectionCoefficients_Impl(const SurfacePropertyConvectionCoefficients_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyConvectionCoefficients_Impl() = default; + virtual ~SurfacePropertyConvectionCoefficients_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyExposedFoundationPerimeter.hpp b/src/model/SurfacePropertyExposedFoundationPerimeter.hpp index ce11b71047e..7908d86a7de 100644 --- a/src/model/SurfacePropertyExposedFoundationPerimeter.hpp +++ b/src/model/SurfacePropertyExposedFoundationPerimeter.hpp @@ -31,7 +31,7 @@ namespace model { explicit SurfacePropertyExposedFoundationPerimeter(Surface& surface, std::string exposedPerimeterCalculationMethod, double exposedPerimeter); - virtual ~SurfacePropertyExposedFoundationPerimeter() = default; + virtual ~SurfacePropertyExposedFoundationPerimeter() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyExposedFoundationPerimeter(const SurfacePropertyExposedFoundationPerimeter& other) = default; SurfacePropertyExposedFoundationPerimeter(SurfacePropertyExposedFoundationPerimeter&& other) = default; diff --git a/src/model/SurfacePropertyExposedFoundationPerimeter_Impl.hpp b/src/model/SurfacePropertyExposedFoundationPerimeter_Impl.hpp index f5d7bb9abc4..73daa1ef8b0 100644 --- a/src/model/SurfacePropertyExposedFoundationPerimeter_Impl.hpp +++ b/src/model/SurfacePropertyExposedFoundationPerimeter_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SurfacePropertyExposedFoundationPerimeter_Impl(const SurfacePropertyExposedFoundationPerimeter_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyExposedFoundationPerimeter_Impl() = default; + virtual ~SurfacePropertyExposedFoundationPerimeter_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyGroundSurfaces.hpp b/src/model/SurfacePropertyGroundSurfaces.hpp index 3375a853f09..766d9d40d1b 100644 --- a/src/model/SurfacePropertyGroundSurfaces.hpp +++ b/src/model/SurfacePropertyGroundSurfaces.hpp @@ -55,7 +55,7 @@ namespace model { explicit SurfacePropertyGroundSurfaces(const Model& model); - virtual ~SurfacePropertyGroundSurfaces() = default; + virtual ~SurfacePropertyGroundSurfaces() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyGroundSurfaces(const SurfacePropertyGroundSurfaces& other) = default; SurfacePropertyGroundSurfaces(SurfacePropertyGroundSurfaces&& other) = default; diff --git a/src/model/SurfacePropertyGroundSurfaces_Impl.hpp b/src/model/SurfacePropertyGroundSurfaces_Impl.hpp index 907f3a2ae22..82105f1ca35 100644 --- a/src/model/SurfacePropertyGroundSurfaces_Impl.hpp +++ b/src/model/SurfacePropertyGroundSurfaces_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SurfacePropertyGroundSurfaces_Impl(const SurfacePropertyGroundSurfaces_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyGroundSurfaces_Impl() = default; + virtual ~SurfacePropertyGroundSurfaces_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyIncidentSolarMultiplier.hpp b/src/model/SurfacePropertyIncidentSolarMultiplier.hpp index 10a936a953c..637c5607b25 100644 --- a/src/model/SurfacePropertyIncidentSolarMultiplier.hpp +++ b/src/model/SurfacePropertyIncidentSolarMultiplier.hpp @@ -31,7 +31,7 @@ namespace model { explicit SurfacePropertyIncidentSolarMultiplier(const SubSurface& subSurface); - virtual ~SurfacePropertyIncidentSolarMultiplier() = default; + virtual ~SurfacePropertyIncidentSolarMultiplier() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyIncidentSolarMultiplier(const SurfacePropertyIncidentSolarMultiplier& other) = default; SurfacePropertyIncidentSolarMultiplier(SurfacePropertyIncidentSolarMultiplier&& other) = default; diff --git a/src/model/SurfacePropertyIncidentSolarMultiplier_Impl.hpp b/src/model/SurfacePropertyIncidentSolarMultiplier_Impl.hpp index 5f947efb5bc..5100b3c5348 100644 --- a/src/model/SurfacePropertyIncidentSolarMultiplier_Impl.hpp +++ b/src/model/SurfacePropertyIncidentSolarMultiplier_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SurfacePropertyIncidentSolarMultiplier_Impl(const SurfacePropertyIncidentSolarMultiplier_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyIncidentSolarMultiplier_Impl() = default; + virtual ~SurfacePropertyIncidentSolarMultiplier_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyLocalEnvironment.hpp b/src/model/SurfacePropertyLocalEnvironment.hpp index 8085c149e6f..26b36e7f991 100644 --- a/src/model/SurfacePropertyLocalEnvironment.hpp +++ b/src/model/SurfacePropertyLocalEnvironment.hpp @@ -36,7 +36,7 @@ namespace model { explicit SurfacePropertyLocalEnvironment(const Surface& surface); explicit SurfacePropertyLocalEnvironment(const SubSurface& surface); - virtual ~SurfacePropertyLocalEnvironment() = default; + virtual ~SurfacePropertyLocalEnvironment() override = default; //@} diff --git a/src/model/SurfacePropertyLocalEnvironment_Impl.hpp b/src/model/SurfacePropertyLocalEnvironment_Impl.hpp index fcba02a7bc2..d5523352052 100644 --- a/src/model/SurfacePropertyLocalEnvironment_Impl.hpp +++ b/src/model/SurfacePropertyLocalEnvironment_Impl.hpp @@ -35,7 +35,7 @@ namespace model { SurfacePropertyLocalEnvironment_Impl(const SurfacePropertyLocalEnvironment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyLocalEnvironment_Impl() = default; + virtual ~SurfacePropertyLocalEnvironment_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyOtherSideCoefficients.hpp b/src/model/SurfacePropertyOtherSideCoefficients.hpp index a54c5449f6a..286a536d520 100644 --- a/src/model/SurfacePropertyOtherSideCoefficients.hpp +++ b/src/model/SurfacePropertyOtherSideCoefficients.hpp @@ -30,7 +30,7 @@ namespace model { explicit SurfacePropertyOtherSideCoefficients(const Model& model); - virtual ~SurfacePropertyOtherSideCoefficients() = default; + virtual ~SurfacePropertyOtherSideCoefficients() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyOtherSideCoefficients(const SurfacePropertyOtherSideCoefficients& other) = default; SurfacePropertyOtherSideCoefficients(SurfacePropertyOtherSideCoefficients&& other) = default; diff --git a/src/model/SurfacePropertyOtherSideCoefficients_Impl.hpp b/src/model/SurfacePropertyOtherSideCoefficients_Impl.hpp index 15d36bfe0ff..fab40e118a4 100644 --- a/src/model/SurfacePropertyOtherSideCoefficients_Impl.hpp +++ b/src/model/SurfacePropertyOtherSideCoefficients_Impl.hpp @@ -30,7 +30,7 @@ namespace model { SurfacePropertyOtherSideCoefficients_Impl(const SurfacePropertyOtherSideCoefficients_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyOtherSideCoefficients_Impl() = default; + virtual ~SurfacePropertyOtherSideCoefficients_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertyOtherSideConditionsModel.hpp b/src/model/SurfacePropertyOtherSideConditionsModel.hpp index 2337f76268c..293de5f9bc7 100644 --- a/src/model/SurfacePropertyOtherSideConditionsModel.hpp +++ b/src/model/SurfacePropertyOtherSideConditionsModel.hpp @@ -27,7 +27,7 @@ namespace model { explicit SurfacePropertyOtherSideConditionsModel(const Model& model); - virtual ~SurfacePropertyOtherSideConditionsModel() = default; + virtual ~SurfacePropertyOtherSideConditionsModel() override = default; // Default the copy and move operators because the virtual dtor is explicit SurfacePropertyOtherSideConditionsModel(const SurfacePropertyOtherSideConditionsModel& other) = default; SurfacePropertyOtherSideConditionsModel(SurfacePropertyOtherSideConditionsModel&& other) = default; diff --git a/src/model/SurfacePropertyOtherSideConditionsModel_Impl.hpp b/src/model/SurfacePropertyOtherSideConditionsModel_Impl.hpp index 30f27a68698..b284a7d4cad 100644 --- a/src/model/SurfacePropertyOtherSideConditionsModel_Impl.hpp +++ b/src/model/SurfacePropertyOtherSideConditionsModel_Impl.hpp @@ -27,7 +27,7 @@ namespace model { SurfacePropertyOtherSideConditionsModel_Impl(const SurfacePropertyOtherSideConditionsModel_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertyOtherSideConditionsModel_Impl() = default; + virtual ~SurfacePropertyOtherSideConditionsModel_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/SurfacePropertySurroundingSurfaces.cpp b/src/model/SurfacePropertySurroundingSurfaces.cpp index 7a64b6c5c9b..9ced140c0db 100644 --- a/src/model/SurfacePropertySurroundingSurfaces.cpp +++ b/src/model/SurfacePropertySurroundingSurfaces.cpp @@ -14,13 +14,12 @@ #include "SurfacePropertyLocalEnvironment.hpp" #include "SurfacePropertyLocalEnvironment_Impl.hpp" -#include -#include - +#include "../utilities/core/Assert.hpp" +#include "../utilities/core/Compare.hpp" #include "../utilities/units/Unit.hpp" -#include "../utilities/core/Assert.hpp" -#include "utilities/core/Compare.hpp" +#include +#include namespace openstudio { namespace model { diff --git a/src/model/SurfacePropertySurroundingSurfaces.hpp b/src/model/SurfacePropertySurroundingSurfaces.hpp index f1d4a96366b..d041a439f88 100644 --- a/src/model/SurfacePropertySurroundingSurfaces.hpp +++ b/src/model/SurfacePropertySurroundingSurfaces.hpp @@ -52,7 +52,7 @@ namespace model { explicit SurfacePropertySurroundingSurfaces(const Model& model); - virtual ~SurfacePropertySurroundingSurfaces() = default; + virtual ~SurfacePropertySurroundingSurfaces() override = default; //@} diff --git a/src/model/SurfacePropertySurroundingSurfaces_Impl.hpp b/src/model/SurfacePropertySurroundingSurfaces_Impl.hpp index 823bd3300fe..c6711eca45a 100644 --- a/src/model/SurfacePropertySurroundingSurfaces_Impl.hpp +++ b/src/model/SurfacePropertySurroundingSurfaces_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SurfacePropertySurroundingSurfaces_Impl(const SurfacePropertySurroundingSurfaces_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SurfacePropertySurroundingSurfaces_Impl() = default; + virtual ~SurfacePropertySurroundingSurfaces_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Surface_Impl.hpp b/src/model/Surface_Impl.hpp index 95080390ab4..2c8bbfbb2a8 100644 --- a/src/model/Surface_Impl.hpp +++ b/src/model/Surface_Impl.hpp @@ -45,7 +45,7 @@ namespace model { Surface_Impl(const Surface_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~Surface_Impl() = default; + virtual ~Surface_Impl() override = default; //@} @@ -182,6 +182,7 @@ namespace model { boost::optional surfaceControlMovableInsulation() const; + // cppcheck-suppress [duplInheritedMember] because PlanarSurface is dumb and returns a vector boost::optional surfacePropertyConvectionCoefficients() const; boost::optional surfacePropertyLocalEnvironment() const; diff --git a/src/model/SwimmingPoolIndoor.hpp b/src/model/SwimmingPoolIndoor.hpp index 56f935ef986..bec5c27b477 100644 --- a/src/model/SwimmingPoolIndoor.hpp +++ b/src/model/SwimmingPoolIndoor.hpp @@ -32,7 +32,7 @@ namespace model { explicit SwimmingPoolIndoor(const Model& model, const Surface& floorSurface); - virtual ~SwimmingPoolIndoor() = default; + virtual ~SwimmingPoolIndoor() override = default; // Default the copy and move operators because the virtual dtor is explicit SwimmingPoolIndoor(const SwimmingPoolIndoor& other) = default; SwimmingPoolIndoor(SwimmingPoolIndoor&& other) = default; diff --git a/src/model/SwimmingPoolIndoor_Impl.hpp b/src/model/SwimmingPoolIndoor_Impl.hpp index a1f0d4e15c4..6fa0f7a6f8e 100644 --- a/src/model/SwimmingPoolIndoor_Impl.hpp +++ b/src/model/SwimmingPoolIndoor_Impl.hpp @@ -31,7 +31,7 @@ namespace model { SwimmingPoolIndoor_Impl(const SwimmingPoolIndoor_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~SwimmingPoolIndoor_Impl() = default; + virtual ~SwimmingPoolIndoor_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/TableIndependentVariable.hpp b/src/model/TableIndependentVariable.hpp index b612897f2e4..6d41adc9463 100644 --- a/src/model/TableIndependentVariable.hpp +++ b/src/model/TableIndependentVariable.hpp @@ -30,7 +30,7 @@ namespace model { explicit TableIndependentVariable(const Model& model); - virtual ~TableIndependentVariable() = default; + virtual ~TableIndependentVariable() override = default; ; // Default the copy and move operators because the virtual dtor is explicit TableIndependentVariable(const TableIndependentVariable& other) = default; diff --git a/src/model/TableIndependentVariable_Impl.hpp b/src/model/TableIndependentVariable_Impl.hpp index 17710ae7137..fc46e017432 100644 --- a/src/model/TableIndependentVariable_Impl.hpp +++ b/src/model/TableIndependentVariable_Impl.hpp @@ -29,7 +29,7 @@ namespace model { TableIndependentVariable_Impl(const TableIndependentVariable_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~TableIndependentVariable_Impl() = default; + virtual ~TableIndependentVariable_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/TableLookup.hpp b/src/model/TableLookup.hpp index 04ce8ec2a0c..431395891ed 100644 --- a/src/model/TableLookup.hpp +++ b/src/model/TableLookup.hpp @@ -33,7 +33,7 @@ namespace model { */ explicit TableLookup(const Model& model); - virtual ~TableLookup() = default; + virtual ~TableLookup() override = default; // Default the copy and move operators because the virtual dtor is explicit TableLookup(const TableLookup& other) = default; TableLookup(TableLookup&& other) = default; diff --git a/src/model/TableLookup_Impl.hpp b/src/model/TableLookup_Impl.hpp index 43e913f9200..c510af73dc7 100644 --- a/src/model/TableLookup_Impl.hpp +++ b/src/model/TableLookup_Impl.hpp @@ -30,7 +30,7 @@ namespace model { TableLookup_Impl(const TableLookup_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~TableLookup_Impl() = default; + virtual ~TableLookup_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/TableMultiVariableLookup.cpp b/src/model/TableMultiVariableLookup.cpp index 5886cdeee79..16d7de35f5c 100644 --- a/src/model/TableMultiVariableLookup.cpp +++ b/src/model/TableMultiVariableLookup.cpp @@ -1266,10 +1266,12 @@ namespace model { getImpl()->resetOutputUnitType(); } + // cppcheck-suppress [duplInheritedMember] this is overriden for documentation purposes int TableMultiVariableLookup::numVariables() const { return getImpl()->numVariables(); } + // cppcheck-suppress [duplInheritedMember] this is overriden for documentation purposes double TableMultiVariableLookup::evaluate(const std::vector& x) const { return getImpl()->evaluate(x); } diff --git a/src/model/TableMultiVariableLookup.hpp b/src/model/TableMultiVariableLookup.hpp index 121eab595c3..3f61290f4d6 100644 --- a/src/model/TableMultiVariableLookup.hpp +++ b/src/model/TableMultiVariableLookup.hpp @@ -59,7 +59,7 @@ namespace model { */ explicit TableMultiVariableLookup(const Model& model, int numberofIndependentVariables); - virtual ~TableMultiVariableLookup() = default; + virtual ~TableMultiVariableLookup() override = default; // Default the copy and move operators because the virtual dtor is explicit TableMultiVariableLookup(const TableMultiVariableLookup& other) = default; TableMultiVariableLookup(TableMultiVariableLookup&& other) = default; diff --git a/src/model/TableMultiVariableLookup_Impl.hpp b/src/model/TableMultiVariableLookup_Impl.hpp index 375800dba76..d1194020ef6 100644 --- a/src/model/TableMultiVariableLookup_Impl.hpp +++ b/src/model/TableMultiVariableLookup_Impl.hpp @@ -31,7 +31,7 @@ namespace model { TableMultiVariableLookup_Impl(const TableMultiVariableLookup_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~TableMultiVariableLookup_Impl() = default; + virtual ~TableMultiVariableLookup_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/TemperingValve.hpp b/src/model/TemperingValve.hpp index 1a645d07f30..ff1c0db58e6 100644 --- a/src/model/TemperingValve.hpp +++ b/src/model/TemperingValve.hpp @@ -29,7 +29,7 @@ namespace model { explicit TemperingValve(const Model& model); - virtual ~TemperingValve() = default; + virtual ~TemperingValve() override = default; // Default the copy and move operators because the virtual dtor is explicit TemperingValve(const TemperingValve& other) = default; TemperingValve(TemperingValve&& other) = default; diff --git a/src/model/TemperingValve_Impl.hpp b/src/model/TemperingValve_Impl.hpp index 9962bc63b09..23eacc78996 100644 --- a/src/model/TemperingValve_Impl.hpp +++ b/src/model/TemperingValve_Impl.hpp @@ -29,7 +29,7 @@ namespace model { TemperingValve_Impl(const TemperingValve_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~TemperingValve_Impl() = default; + virtual ~TemperingValve_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ThermalStorageChilledWaterStratified.hpp b/src/model/ThermalStorageChilledWaterStratified.hpp index e5b3f065b68..dda2ecd916f 100644 --- a/src/model/ThermalStorageChilledWaterStratified.hpp +++ b/src/model/ThermalStorageChilledWaterStratified.hpp @@ -31,7 +31,7 @@ namespace model { explicit ThermalStorageChilledWaterStratified(const Model& model); - virtual ~ThermalStorageChilledWaterStratified() = default; + virtual ~ThermalStorageChilledWaterStratified() override = default; // Default the copy and move operators because the virtual dtor is explicit ThermalStorageChilledWaterStratified(const ThermalStorageChilledWaterStratified& other) = default; ThermalStorageChilledWaterStratified(ThermalStorageChilledWaterStratified&& other) = default; diff --git a/src/model/ThermalStorageChilledWaterStratified_Impl.hpp b/src/model/ThermalStorageChilledWaterStratified_Impl.hpp index 1e434692d4e..496acd494c7 100644 --- a/src/model/ThermalStorageChilledWaterStratified_Impl.hpp +++ b/src/model/ThermalStorageChilledWaterStratified_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ThermalStorageChilledWaterStratified_Impl(const ThermalStorageChilledWaterStratified_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ThermalStorageChilledWaterStratified_Impl() = default; + virtual ~ThermalStorageChilledWaterStratified_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ThermalStorageIceDetailed.hpp b/src/model/ThermalStorageIceDetailed.hpp index 54d69b546ec..3b8dc507d88 100644 --- a/src/model/ThermalStorageIceDetailed.hpp +++ b/src/model/ThermalStorageIceDetailed.hpp @@ -31,7 +31,7 @@ namespace model { explicit ThermalStorageIceDetailed(const Model& model); - virtual ~ThermalStorageIceDetailed() = default; + virtual ~ThermalStorageIceDetailed() override = default; // Default the copy and move operators because the virtual dtor is explicit ThermalStorageIceDetailed(const ThermalStorageIceDetailed& other) = default; ThermalStorageIceDetailed(ThermalStorageIceDetailed&& other) = default; diff --git a/src/model/ThermalStorageIceDetailed_Impl.hpp b/src/model/ThermalStorageIceDetailed_Impl.hpp index 0a3548cbb5b..00b76501eab 100644 --- a/src/model/ThermalStorageIceDetailed_Impl.hpp +++ b/src/model/ThermalStorageIceDetailed_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ThermalStorageIceDetailed_Impl(const ThermalStorageIceDetailed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ThermalStorageIceDetailed_Impl() = default; + virtual ~ThermalStorageIceDetailed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ThermalZone.hpp b/src/model/ThermalZone.hpp index 33d000c95f6..fcd4542d80a 100644 --- a/src/model/ThermalZone.hpp +++ b/src/model/ThermalZone.hpp @@ -44,7 +44,7 @@ namespace model { explicit ThermalZone(const Model& model); - virtual ~ThermalZone() = default; + virtual ~ThermalZone() override = default; // Default the copy and move operators because the virtual dtor is explicit ThermalZone(const ThermalZone& other) = default; ThermalZone(ThermalZone&& other) = default; @@ -234,11 +234,11 @@ namespace model { double floorArea() const; /** Accumulates the exterior surface area (m^2) of spaces. Does not include space - * multiplier. */ + * multiplier. */ double exteriorSurfaceArea() const; /** Accumulates the exterior wall area (m^2) of spaces. Does not include space - * multiplier. */ + * multiplier. */ double exteriorWallArea() const; // TODO: How should this interact with the volume field. If there is an interaction, @@ -284,23 +284,23 @@ namespace model { double gasEquipmentPowerPerPerson() const; /** Returns the infiltration design flow rate (m^3/s) in this thermal zone. - * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ + * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ double infiltrationDesignFlowRate() const; /** Returns the infiltration design flow per space floor area (m^3/m^2*s) in this thermal zone. - * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ + * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ double infiltrationDesignFlowPerSpaceFloorArea() const; /** Returns the infiltration design flow per exterior surface area (m^3/m^2*s) in this thermal zone. - * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ + * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ double infiltrationDesignFlowPerExteriorSurfaceArea() const; /** Returns the infiltration design flow per exterior wall area (m^3/m^2*s) in this thermal zone. - * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ + * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ double infiltrationDesignFlowPerExteriorWallArea() const; /** Returns the infiltration design air changes per hour (1/h) in this thermal zone. - * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ + * Ignores SpaceInfiltrationEffectiveLeakageArea and SpaceInfiltrationFlowCoefficient objects. Does not include space multiplier. */ double infiltrationDesignAirChangesPerHour() const; /** Determines if this zone is conditioned, based on the SqlFile output. Returns 'Yes' if zone is conditioned. */ @@ -319,29 +319,29 @@ namespace model { boost::optional combineSpaces(); /** Removes connections to all other HVACComponent objects */ - void disconnect(); + void disconnect(); // cppcheck-suppress [duplInheritedMember] for documentation purposes /** ThermalZone must be disconnected from all loops to be removable - */ - bool isRemovable() const; + */ + bool isRemovable() const; // cppcheck-suppress [duplInheritedMember] for documentation purposes /** Indicates if the zone will use EnergyPlus ideal air loads. - */ + */ bool useIdealAirLoads() const; /** Adds or removes ideal air loads for the zone. - * ThermalZones that are attached to air loops will be removed. - * If the ThermalZone is later added to a loop useIdealAirLoads - * will be reset to false. - */ + * ThermalZones that are attached to air loops will be removed. + * If the ThermalZone is later added to a loop useIdealAirLoads + * will be reset to false. + */ bool setUseIdealAirLoads(bool useIdealAirLoads); - bool addToNode(Node& node); + bool addToNode(Node& node); // cppcheck-suppress [duplInheritedMember] for documentation purposes /** This method is the same as addToNode, except - * existing air loop connections will not be removed. - * This is because EnergyPlus gained the ability to attach multiple air loops. - **/ + * existing air loop connections will not be removed. + * This is because EnergyPlus gained the ability to attach multiple air loops. + **/ bool multiAddToNode(Node& node); PortList returnPortList() const; @@ -351,11 +351,11 @@ namespace model { PortList exhaustPortList() const; /** Add new equipment setting the heating and cooling priorities - * to the next available priority level. - * Air terminals associated with AirLoopHVAC will be moved to first priority. - * This method is relatively dumb. It will add any model object to the list - * even if it is not hvac equipment. That might change in the future. - */ + * to the next available priority level. + * Air terminals associated with AirLoopHVAC will be moved to first priority. + * This method is relatively dumb. It will add any model object to the list + * even if it is not hvac equipment. That might change in the future. + */ bool addEquipment(const ModelObject& equipment); /** Remove equipment from the EquipmentList. @@ -369,13 +369,13 @@ namespace model { bool setLoadDistributionScheme(const std::string& scheme); /** Set cooling priority of equipment. - * Returns false when equipment is not in the ZoneHVACEquipmentList - */ + * Returns false when equipment is not in the ZoneHVACEquipmentList + */ bool setCoolingPriority(const ModelObject& equipment, unsigned priority); /** Set heating priority of equipment. - * Returns false when equipment is not in the ZoneHVACEquipmentList - */ + * Returns false when equipment is not in the ZoneHVACEquipmentList + */ bool setHeatingPriority(const ModelObject& equipment, unsigned priority); /** Return all equipment. Order is determined by heating priority */ @@ -385,69 +385,69 @@ namespace model { std::vector equipmentInCoolingOrder() const; /** Return the Sequential Cooling Fraction of equipment, if it's a ScheduleConstant. - * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; /** Return the Sequential Cooling Fraction Schedule of equipment. - * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ boost::optional sequentialCoolingFractionSchedule(const ModelObject& equipment) const; /** Return the Sequential Heating Fraction of equipment, if it's a ScheduleConstant - * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; /** Return the Sequential Heating Fraction Schedule of equipment. - * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ boost::optional sequentialHeatingFractionSchedule(const ModelObject& equipment) const; /** Set the Sequential Cooling Fraction of equipment, creates a ScheduleConstant for your convenience. - * Returns false when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns false when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); /** Set the Sequential Cooling Fraction Schedule of equipment. - * Returns false when equipement is not in the ZoneHVACEquipmentList, its cooling priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns false when equipement is not in the ZoneHVACEquipmentList, its cooling priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ bool setSequentialCoolingFractionSchedule(const ModelObject& equipment, Schedule& schedule); /** Set the Sequential Heating Fraction of equipment, creates a ScheduleConstant for your convenience. - * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); /** Set the Sequential Heating Fraction Schedule of equipment. - * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, - * or the loadDistributionScheme isn't 'Sequential' - */ + * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, + * or the loadDistributionScheme isn't 'Sequential' + */ bool setSequentialHeatingFractionSchedule(const ModelObject& equipment, Schedule& schedule); /** Return true if the ThermalZone is attached to - * an AirLoopHVACSupplyPlenum or AirLoopHVACReturnPlenum - */ + * an AirLoopHVACSupplyPlenum or AirLoopHVACReturnPlenum + */ bool isPlenum() const; /** Return true if the ThermalZone is unconditioned and available to be used as a plenum - * This means the zone is not attached to an AirLoopHVAC structure as a conditioned zone - * and there is no zone equipment. - */ + * This means the zone is not attached to an AirLoopHVAC structure as a conditioned zone + * and there is no zone equipment. + */ bool canBePlenum() const; /** Establish plenumZone as the supply plenum for this ThermalZone. - * This ThermalZone must already be attached to AirLoopHVAC. - * The plenumZone must not be used as a plenum on another AirLoopHVAC structure. - * The method canBePlenum called on plenumZone must return true. - */ + * This ThermalZone must already be attached to AirLoopHVAC. + * The plenumZone must not be used as a plenum on another AirLoopHVAC structure. + * The method canBePlenum called on plenumZone must return true. + */ bool setSupplyPlenum(const ThermalZone& plenumZone); /** Overload of setSupplyPlenum() @@ -458,15 +458,15 @@ namespace model { bool setSupplyPlenum(const ThermalZone& plenumZone, unsigned branchIndex); /** Remove any supply plenum serving this zone, - * associated with the AirLoopHVAC returned by - * ThermalZone::airLoopHVAC(). + * associated with the AirLoopHVAC returned by + * ThermalZone::airLoopHVAC(). */ void removeSupplyPlenum(); /** Remove any supply plenum associated with - * the given AirLoopHVAC instance. - * This method is important when a zone is connected to multiple AirLoopHVAC instances. - */ + * the given AirLoopHVAC instance. + * This method is important when a zone is connected to multiple AirLoopHVAC instances. + */ void removeSupplyPlenum(const AirLoopHVAC& airloop); /** Overload of removeSupplyPlenum() @@ -477,32 +477,32 @@ namespace model { void removeSupplyPlenum(unsigned branchIndex); /** Remove any supply plenum associated with - * the given AirLoopHVAC instance, and branchIndex in a dual duct system. - * This method is important when a zone is connected to multiple AirLoopHVAC instances. - * This variation can account for dual duct systems, branchIndex can be 0 or 1 - * indicating which branch of a dual duct system to attach to. - * branchIndex 0 corresponds to the branch of demandInletNode(0). - */ + * the given AirLoopHVAC instance, and branchIndex in a dual duct system. + * This method is important when a zone is connected to multiple AirLoopHVAC instances. + * This variation can account for dual duct systems, branchIndex can be 0 or 1 + * indicating which branch of a dual duct system to attach to. + * branchIndex 0 corresponds to the branch of demandInletNode(0). + */ void removeSupplyPlenum(const AirLoopHVAC& airloop, unsigned branchIndex); /** Establish plenumZone as the return plenum for this ThermalZone. - * This ThermalZone must already be attached to AirLoopHVAC. - * The plenumZone must not be used as a plenum on another AirLoopHVAC structure. - * The method canBePlenum called on plenumZone must return true. - */ + * This ThermalZone must already be attached to AirLoopHVAC. + * The plenumZone must not be used as a plenum on another AirLoopHVAC structure. + * The method canBePlenum called on plenumZone must return true. + */ bool setReturnPlenum(const ThermalZone& plenumZone); /** setReturnPlenum for the specified air loop. - * This method is used when there are multiple air loops attached to the zone - */ + * This method is used when there are multiple air loops attached to the zone + */ bool setReturnPlenum(const ThermalZone& plenumZone, AirLoopHVAC& airLoop); /** Remove any return plenum serving this zone - */ + */ void removeReturnPlenum(); /** Remove any return plenum serving this zone - */ + */ void removeReturnPlenum(AirLoopHVAC& airLoop); /** Returns all ZoneMixing objects associated with this zone, includes supply and exhaust mixing objects */ diff --git a/src/model/ThermalZone_Impl.hpp b/src/model/ThermalZone_Impl.hpp index 8df00d3331c..7ffdfe29f2a 100644 --- a/src/model/ThermalZone_Impl.hpp +++ b/src/model/ThermalZone_Impl.hpp @@ -46,7 +46,7 @@ namespace model { ThermalZone_Impl(const ThermalZone_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ThermalZone_Impl() = default; + virtual ~ThermalZone_Impl() override = default; //@} diff --git a/src/model/ThermochromicGlazing.hpp b/src/model/ThermochromicGlazing.hpp index efffba8be5f..c0797a399aa 100644 --- a/src/model/ThermochromicGlazing.hpp +++ b/src/model/ThermochromicGlazing.hpp @@ -27,7 +27,7 @@ namespace model { explicit ThermochromicGlazing(const Model& model, double opticalDataTemperature = 80.0); - virtual ~ThermochromicGlazing() = default; + virtual ~ThermochromicGlazing() override = default; // Default the copy and move operators because the virtual dtor is explicit ThermochromicGlazing(const ThermochromicGlazing& other) = default; ThermochromicGlazing(ThermochromicGlazing&& other) = default; diff --git a/src/model/ThermochromicGlazing_Impl.hpp b/src/model/ThermochromicGlazing_Impl.hpp index 467d1fd4fb0..5801eaa6430 100644 --- a/src/model/ThermochromicGlazing_Impl.hpp +++ b/src/model/ThermochromicGlazing_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ThermochromicGlazing_Impl(const ThermochromicGlazing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ThermochromicGlazing_Impl() = default; + virtual ~ThermochromicGlazing_Impl() override = default; //@} diff --git a/src/model/Thermostat.hpp b/src/model/Thermostat.hpp index ae7952ed786..f744af102e9 100644 --- a/src/model/Thermostat.hpp +++ b/src/model/Thermostat.hpp @@ -24,7 +24,7 @@ namespace model { class MODEL_API Thermostat : public ModelObject { public: - virtual ~Thermostat() = default; + virtual ~Thermostat() override = default; // Default the copy and move operators because the virtual dtor is explicit Thermostat(const Thermostat& other) = default; Thermostat(Thermostat&& other) = default; diff --git a/src/model/ThermostatSetpointDualSetpoint.hpp b/src/model/ThermostatSetpointDualSetpoint.hpp index 319aeeae666..92904b268c8 100644 --- a/src/model/ThermostatSetpointDualSetpoint.hpp +++ b/src/model/ThermostatSetpointDualSetpoint.hpp @@ -27,7 +27,7 @@ namespace model { explicit ThermostatSetpointDualSetpoint(const Model& model); - virtual ~ThermostatSetpointDualSetpoint() = default; + virtual ~ThermostatSetpointDualSetpoint() override = default; // Default the copy and move operators because the virtual dtor is explicit ThermostatSetpointDualSetpoint(const ThermostatSetpointDualSetpoint& other) = default; ThermostatSetpointDualSetpoint(ThermostatSetpointDualSetpoint&& other) = default; diff --git a/src/model/ThermostatSetpointDualSetpoint_Impl.hpp b/src/model/ThermostatSetpointDualSetpoint_Impl.hpp index 1f7c8cb8d32..ac4b37f806b 100644 --- a/src/model/ThermostatSetpointDualSetpoint_Impl.hpp +++ b/src/model/ThermostatSetpointDualSetpoint_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ThermostatSetpointDualSetpoint_Impl(const ThermostatSetpointDualSetpoint_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ThermostatSetpointDualSetpoint_Impl() = default; + virtual ~ThermostatSetpointDualSetpoint_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Thermostat_Impl.hpp b/src/model/Thermostat_Impl.hpp index 2aacbd78471..66f8810e00d 100644 --- a/src/model/Thermostat_Impl.hpp +++ b/src/model/Thermostat_Impl.hpp @@ -30,7 +30,7 @@ namespace model { boost::optional thermalZone() const; - virtual ~Thermostat_Impl() = default; + virtual ~Thermostat_Impl() override = default; protected: friend class Model_Impl; diff --git a/src/model/Timestep.hpp b/src/model/Timestep.hpp index cc8db24e9a6..f37c818e802 100644 --- a/src/model/Timestep.hpp +++ b/src/model/Timestep.hpp @@ -31,7 +31,7 @@ namespace model { static IddObjectType iddObjectType(); - virtual ~Timestep() = default; + virtual ~Timestep() override = default; // Default the copy and move operators because the virtual dtor is explicit Timestep(const Timestep& other) = default; Timestep(Timestep&& other) = default; diff --git a/src/model/Timestep_Impl.hpp b/src/model/Timestep_Impl.hpp index 372635dbaf9..3a98d38aa60 100644 --- a/src/model/Timestep_Impl.hpp +++ b/src/model/Timestep_Impl.hpp @@ -27,7 +27,7 @@ namespace model { Timestep_Impl(const Timestep_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~Timestep_Impl() = default; + virtual ~Timestep_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/UnitarySystemPerformanceMultispeed.hpp b/src/model/UnitarySystemPerformanceMultispeed.hpp index 2f083124818..4f78068622d 100644 --- a/src/model/UnitarySystemPerformanceMultispeed.hpp +++ b/src/model/UnitarySystemPerformanceMultispeed.hpp @@ -64,7 +64,7 @@ namespace model { //@{ explicit UnitarySystemPerformanceMultispeed(const Model& model); - virtual ~UnitarySystemPerformanceMultispeed() = default; + virtual ~UnitarySystemPerformanceMultispeed() override = default; // Default the copy and move operators because the virtual dtor is explicit UnitarySystemPerformanceMultispeed(const UnitarySystemPerformanceMultispeed& other) = default; UnitarySystemPerformanceMultispeed(UnitarySystemPerformanceMultispeed&& other) = default; diff --git a/src/model/UnitarySystemPerformanceMultispeed_Impl.hpp b/src/model/UnitarySystemPerformanceMultispeed_Impl.hpp index 4d7ea10abf5..de08f308222 100644 --- a/src/model/UnitarySystemPerformanceMultispeed_Impl.hpp +++ b/src/model/UnitarySystemPerformanceMultispeed_Impl.hpp @@ -29,7 +29,7 @@ namespace model { UnitarySystemPerformanceMultispeed_Impl(const UnitarySystemPerformanceMultispeed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~UnitarySystemPerformanceMultispeed_Impl() = default; + virtual ~UnitarySystemPerformanceMultispeed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/UtilityBill.hpp b/src/model/UtilityBill.hpp index fe42a391053..f0a1655e16d 100644 --- a/src/model/UtilityBill.hpp +++ b/src/model/UtilityBill.hpp @@ -139,7 +139,7 @@ namespace model { explicit UtilityBill(const FuelType& fuelType, const Model& model); - virtual ~UtilityBill() = default; + virtual ~UtilityBill() override = default; // Default the copy and move operators because the virtual dtor is explicit UtilityBill(const UtilityBill& other) = default; UtilityBill(UtilityBill&& other) = default; diff --git a/src/model/UtilityBill_Impl.hpp b/src/model/UtilityBill_Impl.hpp index 6452c30ab2b..e8c4d1dc99a 100644 --- a/src/model/UtilityBill_Impl.hpp +++ b/src/model/UtilityBill_Impl.hpp @@ -33,7 +33,7 @@ namespace model { UtilityBill_Impl(const UtilityBill_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~UtilityBill_Impl() = default; + virtual ~UtilityBill_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/Version.hpp b/src/model/Version.hpp index fe09f48cf7a..da5488f40cd 100644 --- a/src/model/Version.hpp +++ b/src/model/Version.hpp @@ -21,7 +21,7 @@ namespace model { /** @name Constructors and Destructors */ //{ - virtual ~Version() = default; + virtual ~Version() override = default; // Default the copy and move operators because the virtual dtor is explicit Version(const Version& other) = default; Version(Version&& other) = default; diff --git a/src/model/Version_Impl.hpp b/src/model/Version_Impl.hpp index 6d961d4bd27..603cd7b4361 100644 --- a/src/model/Version_Impl.hpp +++ b/src/model/Version_Impl.hpp @@ -31,7 +31,7 @@ namespace model { Version_Impl(const Version_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~Version_Impl() = default; + virtual ~Version_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/WaterHeaterHeatPump.hpp b/src/model/WaterHeaterHeatPump.hpp index 793c4f33f6f..5ae484fb1b0 100644 --- a/src/model/WaterHeaterHeatPump.hpp +++ b/src/model/WaterHeaterHeatPump.hpp @@ -36,7 +36,7 @@ namespace model { explicit WaterHeaterHeatPump(const Model& model, const ModelObject& dxCoil, const HVACComponent& tank, const HVACComponent& fan, Schedule& compressorSetpointTemperatureSchedule, Schedule& inletAirMixerSchedule); - virtual ~WaterHeaterHeatPump() = default; + virtual ~WaterHeaterHeatPump() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterHeaterHeatPump(const WaterHeaterHeatPump& other) = default; WaterHeaterHeatPump(WaterHeaterHeatPump&& other) = default; diff --git a/src/model/WaterHeaterHeatPumpWrappedCondenser.hpp b/src/model/WaterHeaterHeatPumpWrappedCondenser.hpp index f8dc6592875..ff068b56f82 100644 --- a/src/model/WaterHeaterHeatPumpWrappedCondenser.hpp +++ b/src/model/WaterHeaterHeatPumpWrappedCondenser.hpp @@ -34,7 +34,7 @@ namespace model { explicit WaterHeaterHeatPumpWrappedCondenser(const Model& model, const ModelObject& dxCoil, const HVACComponent& tank, const HVACComponent& fan, Schedule& compressorSetpointTemperatureSchedule, Schedule& inletAirMixerSchedule); - virtual ~WaterHeaterHeatPumpWrappedCondenser() = default; + virtual ~WaterHeaterHeatPumpWrappedCondenser() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterHeaterHeatPumpWrappedCondenser(const WaterHeaterHeatPumpWrappedCondenser& other) = default; WaterHeaterHeatPumpWrappedCondenser(WaterHeaterHeatPumpWrappedCondenser&& other) = default; diff --git a/src/model/WaterHeaterHeatPumpWrappedCondenser_Impl.hpp b/src/model/WaterHeaterHeatPumpWrappedCondenser_Impl.hpp index 41f2533ed87..c57e8d468fd 100644 --- a/src/model/WaterHeaterHeatPumpWrappedCondenser_Impl.hpp +++ b/src/model/WaterHeaterHeatPumpWrappedCondenser_Impl.hpp @@ -30,7 +30,7 @@ namespace model { WaterHeaterHeatPumpWrappedCondenser_Impl(const WaterHeaterHeatPumpWrappedCondenser_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterHeaterHeatPumpWrappedCondenser_Impl() = default; + virtual ~WaterHeaterHeatPumpWrappedCondenser_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/WaterHeaterHeatPump_Impl.hpp b/src/model/WaterHeaterHeatPump_Impl.hpp index fb112f4c948..089cda92e1d 100644 --- a/src/model/WaterHeaterHeatPump_Impl.hpp +++ b/src/model/WaterHeaterHeatPump_Impl.hpp @@ -30,7 +30,7 @@ namespace model { WaterHeaterHeatPump_Impl(const WaterHeaterHeatPump_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterHeaterHeatPump_Impl() = default; + virtual ~WaterHeaterHeatPump_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/WaterHeaterMixed.hpp b/src/model/WaterHeaterMixed.hpp index 74dfaf83e7a..2ad269d9d75 100644 --- a/src/model/WaterHeaterMixed.hpp +++ b/src/model/WaterHeaterMixed.hpp @@ -38,7 +38,7 @@ namespace model { explicit WaterHeaterMixed(const Model& model); - virtual ~WaterHeaterMixed() = default; + virtual ~WaterHeaterMixed() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterHeaterMixed(const WaterHeaterMixed& other) = default; WaterHeaterMixed(WaterHeaterMixed&& other) = default; diff --git a/src/model/WaterHeaterMixed_Impl.hpp b/src/model/WaterHeaterMixed_Impl.hpp index c06f8f7ebb4..e224792fb7d 100644 --- a/src/model/WaterHeaterMixed_Impl.hpp +++ b/src/model/WaterHeaterMixed_Impl.hpp @@ -37,7 +37,7 @@ namespace model { WaterHeaterMixed_Impl(const WaterHeaterMixed_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterHeaterMixed_Impl() = default; + virtual ~WaterHeaterMixed_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/WaterHeaterSizing.hpp b/src/model/WaterHeaterSizing.hpp index eb17cae1c64..ecc8abe1474 100644 --- a/src/model/WaterHeaterSizing.hpp +++ b/src/model/WaterHeaterSizing.hpp @@ -30,7 +30,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~WaterHeaterSizing() = default; + virtual ~WaterHeaterSizing() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterHeaterSizing(const WaterHeaterSizing& other) = default; WaterHeaterSizing(WaterHeaterSizing&& other) = default; diff --git a/src/model/WaterHeaterSizing_Impl.hpp b/src/model/WaterHeaterSizing_Impl.hpp index ee62b9806e9..ee48aaab776 100644 --- a/src/model/WaterHeaterSizing_Impl.hpp +++ b/src/model/WaterHeaterSizing_Impl.hpp @@ -29,7 +29,7 @@ namespace model { WaterHeaterSizing_Impl(const WaterHeaterSizing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterHeaterSizing_Impl() = default; + virtual ~WaterHeaterSizing_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/WaterHeaterStratified.hpp b/src/model/WaterHeaterStratified.hpp index 228c5c16857..d89d70d7a95 100644 --- a/src/model/WaterHeaterStratified.hpp +++ b/src/model/WaterHeaterStratified.hpp @@ -36,7 +36,7 @@ namespace model { explicit WaterHeaterStratified(const Model& model); - virtual ~WaterHeaterStratified() = default; + virtual ~WaterHeaterStratified() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterHeaterStratified(const WaterHeaterStratified& other) = default; WaterHeaterStratified(WaterHeaterStratified&& other) = default; diff --git a/src/model/WaterHeaterStratified_Impl.hpp b/src/model/WaterHeaterStratified_Impl.hpp index b069de55150..99ff7232137 100644 --- a/src/model/WaterHeaterStratified_Impl.hpp +++ b/src/model/WaterHeaterStratified_Impl.hpp @@ -36,7 +36,7 @@ namespace model { WaterHeaterStratified_Impl(const WaterHeaterStratified_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterHeaterStratified_Impl() = default; + virtual ~WaterHeaterStratified_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/WaterToAirComponent.hpp b/src/model/WaterToAirComponent.hpp index 331bbddce7a..4ee559d34c3 100644 --- a/src/model/WaterToAirComponent.hpp +++ b/src/model/WaterToAirComponent.hpp @@ -30,7 +30,7 @@ namespace model { class MODEL_API WaterToAirComponent : public HVACComponent { public: - virtual ~WaterToAirComponent() = default; + virtual ~WaterToAirComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterToAirComponent(const WaterToAirComponent& other) = default; WaterToAirComponent(WaterToAirComponent&& other) = default; diff --git a/src/model/WaterToAirComponent_Impl.hpp b/src/model/WaterToAirComponent_Impl.hpp index 598b2e29bd8..fa8f6f8de10 100644 --- a/src/model/WaterToAirComponent_Impl.hpp +++ b/src/model/WaterToAirComponent_Impl.hpp @@ -27,7 +27,7 @@ namespace model { WaterToAirComponent_Impl(const WaterToAirComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~WaterToAirComponent_Impl() = default; + virtual ~WaterToAirComponent_Impl() override = default; virtual boost::optional airInletModelObject() const; diff --git a/src/model/WaterToWaterComponent.cpp b/src/model/WaterToWaterComponent.cpp index 8d10db612c3..18a5a5f2dd2 100644 --- a/src/model/WaterToWaterComponent.cpp +++ b/src/model/WaterToWaterComponent.cpp @@ -428,10 +428,6 @@ namespace model { return getImpl()->clone(model); } - void WaterToWaterComponent::disconnect() { - getImpl()->disconnect(); - } - boost::optional WaterToWaterComponent::plantLoop() const { return getImpl()->plantLoop(); } diff --git a/src/model/WaterToWaterComponent.hpp b/src/model/WaterToWaterComponent.hpp index 8a38551a66d..9d39f551c1f 100644 --- a/src/model/WaterToWaterComponent.hpp +++ b/src/model/WaterToWaterComponent.hpp @@ -28,7 +28,7 @@ namespace model { public: WaterToWaterComponent(IddObjectType type, const Model& model); - virtual ~WaterToWaterComponent() = default; + virtual ~WaterToWaterComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterToWaterComponent(const WaterToWaterComponent& other) = default; WaterToWaterComponent(WaterToWaterComponent&& other) = default; @@ -67,11 +67,11 @@ namespace model { /** Returns the optional PlantLoop object that the HVAC component is a supply component on. */ - boost::optional plantLoop() const; + boost::optional plantLoop() const; // cppcheck-suppress [duplInheritedMember] for documentation purposes /** Returns the optional PlantLoop object that the HVAC component is a demand component on. */ - boost::optional secondaryPlantLoop() const; + boost::optional secondaryPlantLoop() const; // cppcheck-suppress [duplInheritedMember] for documentation purposes /** Removes the component from the plantLoop if one is attached. * Repairs the plantLoop connections preserving the integrity of the loop. @@ -105,8 +105,6 @@ namespace model { /** Returns the optional ModelObject connected to the tertiary outlet. **/ boost::optional tertiaryOutletModelObject() const; - void disconnect(); - protected: friend class Model; diff --git a/src/model/WaterToWaterComponent_Impl.hpp b/src/model/WaterToWaterComponent_Impl.hpp index de213ffb4bf..ff4b507776b 100644 --- a/src/model/WaterToWaterComponent_Impl.hpp +++ b/src/model/WaterToWaterComponent_Impl.hpp @@ -29,7 +29,7 @@ namespace model { WaterToWaterComponent_Impl(const WaterToWaterComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~WaterToWaterComponent_Impl() = default; + virtual ~WaterToWaterComponent_Impl() override = default; virtual unsigned supplyInletPort() const = 0; diff --git a/src/model/WaterUseConnections.hpp b/src/model/WaterUseConnections.hpp index 12373bc268a..b0c8bd5fb9e 100644 --- a/src/model/WaterUseConnections.hpp +++ b/src/model/WaterUseConnections.hpp @@ -30,7 +30,7 @@ namespace model { public: explicit WaterUseConnections(const Model& model); - virtual ~WaterUseConnections() = default; + virtual ~WaterUseConnections() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterUseConnections(const WaterUseConnections& other) = default; WaterUseConnections(WaterUseConnections&& other) = default; diff --git a/src/model/WaterUseConnections_Impl.hpp b/src/model/WaterUseConnections_Impl.hpp index ca89de7913c..8d3b9f72188 100644 --- a/src/model/WaterUseConnections_Impl.hpp +++ b/src/model/WaterUseConnections_Impl.hpp @@ -29,7 +29,7 @@ namespace model { WaterUseConnections_Impl(const WaterUseConnections_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterUseConnections_Impl() = default; + virtual ~WaterUseConnections_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/WaterUseEquipment.hpp b/src/model/WaterUseEquipment.hpp index d31aec3a37b..73ae9490a51 100644 --- a/src/model/WaterUseEquipment.hpp +++ b/src/model/WaterUseEquipment.hpp @@ -30,7 +30,7 @@ namespace model { public: explicit WaterUseEquipment(const WaterUseEquipmentDefinition& waterUseEquipmentDefinition); - virtual ~WaterUseEquipment() = default; + virtual ~WaterUseEquipment() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterUseEquipment(const WaterUseEquipment& other) = default; WaterUseEquipment(WaterUseEquipment&& other) = default; diff --git a/src/model/WaterUseEquipmentDefinition.hpp b/src/model/WaterUseEquipmentDefinition.hpp index 140c5d3f5a1..0523fa13e17 100644 --- a/src/model/WaterUseEquipmentDefinition.hpp +++ b/src/model/WaterUseEquipmentDefinition.hpp @@ -27,7 +27,7 @@ namespace model { public: explicit WaterUseEquipmentDefinition(const Model& model); - virtual ~WaterUseEquipmentDefinition() = default; + virtual ~WaterUseEquipmentDefinition() override = default; // Default the copy and move operators because the virtual dtor is explicit WaterUseEquipmentDefinition(const WaterUseEquipmentDefinition& other) = default; WaterUseEquipmentDefinition(WaterUseEquipmentDefinition&& other) = default; diff --git a/src/model/WaterUseEquipmentDefinition_Impl.hpp b/src/model/WaterUseEquipmentDefinition_Impl.hpp index 1c5f424426f..fc39ebb19d2 100644 --- a/src/model/WaterUseEquipmentDefinition_Impl.hpp +++ b/src/model/WaterUseEquipmentDefinition_Impl.hpp @@ -26,7 +26,7 @@ namespace model { WaterUseEquipmentDefinition_Impl(const WaterUseEquipmentDefinition_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterUseEquipmentDefinition_Impl() = default; + virtual ~WaterUseEquipmentDefinition_Impl() override = default; // TODO: remove (unused) virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/WaterUseEquipment_Impl.hpp b/src/model/WaterUseEquipment_Impl.hpp index b1f277e14c3..dd6251e22e0 100644 --- a/src/model/WaterUseEquipment_Impl.hpp +++ b/src/model/WaterUseEquipment_Impl.hpp @@ -29,7 +29,7 @@ namespace model { WaterUseEquipment_Impl(const WaterUseEquipment_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WaterUseEquipment_Impl() = default; + virtual ~WaterUseEquipment_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/WeatherFile.hpp b/src/model/WeatherFile.hpp index e64f48af111..8090a3717dd 100644 --- a/src/model/WeatherFile.hpp +++ b/src/model/WeatherFile.hpp @@ -41,7 +41,7 @@ namespace model { public: /** @name Constructors and Destructors */ //@{ - virtual ~WeatherFile() = default; + virtual ~WeatherFile() override = default; // Default the copy and move operators because the virtual dtor is explicit WeatherFile(const WeatherFile& other) = default; WeatherFile(WeatherFile&& other) = default; diff --git a/src/model/WeatherFileConditionType.hpp b/src/model/WeatherFileConditionType.hpp index 4c4b0ca431b..c1ab26c3a60 100644 --- a/src/model/WeatherFileConditionType.hpp +++ b/src/model/WeatherFileConditionType.hpp @@ -22,7 +22,7 @@ namespace model { // constructor explicit WeatherFileConditionType(const Model& model); - virtual ~WeatherFileConditionType() = default; + virtual ~WeatherFileConditionType() override = default; // Default the copy and move operators because the virtual dtor is explicit WeatherFileConditionType(const WeatherFileConditionType& other) = default; WeatherFileConditionType(WeatherFileConditionType&& other) = default; diff --git a/src/model/WeatherFileConditionType_Impl.hpp b/src/model/WeatherFileConditionType_Impl.hpp index 6de9b8aec69..c1b04ff17dc 100644 --- a/src/model/WeatherFileConditionType_Impl.hpp +++ b/src/model/WeatherFileConditionType_Impl.hpp @@ -26,7 +26,7 @@ namespace model { WeatherFileConditionType_Impl(const WeatherFileConditionType_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~WeatherFileConditionType_Impl() = default; + virtual ~WeatherFileConditionType_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/WeatherFileDays.hpp b/src/model/WeatherFileDays.hpp index fb88bdf81af..54007874803 100644 --- a/src/model/WeatherFileDays.hpp +++ b/src/model/WeatherFileDays.hpp @@ -22,7 +22,7 @@ namespace model { // constructor explicit WeatherFileDays(const Model& model); - virtual ~WeatherFileDays() = default; + virtual ~WeatherFileDays() override = default; // Default the copy and move operators because the virtual dtor is explicit WeatherFileDays(const WeatherFileDays& other) = default; WeatherFileDays(WeatherFileDays&& other) = default; diff --git a/src/model/WeatherFileDays_Impl.hpp b/src/model/WeatherFileDays_Impl.hpp index bace7d5f273..9338e6de237 100644 --- a/src/model/WeatherFileDays_Impl.hpp +++ b/src/model/WeatherFileDays_Impl.hpp @@ -26,7 +26,7 @@ namespace model { WeatherFileDays_Impl(const WeatherFileDays_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~WeatherFileDays_Impl() = default; + virtual ~WeatherFileDays_Impl() override = default; // Get all output variable names that could be associated with this object. virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/WeatherFile_Impl.hpp b/src/model/WeatherFile_Impl.hpp index 17456b55e1f..2f3591b5ac6 100644 --- a/src/model/WeatherFile_Impl.hpp +++ b/src/model/WeatherFile_Impl.hpp @@ -36,7 +36,7 @@ namespace model { WeatherFile_Impl(const WeatherFile_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WeatherFile_Impl() = default; + virtual ~WeatherFile_Impl() override = default; //@} diff --git a/src/model/WindowDataFile.hpp b/src/model/WindowDataFile.hpp index f6380f42126..d6eced518d4 100644 --- a/src/model/WindowDataFile.hpp +++ b/src/model/WindowDataFile.hpp @@ -26,7 +26,7 @@ namespace model { explicit WindowDataFile(const Model& model); - virtual ~WindowDataFile() = default; + virtual ~WindowDataFile() override = default; // Default the copy and move operators because the virtual dtor is explicit WindowDataFile(const WindowDataFile& other) = default; WindowDataFile(WindowDataFile&& other) = default; diff --git a/src/model/WindowDataFile_Impl.hpp b/src/model/WindowDataFile_Impl.hpp index 8fdf8c88b27..0b406912236 100644 --- a/src/model/WindowDataFile_Impl.hpp +++ b/src/model/WindowDataFile_Impl.hpp @@ -27,7 +27,7 @@ namespace model { WindowDataFile_Impl(const WindowDataFile_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~WindowDataFile_Impl() = default; + virtual ~WindowDataFile_Impl() override = default; //@} /** @name Getters */ diff --git a/src/model/WindowPropertyFrameAndDivider.hpp b/src/model/WindowPropertyFrameAndDivider.hpp index 8d5a5332389..eea42261252 100644 --- a/src/model/WindowPropertyFrameAndDivider.hpp +++ b/src/model/WindowPropertyFrameAndDivider.hpp @@ -28,7 +28,7 @@ namespace model { explicit WindowPropertyFrameAndDivider(const Model& model); - virtual ~WindowPropertyFrameAndDivider() = default; + virtual ~WindowPropertyFrameAndDivider() override = default; // Default the copy and move operators because the virtual dtor is explicit WindowPropertyFrameAndDivider(const WindowPropertyFrameAndDivider& other) = default; WindowPropertyFrameAndDivider(WindowPropertyFrameAndDivider&& other) = default; diff --git a/src/model/WindowPropertyFrameAndDivider_Impl.hpp b/src/model/WindowPropertyFrameAndDivider_Impl.hpp index 0bd51b07e5c..b8832d6f8a7 100644 --- a/src/model/WindowPropertyFrameAndDivider_Impl.hpp +++ b/src/model/WindowPropertyFrameAndDivider_Impl.hpp @@ -27,7 +27,7 @@ namespace model { WindowPropertyFrameAndDivider_Impl(const WindowPropertyFrameAndDivider_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~WindowPropertyFrameAndDivider_Impl() = default; + virtual ~WindowPropertyFrameAndDivider_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/YearDescription.hpp b/src/model/YearDescription.hpp index 25c61d8a4e3..1fa597c6f37 100644 --- a/src/model/YearDescription.hpp +++ b/src/model/YearDescription.hpp @@ -31,7 +31,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~YearDescription() = default; + virtual ~YearDescription() override = default; // Default the copy and move operators because the virtual dtor is explicit YearDescription(const YearDescription& other) = default; YearDescription(YearDescription&& other) = default; diff --git a/src/model/YearDescription_Impl.hpp b/src/model/YearDescription_Impl.hpp index ca5fab5ea19..ec811e8aa6c 100644 --- a/src/model/YearDescription_Impl.hpp +++ b/src/model/YearDescription_Impl.hpp @@ -34,7 +34,7 @@ namespace model { YearDescription_Impl(const YearDescription_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~YearDescription_Impl() = default; + virtual ~YearDescription_Impl() override = default; //@} virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ZoneAirContaminantBalance.hpp b/src/model/ZoneAirContaminantBalance.hpp index a3a75012db1..3c16a886688 100644 --- a/src/model/ZoneAirContaminantBalance.hpp +++ b/src/model/ZoneAirContaminantBalance.hpp @@ -27,7 +27,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ZoneAirContaminantBalance() = default; + virtual ~ZoneAirContaminantBalance() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneAirContaminantBalance(const ZoneAirContaminantBalance& other) = default; ZoneAirContaminantBalance(ZoneAirContaminantBalance&& other) = default; diff --git a/src/model/ZoneAirContaminantBalance_Impl.hpp b/src/model/ZoneAirContaminantBalance_Impl.hpp index f25122af2da..fd9353f58cb 100644 --- a/src/model/ZoneAirContaminantBalance_Impl.hpp +++ b/src/model/ZoneAirContaminantBalance_Impl.hpp @@ -34,7 +34,7 @@ namespace model { ZoneAirContaminantBalance_Impl(const ZoneAirContaminantBalance_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ZoneAirContaminantBalance_Impl() = default; + virtual ~ZoneAirContaminantBalance_Impl() override = default; // return the parent object in the hierarchy virtual boost::optional parent() const override; diff --git a/src/model/ZoneAirHeatBalanceAlgorithm.hpp b/src/model/ZoneAirHeatBalanceAlgorithm.hpp index c6f7092901f..1447cc35eca 100644 --- a/src/model/ZoneAirHeatBalanceAlgorithm.hpp +++ b/src/model/ZoneAirHeatBalanceAlgorithm.hpp @@ -25,7 +25,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ZoneAirHeatBalanceAlgorithm() = default; + virtual ~ZoneAirHeatBalanceAlgorithm() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneAirHeatBalanceAlgorithm(const ZoneAirHeatBalanceAlgorithm& other) = default; ZoneAirHeatBalanceAlgorithm(ZoneAirHeatBalanceAlgorithm&& other) = default; diff --git a/src/model/ZoneAirHeatBalanceAlgorithm_Impl.hpp b/src/model/ZoneAirHeatBalanceAlgorithm_Impl.hpp index 25e6df689d2..6da93460fd1 100644 --- a/src/model/ZoneAirHeatBalanceAlgorithm_Impl.hpp +++ b/src/model/ZoneAirHeatBalanceAlgorithm_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneAirHeatBalanceAlgorithm_Impl(const ZoneAirHeatBalanceAlgorithm_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ZoneAirHeatBalanceAlgorithm_Impl() = default; + virtual ~ZoneAirHeatBalanceAlgorithm_Impl() override = default; //@} diff --git a/src/model/ZoneAirMassFlowConservation.hpp b/src/model/ZoneAirMassFlowConservation.hpp index 32818d3a479..475f84bc345 100644 --- a/src/model/ZoneAirMassFlowConservation.hpp +++ b/src/model/ZoneAirMassFlowConservation.hpp @@ -27,7 +27,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ZoneAirMassFlowConservation() = default; + virtual ~ZoneAirMassFlowConservation() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneAirMassFlowConservation(const ZoneAirMassFlowConservation& other) = default; ZoneAirMassFlowConservation(ZoneAirMassFlowConservation&& other) = default; diff --git a/src/model/ZoneAirMassFlowConservation_Impl.hpp b/src/model/ZoneAirMassFlowConservation_Impl.hpp index 8e7754486b6..267cb2a8267 100644 --- a/src/model/ZoneAirMassFlowConservation_Impl.hpp +++ b/src/model/ZoneAirMassFlowConservation_Impl.hpp @@ -27,7 +27,7 @@ namespace model { ZoneAirMassFlowConservation_Impl(const ZoneAirMassFlowConservation_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneAirMassFlowConservation_Impl() = default; + virtual ~ZoneAirMassFlowConservation_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneCapacitanceMultiplierResearchSpecial.hpp b/src/model/ZoneCapacitanceMultiplierResearchSpecial.hpp index b1917b2b3bb..e4915ba7da5 100644 --- a/src/model/ZoneCapacitanceMultiplierResearchSpecial.hpp +++ b/src/model/ZoneCapacitanceMultiplierResearchSpecial.hpp @@ -26,7 +26,7 @@ namespace model { /** @name Constructors and Destructors */ //@{ - virtual ~ZoneCapacitanceMultiplierResearchSpecial() = default; + virtual ~ZoneCapacitanceMultiplierResearchSpecial() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneCapacitanceMultiplierResearchSpecial(const ZoneCapacitanceMultiplierResearchSpecial& other) = default; ZoneCapacitanceMultiplierResearchSpecial(ZoneCapacitanceMultiplierResearchSpecial&& other) = default; diff --git a/src/model/ZoneCapacitanceMultiplierResearchSpecial_Impl.hpp b/src/model/ZoneCapacitanceMultiplierResearchSpecial_Impl.hpp index 832a4039490..9432d6f879b 100644 --- a/src/model/ZoneCapacitanceMultiplierResearchSpecial_Impl.hpp +++ b/src/model/ZoneCapacitanceMultiplierResearchSpecial_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneCapacitanceMultiplierResearchSpecial_Impl(const ZoneCapacitanceMultiplierResearchSpecial_Impl& other, Model_Impl* model, bool keepHandle); // virtual destructor - virtual ~ZoneCapacitanceMultiplierResearchSpecial_Impl() = default; + virtual ~ZoneCapacitanceMultiplierResearchSpecial_Impl() override = default; //@} diff --git a/src/model/ZoneControlContaminantController.hpp b/src/model/ZoneControlContaminantController.hpp index 1c7c01aa984..7bbd402caef 100644 --- a/src/model/ZoneControlContaminantController.hpp +++ b/src/model/ZoneControlContaminantController.hpp @@ -30,7 +30,7 @@ namespace model { explicit ZoneControlContaminantController(const Model& model); - virtual ~ZoneControlContaminantController() = default; + virtual ~ZoneControlContaminantController() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneControlContaminantController(const ZoneControlContaminantController& other) = default; ZoneControlContaminantController(ZoneControlContaminantController&& other) = default; diff --git a/src/model/ZoneControlContaminantController_Impl.hpp b/src/model/ZoneControlContaminantController_Impl.hpp index 1cc3293bac8..f9e0bad6bb0 100644 --- a/src/model/ZoneControlContaminantController_Impl.hpp +++ b/src/model/ZoneControlContaminantController_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ZoneControlContaminantController_Impl(const ZoneControlContaminantController_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneControlContaminantController_Impl() = default; + virtual ~ZoneControlContaminantController_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneControlHumidistat.hpp b/src/model/ZoneControlHumidistat.hpp index 175a153da85..4ab56275a1f 100644 --- a/src/model/ZoneControlHumidistat.hpp +++ b/src/model/ZoneControlHumidistat.hpp @@ -30,7 +30,7 @@ namespace model { explicit ZoneControlHumidistat(const Model& model); - virtual ~ZoneControlHumidistat() = default; + virtual ~ZoneControlHumidistat() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneControlHumidistat(const ZoneControlHumidistat& other) = default; ZoneControlHumidistat(ZoneControlHumidistat&& other) = default; diff --git a/src/model/ZoneControlHumidistat_Impl.hpp b/src/model/ZoneControlHumidistat_Impl.hpp index 9af3cf87abc..1b45bc2bfc9 100644 --- a/src/model/ZoneControlHumidistat_Impl.hpp +++ b/src/model/ZoneControlHumidistat_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ZoneControlHumidistat_Impl(const ZoneControlHumidistat_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneControlHumidistat_Impl() = default; + virtual ~ZoneControlHumidistat_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneControlThermostatStagedDualSetpoint.hpp b/src/model/ZoneControlThermostatStagedDualSetpoint.hpp index d11ad83a6c8..dbbc7711cf6 100644 --- a/src/model/ZoneControlThermostatStagedDualSetpoint.hpp +++ b/src/model/ZoneControlThermostatStagedDualSetpoint.hpp @@ -30,7 +30,7 @@ namespace model { explicit ZoneControlThermostatStagedDualSetpoint(const Model& model); - virtual ~ZoneControlThermostatStagedDualSetpoint() = default; + virtual ~ZoneControlThermostatStagedDualSetpoint() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneControlThermostatStagedDualSetpoint(const ZoneControlThermostatStagedDualSetpoint& other) = default; ZoneControlThermostatStagedDualSetpoint(ZoneControlThermostatStagedDualSetpoint&& other) = default; diff --git a/src/model/ZoneControlThermostatStagedDualSetpoint_Impl.hpp b/src/model/ZoneControlThermostatStagedDualSetpoint_Impl.hpp index f8b948c308b..1b6892d56c0 100644 --- a/src/model/ZoneControlThermostatStagedDualSetpoint_Impl.hpp +++ b/src/model/ZoneControlThermostatStagedDualSetpoint_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ZoneControlThermostatStagedDualSetpoint_Impl(const ZoneControlThermostatStagedDualSetpoint_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneControlThermostatStagedDualSetpoint_Impl() = default; + virtual ~ZoneControlThermostatStagedDualSetpoint_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACBaseboardConvectiveElectric.hpp b/src/model/ZoneHVACBaseboardConvectiveElectric.hpp index 9dee1ccf9ab..c6bf4f3b95c 100644 --- a/src/model/ZoneHVACBaseboardConvectiveElectric.hpp +++ b/src/model/ZoneHVACBaseboardConvectiveElectric.hpp @@ -29,7 +29,7 @@ namespace model { public: explicit ZoneHVACBaseboardConvectiveElectric(const Model& model); - virtual ~ZoneHVACBaseboardConvectiveElectric() = default; + virtual ~ZoneHVACBaseboardConvectiveElectric() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACBaseboardConvectiveElectric(const ZoneHVACBaseboardConvectiveElectric& other) = default; ZoneHVACBaseboardConvectiveElectric(ZoneHVACBaseboardConvectiveElectric&& other) = default; diff --git a/src/model/ZoneHVACBaseboardConvectiveElectric_Impl.hpp b/src/model/ZoneHVACBaseboardConvectiveElectric_Impl.hpp index adb84c2c653..86c631a1a14 100644 --- a/src/model/ZoneHVACBaseboardConvectiveElectric_Impl.hpp +++ b/src/model/ZoneHVACBaseboardConvectiveElectric_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ZoneHVACBaseboardConvectiveElectric_Impl(const ZoneHVACBaseboardConvectiveElectric_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACBaseboardConvectiveElectric_Impl() = default; + virtual ~ZoneHVACBaseboardConvectiveElectric_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACBaseboardConvectiveWater.hpp b/src/model/ZoneHVACBaseboardConvectiveWater.hpp index 2c69ae55c47..4d8dedd4438 100644 --- a/src/model/ZoneHVACBaseboardConvectiveWater.hpp +++ b/src/model/ZoneHVACBaseboardConvectiveWater.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACBaseboardConvectiveWater(const Model& model, Schedule& availabilitySchedule, StraightComponent& heatingCoilBaseboard); - virtual ~ZoneHVACBaseboardConvectiveWater() = default; + virtual ~ZoneHVACBaseboardConvectiveWater() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACBaseboardConvectiveWater(const ZoneHVACBaseboardConvectiveWater& other) = default; ZoneHVACBaseboardConvectiveWater(ZoneHVACBaseboardConvectiveWater&& other) = default; diff --git a/src/model/ZoneHVACBaseboardConvectiveWater_Impl.hpp b/src/model/ZoneHVACBaseboardConvectiveWater_Impl.hpp index 9ec8de02f4c..52db34a8444 100644 --- a/src/model/ZoneHVACBaseboardConvectiveWater_Impl.hpp +++ b/src/model/ZoneHVACBaseboardConvectiveWater_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACBaseboardConvectiveWater_Impl(const ZoneHVACBaseboardConvectiveWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACBaseboardConvectiveWater_Impl() = default; + virtual ~ZoneHVACBaseboardConvectiveWater_Impl() override = default; //@} diff --git a/src/model/ZoneHVACBaseboardRadiantConvectiveElectric.hpp b/src/model/ZoneHVACBaseboardRadiantConvectiveElectric.hpp index a1cce53eb3b..1e08d70d929 100644 --- a/src/model/ZoneHVACBaseboardRadiantConvectiveElectric.hpp +++ b/src/model/ZoneHVACBaseboardRadiantConvectiveElectric.hpp @@ -31,7 +31,7 @@ namespace model { explicit ZoneHVACBaseboardRadiantConvectiveElectric(const Model& model); - virtual ~ZoneHVACBaseboardRadiantConvectiveElectric() = default; + virtual ~ZoneHVACBaseboardRadiantConvectiveElectric() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACBaseboardRadiantConvectiveElectric(const ZoneHVACBaseboardRadiantConvectiveElectric& other) = default; ZoneHVACBaseboardRadiantConvectiveElectric(ZoneHVACBaseboardRadiantConvectiveElectric&& other) = default; diff --git a/src/model/ZoneHVACBaseboardRadiantConvectiveElectric_Impl.hpp b/src/model/ZoneHVACBaseboardRadiantConvectiveElectric_Impl.hpp index c6beda94ebe..f1f09488f60 100644 --- a/src/model/ZoneHVACBaseboardRadiantConvectiveElectric_Impl.hpp +++ b/src/model/ZoneHVACBaseboardRadiantConvectiveElectric_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACBaseboardRadiantConvectiveElectric_Impl(const ZoneHVACBaseboardRadiantConvectiveElectric_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACBaseboardRadiantConvectiveElectric_Impl() = default; + virtual ~ZoneHVACBaseboardRadiantConvectiveElectric_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACBaseboardRadiantConvectiveWater.hpp b/src/model/ZoneHVACBaseboardRadiantConvectiveWater.hpp index f66a69b009b..bca1e2827e4 100644 --- a/src/model/ZoneHVACBaseboardRadiantConvectiveWater.hpp +++ b/src/model/ZoneHVACBaseboardRadiantConvectiveWater.hpp @@ -31,7 +31,7 @@ namespace model { explicit ZoneHVACBaseboardRadiantConvectiveWater(const Model& model); - virtual ~ZoneHVACBaseboardRadiantConvectiveWater() = default; + virtual ~ZoneHVACBaseboardRadiantConvectiveWater() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACBaseboardRadiantConvectiveWater(const ZoneHVACBaseboardRadiantConvectiveWater& other) = default; ZoneHVACBaseboardRadiantConvectiveWater(ZoneHVACBaseboardRadiantConvectiveWater&& other) = default; diff --git a/src/model/ZoneHVACBaseboardRadiantConvectiveWater_Impl.hpp b/src/model/ZoneHVACBaseboardRadiantConvectiveWater_Impl.hpp index 74af533fda4..d02f30e5459 100644 --- a/src/model/ZoneHVACBaseboardRadiantConvectiveWater_Impl.hpp +++ b/src/model/ZoneHVACBaseboardRadiantConvectiveWater_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACBaseboardRadiantConvectiveWater_Impl(const ZoneHVACBaseboardRadiantConvectiveWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACBaseboardRadiantConvectiveWater_Impl() = default; + virtual ~ZoneHVACBaseboardRadiantConvectiveWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACComponent.cpp b/src/model/ZoneHVACComponent.cpp index 44cffb41cf1..013cbfacd12 100644 --- a/src/model/ZoneHVACComponent.cpp +++ b/src/model/ZoneHVACComponent.cpp @@ -459,10 +459,6 @@ namespace model { OS_ASSERT(getImpl()); } - std::vector ZoneHVACComponent::children() const { - return getImpl()->children(); - } - unsigned ZoneHVACComponent::inletPort() const { return getImpl()->inletPort(); } diff --git a/src/model/ZoneHVACComponent.hpp b/src/model/ZoneHVACComponent.hpp index 89fd22fa27b..bda7f55dca9 100644 --- a/src/model/ZoneHVACComponent.hpp +++ b/src/model/ZoneHVACComponent.hpp @@ -25,11 +25,11 @@ namespace model { }; /** ZoneHVACComponent is the base class for HVAC related objects that exclusively condition a single zone. - */ + */ class MODEL_API ZoneHVACComponent : public HVACComponent { public: - virtual ~ZoneHVACComponent() = default; + virtual ~ZoneHVACComponent() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACComponent(const ZoneHVACComponent& other) = default; ZoneHVACComponent(ZoneHVACComponent&& other) = default; @@ -37,39 +37,39 @@ namespace model { ZoneHVACComponent& operator=(ZoneHVACComponent&&) = default; /** Returns the inlet port. For a ZoneHVACComponent this port is typically connected - * to a zone exhaust node. **/ + * to a zone exhaust node. **/ unsigned inletPort() const; /** Returns the optional node connected to the inletPort(). **/ boost::optional inletNode() const; /** Returns the outlet port. For a ZoneHVACComponent this port is typically connected - * to a zone air inlet node **/ + * to a zone air inlet node **/ unsigned outletPort() const; /** Returns the optional node connected to the outletPort(). **/ boost::optional outletNode() const; /** Returns the optional ThermalZone that this ZoneHVACComponent is attached to - **/ + **/ virtual boost::optional thermalZone() const; /** Adds this ZoneHVACComponent to the thermal zone while managing all - * node connections automatically. Returns true if the operation was - * successful. - **/ + * node connections automatically. Returns true if the operation was + * successful. + **/ bool addToThermalZone(ThermalZone& thermalZone); /** Detaches this ZoneHVACComponent from the associated ThermalZone. - * If there is no attached ThermalZone there is no effect. - * If the ThermalZone is attached via an AirLoopHVAC object (as a result of addToNode()), - * then this method will reverse the effects of addToNode, and also detach the ZoneHVACComponent - * from the AirLoopHVAC object. - **/ + * If there is no attached ThermalZone there is no effect. + * If the ThermalZone is attached via an AirLoopHVAC object (as a result of addToNode()), + * then this method will reverse the effects of addToNode, and also detach the ZoneHVACComponent + * from the AirLoopHVAC object. + **/ void removeFromThermalZone(); /** Establish plenumZone as the return plenum for this ZoneHVACComponent. - * ZoneHVACComponent must already be attached to a ThermalZone + * ZoneHVACComponent must already be attached to a ThermalZone * The method canBePlenum called on plenumZone must return true. */ bool setReturnPlenum(const ThermalZone& plenumZone); @@ -81,38 +81,38 @@ namespace model { boost::optional returnPlenum() const; /** Adds this ZoneHVACComponent to a node on an AirLoopHVAC object. - * The node must be located between a ThermalZone and a AirTerminalSingleDuctInletSideMixer object. - * This is used to feed an AirLoopHVAC structure (such as a DOAS, or any built up system) into a ZoneHVACComponent. - * If the ZoneHVACComponent object is already attached to a thermalZone() then it will first be detached using removeFromThermalZone(). - * - * Certain OpenStudio objects derived from the ZoneHVACComponent type, - * can be used as AirLoopHVAC supply components. - * One example is the AirLoopHVACUnitarySystem, which can be used as both - * a ZoneHVACComponent and a AirLoopHVAC component. In these cases - * addToNode can be used to add those components to the supply side of an - * AirLoopHVAC system. - **/ - bool addToNode(Node& node); + * The node must be located between a ThermalZone and a AirTerminalSingleDuctInletSideMixer object. + * This is used to feed an AirLoopHVAC structure (such as a DOAS, or any built up system) into a ZoneHVACComponent. + * If the ZoneHVACComponent object is already attached to a thermalZone() then it will first be detached using removeFromThermalZone(). + * + * Certain OpenStudio objects derived from the ZoneHVACComponent type, + * can be used as AirLoopHVAC supply components. + * One example is the AirLoopHVACUnitarySystem, which can be used as both + * a ZoneHVACComponent and a AirLoopHVAC component. In these cases + * addToNode can be used to add those components to the supply side of an + * AirLoopHVAC system. + **/ + bool addToNode(Node& node); // cppcheck-suppress [duplInheritedMember] for documentation purposes /** Returns the AirLoopHVAC attached to this ZoneHVACComponent. - * The AirLoopHVAC object would have been attached via addToNode */ - boost::optional airLoopHVAC() const; + * The AirLoopHVAC object would have been attached via addToNode */ + boost::optional airLoopHVAC() const; // cppcheck-suppress [duplInheritedMember] for documentation purposes /** If this ZoneHVACComponent is used as a supply component - * on an AirLoopHVAC system, then this method will detach - * this ZoneHVACComponent from the AirLoopHVAC system, otherwise - * this method does nothing. - * - * Certain OpenStudio objects derived from the ZoneHVACComponent type, - * can be used as AirLoopHVAC supply components. - * One example is the AirLoopHVACUnitarySystem, which can be used as both - * a ZoneHVACComponent and a AirLoopHVAC component. - * - * If this ZoneHVACComponent is on the demand side of AirLoopHVAC, - * between a ThermalZone and a AirTerminalSingleDuctInletSideMixer, - * then use the method removeFromThermalZone, instead of removeFromAirLoopHVAC - * to detach this ZoneHVACComponent from the zone and air system. - **/ + * on an AirLoopHVAC system, then this method will detach + * this ZoneHVACComponent from the AirLoopHVAC system, otherwise + * this method does nothing. + * + * Certain OpenStudio objects derived from the ZoneHVACComponent type, + * can be used as AirLoopHVAC supply components. + * One example is the AirLoopHVACUnitarySystem, which can be used as both + * a ZoneHVACComponent and a AirLoopHVAC component. + * + * If this ZoneHVACComponent is on the demand side of AirLoopHVAC, + * between a ThermalZone and a AirTerminalSingleDuctInletSideMixer, + * then use the method removeFromThermalZone, instead of removeFromAirLoopHVAC + * to detach this ZoneHVACComponent from the zone and air system. + **/ bool removeFromAirLoopHVAC(); /** Provided for backwards compatibility, use inletNode instead **/ @@ -134,8 +134,6 @@ namespace model { explicit ZoneHVACComponent(std::shared_ptr impl); - virtual std::vector children() const override; - private: REGISTER_LOGGER("openstudio.model.HVACComponent"); }; diff --git a/src/model/ZoneHVACComponent_Impl.hpp b/src/model/ZoneHVACComponent_Impl.hpp index 8068c95e28e..ae79df8b1fe 100644 --- a/src/model/ZoneHVACComponent_Impl.hpp +++ b/src/model/ZoneHVACComponent_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ZoneHVACComponent_Impl(const ZoneHVACComponent_Impl& other, Model_Impl* model, bool keepHandles); - virtual ~ZoneHVACComponent_Impl() = default; + virtual ~ZoneHVACComponent_Impl() override = default; virtual boost::optional parent() const override; diff --git a/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater.hpp b/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater.hpp index 180b71610d6..a72e2859641 100644 --- a/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater.hpp +++ b/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater.hpp @@ -31,7 +31,7 @@ namespace model { explicit ZoneHVACCoolingPanelRadiantConvectiveWater(const Model& model); - virtual ~ZoneHVACCoolingPanelRadiantConvectiveWater() = default; + virtual ~ZoneHVACCoolingPanelRadiantConvectiveWater() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACCoolingPanelRadiantConvectiveWater(const ZoneHVACCoolingPanelRadiantConvectiveWater& other) = default; ZoneHVACCoolingPanelRadiantConvectiveWater(ZoneHVACCoolingPanelRadiantConvectiveWater&& other) = default; diff --git a/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater_Impl.hpp b/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater_Impl.hpp index e746960ecda..3866be91b99 100644 --- a/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater_Impl.hpp +++ b/src/model/ZoneHVACCoolingPanelRadiantConvectiveWater_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ZoneHVACCoolingPanelRadiantConvectiveWater_Impl(const ZoneHVACCoolingPanelRadiantConvectiveWater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACCoolingPanelRadiantConvectiveWater_Impl() = default; + virtual ~ZoneHVACCoolingPanelRadiantConvectiveWater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACDehumidifierDX.hpp b/src/model/ZoneHVACDehumidifierDX.hpp index 499ccce937a..7fea146659f 100644 --- a/src/model/ZoneHVACDehumidifierDX.hpp +++ b/src/model/ZoneHVACDehumidifierDX.hpp @@ -35,7 +35,7 @@ namespace model { explicit ZoneHVACDehumidifierDX(const Model& model, const Curve& waterRemovalCurve, const Curve& energyFactorCurve, const Curve& partLoadFractionCurve); - virtual ~ZoneHVACDehumidifierDX() = default; + virtual ~ZoneHVACDehumidifierDX() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACDehumidifierDX(const ZoneHVACDehumidifierDX& other) = default; ZoneHVACDehumidifierDX(ZoneHVACDehumidifierDX&& other) = default; diff --git a/src/model/ZoneHVACDehumidifierDX_Impl.hpp b/src/model/ZoneHVACDehumidifierDX_Impl.hpp index 3f837dc0a96..2eb34922101 100644 --- a/src/model/ZoneHVACDehumidifierDX_Impl.hpp +++ b/src/model/ZoneHVACDehumidifierDX_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ZoneHVACDehumidifierDX_Impl(const ZoneHVACDehumidifierDX_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACDehumidifierDX_Impl() = default; + virtual ~ZoneHVACDehumidifierDX_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACEnergyRecoveryVentilator.hpp b/src/model/ZoneHVACEnergyRecoveryVentilator.hpp index 97c9ecbad7b..0e1191f180f 100644 --- a/src/model/ZoneHVACEnergyRecoveryVentilator.hpp +++ b/src/model/ZoneHVACEnergyRecoveryVentilator.hpp @@ -35,7 +35,7 @@ namespace model { explicit ZoneHVACEnergyRecoveryVentilator(const Model& model, const HVACComponent& heatExchanger, const HVACComponent& supplyAirFan, const HVACComponent& exhaustAirFan); - virtual ~ZoneHVACEnergyRecoveryVentilator() = default; + virtual ~ZoneHVACEnergyRecoveryVentilator() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACEnergyRecoveryVentilator(const ZoneHVACEnergyRecoveryVentilator& other) = default; ZoneHVACEnergyRecoveryVentilator(ZoneHVACEnergyRecoveryVentilator&& other) = default; diff --git a/src/model/ZoneHVACEnergyRecoveryVentilatorController.hpp b/src/model/ZoneHVACEnergyRecoveryVentilatorController.hpp index d9276f606b2..0cb088d5377 100644 --- a/src/model/ZoneHVACEnergyRecoveryVentilatorController.hpp +++ b/src/model/ZoneHVACEnergyRecoveryVentilatorController.hpp @@ -31,7 +31,7 @@ namespace model { explicit ZoneHVACEnergyRecoveryVentilatorController(const Model& model); - virtual ~ZoneHVACEnergyRecoveryVentilatorController() = default; + virtual ~ZoneHVACEnergyRecoveryVentilatorController() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACEnergyRecoveryVentilatorController(const ZoneHVACEnergyRecoveryVentilatorController& other) = default; ZoneHVACEnergyRecoveryVentilatorController(ZoneHVACEnergyRecoveryVentilatorController&& other) = default; diff --git a/src/model/ZoneHVACEnergyRecoveryVentilatorController_Impl.hpp b/src/model/ZoneHVACEnergyRecoveryVentilatorController_Impl.hpp index d6a554fac5c..918c03a2a75 100644 --- a/src/model/ZoneHVACEnergyRecoveryVentilatorController_Impl.hpp +++ b/src/model/ZoneHVACEnergyRecoveryVentilatorController_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ZoneHVACEnergyRecoveryVentilatorController_Impl(const ZoneHVACEnergyRecoveryVentilatorController_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACEnergyRecoveryVentilatorController_Impl() = default; + virtual ~ZoneHVACEnergyRecoveryVentilatorController_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACEnergyRecoveryVentilator_Impl.hpp b/src/model/ZoneHVACEnergyRecoveryVentilator_Impl.hpp index 7a8044d3324..f5d18112306 100644 --- a/src/model/ZoneHVACEnergyRecoveryVentilator_Impl.hpp +++ b/src/model/ZoneHVACEnergyRecoveryVentilator_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ZoneHVACEnergyRecoveryVentilator_Impl(const ZoneHVACEnergyRecoveryVentilator_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACEnergyRecoveryVentilator_Impl() = default; + virtual ~ZoneHVACEnergyRecoveryVentilator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACEquipmentList.hpp b/src/model/ZoneHVACEquipmentList.hpp index bb0bbed8f3f..6802f7470fb 100644 --- a/src/model/ZoneHVACEquipmentList.hpp +++ b/src/model/ZoneHVACEquipmentList.hpp @@ -27,7 +27,7 @@ namespace model { public: explicit ZoneHVACEquipmentList(const ThermalZone& thermalZone); - virtual ~ZoneHVACEquipmentList() = default; + virtual ~ZoneHVACEquipmentList() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACEquipmentList(const ZoneHVACEquipmentList& other) = default; ZoneHVACEquipmentList(ZoneHVACEquipmentList&& other) = default; diff --git a/src/model/ZoneHVACEquipmentList_Impl.hpp b/src/model/ZoneHVACEquipmentList_Impl.hpp index 5753c89e3c1..74358c2ce4b 100644 --- a/src/model/ZoneHVACEquipmentList_Impl.hpp +++ b/src/model/ZoneHVACEquipmentList_Impl.hpp @@ -43,7 +43,7 @@ namespace model { boost::optional getGroupForModelObject(const ModelObject& modelObject) const; - virtual ~ZoneHVACEquipmentList_Impl() = default; + virtual ~ZoneHVACEquipmentList_Impl() override = default; virtual const std::vector& outputVariableNames() const override; diff --git a/src/model/ZoneHVACFourPipeFanCoil.hpp b/src/model/ZoneHVACFourPipeFanCoil.hpp index e412d4a9a88..f3956e313d6 100644 --- a/src/model/ZoneHVACFourPipeFanCoil.hpp +++ b/src/model/ZoneHVACFourPipeFanCoil.hpp @@ -40,7 +40,7 @@ namespace model { ZoneHVACFourPipeFanCoil(const Model& model, Schedule& availabilitySchedule, HVACComponent& supplyAirFan, HVACComponent& coolingCoil, HVACComponent& heatingCoil); - virtual ~ZoneHVACFourPipeFanCoil() = default; + virtual ~ZoneHVACFourPipeFanCoil() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACFourPipeFanCoil(const ZoneHVACFourPipeFanCoil& other) = default; ZoneHVACFourPipeFanCoil(ZoneHVACFourPipeFanCoil&& other) = default; diff --git a/src/model/ZoneHVACFourPipeFanCoil_Impl.hpp b/src/model/ZoneHVACFourPipeFanCoil_Impl.hpp index 3331d21899a..72da86650d2 100644 --- a/src/model/ZoneHVACFourPipeFanCoil_Impl.hpp +++ b/src/model/ZoneHVACFourPipeFanCoil_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ZoneHVACFourPipeFanCoil_Impl(const ZoneHVACFourPipeFanCoil_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACFourPipeFanCoil_Impl() = default; + virtual ~ZoneHVACFourPipeFanCoil_Impl() override = default; //@} diff --git a/src/model/ZoneHVACHighTemperatureRadiant.hpp b/src/model/ZoneHVACHighTemperatureRadiant.hpp index 34991412292..7a9b753724f 100644 --- a/src/model/ZoneHVACHighTemperatureRadiant.hpp +++ b/src/model/ZoneHVACHighTemperatureRadiant.hpp @@ -31,7 +31,7 @@ namespace model { explicit ZoneHVACHighTemperatureRadiant(const Model& model); - virtual ~ZoneHVACHighTemperatureRadiant() = default; + virtual ~ZoneHVACHighTemperatureRadiant() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACHighTemperatureRadiant(const ZoneHVACHighTemperatureRadiant& other) = default; ZoneHVACHighTemperatureRadiant(ZoneHVACHighTemperatureRadiant&& other) = default; diff --git a/src/model/ZoneHVACHighTemperatureRadiant_Impl.hpp b/src/model/ZoneHVACHighTemperatureRadiant_Impl.hpp index 5d02abad1a1..a7ddc1f2695 100644 --- a/src/model/ZoneHVACHighTemperatureRadiant_Impl.hpp +++ b/src/model/ZoneHVACHighTemperatureRadiant_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ZoneHVACHighTemperatureRadiant_Impl(const ZoneHVACHighTemperatureRadiant_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACHighTemperatureRadiant_Impl() = default; + virtual ~ZoneHVACHighTemperatureRadiant_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACIdealLoadsAirSystem.hpp b/src/model/ZoneHVACIdealLoadsAirSystem.hpp index 100db4b7de4..db91c1491b3 100644 --- a/src/model/ZoneHVACIdealLoadsAirSystem.hpp +++ b/src/model/ZoneHVACIdealLoadsAirSystem.hpp @@ -32,7 +32,7 @@ namespace model { explicit ZoneHVACIdealLoadsAirSystem(const Model& model); - virtual ~ZoneHVACIdealLoadsAirSystem() = default; + virtual ~ZoneHVACIdealLoadsAirSystem() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACIdealLoadsAirSystem(const ZoneHVACIdealLoadsAirSystem& other) = default; ZoneHVACIdealLoadsAirSystem(ZoneHVACIdealLoadsAirSystem&& other) = default; diff --git a/src/model/ZoneHVACIdealLoadsAirSystem_Impl.hpp b/src/model/ZoneHVACIdealLoadsAirSystem_Impl.hpp index 629efc444db..bee8f31860e 100644 --- a/src/model/ZoneHVACIdealLoadsAirSystem_Impl.hpp +++ b/src/model/ZoneHVACIdealLoadsAirSystem_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ZoneHVACIdealLoadsAirSystem_Impl(const ZoneHVACIdealLoadsAirSystem_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACIdealLoadsAirSystem_Impl() = default; + virtual ~ZoneHVACIdealLoadsAirSystem_Impl() override = default; //@} diff --git a/src/model/ZoneHVACLowTempRadiantConstFlow.hpp b/src/model/ZoneHVACLowTempRadiantConstFlow.hpp index 8785579b9a1..d672c37355a 100644 --- a/src/model/ZoneHVACLowTempRadiantConstFlow.hpp +++ b/src/model/ZoneHVACLowTempRadiantConstFlow.hpp @@ -38,7 +38,7 @@ namespace model { // Ctor with hydronicTubingLength autosized ZoneHVACLowTempRadiantConstFlow(const Model& model, Schedule& availabilitySchedule, HVACComponent& heatingCoil, HVACComponent& coolingCoil); - virtual ~ZoneHVACLowTempRadiantConstFlow() = default; + virtual ~ZoneHVACLowTempRadiantConstFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACLowTempRadiantConstFlow(const ZoneHVACLowTempRadiantConstFlow& other) = default; ZoneHVACLowTempRadiantConstFlow(ZoneHVACLowTempRadiantConstFlow&& other) = default; diff --git a/src/model/ZoneHVACLowTempRadiantConstFlow_Impl.hpp b/src/model/ZoneHVACLowTempRadiantConstFlow_Impl.hpp index c168907edc1..d7082f04bb7 100644 --- a/src/model/ZoneHVACLowTempRadiantConstFlow_Impl.hpp +++ b/src/model/ZoneHVACLowTempRadiantConstFlow_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ZoneHVACLowTempRadiantConstFlow_Impl(const ZoneHVACLowTempRadiantConstFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACLowTempRadiantConstFlow_Impl() = default; + virtual ~ZoneHVACLowTempRadiantConstFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACLowTempRadiantVarFlow.hpp b/src/model/ZoneHVACLowTempRadiantVarFlow.hpp index f9441491967..730e6addbec 100644 --- a/src/model/ZoneHVACLowTempRadiantVarFlow.hpp +++ b/src/model/ZoneHVACLowTempRadiantVarFlow.hpp @@ -37,7 +37,7 @@ namespace model { // This constructor defaults the availabilitySchedule to alwaysOnDiscrete, and **does not set any heating nor cooling coil** explicit ZoneHVACLowTempRadiantVarFlow(const Model& model); - virtual ~ZoneHVACLowTempRadiantVarFlow() = default; + virtual ~ZoneHVACLowTempRadiantVarFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACLowTempRadiantVarFlow(const ZoneHVACLowTempRadiantVarFlow& other) = default; ZoneHVACLowTempRadiantVarFlow(ZoneHVACLowTempRadiantVarFlow&& other) = default; diff --git a/src/model/ZoneHVACLowTempRadiantVarFlow_Impl.hpp b/src/model/ZoneHVACLowTempRadiantVarFlow_Impl.hpp index dcf242fb51c..c748a6c1aea 100644 --- a/src/model/ZoneHVACLowTempRadiantVarFlow_Impl.hpp +++ b/src/model/ZoneHVACLowTempRadiantVarFlow_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ZoneHVACLowTempRadiantVarFlow_Impl(const ZoneHVACLowTempRadiantVarFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACLowTempRadiantVarFlow_Impl() = default; + virtual ~ZoneHVACLowTempRadiantVarFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACLowTemperatureRadiantElectric.hpp b/src/model/ZoneHVACLowTemperatureRadiantElectric.hpp index 8a92d0283b7..09a10a518b4 100644 --- a/src/model/ZoneHVACLowTemperatureRadiantElectric.hpp +++ b/src/model/ZoneHVACLowTemperatureRadiantElectric.hpp @@ -33,7 +33,7 @@ namespace model { explicit ZoneHVACLowTemperatureRadiantElectric(const Model& model, Schedule& availabilitySchedule, Schedule& heatingTemperatureSchedule); - virtual ~ZoneHVACLowTemperatureRadiantElectric() = default; + virtual ~ZoneHVACLowTemperatureRadiantElectric() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACLowTemperatureRadiantElectric(const ZoneHVACLowTemperatureRadiantElectric& other) = default; ZoneHVACLowTemperatureRadiantElectric(ZoneHVACLowTemperatureRadiantElectric&& other) = default; diff --git a/src/model/ZoneHVACLowTemperatureRadiantElectric_Impl.hpp b/src/model/ZoneHVACLowTemperatureRadiantElectric_Impl.hpp index 9c7865eebac..0c7f61ea604 100644 --- a/src/model/ZoneHVACLowTemperatureRadiantElectric_Impl.hpp +++ b/src/model/ZoneHVACLowTemperatureRadiantElectric_Impl.hpp @@ -31,7 +31,7 @@ namespace model { ZoneHVACLowTemperatureRadiantElectric_Impl(const ZoneHVACLowTemperatureRadiantElectric_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACLowTemperatureRadiantElectric_Impl() = default; + virtual ~ZoneHVACLowTemperatureRadiantElectric_Impl() override = default; virtual unsigned inletPort() const override; diff --git a/src/model/ZoneHVACPackagedTerminalAirConditioner.hpp b/src/model/ZoneHVACPackagedTerminalAirConditioner.hpp index ed78dd39d5b..ebb3e704408 100644 --- a/src/model/ZoneHVACPackagedTerminalAirConditioner.hpp +++ b/src/model/ZoneHVACPackagedTerminalAirConditioner.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACPackagedTerminalAirConditioner(const Model& model, Schedule& availabilitySchedule, HVACComponent& supplyAirFan, HVACComponent& heatingCoil, HVACComponent& coolingCoil); - virtual ~ZoneHVACPackagedTerminalAirConditioner() = default; + virtual ~ZoneHVACPackagedTerminalAirConditioner() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACPackagedTerminalAirConditioner(const ZoneHVACPackagedTerminalAirConditioner& other) = default; ZoneHVACPackagedTerminalAirConditioner(ZoneHVACPackagedTerminalAirConditioner&& other) = default; diff --git a/src/model/ZoneHVACPackagedTerminalAirConditioner_Impl.hpp b/src/model/ZoneHVACPackagedTerminalAirConditioner_Impl.hpp index c1d17a67676..73a86500349 100644 --- a/src/model/ZoneHVACPackagedTerminalAirConditioner_Impl.hpp +++ b/src/model/ZoneHVACPackagedTerminalAirConditioner_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACPackagedTerminalAirConditioner_Impl(const ZoneHVACPackagedTerminalAirConditioner_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACPackagedTerminalAirConditioner_Impl() = default; + virtual ~ZoneHVACPackagedTerminalAirConditioner_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACPackagedTerminalHeatPump.hpp b/src/model/ZoneHVACPackagedTerminalHeatPump.hpp index f4bef0ca580..bc5de9d325f 100644 --- a/src/model/ZoneHVACPackagedTerminalHeatPump.hpp +++ b/src/model/ZoneHVACPackagedTerminalHeatPump.hpp @@ -33,7 +33,7 @@ namespace model { ZoneHVACPackagedTerminalHeatPump(const Model& model, Schedule& availabilitySchedule, HVACComponent& supplyAirFan, HVACComponent& heatingCoil, HVACComponent& coolingCoil, HVACComponent& supplementalHeatingCoil); - virtual ~ZoneHVACPackagedTerminalHeatPump() = default; + virtual ~ZoneHVACPackagedTerminalHeatPump() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACPackagedTerminalHeatPump(const ZoneHVACPackagedTerminalHeatPump& other) = default; ZoneHVACPackagedTerminalHeatPump(ZoneHVACPackagedTerminalHeatPump&& other) = default; diff --git a/src/model/ZoneHVACPackagedTerminalHeatPump_Impl.hpp b/src/model/ZoneHVACPackagedTerminalHeatPump_Impl.hpp index 976cdf7d850..00d30fe1534 100644 --- a/src/model/ZoneHVACPackagedTerminalHeatPump_Impl.hpp +++ b/src/model/ZoneHVACPackagedTerminalHeatPump_Impl.hpp @@ -33,7 +33,7 @@ namespace model { ZoneHVACPackagedTerminalHeatPump_Impl(const ZoneHVACPackagedTerminalHeatPump_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACPackagedTerminalHeatPump_Impl() = default; + virtual ~ZoneHVACPackagedTerminalHeatPump_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow.hpp b/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow.hpp index c326d616d0e..60a3b3512f4 100644 --- a/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow.hpp +++ b/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow.hpp @@ -42,7 +42,7 @@ namespace model { const CoilHeatingDXVariableRefrigerantFlowFluidTemperatureControl& heatingCoil, const HVACComponent& fan); - virtual ~ZoneHVACTerminalUnitVariableRefrigerantFlow() = default; + virtual ~ZoneHVACTerminalUnitVariableRefrigerantFlow() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACTerminalUnitVariableRefrigerantFlow(const ZoneHVACTerminalUnitVariableRefrigerantFlow& other) = default; ZoneHVACTerminalUnitVariableRefrigerantFlow(ZoneHVACTerminalUnitVariableRefrigerantFlow&& other) = default; diff --git a/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl.hpp b/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl.hpp index 4536d69c86b..4fc7a6ed3fa 100644 --- a/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl.hpp +++ b/src/model/ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl.hpp @@ -34,7 +34,7 @@ namespace model { ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl(const ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl() = default; + virtual ~ZoneHVACTerminalUnitVariableRefrigerantFlow_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACUnitHeater.hpp b/src/model/ZoneHVACUnitHeater.hpp index bf2c1d44f9c..7284e3a8700 100644 --- a/src/model/ZoneHVACUnitHeater.hpp +++ b/src/model/ZoneHVACUnitHeater.hpp @@ -31,7 +31,7 @@ namespace model { ZoneHVACUnitHeater(const Model& model, Schedule& availabilitySchedule, HVACComponent& supplyAirFan, HVACComponent& heatingCoil); - virtual ~ZoneHVACUnitHeater() = default; + virtual ~ZoneHVACUnitHeater() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACUnitHeater(const ZoneHVACUnitHeater& other) = default; ZoneHVACUnitHeater(ZoneHVACUnitHeater&& other) = default; diff --git a/src/model/ZoneHVACUnitHeater_Impl.hpp b/src/model/ZoneHVACUnitHeater_Impl.hpp index 64daf742886..5581a273f35 100644 --- a/src/model/ZoneHVACUnitHeater_Impl.hpp +++ b/src/model/ZoneHVACUnitHeater_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ZoneHVACUnitHeater_Impl(const ZoneHVACUnitHeater_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACUnitHeater_Impl() = default; + virtual ~ZoneHVACUnitHeater_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACUnitVentilator.hpp b/src/model/ZoneHVACUnitVentilator.hpp index 135a6434230..fa6ad6b90ec 100644 --- a/src/model/ZoneHVACUnitVentilator.hpp +++ b/src/model/ZoneHVACUnitVentilator.hpp @@ -33,7 +33,7 @@ namespace model { explicit ZoneHVACUnitVentilator(const Model& model, const HVACComponent& supplyAirFan); - virtual ~ZoneHVACUnitVentilator() = default; + virtual ~ZoneHVACUnitVentilator() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACUnitVentilator(const ZoneHVACUnitVentilator& other) = default; ZoneHVACUnitVentilator(ZoneHVACUnitVentilator&& other) = default; diff --git a/src/model/ZoneHVACUnitVentilator_Impl.hpp b/src/model/ZoneHVACUnitVentilator_Impl.hpp index 3ac61ffca28..1df51f3dcec 100644 --- a/src/model/ZoneHVACUnitVentilator_Impl.hpp +++ b/src/model/ZoneHVACUnitVentilator_Impl.hpp @@ -30,7 +30,7 @@ namespace model { ZoneHVACUnitVentilator_Impl(const ZoneHVACUnitVentilator_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACUnitVentilator_Impl() = default; + virtual ~ZoneHVACUnitVentilator_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneHVACWaterToAirHeatPump.hpp b/src/model/ZoneHVACWaterToAirHeatPump.hpp index f8407ec95bb..9458a31b23b 100644 --- a/src/model/ZoneHVACWaterToAirHeatPump.hpp +++ b/src/model/ZoneHVACWaterToAirHeatPump.hpp @@ -35,7 +35,7 @@ namespace model { ZoneHVACWaterToAirHeatPump(const Model& model, Schedule& availabilitySchedule, HVACComponent& supplyAirFan, HVACComponent& heatingCoil, HVACComponent& coolingCoil, HVACComponent& supplementalHeatingCoil); - virtual ~ZoneHVACWaterToAirHeatPump() = default; + virtual ~ZoneHVACWaterToAirHeatPump() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneHVACWaterToAirHeatPump(const ZoneHVACWaterToAirHeatPump& other) = default; ZoneHVACWaterToAirHeatPump(ZoneHVACWaterToAirHeatPump&& other) = default; diff --git a/src/model/ZoneHVACWaterToAirHeatPump_Impl.hpp b/src/model/ZoneHVACWaterToAirHeatPump_Impl.hpp index 30e3f68d371..a9f1e15c8b1 100644 --- a/src/model/ZoneHVACWaterToAirHeatPump_Impl.hpp +++ b/src/model/ZoneHVACWaterToAirHeatPump_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneHVACWaterToAirHeatPump_Impl(const ZoneHVACWaterToAirHeatPump_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneHVACWaterToAirHeatPump_Impl() = default; + virtual ~ZoneHVACWaterToAirHeatPump_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneMixing.hpp b/src/model/ZoneMixing.hpp index c8386c4814b..068b09dbd6c 100644 --- a/src/model/ZoneMixing.hpp +++ b/src/model/ZoneMixing.hpp @@ -35,7 +35,7 @@ namespace model { explicit ZoneMixing(const ThermalZone& thermalZone); explicit ZoneMixing(const Space& space); - virtual ~ZoneMixing() = default; + virtual ~ZoneMixing() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneMixing(const ZoneMixing& other) = default; ZoneMixing(ZoneMixing&& other) = default; diff --git a/src/model/ZoneMixing_Impl.hpp b/src/model/ZoneMixing_Impl.hpp index 28032a1edb6..d7bb8dd1180 100644 --- a/src/model/ZoneMixing_Impl.hpp +++ b/src/model/ZoneMixing_Impl.hpp @@ -32,7 +32,7 @@ namespace model { ZoneMixing_Impl(const ZoneMixing_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneMixing_Impl() = default; + virtual ~ZoneMixing_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZonePropertyUserViewFactorsBySurfaceName.hpp b/src/model/ZonePropertyUserViewFactorsBySurfaceName.hpp index d5409f22756..825c42bd725 100644 --- a/src/model/ZonePropertyUserViewFactorsBySurfaceName.hpp +++ b/src/model/ZonePropertyUserViewFactorsBySurfaceName.hpp @@ -68,7 +68,7 @@ class InternalMass; */ */ explicit ZonePropertyUserViewFactorsBySurfaceName(const ThermalZone& thermalZone); - virtual ~ZonePropertyUserViewFactorsBySurfaceName() = default; + virtual ~ZonePropertyUserViewFactorsBySurfaceName() override = default; // Default the copy and move operators because the virtual dtor is explicit ZonePropertyUserViewFactorsBySurfaceName(const ZonePropertyUserViewFactorsBySurfaceName& other) = default; ZonePropertyUserViewFactorsBySurfaceName(ZonePropertyUserViewFactorsBySurfaceName&& other) = default; diff --git a/src/model/ZonePropertyUserViewFactorsBySurfaceName_Impl.hpp b/src/model/ZonePropertyUserViewFactorsBySurfaceName_Impl.hpp index 66e4e6e01e5..1906f3b91b1 100644 --- a/src/model/ZonePropertyUserViewFactorsBySurfaceName_Impl.hpp +++ b/src/model/ZonePropertyUserViewFactorsBySurfaceName_Impl.hpp @@ -35,7 +35,7 @@ namespace model { ZonePropertyUserViewFactorsBySurfaceName_Impl(const ZonePropertyUserViewFactorsBySurfaceName_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZonePropertyUserViewFactorsBySurfaceName_Impl() = default; + virtual ~ZonePropertyUserViewFactorsBySurfaceName_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneVentilationDesignFlowRate.hpp b/src/model/ZoneVentilationDesignFlowRate.hpp index efed0197ceb..484a086290a 100644 --- a/src/model/ZoneVentilationDesignFlowRate.hpp +++ b/src/model/ZoneVentilationDesignFlowRate.hpp @@ -30,7 +30,7 @@ namespace model { explicit ZoneVentilationDesignFlowRate(const Model& model); - virtual ~ZoneVentilationDesignFlowRate() = default; + virtual ~ZoneVentilationDesignFlowRate() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneVentilationDesignFlowRate(const ZoneVentilationDesignFlowRate& other) = default; ZoneVentilationDesignFlowRate(ZoneVentilationDesignFlowRate&& other) = default; diff --git a/src/model/ZoneVentilationDesignFlowRate_Impl.hpp b/src/model/ZoneVentilationDesignFlowRate_Impl.hpp index b491a0e3cdd..10c8f3e2b79 100644 --- a/src/model/ZoneVentilationDesignFlowRate_Impl.hpp +++ b/src/model/ZoneVentilationDesignFlowRate_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ZoneVentilationDesignFlowRate_Impl(const ZoneVentilationDesignFlowRate_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneVentilationDesignFlowRate_Impl() = default; + virtual ~ZoneVentilationDesignFlowRate_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/ZoneVentilationWindandStackOpenArea.hpp b/src/model/ZoneVentilationWindandStackOpenArea.hpp index 340602dcc85..e329687bed8 100644 --- a/src/model/ZoneVentilationWindandStackOpenArea.hpp +++ b/src/model/ZoneVentilationWindandStackOpenArea.hpp @@ -30,7 +30,7 @@ namespace model { explicit ZoneVentilationWindandStackOpenArea(const Model& model); - virtual ~ZoneVentilationWindandStackOpenArea() = default; + virtual ~ZoneVentilationWindandStackOpenArea() override = default; // Default the copy and move operators because the virtual dtor is explicit ZoneVentilationWindandStackOpenArea(const ZoneVentilationWindandStackOpenArea& other) = default; ZoneVentilationWindandStackOpenArea(ZoneVentilationWindandStackOpenArea&& other) = default; diff --git a/src/model/ZoneVentilationWindandStackOpenArea_Impl.hpp b/src/model/ZoneVentilationWindandStackOpenArea_Impl.hpp index 8833804c9fd..8463e4cc31d 100644 --- a/src/model/ZoneVentilationWindandStackOpenArea_Impl.hpp +++ b/src/model/ZoneVentilationWindandStackOpenArea_Impl.hpp @@ -29,7 +29,7 @@ namespace model { ZoneVentilationWindandStackOpenArea_Impl(const ZoneVentilationWindandStackOpenArea_Impl& other, Model_Impl* model, bool keepHandle); - virtual ~ZoneVentilationWindandStackOpenArea_Impl() = default; + virtual ~ZoneVentilationWindandStackOpenArea_Impl() override = default; //@} /** @name Virtual Methods */ diff --git a/src/model/test/GroundHeatExchangerVertical_GTest.cpp b/src/model/test/GroundHeatExchangerVertical_GTest.cpp index 71d4db28d52..d89e056cfc6 100644 --- a/src/model/test/GroundHeatExchangerVertical_GTest.cpp +++ b/src/model/test/GroundHeatExchangerVertical_GTest.cpp @@ -16,7 +16,6 @@ #include "../Node.hpp" #include "../Node_Impl.hpp" #include "../AirLoopHVACZoneSplitter.hpp" -#include "OpenStudio.hxx" using namespace openstudio; using namespace openstudio::model; diff --git a/src/nano/nano_observer.hpp b/src/nano/nano_observer.hpp index 8388b61c54e..a92b5b68fcd 100644 --- a/src/nano/nano_observer.hpp +++ b/src/nano/nano_observer.hpp @@ -28,6 +28,7 @@ class Observer head = new SSNode{{key, obs}, head}; } + // cppcheck-suppress constParameterPointer void remove(DelegateKey const& key, Observer* obs) { SSNode* node = head; SSNode* prev = nullptr; diff --git a/src/utilities/bcl/BCLMeasure.cpp b/src/utilities/bcl/BCLMeasure.cpp index e968c609d6e..07202197325 100644 --- a/src/utilities/bcl/BCLMeasure.cpp +++ b/src/utilities/bcl/BCLMeasure.cpp @@ -177,9 +177,6 @@ BCLMeasure::BCLMeasure(const std::string& name, const std::string& className, co std::string testTemplate; std::string templateClassName; - std::string templateName = "NAME_TEXT"; - std::string templateDescription = "DESCRIPTION_TEXT"; - std::string templateModelerDescription = "MODELER_DESCRIPTION_TEXT"; std::vector arguments; std::vector outputs; std::string testOSM; @@ -257,6 +254,9 @@ BCLMeasure::BCLMeasure(const std::string& name, const std::string& className, co if (!measureTemplate.empty()) { measureString = ::openstudio::embedded_files::getFileAsString(measureTemplate); boost::replace_all(measureString, templateClassName, className); + std::string templateName = "NAME_TEXT"; + std::string templateDescription = "DESCRIPTION_TEXT"; + std::string templateModelerDescription = "MODELER_DESCRIPTION_TEXT"; boost::replace_all(measureString, templateName, name); boost::replace_all(measureString, templateModelerDescription, modelerDescription); // put first as this includes description tag boost::replace_all(measureString, templateDescription, description); @@ -823,7 +823,6 @@ bool BCLMeasure::updateMeasureScript(const MeasureType& oldMeasureType, const Me boost::optional rubyScriptPath_ = primaryRubyScriptPath(); if (rubyScriptPath_ && exists(*rubyScriptPath_)) { - std::string fileString; openstudio::filesystem::ifstream file(*rubyScriptPath_, std::ios_base::binary); if (file.is_open()) { @@ -832,7 +831,7 @@ bool BCLMeasure::updateMeasureScript(const MeasureType& oldMeasureType, const Me std::string descriptionFunction = "$1def description\n$1 return \"" + description + "\"\n$1end"; std::string modelerDescriptionFunction = "$1def modeler_description\n$1 return \"" + modelerDescription + "\"\n$1end"; - fileString = openstudio::filesystem::read_as_string(file); + std::string fileString = openstudio::filesystem::read_as_string(file); boost::regex re; diff --git a/src/utilities/bcl/LocalBCL.cpp b/src/utilities/bcl/LocalBCL.cpp index c74f8d7041b..933b74bd367 100644 --- a/src/utilities/bcl/LocalBCL.cpp +++ b/src/utilities/bcl/LocalBCL.cpp @@ -989,7 +989,7 @@ std::vector LocalBCL::searchMeasures(const std::string& searchTerm, /// Class members -// cppcheck-suppress constParameter +// cppcheck-suppress constParameterReference bool LocalBCL::addComponent(BCLComponent& component) { //Check for uid if ((m_db != nullptr) && !component.uid().empty() && !component.versionId().empty()) { @@ -1103,7 +1103,7 @@ bool LocalBCL::addComponent(BCLComponent& component) { return false; } -// cppcheck-suppress constParameter +// cppcheck-suppress constParameterReference bool LocalBCL::removeComponent(BCLComponent& component) { // if uid is empty or not found in database return false if ((m_db == nullptr) || component.uid().empty() || component.versionId().empty()) { @@ -1175,7 +1175,7 @@ bool LocalBCL::removeComponent(BCLComponent& component) { return true; } -// cppcheck-suppress constParameter +// cppcheck-suppress constParameterReference bool LocalBCL::addMeasure(BCLMeasure& measure) { // if uid is empty or not found in database return false @@ -1286,7 +1286,7 @@ bool LocalBCL::addMeasure(BCLMeasure& measure) { return commitTransaction(); } -// cppcheck-suppress constParameter +// cppcheck-suppress constParameterReference bool LocalBCL::removeMeasure(BCLMeasure& measure) { // if uid is empty if ((m_db == nullptr) || measure.uid().empty() || measure.versionId().empty()) { diff --git a/src/utilities/bcl/LocalBCL.hpp b/src/utilities/bcl/LocalBCL.hpp index 586927d2605..7c9dd8601c8 100644 --- a/src/utilities/bcl/LocalBCL.hpp +++ b/src/utilities/bcl/LocalBCL.hpp @@ -47,7 +47,7 @@ class UTILITIES_API LocalBCL : public BCL static void close(); /// virtual destructor - virtual ~LocalBCL(); + virtual ~LocalBCL() override; //@} /** @name Inherited members */ @@ -71,6 +71,7 @@ class UTILITIES_API LocalBCL : public BCL // TODO: make this take a vector of remote bcl filters /// Perform a component search of the library std::vector searchComponents(const std::string& searchTerm, const std::string& componentType) const; + // cppcheck-suppress functionStatic std::vector searchComponents(const std::string& searchTerm, const unsigned componentTypeTID) const; // TODO: make this take a vector of remote bcl filters diff --git a/src/utilities/bcl/RemoteBCL.hpp b/src/utilities/bcl/RemoteBCL.hpp index a7fc975119b..8e7c59941b2 100644 --- a/src/utilities/bcl/RemoteBCL.hpp +++ b/src/utilities/bcl/RemoteBCL.hpp @@ -55,7 +55,7 @@ class UTILITIES_API RemoteBCL : public BCL //@{ /// Virtual destructor - virtual ~RemoteBCL() = default; + virtual ~RemoteBCL() override = default; //@} /** @name Inherited members */ diff --git a/src/utilities/bcl/test/BCLMeasure_GTest.cpp b/src/utilities/bcl/test/BCLMeasure_GTest.cpp index 413e6835fab..cbceba6efeb 100644 --- a/src/utilities/bcl/test/BCLMeasure_GTest.cpp +++ b/src/utilities/bcl/test/BCLMeasure_GTest.cpp @@ -10,11 +10,12 @@ #include "../BCLXML.hpp" #include "../../core/ApplicationPathHelpers.hpp" #include "../../core/PathHelpers.hpp" -#include "utilities/core/Filesystem.hpp" +#include "../../core/Filesystem.hpp" + +#include #include #include -#include using namespace openstudio; namespace fs = openstudio::filesystem; diff --git a/src/utilities/bcl/test/BCLXML_GTest.cpp b/src/utilities/bcl/test/BCLXML_GTest.cpp index 5f3db76e1c1..d55be196758 100644 --- a/src/utilities/bcl/test/BCLXML_GTest.cpp +++ b/src/utilities/bcl/test/BCLXML_GTest.cpp @@ -109,7 +109,7 @@ TEST_F(BCLFixture, BCLXML_New) { EXPECT_TRUE(bclXMLValidator.validate(xmlPath)); EXPECT_EQ(0, bclXMLValidator.errors().size()) << [&bclXMLValidator]() { std::string s; - for (auto& logMessage : bclXMLValidator.errors()) { + for (const auto& logMessage : bclXMLValidator.errors()) { s += logMessage.logMessage() + "\n"; } return s; @@ -171,7 +171,7 @@ TEST_F(BCLFixture, BCLXML_validation_historical) { EXPECT_TRUE(bclXMLValidator.validate(xmlPath)); EXPECT_EQ(0, bclXMLValidator.errors().size()) << [&bclXMLValidator]() { std::string s; - for (auto& logMessage : bclXMLValidator.errors()) { + for (const auto& logMessage : bclXMLValidator.errors()) { s += logMessage.logMessage() + "\n"; } return s; @@ -186,7 +186,7 @@ TEST_F(BCLFixture, BCLXML_validation_historical) { EXPECT_EQ(2, bclXMLValidator.errors().size()) << [&bclXMLValidator]() { std::string s; - for (auto& logMessage : bclXMLValidator.errors()) { + for (const auto& logMessage : bclXMLValidator.errors()) { s += logMessage.logMessage() + "\n"; } return s; diff --git a/src/utilities/core/Enum.hpp b/src/utilities/core/Enum.hpp index 3253934b617..a19ced97973 100644 --- a/src/utilities/core/Enum.hpp +++ b/src/utilities/core/Enum.hpp @@ -107,7 +107,7 @@ return BOOST_PP_STRINGIZE(_enum_name); \ } \ domain value() const { \ - return static_cast(EnumBase<_enum_name>::value()); \ + return static_cast(EnumBase<_enum_name>::integer_value()); \ } \ \ private: \ @@ -241,7 +241,7 @@ * * domain value() const * { - * return static_cast(EnumBase::value()); + * return static_cast(EnumBase::integer_value()); * } * * private: diff --git a/src/utilities/core/EnumBase.hpp b/src/utilities/core/EnumBase.hpp index d35998683b1..55d7750a099 100644 --- a/src/utilities/core/EnumBase.hpp +++ b/src/utilities/core/EnumBase.hpp @@ -64,7 +64,7 @@ class EnumBase : public ::StaticInitializer } /** Returns this instance's current value (as an integer). */ - int value() const { + int integer_value() const { return m_value; } diff --git a/src/utilities/core/FileLogSink_Impl.hpp b/src/utilities/core/FileLogSink_Impl.hpp index 712253cebad..10bfe6e6d58 100644 --- a/src/utilities/core/FileLogSink_Impl.hpp +++ b/src/utilities/core/FileLogSink_Impl.hpp @@ -23,7 +23,7 @@ namespace detail { FileLogSink_Impl(const openstudio::path& path); /// destructor, does not disable log sink - virtual ~FileLogSink_Impl(); + virtual ~FileLogSink_Impl() override; /// returns the path that log messages are written to openstudio::path path() const; diff --git a/src/utilities/core/LogSink_Impl.hpp b/src/utilities/core/LogSink_Impl.hpp index 16e671ea984..766a94aa398 100644 --- a/src/utilities/core/LogSink_Impl.hpp +++ b/src/utilities/core/LogSink_Impl.hpp @@ -30,9 +30,11 @@ namespace detail { bool isEnabled() const; /// enable the sink + // cppcheck-suppress functionConst void enable(); /// disable the sink + // cppcheck-suppress functionConst void disable(); /// get the logging level diff --git a/src/utilities/core/PathHelpers.cpp b/src/utilities/core/PathHelpers.cpp index 433c9569cde..b4e9339260f 100644 --- a/src/utilities/core/PathHelpers.cpp +++ b/src/utilities/core/PathHelpers.cpp @@ -428,6 +428,7 @@ bool isNetworkPath(const path& p) { } bool isNetworkPathAvailable(const path& p) { + // cppcheck-suppress knownConditionTrueFalse if (!isNetworkPath(p)) { return false; } diff --git a/src/utilities/core/StringStreamLogSink_Impl.hpp b/src/utilities/core/StringStreamLogSink_Impl.hpp index 741f07e17c2..abcf518b879 100644 --- a/src/utilities/core/StringStreamLogSink_Impl.hpp +++ b/src/utilities/core/StringStreamLogSink_Impl.hpp @@ -21,7 +21,7 @@ namespace detail { StringStreamLogSink_Impl(); /// destructor, disables log sink - virtual ~StringStreamLogSink_Impl(); + virtual ~StringStreamLogSink_Impl() override; /// get the string stream's content std::string string() const; diff --git a/src/utilities/core/benchmark/Zip_Benchmark.cpp b/src/utilities/core/benchmark/Zip_Benchmark.cpp index cb6dc9ed75c..c58ea495739 100644 --- a/src/utilities/core/benchmark/Zip_Benchmark.cpp +++ b/src/utilities/core/benchmark/Zip_Benchmark.cpp @@ -5,9 +5,10 @@ #include -#include "../UnzipFile.hpp" +#include "../FilesystemHelpers.hpp" #include "../Path.hpp" -#include "utilities/core/FilesystemHelpers.hpp" +#include "../UnzipFile.hpp" + #include #include diff --git a/src/utilities/core/test/Containers_GTest.cpp b/src/utilities/core/test/Containers_GTest.cpp index 24e662d2ea1..5f7bfb4113c 100644 --- a/src/utilities/core/test/Containers_GTest.cpp +++ b/src/utilities/core/test/Containers_GTest.cpp @@ -61,8 +61,11 @@ class X_Impl private: std::string i; + // cppcheck-suppress unusedStructMember std::string j; + // cppcheck-suppress unusedStructMember std::string k; + // cppcheck-suppress unusedStructMember std::string l; static size_t count; }; diff --git a/src/utilities/core/test/Enum_GTest.cpp b/src/utilities/core/test/Enum_GTest.cpp index 5d3c9af5d80..276955daac8 100644 --- a/src/utilities/core/test/Enum_GTest.cpp +++ b/src/utilities/core/test/Enum_GTest.cpp @@ -30,6 +30,7 @@ TEST(Enum, EnumThrows) { EXPECT_THROW(openstudio::enums::TestEnum("forth"), std::runtime_error); // #1741, we expect an informative error message try { + // cppcheck-suppress unusedScopedObject openstudio::enums::TestEnum("forth"); } catch (std::runtime_error& e) { std::string expectedErrorMessage("Unknown OpenStudio Enum Value 'FORTH' for Enum TestEnum"); @@ -39,6 +40,7 @@ TEST(Enum, EnumThrows) { EXPECT_NO_THROW(openstudio::enums::TestEnum("third")); EXPECT_THROW(openstudio::enums::TestEnum(3), std::runtime_error); try { + // cppcheck-suppress unusedScopedObject openstudio::enums::TestEnum(3); } catch (std::runtime_error& e) { std::string expectedErrorMessage("Unknown OpenStudio Enum Value = 3 for Enum TestEnum"); diff --git a/src/utilities/core/test/Path_GTest.cpp b/src/utilities/core/test/Path_GTest.cpp index 306b7625cb6..87efc5325a4 100644 --- a/src/utilities/core/test/Path_GTest.cpp +++ b/src/utilities/core/test/Path_GTest.cpp @@ -11,7 +11,6 @@ #include "../Path.hpp" #include "../PathHelpers.hpp" #include "../Filesystem.hpp" -#include "utilities/sql/SqlFileDataDictionary.hpp" #include diff --git a/src/utilities/data/Attribute.cpp b/src/utilities/data/Attribute.cpp index 35bb574a5bf..53cc2922d3f 100644 --- a/src/utilities/data/Attribute.cpp +++ b/src/utilities/data/Attribute.cpp @@ -1133,20 +1133,20 @@ std::ostream& operator<<(std::ostream& os, const Attribute& attribute) { return os; } -Attribute createAttributeFromVector(const std::string& name, std::vector value) { +Attribute createAttributeFromVector(const std::string& name, const std::vector& value) { AttributeVector valueAsAttributes; + valueAsAttributes.reserve(value.size()); for (int v : value) { - Attribute attribute(std::string(), v); - valueAsAttributes.push_back(attribute); + valueAsAttributes.emplace_back(std::string(), v); } return Attribute(name, valueAsAttributes); } -Attribute createAttributeFromVector(const std::string& name, std::vector value) { +Attribute createAttributeFromVector(const std::string& name, const std::vector& value) { AttributeVector valueAsAttributes; + valueAsAttributes.reserve(value.size()); for (double v : value) { - Attribute attribute(std::string(), v); - valueAsAttributes.push_back(attribute); + valueAsAttributes.emplace_back(std::string(), v); } return Attribute(name, valueAsAttributes); } diff --git a/src/utilities/data/Attribute.hpp b/src/utilities/data/Attribute.hpp index 1f4a17e74a1..d05ccd295f6 100644 --- a/src/utilities/data/Attribute.hpp +++ b/src/utilities/data/Attribute.hpp @@ -342,11 +342,11 @@ UTILITIES_API std::ostream& operator<<(std::ostream& os, const Attribute& attrib /** \relates Attribute */ // DLM: can this be a member of Attribute? -UTILITIES_API Attribute createAttributeFromVector(const std::string& name, std::vector value); +UTILITIES_API Attribute createAttributeFromVector(const std::string& name, const std::vector& value); /** \relates Attribute */ // DLM: can this be a member of Attribute? -UTILITIES_API Attribute createAttributeFromVector(const std::string& name, std::vector value); +UTILITIES_API Attribute createAttributeFromVector(const std::string& name, const std::vector& value); /** \relates Attribute */ // DLM: can this be a member of Attribute? diff --git a/src/utilities/data/CalibrationResult.cpp b/src/utilities/data/CalibrationResult.cpp index c44239b59a0..b4e9254aa31 100644 --- a/src/utilities/data/CalibrationResult.cpp +++ b/src/utilities/data/CalibrationResult.cpp @@ -270,7 +270,7 @@ boost::optional CalibrationUtilityBill::fromAttribute(co CalibrationUtilityBill::CalibrationUtilityBill( const std::string& name, const FuelType& fuelType, const InstallLocationType& meterInstallLocation, boost::optional meterSpecificInstallLocation, boost::optional meterEndUseCategory, - boost::optional meterSpecificEndUse, std::string consumptionUnit, double consumptionUnitConversionFactor, + boost::optional meterSpecificEndUse, const std::string& consumptionUnit, double consumptionUnitConversionFactor, boost::optional peakDemandUnit, boost::optional peakDemandUnitConversionFactor, boost::optional timestepsInPeakDemandWindow, boost::optional minutesInPeakDemandWindow, boost::optional numberBillingPeriodsInCalculations, boost::optional CVRMSE, boost::optional NMBE) diff --git a/src/utilities/data/CalibrationResult.hpp b/src/utilities/data/CalibrationResult.hpp index 0843fd543a2..cd4e1fb3c38 100644 --- a/src/utilities/data/CalibrationResult.hpp +++ b/src/utilities/data/CalibrationResult.hpp @@ -87,7 +87,7 @@ class UTILITIES_API CalibrationUtilityBill /// Create attribute wrapper with all required information. CalibrationUtilityBill(const std::string& name, const FuelType& fuelType, const InstallLocationType& meterInstallLocation, boost::optional meterSpecificInstallLocation, boost::optional meterEndUseCategory, - boost::optional meterSpecificEndUse, std::string consumptionUnit, double consumptionUnitConversionFactor, + boost::optional meterSpecificEndUse, const std::string& consumptionUnit, double consumptionUnitConversionFactor, boost::optional peakDemandUnit, boost::optional peakDemandUnitConversionFactor, boost::optional timestepsInPeakDemandWindow, boost::optional minutesInPeakDemandWindow, boost::optional numberBillingPeriodsInCalculations, boost::optional CVRMSE, boost::optional NMBE); @@ -129,6 +129,7 @@ class UTILITIES_API CalibrationUtilityBill std::vector billingPeriods() const; /// Add a CalibrationBillingPeriod to this CalibrationUtilityBill. + // cppcheck-suppress functionConst bool addBillingPeriod(const CalibrationBillingPeriod& billingPeriod); private: diff --git a/src/utilities/data/Test/EndUses_GTest.cpp b/src/utilities/data/Test/EndUses_GTest.cpp index 4cad4b50d2a..5eee39a6fc9 100644 --- a/src/utilities/data/Test/EndUses_GTest.cpp +++ b/src/utilities/data/Test/EndUses_GTest.cpp @@ -96,7 +96,7 @@ TEST_F(DataFixture, EndUses) { EXPECT_EQ(static_cast(2), subCategories.size()); for (const EndUseFuelType& fuelType : fuelTypes) { - std::string units = endUses.getUnitsForFuelType(fuelType); + // std::string units = endUses.getUnitsForFuelType(fuelType); for (const EndUseCategoryType& category : categories) { for (const std::string& subCategory : subCategories) { /* double value =*/endUses.getEndUse(fuelType, category, subCategory); diff --git a/src/utilities/data/TimeSeries.cpp b/src/utilities/data/TimeSeries.cpp index 5d0b2c84321..48046bea8b8 100644 --- a/src/utilities/data/TimeSeries.cpp +++ b/src/utilities/data/TimeSeries.cpp @@ -36,7 +36,7 @@ namespace detail { m_startDateTime = DateTime(startDate, Time(0)); - for (unsigned i = 0; i < values.size(); ++i) { + for (size_t i = 0; i < values.size(); ++i) { m_secondsFromFirstReport[i] = i * secondsPerInterval; m_secondsFromStart[i] = (i + 1) * secondsPerInterval; } @@ -78,7 +78,7 @@ namespace detail { m_startDateTime = m_firstReportDateTime - intervalLength; - for (unsigned i = 0; i < values.size(); ++i) { + for (size_t i = 0; i < values.size(); ++i) { m_secondsFromFirstReport[i] = i * secondsPerInterval; m_secondsFromStart[i] = (i + 1) * secondsPerInterval; } diff --git a/src/utilities/filetypes/EpwFile.hpp b/src/utilities/filetypes/EpwFile.hpp index 9419aaec04c..7d5abbc5bfd 100644 --- a/src/utilities/filetypes/EpwFile.hpp +++ b/src/utilities/filetypes/EpwFile.hpp @@ -126,7 +126,7 @@ OPENSTUDIO_ENUM(EpwComputedField, ((Density)(Density)) ((SpecificVolume)(Specific Volume)) ); -// cppcheck-suppress unknownMacro +// cppcheck-suppress [unknownMacro, syntaxError] OPENSTUDIO_ENUM(EpwDesignField, ((TitleOfDesignCondition)(Title of Design Condition)(0)) ((Blank)(Blank)) diff --git a/src/utilities/filetypes/WorkflowJSON.cpp b/src/utilities/filetypes/WorkflowJSON.cpp index d7cd60f1f20..1ba116ceea1 100644 --- a/src/utilities/filetypes/WorkflowJSON.cpp +++ b/src/utilities/filetypes/WorkflowJSON.cpp @@ -181,6 +181,7 @@ namespace detail { } bool WorkflowJSON_Impl::saveAs(const openstudio::path& p) { + // cppcheck-suppress knownConditionTrueFalse if (setOswPath(p, true)) { checkForUpdates(); return save(); diff --git a/src/utilities/floorspace/FSModel.cpp b/src/utilities/floorspace/FSModel.cpp index 8dbc4a3a5fb..a4959b4b3b7 100644 --- a/src/utilities/floorspace/FSModel.cpp +++ b/src/utilities/floorspace/FSModel.cpp @@ -628,8 +628,8 @@ void FSSpace::simplifyFace(const FSGeometry& geometry) { std::vector edgeRefs; // Create new edges for the face for (unsigned i = 0; i < simplifiedVertices.size(); i++) { - Point3d& p1 = simplifiedVertices[i]; - Point3d& p2 = simplifiedVertices[(i + 1) % simplifiedVertices.size()]; + const Point3d& p1 = simplifiedVertices[i]; + const Point3d& p2 = simplifiedVertices[(i + 1) % simplifiedVertices.size()]; auto v1 = geometry.vertex(p1); auto v2 = geometry.vertex(p2); @@ -785,6 +785,7 @@ FSEdge::FSEdge(const Json::Value& root, const FSGeometry& geometry) { load(root, geometry); } +// cppcheck-suppress constParameterReference FSEdge::FSEdge(FSVertex& v1, FSVertex& v2) { m_vertices.push_back(v1); m_vertices.push_back(v2); diff --git a/src/utilities/geometry/FloorplanJS.cpp b/src/utilities/geometry/FloorplanJS.cpp index 57b63fe0aa5..f1221dd9ea1 100644 --- a/src/utilities/geometry/FloorplanJS.cpp +++ b/src/utilities/geometry/FloorplanJS.cpp @@ -1077,9 +1077,8 @@ ThreeScene FloorplanJS::toThreeScene(bool openstudioFormat) const { Json::ArrayIndex storyN = stories.size(); for (Json::ArrayIndex storyIdx = 0; storyIdx < storyN; ++storyIdx) { - std::string storyName; if (checkKeyAndType(stories[storyIdx], "name", Json::stringValue)) { - storyName = stories[storyIdx].get("name", storyName).asString(); + std::string storyName = stories[storyIdx].get("name", storyName).asString(); buildingStoryNames.push_back(storyName); } @@ -1190,7 +1189,7 @@ ThreeScene FloorplanJS::toThreeScene(bool openstudioFormat) const { spaceFloorOffset = lengthToMeters * spaces[spaceIdx].get("floor_offset", spaceFloorOffset).asDouble(); } - bool openToBelow = false; + [[maybe_unused]] bool openToBelow = false; if (checkKeyAndType(spaces[spaceIdx], "open_to_below", Json::booleanValue)) { openToBelow = spaces[spaceIdx].get("open_to_below", openToBelow).asBool(); } @@ -1283,7 +1282,7 @@ ThreeScene FloorplanJS::toThreeScene(bool openstudioFormat) const { shadingFloorOffset = lengthToMeters * shading[shadingdx].get("floor_offset", shadingFloorOffset).asDouble(); } - bool openToBelow = false; + [[maybe_unused]] bool openToBelow = false; if (checkKeyAndType(shading[shadingdx], "open_to_below", Json::booleanValue)) { openToBelow = shading[shadingdx].get("open_to_below", openToBelow).asBool(); } diff --git a/src/utilities/geometry/FloorplanJS.hpp b/src/utilities/geometry/FloorplanJS.hpp index d00598bb8e0..ebdfbb77fb1 100644 --- a/src/utilities/geometry/FloorplanJS.hpp +++ b/src/utilities/geometry/FloorplanJS.hpp @@ -191,9 +191,9 @@ class UTILITIES_API FloorplanJS // recursively traverses through value and finds the largest id void setLastId(const Json::Value& value); - Json::Value* findByHandleString(Json::Value& value, const std::string& key, const std::string& handleString); - Json::Value* findByName(Json::Value& value, const std::string& key, const std::string& name, bool requireEmptyHandle); - Json::Value* findById(Json::Value& value, const std::string& key, const std::string& id); + static Json::Value* findByHandleString(Json::Value& value, const std::string& key, const std::string& handleString); + static Json::Value* findByName(Json::Value& value, const std::string& key, const std::string& name, bool requireEmptyHandle); + static Json::Value* findById(Json::Value& value, const std::string& key, const std::string& id); // cppcheck-suppress functionStatic const Json::Value* findById(const Json::Value& values, const std::string& id) const; diff --git a/src/utilities/geometry/Intersection.cpp b/src/utilities/geometry/Intersection.cpp index c93dc5a69d4..e9ba3c93529 100644 --- a/src/utilities/geometry/Intersection.cpp +++ b/src/utilities/geometry/Intersection.cpp @@ -609,6 +609,7 @@ std::vector removeSpikes(const std::vector& polygon, double to return result; } +// cppcheck-suppress constParameterReference bool polygonInPolygon(std::vector& points, const std::vector& polygon, double tol) { // convert vertices to boost rings diff --git a/src/utilities/geometry/Polyhedron.cpp b/src/utilities/geometry/Polyhedron.cpp index 2afd1373132..1ef5fabe79f 100644 --- a/src/utilities/geometry/Polyhedron.cpp +++ b/src/utilities/geometry/Polyhedron.cpp @@ -95,7 +95,7 @@ void Surface3dEdge::resetEdgeMatching() { m_conflictedOrientation = false; } -bool Surface3dEdge::containsPoint(const Point3d& testVertex) { +bool Surface3dEdge::containsPoint(const Point3d& testVertex) const { return !isAlmostEqual3dPt(m_start, testVertex) && !isAlmostEqual3dPt(m_end, testVertex) && isPointOnLineBetweenPoints(m_start, m_end, testVertex); } @@ -396,7 +396,7 @@ std::vector Polyhedron::edgesNotTwo(bool includeCreatedEdges) con } } } - for (auto& edge : edgesNotTwo) { + for (const auto& edge : edgesNotTwo) { LOG(Debug, edge); } @@ -443,7 +443,7 @@ std::vector Polyhedron::findSurfacesWithIncorrectOrientation() const } std::set conflictedSurfaces; - for (auto& edge : uniqueSurface3dEdges) { + for (const auto& edge : uniqueSurface3dEdges) { const auto& surfNums = edge.allSurfNums(); const size_t sfIndex1 = surfNums.front(); const size_t sfIndex2 = surfNums.back(); diff --git a/src/utilities/geometry/Polyhedron.hpp b/src/utilities/geometry/Polyhedron.hpp index df93c8ae26e..fdc39a822ef 100644 --- a/src/utilities/geometry/Polyhedron.hpp +++ b/src/utilities/geometry/Polyhedron.hpp @@ -47,7 +47,7 @@ class UTILITIES_API Surface3dEdge void appendSurface(const Surface3d& surface); // Checks whether a Point: is not almost equal to the start and end points, and that isPointOnLineBetweenPoints(start, end, testVertex) is true - bool containsPoint(const Point3d& testVertex); + bool containsPoint(const Point3d& testVertex) const; void markConflictedOrientation(); bool hasConflictedOrientation() const; diff --git a/src/utilities/geometry/RoofGeometry_Details.hpp b/src/utilities/geometry/RoofGeometry_Details.hpp index 27669288480..e7384a936ba 100644 --- a/src/utilities/geometry/RoofGeometry_Details.hpp +++ b/src/utilities/geometry/RoofGeometry_Details.hpp @@ -1294,7 +1294,6 @@ static void computeSplitEvents(std::shared_ptr vertex, const std::vector std::shared_ptr e2(new QueueEvent(oppositeEdge.point, oppositeEdge.distance, vertex, oppositeEdge.oppositeEdge)); // SplitVertexEvent QueueEvent::insert_sorted(queue, e2); - continue; } } @@ -1335,7 +1334,7 @@ static void computeEdgeEvents(std::shared_ptr previousVertex, std::share static void initEvents(std::vector>>& sLav, std::vector>& queue, const std::vector>& edges) { - for (std::vector>& lav : sLav) { + for (const std::vector>& lav : sLav) { for (const std::shared_ptr& vertex : lav) { computeSplitEvents(vertex, edges, queue, boost::none); } @@ -1561,7 +1560,7 @@ static std::vector createChains(const std::vector chains; - for (Chain& edgeChain : edgeChains) { + for (const Chain& edgeChain : edgeChains) { chains.push_back(edgeChain); } @@ -1570,7 +1569,7 @@ static std::vector createChains(const std::vector createChains(const std::vector>& eventCluster, +static LevelEvent createLevelEvent(const Point3d& eventCenter, double distance, const std::vector>& eventCluster, std::vector>>& sLav) { std::vector chains = createChains(eventCluster, sLav); @@ -1724,10 +1723,9 @@ static bool isInsidePolygon(const Point3d& point, const std::vector& po node2 = points[it]; } - double x = point.x(); - double y = point.y(); - + const double y = point.y(); if ((node1.y() < y && node2.y() >= y) || (node2.y() < y && node1.y() >= y)) { + const double x = point.x(); if (node1.x() + (y - node1.y()) / (node2.y() - node1.y()) * (node2.x() - node1.x()) < x) { oddNodes = !oddNodes; } @@ -1737,7 +1735,7 @@ static bool isInsidePolygon(const Point3d& point, const std::vector& po return oddNodes; } -static int chooseOppositeEdgeLavIndex(std::vector>& edgeLavs, std::shared_ptr oppositeEdge, const Point3d& center, +static int chooseOppositeEdgeLavIndex(const std::vector>& edgeLavs, std::shared_ptr oppositeEdge, const Point3d& center, std::vector>>& sLav) { if (edgeLavs.empty()) { return -1; @@ -1817,7 +1815,7 @@ static void createOppositeEdgeChains(std::vector oppositeEdgeChains; std::vector chainsForRemoval; - for (Chain& chain : chains) { + for (const Chain& chain : chains) { // add opposite edges as chain parts if (chain.chainType == Chain::TYPE_SPLIT) { std::shared_ptr oppositeEdge = chain.getOppositeEdge(); @@ -1864,12 +1862,12 @@ static void createOppositeEdgeChains(std::vector createMultiSplitVertex(std::shared_ptr nextEdge, std::shared_ptr previousEdge, Point3d& center, +static std::shared_ptr createMultiSplitVertex(std::shared_ptr nextEdge, std::shared_ptr previousEdge, const Point3d& center, double distance) { std::shared_ptr bisector(new Ray2d(calcBisector(center, previousEdge, nextEdge))); @@ -1917,7 +1915,7 @@ static void correctBisectorDirection(std::shared_ptr bisector, std::share } } -static bool areSameLav(std::vector>& lav1, std::vector>& lav2) { +static bool areSameLav(const std::vector>& lav1, const std::vector>& lav2) { if (lav1.size() != lav2.size()) { return false; } @@ -2204,8 +2202,8 @@ static void multiSplitEvent(LevelEvent& event, std::vectorprocessed = true; @@ -2241,8 +2239,9 @@ static void addMultiBackFaces(const std::vector>& ed } } -static void pickEvent(LevelEvent& event, std::vector>>& sLav, std::vector>& queue, - std::vector>& /*edges*/, std::vector>& faces) { +static void pickEvent(const LevelEvent& event, std::vector>>& sLav, + std::vector>& queue, std::vector>& /*edges*/, + std::vector>& faces) { // lav will be removed so it is final vertex. std::shared_ptr pickVertex(new Vertex(event.point, event.distance, nullptr, nullptr, nullptr)); pickVertex->processed = true; @@ -2383,7 +2382,7 @@ static void removeEmptyLav(std::vector>>& sL return facesToPoint3d(faces, roofPitchDegrees, zcoord); } -static std::vector getGableTopAndBottomVertices(std::vector& surface) { +static std::vector getGableTopAndBottomVertices(const std::vector& surface) { std::vector ret; if (surface.size() != 3) { // gable must have 3 vertices @@ -2405,7 +2404,8 @@ static std::vector getGableTopAndBottomVertices(std::vector& s return ret; } -static int getOppositeGableIndex(std::vector>& surfaces, std::vector connectedSurfaces, unsigned gableIndexNum) { +static int getOppositeGableIndex(const std::vector>& surfaces, const std::vector& connectedSurfaces, + unsigned gableIndexNum) { // Obtain opposite gable index relative to gableIndexNum if (connectedSurfaces.size() < 4) { // There must be at least 4 connected surfaces (including gableIndexNum) for @@ -2454,7 +2454,7 @@ static void applyGableLogicTriangles(std::vector>& surfaces std::vector connectedSurfaces; for (unsigned j = 0; j < surfaces.size(); j++) { - for (Point3d& vertex : surfaces[j]) { + for (const Point3d& vertex : surfaces[j]) { if (vertex != gableTop) { continue; } @@ -2573,7 +2573,7 @@ static void applyGableLogicTriangles(std::vector>& surfaces } } -static void applyGableLogicRidgeTwoAnglesForward(std::vector>& surfaces) { +static void applyGableLogicRidgeTwoAnglesForward(const std::vector>& surfaces) { // TODO /* ___________ ___________ @@ -2591,7 +2591,7 @@ static void applyGableLogicRidgeTwoAnglesForward(std::vector>& surfaces) { +static void applyGableLogicRidgeTwoAnglesInside(const std::vector>& surfaces) { // TODO /* ___________ ___________ @@ -2609,7 +2609,7 @@ static void applyGableLogicRidgeTwoAnglesInside(std::vector */ } -static void applyGableLogicRidgeTwoAnglesBackward(std::vector>& surfaces) { +static void applyGableLogicRidgeTwoAnglesBackward(const std::vector>& surfaces) { // TODO /* _______________________ _______________________ @@ -2629,7 +2629,7 @@ static void applyGableLogicRidgeTwoAnglesBackward(std::vector>& surfaces) { +static void applyGableLogicTwoRidgesTwoOppositeAngles(const std::vector>& surfaces) { // TODO /* _______________________ _______________________ @@ -2722,7 +2722,7 @@ static std::vector getShedLine(const std::vector& polygon, dou // Calculate distance from each polygon vertex to the line. std::map distances; double minDistance = std::numeric_limits::max(); - for (Point3d& vertex : polygon) { + for (const Point3d& vertex : polygon) { distances[vertex] = getDistancePointToLineSegment(vertex, line); if (distances[vertex] < minDistance) { minDistance = distances[vertex]; diff --git a/src/utilities/geometry/Test/Intersection_GTest.cpp b/src/utilities/geometry/Test/Intersection_GTest.cpp index d32b1e6b14d..f5e4baca2ac 100644 --- a/src/utilities/geometry/Test/Intersection_GTest.cpp +++ b/src/utilities/geometry/Test/Intersection_GTest.cpp @@ -2104,12 +2104,12 @@ TEST_F(GeometryFixture, JoinAll_2527) { {25867, 40.869, 0}, }; - std::vector polyx{ - {30439.131, 40.869, 0}, - {40.869, 40.869, 0}, - {4612, 4612, 0}, - {25867, 4612, 0}, - }; + // std::vector polyx{ + // {30439.131, 40.869, 0}, + // {40.869, 40.869, 0}, + // {4612, 4612, 0}, + // {25867, 4612, 0}, + // }; polygons.push_back(poly1); polygons.push_back(poly2); diff --git a/src/utilities/geometry/Test/RoofGeometry_GTest.cpp b/src/utilities/geometry/Test/RoofGeometry_GTest.cpp index ec07adb4824..0255db07b2d 100644 --- a/src/utilities/geometry/Test/RoofGeometry_GTest.cpp +++ b/src/utilities/geometry/Test/RoofGeometry_GTest.cpp @@ -13,7 +13,7 @@ using namespace openstudio; -void polygonMatches(std::vector> expectedPolygons, std::vector polygon) { +void polygonMatches(const std::vector>& expectedPolygons, const std::vector& polygon) { int numMatches = 0; for (const std::vector& expectedPolygon : expectedPolygons) { if (circularEqual(expectedPolygon, polygon, 0.01)) { diff --git a/src/utilities/idd/IddEnums.hpp b/src/utilities/idd/IddEnums.hpp index 2279096fb8d..d1b0d79d7e8 100644 --- a/src/utilities/idd/IddEnums.hpp +++ b/src/utilities/idd/IddEnums.hpp @@ -43,7 +43,7 @@ struct UTILITIES_API IddFileType : public ::EnumBase } domain value() const { - return static_cast(EnumBase::value()); + return static_cast(EnumBase::integer_value()); } private: @@ -99,7 +99,7 @@ struct UTILITIES_API IddObjectType : public ::EnumBase } domain value() const { - return static_cast(EnumBase::value()); + return static_cast(EnumBase::integer_value()); } private: diff --git a/src/utilities/idd/IddFieldProperties.cpp b/src/utilities/idd/IddFieldProperties.cpp index 63a73e9da35..58bd509a03d 100644 --- a/src/utilities/idd/IddFieldProperties.cpp +++ b/src/utilities/idd/IddFieldProperties.cpp @@ -184,7 +184,7 @@ std::ostream& IddFieldProperties::print(std::ostream& os) const { os << " \\reference " << reference << '\n'; } } - if (!references.empty()) { + if (!referenceClassNames.empty()) { for (const std::string& reference : referenceClassNames) { os << " \\reference-class-name " << reference << '\n'; } diff --git a/src/utilities/idd/IddObject.cpp b/src/utilities/idd/IddObject.cpp index e96648c190f..51a136bacac 100644 --- a/src/utilities/idd/IddObject.cpp +++ b/src/utilities/idd/IddObject.cpp @@ -517,10 +517,9 @@ namespace detail { void IddObject_Impl::parseObject(const std::string& text) { // find the object name and the property text smatch matches; - string objectName; string propertiesText; if (boost::regex_search(text, matches, iddRegex::line())) { - objectName = string(matches[1].first, matches[1].second); + std::string objectName = string(matches[1].first, matches[1].second); openstudio::ascii_trim(objectName); if (!boost::equals(m_name, objectName)) { LOG_AND_THROW("Object name '" << objectName << "' does not match expected '" << m_name << "'"); diff --git a/src/utilities/idd/Test/IddField_GTest.cpp b/src/utilities/idd/Test/IddField_GTest.cpp index 5500e552cc9..cbd8fb7ffe1 100644 --- a/src/utilities/idd/Test/IddField_GTest.cpp +++ b/src/utilities/idd/Test/IddField_GTest.cpp @@ -27,7 +27,7 @@ TEST_F(IddFixture, IddField_Properties) { // ==, != operators ASSERT_TRUE(iddZone.nonextensibleFields().size() > 2); ASSERT_TRUE(!iddZoneList.nonextensibleFields().empty()); - EXPECT_TRUE(iddZone.nonextensibleFields()[0].properties() == iddZone.nonextensibleFields()[0].properties()); + EXPECT_EQ(iddZone.nonextensibleFields()[0].properties(), iddZone.nonextensibleFields()[0].properties()); // ETH@20100326 Would expect these to be the same--probably only differ by note/memo. // Is that the behavior we want? EXPECT_FALSE(iddZone.nonextensibleFields()[0].properties() == iddZoneList.nonextensibleFields()[0].properties()); diff --git a/src/utilities/idd/Test/IddKey_GTest.cpp b/src/utilities/idd/Test/IddKey_GTest.cpp index 189d2eab06a..755f6368550 100644 --- a/src/utilities/idd/Test/IddKey_GTest.cpp +++ b/src/utilities/idd/Test/IddKey_GTest.cpp @@ -24,7 +24,7 @@ TEST_F(IddFixture, IddKey_Getters) { EXPECT_EQ(static_cast(8), keys.size()); LOG(Info, "Keys for field " << Controller_OutdoorAirFields::EconomizerControlType << ", " << f->name() << ", of IddObject " << obj.name() << ":"); unsigned i = 0; - for (IddKey& key : keys) { + for (const IddKey& key : keys) { LOG(Info, " Key " << i << ": " << key.name()); ++i; } diff --git a/src/utilities/idf/ImfFile.cpp b/src/utilities/idf/ImfFile.cpp index b03fd4b5223..d3805357817 100644 --- a/src/utilities/idf/ImfFile.cpp +++ b/src/utilities/idf/ImfFile.cpp @@ -61,6 +61,7 @@ OptionalImfFile ImfFile::load(std::istream& is, IddFileType iddFileType) { ImfFile temp{IddFileType::EnergyPlus}; temp.m_iddFileAndFactoryWrapper.setIddFile(iddFileType); bool success = temp.m_load(is); + // cppcheck-suppress knownConditionTrueFalse if (success) { result = temp; } @@ -72,6 +73,7 @@ OptionalImfFile ImfFile::load(std::istream& is, const IddFile& iddFile) { ImfFile temp{IddFileType::EnergyPlus}; temp.m_iddFileAndFactoryWrapper.setIddFile(iddFile); bool success = temp.m_load(is); + // cppcheck-suppress knownConditionTrueFalse if (success) { result = temp; } @@ -262,14 +264,14 @@ bool ImfFile::m_load(std::istream& is) { // peek at the object type and name for indexing in map std::string objectType; - std::string objName; - //bool objectHasName(false); + // std::string objName; + // bool objectHasName(false); if (boost::regex_search(line, matches, idfRegex::objectTypeAndName())) { objectType = std::string(matches[1].first, matches[1].second); boost::trim(objectType); - objName = std::string(matches[2].first, matches[2].second); - boost::trim(objectType); + // objName = std::string(matches[2].first, matches[2].second); + // boost::trim(objName); } else if (boost::regex_search(line, matches, idfRegex::line())) { // doesn't match name, just type objectType = std::string(matches[1].first, matches[1].second); diff --git a/src/utilities/idf/WorkspaceExtensibleGroup.hpp b/src/utilities/idf/WorkspaceExtensibleGroup.hpp index 08b0af76ca1..ed1034aad34 100644 --- a/src/utilities/idf/WorkspaceExtensibleGroup.hpp +++ b/src/utilities/idf/WorkspaceExtensibleGroup.hpp @@ -27,7 +27,7 @@ class WorkspaceObject; class UTILITIES_API WorkspaceExtensibleGroup : public IdfExtensibleGroup { public: - virtual ~WorkspaceExtensibleGroup() = default; + virtual ~WorkspaceExtensibleGroup() override = default; /** @name Getters */ //@{ diff --git a/src/utilities/idf/WorkspaceObject.hpp b/src/utilities/idf/WorkspaceObject.hpp index 2e19971d3f8..c28607d4bbc 100644 --- a/src/utilities/idf/WorkspaceObject.hpp +++ b/src/utilities/idf/WorkspaceObject.hpp @@ -33,7 +33,7 @@ class UTILITIES_API WorkspaceObject : public IdfObject //@{ // TODO: virtual dtor, but no copy ctor / assignment nor move ones... The move ones will **not** be declared/defaulted - virtual ~WorkspaceObject() = default; + virtual ~WorkspaceObject() override = default; WorkspaceObject(const WorkspaceObject& other) = default; WorkspaceObject(WorkspaceObject&& other) = default; diff --git a/src/utilities/idf/WorkspaceObjectOrder.hpp b/src/utilities/idf/WorkspaceObjectOrder.hpp index 2fda104445d..7a74ca2433f 100644 --- a/src/utilities/idf/WorkspaceObjectOrder.hpp +++ b/src/utilities/idf/WorkspaceObjectOrder.hpp @@ -34,7 +34,7 @@ namespace detail { WorkspaceObjectOrder_Impl(const std::vector& iddOrder, const ObjectGetter& objectGetter); - virtual ~WorkspaceObjectOrder_Impl() = default; + virtual ~WorkspaceObjectOrder_Impl() override = default; // GETTERS AND SETTERS diff --git a/src/utilities/sql/PreparedStatement.cpp b/src/utilities/sql/PreparedStatement.cpp index 8423cfb294d..145114c7bfd 100644 --- a/src/utilities/sql/PreparedStatement.cpp +++ b/src/utilities/sql/PreparedStatement.cpp @@ -4,7 +4,7 @@ ***********************************************************************************************************************/ #include "PreparedStatement.hpp" -#include "OpenStudio.hxx" +#include #include namespace openstudio { diff --git a/src/utilities/sql/SqlFile_Impl.cpp b/src/utilities/sql/SqlFile_Impl.cpp index 24ed8d4c0a2..d32500e5dfa 100644 --- a/src/utilities/sql/SqlFile_Impl.cpp +++ b/src/utilities/sql/SqlFile_Impl.cpp @@ -6,7 +6,6 @@ #include "SqlFile_Impl.hpp" #include "SqlFileTimeSeriesQuery.hpp" #include "PreparedStatement.hpp" -#include "OpenStudio.hxx" #include "../time/Calendar.hpp" #include "../filetypes/EpwFile.hpp" @@ -15,6 +14,8 @@ #include "../core/ASCIIStrings.hpp" #include "../core/StringHelpers.hpp" +#include + #include using boost::multi_index_container; @@ -70,7 +71,8 @@ namespace detail { initschema = true; } - sqlite3_open_v2(fileName.c_str(), &m_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE, nullptr); + int code = sqlite3_open_v2(fileName.c_str(), &m_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_EXCLUSIVE, nullptr); + m_connectionOpen = (code == 0); if (initschema) { execAndThrowOnError( diff --git a/src/utilities/sql/SqlFile_Impl.hpp b/src/utilities/sql/SqlFile_Impl.hpp index 19fb1f6321f..4b7a7a36939 100644 --- a/src/utilities/sql/SqlFile_Impl.hpp +++ b/src/utilities/sql/SqlFile_Impl.hpp @@ -1306,11 +1306,11 @@ namespace detail { // Variadic arguments are the bind arguments if any, to replace '?' placeholders in the statement string template void execAndThrowOnError(const std::string& bindingStatement, Args&&... args) { - if (m_db) { - PreparedStatement stmt(bindingStatement, m_db, false, args...); - stmt.execAndThrowOnError(); + if (!m_connectionOpen) { + throw std::runtime_error("Error executing SQL statement as database connection is not open."); } - std::runtime_error("Error executing SQL statement as database connection is not open."); + PreparedStatement stmt(bindingStatement, m_db, false, args...); + stmt.execAndThrowOnError(); } void addSimulation(const openstudio::EpwFile& t_epwFile, const openstudio::DateTime& t_simulationTime, const openstudio::Calendar& t_calendar); diff --git a/src/utilities/time/Date.cpp b/src/utilities/time/Date.cpp index 3f2793d353e..4438bf9d752 100644 --- a/src/utilities/time/Date.cpp +++ b/src/utilities/time/Date.cpp @@ -42,7 +42,7 @@ MonthOfYear monthOfYear(const std::string& month) { return {MonthOfYear::Mar}; } else if (istringEqual("Apr", month) || istringEqual("April", month)) { return {MonthOfYear::Apr}; - } else if (istringEqual("May", month) || istringEqual("May", month)) { + } else if (istringEqual("May", month)) { return {MonthOfYear::May}; } else if (istringEqual("Jun", month) || istringEqual("June", month)) { return {MonthOfYear::Jun}; diff --git a/src/utilities/time/Time.cpp b/src/utilities/time/Time.cpp index 453d4248917..8a9b80def0f 100644 --- a/src/utilities/time/Time.cpp +++ b/src/utilities/time/Time.cpp @@ -77,9 +77,7 @@ Time::Time(tm t_tm) : m_impl(t_tm.tm_hour, t_tm.tm_min, t_tm.tm_sec) {} Time::Time(const Time& other) : m_impl(other.impl()) {} /// Time from impl -Time::Time(const ImplType& implType) { - m_impl = implType; -} +Time::Time(const ImplType& implType) : m_impl(implType) {} /// assignment operator Time& Time::operator=(const Time& other) { diff --git a/src/utilities/units/BTUUnit.hpp b/src/utilities/units/BTUUnit.hpp index de153037429..038543ed134 100644 --- a/src/utilities/units/BTUUnit.hpp +++ b/src/utilities/units/BTUUnit.hpp @@ -79,7 +79,7 @@ class UTILITIES_API BTUUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ BTUUnit(const std::string& scaleAbbreviation, const BTUExpnt& exponents = BTUExpnt(), const std::string& prettyString = ""); - virtual ~BTUUnit() = default; + virtual ~BTUUnit() override = default; //@} protected: diff --git a/src/utilities/units/BTUUnit_Impl.hpp b/src/utilities/units/BTUUnit_Impl.hpp index 8dde081b6c3..ee17d4e5737 100644 --- a/src/utilities/units/BTUUnit_Impl.hpp +++ b/src/utilities/units/BTUUnit_Impl.hpp @@ -37,7 +37,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ BTUUnit_Impl(const std::string& scaleAbbreviation, const BTUExpnt& exponents = BTUExpnt(), const std::string& prettyString = ""); - virtual ~BTUUnit_Impl() = default; + virtual ~BTUUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/CFMUnit.hpp b/src/utilities/units/CFMUnit.hpp index 42ec6b8f331..f55a95fde31 100644 --- a/src/utilities/units/CFMUnit.hpp +++ b/src/utilities/units/CFMUnit.hpp @@ -80,7 +80,7 @@ class UTILITIES_API CFMUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ CFMUnit(const std::string& scaleAbbreviation, const CFMExpnt& exponents = CFMExpnt(), const std::string& prettyString = ""); - virtual ~CFMUnit() = default; + virtual ~CFMUnit() override = default; //@} protected: diff --git a/src/utilities/units/CFMUnit_Impl.hpp b/src/utilities/units/CFMUnit_Impl.hpp index 38aefdc5bcc..b5a7d456d72 100644 --- a/src/utilities/units/CFMUnit_Impl.hpp +++ b/src/utilities/units/CFMUnit_Impl.hpp @@ -37,7 +37,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ CFMUnit_Impl(const std::string& scaleAbbreviation, const CFMExpnt& exponents = CFMExpnt(), const std::string& prettyString = ""); - virtual ~CFMUnit_Impl() = default; + virtual ~CFMUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/CelsiusUnit.hpp b/src/utilities/units/CelsiusUnit.hpp index 38586255906..76d80fecbaf 100644 --- a/src/utilities/units/CelsiusUnit.hpp +++ b/src/utilities/units/CelsiusUnit.hpp @@ -45,7 +45,7 @@ class UTILITIES_API CelsiusUnit : public TemperatureUnit * \param[in] prettyString optional string to use in place of standardString. */ CelsiusUnit(const std::string& scaleAbbreviation, int CExp = 0, const std::string& prettyString = ""); - virtual ~CelsiusUnit() = default; + virtual ~CelsiusUnit() override = default; //@} protected: diff --git a/src/utilities/units/CelsiusUnit_Impl.hpp b/src/utilities/units/CelsiusUnit_Impl.hpp index 483b7bb0b87..79c5e967ccd 100644 --- a/src/utilities/units/CelsiusUnit_Impl.hpp +++ b/src/utilities/units/CelsiusUnit_Impl.hpp @@ -35,7 +35,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ CelsiusUnit_Impl(const std::string& scaleAbbreviation, int CExp = 0, const std::string& prettyString = ""); - virtual ~CelsiusUnit_Impl() = default; + virtual ~CelsiusUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/FahrenheitUnit.hpp b/src/utilities/units/FahrenheitUnit.hpp index 5e7c77ca566..59460a134c6 100644 --- a/src/utilities/units/FahrenheitUnit.hpp +++ b/src/utilities/units/FahrenheitUnit.hpp @@ -45,7 +45,7 @@ class UTILITIES_API FahrenheitUnit : public TemperatureUnit * \param[in] prettyString optional string to use in place of standardString. */ FahrenheitUnit(const std::string& scaleAbbreviation, int FExp = 0, const std::string& prettyString = ""); - virtual ~FahrenheitUnit() = default; + virtual ~FahrenheitUnit() override = default; //@} /** @name Mathematical Operators */ diff --git a/src/utilities/units/FahrenheitUnit_Impl.hpp b/src/utilities/units/FahrenheitUnit_Impl.hpp index ac3d91d6782..e9a90e5f14f 100644 --- a/src/utilities/units/FahrenheitUnit_Impl.hpp +++ b/src/utilities/units/FahrenheitUnit_Impl.hpp @@ -36,7 +36,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ FahrenheitUnit_Impl(const std::string& scaleAbbreviation, int FExp = 0, const std::string& prettyString = ""); - virtual ~FahrenheitUnit_Impl() = default; + virtual ~FahrenheitUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/GPDUnit.hpp b/src/utilities/units/GPDUnit.hpp index f863468eed3..da9a7a571fd 100644 --- a/src/utilities/units/GPDUnit.hpp +++ b/src/utilities/units/GPDUnit.hpp @@ -80,7 +80,7 @@ class UTILITIES_API GPDUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ GPDUnit(const std::string& scaleAbbreviation, const GPDExpnt& exponents = GPDExpnt(), const std::string& prettyString = ""); - virtual ~GPDUnit() = default; + virtual ~GPDUnit() override = default; //@} protected: diff --git a/src/utilities/units/GPDUnit_Impl.hpp b/src/utilities/units/GPDUnit_Impl.hpp index ada974778ac..b2697f98284 100644 --- a/src/utilities/units/GPDUnit_Impl.hpp +++ b/src/utilities/units/GPDUnit_Impl.hpp @@ -35,7 +35,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ GPDUnit_Impl(const std::string& scaleAbbreviation, const GPDExpnt& exponents = GPDExpnt(), const std::string& prettyString = ""); - virtual ~GPDUnit_Impl() = default; + virtual ~GPDUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/IPUnit.hpp b/src/utilities/units/IPUnit.hpp index 75a3e7dc70c..e51fc8b8b08 100644 --- a/src/utilities/units/IPUnit.hpp +++ b/src/utilities/units/IPUnit.hpp @@ -81,7 +81,7 @@ class UTILITIES_API IPUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ IPUnit(const std::string& scaleAbbreviation, const IPExpnt& exponents = IPExpnt(), const std::string& prettyString = ""); - virtual ~IPUnit() = default; + virtual ~IPUnit() override = default; //@} diff --git a/src/utilities/units/IPUnit_Impl.hpp b/src/utilities/units/IPUnit_Impl.hpp index 837e9a22e5f..1af472de624 100644 --- a/src/utilities/units/IPUnit_Impl.hpp +++ b/src/utilities/units/IPUnit_Impl.hpp @@ -37,7 +37,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ IPUnit_Impl(const std::string& scaleAbbreviation, const IPExpnt& exponents = IPExpnt(), const std::string& prettyString = ""); - virtual ~IPUnit_Impl() = default; + virtual ~IPUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/MPHUnit.hpp b/src/utilities/units/MPHUnit.hpp index 0613ee3b759..a439bb3b8e5 100644 --- a/src/utilities/units/MPHUnit.hpp +++ b/src/utilities/units/MPHUnit.hpp @@ -77,7 +77,7 @@ class UTILITIES_API MPHUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ MPHUnit(const std::string& scaleAbbreviation, const MPHExpnt& exponents = MPHExpnt(), const std::string& prettyString = ""); - virtual ~MPHUnit() = default; + virtual ~MPHUnit() override = default; //@} protected: diff --git a/src/utilities/units/MPHUnit_Impl.hpp b/src/utilities/units/MPHUnit_Impl.hpp index a84f142ea0a..d1d658f9e8a 100644 --- a/src/utilities/units/MPHUnit_Impl.hpp +++ b/src/utilities/units/MPHUnit_Impl.hpp @@ -35,7 +35,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ MPHUnit_Impl(const std::string& scaleAbbreviation, const MPHExpnt& exponents = MPHExpnt(), const std::string& prettyString = ""); - virtual ~MPHUnit_Impl() = default; + virtual ~MPHUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/Misc1Unit.hpp b/src/utilities/units/Misc1Unit.hpp index 43726511b3a..66797ce5a34 100644 --- a/src/utilities/units/Misc1Unit.hpp +++ b/src/utilities/units/Misc1Unit.hpp @@ -80,7 +80,7 @@ class UTILITIES_API Misc1Unit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ Misc1Unit(const std::string& scaleAbbreviation, const Misc1Expnt& exponents = Misc1Expnt(), const std::string& prettyString = ""); - virtual ~Misc1Unit() = default; + virtual ~Misc1Unit() override = default; //@} protected: diff --git a/src/utilities/units/Misc1Unit_Impl.hpp b/src/utilities/units/Misc1Unit_Impl.hpp index 7f911263d4c..e736958411b 100644 --- a/src/utilities/units/Misc1Unit_Impl.hpp +++ b/src/utilities/units/Misc1Unit_Impl.hpp @@ -35,7 +35,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ Misc1Unit_Impl(const std::string& scaleAbbreviation, const Misc1Expnt& exponents = Misc1Expnt(), const std::string& prettyString = ""); - virtual ~Misc1Unit_Impl() = default; + virtual ~Misc1Unit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/Quantity.cpp b/src/utilities/units/Quantity.cpp index 2018f09d3f7..62fc41f9289 100644 --- a/src/utilities/units/Quantity.cpp +++ b/src/utilities/units/Quantity.cpp @@ -365,6 +365,7 @@ Quantity operator/(const Quantity& lQuantity, const Quantity& rQuantity) { Quantity pow(const Quantity& rQuantity, int expNum, int expDenom) { Quantity result(rQuantity); + // cppcheck-suppress ignoredReturnValue result.pow(expNum, expDenom); return result; } diff --git a/src/utilities/units/SIUnit.hpp b/src/utilities/units/SIUnit.hpp index 37e6317fea0..cfd92bdcd33 100644 --- a/src/utilities/units/SIUnit.hpp +++ b/src/utilities/units/SIUnit.hpp @@ -73,7 +73,7 @@ class UTILITIES_API SIUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ SIUnit(const std::string& scaleAbbreviation, const SIExpnt& exponents = SIExpnt(), const std::string& prettyString = ""); - virtual ~SIUnit() = default; + virtual ~SIUnit() override = default; //@} protected: diff --git a/src/utilities/units/SIUnit_Impl.hpp b/src/utilities/units/SIUnit_Impl.hpp index 1252d7eef97..d8f05d34139 100644 --- a/src/utilities/units/SIUnit_Impl.hpp +++ b/src/utilities/units/SIUnit_Impl.hpp @@ -40,7 +40,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ SIUnit_Impl(const std::string& scaleAbbreviation, const SIExpnt& exponents = SIExpnt(), const std::string& prettyString = ""); - virtual ~SIUnit_Impl() = default; + virtual ~SIUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/TemperatureUnit.hpp b/src/utilities/units/TemperatureUnit.hpp index a901503cc14..5018d58e272 100644 --- a/src/utilities/units/TemperatureUnit.hpp +++ b/src/utilities/units/TemperatureUnit.hpp @@ -29,7 +29,7 @@ class UTILITIES_API TemperatureUnit : public Unit /** @name Constructors and Destructors */ //@{ - virtual ~TemperatureUnit() = default; + virtual ~TemperatureUnit() override = default; //@} /** @name Mathematical Operators */ diff --git a/src/utilities/units/TemperatureUnit_Impl.hpp b/src/utilities/units/TemperatureUnit_Impl.hpp index d22c314f6c6..6f29ef1f31c 100644 --- a/src/utilities/units/TemperatureUnit_Impl.hpp +++ b/src/utilities/units/TemperatureUnit_Impl.hpp @@ -19,7 +19,7 @@ namespace detail { /** @name Constructors and Destructors */ //@{ - virtual ~TemperatureUnit_Impl() = default; + virtual ~TemperatureUnit_Impl() override = default; //@} /** @name Mathematical Operators */ diff --git a/src/utilities/units/ThermUnit.hpp b/src/utilities/units/ThermUnit.hpp index cd91c004e4b..c90aadaefa2 100644 --- a/src/utilities/units/ThermUnit.hpp +++ b/src/utilities/units/ThermUnit.hpp @@ -79,7 +79,7 @@ class UTILITIES_API ThermUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ ThermUnit(const std::string& scaleAbbreviation, const ThermExpnt& exponents = ThermExpnt(), const std::string& prettyString = ""); - virtual ~ThermUnit() = default; + virtual ~ThermUnit() override = default; //@} protected: diff --git a/src/utilities/units/ThermUnit_Impl.hpp b/src/utilities/units/ThermUnit_Impl.hpp index ddf4a6cd858..ec4bd6ec51b 100644 --- a/src/utilities/units/ThermUnit_Impl.hpp +++ b/src/utilities/units/ThermUnit_Impl.hpp @@ -37,7 +37,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ ThermUnit_Impl(const std::string& scaleAbbreviation, const ThermExpnt& exponents = ThermExpnt(), const std::string& prettyString = ""); - virtual ~ThermUnit_Impl() = default; + virtual ~ThermUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/WhUnit.hpp b/src/utilities/units/WhUnit.hpp index 993c8f8ba8e..d9d126eceaf 100644 --- a/src/utilities/units/WhUnit.hpp +++ b/src/utilities/units/WhUnit.hpp @@ -70,7 +70,7 @@ class UTILITIES_API WhUnit : public Unit * \param[in] prettyString optional string to use in place of standardString. */ WhUnit(const std::string& scaleAbbreviation, const WhExpnt& exponents = WhExpnt(), const std::string& prettyString = ""); - virtual ~WhUnit() = default; + virtual ~WhUnit() override = default; //@} protected: diff --git a/src/utilities/units/WhUnit_Impl.hpp b/src/utilities/units/WhUnit_Impl.hpp index 111aeb7d8bc..d0b8a84c445 100644 --- a/src/utilities/units/WhUnit_Impl.hpp +++ b/src/utilities/units/WhUnit_Impl.hpp @@ -39,7 +39,7 @@ namespace detail { * \param[in] prettyString optional string to use in place of standardString. */ WhUnit_Impl(const std::string& scaleAbbreviation, const WhExpnt& exponents = WhExpnt(), const std::string& prettyString = ""); - virtual ~WhUnit_Impl() = default; + virtual ~WhUnit_Impl() override = default; /** Deep copy constructor. */ virtual Unit clone() const override; diff --git a/src/utilities/units/test/OSQuantityVector_GTest.cpp b/src/utilities/units/test/OSQuantityVector_GTest.cpp index cbcaf1d07b7..23fba3d1629 100644 --- a/src/utilities/units/test/OSQuantityVector_GTest.cpp +++ b/src/utilities/units/test/OSQuantityVector_GTest.cpp @@ -223,7 +223,7 @@ TEST_F(UnitsFixture,OSQuantityVector_Profiling_Addition_QuantityVectorBaseCase) TEST_F(UnitsFixture, OSQuantityVector_Profiling_Addition_OSQuantityVector) { for (unsigned i = 0, n = 10; i < n; ++i) { Quantity other(10.0, createSIPower()); - OSQuantityVector result = testOSQuantityVector + other; + [[maybe_unused]] OSQuantityVector result = testOSQuantityVector + other; } } /* @@ -240,6 +240,6 @@ TEST_F(UnitsFixture,OSQuantityVector_Profiling_Multiplication_QuantityVectorBase TEST_F(UnitsFixture, OSQuantityVector_Profiling_Multiplication_OSQuantityVector) { for (unsigned i = 0, n = 10; i < n; ++i) { Quantity other(8.0, createWhTime()); - OSQuantityVector result = testOSQuantityVector * other; + [[maybe_unused]] OSQuantityVector result = testOSQuantityVector * other; } } diff --git a/src/utilities/units/test/Quantity_GTest.cpp b/src/utilities/units/test/Quantity_GTest.cpp index fa549e651d9..ea37581fc13 100644 --- a/src/utilities/units/test/Quantity_GTest.cpp +++ b/src/utilities/units/test/Quantity_GTest.cpp @@ -84,6 +84,7 @@ TEST_F(UnitsFixture, Quantity_ArithmeticOperators) { EXPECT_EQ("ft/s^2", a.standardUnitsString()); // pow + // cppcheck-suppress ignoredReturnValue a.pow(6); EXPECT_EQ("ft^6/s^12", a.standardUnitsString()); Quantity b = openstudio::pow(a, 1, 3); diff --git a/src/utilities/units/test/Unit_GTest.cpp b/src/utilities/units/test/Unit_GTest.cpp index 6eae44aaf3f..1b98297a43f 100644 --- a/src/utilities/units/test/Unit_GTest.cpp +++ b/src/utilities/units/test/Unit_GTest.cpp @@ -189,6 +189,7 @@ TEST_F(UnitsFixture, Unit_ArithmeticOperators) { SCOPED_TRACE("u5*u4"); testStreamOutput("k(m^2*kg/s^2)", u7); } + // cppcheck-suppress knownConditionTrueFalse EXPECT_TRUE(u6 == u7); // DIVISION diff --git a/src/utilities/xml/Test/XMLValidator_GTest.cpp b/src/utilities/xml/Test/XMLValidator_GTest.cpp index 9ab4f3e2e39..a8c3547f014 100644 --- a/src/utilities/xml/Test/XMLValidator_GTest.cpp +++ b/src/utilities/xml/Test/XMLValidator_GTest.cpp @@ -6,13 +6,15 @@ #include #include "XMLValidatorFixture.hpp" -#include "utilities/core/Filesystem.hpp" -#include "utilities/core/PathHelpers.hpp" +#include "../../core/Filesystem.hpp" +#include "../../core/PathHelpers.hpp" + +#include + +#include #include #include -#include -#include #include using namespace std; diff --git a/src/utilities/xml/XMLErrors.cpp b/src/utilities/xml/XMLErrors.cpp index c6a5aefa404..545c9789724 100644 --- a/src/utilities/xml/XMLErrors.cpp +++ b/src/utilities/xml/XMLErrors.cpp @@ -54,6 +54,7 @@ namespace detail { return oss.str(); } + // cppcheck-suppress constParameterPointer void callback_messages_structured_error(void* errorCollectorVoidPtr, xmlError* error) { // This shouldn't happen, but better be safe than sorry if (!error) { diff --git a/src/utilities/xml/XMLValidator.cpp b/src/utilities/xml/XMLValidator.cpp index b849489aceb..626c4d8058f 100644 --- a/src/utilities/xml/XMLValidator.cpp +++ b/src/utilities/xml/XMLValidator.cpp @@ -329,15 +329,15 @@ bool XMLValidator::xsdValidate() const { m_logMessages.reserve(m_logMessages.size() + schemaValidErrorCollector.logMessages.size() + schemaParserErrorCollector.logMessages.size() + parseFileErrorCollector.logMessages.size()); - for (auto& logMessage : schemaValidErrorCollector.logMessages) { + for (const auto& logMessage : schemaValidErrorCollector.logMessages) { logAndStore(logMessage.logLevel(), "xsdValidate.schemaValidError: " + logMessage.logMessage()); } - for (auto& logMessage : schemaParserErrorCollector.logMessages) { + for (const auto& logMessage : schemaParserErrorCollector.logMessages) { logAndStore(logMessage.logLevel(), "xsdValidate.schemaParserError: " + logMessage.logMessage()); } - for (auto& logMessage : parseFileErrorCollector.logMessages) { + for (const auto& logMessage : parseFileErrorCollector.logMessages) { logAndStore(logMessage.logLevel(), "xsdValidate.parseFileError: " + logMessage.logMessage()); } @@ -370,6 +370,7 @@ std::vector processXSLTApplyResult(xmlDoc* res) { } /* Evaluate xpath expression */ + // cppcheck-suppress cstyleCast xpathObj = xmlXPathEvalExpression((const xmlChar*)xpathExpr, xpathCtx); if (xpathObj == nullptr) { xmlXPathFreeContext(xpathCtx); diff --git a/src/workflow/OSWorkflow.cpp b/src/workflow/OSWorkflow.cpp index c67f1b219ac..565d4075b01 100644 --- a/src/workflow/OSWorkflow.cpp +++ b/src/workflow/OSWorkflow.cpp @@ -4,6 +4,7 @@ ***********************************************************************************************************************/ #include "OSWorkflow.hpp" +#include "Util.hpp" #include "WorkflowRunOptions.hpp" #include "../osversion/VersionTranslator.hpp" @@ -25,7 +26,6 @@ #include "../utilities/filetypes/WorkflowStep.hpp" #include "../utilities/idf/Workspace.hpp" #include "../energyplus/ForwardTranslator.hpp" -#include "workflow/Util.hpp" #include #include diff --git a/src/workflow/RunEnergyPlus.cpp b/src/workflow/RunEnergyPlus.cpp index 62a01f4e6b7..c92dd59b2d6 100644 --- a/src/workflow/RunEnergyPlus.cpp +++ b/src/workflow/RunEnergyPlus.cpp @@ -22,7 +22,6 @@ #include "../utilities/core/FilesystemHelpers.hpp" #include "../utilities/core/ASCIIStrings.hpp" #include "../utilities/core/ApplicationPathHelpers.hpp" -#include "energyplus/ErrorFile.hpp" #include #include diff --git a/src/workflow/RunPostProcess.cpp b/src/workflow/RunPostProcess.cpp index e5562a3d4e1..9c5d75cb82c 100644 --- a/src/workflow/RunPostProcess.cpp +++ b/src/workflow/RunPostProcess.cpp @@ -6,7 +6,6 @@ #include "OSWorkflow.hpp" #include "Util.hpp" -#include "workflow/Util.hpp" namespace openstudio {