diff options
author | hjk <hjk@qt.io> | 2017-12-15 09:46:29 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2017-12-15 11:42:40 +0000 |
commit | ff04632b924e27d21261704cb0b43cb1879dc0ee (patch) | |
tree | 11b80ab9bb5f89a26ade6a207cc0fed4ad88ce84 /src/plugins/texteditor | |
parent | 4f3ac0382afff9b7125b9d9d182caec7aa6e8561 (diff) | |
download | qt-creator-ff04632b924e27d21261704cb0b43cb1879dc0ee.tar.gz |
TextEditor: Remove QuickFixAssistProvider
It did not contain any functionality beyond the base IAssistProvider
anymore.
Change-Id: I0198b3d629f81be8c994ffed3904b5f12ee7f9b9
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/texteditor')
-rw-r--r-- | src/plugins/texteditor/codeassist/codeassistant.cpp | 1 | ||||
-rw-r--r-- | src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp | 1 | ||||
-rw-r--r-- | src/plugins/texteditor/codeassist/quickfixassistprovider.cpp | 35 | ||||
-rw-r--r-- | src/plugins/texteditor/codeassist/quickfixassistprovider.h | 41 | ||||
-rw-r--r-- | src/plugins/texteditor/textdocument.cpp | 4 | ||||
-rw-r--r-- | src/plugins/texteditor/textdocument.h | 4 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.pro | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditor.qbs | 2 |
8 files changed, 4 insertions, 86 deletions
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index 5de47c3b09..2b854abc2b 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 f0f610ef99..cb3a4e8042 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 6c627d5eb3..0000000000 --- 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 5825468904..0000000000 --- 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 d418d3324e..76aa718c1b 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 8ed2ebbfd9..89b2d413f0 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 d83d165443..b41ddf6583 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 1dfbde68a8..383fb49226 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", |