summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/editormanager/openeditorsview.cpp1
-rw-r--r--src/plugins/cpptools/cppcodecompletion.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 8c8e07d0ab..fb32507bb5 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 c2db0bd1b7..dcf41e3e74 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;