mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 04:39:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_copy_init' into 'master'

Browse source 
Fix unnecessary-copy-initialization

See merge request OpenMW/openmw!1531
This commit is contained in:
psi29a 2022-01-05 09:05:57 +00:00
commit 24b9c91ef8
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/tooltips.cpp
View file

@ -650,7 +650,7 @@ namespace MWGui
std::string ToolTips::getSoulString(const MWWorld::CellRef& cellref)
{
std::string soul = cellref.getSoul();
const std::string& soul = cellref.getSoul();
if (soul.empty())
return std::string();
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
@ -666,7 +666,7 @@ namespace MWGui
{
std::string ret;
ret += getMiscString(cellref.getOwner(), "Owner");
const std::string factionId = cellref.getFaction();
const std::string& factionId = cellref.getFaction();
if (!factionId.empty())
{
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();

2
apps/openmw/mwmechanics/magiceffects.cpp
View file

@ -137,7 +137,7 @@ namespace MWMechanics
{
if (this==&effects)
{
MagicEffects temp (effects);
const MagicEffects& temp (effects);
*this += temp;
return *this;
}

2
apps/wizard/inisettings.cpp
View file

@ -122,7 +122,7 @@ bool Wizard::IniSettings::writeFile(const QString &path, QTextStream &stream)
QString section(fullKey.at(0));
section.prepend(QLatin1Char('['));
section.append(QLatin1Char(']'));
QString key(fullKey.at(1));
const QString& key(fullKey.at(1));
int index = buffer.lastIndexOf(section);
if (index == -1) {

4
components/detournavigator/navigatorutils.cpp
View file

@ -11,7 +11,7 @@ namespace DetourNavigator
const auto navMesh = navigator.getNavMesh(agentHalfExtents);
if (!navMesh)
return std::nullopt;
const auto settings = navigator.getSettings();
const auto& settings = navigator.getSettings();
const auto result = DetourNavigator::findRandomPointAroundCircle(navMesh->lockConst()->getImpl(),
toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
toNavMeshCoordinates(settings.mRecast, maxRadius), includeFlags, settings.mDetour);
@ -26,7 +26,7 @@ namespace DetourNavigator
const auto navMesh = navigator.getNavMesh(agentHalfExtents);
if (navMesh == nullptr)
return std::nullopt;
const auto settings = navigator.getSettings();
const auto& settings = navigator.getSettings();
const auto result = DetourNavigator::raycast(navMesh->lockConst()->getImpl(),
toNavMeshCoordinates(settings.mRecast, agentHalfExtents), toNavMeshCoordinates(settings.mRecast, start),
toNavMeshCoordinates(settings.mRecast, end), includeFlags, settings.mDetour);

2
components/esm/esmreader.cpp
View file

@ -70,7 +70,7 @@ void ESMReader::resolveParentFileIndices(const std::vector<ESMReader>& allPlugin
const ESMReader& reader = allPlugins.at(i);
if (reader.getFileSize() == 0)
continue; // Content file in non-ESM format
const std::string candidate = reader.getName();
const std::string& candidate = reader.getName();
std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
index = i;