summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodecompletion.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-05-19 14:09:43 +0200
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-05-19 14:12:22 +0200
commitb0cc9fa4e731d5e5dd17c472151f6cc76b9fa897 (patch)
tree701d0211c38995b5501f47f8f818273110f98136 /src/plugins/cpptools/cppcodecompletion.cpp
parent148d232e88e1e86e4b8f795bbc67fc2071f91d66 (diff)
downloadqt-creator-b0cc9fa4e731d5e5dd17c472151f6cc76b9fa897.tar.gz
Tuned the automatic preprocessor competion.
To only run if the pound/hash sign is at the start of the line.
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
-rw-r--r--src/plugins/cpptools/cppcodecompletion.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index e45d9261c6..a68a4cd127 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -636,6 +636,16 @@ bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
{
const int pos = editor->position();
if (startOfOperator(editor, pos, /*token =*/ 0, /*want function call=*/ true) != pos) {
+ if (m_completionOperator == T_POUND) {
+ if (TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget())) {
+ QTextCursor tc(edit->document());
+ tc.setPosition(pos);
+ return tc.columnNumber() == 1;
+ }
+
+ return false;
+ }
+
return true;
}