From a1a565b9c55b563460be0d5ca7aef6deb93e0ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Wed, 16 Jun 2010 17:30:20 +0200
Subject: [PATCH] Two more columnNumber() calls that should be
positionInBlock()
columnNumber() relies on text wrapping, and we're only interested in the
position of the cursor in the block.
---
src/libs/cplusplus/ASTPath.h | 2 +-
src/plugins/cpptools/cppcodecompletion.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libs/cplusplus/ASTPath.h b/src/libs/cplusplus/ASTPath.h
index 84b5a2ac024..63cbb1ae6f1 100644
--- a/src/libs/cplusplus/ASTPath.h
+++ b/src/libs/cplusplus/ASTPath.h
@@ -51,7 +51,7 @@ public:
{}
QList<AST *> operator()(const QTextCursor &cursor)
- { return this->operator()(cursor.blockNumber(), cursor.columnNumber()); }
+ { return this->operator()(cursor.blockNumber(), cursor.positionInBlock()); }
/// line and column are 0-based!
QList<AST *> operator()(int line, int column);
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 2ede5fca70d..23de6cc446e 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -640,7 +640,7 @@ bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
if (TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget())) {
QTextCursor tc(edit->document());
tc.setPosition(pos);
- return tc.columnNumber() == 1;
+ return tc.positionInBlock() == 1;
}
return false;
--
GitLab