From 8b938faf017f45b49ac5de001109796a30738be1 Mon Sep 17 00:00:00 2001 From: paxcut Date: Tue, 17 Mar 2026 03:09:22 -0700 Subject: [PATCH] fixes for compilation errors --- plugins/ui/source/ui/text_editor/codeFolder.cpp | 8 ++++---- plugins/ui/source/ui/text_editor/render.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/ui/source/ui/text_editor/codeFolder.cpp b/plugins/ui/source/ui/text_editor/codeFolder.cpp index 4c73d9f03..a61b245fd 100644 --- a/plugins/ui/source/ui/text_editor/codeFolder.cpp +++ b/plugins/ui/source/ui/text_editor/codeFolder.cpp @@ -169,7 +169,8 @@ namespace hex::ui { m_curr = tokenStart + start; Token::Separator openSeparator = Token::Separator::EndOfProgram; Token::Separator closeSeparator = Token::Separator::EndOfProgram; - Token::Operator openOperator, closeOperator; + Token::Operator openOperator = Token::Operator{}; + Token::Operator closeOperator = Token::Operator{}; if (delimiters == "{}") { openSeparator = Token::Separator::LeftBrace; closeSeparator = Token::Separator::RightBrace; @@ -552,7 +553,7 @@ namespace hex::ui { } void TextEditor::Lines::closeCodeFold(const Range &key, bool userTriggered) { - float topRow; + float topRow = 0.0f; if (userTriggered) { topRow = m_topRow; @@ -768,8 +769,7 @@ namespace hex::ui { m_curr += -std::min(-count,id); } - constexpr static u32 Normal = 0; - constexpr static u32 Not = 1; + enum : u32 { Normal = 0, Not = 1 }; bool TextEditor::Lines::begin() { m_originalPosition = m_curr; diff --git a/plugins/ui/source/ui/text_editor/render.cpp b/plugins/ui/source/ui/text_editor/render.cpp index 947e8927a..fa9d2f868 100644 --- a/plugins/ui/source/ui/text_editor/render.cpp +++ b/plugins/ui/source/ui/text_editor/render.cpp @@ -919,7 +919,7 @@ namespace hex::ui { m_foldedLine.append(Ellipsis); if (appendClosingLine) { if (delimiterCoordinates.m_end.m_line == key.m_end.m_line) { - auto line = lineEnd.subLine(delimiterCoordinates.m_end.m_column, -1).trim(TrimMode::TrimBoth); + auto line = lineEnd.subLine(delimiterCoordinates.m_end.m_column,(u64) -1).trim(TrimMode::TrimBoth); m_foldedLine.append(line); } else { auto line = lineEnd.trim(TrimMode::TrimBoth); @@ -968,7 +968,7 @@ namespace hex::ui { auto const newPos = std::lower_bound(m_ellipsisIndices.begin(), m_ellipsisIndices.end(), newIndex); m_ellipsisIndices.insert(newPos, newIndex); m_foldedLine.append(Ellipsis); - auto line = lineEnd.subLine(delimiterCoordinates.m_end.m_column, -1).trim(TrimMode::TrimBoth); + auto line = lineEnd.subLine(delimiterCoordinates.m_end.m_column, (u64) -1).trim(TrimMode::TrimBoth); m_foldedLine.append(line); m_keys.push_back(key); m_full.m_end = key.m_end;