diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp index 5635a5d00a..e9a39cceff 100644 --- a/apps/openmw/mwclass/container.cpp +++ b/apps/openmw/mwclass/container.cpp @@ -152,8 +152,8 @@ namespace MWClass return action; } - const ESM::RefId& lockedSound = ESM::RefId::stringRefId("LockedChest"); - const ESM::RefId& trapActivationSound = ESM::RefId::stringRefId("Disarm Trap Fail"); + static const ESM::RefId lockedSound = ESM::RefId::stringRefId("LockedChest"); + static const ESM::RefId trapActivationSound = ESM::RefId::stringRefId("Disarm Trap Fail"); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::InventoryStore& invStore = player.getClass().getInventoryStore(player); diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 620a1c3cf6..ac144c2acf 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -804,7 +804,7 @@ namespace MWGui return mMessageBoxManager->readPressedButton(); } - std::string_view WindowManager::getGameSettingString(const std::string_view& id, std::string_view default_) + std::string_view WindowManager::getGameSettingString(const std::string_view id, std::string_view default_) { const ESM::GameSetting* setting = mStore->get().search(id); diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp index abca6ddcab..85ce9f5035 100644 --- a/apps/openmw/mwgui/windowmanagerimp.hpp +++ b/apps/openmw/mwgui/windowmanagerimp.hpp @@ -283,7 +283,7 @@ namespace MWGui * @param id Identifier for the GMST setting, e.g. "aName" * @param default Default value if the GMST setting cannot be used. */ - std::string_view getGameSettingString(const std::string_view& id, std::string_view default_) override; + std::string_view getGameSettingString(const std::string_view id, std::string_view default_) override; void processChangedSettings(const Settings::CategorySettingVector& changed) override; diff --git a/components/esm/refid.cpp b/components/esm/refid.cpp index 5bac30f8a4..b69dbc6fb3 100644 --- a/components/esm/refid.cpp +++ b/components/esm/refid.cpp @@ -19,7 +19,7 @@ namespace ESM return os; } - RefId RefId::stringRefId(const std::string_view & id) + RefId RefId::stringRefId(std::string_view id) { RefId newRefId; newRefId.mId = Misc::StringUtils::lowerCase(id); diff --git a/components/esm/refid.hpp b/components/esm/refid.hpp index a36fe3165b..008fd1f6b2 100644 --- a/components/esm/refid.hpp +++ b/components/esm/refid.hpp @@ -3,6 +3,7 @@ #include #include #include +#include namespace ESM { @@ -19,7 +20,7 @@ namespace ESM //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. //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); + static RefId stringRefId(std::string_view id); const std::string& getRefIdString() const { return mId; }