diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:47:10 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:47:10 +1100 |
commit | 1c89042016c739815b2d70bcbef4673eef6b63e0 (patch) | |
tree | f7c8e96e744222857c613e5fd14720d2695613c3 /source/frontend/StarChatBubbleManager.cpp | |
parent | 30e1871d3f44629e00a1f66d8164e3e62c7f889f (diff) | |
parent | 7c4fbad2ba7d79580a9ebbf9fde1de117be4d08e (diff) |
Merge pull request #19 from kblaschke/fix-compiler-warnings
Fixed a huge amount of Clang warnings
Diffstat (limited to 'source/frontend/StarChatBubbleManager.cpp')
-rw-r--r-- | source/frontend/StarChatBubbleManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/frontend/StarChatBubbleManager.cpp b/source/frontend/StarChatBubbleManager.cpp index 166eba0..3137353 100644 --- a/source/frontend/StarChatBubbleManager.cpp +++ b/source/frontend/StarChatBubbleManager.cpp @@ -265,12 +265,12 @@ void ChatBubbleManager::addChatActions(List<ChatAction> chatActions, bool silent RectF boundBox = fold(backgroundImages, RectF::null(), [pos, this](RectF const& boundBox, BubbleImage const& bubbleImage) { return boundBox.combined(bubbleImageRect(pos, bubbleImage, m_zoom)); }); - Bubble bubble = {sayAction.entity, sayAction.text, sayAction.config, 0, move(backgroundImages), move(bubbleTexts), false}; + Bubble bubble = {sayAction.entity, sayAction.text, sayAction.config, 0, std::move(backgroundImages), std::move(bubbleTexts), false}; List<BubbleState<Bubble>> oldBubbles = m_bubbles.filtered([&sayAction](BubbleState<Bubble> const&, Bubble const& bubble) { return bubble.entity == sayAction.entity; }); m_bubbles.filter([&sayAction](BubbleState<Bubble> const&, Bubble const& bubble) { return bubble.entity != sayAction.entity; }); - m_bubbles.addBubble(pos, boundBox, move(bubble), m_interBubbleMargin * m_zoom); + m_bubbles.addBubble(pos, boundBox, std::move(bubble), m_interBubbleMargin * m_zoom); oldBubbles.sort([](BubbleState<Bubble> const& a, BubbleState<Bubble> const& b) { return a.contents.age < b.contents.age; }); for (auto bubble : oldBubbles.slice(0, m_maxMessagePerEntity - 1)) m_bubbles.addBubble(bubble.idealDestination, bubble.boundBox, bubble.contents, 0); @@ -300,8 +300,8 @@ void ChatBubbleManager::addChatActions(List<ChatAction> chatActions, bool silent portraitAction.position, portraitAction.config, 0, - move(backgroundImages), - move(bubbleTexts), + std::move(backgroundImages), + std::move(bubbleTexts), false }); } |