From e0ea602f6cd3c3289722cd6b22ca2ba02eefc846 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 23 Nov 2017 14:30:09 +0100 Subject: Clang: Use LineColumn instead of explicit integers for line and column With OptionalLineColumn we don't need any bool return parameter any more. Change-Id: I6f57f221c1bfdf08a92a87a7d71ea0eecf83dbcf Reviewed-by: Tobias Hunger Reviewed-by: Eike Ziller --- src/plugins/clangrefactoring/refactoringengine.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/plugins/clangrefactoring') diff --git a/src/plugins/clangrefactoring/refactoringengine.cpp b/src/plugins/clangrefactoring/refactoringengine.cpp index 75f79a7a2b..7c69cfc9d1 100644 --- a/src/plugins/clangrefactoring/refactoringengine.cpp +++ b/src/plugins/clangrefactoring/refactoringengine.cpp @@ -94,13 +94,20 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data, CppTools::Usages RefactoringEngine::locationsAt(const CppTools::CursorInEditor &data) const { - int line = 0, column = 0; + CppTools::Usages usages; + QTextCursor cursor = Utils::Text::wordStartCursor(data.cursor()); - Utils::Text::convertPosition(cursor.document(), cursor.position(), &line, &column); + Utils::OptionalLineColumn lineColumn = Utils::Text::convertPosition(cursor.document(), + cursor.position()); + + if (lineColumn) { + const QByteArray filePath = data.filePath().toString().toUtf8(); + const ClangBackEnd::FilePathId filePathId = m_filePathCache.filePathId(ClangBackEnd::FilePathView(filePath)); + + usages = m_symbolQuery.sourceUsagesAt(filePathId, lineColumn->line, lineColumn->column + 1); + } - const QByteArray filePath = data.filePath().toString().toUtf8(); - const ClangBackEnd::FilePathId filePathId = m_filePathCache.filePathId(ClangBackEnd::FilePathView(filePath)); - return m_symbolQuery.sourceUsagesAt(filePathId, line, column + 1); + return usages; } void RefactoringEngine::globalRename(const CppTools::CursorInEditor &data, -- cgit v1.2.1