zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-18 02:43: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

2
src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.h
View File

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

3
src/ObjLoading/ObjContainer/IPak/IPakStreamManager.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "Utils/ClassUtils.h"
#include "Utils/ObjStream.h"
#include <cstdint>
@@ -30,5 +29,5 @@ public:
IPakStreamManager& operator=(const IPakStreamManager& other) = delete;
IPakStreamManager& operator=(IPakStreamManager&& other) noexcept = delete;
_NODISCARD std::unique_ptr<iobjstream> OpenStream(int64_t startPosition, size_t length) const;
[[nodiscard]] std::unique_ptr<iobjstream> OpenStream(int64_t startPosition, size_t length) const;
};

9
src/ObjLoading/ObjContainer/SoundBank/SoundBank.h
View File

@@ -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<std::istream> 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<std::string>& GetDependencies() const;
[[nodiscard]] const std::vector<std::string>& 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;
};