1 files changed, 8 insertions, 12 deletions
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 44f9e01a01..9aa98c7189 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -1267,20 +1267,16 @@ std::unique_ptr<AssistInterface> CppEditorWidget::createAssistInterface(AssistKi
 
         if (cap)
             return cap->createAssistInterface(textDocument()->filePath(), this, getFeatures(), reason);
-        else {
-            if (isOldStyleSignalOrSlot())
-                return CppModelManager::instance()
-                    ->completionAssistProvider()
-                    ->createAssistInterface(textDocument()->filePath(), this, getFeatures(), reason);
-            return TextEditorWidget::createAssistInterface(kind, reason);
+
+        if (isOldStyleSignalOrSlot()) {
+            return CppModelManager::instance()
+                ->completionAssistProvider()
+                ->createAssistInterface(textDocument()->filePath(), this, getFeatures(), reason);
         }
-    } else if (kind == QuickFix) {
-        if (isSemanticInfoValid())
-            return std::make_unique<CppQuickFixInterface>(const_cast<CppEditorWidget *>(this), reason);
-    } else {
-        return TextEditorWidget::createAssistInterface(kind, reason);
     }
-    return nullptr;
+    if (kind == QuickFix && isSemanticInfoValid())
+        return std::make_unique<CppQuickFixInterface>(const_cast<CppEditorWidget *>(this), reason);
+    return TextEditorWidget::createAssistInterface(kind, reason);
 }
 
 QSharedPointer<FunctionDeclDefLink> CppEditorWidget::declDefLink() const