zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-15 17:33:03 +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

10
src/ZoneCommon/Zone/Definition/Parsing/Matcher/ZoneDefinitionMatcherFactory.h
View File

@@ -10,9 +10,9 @@ class ZoneDefinitionMatcherFactory final : public AbstractMatcherFactory<ZoneDef
public:
explicit ZoneDefinitionMatcherFactory(const IMatcherForLabelSupplier<ZoneDefinitionParserValue>* labelSupplier);
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Type(ZoneDefinitionParserValueType type) const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Keyword(std::string keyword) const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Field() const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> String() const;
_NODISCARD MatcherFactoryWrapper<ZoneDefinitionParserValue> Char(char c) const;
[[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Type(ZoneDefinitionParserValueType type) const;
[[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Keyword(std::string keyword) const;
[[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Field() const;
[[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> String() const;
[[nodiscard]] MatcherFactoryWrapper<ZoneDefinitionParserValue> Char(char c) const;
};

13
src/ZoneCommon/Zone/Definition/Parsing/ZoneDefinitionParserValue.h
View File

@@ -2,7 +2,6 @@
#include "Parsing/IParserValue.h"
#include "Parsing/TokenPos.h"
#include "Utils/ClassUtils.h"
#include <string>
@@ -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;
};

5
src/ZoneCommon/Zone/XChunk/XChunkException.h
View File

@@ -1,5 +1,4 @@
#pragma once
#include "Utils/ClassUtils.h"
#include <exception>
#include <string>
@@ -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;
};

21
src/ZoneCommon/Zone/ZoneScriptStrings.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "Utils/ClassUtils.h"
#include "Zone/ZoneTypes.h"
#include <cstddef>
@@ -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<std::string>::const_iterator begin() const;
_NODISCARD std::vector<std::string>::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<std::string>::const_iterator begin() const;
[[nodiscard]] std::vector<std::string>::const_iterator end() const;
};