From 90d7f92dddb424e5640d49ea7362b0a530a02f4b Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Thu, 5 Mar 2026 22:31:07 +0000 Subject: [PATCH] chore: replace all usages of removed ClassUtils macros --- src/Linking/Linker.cpp | 1 - src/ObjCommon/InfoString/InfoString.h | 10 +- src/ObjCommon/SearchPath/ISearchPath.h | 1 - .../SearchPath/SearchPathFilesystem.cpp | 1 - src/ObjCommon/Sound/FlacDecoder.cpp | 3 +- .../CommonStructuredDataDef.h | 3 +- .../CommonStructuredDataEnum.h | 5 +- .../CommonStructuredDataTypes.h | 6 +- src/ObjCommon/Utils/DistinctMapper.h | 14 +-- src/ObjCommon/Utils/ObjFileStream.h | 103 ------------------ src/ObjCommon/Utils/ObjStream.h | 16 ++- .../Game/IW4/Techset/CompilerTechsetIW4.cpp | 2 +- .../Game/IW4/Menu/MenuConverterIW4.cpp | 3 +- .../IW4/Weapon/InfoStringLoaderWeaponIW4.cpp | 4 +- .../Game/IW5/Menu/MenuConverterIW5.cpp | 7 +- .../T6/Weapon/WeaponInfoStringLoaderT6.cpp | 12 +- src/ObjLoading/Gdt/AbstractGdtEntryReader.h | 17 ++- .../InfoStringToStructConverterBase.h | 1 - src/ObjLoading/Menu/AbstractMenuConverter.h | 3 +- .../ObjContainer/IPak/IPakEntryReadStream.h | 2 +- .../ObjContainer/IPak/IPakStreamManager.h | 3 +- .../ObjContainer/SoundBank/SoundBank.h | 9 +- .../Parsing/Graph2D/Graph2DReader.cpp | 4 +- .../CommonEventHandlerCondition.h | 2 +- .../EventHandler/CommonEventHandlerScript.h | 2 +- .../CommonEventHandlerSetLocalVar.h | 3 +- .../EventHandler/ICommonEventHandlerElement.h | 4 +- .../CommonExpressionBaseFunctionCall.h | 9 +- .../CommonExpressionCustomFunctionCall.h | 8 +- .../Parsing/Menu/Matcher/MenuMatcherFactory.h | 26 ++--- src/ObjLoading/Parsing/Menu/MenuFileParser.h | 3 +- .../EventHandlerSetScopeSequences.cpp | 20 ++-- src/ObjLoading/SearchPath/IWD.cpp | 2 +- .../Parsing/StructuredDataDefParser.h | 3 +- .../StructuredDataDefSizeCalculator.cpp | 3 +- .../Parsing/StructuredDataDefSizeCalculator.h | 5 +- .../AbstractMaterialConstantZoneState.cpp | 1 + src/Parser/Parsing/IParserLineStream.h | 8 +- src/Parser/Parsing/IParserValue.h | 5 +- src/Parser/Parsing/Impl/AbstractLexer.h | 1 - .../Parsing/Impl/CommentRemovingStreamProxy.h | 4 +- .../Parsing/Impl/IncludingStreamProxy.h | 12 +- .../Parsing/Impl/PackDefinitionStreamProxy.h | 11 +- .../Parsing/Impl/ParserFilesystemStream.h | 4 +- .../Parsing/Impl/ParserMultiInputStream.h | 4 +- .../Parsing/Impl/ParserSingleInputStream.h | 4 +- .../Impl/SkipUntilFirstNonEmptyProxy.h | 4 +- src/Parser/Parsing/Matcher/MatcherAnd.h | 1 + src/Parser/Parsing/Matcher/MatcherLabel.h | 3 +- src/Parser/Parsing/Matcher/MatcherOr.h | 1 + src/Parser/Parsing/ParsingException.h | 9 +- .../Parsing/Sequence/AbstractSequence.h | 5 +- src/Parser/Parsing/Sequence/SequenceResult.h | 5 +- .../Simple/Expression/ISimpleExpression.h | 12 +- .../SimpleExpressionBinaryOperation.h | 12 +- .../SimpleExpressionConditionalOperator.h | 9 +- .../Expression/SimpleExpressionMatchers.h | 5 +- .../Expression/SimpleExpressionScopeValue.h | 8 +- .../SimpleExpressionUnaryOperation.h | 10 +- .../Simple/Expression/SimpleExpressionValue.h | 11 +- .../Simple/SimpleExpressionInterpreter.cpp | 3 +- src/Parser/Parsing/Simple/SimpleParserValue.h | 19 ++-- src/RawTemplater/RawTemplater.cpp | 2 +- .../Templating/DirectiveEscapeStreamProxy.h | 4 +- .../Templating/SetDefineStreamProxy.h | 9 +- src/RawTemplater/Templating/Templater.cpp | 15 ++- src/RawTemplater/Templating/Templater.h | 4 +- .../Templating/TemplatingStreamProxy.h | 15 ++- src/Unlinking/Unlinker.cpp | 1 - .../Domain/Definition/DataDefinition.h | 1 - .../Domain/Definition/TypeDeclaration.h | 1 - .../Domain/Definition/Variable.h | 1 - .../Domain/Evaluation/Operation.h | 1 - .../Commands/Impl/CommandsParserValue.h | 1 - .../Parsing/Commands/Sequence/SequenceBlock.h | 1 - .../Parsing/Header/Block/HeaderBlockEnum.h | 1 - .../Parsing/Header/Impl/HeaderParserState.h | 3 +- .../Parsing/Header/Impl/HeaderParserValue.h | 1 - .../Persistence/IDataRepository.h | 1 - .../Utils/NamespaceBuilder.h | 4 +- .../ZoneCodeGenerator.cpp | 2 +- .../Matcher/ZoneDefinitionMatcherFactory.h | 10 +- .../Parsing/ZoneDefinitionParserValue.h | 13 +-- src/ZoneCommon/Zone/XChunk/XChunkException.h | 5 +- src/ZoneCommon/Zone/ZoneScriptStrings.h | 21 ++-- .../Game/T6/ZoneLoaderFactoryT6.cpp | 1 + src/ZoneLoading/ZoneLoading.cpp | 1 - .../Game/IW3/ZoneWriterFactoryIW3.cpp | 1 + .../Game/IW4/ZoneWriterFactoryIW4.cpp | 1 + .../Game/IW5/ZoneWriterFactoryIW5.cpp | 1 + .../Game/T5/ZoneWriterFactoryT5.cpp | 1 + .../Game/T6/ZoneWriterFactoryT6.cpp | 1 + .../Processor/OutputProcessorDeflate.cpp | 1 - src/ZoneWriting/Writing/WritingException.h | 5 +- .../EventHandlerSetScopeSequencesTests.cpp | 1 - .../Menu/Sequence/ItemScopeSequencesTests.cpp | 1 - test/ParserTestUtils/Parsing/Mock/MockLexer.h | 4 +- .../Parsing/Mock/MockPackValueSupplier.h | 3 +- .../Parsing/Mock/MockParserLineStream.h | 4 +- .../Parsing/Simple/SimpleExpressionTests.cpp | 5 +- .../Commands/Sequence/SequenceActionTests.cpp | 3 +- .../Sequence/SequenceArchitectureTests.cpp | 1 - .../Commands/Sequence/SequenceGameTests.cpp | 1 - .../Parsing/Matcher/MatcherTests.cpp | 5 +- 104 files changed, 244 insertions(+), 405 deletions(-) delete mode 100644 src/ObjCommon/Utils/ObjFileStream.h diff --git a/src/Linking/Linker.cpp b/src/Linking/Linker.cpp index e2b3e874..dc710d4d 100644 --- a/src/Linking/Linker.cpp +++ b/src/Linking/Linker.cpp @@ -7,7 +7,6 @@ #include "SearchPath/OutputPathFilesystem.h" #include "SearchPath/SearchPaths.h" #include "Utils/Logging/Log.h" -#include "Utils/ObjFileStream.h" #include "Zone/AssetList/AssetList.h" #include "Zone/AssetList/AssetListReader.h" #include "Zone/Definition/ZoneDefinitionStream.h" diff --git a/src/ObjCommon/InfoString/InfoString.h b/src/ObjCommon/InfoString/InfoString.h index 84054b6d..771461ed 100644 --- a/src/ObjCommon/InfoString/InfoString.h +++ b/src/ObjCommon/InfoString/InfoString.h @@ -1,6 +1,6 @@ #pragma once + #include "Obj/Gdt/GdtEntry.h" -#include "Utils/ClassUtils.h" #include #include @@ -16,14 +16,14 @@ class InfoString std::vector m_keys_by_insertion; public: - _NODISCARD bool HasKey(const std::string& key) const; - _NODISCARD const std::string& GetValueForKey(const std::string& key) const; + [[nodiscard]] bool HasKey(const std::string& key) const; + [[nodiscard]] const std::string& GetValueForKey(const std::string& key) const; const std::string& GetValueForKey(const std::string& key, bool* foundValue) const; void SetValueForKey(const std::string& key, std::string value); void RemoveKey(const std::string& key); - _NODISCARD std::string ToString() const; - _NODISCARD std::string ToString(const std::string& prefix) const; + [[nodiscard]] std::string ToString() const; + [[nodiscard]] std::string ToString(const std::string& prefix) const; void ToGdtProperties(const std::string& prefix, GdtEntry& gdtEntry) const; bool FromStream(std::istream& stream); diff --git a/src/ObjCommon/SearchPath/ISearchPath.h b/src/ObjCommon/SearchPath/ISearchPath.h index 53ed4639..1abcf3cf 100644 --- a/src/ObjCommon/SearchPath/ISearchPath.h +++ b/src/ObjCommon/SearchPath/ISearchPath.h @@ -1,7 +1,6 @@ #pragma once #include "SearchPathSearchOptions.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/src/ObjCommon/SearchPath/SearchPathFilesystem.cpp b/src/ObjCommon/SearchPath/SearchPathFilesystem.cpp index 6e5e4c07..b9a5d83b 100644 --- a/src/ObjCommon/SearchPath/SearchPathFilesystem.cpp +++ b/src/ObjCommon/SearchPath/SearchPathFilesystem.cpp @@ -1,7 +1,6 @@ #include "SearchPathFilesystem.h" #include "Utils/Logging/Log.h" -#include "Utils/ObjFileStream.h" #include #include diff --git a/src/ObjCommon/Sound/FlacDecoder.cpp b/src/ObjCommon/Sound/FlacDecoder.cpp index 696ccd37..3c3fd0d6 100644 --- a/src/ObjCommon/Sound/FlacDecoder.cpp +++ b/src/ObjCommon/Sound/FlacDecoder.cpp @@ -1,7 +1,6 @@ #include "FlacDecoder.h" #include "Utils/Alignment.h" -#include "Utils/ClassUtils.h" #include "Utils/Endianness.h" #include "Utils/FileUtils.h" #include "Utils/Logging/Log.h" @@ -42,7 +41,7 @@ namespace { } - _NODISCARD char const* what() const noexcept override + [[nodiscard]] char const* what() const noexcept override { return m_message.c_str(); } diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h index 1b607d1d..ad010bf0 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h @@ -2,7 +2,6 @@ #include "CommonStructuredDataEnum.h" #include "CommonStructuredDataStruct.h" -#include "Utils/ClassUtils.h" #include #include @@ -23,5 +22,5 @@ public: CommonStructuredDataDef(); explicit CommonStructuredDataDef(int version); - _NODISCARD uint32_t CalculateChecksum() const; + [[nodiscard]] uint32_t CalculateChecksum() const; }; diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h index 407b7436..a0febf09 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h @@ -1,5 +1,4 @@ #pragma once -#include "Utils/ClassUtils.h" #include #include @@ -25,8 +24,8 @@ struct CommonStructuredDataEnum explicit CommonStructuredDataEnum(std::string name); CommonStructuredDataEnum(std::string name, int reservedEntryCount); - _NODISCARD size_t ElementCount() const; - _NODISCARD uint32_t CalculateChecksum(uint32_t initialValue) const; + [[nodiscard]] size_t ElementCount() const; + [[nodiscard]] uint32_t CalculateChecksum(uint32_t initialValue) const; void SortEntriesByOffset(); void SortEntriesByName(); diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h index e502a166..92292ebe 100644 --- a/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h +++ b/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h @@ -1,7 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" - #include enum class CommonStructuredDataTypeCategory @@ -36,8 +34,8 @@ struct CommonStructuredDataType explicit CommonStructuredDataType(CommonStructuredDataTypeCategory category); CommonStructuredDataType(CommonStructuredDataTypeCategory category, size_t extraInfo); - _NODISCARD size_t GetAlignmentInBits() const; - _NODISCARD size_t GetSizeInBits(const CommonStructuredDataDef& def) const; + [[nodiscard]] size_t GetAlignmentInBits() const; + [[nodiscard]] size_t GetSizeInBits(const CommonStructuredDataDef& def) const; friend bool operator<(const CommonStructuredDataType& lhs, const CommonStructuredDataType& rhs); friend bool operator<=(const CommonStructuredDataType& lhs, const CommonStructuredDataType& rhs); diff --git a/src/ObjCommon/Utils/DistinctMapper.h b/src/ObjCommon/Utils/DistinctMapper.h index a5173285..e70aebad 100644 --- a/src/ObjCommon/Utils/DistinctMapper.h +++ b/src/ObjCommon/Utils/DistinctMapper.h @@ -1,7 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" - #include #include #include @@ -41,7 +39,7 @@ public: return false; } - _NODISCARD size_t GetDistinctPositionByInputPosition(const size_t inputPosition) const + [[nodiscard]] size_t GetDistinctPositionByInputPosition(const size_t inputPosition) const { if (inputPosition >= m_distinct_position_by_input_position.size()) return 0; @@ -49,7 +47,7 @@ public: return m_distinct_position_by_input_position[inputPosition]; } - _NODISCARD T GetDistinctValueByInputPosition(const size_t inputPosition) const + [[nodiscard]] T GetDistinctValueByInputPosition(const size_t inputPosition) const { if (inputPosition >= m_distinct_values.size()) return T{}; @@ -57,7 +55,7 @@ public: return m_distinct_values[inputPosition]; } - _NODISCARD size_t GetInputPositionByDistinctPosition(const size_t distinctPosition) const + [[nodiscard]] size_t GetInputPositionByDistinctPosition(const size_t distinctPosition) const { if (distinctPosition >= m_input_position_by_distinct_position.size()) return 0; @@ -65,17 +63,17 @@ public: return m_input_position_by_distinct_position[distinctPosition]; } - _NODISCARD const std::vector& GetDistinctValues() const + [[nodiscard]] const std::vector& GetDistinctValues() const { return m_distinct_values; } - _NODISCARD size_t GetInputValueCount() const + [[nodiscard]] size_t GetInputValueCount() const { return m_input_entry_index; } - _NODISCARD size_t GetDistinctValueCount() const + [[nodiscard]] size_t GetDistinctValueCount() const { return m_distinct_entry_index; } diff --git a/src/ObjCommon/Utils/ObjFileStream.h b/src/ObjCommon/Utils/ObjFileStream.h deleted file mode 100644 index 094448cb..00000000 --- a/src/ObjCommon/Utils/ObjFileStream.h +++ /dev/null @@ -1,103 +0,0 @@ -// ReSharper disable CppHidingFunction -// ReSharper disable IdentifierTypo -// ReSharper disable CppInconsistentNaming -#pragma once - -// #include -// -// #include "ObjStream.h" -// -// template -// class basic_fobjbuf final : public basic_objbuf, public std::basic_filebuf -// { -// public: -// using myfb = std::basic_filebuf; -// -// explicit basic_fobjbuf(myfb* fb) -// { -// m_fb.swap(*fb); -// } -// -// _NODISCARD bool is_open() const override -// { -// return m_fb.is_open(); -// } -// -// bool close() override -// { -// return m_fb.close(); -// } -// -// private: -// myfb m_fb; -// }; -// -// template -// class basic_fobjstream final : public basic_objstream -// { -// public: -// using mybase = basic_objstream; -// using myfb = basic_fobjbuf; -// -// using mybase::m_ob; -// -// explicit basic_fobjstream(std::fstream&& stream) -// : mybase(std::make_unique(std::move(*stream.rdbuf()))) -// { -// // reinterpret_cast(m_ob.get())->swapp(*stream.rdbuf()); -// // reinterpret_cast(m_ob.get())->swap(*stream.rdbuf()); -// } -// -// basic_fobjstream(const basic_fobjstream& other) = delete; -// basic_fobjstream(basic_fobjstream&& other) noexcept = default; -// basic_fobjstream& operator=(const basic_fobjstream& other) = delete; -// basic_fobjstream& operator=(basic_fobjstream&& other) noexcept = default; -// }; -// -// template -// class basic_ifobjstream final : public basic_iobjstream -// { -// public: -// using mybase = basic_iobjstream; -// using myfb = basic_fobjbuf; -// -// using mybase::m_ob; -// -// explicit basic_ifobjstream(std::ifstream&& stream) -// : mybase(std::make_unique(std::move(*stream.rdbuf()))) -// { -// // reinterpret_cast(m_ob.get())->swapp(*stream.rdbuf()); -// // m_ob->swapp(*stream.rdbuf()); -// } -// ~basic_ifobjstream() = default; -// -// basic_ifobjstream(const basic_ifobjstream& other) = delete; -// basic_ifobjstream(basic_ifobjstream&& other) noexcept = default; -// basic_ifobjstream& operator=(const basic_ifobjstream& other) = delete; -// basic_ifobjstream& operator=(basic_ifobjstream&& other) noexcept = default; -// }; -// -// template -// class basic_ofobjstream final : public basic_oobjstream -// { -// public: -// using mybase = basic_oobjstream; -// using myfb = basic_fobjbuf; -// -// using mybase::m_ob; -// -// explicit basic_ofobjstream(std::ofstream file) -// : mybase(std::make_unique(file.rdbuf())) -// { -// } -// -// basic_ofobjstream(const basic_ofobjstream& other) = delete; -// basic_ofobjstream(basic_ofobjstream&& other) noexcept = default; -// basic_ofobjstream& operator=(const basic_ofobjstream& other) = delete; -// basic_ofobjstream& operator=(basic_ofobjstream&& other) noexcept = default; -// }; -// -// using fobjbuf = basic_fobjbuf>; -// using fobjstream = basic_fobjstream>; -// using ifobjstream = basic_ifobjstream>; -// using ofobjstream = basic_ofobjstream>; diff --git a/src/ObjCommon/Utils/ObjStream.h b/src/ObjCommon/Utils/ObjStream.h index e67d7319..603f985e 100644 --- a/src/ObjCommon/Utils/ObjStream.h +++ b/src/ObjCommon/Utils/ObjStream.h @@ -2,8 +2,6 @@ // ReSharper disable IdentifierTypo #pragma once -#include "Utils/ClassUtils.h" - #include #include #include @@ -12,7 +10,7 @@ template class basic_objbuf : public std::basic_streambuf { public: - _NODISCARD virtual bool is_open() const = 0; + [[nodiscard]] virtual bool is_open() const = 0; virtual bool close() = 0; }; @@ -62,12 +60,12 @@ public: } // ReSharper disable once CppHidingFunction - _NODISCARD myob* rdbuf() const + [[nodiscard]] myob* rdbuf() const { return const_cast(m_ob.get()); } - _NODISCARD bool is_open() const + [[nodiscard]] bool is_open() const { return m_ob->is_open(); } @@ -126,12 +124,12 @@ public: } // ReSharper disable once CppHidingFunction - _NODISCARD myob* rdbuf() const + [[nodiscard]] myob* rdbuf() const { return const_cast(m_ob.get()); } - _NODISCARD bool is_open() const + [[nodiscard]] bool is_open() const { return m_ob->is_open(); } @@ -190,12 +188,12 @@ public: } // ReSharper disable once CppHidingFunction - _NODISCARD myob* rdbuf() const + [[nodiscard]] myob* rdbuf() const { return const_cast(m_ob.get()); } - _NODISCARD bool is_open() const + [[nodiscard]] bool is_open() const { return m_ob->is_open(); } diff --git a/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp index 161fa2e9..f3a4d0df 100644 --- a/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp +++ b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp @@ -1041,7 +1041,7 @@ namespace { } - _NODISCARD const LoadedTechnique* LoadMaterialTechnique(const std::string& techniqueName) const + [[nodiscard]] const LoadedTechnique* LoadMaterialTechnique(const std::string& techniqueName) const { auto* technique = m_zone_state.FindLoadedTechnique(techniqueName); if (technique) diff --git a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp index bc07ad53..d4f29be9 100644 --- a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp +++ b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp @@ -11,7 +11,6 @@ #include "Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h" #include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h" -#include "Utils/ClassUtils.h" #include "Utils/StringUtils.h" #include @@ -409,7 +408,7 @@ namespace } } - _NODISCARD Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const + [[nodiscard]] Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const { if (!expression) return nullptr; diff --git a/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp b/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp index 6bfe7f07..ee42d20d 100644 --- a/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp +++ b/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp @@ -59,7 +59,7 @@ namespace return true; } - _NODISCARD bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const + [[nodiscard]] bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const { auto** bounceSound = reinterpret_cast(reinterpret_cast(m_structure) + field.iOffset); if (value.empty()) @@ -81,7 +81,7 @@ namespace return true; } - _NODISCARD bool ConvertNotetrackMap(const cspField_t& field, const std::string& value, const char* mapName, const size_t keyAndValueCount) + [[nodiscard]] bool ConvertNotetrackMap(const cspField_t& field, const std::string& value, const char* mapName, const size_t keyAndValueCount) { std::vector> pairs; if (!ParseAsArray(value, pairs)) diff --git a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp index b4bfc9a8..e16e1bee 100644 --- a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp +++ b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp @@ -11,7 +11,6 @@ #include "Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h" #include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h" -#include "Utils/ClassUtils.h" #include "Utils/StringUtils.h" #include @@ -26,7 +25,7 @@ namespace { class MenuConverter final : public AbstractMenuConverter, public IMenuConverter { - _NODISCARD static rectDef_s ConvertRectDef(const CommonRect& rect) + [[nodiscard]] static rectDef_s ConvertRectDef(const CommonRect& rect) { return rectDef_s{ static_cast(rect.x), @@ -38,7 +37,7 @@ namespace }; } - _NODISCARD static rectDef_s ConvertRectDefRelativeTo(const CommonRect& rect, const CommonRect& rectRelativeTo) + [[nodiscard]] static rectDef_s ConvertRectDefRelativeTo(const CommonRect& rect, const CommonRect& rectRelativeTo) { return rectDef_s{ static_cast(rectRelativeTo.x + rect.x), @@ -409,7 +408,7 @@ namespace } } - _NODISCARD Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const + [[nodiscard]] Statement_s* ConvertExpression(const ISimpleExpression* expression, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const { if (!expression) return nullptr; diff --git a/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp b/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp index 8bc473e9..d7ea67b6 100644 --- a/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp +++ b/src/ObjLoading/Game/T6/Weapon/WeaponInfoStringLoaderT6.cpp @@ -160,7 +160,7 @@ namespace return true; } - _NODISCARD bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const + [[nodiscard]] bool ConvertBounceSounds(const cspField_t& field, const std::string& value) const { auto*** bounceSound = reinterpret_cast(reinterpret_cast(m_structure) + field.iOffset); if (value.empty()) @@ -179,7 +179,7 @@ namespace return true; } - _NODISCARD bool ConvertNotetrackSoundMap(const cspField_t& field, const std::string& value) + [[nodiscard]] bool ConvertNotetrackSoundMap(const cspField_t& field, const std::string& value) { std::vector> pairs; if (!ParseAsArray(value, pairs)) @@ -228,7 +228,7 @@ namespace return true; } - _NODISCARD bool ConvertWeaponCamo(const cspField_t& field, const std::string& value) + [[nodiscard]] bool ConvertWeaponCamo(const cspField_t& field, const std::string& value) { if (value.empty()) { @@ -250,7 +250,7 @@ namespace return true; } - _NODISCARD bool ConvertAttachments(const cspField_t& field, const std::string& value) + [[nodiscard]] bool ConvertAttachments(const cspField_t& field, const std::string& value) { std::vector valueArray; if (!ParseAsArray(value, valueArray)) @@ -295,13 +295,13 @@ namespace return true; } - _NODISCARD static bool HasMoreThanOneAttachmentSetInMask(const int mask) + [[nodiscard]] static bool HasMoreThanOneAttachmentSetInMask(const int mask) { // Check if int has more than 1 bit set return (mask & (mask - 1)) != 0; } - _NODISCARD bool ConvertAttachmentUniques(const cspField_t& field, const std::string& value) + [[nodiscard]] bool ConvertAttachmentUniques(const cspField_t& field, const std::string& value) { std::vector valueArray; if (!ParseAsArray(value, valueArray)) diff --git a/src/ObjLoading/Gdt/AbstractGdtEntryReader.h b/src/ObjLoading/Gdt/AbstractGdtEntryReader.h index 1b76c3ed..1e99d241 100644 --- a/src/ObjLoading/Gdt/AbstractGdtEntryReader.h +++ b/src/ObjLoading/Gdt/AbstractGdtEntryReader.h @@ -1,7 +1,6 @@ #pragma once #include "Obj/Gdt/GdtEntry.h" -#include "Utils/ClassUtils.h" #include @@ -9,7 +8,7 @@ class GdtReadingException : public std::exception { public: explicit GdtReadingException(std::string message); - _NODISCARD const char* what() const noexcept override; + [[nodiscard]] const char* what() const noexcept override; private: std::string m_message; @@ -41,13 +40,13 @@ class AbstractGdtEntryReader protected: explicit AbstractGdtEntryReader(const GdtEntry& entry); - _NODISCARD std::string ReadStringProperty(const std::string& propertyName, std::string defaultValue = std::string()) const; - _NODISCARD bool ReadBoolProperty(const std::string& propertyName, bool defaultValue = false) const; - _NODISCARD int ReadIntegerProperty(const std::string& propertyName, int defaultValue = 0) const; - _NODISCARD float ReadFloatProperty(const std::string& propertyName, float defaultValue = 0.0f) const; - _NODISCARD GdtVec2 ReadVec2Property(const std::string& propertyName, GdtVec2 defaultValue = {}) const; - _NODISCARD GdtVec3 ReadVec3Property(const std::string& propertyName, GdtVec3 defaultValue = {}) const; - _NODISCARD GdtVec4 ReadVec4Property(const std::string& propertyName, GdtVec4 defaultValue = {}) const; + [[nodiscard]] std::string ReadStringProperty(const std::string& propertyName, std::string defaultValue = std::string()) const; + [[nodiscard]] bool ReadBoolProperty(const std::string& propertyName, bool defaultValue = false) const; + [[nodiscard]] int ReadIntegerProperty(const std::string& propertyName, int defaultValue = 0) const; + [[nodiscard]] float ReadFloatProperty(const std::string& propertyName, float defaultValue = 0.0f) const; + [[nodiscard]] GdtVec2 ReadVec2Property(const std::string& propertyName, GdtVec2 defaultValue = {}) const; + [[nodiscard]] GdtVec3 ReadVec3Property(const std::string& propertyName, GdtVec3 defaultValue = {}) const; + [[nodiscard]] GdtVec4 ReadVec4Property(const std::string& propertyName, GdtVec4 defaultValue = {}) const; const GdtEntry& m_entry; }; diff --git a/src/ObjLoading/InfoString/InfoStringToStructConverterBase.h b/src/ObjLoading/InfoString/InfoStringToStructConverterBase.h index e2f936d2..5109b1d3 100644 --- a/src/ObjLoading/InfoString/InfoStringToStructConverterBase.h +++ b/src/ObjLoading/InfoString/InfoStringToStructConverterBase.h @@ -4,7 +4,6 @@ #include "Asset/AssetRegistration.h" #include "InfoString/InfoString.h" #include "Pool/XAssetInfo.h" -#include "Utils/ClassUtils.h" #include "Utils/Logging/Log.h" #include "Utils/MemoryManager.h" #include "Zone/ZoneScriptStrings.h" diff --git a/src/ObjLoading/Menu/AbstractMenuConverter.h b/src/ObjLoading/Menu/AbstractMenuConverter.h index 1db72896..add4ac95 100644 --- a/src/ObjLoading/Menu/AbstractMenuConverter.h +++ b/src/ObjLoading/Menu/AbstractMenuConverter.h @@ -3,7 +3,6 @@ #include "Asset/AssetCreationContext.h" #include "MenuConversionException.h" #include "SearchPath/ISearchPath.h" -#include "Utils/ClassUtils.h" #include "Utils/MemoryManager.h" namespace menu @@ -13,7 +12,7 @@ namespace menu protected: AbstractMenuConverter(bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context); - _NODISCARD const char* ConvertString(const std::string& str) const; + [[nodiscard]] const char* ConvertString(const std::string& str) const; static void PrintConversionExceptionDetails(const MenuConversionException& e); bool m_disable_optimizations; diff --git a/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.h b/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.h index a32fb3b9..da90d261 100644 --- a/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.h +++ b/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.h @@ -99,7 +99,7 @@ public: IPakEntryReadStream(std::istream& stream, IPakStreamManagerActions* streamManagerActions, uint8_t* chunkBuffer, int64_t startOffset, size_t entrySize); ~IPakEntryReadStream() override; - _NODISCARD bool is_open() const override; + [[nodiscard]] bool is_open() const override; bool close() override; protected: diff --git a/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.h b/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.h index fc4b2904..b443e80e 100644 --- a/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.h +++ b/src/ObjLoading/ObjContainer/IPak/IPakStreamManager.h @@ -1,6 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" #include "Utils/ObjStream.h" #include @@ -30,5 +29,5 @@ public: IPakStreamManager& operator=(const IPakStreamManager& other) = delete; IPakStreamManager& operator=(IPakStreamManager&& other) noexcept = delete; - _NODISCARD std::unique_ptr OpenStream(int64_t startPosition, size_t length) const; + [[nodiscard]] std::unique_ptr OpenStream(int64_t startPosition, size_t length) const; }; diff --git a/src/ObjLoading/ObjContainer/SoundBank/SoundBank.h b/src/ObjLoading/ObjContainer/SoundBank/SoundBank.h index acf48020..f5ca8896 100644 --- a/src/ObjLoading/ObjContainer/SoundBank/SoundBank.h +++ b/src/ObjLoading/ObjContainer/SoundBank/SoundBank.h @@ -4,7 +4,6 @@ #include "ObjContainer/ObjContainerRepository.h" #include "ObjContainer/SoundBank/SoundBankTypes.h" #include "SearchPath/ISearchPath.h" -#include "Utils/ClassUtils.h" #include "Utils/FileUtils.h" #include "Utils/ObjStream.h" #include "Zone/Zone.h" @@ -20,7 +19,7 @@ public: SoundBankEntryInputStream(); SoundBankEntryInputStream(std::unique_ptr stream, SoundAssetBankEntry entry); - _NODISCARD bool IsOpen() const; + [[nodiscard]] bool IsOpen() const; }; class SoundBank final : public ObjContainerReferenceable @@ -58,8 +57,8 @@ public: std::string GetName() override; bool Initialize(); - _NODISCARD const std::vector& GetDependencies() const; + [[nodiscard]] const std::vector& GetDependencies() const; - _NODISCARD bool VerifyChecksum(const SoundAssetBankChecksum& checksum) const; - _NODISCARD SoundBankEntryInputStream GetEntryStream(unsigned int id) const; + [[nodiscard]] bool VerifyChecksum(const SoundAssetBankChecksum& checksum) const; + [[nodiscard]] SoundBankEntryInputStream GetEntryStream(unsigned int id) const; }; diff --git a/src/ObjLoading/Parsing/Graph2D/Graph2DReader.cpp b/src/ObjLoading/Parsing/Graph2D/Graph2DReader.cpp index 487c7e52..e6ad9fa7 100644 --- a/src/ObjLoading/Parsing/Graph2D/Graph2DReader.cpp +++ b/src/ObjLoading/Parsing/Graph2D/Graph2DReader.cpp @@ -170,12 +170,12 @@ namespace graph2d } public: - _NODISCARD GenericGraph2D& GetResult() const + [[nodiscard]] GenericGraph2D& GetResult() const { return m_state->m_result; } - _NODISCARD bool HasExpectedKnotCount() const + [[nodiscard]] bool HasExpectedKnotCount() const { return GetExpectedKnotCount() == GetActualKnotCount(); } diff --git a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerCondition.h b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerCondition.h index 92065f32..b09830fd 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerCondition.h +++ b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerCondition.h @@ -20,6 +20,6 @@ namespace menu std::unique_ptr conditionElements, std::unique_ptr elseElements); - _NODISCARD CommonEventHandlerElementType GetType() const override; + [[nodiscard]] CommonEventHandlerElementType GetType() const override; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerScript.h b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerScript.h index 59193332..fb112a49 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerScript.h +++ b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerScript.h @@ -14,6 +14,6 @@ namespace menu CommonEventHandlerScript(); explicit CommonEventHandlerScript(std::string script); - _NODISCARD CommonEventHandlerElementType GetType() const override; + [[nodiscard]] CommonEventHandlerElementType GetType() const override; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h index 10d99520..cc27dcef 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h +++ b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h @@ -1,4 +1,5 @@ #pragma once + #include "ICommonEventHandlerElement.h" #include "Parsing/Simple/Expression/ISimpleExpression.h" @@ -26,6 +27,6 @@ namespace menu CommonEventHandlerSetLocalVar(); CommonEventHandlerSetLocalVar(SetLocalVarType type, std::string varName, std::unique_ptr value); - _NODISCARD CommonEventHandlerElementType GetType() const override; + [[nodiscard]] CommonEventHandlerElementType GetType() const override; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/ICommonEventHandlerElement.h b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/ICommonEventHandlerElement.h index da24ac95..54501fa9 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/EventHandler/ICommonEventHandlerElement.h +++ b/src/ObjLoading/Parsing/Menu/Domain/EventHandler/ICommonEventHandlerElement.h @@ -1,7 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" - namespace menu { enum class CommonEventHandlerElementType @@ -23,6 +21,6 @@ namespace menu ICommonEventHandlerElement& operator=(const ICommonEventHandlerElement& other) = default; ICommonEventHandlerElement& operator=(ICommonEventHandlerElement&& other) noexcept = default; - _NODISCARD virtual CommonEventHandlerElementType GetType() const = 0; + [[nodiscard]] virtual CommonEventHandlerElementType GetType() const = 0; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionBaseFunctionCall.h b/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionBaseFunctionCall.h index a04a1640..9a3742ec 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionBaseFunctionCall.h +++ b/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionBaseFunctionCall.h @@ -1,4 +1,5 @@ #pragma once + #include "Parsing/Simple/Expression/ISimpleExpression.h" #include @@ -14,9 +15,9 @@ namespace menu CommonExpressionBaseFunctionCall(std::string functionName, size_t functionIndex); - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionCustomFunctionCall.h b/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionCustomFunctionCall.h index 4c62886a..b7ae46af 100644 --- a/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionCustomFunctionCall.h +++ b/src/ObjLoading/Parsing/Menu/Domain/Expression/CommonExpressionCustomFunctionCall.h @@ -11,9 +11,9 @@ namespace menu explicit CommonExpressionCustomFunctionCall(std::string functionName); - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h b/src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h index 562deeed..cf766b6b 100644 --- a/src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h +++ b/src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h @@ -23,21 +23,21 @@ namespace menu public: explicit MenuMatcherFactory(const IMatcherForLabelSupplier* labelSupplier); - _NODISCARD MatcherFactoryWrapper StringChain() const; - _NODISCARD MatcherFactoryWrapper Text() const; - _NODISCARD MatcherFactoryWrapper TextNoChain() const; - _NODISCARD MatcherFactoryWrapper Numeric() const; + [[nodiscard]] MatcherFactoryWrapper StringChain() const; + [[nodiscard]] MatcherFactoryWrapper Text() const; + [[nodiscard]] MatcherFactoryWrapper TextNoChain() const; + [[nodiscard]] MatcherFactoryWrapper Numeric() const; - _NODISCARD MatcherFactoryWrapper TextExpression() const; - _NODISCARD MatcherFactoryWrapper IntExpression() const; - _NODISCARD MatcherFactoryWrapper NumericExpression() const; + [[nodiscard]] MatcherFactoryWrapper TextExpression() const; + [[nodiscard]] MatcherFactoryWrapper IntExpression() const; + [[nodiscard]] MatcherFactoryWrapper NumericExpression() const; - _NODISCARD static int TokenNumericIntValue(const SimpleParserValue& value); - _NODISCARD static double TokenNumericFloatingPointValue(const SimpleParserValue& value); - _NODISCARD static std::string& TokenTextValue(const SimpleParserValue& value); + [[nodiscard]] static int TokenNumericIntValue(const SimpleParserValue& value); + [[nodiscard]] static double TokenNumericFloatingPointValue(const SimpleParserValue& value); + [[nodiscard]] static std::string& TokenTextValue(const SimpleParserValue& value); - _NODISCARD static std::string TokenTextExpressionValue(MenuFileParserState* state, SequenceResult& result); - _NODISCARD static int TokenIntExpressionValue(MenuFileParserState* state, SequenceResult& result); - _NODISCARD static double TokenNumericExpressionValue(MenuFileParserState* state, SequenceResult& result); + [[nodiscard]] static std::string TokenTextExpressionValue(MenuFileParserState* state, SequenceResult& result); + [[nodiscard]] static int TokenIntExpressionValue(MenuFileParserState* state, SequenceResult& result); + [[nodiscard]] static double TokenNumericExpressionValue(MenuFileParserState* state, SequenceResult& result); }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/MenuFileParser.h b/src/ObjLoading/Parsing/Menu/MenuFileParser.h index f95ee2cc..8a8ff7aa 100644 --- a/src/ObjLoading/Parsing/Menu/MenuFileParser.h +++ b/src/ObjLoading/Parsing/Menu/MenuFileParser.h @@ -5,7 +5,6 @@ #include "Parsing/Impl/AbstractParser.h" #include "Parsing/Simple/SimpleLexer.h" #include "Parsing/Simple/SimpleParserValue.h" -#include "Utils/ClassUtils.h" namespace menu { @@ -28,6 +27,6 @@ namespace menu public: MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel, bool permissiveMode); MenuFileParser(SimpleLexer* lexer, FeatureLevel featureLevel, bool permissiveMode, const MenuAssetZoneState* zoneState); - _NODISCARD MenuFileParserState* GetState() const; + [[nodiscard]] MenuFileParserState* GetState() const; }; } // namespace menu diff --git a/src/ObjLoading/Parsing/Menu/Sequence/EventHandlerSetScopeSequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/EventHandlerSetScopeSequences.cpp index 228ea1c1..e9d4f2de 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/EventHandlerSetScopeSequences.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/EventHandlerSetScopeSequences.cpp @@ -31,7 +31,7 @@ namespace menu { } - _NODISCARD MatcherFactoryWrapper ScriptStrictNumeric() const + [[nodiscard]] MatcherFactoryWrapper ScriptStrictNumeric() const { return And({ MatcherFactoryWrapper(std::make_unique()) @@ -64,7 +64,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptNumeric() const + [[nodiscard]] MatcherFactoryWrapper ScriptNumeric() const { return Or({ ScriptStrictNumeric(), @@ -81,7 +81,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptStrictInt() const + [[nodiscard]] MatcherFactoryWrapper ScriptStrictInt() const { return And({ MatcherFactoryWrapper(std::make_unique()) @@ -100,7 +100,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptChar(const char c) const + [[nodiscard]] MatcherFactoryWrapper ScriptChar(const char c) const { return Or({ Char(c), @@ -118,7 +118,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptInt() const + [[nodiscard]] MatcherFactoryWrapper ScriptInt() const { return Or({ ScriptStrictInt(), @@ -136,7 +136,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptText() const + [[nodiscard]] MatcherFactoryWrapper ScriptText() const { return Or({ Type(SimpleParserValueType::STRING), @@ -154,12 +154,12 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptKeyword(std::string keyword) const + [[nodiscard]] MatcherFactoryWrapper ScriptKeyword(std::string keyword) const { return KeywordIgnoreCase(std::move(keyword)); } - _NODISCARD MatcherFactoryWrapper ScriptColor() const + [[nodiscard]] MatcherFactoryWrapper ScriptColor() const { return And({ ScriptStrictNumeric(), @@ -169,7 +169,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptLocalVarIntOrLiteral() const + [[nodiscard]] MatcherFactoryWrapper ScriptLocalVarIntOrLiteral() const { return Or({ And({ @@ -182,7 +182,7 @@ namespace menu }); } - _NODISCARD MatcherFactoryWrapper ScriptLocalVarBoolOrLiteral() const + [[nodiscard]] MatcherFactoryWrapper ScriptLocalVarBoolOrLiteral() const { return Or({ And({ diff --git a/src/ObjLoading/SearchPath/IWD.cpp b/src/ObjLoading/SearchPath/IWD.cpp index 99e77807..3b562b8d 100644 --- a/src/ObjLoading/SearchPath/IWD.cpp +++ b/src/ObjLoading/SearchPath/IWD.cpp @@ -56,7 +56,7 @@ namespace IwdFile& operator=(const IwdFile& other) = default; IwdFile& operator=(IwdFile&& other) noexcept = default; - _NODISCARD bool is_open() const override + [[nodiscard]] bool is_open() const override { return m_open; } diff --git a/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h index 6b8c02fa..31ba9dd1 100644 --- a/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h +++ b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefParser.h @@ -5,7 +5,6 @@ #include "Parsing/Simple/SimpleParserValue.h" #include "StructuredDataDef/CommonStructuredDataDef.h" #include "StructuredDataDefParserState.h" -#include "Utils/ClassUtils.h" namespace sdd { @@ -24,6 +23,6 @@ namespace sdd public: explicit StructuredDataDefParser(SimpleLexer* lexer); - _NODISCARD std::vector> GetDefs() const; + [[nodiscard]] std::vector> GetDefs() const; }; } // namespace sdd diff --git a/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.cpp b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.cpp index 0c589711..58ee1722 100644 --- a/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.cpp +++ b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.cpp @@ -1,7 +1,6 @@ #include "StructuredDataDefSizeCalculator.h" #include "Utils/Alignment.h" -#include "Utils/ClassUtils.h" #include #include @@ -32,7 +31,7 @@ class StructuredDataDefSizeCalculatorInternal std::vector m_indexed_array_calculated; std::vector m_enumed_array_calculated; - _NORETURN void ThrowCircularDependencyException(const size_t structIndex) const + [[noreturn]] void ThrowCircularDependencyException(const size_t structIndex) const { assert(structIndex < m_def.m_structs.size()); diff --git a/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.h b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.h index 9e18a951..b4c2cf12 100644 --- a/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.h +++ b/src/ObjLoading/StructuredDataDef/Parsing/StructuredDataDefSizeCalculator.h @@ -1,7 +1,6 @@ #pragma once #include "StructuredDataDef/CommonStructuredDataDef.h" -#include "Utils/ClassUtils.h" #include #include @@ -15,8 +14,8 @@ namespace sdd public: explicit SizeCalculationException(std::string message); - _NODISCARD const std::string& Message() const; - _NODISCARD char const* what() const noexcept override; + [[nodiscard]] const std::string& Message() const; + [[nodiscard]] char const* what() const noexcept override; }; class StructuredDataDefSizeCalculator diff --git a/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp b/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp index 363b7bac..57cae6f9 100644 --- a/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp +++ b/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp @@ -6,6 +6,7 @@ #include "Utils/Logging/Log.h" #include +#include namespace { diff --git a/src/Parser/Parsing/IParserLineStream.h b/src/Parser/Parsing/IParserLineStream.h index 8fb39344..b33c5156 100644 --- a/src/Parser/Parsing/IParserLineStream.h +++ b/src/Parser/Parsing/IParserLineStream.h @@ -1,7 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" - #include #include #include @@ -16,7 +14,7 @@ public: ParserLine(); ParserLine(std::shared_ptr filename, int lineNumber, std::string line); - _NODISCARD bool IsEof() const; + [[nodiscard]] bool IsEof() const; }; class IParserLineStream @@ -33,6 +31,6 @@ public: virtual ParserLine NextLine() = 0; virtual bool IncludeFile(const std::string& filename) = 0; virtual void PopCurrentFile() = 0; - _NODISCARD virtual bool IsOpen() const = 0; - _NODISCARD virtual bool Eof() const = 0; + [[nodiscard]] virtual bool IsOpen() const = 0; + [[nodiscard]] virtual bool Eof() const = 0; }; diff --git a/src/Parser/Parsing/IParserValue.h b/src/Parser/Parsing/IParserValue.h index bb138cc1..5a76f3f7 100644 --- a/src/Parser/Parsing/IParserValue.h +++ b/src/Parser/Parsing/IParserValue.h @@ -1,7 +1,6 @@ #pragma once #include "TokenPos.h" -#include "Utils/ClassUtils.h" class IParserValue { @@ -15,6 +14,6 @@ public: IParserValue& operator=(const IParserValue& other) = default; IParserValue& operator=(IParserValue&& other) noexcept = default; - _NODISCARD virtual bool IsEof() const = 0; - _NODISCARD virtual const TokenPos& GetPos() const = 0; + [[nodiscard]] virtual bool IsEof() const = 0; + [[nodiscard]] virtual const TokenPos& GetPos() const = 0; }; diff --git a/src/Parser/Parsing/Impl/AbstractLexer.h b/src/Parser/Parsing/Impl/AbstractLexer.h index 34b6f2dd..ca1a48a4 100644 --- a/src/Parser/Parsing/Impl/AbstractLexer.h +++ b/src/Parser/Parsing/Impl/AbstractLexer.h @@ -3,7 +3,6 @@ #include "Parsing/ILexer.h" #include "Parsing/IParserLineStream.h" #include "Parsing/ParsingException.h" -#include "Utils/ClassUtils.h" #include "Utils/StringUtils.h" #include diff --git a/src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h b/src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h index d9d9bfc5..9c52df79 100644 --- a/src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h +++ b/src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h @@ -14,6 +14,6 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; }; diff --git a/src/Parser/Parsing/Impl/IncludingStreamProxy.h b/src/Parser/Parsing/Impl/IncludingStreamProxy.h index 2213c273..319e33c2 100644 --- a/src/Parser/Parsing/Impl/IncludingStreamProxy.h +++ b/src/Parser/Parsing/Impl/IncludingStreamProxy.h @@ -15,11 +15,11 @@ class IncludingStreamProxy final : public AbstractDirectiveStreamProxy IParserLineStream* const m_stream; std::set m_included_files; - _NODISCARD static bool + [[nodiscard]] static bool ExtractIncludeFilename(const ParserLine& line, size_t includeDirectivePosition, size_t& filenameStartPosition, size_t& filenameEndPosition); - _NODISCARD bool MatchIncludeDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos) const; - _NODISCARD bool MatchPragmaOnceDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos); - _NODISCARD bool MatchDirectives(const ParserLine& line); + [[nodiscard]] bool MatchIncludeDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos) const; + [[nodiscard]] bool MatchPragmaOnceDirective(const ParserLine& line, size_t directiveStartPos, size_t directiveEndPos); + [[nodiscard]] bool MatchDirectives(const ParserLine& line); public: explicit IncludingStreamProxy(IParserLineStream* stream); @@ -27,6 +27,6 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; }; diff --git a/src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h b/src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h index 4feb73a6..de01ee37 100644 --- a/src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h +++ b/src/Parser/Parsing/Impl/PackDefinitionStreamProxy.h @@ -3,7 +3,6 @@ #include "AbstractDirectiveStreamProxy.h" #include "Parsing/IPackValueSupplier.h" #include "Parsing/IParserLineStream.h" -#include "Utils/ClassUtils.h" #include @@ -21,8 +20,8 @@ private: IParserLineStream* const m_stream; std::stack m_current_pack; - _NODISCARD bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition); - _NODISCARD bool MatchDirectives(const ParserLine& line); + [[nodiscard]] bool MatchPackDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition); + [[nodiscard]] bool MatchDirectives(const ParserLine& line); public: explicit PackDefinitionStreamProxy(IParserLineStream* stream); @@ -30,8 +29,8 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; - _NODISCARD int GetCurrentPack() const override; + [[nodiscard]] int GetCurrentPack() const override; }; diff --git a/src/Parser/Parsing/Impl/ParserFilesystemStream.h b/src/Parser/Parsing/Impl/ParserFilesystemStream.h index a981e904..971fa2b9 100644 --- a/src/Parser/Parsing/Impl/ParserFilesystemStream.h +++ b/src/Parser/Parsing/Impl/ParserFilesystemStream.h @@ -25,6 +25,6 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; }; diff --git a/src/Parser/Parsing/Impl/ParserMultiInputStream.h b/src/Parser/Parsing/Impl/ParserMultiInputStream.h index 2b26e7e5..68e62c70 100644 --- a/src/Parser/Parsing/Impl/ParserMultiInputStream.h +++ b/src/Parser/Parsing/Impl/ParserMultiInputStream.h @@ -24,8 +24,8 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; private: class FileInfo diff --git a/src/Parser/Parsing/Impl/ParserSingleInputStream.h b/src/Parser/Parsing/Impl/ParserSingleInputStream.h index c81e4ea5..fca95c5b 100644 --- a/src/Parser/Parsing/Impl/ParserSingleInputStream.h +++ b/src/Parser/Parsing/Impl/ParserSingleInputStream.h @@ -17,6 +17,6 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; }; diff --git a/src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h b/src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h index b4f5a753..57fc8890 100644 --- a/src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h +++ b/src/Parser/Parsing/Impl/SkipUntilFirstNonEmptyProxy.h @@ -10,8 +10,8 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; private: IParserLineStream* const m_stream; diff --git a/src/Parser/Parsing/Matcher/MatcherAnd.h b/src/Parser/Parsing/Matcher/MatcherAnd.h index 9059e09f..c2b8009a 100644 --- a/src/Parser/Parsing/Matcher/MatcherAnd.h +++ b/src/Parser/Parsing/Matcher/MatcherAnd.h @@ -2,6 +2,7 @@ #include "AbstractMatcher.h" #include "Parsing/IParserValue.h" +#include "Utils/ClassUtils.h" #include #include diff --git a/src/Parser/Parsing/Matcher/MatcherLabel.h b/src/Parser/Parsing/Matcher/MatcherLabel.h index d07e9c33..46be3130 100644 --- a/src/Parser/Parsing/Matcher/MatcherLabel.h +++ b/src/Parser/Parsing/Matcher/MatcherLabel.h @@ -2,7 +2,6 @@ #include "AbstractMatcher.h" #include "Parsing/IParserValue.h" -#include "Utils/ClassUtils.h" #include @@ -19,7 +18,7 @@ public: IMatcherForLabelSupplier& operator=(const IMatcherForLabelSupplier& other) = default; IMatcherForLabelSupplier& operator=(IMatcherForLabelSupplier&& other) noexcept = default; - _NODISCARD virtual AbstractMatcher* GetMatcherForLabel(int label) const = 0; + [[nodiscard]] virtual AbstractMatcher* GetMatcherForLabel(int label) const = 0; }; template class MatcherLabel final : public AbstractMatcher diff --git a/src/Parser/Parsing/Matcher/MatcherOr.h b/src/Parser/Parsing/Matcher/MatcherOr.h index d8dba50f..9eceb205 100644 --- a/src/Parser/Parsing/Matcher/MatcherOr.h +++ b/src/Parser/Parsing/Matcher/MatcherOr.h @@ -2,6 +2,7 @@ #include "AbstractMatcher.h" #include "Parsing/IParserValue.h" +#include "Utils/ClassUtils.h" #include #include diff --git a/src/Parser/Parsing/ParsingException.h b/src/Parser/Parsing/ParsingException.h index 34876ff1..689ec50e 100644 --- a/src/Parser/Parsing/ParsingException.h +++ b/src/Parser/Parsing/ParsingException.h @@ -1,7 +1,6 @@ #pragma once #include "TokenPos.h" -#include "Utils/ClassUtils.h" #include #include @@ -15,8 +14,8 @@ class ParsingException final : public std::exception public: ParsingException(TokenPos position, std::string message); - _NODISCARD TokenPos Position() const; - _NODISCARD const std::string& Message() const; - _NODISCARD std::string FullMessage() const; - _NODISCARD char const* what() const noexcept override; + [[nodiscard]] TokenPos Position() const; + [[nodiscard]] const std::string& Message() const; + [[nodiscard]] std::string FullMessage() const; + [[nodiscard]] char const* what() const noexcept override; }; diff --git a/src/Parser/Parsing/Sequence/AbstractSequence.h b/src/Parser/Parsing/Sequence/AbstractSequence.h index 83a9ade7..dee5570f 100644 --- a/src/Parser/Parsing/Sequence/AbstractSequence.h +++ b/src/Parser/Parsing/Sequence/AbstractSequence.h @@ -4,7 +4,6 @@ #include "Parsing/Matcher/MatcherAnd.h" #include "Parsing/Matcher/MatcherLabel.h" #include "SequenceResult.h" -#include "Utils/ClassUtils.h" #include #include @@ -59,7 +58,7 @@ public: AbstractSequence& operator=(const AbstractSequence& other) = default; AbstractSequence& operator=(AbstractSequence&& other) noexcept = default; - _NODISCARD matcher_t* GetMatcherForLabel(const int label) const override + [[nodiscard]] matcher_t* GetMatcherForLabel(const int label) const override { if (label == 0) return m_entry.get(); @@ -72,7 +71,7 @@ public: return nullptr; } - _NODISCARD bool MatchSequence(ILexer* lexer, ParserState* state, unsigned& consumedTokenCount) const + [[nodiscard]] bool MatchSequence(ILexer* lexer, ParserState* state, unsigned& consumedTokenCount) const { if (!m_entry) return false; diff --git a/src/Parser/Parsing/Sequence/SequenceResult.h b/src/Parser/Parsing/Sequence/SequenceResult.h index fb268bd7..a10a5e94 100644 --- a/src/Parser/Parsing/Sequence/SequenceResult.h +++ b/src/Parser/Parsing/Sequence/SequenceResult.h @@ -3,7 +3,6 @@ #include "Parsing/Matcher/AbstractMatcher.h" #include "Parsing/Matcher/MatcherResult.h" #include "Parsing/ParsingException.h" -#include "Utils/ClassUtils.h" #include #include @@ -41,7 +40,7 @@ public: } } - _NODISCARD int PeekTag() const + [[nodiscard]] int PeekTag() const { if (m_tag_offset < m_tags.size()) return m_tags[m_tag_offset]; @@ -72,7 +71,7 @@ public: return AbstractMatcher::NO_ID; } - _NODISCARD bool HasNextCapture(int captureId) + [[nodiscard]] bool HasNextCapture(int captureId) { auto foundEntry = m_captures.find(captureId); diff --git a/src/Parser/Parsing/Simple/Expression/ISimpleExpression.h b/src/Parser/Parsing/Simple/Expression/ISimpleExpression.h index 9c2cb778..666b59ee 100644 --- a/src/Parser/Parsing/Simple/Expression/ISimpleExpression.h +++ b/src/Parser/Parsing/Simple/Expression/ISimpleExpression.h @@ -1,7 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" - #include class SimpleExpressionValue; @@ -18,7 +16,7 @@ public: ISimpleExpressionScopeValues& operator=(const ISimpleExpressionScopeValues& other) = default; ISimpleExpressionScopeValues& operator=(ISimpleExpressionScopeValues&& other) noexcept = default; - _NODISCARD virtual SimpleExpressionValue ValueByName(const std::string& name) const = 0; + [[nodiscard]] virtual SimpleExpressionValue ValueByName(const std::string& name) const = 0; }; class ISimpleExpression @@ -33,10 +31,10 @@ public: ISimpleExpression& operator=(const ISimpleExpression& other) = default; ISimpleExpression& operator=(ISimpleExpression&& other) noexcept = default; - _NODISCARD virtual bool Equals(const ISimpleExpression* other) const = 0; - _NODISCARD virtual bool IsStatic() const = 0; - _NODISCARD virtual SimpleExpressionValue EvaluateStatic() const = 0; - _NODISCARD virtual SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const = 0; + [[nodiscard]] virtual bool Equals(const ISimpleExpression* other) const = 0; + [[nodiscard]] virtual bool IsStatic() const = 0; + [[nodiscard]] virtual SimpleExpressionValue EvaluateStatic() const = 0; + [[nodiscard]] virtual SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const = 0; }; // Include SimpleExpressionValue after definition to avoid "base class not defined" diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h b/src/Parser/Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h index a28875da..adeaabf7 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionBinaryOperation.h @@ -93,11 +93,11 @@ public: std::unique_ptr operand1, std::unique_ptr operand2); - _NODISCARD bool Operand1NeedsParenthesis() const; - _NODISCARD bool Operand2NeedsParenthesis() const; + [[nodiscard]] bool Operand1NeedsParenthesis() const; + [[nodiscard]] bool Operand2NeedsParenthesis() const; - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; }; diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h b/src/Parser/Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h index 479e8c2e..399c0c0a 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h @@ -1,4 +1,5 @@ #pragma once + #include "ISimpleExpression.h" class SimpleExpressionConditionalOperator final : public ISimpleExpression @@ -8,10 +9,10 @@ public: std::unique_ptr m_true_value; std::unique_ptr m_false_value; - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; SimpleExpressionConditionalOperator(); SimpleExpressionConditionalOperator(std::unique_ptr condition, diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.h b/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.h index aaf02bc9..e55201e8 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.h +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionMatchers.h @@ -7,7 +7,6 @@ #include "Parsing/Simple/SimpleParserValue.h" #include "SimpleExpressionBinaryOperation.h" #include "SimpleExpressionUnaryOperation.h" -#include "Utils/ClassUtils.h" #include #include @@ -47,8 +46,8 @@ protected: virtual std::unique_ptr ParseOperandExtension(const supplier_t* labelSupplier) const; virtual std::unique_ptr ProcessOperandExtension(SequenceResult& result) const; - _NODISCARD virtual std::vector EnabledUnaryOperations() const; - _NODISCARD virtual std::vector EnabledBinaryOperations() const; + [[nodiscard]] virtual std::vector EnabledUnaryOperations() const; + [[nodiscard]] virtual std::vector EnabledBinaryOperations() const; private: std::unique_ptr ParseBinaryOperationType(const supplier_t* labelSupplier) const; diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionScopeValue.h b/src/Parser/Parsing/Simple/Expression/SimpleExpressionScopeValue.h index 3e0b0da2..d4011022 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionScopeValue.h +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionScopeValue.h @@ -12,8 +12,8 @@ public: explicit SimpleExpressionScopeValue(std::string valueName); - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; }; diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h b/src/Parser/Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h index d981dfc0..386e76ec 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h @@ -44,10 +44,10 @@ public: SimpleExpressionUnaryOperation(const SimpleExpressionUnaryOperationType* operationType, std::unique_ptr operand); - _NODISCARD bool OperandNeedsParenthesis() const; + [[nodiscard]] bool OperandNeedsParenthesis() const; - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; }; diff --git a/src/Parser/Parsing/Simple/Expression/SimpleExpressionValue.h b/src/Parser/Parsing/Simple/Expression/SimpleExpressionValue.h index e1df8615..22ff5d75 100644 --- a/src/Parser/Parsing/Simple/Expression/SimpleExpressionValue.h +++ b/src/Parser/Parsing/Simple/Expression/SimpleExpressionValue.h @@ -1,7 +1,6 @@ #pragma once #include "ISimpleExpression.h" -#include "Utils/ClassUtils.h" #include #include @@ -31,9 +30,9 @@ public: explicit SimpleExpressionValue(double doubleValue); explicit SimpleExpressionValue(int intValue); - _NODISCARD bool Equals(const ISimpleExpression* other) const override; - _NODISCARD bool IsStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateStatic() const override; - _NODISCARD SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; - _NODISCARD bool IsTruthy() const; + [[nodiscard]] bool Equals(const ISimpleExpression* other) const override; + [[nodiscard]] bool IsStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateStatic() const override; + [[nodiscard]] SimpleExpressionValue EvaluateNonStatic(const ISimpleExpressionScopeValues* scopeValues) const override; + [[nodiscard]] bool IsTruthy() const; }; diff --git a/src/Parser/Parsing/Simple/SimpleExpressionInterpreter.cpp b/src/Parser/Parsing/Simple/SimpleExpressionInterpreter.cpp index 6f8ba50c..24e1e572 100644 --- a/src/Parser/Parsing/Simple/SimpleExpressionInterpreter.cpp +++ b/src/Parser/Parsing/Simple/SimpleExpressionInterpreter.cpp @@ -3,7 +3,6 @@ #include "Expression/SimpleExpressionMatchers.h" #include "Matcher/SimpleMatcherFactory.h" #include "Parsing/Impl/AbstractParser.h" -#include "Utils/ClassUtils.h" class SimpleExpressionInterpreterParserState { @@ -39,7 +38,7 @@ public: { } - _NODISCARD std::unique_ptr GetParsedExpression() const + [[nodiscard]] std::unique_ptr GetParsedExpression() const { return std::move(m_state->m_expression); } diff --git a/src/Parser/Parsing/Simple/SimpleParserValue.h b/src/Parser/Parsing/Simple/SimpleParserValue.h index 61ce3bbc..ba9a0db2 100644 --- a/src/Parser/Parsing/Simple/SimpleParserValue.h +++ b/src/Parser/Parsing/Simple/SimpleParserValue.h @@ -2,7 +2,6 @@ #include "Parsing/IParserValue.h" #include "Parsing/TokenPos.h" -#include "Utils/ClassUtils.h" #include @@ -66,14 +65,14 @@ public: SimpleParserValue& operator=(const SimpleParserValue& other) = delete; SimpleParserValue& operator=(SimpleParserValue&& other) noexcept; - _NODISCARD bool IsEof() const override; - _NODISCARD const TokenPos& GetPos() const override; + [[nodiscard]] bool IsEof() const override; + [[nodiscard]] const TokenPos& GetPos() const override; - _NODISCARD char CharacterValue() const; - _NODISCARD int MultiCharacterValue() const; - _NODISCARD int IntegerValue() const; - _NODISCARD double FloatingPointValue() const; - _NODISCARD std::string& StringValue() const; - _NODISCARD std::string& IdentifierValue() const; - _NODISCARD size_t IdentifierHash() const; + [[nodiscard]] char CharacterValue() const; + [[nodiscard]] int MultiCharacterValue() const; + [[nodiscard]] int IntegerValue() const; + [[nodiscard]] double FloatingPointValue() const; + [[nodiscard]] std::string& StringValue() const; + [[nodiscard]] std::string& IdentifierValue() const; + [[nodiscard]] size_t IdentifierHash() const; }; diff --git a/src/RawTemplater/RawTemplater.cpp b/src/RawTemplater/RawTemplater.cpp index 85554e28..06165b8b 100644 --- a/src/RawTemplater/RawTemplater.cpp +++ b/src/RawTemplater/RawTemplater.cpp @@ -17,7 +17,7 @@ class RawTemplater::Impl bool m_write_build_log; std::ofstream m_build_log_file; - _NODISCARD bool GenerateCode(const std::string& filename) + [[nodiscard]] bool GenerateCode(const std::string& filename) { std::ifstream file(filename, std::ios::in | std::ios::binary); if (!file.is_open()) diff --git a/src/RawTemplater/Templating/DirectiveEscapeStreamProxy.h b/src/RawTemplater/Templating/DirectiveEscapeStreamProxy.h index bb79d4a5..625f0100 100644 --- a/src/RawTemplater/Templating/DirectiveEscapeStreamProxy.h +++ b/src/RawTemplater/Templating/DirectiveEscapeStreamProxy.h @@ -11,8 +11,8 @@ namespace templating ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; private: IParserLineStream* const m_stream; diff --git a/src/RawTemplater/Templating/SetDefineStreamProxy.h b/src/RawTemplater/Templating/SetDefineStreamProxy.h index 9051ceee..639558ae 100644 --- a/src/RawTemplater/Templating/SetDefineStreamProxy.h +++ b/src/RawTemplater/Templating/SetDefineStreamProxy.h @@ -2,7 +2,6 @@ #include "Parsing/Impl/AbstractDirectiveStreamProxy.h" #include "Parsing/Impl/DefinesStreamProxy.h" -#include "Utils/ClassUtils.h" namespace templating { @@ -16,14 +15,14 @@ namespace templating ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; private: static constexpr const char* SET_DIRECTIVE = "set"; - _NODISCARD bool MatchSetDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; - _NODISCARD bool MatchDirectives(const ParserLine& line) const; + [[nodiscard]] bool MatchSetDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; + [[nodiscard]] bool MatchDirectives(const ParserLine& line) const; IParserLineStream* const m_stream; DefinesStreamProxy* m_defines_proxy; diff --git a/src/RawTemplater/Templating/Templater.cpp b/src/RawTemplater/Templating/Templater.cpp index 9e4eda61..c26d6d73 100644 --- a/src/RawTemplater/Templating/Templater.cpp +++ b/src/RawTemplater/Templating/Templater.cpp @@ -7,7 +7,6 @@ #include "Parsing/ParsingException.h" #include "SetDefineStreamProxy.h" #include "TemplatingStreamProxy.h" -#include "Utils/ClassUtils.h" #include "Utils/FileUtils.h" #include "Utils/Logging/Log.h" @@ -75,8 +74,8 @@ namespace templating virtual const std::string& GetName() = 0; virtual void Advance() = 0; virtual void Apply(DefinesStreamProxy* definesProxy) = 0; - _NODISCARD virtual bool IsFinished() const = 0; - _NODISCARD virtual TemplatingVariationType GetVariationType() const = 0; + [[nodiscard]] virtual bool IsFinished() const = 0; + [[nodiscard]] virtual TemplatingVariationType GetVariationType() const = 0; }; class SwitchVariation final : public ITemplatingVariation @@ -108,12 +107,12 @@ namespace templating definesProxy->AddDefine(DefinesStreamProxy::Define(m_name, "1")); } - _NODISCARD bool IsFinished() const override + [[nodiscard]] bool IsFinished() const override { return m_finished; } - _NODISCARD TemplatingVariationType GetVariationType() const override + [[nodiscard]] TemplatingVariationType GetVariationType() const override { return TemplatingVariationType::SWITCH; } @@ -149,12 +148,12 @@ namespace templating definesProxy->AddDefine(DefinesStreamProxy::Define(m_name, m_values[m_value_offset])); } - _NODISCARD bool IsFinished() const override + [[nodiscard]] bool IsFinished() const override { return m_value_offset >= m_values.size(); } - _NODISCARD TemplatingVariationType GetVariationType() const override + [[nodiscard]] TemplatingVariationType GetVariationType() const override { return TemplatingVariationType::OPTIONS; } @@ -280,7 +279,7 @@ namespace templating } } - _NODISCARD bool HasActiveVariations() const + [[nodiscard]] bool HasActiveVariations() const { return !m_active_variations.empty(); } diff --git a/src/RawTemplater/Templating/Templater.h b/src/RawTemplater/Templating/Templater.h index f73cc7af..38db7a50 100644 --- a/src/RawTemplater/Templating/Templater.h +++ b/src/RawTemplater/Templating/Templater.h @@ -1,6 +1,6 @@ #pragma once + #include "Parsing/IParserLineStream.h" -#include "Utils/ClassUtils.h" #include @@ -12,7 +12,7 @@ namespace templating Templater(std::istream& stream, std::string fileName); void SetBuildLogFile(std::ostream* buildLogFile); - _NODISCARD bool TemplateToDirectory(const std::string& outputDirectory) const; + [[nodiscard]] bool TemplateToDirectory(const std::string& outputDirectory) const; private: std::istream& m_stream; diff --git a/src/RawTemplater/Templating/TemplatingStreamProxy.h b/src/RawTemplater/Templating/TemplatingStreamProxy.h index 7856abec..4fefa878 100644 --- a/src/RawTemplater/Templating/TemplatingStreamProxy.h +++ b/src/RawTemplater/Templating/TemplatingStreamProxy.h @@ -2,7 +2,6 @@ #include "Parsing/Impl/AbstractDirectiveStreamProxy.h" #include "Parsing/Impl/DefinesStreamProxy.h" -#include "Utils/ClassUtils.h" namespace templating { @@ -34,8 +33,8 @@ namespace templating ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; private: static constexpr const char* SWITCH_DIRECTIVE = "switch"; @@ -43,11 +42,11 @@ namespace templating static constexpr const char* FILENAME_DIRECTIVE = "filename"; static constexpr const char* SKIP_DIRECTIVE = "skip"; - _NODISCARD bool MatchSwitchDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; - _NODISCARD bool MatchOptionsDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; - _NODISCARD bool MatchFilenameDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; - _NODISCARD bool MatchSkipDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; - _NODISCARD bool MatchDirectives(const ParserLine& line) const; + [[nodiscard]] bool MatchSwitchDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; + [[nodiscard]] bool MatchOptionsDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; + [[nodiscard]] bool MatchFilenameDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; + [[nodiscard]] bool MatchSkipDirective(const ParserLine& line, size_t directiveStartPosition, size_t directiveEndPosition) const; + [[nodiscard]] bool MatchDirectives(const ParserLine& line) const; IParserLineStream* const m_stream; ITemplaterControl* const m_templater_control; diff --git a/src/Unlinking/Unlinker.cpp b/src/Unlinking/Unlinker.cpp index 213d6c6b..771f6bb8 100644 --- a/src/Unlinking/Unlinker.cpp +++ b/src/Unlinking/Unlinker.cpp @@ -9,7 +9,6 @@ #include "UnlinkerArgs.h" #include "UnlinkerPaths.h" #include "Utils/Logging/Log.h" -#include "Utils/ObjFileStream.h" #include "Zone/AssetNameResolver.h" #include "Zone/Definition/ZoneDefWriter.h" #include "ZoneLoading.h" diff --git a/src/ZoneCodeGeneratorLib/Domain/Definition/DataDefinition.h b/src/ZoneCodeGeneratorLib/Domain/Definition/DataDefinition.h index b696e9b7..8e702a7a 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Definition/DataDefinition.h +++ b/src/ZoneCodeGeneratorLib/Domain/Definition/DataDefinition.h @@ -1,5 +1,4 @@ #pragma once -#include "Utils/ClassUtils.h" #include diff --git a/src/ZoneCodeGeneratorLib/Domain/Definition/TypeDeclaration.h b/src/ZoneCodeGeneratorLib/Domain/Definition/TypeDeclaration.h index e1a77eeb..12f106d4 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Definition/TypeDeclaration.h +++ b/src/ZoneCodeGeneratorLib/Domain/Definition/TypeDeclaration.h @@ -2,7 +2,6 @@ #include "DataDefinition.h" #include "DeclarationModifier.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/src/ZoneCodeGeneratorLib/Domain/Definition/Variable.h b/src/ZoneCodeGeneratorLib/Domain/Definition/Variable.h index 82611685..3a89f76b 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Definition/Variable.h +++ b/src/ZoneCodeGeneratorLib/Domain/Definition/Variable.h @@ -1,7 +1,6 @@ #pragma once #include "TypeDeclaration.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/src/ZoneCodeGeneratorLib/Domain/Evaluation/Operation.h b/src/ZoneCodeGeneratorLib/Domain/Evaluation/Operation.h index 5cc43245..8f6a82c4 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Evaluation/Operation.h +++ b/src/ZoneCodeGeneratorLib/Domain/Evaluation/Operation.h @@ -2,7 +2,6 @@ #include "IEvaluation.h" #include "OperationType.h" -#include "Utils/ClassUtils.h" #include diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParserValue.h b/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParserValue.h index 41b0477f..839ca6f0 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParserValue.h +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Impl/CommandsParserValue.h @@ -3,7 +3,6 @@ #include "Domain/Evaluation/OperationType.h" #include "Parsing/IParserValue.h" #include "Parsing/TokenPos.h" -#include "Utils/ClassUtils.h" #include diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceBlock.h b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceBlock.h index 64700762..798592c6 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceBlock.h +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceBlock.h @@ -1,7 +1,6 @@ #pragma once #include "Parsing/Commands/Impl/CommandsParser.h" -#include "Utils/ClassUtils.h" #include diff --git a/src/ZoneCodeGeneratorLib/Parsing/Header/Block/HeaderBlockEnum.h b/src/ZoneCodeGeneratorLib/Parsing/Header/Block/HeaderBlockEnum.h index 2a68841c..c6f49ebb 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Header/Block/HeaderBlockEnum.h +++ b/src/ZoneCodeGeneratorLib/Parsing/Header/Block/HeaderBlockEnum.h @@ -5,7 +5,6 @@ #include "IHeaderBlock.h" #include "IHeaderBlockNameHolder.h" #include "IHeaderBlockVariableDefining.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.h b/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.h index ca594be1..f67dfc97 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.h +++ b/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserState.h @@ -7,7 +7,6 @@ #include "Parsing/Header/Block/IHeaderBlock.h" #include "Parsing/IPackValueSupplier.h" #include "Persistence/IDataRepository.h" -#include "Utils/ClassUtils.h" #include "Utils/NamespaceBuilder.h" #include @@ -23,7 +22,7 @@ class HeaderParserState public: explicit HeaderParserState(const IPackValueSupplier* packValueSupplier); - _NODISCARD IHeaderBlock* GetBlock() const; + [[nodiscard]] IHeaderBlock* GetBlock() const; void PushBlock(std::unique_ptr block); void PopBlock(); diff --git a/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserValue.h b/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserValue.h index b6fa4ca8..18348736 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserValue.h +++ b/src/ZoneCodeGeneratorLib/Parsing/Header/Impl/HeaderParserValue.h @@ -2,7 +2,6 @@ #include "Parsing/IParserValue.h" #include "Parsing/TokenPos.h" -#include "Utils/ClassUtils.h" #include diff --git a/src/ZoneCodeGeneratorLib/Persistence/IDataRepository.h b/src/ZoneCodeGeneratorLib/Persistence/IDataRepository.h index a24f9ba7..f483f497 100644 --- a/src/ZoneCodeGeneratorLib/Persistence/IDataRepository.h +++ b/src/ZoneCodeGeneratorLib/Persistence/IDataRepository.h @@ -7,7 +7,6 @@ #include "Domain/Environment/Architecture.h" #include "Domain/FastFile/FastFileBlock.h" #include "Domain/Information/StructureInformation.h" -#include "Utils/ClassUtils.h" #include diff --git a/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h b/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h index a75b0a4e..3e930af6 100644 --- a/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h +++ b/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h @@ -1,7 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" - #include #include @@ -12,7 +10,7 @@ class NamespaceBuilder public: static std::string Combine(const std::string& _namespace, const std::string& name); - _NODISCARD bool IsEmpty() const; + [[nodiscard]] bool IsEmpty() const; void Push(std::string element); void Pop(); std::string ToString(); diff --git a/src/ZoneCodeGeneratorLib/ZoneCodeGenerator.cpp b/src/ZoneCodeGeneratorLib/ZoneCodeGenerator.cpp index c0a5e5b8..ba3e2f48 100644 --- a/src/ZoneCodeGeneratorLib/ZoneCodeGenerator.cpp +++ b/src/ZoneCodeGeneratorLib/ZoneCodeGenerator.cpp @@ -81,7 +81,7 @@ private: prettyPrinter.PrintAll(); } - _NODISCARD bool GenerateCode() const + [[nodiscard]] bool GenerateCode() const { CodeGenerator codeGenerator(&m_args); return codeGenerator.GenerateCode(m_repository.get()); diff --git a/src/ZoneCommon/Zone/Definition/Parsing/Matcher/ZoneDefinitionMatcherFactory.h b/src/ZoneCommon/Zone/Definition/Parsing/Matcher/ZoneDefinitionMatcherFactory.h index eff3f346..4ed08dbb 100644 --- a/src/ZoneCommon/Zone/Definition/Parsing/Matcher/ZoneDefinitionMatcherFactory.h +++ b/src/ZoneCommon/Zone/Definition/Parsing/Matcher/ZoneDefinitionMatcherFactory.h @@ -10,9 +10,9 @@ class ZoneDefinitionMatcherFactory final : public AbstractMatcherFactory* labelSupplier); - _NODISCARD MatcherFactoryWrapper Type(ZoneDefinitionParserValueType type) const; - _NODISCARD MatcherFactoryWrapper Keyword(std::string keyword) const; - _NODISCARD MatcherFactoryWrapper Field() const; - _NODISCARD MatcherFactoryWrapper String() const; - _NODISCARD MatcherFactoryWrapper Char(char c) const; + [[nodiscard]] MatcherFactoryWrapper Type(ZoneDefinitionParserValueType type) const; + [[nodiscard]] MatcherFactoryWrapper Keyword(std::string keyword) const; + [[nodiscard]] MatcherFactoryWrapper Field() const; + [[nodiscard]] MatcherFactoryWrapper String() const; + [[nodiscard]] MatcherFactoryWrapper Char(char c) const; }; diff --git a/src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserValue.h b/src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserValue.h index a6935a09..a0a4749a 100644 --- a/src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserValue.h +++ b/src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserValue.h @@ -2,7 +2,6 @@ #include "Parsing/IParserValue.h" #include "Parsing/TokenPos.h" -#include "Utils/ClassUtils.h" #include @@ -49,11 +48,11 @@ public: ZoneDefinitionParserValue& operator=(const ZoneDefinitionParserValue& other) = delete; ZoneDefinitionParserValue& operator=(ZoneDefinitionParserValue&& other) noexcept; - _NODISCARD bool IsEof() const override; - _NODISCARD const TokenPos& GetPos() const override; + [[nodiscard]] bool IsEof() const override; + [[nodiscard]] const TokenPos& GetPos() const override; - _NODISCARD char CharacterValue() const; - _NODISCARD std::string& StringValue() const; - _NODISCARD std::string& FieldValue() const; - _NODISCARD size_t FieldHash() const; + [[nodiscard]] char CharacterValue() const; + [[nodiscard]] std::string& StringValue() const; + [[nodiscard]] std::string& FieldValue() const; + [[nodiscard]] size_t FieldHash() const; }; diff --git a/src/ZoneCommon/Zone/XChunk/XChunkException.h b/src/ZoneCommon/Zone/XChunk/XChunkException.h index 97346d7c..a34e2d88 100644 --- a/src/ZoneCommon/Zone/XChunk/XChunkException.h +++ b/src/ZoneCommon/Zone/XChunk/XChunkException.h @@ -1,5 +1,4 @@ #pragma once -#include "Utils/ClassUtils.h" #include #include @@ -11,6 +10,6 @@ class XChunkException final : public std::exception public: explicit XChunkException(std::string message); - _NODISCARD char const* what() const noexcept override; - _NODISCARD const std::string& Message() const; + [[nodiscard]] char const* what() const noexcept override; + [[nodiscard]] const std::string& Message() const; }; diff --git a/src/ZoneCommon/Zone/ZoneScriptStrings.h b/src/ZoneCommon/Zone/ZoneScriptStrings.h index bd01235d..e558e78f 100644 --- a/src/ZoneCommon/Zone/ZoneScriptStrings.h +++ b/src/ZoneCommon/Zone/ZoneScriptStrings.h @@ -1,6 +1,5 @@ #pragma once -#include "Utils/ClassUtils.h" #include "Zone/ZoneTypes.h" #include @@ -24,16 +23,16 @@ public: void AddScriptString(const std::string& value); scr_string_t AddOrGetScriptString(const char* value); scr_string_t AddOrGetScriptString(const std::string& value); - _NODISCARD scr_string_t GetScriptString(const char* value) const; - _NODISCARD scr_string_t GetScriptString(const std::string& value) const; + [[nodiscard]] scr_string_t GetScriptString(const char* value) const; + [[nodiscard]] scr_string_t GetScriptString(const std::string& value) const; - _NODISCARD size_t Count() const; - _NODISCARD bool Empty() const; + [[nodiscard]] size_t Count() const; + [[nodiscard]] bool Empty() const; - _NODISCARD const char* CValue(size_t index) const; - _NODISCARD const std::string& Value(size_t index) const; - _NODISCARD const std::string& Value(size_t index, bool& isNull) const; - _NODISCARD const std::string& operator[](size_t index) const; - _NODISCARD std::vector::const_iterator begin() const; - _NODISCARD std::vector::const_iterator end() const; + [[nodiscard]] const char* CValue(size_t index) const; + [[nodiscard]] const std::string& Value(size_t index) const; + [[nodiscard]] const std::string& Value(size_t index, bool& isNull) const; + [[nodiscard]] const std::string& operator[](size_t index) const; + [[nodiscard]] std::vector::const_iterator begin() const; + [[nodiscard]] std::vector::const_iterator end() const; }; diff --git a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp index 0d377ee7..bd4697b2 100644 --- a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp +++ b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp @@ -16,6 +16,7 @@ #include "Loading/Steps/StepVerifyFileName.h" #include "Loading/Steps/StepVerifyMagic.h" #include "Loading/Steps/StepVerifySignature.h" +#include "Utils/ClassUtils.h" #include "Utils/Endianness.h" #include "Utils/Logging/Log.h" #include "Zone/XChunk/XChunkProcessorInflate.h" diff --git a/src/ZoneLoading/ZoneLoading.cpp b/src/ZoneLoading/ZoneLoading.cpp index 49e267da..71e2ae0a 100644 --- a/src/ZoneLoading/ZoneLoading.cpp +++ b/src/ZoneLoading/ZoneLoading.cpp @@ -2,7 +2,6 @@ #include "Loading/IZoneLoaderFactory.h" #include "Loading/ZoneLoader.h" -#include "Utils/ObjFileStream.h" #include #include diff --git a/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp b/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp index 350e4971..8554bfd7 100644 --- a/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp +++ b/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp @@ -4,6 +4,7 @@ #include "Game/IW3/GameIW3.h" #include "Game/IW3/IW3.h" #include "Game/IW3/ZoneConstantsIW3.h" +#include "Utils/ClassUtils.h" #include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepWriteXBlockSizes.h" diff --git a/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp b/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp index 941f76e6..b65e6080 100644 --- a/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp +++ b/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp @@ -4,6 +4,7 @@ #include "Game/IW4/GameIW4.h" #include "Game/IW4/IW4.h" #include "Game/IW4/ZoneConstantsIW4.h" +#include "Utils/ClassUtils.h" #include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepWriteTimestamp.h" diff --git a/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp b/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp index 90ed3208..2721a139 100644 --- a/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp +++ b/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp @@ -4,6 +4,7 @@ #include "Game/IW5/GameIW5.h" #include "Game/IW5/IW5.h" #include "Game/IW5/ZoneConstantsIW5.h" +#include "Utils/ClassUtils.h" #include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepWriteTimestamp.h" diff --git a/src/ZoneWriting/Game/T5/ZoneWriterFactoryT5.cpp b/src/ZoneWriting/Game/T5/ZoneWriterFactoryT5.cpp index 4cb65a9b..786d5488 100644 --- a/src/ZoneWriting/Game/T5/ZoneWriterFactoryT5.cpp +++ b/src/ZoneWriting/Game/T5/ZoneWriterFactoryT5.cpp @@ -4,6 +4,7 @@ #include "Game/T5/GameT5.h" #include "Game/T5/T5.h" #include "Game/T5/ZoneConstantsT5.h" +#include "Utils/ClassUtils.h" #include "Writing/Processor/OutputProcessorDeflate.h" #include "Writing/Steps/StepAddOutputProcessor.h" #include "Writing/Steps/StepWriteXBlockSizes.h" diff --git a/src/ZoneWriting/Game/T6/ZoneWriterFactoryT6.cpp b/src/ZoneWriting/Game/T6/ZoneWriterFactoryT6.cpp index fb3796f8..60ed2c25 100644 --- a/src/ZoneWriting/Game/T6/ZoneWriterFactoryT6.cpp +++ b/src/ZoneWriting/Game/T6/ZoneWriterFactoryT6.cpp @@ -4,6 +4,7 @@ #include "Game/T6/GameT6.h" #include "Game/T6/T6.h" #include "Game/T6/ZoneConstantsT6.h" +#include "Utils/ClassUtils.h" #include "Utils/ICapturedDataProvider.h" #include "Writing/Processor/OutputProcessorXChunks.h" #include "Writing/Steps/StepAddOutputProcessor.h" diff --git a/src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.cpp b/src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.cpp index 1355fd9b..dad62685 100644 --- a/src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.cpp +++ b/src/ZoneWriting/Writing/Processor/OutputProcessorDeflate.cpp @@ -1,6 +1,5 @@ #include "OutputProcessorDeflate.h" -#include "Utils/ClassUtils.h" #include "Writing/WritingException.h" #include diff --git a/src/ZoneWriting/Writing/WritingException.h b/src/ZoneWriting/Writing/WritingException.h index c3725b6f..d4028afe 100644 --- a/src/ZoneWriting/Writing/WritingException.h +++ b/src/ZoneWriting/Writing/WritingException.h @@ -1,5 +1,4 @@ #pragma once -#include "Utils/ClassUtils.h" #include #include @@ -11,6 +10,6 @@ class WritingException final : public std::exception public: explicit WritingException(std::string message); - _NODISCARD char const* what() const noexcept override; - _NODISCARD const std::string& Message() const; + [[nodiscard]] char const* what() const noexcept override; + [[nodiscard]] const std::string& Message() const; }; diff --git a/test/ObjLoadingTests/Parsing/Menu/Sequence/EventHandlerSetScopeSequencesTests.cpp b/test/ObjLoadingTests/Parsing/Menu/Sequence/EventHandlerSetScopeSequencesTests.cpp index 5f274175..cecd72ce 100644 --- a/test/ObjLoadingTests/Parsing/Menu/Sequence/EventHandlerSetScopeSequencesTests.cpp +++ b/test/ObjLoadingTests/Parsing/Menu/Sequence/EventHandlerSetScopeSequencesTests.cpp @@ -2,7 +2,6 @@ #include "Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h" #include "Parsing/Menu/Sequence/EventHandlerSetScopeSequences.h" #include "Parsing/Mock/MockLexer.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp b/test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp index da457fe1..b967cb3d 100644 --- a/test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp +++ b/test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp @@ -1,6 +1,5 @@ #include "Parsing/Menu/Sequence/ItemScopeSequences.h" #include "Parsing/Mock/MockLexer.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/test/ParserTestUtils/Parsing/Mock/MockLexer.h b/test/ParserTestUtils/Parsing/Mock/MockLexer.h index f48c303a..a12682a3 100644 --- a/test/ParserTestUtils/Parsing/Mock/MockLexer.h +++ b/test/ParserTestUtils/Parsing/Mock/MockLexer.h @@ -55,12 +55,12 @@ public: return !m_tokens.empty() && m_pop_count < m_tokens.size() ? m_tokens[m_pop_count].GetPos() : m_eof.GetPos(); } - _NODISCARD size_t GetPopCount() const + [[nodiscard]] size_t GetPopCount() const { return m_pop_count; } - _NODISCARD ParserLine GetLineForPos(const TokenPos& pos) const override + [[nodiscard]] ParserLine GetLineForPos(const TokenPos& pos) const override { return ParserLine(); } diff --git a/test/ParserTestUtils/Parsing/Mock/MockPackValueSupplier.h b/test/ParserTestUtils/Parsing/Mock/MockPackValueSupplier.h index 7c668183..a0732cba 100644 --- a/test/ParserTestUtils/Parsing/Mock/MockPackValueSupplier.h +++ b/test/ParserTestUtils/Parsing/Mock/MockPackValueSupplier.h @@ -1,10 +1,9 @@ #pragma once #include "Parsing/IPackValueSupplier.h" -#include "Utils/ClassUtils.h" class MockPackValueSupplier final : public IPackValueSupplier { public: - _NODISCARD int GetCurrentPack() const override; + [[nodiscard]] int GetCurrentPack() const override; }; diff --git a/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.h b/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.h index 8d7b28f9..ba64dddc 100644 --- a/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.h +++ b/test/ParserTestUtils/Parsing/Mock/MockParserLineStream.h @@ -31,6 +31,6 @@ public: ParserLine NextLine() override; bool IncludeFile(const std::string& filename) override; void PopCurrentFile() override; - _NODISCARD bool IsOpen() const override; - _NODISCARD bool Eof() const override; + [[nodiscard]] bool IsOpen() const override; + [[nodiscard]] bool Eof() const override; }; diff --git a/test/ParserTests/Parsing/Simple/SimpleExpressionTests.cpp b/test/ParserTests/Parsing/Simple/SimpleExpressionTests.cpp index 2e2778a7..4c41db56 100644 --- a/test/ParserTests/Parsing/Simple/SimpleExpressionTests.cpp +++ b/test/ParserTests/Parsing/Simple/SimpleExpressionTests.cpp @@ -5,7 +5,6 @@ #include "Parsing/Simple/Expression/SimpleExpressionMatchers.h" #include "Parsing/Simple/Matcher/SimpleMatcherFactory.h" #include "Parsing/Simple/SimpleParserValue.h" -#include "Utils/ClassUtils.h" #include #include @@ -51,7 +50,7 @@ namespace test::parsing::simple::expression { } - _NODISCARD SimpleExpressionTestState* GetState() const + [[nodiscard]] SimpleExpressionTestState* GetState() const { return m_state.get(); } @@ -129,7 +128,7 @@ namespace test::parsing::simple::expression return m_sequence->MatchSequence(m_lexer.get(), m_state, m_consumed_token_count); } - _NODISCARD bool PerformIntegrationTest() const + [[nodiscard]] bool PerformIntegrationTest() const { REQUIRE(m_lexer); REQUIRE(m_parser); diff --git a/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceActionTests.cpp b/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceActionTests.cpp index ef9aeea2..e0061bcf 100644 --- a/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceActionTests.cpp +++ b/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceActionTests.cpp @@ -3,7 +3,6 @@ #include "Parsing/PostProcessing/CreateMemberInformationPostProcessor.h" #include "Parsing/PostProcessing/CreateStructureInformationPostProcessor.h" #include "Persistence/InMemory/InMemoryRepository.h" -#include "Utils/ClassUtils.h" #include #include @@ -52,7 +51,7 @@ namespace test::parsing::commands::sequence::sequence_action REQUIRE(m_arg_struct3 != nullptr); } - _NODISCARD bool CreateInformation() const + [[nodiscard]] bool CreateInformation() const { auto createStructureInformation = std::make_unique(); auto createMemberInformation = std::make_unique(); diff --git a/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceArchitectureTests.cpp b/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceArchitectureTests.cpp index 9a469239..0b87f0e3 100644 --- a/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceArchitectureTests.cpp +++ b/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceArchitectureTests.cpp @@ -1,7 +1,6 @@ #include "Parsing/Commands/Sequence/SequenceArchitecture.h" #include "Parsing/Mock/MockLexer.h" #include "Persistence/InMemory/InMemoryRepository.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceGameTests.cpp b/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceGameTests.cpp index 1a800565..681acc1f 100644 --- a/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceGameTests.cpp +++ b/test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceGameTests.cpp @@ -1,7 +1,6 @@ #include "Parsing/Commands/Sequence/SequenceGame.h" #include "Parsing/Mock/MockLexer.h" #include "Persistence/InMemory/InMemoryRepository.h" -#include "Utils/ClassUtils.h" #include #include diff --git a/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp b/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp index be3b0046..69e67e3f 100644 --- a/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp +++ b/test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp @@ -3,7 +3,6 @@ #include "Parsing/Impl/DefinesStreamProxy.h" #include "Parsing/Mock/MockLexer.h" #include "Parsing/Mock/MockSequence.h" -#include "Utils/ClassUtils.h" #include #include @@ -52,7 +51,7 @@ namespace test::parsing::matcher m_sequence->AddMockLabeledMatchers(matchers, label); } - _NODISCARD factory_t Factory() const + [[nodiscard]] factory_t Factory() const { return HeaderMatcherFactory(m_sequence->GetLabelSupplier()); } @@ -69,7 +68,7 @@ namespace test::parsing::matcher return m_sequence->MatchSequence(m_lexer.get(), m_mock_state.get(), m_consumed_token_count); } - _NODISCARD unsigned GetConsumedTokenCount() const + [[nodiscard]] unsigned GetConsumedTokenCount() const { return m_consumed_token_count; }