diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 8c8e07d0ab18b7919e5c554753e9d274ac1688b8..fb32507bb5d6d57e7c98c180dd8b6ac168b57faf 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 c2db0bd1b7d295b9dc9e6651e4460997495cc427..dcf41e3e744b70b4eb5466dfea1d3b9a870faa4a 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;