INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-17 18:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make InfoStringDumper scriptstring callback return std::string instead of const std::string& since a reference is not needed

Browse Source
This commit is contained in:
Jan
2020-10-23 13:26:32 +02:00
parent 99195232bb
commit 2e61f46544
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ObjCommon/Utils/InfoString.cpp
View File

@ -117,7 +117,7 @@ InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void*
{
}
InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function<const std::string&(scr_string_t)> scriptStringValueCallback)
InfoStringFromStructConverterBase::InfoStringFromStructConverterBase(const void* structure, std::function<std::string(scr_string_t)> scriptStringValueCallback)
: m_structure(structure),
m_get_scr_string(std::move(scriptStringValueCallback))
{
@ -132,7 +132,7 @@ InfoString InfoStringFromStructConverterBase::Convert()
return std::move(m_info_string);
}
void InfoStringFromStructConverterBase::FillFromString(const std::string& key, size_t offset)
void InfoStringFromStructConverterBase::FillFromString(const std::string& key, const size_t offset)
{
const auto* str = *reinterpret_cast<const char**>(reinterpret_cast<uintptr_t>(m_structure) + offset);

4
src/ObjCommon/Utils/InfoString.h
View File

@ -50,7 +50,7 @@ class InfoStringFromStructConverterBase
protected:
InfoString m_info_string;
const void* m_structure;
const std::function<const std::string&(scr_string_t)> m_get_scr_string;
const std::function<std::string(scr_string_t)> m_get_scr_string;
void FillFromString(const std::string& key, size_t offset);
void FillFromStringBuffer(const std::string& key, size_t offset, size_t bufferSize);
@ -67,7 +67,7 @@ protected:
public:
explicit InfoStringFromStructConverterBase(const void* structure);
InfoStringFromStructConverterBase(const void* structure, std::function<const std::string&(scr_string_t)> scriptStringValueCallback);
InfoStringFromStructConverterBase(const void* structure, std::function<std::string(scr_string_t)> scriptStringValueCallback);
virtual ~InfoStringFromStructConverterBase();
InfoStringFromStructConverterBase(const InfoStringFromStructConverterBase& other) = delete;
InfoStringFromStructConverterBase(InfoStringFromStructConverterBase&& other) noexcept = delete;