mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2026-09-10 07:57:05 +00:00
chore: replace all usages of removed ClassUtils macros
This commit is contained in:
@@ -20,6 +20,6 @@ namespace menu
|
||||
std::unique_ptr<CommonEventHandlerSet> conditionElements,
|
||||
std::unique_ptr<CommonEventHandlerSet> elseElements);
|
||||
|
||||
_NODISCARD CommonEventHandlerElementType GetType() const override;
|
||||
[[nodiscard]] CommonEventHandlerElementType GetType() const override;
|
||||
};
|
||||
} // namespace menu
|
||||
|
||||
@@ -14,6 +14,6 @@ namespace menu
|
||||
CommonEventHandlerScript();
|
||||
explicit CommonEventHandlerScript(std::string script);
|
||||
|
||||
_NODISCARD CommonEventHandlerElementType GetType() const override;
|
||||
[[nodiscard]] CommonEventHandlerElementType GetType() const override;
|
||||
};
|
||||
} // namespace menu
|
||||
|
||||
@@ -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<ISimpleExpression> value);
|
||||
|
||||
_NODISCARD CommonEventHandlerElementType GetType() const override;
|
||||
[[nodiscard]] CommonEventHandlerElementType GetType() const override;
|
||||
};
|
||||
} // namespace menu
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "Parsing/Simple/Expression/ISimpleExpression.h"
|
||||
|
||||
#include <vector>
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user