From c721304a4731a91a9e143a54d2ab3ef89526e05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 10 Feb 2009 16:43:23 +0100
Subject: [PATCH] Fix for crash when doing signal completion
---
src/plugins/coreplugin/editormanager/openeditorsview.cpp | 1 -
src/plugins/cpptools/cppcodecompletion.cpp | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 8c8e07d0ab1..fb32507bb5d 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -80,7 +80,6 @@ OpenEditorsWidget::OpenEditorsWidget()
OpenEditorsWidget::~OpenEditorsWidget()
{
-
}
void OpenEditorsWidget::updateCurrentItem(Core::IEditor *editor)
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index c2db0bd1b7d..dcf41e3e744 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -200,7 +200,7 @@ FunctionArgumentWidget::FunctionArgumentWidget()
setParent(m_popupFrame);
setFocusPolicy(Qt::NoFocus);
- QVBoxLayout *layout = new QVBoxLayout();
+ QVBoxLayout *layout = new QVBoxLayout;
layout->addWidget(this);
layout->setMargin(0);
m_popupFrame->setLayout(layout);
@@ -968,6 +968,8 @@ bool CppCodeCompletion::completeQtMethod(CPlusPlus::FullySpecifiedType,
for (unsigned i = 0; i < scope->symbolCount(); ++i) {
Symbol *member = scope->symbolAt(i);
+ if (! member->type())
+ continue;
Function *fun = member->type()->asFunctionType();
if (! fun)
continue;
--
GitLab