diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index d31a4eb899c625f42f2c37e0452c19c1d3c0f1f1..f168f1810b3614568103c24fe96fa91604ee5c0c 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -133,7 +133,7 @@ TextEditor::CompletionAssistProvider *CppEditorDocument::completionAssistProvide
     return m_completionAssistProvider;
 }
 
-TextEditor::QuickFixAssistProvider *CppEditorDocument::quickFixAssistProvider() const
+TextEditor::IAssistProvider *CppEditorDocument::quickFixAssistProvider() const
 {
     return CppEditorPlugin::instance()->quickFixProvider();
 }
diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h
index e2e8a0a28e22e4eaae13931f6c524f23372f1d18..47ac86f8b0f17f2cae7be7cdf30d15a1efe98e8b 100644
--- a/src/plugins/cppeditor/cppeditordocument.h
+++ b/src/plugins/cppeditor/cppeditordocument.h
@@ -53,7 +53,7 @@ public:
 
     bool isObjCEnabled() const;
     TextEditor::CompletionAssistProvider *completionAssistProvider() const override;
-    TextEditor::QuickFixAssistProvider *quickFixAssistProvider() const override;
+    TextEditor::IAssistProvider *quickFixAssistProvider() const override;
 
     void recalculateSemanticInfoDetached();
     CppTools::SemanticInfo recalculateSemanticInfo(); // TODO: Remove me
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 4fdbe9af3bd88fa7f031fcaf5a17f27896bf3f36..d7c9a09bcf35c36e4ba8f6bf4589fc7bd81f4e4f 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -26,8 +26,9 @@
 #pragma once
 
 #include <cpptools/cppsemanticinfo.h>
+
 #include <texteditor/codeassist/assistinterface.h>
-#include <texteditor/codeassist/quickfixassistprovider.h>
+#include <texteditor/codeassist/iassistprovider.h>
 #include <texteditor/codeassist/quickfixassistprocessor.h>
 
 #include <cplusplus/LookupContext.h>
@@ -68,10 +69,10 @@ private:
     QList<CPlusPlus::AST *> m_path;
 };
 
-class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
+class CppQuickFixAssistProvider : public TextEditor::IAssistProvider
 {
 public:
-    CppQuickFixAssistProvider(QObject *parent = 0) : TextEditor::QuickFixAssistProvider(parent) {}
+    CppQuickFixAssistProvider(QObject *parent = nullptr) : TextEditor::IAssistProvider(parent) {}
     IAssistProvider::RunType runType() const override;
     TextEditor::IAssistProcessor *createProcessor() const override;
 };
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index 732deddb4b705993263475de5cdd39661a02e9c5..387c1d719fee6361f4a72fdf6a98a78dbcce800f 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -621,7 +621,7 @@ Internal::QmlOutlineModel *QmlJSEditorDocument::outlineModel() const
     return d->m_outlineModel;
 }
 
-TextEditor::QuickFixAssistProvider *QmlJSEditorDocument::quickFixAssistProvider() const
+TextEditor::IAssistProvider *QmlJSEditorDocument::quickFixAssistProvider() const
 {
     return Internal::QmlJSEditorPlugin::instance()->quickFixAssistProvider();
 }
diff --git a/src/plugins/qmljseditor/qmljseditordocument.h b/src/plugins/qmljseditor/qmljseditordocument.h
index f883648381cde62c2c7fc95e09635d68a2fc2530..47671ad7c8ecaf91becb5f3f3c5f4044610101c6 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.h
+++ b/src/plugins/qmljseditor/qmljseditordocument.h
@@ -52,7 +52,7 @@ public:
     void setDiagnosticRanges(const QVector<QTextLayout::FormatRange> &ranges);
     Internal::QmlOutlineModel *outlineModel() const;
 
-    TextEditor::QuickFixAssistProvider *quickFixAssistProvider() const override;
+    TextEditor::IAssistProvider *quickFixAssistProvider() const override;
 
 signals:
     void updateCodeWarnings(QmlJS::Document::Ptr doc);
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
index 021bbaebbb365dff84a436c63141391104202817..a0c9af21e6ab7d37bdadc113d50e408f7308a231 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
@@ -67,7 +67,7 @@ QmlJSRefactoringFilePtr QmlJSQuickFixAssistInterface::currentFile() const
 // QmlJSQuickFixAssistProvider
 // ---------------------------
 QmlJSQuickFixAssistProvider::QmlJSQuickFixAssistProvider(QObject *parent)
-    : TextEditor::QuickFixAssistProvider(parent)
+    : IAssistProvider(parent)
 {}
 
 QmlJSQuickFixAssistProvider::~QmlJSQuickFixAssistProvider()
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h
index 14a357c27c5028239e14c433fac664a8208b92ae..646e8b90a21b2d40a1782c6a65befd7d2fafa083 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.h
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.h
@@ -30,7 +30,7 @@
 #include <qmljstools/qmljsrefactoringchanges.h>
 
 #include <texteditor/codeassist/assistinterface.h>
-#include <texteditor/codeassist/quickfixassistprovider.h>
+#include <texteditor/codeassist/iassistprovider.h>
 #include <texteditor/codeassist/quickfixassistprocessor.h>
 
 
@@ -52,10 +52,10 @@ private:
 };
 
 
-class QmlJSQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
+class QmlJSQuickFixAssistProvider : public TextEditor::IAssistProvider
 {
 public:
-    QmlJSQuickFixAssistProvider(QObject *parent = 0);
+    QmlJSQuickFixAssistProvider(QObject *parent = nullptr);
     ~QmlJSQuickFixAssistProvider();
 
     IAssistProvider::RunType runType() const override;
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 5de47c3b09267e54d983b53eb2211db1c94df6f6..2b854abc2bb2b6972f852f4726bac66026cdf7c2 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -25,7 +25,6 @@
 
 #include "codeassistant.h"
 #include "completionassistprovider.h"
-#include "quickfixassistprovider.h"
 #include "iassistprocessor.h"
 #include "textdocument.h"
 #include "iassistproposal.h"
diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
index f0f610ef99ff870a1d4afb42d75412f7df4c69e5..cb3a4e80423f8d0986c09088589fb4b503ab3cf9 100644
--- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
+++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 #include "quickfixassistprocessor.h"
-#include "quickfixassistprovider.h"
 #include "assistinterface.h"
 #include "genericproposalmodel.h"
 #include "assistproposalitem.h"
diff --git a/src/plugins/texteditor/codeassist/quickfixassistprovider.cpp b/src/plugins/texteditor/codeassist/quickfixassistprovider.cpp
deleted file mode 100644
index 6c627d5eb39ed60122c60875a83fc0fbce606e9c..0000000000000000000000000000000000000000
--- a/src/plugins/texteditor/codeassist/quickfixassistprovider.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "quickfixassistprovider.h"
-
-using namespace TextEditor;
-
-QuickFixAssistProvider::QuickFixAssistProvider(QObject *parent)
-    : IAssistProvider(parent)
-{}
-
-QuickFixAssistProvider::~QuickFixAssistProvider()
-{}
diff --git a/src/plugins/texteditor/codeassist/quickfixassistprovider.h b/src/plugins/texteditor/codeassist/quickfixassistprovider.h
deleted file mode 100644
index 58254689043dce88dcf680846b90b317e7cb9e87..0000000000000000000000000000000000000000
--- a/src/plugins/texteditor/codeassist/quickfixassistprovider.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include "iassistprovider.h"
-
-namespace TextEditor {
-
-class TEXTEDITOR_EXPORT QuickFixAssistProvider : public IAssistProvider
-{
-    Q_OBJECT
-
-public:
-    QuickFixAssistProvider(QObject *parent = 0);
-    ~QuickFixAssistProvider();
-};
-
-} // TextEditor
diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp
index d418d3324eccd92ba6c94c039d1b53df3bffb429..76aa718c1bfd4ddd47749bfd6b59b3429a9f3864 100644
--- a/src/plugins/texteditor/textdocument.cpp
+++ b/src/plugins/texteditor/textdocument.cpp
@@ -392,9 +392,9 @@ CompletionAssistProvider *TextDocument::completionAssistProvider() const
     return d->m_completionAssistProvider;
 }
 
-QuickFixAssistProvider *TextDocument::quickFixAssistProvider() const
+IAssistProvider *TextDocument::quickFixAssistProvider() const
 {
-    return 0;
+    return nullptr;
 }
 
 void TextDocument::applyFontSettings()
diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h
index 8ed2ebbfd90dbaf33ce73f9461c182e3f6d6c3b3..89b2d413f058ebb4174499117a35c1a0f64c6477 100644
--- a/src/plugins/texteditor/textdocument.h
+++ b/src/plugins/texteditor/textdocument.h
@@ -48,7 +48,7 @@ class CompletionAssistProvider;
 class ExtraEncodingSettings;
 class FontSettings;
 class Indenter;
-class QuickFixAssistProvider;
+class IAssistProvider;
 class StorageSettings;
 class SyntaxHighlighter;
 class TabSettings;
@@ -136,7 +136,7 @@ public:
 
     void setCompletionAssistProvider(CompletionAssistProvider *provider);
     virtual CompletionAssistProvider *completionAssistProvider() const;
-    virtual QuickFixAssistProvider *quickFixAssistProvider() const;
+    virtual IAssistProvider *quickFixAssistProvider() const;
 
     void setTabSettings(const TextEditor::TabSettings &tabSettings);
     void setFontSettings(const TextEditor::FontSettings &fontSettings);
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index d83d16544326e7935d2104be0120278afa2b5bbf..b41ddf658316519a224988cd2c9d533cfb42927f 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -80,7 +80,6 @@ SOURCES += texteditorplugin.cpp \
     codeassist/runner.cpp \
     codeassist/completionassistprovider.cpp \
     codeassist/genericproposalmodel.cpp \
-    codeassist/quickfixassistprovider.cpp \
     codeassist/quickfixassistprocessor.cpp \
     codeassist/genericproposal.cpp \
     codeassist/genericproposalwidget.cpp \
@@ -191,7 +190,6 @@ HEADERS += texteditorplugin.h \
     codeassist/assistproposaliteminterface.h \
     codeassist/completionassistprovider.h \
     codeassist/genericproposalmodel.h \
-    codeassist/quickfixassistprovider.h \
     codeassist/quickfixassistprocessor.h \
     codeassist/genericproposal.h \
     codeassist/genericproposalwidget.h \
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 1dfbde68a85c91012800c6a654df32cae329574e..383fb492268cb1c7cb1dc9252c7c2774a060be5a 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -186,8 +186,6 @@ Project {
                 "keywordscompletionassist.h",
                 "quickfixassistprocessor.cpp",
                 "quickfixassistprocessor.h",
-                "quickfixassistprovider.cpp",
-                "quickfixassistprovider.h",
                 "runner.cpp",
                 "runner.h",
                 "textdocumentmanipulator.cpp",