From 4fa78b4794f1de54626b0bf2f9f208fc85207657 Mon Sep 17 00:00:00 2001 From: con <qtc-committer@nokia.com> Date: Thu, 15 Oct 2009 16:08:11 +0200 Subject: [PATCH] QuickOpenFiltersFilter --> LocatorFiltersFilter --- ...tersfilter.cpp => locatorfiltersfilter.cpp} | 18 +++++++++--------- ...nfiltersfilter.h => locatorfiltersfilter.h} | 10 +++++----- src/plugins/quickopen/locatorplugin.cpp | 4 ++-- src/plugins/quickopen/quickopen.pro | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) rename src/plugins/quickopen/{quickopenfiltersfilter.cpp => locatorfiltersfilter.cpp} (83%) rename src/plugins/quickopen/{quickopenfiltersfilter.h => locatorfiltersfilter.h} (90%) diff --git a/src/plugins/quickopen/quickopenfiltersfilter.cpp b/src/plugins/quickopen/locatorfiltersfilter.cpp similarity index 83% rename from src/plugins/quickopen/quickopenfiltersfilter.cpp rename to src/plugins/quickopen/locatorfiltersfilter.cpp index 280907018ad..cd2e3624691 100644 --- a/src/plugins/quickopen/quickopenfiltersfilter.cpp +++ b/src/plugins/quickopen/locatorfiltersfilter.cpp @@ -27,7 +27,7 @@ ** **************************************************************************/ -#include "quickopenfiltersfilter.h" +#include "locatorfiltersfilter.h" #include "locatorplugin.h" #include "locatorwidget.h" @@ -38,7 +38,7 @@ using namespace QuickOpen::Internal; Q_DECLARE_METATYPE(ILocatorFilter*); -QuickOpenFiltersFilter::QuickOpenFiltersFilter(LocatorPlugin *plugin, +LocatorFiltersFilter::LocatorFiltersFilter(LocatorPlugin *plugin, LocatorWidget *locatorWidget): m_plugin(plugin), m_locatorWidget(locatorWidget), @@ -48,22 +48,22 @@ QuickOpenFiltersFilter::QuickOpenFiltersFilter(LocatorPlugin *plugin, setHidden(true); } -QString QuickOpenFiltersFilter::trName() const +QString LocatorFiltersFilter::trName() const { return tr("Available filters"); } -QString QuickOpenFiltersFilter::name() const +QString LocatorFiltersFilter::name() const { return QLatin1String("FiltersFilter"); } -ILocatorFilter::Priority QuickOpenFiltersFilter::priority() const +ILocatorFilter::Priority LocatorFiltersFilter::priority() const { return High; } -QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry) +QList<FilterEntry> LocatorFiltersFilter::matchesFor(const QString &entry) { QList<FilterEntry> entries; if (entry.isEmpty()) { @@ -81,7 +81,7 @@ QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry) return entries; } -void QuickOpenFiltersFilter::accept(FilterEntry selection) const +void LocatorFiltersFilter::accept(FilterEntry selection) const { ILocatorFilter *filter = selection.internalData.value<ILocatorFilter*>(); if (filter) @@ -89,13 +89,13 @@ void QuickOpenFiltersFilter::accept(FilterEntry selection) const filter->shortcutString().length() + 1); } -void QuickOpenFiltersFilter::refresh(QFutureInterface<void> &future) +void LocatorFiltersFilter::refresh(QFutureInterface<void> &future) { Q_UNUSED(future) // Nothing to refresh } -bool QuickOpenFiltersFilter::isConfigurable() const +bool LocatorFiltersFilter::isConfigurable() const { return false; } diff --git a/src/plugins/quickopen/quickopenfiltersfilter.h b/src/plugins/quickopen/locatorfiltersfilter.h similarity index 90% rename from src/plugins/quickopen/quickopenfiltersfilter.h rename to src/plugins/quickopen/locatorfiltersfilter.h index e9f55c4a664..747fb36d98c 100644 --- a/src/plugins/quickopen/quickopenfiltersfilter.h +++ b/src/plugins/quickopen/locatorfiltersfilter.h @@ -27,8 +27,8 @@ ** **************************************************************************/ -#ifndef QUICKOPENFILTERSFILTER_H -#define QUICKOPENFILTERSFILTER_H +#ifndef LOCATORFILTERSFILTER_H +#define LOCATORFILTERSFILTER_H #include "ilocatorfilter.h" @@ -44,12 +44,12 @@ class LocatorWidget; This filter provides the user with the list of available QuickOpen filters. The list is only shown when nothing has been typed yet. */ -class QuickOpenFiltersFilter : public ILocatorFilter +class LocatorFiltersFilter : public ILocatorFilter { Q_OBJECT public: - QuickOpenFiltersFilter(LocatorPlugin *plugin, + LocatorFiltersFilter(LocatorPlugin *plugin, LocatorWidget *locatorWidget); // ILocatorFilter @@ -70,4 +70,4 @@ private: } // namespace Internal } // namespace QuickOpen -#endif // QUICKOPENFILTERSFILTER_H +#endif // LOCATORFILTERSFILTER_H diff --git a/src/plugins/quickopen/locatorplugin.cpp b/src/plugins/quickopen/locatorplugin.cpp index 8500f90419b..c3eb56bdff5 100644 --- a/src/plugins/quickopen/locatorplugin.cpp +++ b/src/plugins/quickopen/locatorplugin.cpp @@ -29,7 +29,7 @@ #include "locatorplugin.h" #include "quickopenconstants.h" -#include "quickopenfiltersfilter.h" +#include "locatorfiltersfilter.h" #include "locatormanager.h" #include "locatorwidget.h" #include "opendocumentsfilter.h" @@ -120,7 +120,7 @@ bool LocatorPlugin::initialize(const QStringList &, QString *) m_fileSystemFilter = new FileSystemFilter(core->editorManager(), m_locatorWidget); addObject(m_fileSystemFilter); - addAutoReleasedObject(new QuickOpenFiltersFilter(this, m_locatorWidget)); + addAutoReleasedObject(new LocatorFiltersFilter(this, m_locatorWidget)); connect(core, SIGNAL(coreOpened()), this, SLOT(startSettingsLoad())); return true; diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro index ec124018b7f..0cf3907ce76 100644 --- a/src/plugins/quickopen/quickopen.pro +++ b/src/plugins/quickopen/quickopen.pro @@ -5,7 +5,7 @@ include(../../qtcreatorplugin.pri) include(quickopen_dependencies.pri) HEADERS += locatorplugin.h \ locatorwidget.h \ - quickopenfiltersfilter.h \ + locatorfiltersfilter.h \ settingspage.h \ ilocatorfilter.h \ opendocumentsfilter.h \ @@ -17,7 +17,7 @@ HEADERS += locatorplugin.h \ quickopen_global.h SOURCES += locatorplugin.cpp \ locatorwidget.cpp \ - quickopenfiltersfilter.cpp \ + locatorfiltersfilter.cpp \ opendocumentsfilter.cpp \ filesystemfilter.cpp \ settingspage.cpp \ -- GitLab