zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-16 09:53:04 +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

2
src/RawTemplater/RawTemplater.cpp
View File

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

4
src/RawTemplater/Templating/DirectiveEscapeStreamProxy.h
View File

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

9
src/RawTemplater/Templating/SetDefineStreamProxy.h
View File

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

15
src/RawTemplater/Templating/Templater.cpp
View File

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

4
src/RawTemplater/Templating/Templater.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "Parsing/IParserLineStream.h"
#include "Utils/ClassUtils.h"
#include <string>
@@ -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;

15
src/RawTemplater/Templating/TemplatingStreamProxy.h
View File

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