From dd68dd90d34f7b4f109ab7d9fea4e4fb2f5fe625 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 12 Jun 2025 13:55:31 +0200 Subject: [PATCH] CppEditor: use Text::Range::contains in outline Change-Id: I45a8027021e201eb71d06dccfaa9f9021248890a Reviewed-by: Christian Kandeler --- src/plugins/cppeditor/cppoutlinemodel.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/plugins/cppeditor/cppoutlinemodel.cpp b/src/plugins/cppeditor/cppoutlinemodel.cpp index 472db57d4a1..9d424d15914 100644 --- a/src/plugins/cppeditor/cppoutlinemodel.cpp +++ b/src/plugins/cppeditor/cppoutlinemodel.cpp @@ -287,17 +287,6 @@ void OutlineModel::buildTree(SymbolItem *root, bool isRoot) } } -static bool contains(const Utils::Text::Range &range, int line, int column) -{ - if (line < range.begin.line || line > range.end.line) - return false; - if (line == range.begin.line && column < range.begin.column) - return false; - if (line == range.end.line && column > range.end.column) - return false; - return true; -} - QModelIndex OutlineModel::indexForPosition(int line, int column, const QModelIndex &rootIndex) const { @@ -309,7 +298,7 @@ QModelIndex OutlineModel::indexForPosition(int line, int column, if (range.begin.line > line) break; // Skip ranges that do not include current line and column. - if (range.end != range.begin && !contains(range, line, column)) + if (range.end != range.begin && !range.contains(Utils::Text::Position{line, column})) continue; lastIndex = index; }