feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Use LineColumn instead of explicit integers for line and column

Browse Source 
With OptionalLineColumn we don't need any bool return parameter any more.

Change-Id: I6f57f221c1bfdf08a92a87a7d71ea0eecf83dbcf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marco Bubke
2017-11-23 14:30:09 +01:00
parent 7666db896d
commit e0ea602f6c
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/utils/linecolumn.h
View File

@@ -25,6 +25,10 @@
#pragma once
#include "optional.h"
namespace Utils {
class LineColumn
{
public:
@@ -34,11 +38,10 @@ public:
column(column)
{}
bool isValid() const
{
return line >= 0 && column >= 0;
}
int line = -1;
int column = -1;
};
using OptionalLineColumn = optional<LineColumn>;
} // namespace Utils

12
src/libs/utils/textutils.cpp
View File

@@ -46,6 +46,18 @@ bool convertPosition(const QTextDocument *document, int pos, int *line, int *col
}
}
Utils::OptionalLineColumn convertPosition(const QTextDocument *document, int pos)
{
Utils::OptionalLineColumn optional;
QTextBlock block = document->findBlock(pos);
if (block.isValid())
optional.emplace(block.blockNumber() + 1, pos - block.position());
return optional;
}
QString textAt(QTextCursor tc, int pos, int length)
{
if (pos < 0)

3
src/libs/utils/textutils.h
View File

@@ -25,6 +25,7 @@
#pragma once
#include "linecolumn.h"
#include "utils_global.h"
#include <QString>
@@ -39,6 +40,8 @@ namespace Text {
QTCREATOR_UTILS_EXPORT bool convertPosition(const QTextDocument *document,
int pos,
int *line, int *column);
QTCREATOR_UTILS_EXPORT
Utils::OptionalLineColumn convertPosition(const QTextDocument *document, int pos);
QTCREATOR_UTILS_EXPORT QString textAt(QTextCursor tc, int pos, int length);

19
src/plugins/clangrefactoring/refactoringengine.cpp
View File

@@ -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;
QTextCursor cursor = Utils::Text::wordStartCursor(data.cursor());
Utils::Text::convertPosition(cursor.document(), cursor.position(), &line, &column);
CppTools::Usages usages;
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);
QTextCursor cursor = Utils::Text::wordStartCursor(data.cursor());
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);
}
return usages;
}
void RefactoringEngine::globalRename(const CppTools::CursorInEditor &data,