diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2021-02-11 11:41:55 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2021-02-11 13:32:30 +0000 |
commit | 6a2088d8ec3c8b728e187cfccd30a8bf13cb6c07 (patch) | |
tree | e5d04cfcd722601b62442fefe2d4a9906755ec53 | |
parent | 9ad5cd5f58a20247e1cc70edee5bc264e6f53405 (diff) |
Provide empty implementation for ILocatorFilter::refresh()
Make this method just virtual, not a pure virtual.
Remove all empty reimplementations of this method.
Change-Id: Idf10e492355e8519172facd421ea0b2b13ce3b80
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
34 files changed, 3 insertions, 93 deletions
diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp index be9dc2b225..c62cf7edc8 100644 --- a/src/plugins/bookmarks/bookmarkfilter.cpp +++ b/src/plugins/bookmarks/bookmarkfilter.cpp @@ -133,8 +133,3 @@ void BookmarkFilter::accept(LocatorFilterEntry selection, QString *newText, m_manager->gotoBookmark(bookmark); } } - -void BookmarkFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} diff --git a/src/plugins/bookmarks/bookmarkfilter.h b/src/plugins/bookmarks/bookmarkfilter.h index da5102a5fe..e846436cdb 100644 --- a/src/plugins/bookmarks/bookmarkfilter.h +++ b/src/plugins/bookmarks/bookmarkfilter.h @@ -42,7 +42,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: BookmarkManager *m_manager = nullptr; // not owned diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp index 2820068410..0bfebb998f 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp @@ -145,10 +145,6 @@ void ClangCurrentDocumentFilter::accept(Core::LocatorFilterEntry selection, lineColumn.column - 1); } -void ClangCurrentDocumentFilter::refresh(QFutureInterface<void> &) -{ -} - void ClangCurrentDocumentFilter::reset(Core::IEditor *newCurrent, const QString &path) { m_currentEditor = newCurrent; diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.h b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.h index bd758d74cd..599bbd2d59 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.h +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.h @@ -44,7 +44,7 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; + private: void onEditorAboutToClose(Core::IEditor *editors); void onCurrentEditorChanged(Core::IEditor *newCurrent); diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp index c0d8512396..abeec70e59 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp @@ -102,11 +102,6 @@ QList<Core::LocatorFilterEntry> CMakeTargetLocatorFilter::matchesFor(QFutureInte return m_result; } -void CMakeTargetLocatorFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} - void CMakeTargetLocatorFilter::projectListUpdated() { // Enable the filter if there's at least one CMake project diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h index 7bf295dd28..0749e2bb85 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.h @@ -40,7 +40,6 @@ public: void prepareSearch(const QString &entry) override; QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) final; - void refresh(QFutureInterface<void> &future) final; private: void projectListUpdated(); diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp index 8b630d3fd5..bb8029ce25 100644 --- a/src/plugins/coreplugin/locator/commandlocator.cpp +++ b/src/plugins/coreplugin/locator/commandlocator.cpp @@ -129,8 +129,4 @@ void CommandLocator::accept(LocatorFilterEntry entry, }, Qt::QueuedConnection); } -void CommandLocator::refresh(QFutureInterface<void> &) -{ -} - } // namespace Core diff --git a/src/plugins/coreplugin/locator/commandlocator.h b/src/plugins/coreplugin/locator/commandlocator.h index 0a496724a4..9c4efc3e6e 100644 --- a/src/plugins/coreplugin/locator/commandlocator.h +++ b/src/plugins/coreplugin/locator/commandlocator.h @@ -50,7 +50,6 @@ public: const QString &entry) override; void accept(LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: CommandLocatorPrivate *d = nullptr; diff --git a/src/plugins/coreplugin/locator/executefilter.h b/src/plugins/coreplugin/locator/executefilter.h index e581452dfe..6415832945 100644 --- a/src/plugins/coreplugin/locator/executefilter.h +++ b/src/plugins/coreplugin/locator/executefilter.h @@ -53,7 +53,6 @@ public: const QString &entry) override; void accept(LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &) override {} private: void finished(int exitCode, QProcess::ExitStatus status); diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp index da8887b1f4..11e142f47b 100644 --- a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp +++ b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp @@ -61,10 +61,6 @@ void ExternalToolsFilter::accept(LocatorFilterEntry selection, MessageManager::writeFlashing(runner->errorString()); } -void ExternalToolsFilter::refresh(QFutureInterface<void> &) -{ -} - void ExternalToolsFilter::prepareSearch(const QString &entry) { QList<LocatorFilterEntry> bestEntries; diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.h b/src/plugins/coreplugin/locator/externaltoolsfilter.h index 0da8436329..519083ac29 100644 --- a/src/plugins/coreplugin/locator/externaltoolsfilter.h +++ b/src/plugins/coreplugin/locator/externaltoolsfilter.h @@ -40,7 +40,6 @@ public: const QString &entry) override; void accept(LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; void prepareSearch(const QString &entry) override; private: diff --git a/src/plugins/coreplugin/locator/filesystemfilter.h b/src/plugins/coreplugin/locator/filesystemfilter.h index fb0bb3b2ea..f18493515a 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.h +++ b/src/plugins/coreplugin/locator/filesystemfilter.h @@ -49,7 +49,6 @@ public: QString *newText, int *selectionStart, int *selectionLength) const override; void restoreState(const QByteArray &state) override; bool openConfigDialog(QWidget *parent, bool &needsRefresh) override; - void refresh(QFutureInterface<void> &) override {} protected: void saveState(QJsonObject &object) const final; diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index e907062973..7bf15d284b 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -145,7 +145,7 @@ public: virtual void accept(LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const = 0; - virtual void refresh(QFutureInterface<void> &future) = 0; + virtual void refresh(QFutureInterface<void> &future) { Q_UNUSED(future) }; virtual QByteArray saveState() const; virtual void restoreState(const QByteArray &state); diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp index b187287630..952cd0d094 100644 --- a/src/plugins/coreplugin/locator/javascriptfilter.cpp +++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp @@ -110,12 +110,6 @@ void JavaScriptFilter::accept(Core::LocatorFilterEntry selection, QString *newTe clipboard->setText(selection.internalData.toString()); } -void JavaScriptFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) - // Nothing to refresh -} - void JavaScriptFilter::setupEngine() { m_engine.reset(new QJSEngine); diff --git a/src/plugins/coreplugin/locator/javascriptfilter.h b/src/plugins/coreplugin/locator/javascriptfilter.h index 35418949a9..ccded29990 100644 --- a/src/plugins/coreplugin/locator/javascriptfilter.h +++ b/src/plugins/coreplugin/locator/javascriptfilter.h @@ -51,7 +51,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: void setupEngine(); diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp index 9b95274ff3..d753907cec 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp @@ -99,9 +99,3 @@ void LocatorFiltersFilter::accept(LocatorFilterEntry selection, *selectionStart = shortcutString.length() + 1; } } - -void LocatorFiltersFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) - // Nothing to refresh -} diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.h b/src/plugins/coreplugin/locator/locatorfiltersfilter.h index 5c2bf7ba44..cbdc0761ad 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.h +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.h @@ -51,7 +51,6 @@ public: const QString &entry) override; void accept(LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: QStringList m_filterShortcutStrings; diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp index 494a9a8583..5cd59f9798 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp @@ -265,11 +265,6 @@ void SpotlightLocatorFilter::prepareSearch(const QString &entry) BaseFileFilter::prepareSearch(entry); } -void SpotlightLocatorFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} - bool SpotlightLocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefresh) { Q_UNUSED(needsRefresh) diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.h b/src/plugins/coreplugin/locator/spotlightlocatorfilter.h index b96e0cae8c..38dba088b7 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.h +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.h @@ -39,7 +39,6 @@ public: SpotlightLocatorFilter(); void prepareSearch(const QString &entry) override; - void refresh(QFutureInterface<void> &future) override; using ILocatorFilter::openConfigDialog; bool openConfigDialog(QWidget *parent, bool &needsRefresh) final; diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp index 2e3b862894..b16ee40d0e 100644 --- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp @@ -175,12 +175,6 @@ void UrlLocatorFilter::accept(Core::LocatorFilterEntry selection, QDesktopServices::openUrl(url); } -void UrlLocatorFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) - // Nothing to refresh -} - const char kDisplayNameKey[] = "displayName"; const char kRemoteUrlsKey[] = "remoteUrls"; diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.h b/src/plugins/coreplugin/locator/urllocatorfilter.h index 3b7cdf4f41..fdfe8096d3 100644 --- a/src/plugins/coreplugin/locator/urllocatorfilter.h +++ b/src/plugins/coreplugin/locator/urllocatorfilter.h @@ -48,7 +48,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; void restoreState(const QByteArray &state) override; bool openConfigDialog(QWidget *parent, bool &needsRefresh) override; diff --git a/src/plugins/coreplugin/menubarfilter.cpp b/src/plugins/coreplugin/menubarfilter.cpp index 524ad4d07b..ad8f904148 100644 --- a/src/plugins/coreplugin/menubarfilter.cpp +++ b/src/plugins/coreplugin/menubarfilter.cpp @@ -90,11 +90,6 @@ void MenuBarFilter::accept(LocatorFilterEntry selection, QString *newText, } } -void MenuBarFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} - QList<LocatorFilterEntry> MenuBarFilter::matchesForAction(QAction *action, const QStringList &entryPath, const QStringList &path, diff --git a/src/plugins/coreplugin/menubarfilter.h b/src/plugins/coreplugin/menubarfilter.h index 39633aa6f1..62e7dbdc7d 100644 --- a/src/plugins/coreplugin/menubarfilter.h +++ b/src/plugins/coreplugin/menubarfilter.h @@ -49,8 +49,8 @@ public: const QString &entry) override; void accept(LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; void prepareSearch(const QString &entry) override; + private: QList<LocatorFilterEntry> matchesForAction(QAction *action, const QStringList &entryPath, diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index 388aca6c70..3d5397a77b 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -127,11 +127,6 @@ void CppCurrentDocumentFilter::accept(Core::LocatorFilterEntry selection, Core::EditorManager::openEditorAt(info->fileName(), info->line(), info->column()); } -void CppCurrentDocumentFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} - void CppCurrentDocumentFilter::onDocumentUpdated(Document::Ptr doc) { QMutexLocker locker(&m_mutex); diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h index 51dd801d84..f29dca1c03 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.h +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h @@ -49,7 +49,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: void onDocumentUpdated(CPlusPlus::Document::Ptr doc); diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 2bca12c555..0d2ae76b80 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -61,11 +61,6 @@ Core::LocatorFilterEntry CppLocatorFilter::filterEntryFromIndexItem(IndexItem::P return filterEntry; } -void CppLocatorFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} - QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor( QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) { diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h index 129c5cc08a..63df955117 100644 --- a/src/plugins/cpptools/cpplocatorfilter.h +++ b/src/plugins/cpptools/cpplocatorfilter.h @@ -45,7 +45,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; protected: virtual IndexItem::ItemType matchTypes() const { return IndexItem::All; } diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index 45822fa272..7a02abd3ed 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -197,8 +197,6 @@ void DocumentLocatorFilter::accept(Core::LocatorFilterEntry selection, } } -void DocumentLocatorFilter::refresh(QFutureInterface<void> & /*future*/) {} - WorkspaceLocatorFilter::WorkspaceLocatorFilter() : WorkspaceLocatorFilter(QVector<SymbolKind>()) {} @@ -279,8 +277,6 @@ void WorkspaceLocatorFilter::accept(Core::LocatorFilterEntry selection, } } -void WorkspaceLocatorFilter::refresh(QFutureInterface<void> & /*future*/) {} - void WorkspaceLocatorFilter::handleResponse(Client *client, const WorkspaceSymbolRequest::Response &response) { diff --git a/src/plugins/languageclient/locatorfilter.h b/src/plugins/languageclient/locatorfilter.h index 78fef8dfc5..24e7ff54c5 100644 --- a/src/plugins/languageclient/locatorfilter.h +++ b/src/plugins/languageclient/locatorfilter.h @@ -52,7 +52,6 @@ public: QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; signals: void symbolsUpToDate(QPrivateSignal); @@ -88,7 +87,6 @@ public: QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; signals: void allRequestsFinished(QPrivateSignal); diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index 7335075792..98d69a24e9 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -96,8 +96,3 @@ void MacroLocatorFilter::accept(Core::LocatorFilterEntry selection, MacroManager::instance()->executeMacro(selection.displayName); } - -void MacroLocatorFilter::refresh(QFutureInterface<void> &future) -{ - Q_UNUSED(future) -} diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index 784c217258..b12a8a30ff 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -44,7 +44,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: const QIcon m_icon; diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index 869401a571..5f3a07ec8a 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -50,10 +50,6 @@ FunctionFilter::FunctionFilter(LocatorData *data, QObject *parent) FunctionFilter::~FunctionFilter() = default; -void FunctionFilter::refresh(QFutureInterface<void> &) -{ -} - QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor( QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.h b/src/plugins/qmljstools/qmljsfunctionfilter.h index 99759f3219..ee96834a5c 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.h +++ b/src/plugins/qmljstools/qmljsfunctionfilter.h @@ -44,7 +44,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &future) override; private: LocatorData *m_data = nullptr; diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index 0e646aada8..c730e9803c 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -48,7 +48,6 @@ public: const QString &entry) override; void accept(Core::LocatorFilterEntry selection, QString *newText, int *selectionStart, int *selectionLength) const override; - void refresh(QFutureInterface<void> &) override {} private: bool m_hasCurrentEditor = false; |