From 9db9df95e29e9b95fabd01b2c9c99da9aa5def3b Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Thu, 14 Aug 2025 11:19:13 +0200 Subject: [PATCH] Address more simple Coverity defects --- apps/openmw/mwgui/spellmodel.cpp | 2 +- apps/openmw/mwlua/types/player.cpp | 10 +++++----- apps/openmw/mwlua/uibindings.cpp | 6 +++--- apps/openmw/mwworld/projectilemanager.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp index 06bc8a2ee9..5a732d771c 100644 --- a/apps/openmw/mwgui/spellmodel.cpp +++ b/apps/openmw/mwgui/spellmodel.cpp @@ -106,7 +106,7 @@ namespace MWGui newSpell.mSelected = (MWBase::Environment::get().getWindowManager()->getSelectedSpell() == spell->mId); newSpell.mActive = true; newSpell.mCount = 1; - mSpells.push_back(newSpell); + mSpells.push_back(std::move(newSpell)); } MWWorld::InventoryStore& invStore = mActor.getClass().getInventoryStore(mActor); diff --git a/apps/openmw/mwlua/types/player.cpp b/apps/openmw/mwlua/types/player.cpp index 1eba2be37a..db794b2301 100644 --- a/apps/openmw/mwlua/types/player.cpp +++ b/apps/openmw/mwlua/types/player.cpp @@ -218,10 +218,10 @@ namespace MWLua }; topicEntryBindingsClass["id"] = sol::readonly_property( [](const MWDialogue::Entry& topicEntry) { return topicEntry.mInfoId.serializeText(); }); - topicEntryBindingsClass["text"] - = sol::readonly_property([](const MWDialogue::Entry& topicEntry) { return topicEntry.mText; }); - topicEntryBindingsClass["actor"] - = sol::readonly_property([](const MWDialogue::Entry& topicEntry) { return topicEntry.mActorName; }); + topicEntryBindingsClass["text"] = sol::readonly_property( + [](const MWDialogue::Entry& topicEntry) -> std::string_view { return topicEntry.mText; }); + topicEntryBindingsClass["actor"] = sol::readonly_property( + [](const MWDialogue::Entry& topicEntry) -> std::string_view { return topicEntry.mActorName; }); } void addJournalClassJournalEntriesListBindings(sol::state_view& lua, const MWBase::Journal* journal) @@ -255,7 +255,7 @@ namespace MWLua journalEntryBindingsClass["id"] = sol::readonly_property( [](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mInfoId.serializeText(); }); journalEntryBindingsClass["text"] = sol::readonly_property( - [](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mText; }); + [](const MWDialogue::StampedJournalEntry& journalEntry) -> std::string_view { return journalEntry.mText; }); journalEntryBindingsClass["questId"] = sol::readonly_property( [](const MWDialogue::StampedJournalEntry& journalEntry) { return journalEntry.mTopic.serializeText(); }); journalEntryBindingsClass["day"] = sol::readonly_property( diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp index 61b1671087..8faf4615ce 100644 --- a/apps/openmw/mwlua/uibindings.cpp +++ b/apps/openmw/mwlua/uibindings.cpp @@ -164,7 +164,7 @@ namespace MWLua else return LuaUtil::toLuaIndex(index); }; - layersTable["insertAfter"] = [context](std::string afterName, std::string_view name, const sol::object& opt) { + layersTable["insertAfter"] = [context](std::string afterName, std::string name, const sol::object& opt) { LuaUi::Layer::Options options; options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true); context.mLuaManager->addAction( @@ -177,11 +177,11 @@ namespace MWLua }, "Insert after UI layer"); }; - layersTable["insertBefore"] = [context](std::string beforeName, std::string_view name, const sol::object& opt) { + layersTable["insertBefore"] = [context](std::string beforeName, std::string name, const sol::object& opt) { LuaUi::Layer::Options options; options.mInteractive = LuaUtil::getValueOrDefault(LuaUtil::getFieldOrNil(opt, "interactive"), true); context.mLuaManager->addAction( - [=]() { + [beforeName = std::move(beforeName), name = std::move(name), options]() { size_t index = LuaUi::Layer::indexOf(beforeName); if (index == LuaUi::Layer::count()) throw std::logic_error( diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp index 2d6a2e7dce..1186316bb1 100644 --- a/apps/openmw/mwworld/projectilemanager.cpp +++ b/apps/openmw/mwworld/projectilemanager.cpp @@ -786,7 +786,7 @@ namespace MWWorld state.mSounds.push_back(sound); } - mMagicBolts.push_back(state); + mMagicBolts.push_back(std::move(state)); return true; }