From 4195b4e7e2b0da842f043233074c5a479450691d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 3 May 2023 19:05:23 +0200 Subject: [PATCH] ILocatorFilter: Remove calls to setDefaultIncludedByDefault(false) By default, setDefaultIncludedByDefault() is set to false, so no need to repeat it now in direct subclasses. Leave it only inside the AllProjectFilesFilter, as the DirectoryFilter superclass sets it to true. Change-Id: Ib66d112a3bfeed52315663f6898148cf5c5d88b1 Reviewed-by: Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot --- src/plugins/clangcodemodel/clangdlocatorfilters.cpp | 4 ---- src/plugins/coreplugin/locator/executefilter.cpp | 1 - src/plugins/coreplugin/locator/filesystemfilter.cpp | 1 - src/plugins/coreplugin/locator/javascriptfilter.cpp | 1 - src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp | 1 - src/plugins/coreplugin/locator/urllocatorfilter.cpp | 1 - src/plugins/cppeditor/cpplocatorfilter.cpp | 4 ---- src/plugins/help/helpindexfilter.cpp | 1 - src/plugins/languageclient/locatorfilter.cpp | 2 -- src/plugins/projectexplorer/currentprojectfilter.cpp | 1 - src/plugins/qmljstools/qmljsfunctionfilter.cpp | 1 - 11 files changed, 18 deletions(-) diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp index 6d3ab92e144..f783a98499a 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp @@ -37,7 +37,6 @@ ClangdAllSymbolsFilter::ClangdAllSymbolsFilter() setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::LOCATOR_FILTER_DISPLAY_NAME)); setDescription(::CppEditor::Tr::tr(CppEditor::Constants::LOCATOR_FILTER_DESCRIPTION)); setDefaultShortcutString(":"); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks ClangdAllSymbolsFilter::matchers() @@ -53,7 +52,6 @@ ClangdClassesFilter::ClangdClassesFilter() setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::CLASSES_FILTER_DISPLAY_NAME)); setDescription(::CppEditor::Tr::tr(CppEditor::Constants::CLASSES_FILTER_DESCRIPTION)); setDefaultShortcutString("c"); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks ClangdClassesFilter::matchers() @@ -69,7 +67,6 @@ ClangdFunctionsFilter::ClangdFunctionsFilter() setDisplayName(::CppEditor::Tr::tr(CppEditor::Constants::FUNCTIONS_FILTER_DISPLAY_NAME)); setDescription(::CppEditor::Tr::tr(CppEditor::Constants::FUNCTIONS_FILTER_DESCRIPTION)); setDefaultShortcutString("m"); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks ClangdFunctionsFilter::matchers() @@ -86,7 +83,6 @@ ClangdCurrentDocumentFilter::ClangdCurrentDocumentFilter() setDescription(::CppEditor::Tr::tr(CppEditor::Constants::CURRENT_DOCUMENT_FILTER_DESCRIPTION)); setDefaultShortcutString("."); setPriority(High); - setDefaultIncludedByDefault(false); setEnabled(false); connect(EditorManager::instance(), &EditorManager::currentEditorChanged, this, [this](const IEditor *editor) { setEnabled(editor); }); diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp index 2225508ae4b..2a405c369ea 100644 --- a/src/plugins/coreplugin/locator/executefilter.cpp +++ b/src/plugins/coreplugin/locator/executefilter.cpp @@ -31,7 +31,6 @@ ExecuteFilter::ExecuteFilter() "environment variable if needed. Note that the command is run directly, not in a shell.")); setDefaultShortcutString("!"); setPriority(High); - setDefaultIncludedByDefault(false); } ExecuteFilter::~ExecuteFilter() diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp index e1d45afeb3f..066be68330c 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.cpp +++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp @@ -127,7 +127,6 @@ FileSystemFilter::FileSystemFilter() "path. \"~\" refers to your home directory. You have the option to create a " "file if it does not exist yet.")); setDefaultShortcutString("f"); - setDefaultIncludedByDefault(false); *sDeviceRootIcon = qApp->style()->standardIcon(QStyle::SP_DriveHDIcon); } diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp index 0a155e85500..ea5a832c984 100644 --- a/src/plugins/coreplugin/locator/javascriptfilter.cpp +++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp @@ -359,7 +359,6 @@ JavaScriptFilter::JavaScriptFilter() setId("JavaScriptFilter"); setDisplayName(Tr::tr("Evaluate JavaScript")); setDescription(Tr::tr("Evaluates arbitrary JavaScript expressions and copies the result.")); - setDefaultIncludedByDefault(false); setDefaultShortcutString("="); } diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp index 167a24be8ad..e2f077a5659 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp @@ -102,7 +102,6 @@ SpotlightLocatorFilter::SpotlightLocatorFilter() { setId("SpotlightFileNamesLocatorFilter"); setDefaultShortcutString("md"); - setDefaultIncludedByDefault(false); setDisplayName(Tr::tr("File Name Index")); setDescription(Tr::tr( "Locates files from a global file system index (Spotlight, Locate, Everything). Append " diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp index d00eb7a21fe..c9025b2237a 100644 --- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp @@ -159,7 +159,6 @@ UrlLocatorFilter::UrlLocatorFilter(const QString &displayName, Id id) setId(id); m_defaultDisplayName = displayName; setDisplayName(displayName); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks UrlLocatorFilter::matchers() diff --git a/src/plugins/cppeditor/cpplocatorfilter.cpp b/src/plugins/cppeditor/cpplocatorfilter.cpp index 5f0904dd035..cd1add7786e 100644 --- a/src/plugins/cppeditor/cpplocatorfilter.cpp +++ b/src/plugins/cppeditor/cpplocatorfilter.cpp @@ -338,7 +338,6 @@ CppAllSymbolsFilter::CppAllSymbolsFilter() setDisplayName(Tr::tr(Constants::LOCATOR_FILTER_DISPLAY_NAME)); setDescription(Tr::tr(Constants::LOCATOR_FILTER_DESCRIPTION)); setDefaultShortcutString(":"); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks CppAllSymbolsFilter::matchers() @@ -353,7 +352,6 @@ CppClassesFilter::CppClassesFilter() setDisplayName(Tr::tr(Constants::CLASSES_FILTER_DISPLAY_NAME)); setDescription(Tr::tr(Constants::CLASSES_FILTER_DESCRIPTION)); setDefaultShortcutString("c"); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks CppClassesFilter::matchers() @@ -367,7 +365,6 @@ CppFunctionsFilter::CppFunctionsFilter() setDisplayName(Tr::tr(Constants::FUNCTIONS_FILTER_DISPLAY_NAME)); setDescription(Tr::tr(Constants::FUNCTIONS_FILTER_DESCRIPTION)); setDefaultShortcutString("m"); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks CppFunctionsFilter::matchers() @@ -382,7 +379,6 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter() setDescription(Tr::tr(Constants::CURRENT_DOCUMENT_FILTER_DESCRIPTION)); setDefaultShortcutString("."); setPriority(High); - setDefaultIncludedByDefault(false); } LocatorMatcherTasks CppCurrentDocumentFilter::matchers() diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index c32f02c6c16..9da19214801 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -29,7 +29,6 @@ HelpIndexFilter::HelpIndexFilter() setId("HelpIndexFilter"); setDisplayName(Tr::tr("Help Index")); setDescription(Tr::tr("Locates help topics, for example in the Qt documentation.")); - setDefaultIncludedByDefault(false); setDefaultShortcutString("?"); setRefreshRecipe(Sync([this] { invalidateCache(); })); diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index 04caf2d1723..da03b2e7c50 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -175,7 +175,6 @@ LanguageCurrentDocumentFilter::LanguageCurrentDocumentFilter() setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME)); setDescription(Tr::tr(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_DESCRIPTION)); setDefaultShortcutString("."); - setDefaultIncludedByDefault(false); setPriority(ILocatorFilter::Low); } @@ -253,7 +252,6 @@ LanguageAllSymbolsFilter::LanguageAllSymbolsFilter() setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME)); setDescription(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_DESCRIPTION)); setDefaultShortcutString(":"); - setDefaultIncludedByDefault(false); setPriority(ILocatorFilter::Low); } diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index d42ab82e968..d0f9ed99b0a 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -20,7 +20,6 @@ CurrentProjectFilter::CurrentProjectFilter() "or \":\" to jump to the given line number. Append another " "\"+\" or \":\" to jump to the column number as well.")); setDefaultShortcutString("p"); - setDefaultIncludedByDefault(false); setRefreshRecipe(Tasking::Sync([this] { invalidate(); })); connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index 293e8962f48..34a60040f3c 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -25,7 +25,6 @@ QmlJSFunctionsFilter::QmlJSFunctionsFilter(LocatorData *data) setDisplayName(Tr::tr("QML Functions")); setDescription(Tr::tr("Locates QML functions in any open project.")); setDefaultShortcutString("m"); - setDefaultIncludedByDefault(false); } static void matches(QPromise &promise, const LocatorStorage &storage,