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/rendering/StarTextPainter.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/rendering/StarTextPainter.cpp')
-rw-r--r-- | source/rendering/StarTextPainter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/rendering/StarTextPainter.cpp b/source/rendering/StarTextPainter.cpp index 748aa52..fe352d1 100644 --- a/source/rendering/StarTextPainter.cpp +++ b/source/rendering/StarTextPainter.cpp @@ -279,7 +279,7 @@ StringList TextPainter::wrapText(StringView s, Maybe<unsigned> wrapWidth) { int lastLine = 0; TextPainter::WrapTextCallback textCallback = [&](StringView text, int line) { if (lastLine != line) { - result.append(move(current)); + result.append(std::move(current)); lastLine = line; } @@ -290,7 +290,7 @@ StringList TextPainter::wrapText(StringView s, Maybe<unsigned> wrapWidth) { processWrapText(s, wrapWidth.ptr(), textCallback); if (!current.empty()) - result.append(move(current)); + result.append(std::move(current)); return result; }; @@ -312,7 +312,7 @@ void TextPainter::setMode(FontMode mode) { } void TextPainter::setFontColor(Vec4B color) { - m_renderSettings.color = move(color); + m_renderSettings.color = std::move(color); } void TextPainter::setProcessingDirectives(StringView directives) { @@ -411,7 +411,7 @@ RectF TextPainter::doRenderText(StringView s, TextPositioning const& position, b break; } - m_renderSettings = move(backupRenderSettings); + m_renderSettings = std::move(backupRenderSettings); return bounds; } |