From d94dd392cb3cbb0c39ec9eb5cce4deba4afc4c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 16 Feb 2009 18:34:56 +0100
Subject: [PATCH] Reuse the function argument widget when possible
Now that we're showing this thing instantly, we can no longer rely on
the thing hiding cause of a focus change.
(cherry picked from commit 5a0a084c3130e0401eed687795371c2a49b4b635)
Conflicts:
src/plugins/cpptools/cppcodecompletion.cpp
---
src/plugins/cpptools/cppcodecompletion.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 94258decc1a..b9dc55f0b99 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -187,10 +187,10 @@ using namespace CppTools::Internal;
FunctionArgumentWidget::FunctionArgumentWidget()
: m_item(0)
{
- QObject *editorObject = Core::ICore::instance()->editorManager()->currentEditor();
+ QObject *editorObject = Core::EditorManager::instance()->currentEditor();
m_editor = qobject_cast<TextEditor::ITextEditor *>(editorObject);
- m_popupFrame = new QFrame(0, Qt::ToolTip|Qt::WindowStaysOnTopHint);
+ m_popupFrame = new QFrame(0, Qt::ToolTip | Qt::WindowStaysOnTopHint);
m_popupFrame->setFocusPolicy(Qt::NoFocus);
m_popupFrame->setAttribute(Qt::WA_DeleteOnClose);
@@ -1069,7 +1069,10 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
Function *function = symbol->type()->asFunction();
QTC_ASSERT(function, return);
- m_functionArgumentWidget = new FunctionArgumentWidget();
+ // Recreate if necessary
+ if (!m_functionArgumentWidget)
+ m_functionArgumentWidget = new FunctionArgumentWidget;
+
m_functionArgumentWidget->showFunctionHint(function, typeOfExpression.lookupContext());
}
} else if (m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) {
--
GitLab