diff options
-rw-r--r-- | src/plugins/coreplugin/locator/basefilefilter.h | 7 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/commandlocator.h | 7 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/directoryfilter.h | 8 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/executefilter.h | 6 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/filesystemfilter.h | 15 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/locator_test.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/locatorfiltersfilter.h | 9 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/opendocumentsfilter.h | 7 | ||||
-rw-r--r-- | src/plugins/coreplugin/locator/spotlightlocatorfilter.h | 4 | ||||
-rw-r--r-- | src/plugins/cpptools/cppcurrentdocumentfilter.h | 7 | ||||
-rw-r--r-- | src/plugins/cpptools/cppincludesfilter.h | 4 | ||||
-rw-r--r-- | src/plugins/cpptools/cpplocatorfilter.h | 6 | ||||
-rw-r--r-- | src/plugins/help/helpindexfilter.h | 8 | ||||
-rw-r--r-- | src/plugins/help/remotehelpfilter.h | 13 | ||||
-rw-r--r-- | src/plugins/macros/macrolocatorfilter.h | 7 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljsfunctionfilter.h | 7 | ||||
-rw-r--r-- | src/plugins/texteditor/linenumberfilter.h | 9 |
17 files changed, 68 insertions, 58 deletions
diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h index 16cfc45c71..c4623a25dc 100644 --- a/src/plugins/coreplugin/locator/basefilefilter.h +++ b/src/plugins/coreplugin/locator/basefilefilter.h @@ -69,9 +69,10 @@ public: BaseFileFilter(); ~BaseFileFilter(); - void prepareSearch(const QString &entry); - QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry); - void accept(LocatorFilterEntry selection) const; + void prepareSearch(const QString &entry) override; + QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, + const QString &entry) override; + void accept(LocatorFilterEntry selection) const override; protected: void setFileIterator(Iterator *iterator); diff --git a/src/plugins/coreplugin/locator/commandlocator.h b/src/plugins/coreplugin/locator/commandlocator.h index f9704fa43b..1ce2eb0226 100644 --- a/src/plugins/coreplugin/locator/commandlocator.h +++ b/src/plugins/coreplugin/locator/commandlocator.h @@ -45,9 +45,10 @@ public: void appendCommand(Command *cmd); - QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry); - void accept(LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, + const QString &entry) override; + void accept(LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; private: CommandLocatorPrivate *d; diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h index 8441b9d6c3..06ef1f37e3 100644 --- a/src/plugins/coreplugin/locator/directoryfilter.h +++ b/src/plugins/coreplugin/locator/directoryfilter.h @@ -42,10 +42,10 @@ class DirectoryFilter : public BaseFileFilter public: DirectoryFilter(Id id); - QByteArray saveState() const; - void restoreState(const QByteArray &state); - bool openConfigDialog(QWidget *parent, bool &needsRefresh); - void refresh(QFutureInterface<void> &future); + QByteArray saveState() const override; + void restoreState(const QByteArray &state) override; + bool openConfigDialog(QWidget *parent, bool &needsRefresh) override; + void refresh(QFutureInterface<void> &future) override; private: void addDirectory(); diff --git a/src/plugins/coreplugin/locator/executefilter.h b/src/plugins/coreplugin/locator/executefilter.h index 890468354e..32d8f78705 100644 --- a/src/plugins/coreplugin/locator/executefilter.h +++ b/src/plugins/coreplugin/locator/executefilter.h @@ -50,9 +50,9 @@ class ExecuteFilter : public Core::ILocatorFilter public: ExecuteFilter(); QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, - const QString &entry); - void accept(LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &) {} + const QString &entry) override; + void accept(LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &) override {} private: void finished(int exitCode, QProcess::ExitStatus status); diff --git a/src/plugins/coreplugin/locator/filesystemfilter.h b/src/plugins/coreplugin/locator/filesystemfilter.h index 0dd2e003a2..63384e2cd9 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.h +++ b/src/plugins/coreplugin/locator/filesystemfilter.h @@ -44,13 +44,14 @@ class FileSystemFilter : public ILocatorFilter public: explicit FileSystemFilter(LocatorWidget *locatorWidget); - void prepareSearch(const QString &entry); - QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry); - void accept(LocatorFilterEntry selection) const; - QByteArray saveState() const; - void restoreState(const QByteArray &state); - bool openConfigDialog(QWidget *parent, bool &needsRefresh); - void refresh(QFutureInterface<void> &) {} + void prepareSearch(const QString &entry) override; + QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, + const QString &entry) override; + void accept(LocatorFilterEntry selection) const override; + QByteArray saveState() const override; + void restoreState(const QByteArray &state) override; + bool openConfigDialog(QWidget *parent, bool &needsRefresh) override; + void refresh(QFutureInterface<void> &) override {} private: LocatorWidget *m_locatorWidget; diff --git a/src/plugins/coreplugin/locator/locator_test.cpp b/src/plugins/coreplugin/locator/locator_test.cpp index 021732d213..5b4653c5fe 100644 --- a/src/plugins/coreplugin/locator/locator_test.cpp +++ b/src/plugins/coreplugin/locator/locator_test.cpp @@ -49,7 +49,7 @@ public: setFileIterator(new BaseFileFilter::ListIterator(theFiles)); } - void refresh(QFutureInterface<void> &) {} + void refresh(QFutureInterface<void> &) override {} }; inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size()); } diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.h b/src/plugins/coreplugin/locator/locatorfiltersfilter.h index b0e8a1ba0a..a97cc9493a 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.h +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.h @@ -48,10 +48,11 @@ public: LocatorWidget *locatorWidget); // ILocatorFilter - void prepareSearch(const QString &entry); - QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry); - void accept(LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + void prepareSearch(const QString &entry) override; + QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, + const QString &entry) override; + void accept(LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; private: Locator *m_plugin; diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.h b/src/plugins/coreplugin/locator/opendocumentsfilter.h index d676618331..00622d1dbf 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.h +++ b/src/plugins/coreplugin/locator/opendocumentsfilter.h @@ -43,9 +43,10 @@ class OpenDocumentsFilter : public ILocatorFilter public: OpenDocumentsFilter(); - QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, const QString &entry); - void accept(LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future, + const QString &entry) override; + void accept(LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; public slots: void refreshInternally(); diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.h b/src/plugins/coreplugin/locator/spotlightlocatorfilter.h index a3a0fcafeb..45dc33900d 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.h +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.h @@ -42,8 +42,8 @@ public: setShortcutString(QLatin1String("md")); } - void prepareSearch(const QString &entry); - void refresh(QFutureInterface<void> &future); + void prepareSearch(const QString &entry) override; + void refresh(QFutureInterface<void> &future) override; }; } // Internal diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h index 53122e1fff..2a93cd3432 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.h +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h @@ -46,9 +46,10 @@ public: StringTable &stringTable); ~CppCurrentDocumentFilter() {} - QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; private: void onDocumentUpdated(CPlusPlus::Document::Ptr doc); diff --git a/src/plugins/cpptools/cppincludesfilter.h b/src/plugins/cpptools/cppincludesfilter.h index bfc30c927c..d6304ee804 100644 --- a/src/plugins/cpptools/cppincludesfilter.h +++ b/src/plugins/cpptools/cppincludesfilter.h @@ -39,8 +39,8 @@ public: // ILocatorFilter interface public: - void prepareSearch(const QString &entry); - void refresh(QFutureInterface<void> &future); + void prepareSearch(const QString &entry) override; + void refresh(QFutureInterface<void> &future) override; private: void markOutdated(); diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h index 90716a5286..84ab9802ba 100644 --- a/src/plugins/cpptools/cpplocatorfilter.h +++ b/src/plugins/cpptools/cpplocatorfilter.h @@ -42,9 +42,9 @@ public: ~CppLocatorFilter(); QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, - const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; protected: virtual IndexItem::ItemType matchTypes() const { return IndexItem::All; } diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h index f0edb547f6..701c37dbd3 100644 --- a/src/plugins/help/helpindexfilter.h +++ b/src/plugins/help/helpindexfilter.h @@ -42,11 +42,11 @@ public: ~HelpIndexFilter(); // ILocatorFilter - void prepareSearch(const QString &entry); + void prepareSearch(const QString &entry) override; QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, - const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; Q_INVOKABLE QSet<QString> searchMatches(const QString &databaseFilePath, const QString &term, int limit); diff --git a/src/plugins/help/remotehelpfilter.h b/src/plugins/help/remotehelpfilter.h index e166ad6ecf..1dc89ab085 100644 --- a/src/plugins/help/remotehelpfilter.h +++ b/src/plugins/help/remotehelpfilter.h @@ -43,12 +43,13 @@ public: ~RemoteHelpFilter(); // ILocatorFilter - QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); - QByteArray saveState() const; - void restoreState(const QByteArray &state); - bool openConfigDialog(QWidget *parent, bool &needsRefresh); + QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; + QByteArray saveState() const override; + void restoreState(const QByteArray &state) override; + bool openConfigDialog(QWidget *parent, bool &needsRefresh) override; QStringList remoteUrls() const; diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index a20b296ce6..442de6d3e2 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -43,9 +43,10 @@ public: MacroLocatorFilter(); ~MacroLocatorFilter(); - QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; private: const QIcon m_icon; diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.h b/src/plugins/qmljstools/qmljsfunctionfilter.h index 503343ea4a..d696744694 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.h +++ b/src/plugins/qmljstools/qmljsfunctionfilter.h @@ -40,9 +40,10 @@ public: explicit FunctionFilter(LocatorData *data, QObject *parent = 0); ~FunctionFilter(); - QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &future); + QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &future) override; private: LocatorData *m_data; diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index 8a8954cadf..8d0fe999ed 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -43,10 +43,11 @@ class LineNumberFilter : public Core::ILocatorFilter public: explicit LineNumberFilter(QObject *parent = 0); - void prepareSearch(const QString &entry); - QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry); - void accept(Core::LocatorFilterEntry selection) const; - void refresh(QFutureInterface<void> &) {} + void prepareSearch(const QString &entry) override; + QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, + const QString &entry) override; + void accept(Core::LocatorFilterEntry selection) const override; + void refresh(QFutureInterface<void> &) override {} private: bool m_hasCurrentEditor; |