zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-07 05:23:02 +00:00
Code Activity

chore: replace all usages of removed ClassUtils macros

Browse Source
This commit is contained in:
Jan Laupetin
2026-03-05 22:31:07 +00:00
parent bc16febfe2
commit 90d7f92ddd
104 changed files with 244 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/ObjLoadingTests/Parsing/Menu/Sequence/EventHandlerSetScopeSequencesTests.cpp
View File

@@ -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 <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>

1
test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp
View File

@@ -1,6 +1,5 @@
#include "Parsing/Menu/Sequence/ItemScopeSequences.h"
#include "Parsing/Mock/MockLexer.h"
#include "Utils/ClassUtils.h"
#include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>

4
test/ParserTestUtils/Parsing/Mock/MockLexer.h
View File

@@ -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();
}

3
test/ParserTestUtils/Parsing/Mock/MockPackValueSupplier.h
View File

@@ -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;
};

4
test/ParserTestUtils/Parsing/Mock/MockParserLineStream.h
View File

@@ -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;
};

5
test/ParserTests/Parsing/Simple/SimpleExpressionTests.cpp
View File

@@ -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 <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>
@@ -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);

3
test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceActionTests.cpp
View File

@@ -3,7 +3,6 @@
#include "Parsing/PostProcessing/CreateMemberInformationPostProcessor.h"
#include "Parsing/PostProcessing/CreateStructureInformationPostProcessor.h"
#include "Persistence/InMemory/InMemoryRepository.h"
#include "Utils/ClassUtils.h"
#include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>
@@ -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<CreateStructureInformationPostProcessor>();
auto createMemberInformation = std::make_unique<CreateMemberInformationPostProcessor>();

1
test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceArchitectureTests.cpp
View File

@@ -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 <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>

1
test/ZoneCodeGeneratorLibTests/Parsing/Commands/Sequence/SequenceGameTests.cpp
View File

@@ -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 <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>

5
test/ZoneCodeGeneratorLibTests/Parsing/Matcher/MatcherTests.cpp
View File

@@ -3,7 +3,6 @@
#include "Parsing/Impl/DefinesStreamProxy.h"
#include "Parsing/Mock/MockLexer.h"
#include "Parsing/Mock/MockSequence.h"
#include "Utils/ClassUtils.h"
#include <algorithm>
#include <catch2/catch_test_macros.hpp>
@@ -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;
}