diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/frontend/StarChatBubbleSeparation.hpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/frontend/StarChatBubbleSeparation.hpp')
-rw-r--r-- | source/frontend/StarChatBubbleSeparation.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/frontend/StarChatBubbleSeparation.hpp b/source/frontend/StarChatBubbleSeparation.hpp index 4bbf018..dfe5167 100644 --- a/source/frontend/StarChatBubbleSeparation.hpp +++ b/source/frontend/StarChatBubbleSeparation.hpp @@ -112,7 +112,7 @@ void BubbleSeparator<T>::addBubble(Vec2F position, RectF boundBox, T contents, u Vec2F separatedOffset = separated.min() - boundBox.min(); Vec2F separatedPosition = position + separatedOffset; Bubble bubble = Bubble{ contents, position, position, boundBox, separatedOffset, separated, separatedOffset, separatedPosition }; - m_bubbles.insertSorted(move(bubble), &BubbleSeparator<T>::compareBubbleY); + m_bubbles.insertSorted(std::move(bubble), &BubbleSeparator<T>::compareBubbleY); } template <typename T> @@ -136,8 +136,8 @@ template <typename T> void BubbleSeparator<T>::forEach(function<void(Bubble&, T&)> func) { bool anyMoved = false; - List<Box<float, 2>> leftEdges = move(m_sortedLeftEdges); - List<Box<float, 2>> rightEdges = move(m_sortedRightEdges); + List<Box<float, 2>> leftEdges = std::move(m_sortedLeftEdges); + List<Box<float, 2>> rightEdges = std::move(m_sortedRightEdges); m_bubbles.exec([this, func, &anyMoved, &leftEdges, &rightEdges](Bubble& bubble) { RectF oldBoundBox = bubble.boundBox; |