From 99b2020cb30ec9c6a85c44d497995acf0f953c99 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 2 Jun 2010 15:22:42 +0200
Subject: [PATCH] Check the type of the token that triggered the completion.
---
src/plugins/cpptools/cppcodecompletion.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 635bf9e7b01..935e0315959 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -634,8 +634,10 @@ int CppCodeCompletion::startPosition() const
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) {
+ unsigned token = T_EOF_SYMBOL;
+
+ if (startOfOperator(editor, pos, &token, /*want function call=*/ true) != pos) {
+ if (token == T_POUND) {
if (TextEditor::BaseTextEditor *edit = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget())) {
QTextCursor tc(edit->document());
tc.setPosition(pos);
--
GitLab