Commit ff04632b authored by hjk's avatar hjk

TextEditor: Remove QuickFixAssistProvider

It did not contain any functionality beyond the base IAssistProvider
anymore.

Change-Id: I0198b3d629f81be8c994ffed3904b5f12ee7f9b9
Reviewed-by: David Schulz's avatarDavid Schulz <david.schulz@qt.io>
parent 4f3ac038
...@@ -133,7 +133,7 @@ TextEditor::CompletionAssistProvider *CppEditorDocument::completionAssistProvide ...@@ -133,7 +133,7 @@ TextEditor::CompletionAssistProvider *CppEditorDocument::completionAssistProvide
return m_completionAssistProvider; return m_completionAssistProvider;
} }
TextEditor::QuickFixAssistProvider *CppEditorDocument::quickFixAssistProvider() const TextEditor::IAssistProvider *CppEditorDocument::quickFixAssistProvider() const
{ {
return CppEditorPlugin::instance()->quickFixProvider(); return CppEditorPlugin::instance()->quickFixProvider();
} }
......
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
bool isObjCEnabled() const; bool isObjCEnabled() const;
TextEditor::CompletionAssistProvider *completionAssistProvider() const override; TextEditor::CompletionAssistProvider *completionAssistProvider() const override;
TextEditor::QuickFixAssistProvider *quickFixAssistProvider() const override; TextEditor::IAssistProvider *quickFixAssistProvider() const override;
void recalculateSemanticInfoDetached(); void recalculateSemanticInfoDetached();
CppTools::SemanticInfo recalculateSemanticInfo(); // TODO: Remove me CppTools::SemanticInfo recalculateSemanticInfo(); // TODO: Remove me
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
#pragma once #pragma once
#include <cpptools/cppsemanticinfo.h> #include <cpptools/cppsemanticinfo.h>
#include <texteditor/codeassist/assistinterface.h> #include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/quickfixassistprovider.h> #include <texteditor/codeassist/iassistprovider.h>
#include <texteditor/codeassist/quickfixassistprocessor.h> #include <texteditor/codeassist/quickfixassistprocessor.h>
#include <cplusplus/LookupContext.h> #include <cplusplus/LookupContext.h>
...@@ -68,10 +69,10 @@ private: ...@@ -68,10 +69,10 @@ private:
QList<CPlusPlus::AST *> m_path; QList<CPlusPlus::AST *> m_path;
}; };
class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider class CppQuickFixAssistProvider : public TextEditor::IAssistProvider
{ {
public: public:
CppQuickFixAssistProvider(QObject *parent = 0) : TextEditor::QuickFixAssistProvider(parent) {} CppQuickFixAssistProvider(QObject *parent = nullptr) : TextEditor::IAssistProvider(parent) {}
IAssistProvider::RunType runType() const override; IAssistProvider::RunType runType() const override;
TextEditor::IAssistProcessor *createProcessor() const override; TextEditor::IAssistProcessor *createProcessor() const override;
}; };
......
...@@ -621,7 +621,7 @@ Internal::QmlOutlineModel *QmlJSEditorDocument::outlineModel() const ...@@ -621,7 +621,7 @@ Internal::QmlOutlineModel *QmlJSEditorDocument::outlineModel() const
return d->m_outlineModel; return d->m_outlineModel;
} }
TextEditor::QuickFixAssistProvider *QmlJSEditorDocument::quickFixAssistProvider() const TextEditor::IAssistProvider *QmlJSEditorDocument::quickFixAssistProvider() const
{ {
return Internal::QmlJSEditorPlugin::instance()->quickFixAssistProvider(); return Internal::QmlJSEditorPlugin::instance()->quickFixAssistProvider();
} }
......
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
void setDiagnosticRanges(const QVector<QTextLayout::FormatRange> &ranges); void setDiagnosticRanges(const QVector<QTextLayout::FormatRange> &ranges);
Internal::QmlOutlineModel *outlineModel() const; Internal::QmlOutlineModel *outlineModel() const;
TextEditor::QuickFixAssistProvider *quickFixAssistProvider() const override; TextEditor::IAssistProvider *quickFixAssistProvider() const override;
signals: signals:
void updateCodeWarnings(QmlJS::Document::Ptr doc); void updateCodeWarnings(QmlJS::Document::Ptr doc);
......
...@@ -67,7 +67,7 @@ QmlJSRefactoringFilePtr QmlJSQuickFixAssistInterface::currentFile() const ...@@ -67,7 +67,7 @@ QmlJSRefactoringFilePtr QmlJSQuickFixAssistInterface::currentFile() const
// QmlJSQuickFixAssistProvider // QmlJSQuickFixAssistProvider
// --------------------------- // ---------------------------
QmlJSQuickFixAssistProvider::QmlJSQuickFixAssistProvider(QObject *parent) QmlJSQuickFixAssistProvider::QmlJSQuickFixAssistProvider(QObject *parent)
: TextEditor::QuickFixAssistProvider(parent) : IAssistProvider(parent)
{} {}
QmlJSQuickFixAssistProvider::~QmlJSQuickFixAssistProvider() QmlJSQuickFixAssistProvider::~QmlJSQuickFixAssistProvider()
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <qmljstools/qmljsrefactoringchanges.h> #include <qmljstools/qmljsrefactoringchanges.h>
#include <texteditor/codeassist/assistinterface.h> #include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/quickfixassistprovider.h> #include <texteditor/codeassist/iassistprovider.h>
#include <texteditor/codeassist/quickfixassistprocessor.h> #include <texteditor/codeassist/quickfixassistprocessor.h>
...@@ -52,10 +52,10 @@ private: ...@@ -52,10 +52,10 @@ private:
}; };
class QmlJSQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider class QmlJSQuickFixAssistProvider : public TextEditor::IAssistProvider
{ {
public: public:
QmlJSQuickFixAssistProvider(QObject *parent = 0); QmlJSQuickFixAssistProvider(QObject *parent = nullptr);
~QmlJSQuickFixAssistProvider(); ~QmlJSQuickFixAssistProvider();
IAssistProvider::RunType runType() const override; IAssistProvider::RunType runType() const override;
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "codeassistant.h" #include "codeassistant.h"
#include "completionassistprovider.h" #include "completionassistprovider.h"
#include "quickfixassistprovider.h"
#include "iassistprocessor.h" #include "iassistprocessor.h"
#include "textdocument.h" #include "textdocument.h"
#include "iassistproposal.h" #include "iassistproposal.h"
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
****************************************************************************/ ****************************************************************************/
#include "quickfixassistprocessor.h" #include "quickfixassistprocessor.h"
#include "quickfixassistprovider.h"
#include "assistinterface.h" #include "assistinterface.h"
#include "genericproposalmodel.h" #include "genericproposalmodel.h"
#include "assistproposalitem.h" #include "assistproposalitem.h"
......
/****************************************************************************
**
** 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()
{}
/****************************************************************************
**
** 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
...@@ -392,9 +392,9 @@ CompletionAssistProvider *TextDocument::completionAssistProvider() const ...@@ -392,9 +392,9 @@ CompletionAssistProvider *TextDocument::completionAssistProvider() const
return d->m_completionAssistProvider; return d->m_completionAssistProvider;
} }
QuickFixAssistProvider *TextDocument::quickFixAssistProvider() const IAssistProvider *TextDocument::quickFixAssistProvider() const
{ {
return 0; return nullptr;
} }
void TextDocument::applyFontSettings() void TextDocument::applyFontSettings()
......
...@@ -48,7 +48,7 @@ class CompletionAssistProvider; ...@@ -48,7 +48,7 @@ class CompletionAssistProvider;
class ExtraEncodingSettings; class ExtraEncodingSettings;
class FontSettings; class FontSettings;
class Indenter; class Indenter;
class QuickFixAssistProvider; class IAssistProvider;
class StorageSettings; class StorageSettings;
class SyntaxHighlighter; class SyntaxHighlighter;
class TabSettings; class TabSettings;
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
void setCompletionAssistProvider(CompletionAssistProvider *provider); void setCompletionAssistProvider(CompletionAssistProvider *provider);
virtual CompletionAssistProvider *completionAssistProvider() const; virtual CompletionAssistProvider *completionAssistProvider() const;
virtual QuickFixAssistProvider *quickFixAssistProvider() const; virtual IAssistProvider *quickFixAssistProvider() const;
void setTabSettings(const TextEditor::TabSettings &tabSettings); void setTabSettings(const TextEditor::TabSettings &tabSettings);
void setFontSettings(const TextEditor::FontSettings &fontSettings); void setFontSettings(const TextEditor::FontSettings &fontSettings);
......
...@@ -80,7 +80,6 @@ SOURCES += texteditorplugin.cpp \ ...@@ -80,7 +80,6 @@ SOURCES += texteditorplugin.cpp \
codeassist/runner.cpp \ codeassist/runner.cpp \
codeassist/completionassistprovider.cpp \ codeassist/completionassistprovider.cpp \
codeassist/genericproposalmodel.cpp \ codeassist/genericproposalmodel.cpp \
codeassist/quickfixassistprovider.cpp \
codeassist/quickfixassistprocessor.cpp \ codeassist/quickfixassistprocessor.cpp \
codeassist/genericproposal.cpp \ codeassist/genericproposal.cpp \
codeassist/genericproposalwidget.cpp \ codeassist/genericproposalwidget.cpp \
...@@ -191,7 +190,6 @@ HEADERS += texteditorplugin.h \ ...@@ -191,7 +190,6 @@ HEADERS += texteditorplugin.h \
codeassist/assistproposaliteminterface.h \ codeassist/assistproposaliteminterface.h \
codeassist/completionassistprovider.h \ codeassist/completionassistprovider.h \
codeassist/genericproposalmodel.h \ codeassist/genericproposalmodel.h \
codeassist/quickfixassistprovider.h \
codeassist/quickfixassistprocessor.h \ codeassist/quickfixassistprocessor.h \
codeassist/genericproposal.h \ codeassist/genericproposal.h \
codeassist/genericproposalwidget.h \ codeassist/genericproposalwidget.h \
......
...@@ -186,8 +186,6 @@ Project { ...@@ -186,8 +186,6 @@ Project {
"keywordscompletionassist.h", "keywordscompletionassist.h",
"quickfixassistprocessor.cpp", "quickfixassistprocessor.cpp",
"quickfixassistprocessor.h", "quickfixassistprocessor.h",
"quickfixassistprovider.cpp",
"quickfixassistprovider.h",
"runner.cpp", "runner.cpp",
"runner.h", "runner.h",
"textdocumentmanipulator.cpp", "textdocumentmanipulator.cpp",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment