mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 13:36:44 +00:00
Code Issues Releases Wiki Activity

RefId's mId can't be get as mutable from the outside

Browse source 
also removed useless operator= defintion
This commit is contained in:
fteppe 2022-10-03 13:47:23 +02:00 committed by florent.teppe
parent d6d2a37d03
commit ee941f9b09
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwworld/esmstore.cpp
View file

@ -431,7 +431,6 @@ namespace MWWorld
{ {
ESM::RefId& refId = refIDs[value.mRefID]; ESM::RefId& refId = refIDs[value.mRefID];
// We manually lower case IDs here for the time being to improve performance. // We manually lower case IDs here for the time being to improve performance.
Misc::StringUtils::lowerCaseInPlace(refId.getRefIdString());
++mRefCount[std::move(refId)]; ++mRefCount[std::move(refId)];
} }
}; };

8
components/esm/refid.hpp
View file

@ -12,16 +12,16 @@ namespace ESM
void clear() { mId.clear(); } void clear() { mId.clear(); }
bool empty() const { return mId.empty(); } bool empty() const { return mId.empty(); }
void swap(RefId& rhs) { mId.swap(rhs.mId); } void swap(RefId& rhs) { mId.swap(rhs.mId); }
bool operator==(const RefId& rhs) const { return mId == rhs.mId; } bool operator==(const RefId& rhs) const { return ciEqual(*this, rhs); }
void operator=(const RefId& rhs) { mId = rhs.mId; }
bool operator<(const RefId& rhs) const { return mId < rhs.mId; } bool operator<(const RefId& rhs) const { return mId < rhs.mId; }
bool operator>(const RefId& rhs) const { return mId > rhs.mId; } bool operator>(const RefId& rhs) const { return mId > rhs.mId; }
static bool ciEqual(const RefId& left, const RefId& right); static bool ciEqual(const RefId& left, const RefId& right);
friend std::ostream& operator<<(std::ostream& os, const RefId& dt); friend std::ostream& operator<<(std::ostream& os, const RefId& dt);
static RefId stringRefId(const std::string_view& id); //The //The 2 following functions are used to move back and forth between string and RefID. Used for hard coded RefIds that are as string in the code.
std::string& getRefIdString() { return mId; } //For serialization, and display. Using explicit conversions make it very clear where in the code we need to convert from string to RefId and Vice versa.
static RefId stringRefId(const std::string_view& id);
const std::string& getRefIdString() const { return mId; } const std::string& getRefIdString() const { return mId; }

1
components/esmloader/load.cpp
View file

@ -82,7 +82,6 @@ namespace EsmLoader
T record; T record;
bool deleted = false; bool deleted = false;
record.load(reader, deleted); record.load(reader, deleted);
Misc::StringUtils::lowerCaseInPlace(record.mId.getRefIdString());
if (Misc::ResourceHelpers::isHiddenMarker(record.mId.getRefIdString())) if (Misc::ResourceHelpers::isHiddenMarker(record.mId.getRefIdString()))
return; return;
records.emplace_back(deleted, std::move(record)); records.emplace_back(deleted, std::move(record));