mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 09:45:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'move' into 'master'

Browse source 
Move local variables in GUI code

See merge request OpenMW/openmw!3758
This commit is contained in:
psi29a 2024-01-10 19:05:01 +00:00
commit a0890259e1
7 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,8 +395,10 @@ namespace MWGui
{
std::string suggestedName = mAlchemy->suggestPotionName();
if (suggestedName != mSuggestedPotionName)
{
mNameEdit->setCaptionWithReplacing(suggestedName);
mSuggestedPotionName = suggestedName;
mSuggestedPotionName = std::move(suggestedName);
}
mSortModel->clearDragItems();

2
apps/openmw/mwgui/bookpage.cpp
View file

@ -1065,7 +1065,7 @@ namespace MWGui
{
createActiveFormats(newBook);
mBook = newBook;
mBook = std::move(newBook);
setPage(newPage);
if (newPage < mBook->mPages.size())

2
apps/openmw/mwgui/console.cpp
View file

@ -440,7 +440,7 @@ namespace MWGui
// If new search term reset position, otherwise continue from current position
if (newSearchTerm != mCurrentSearchTerm)
{
mCurrentSearchTerm = newSearchTerm;
mCurrentSearchTerm = std::move(newSearchTerm);
mCurrentOccurrenceIndex = std::string::npos;
}

2
apps/openmw/mwgui/formatting.cpp
View file

@ -221,7 +221,7 @@ namespace MWGui::Formatting
}
}
mAttributes[key] = value;
mAttributes[key] = std::move(value);
}
}

2
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -472,7 +472,7 @@ namespace MWGui
ESM::EffectList effectList;
effectList.mList = mEffects;
mSpell.mEffects = effectList;
mSpell.mEffects = std::move(effectList);
mSpell.mData.mCost = int(y);
mSpell.mData.mType = ESM::Spell::ST_Spell;
mSpell.mData.mFlags = 0;

2
apps/openmw/mwgui/spellicons.cpp
View file

@ -172,7 +172,7 @@ namespace MWGui
w += 16;
ToolTipInfo* tooltipInfo = image->getUserData<ToolTipInfo>();
tooltipInfo->text = sourcesDescription;
tooltipInfo->text = std::move(sourcesDescription);
// Fade out
if (totalDuration >= fadeTime && fadeTime > 0.f)

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

@ -251,7 +251,7 @@ namespace MWGui
if (!cost.empty() && cost != "0")
info.text
+= MWGui::ToolTips::getValueString(MWMechanics::calcSpellCost(*spell), "#{sCastCost}");
info.effects = effects;
info.effects = std::move(effects);
tooltipSize = createToolTip(info);
}
else if (type == "Layout")