Commit 4fa78b47 authored by con's avatar con
Browse files

QuickOpenFiltersFilter --> LocatorFiltersFilter

parent 4dd828a3
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
** **
**************************************************************************/ **************************************************************************/
#include "quickopenfiltersfilter.h" #include "locatorfiltersfilter.h"
#include "locatorplugin.h" #include "locatorplugin.h"
#include "locatorwidget.h" #include "locatorwidget.h"
...@@ -38,7 +38,7 @@ using namespace QuickOpen::Internal; ...@@ -38,7 +38,7 @@ using namespace QuickOpen::Internal;
Q_DECLARE_METATYPE(ILocatorFilter*); Q_DECLARE_METATYPE(ILocatorFilter*);
QuickOpenFiltersFilter::QuickOpenFiltersFilter(LocatorPlugin *plugin, LocatorFiltersFilter::LocatorFiltersFilter(LocatorPlugin *plugin,
LocatorWidget *locatorWidget): LocatorWidget *locatorWidget):
m_plugin(plugin), m_plugin(plugin),
m_locatorWidget(locatorWidget), m_locatorWidget(locatorWidget),
...@@ -48,22 +48,22 @@ QuickOpenFiltersFilter::QuickOpenFiltersFilter(LocatorPlugin *plugin, ...@@ -48,22 +48,22 @@ QuickOpenFiltersFilter::QuickOpenFiltersFilter(LocatorPlugin *plugin,
setHidden(true); setHidden(true);
} }
QString QuickOpenFiltersFilter::trName() const QString LocatorFiltersFilter::trName() const
{ {
return tr("Available filters"); return tr("Available filters");
} }
QString QuickOpenFiltersFilter::name() const QString LocatorFiltersFilter::name() const
{ {
return QLatin1String("FiltersFilter"); return QLatin1String("FiltersFilter");
} }
ILocatorFilter::Priority QuickOpenFiltersFilter::priority() const ILocatorFilter::Priority LocatorFiltersFilter::priority() const
{ {
return High; return High;
} }
QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry) QList<FilterEntry> LocatorFiltersFilter::matchesFor(const QString &entry)
{ {
QList<FilterEntry> entries; QList<FilterEntry> entries;
if (entry.isEmpty()) { if (entry.isEmpty()) {
...@@ -81,7 +81,7 @@ QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry) ...@@ -81,7 +81,7 @@ QList<FilterEntry> QuickOpenFiltersFilter::matchesFor(const QString &entry)
return entries; return entries;
} }
void QuickOpenFiltersFilter::accept(FilterEntry selection) const void LocatorFiltersFilter::accept(FilterEntry selection) const
{ {
ILocatorFilter *filter = selection.internalData.value<ILocatorFilter*>(); ILocatorFilter *filter = selection.internalData.value<ILocatorFilter*>();
if (filter) if (filter)
...@@ -89,13 +89,13 @@ void QuickOpenFiltersFilter::accept(FilterEntry selection) const ...@@ -89,13 +89,13 @@ void QuickOpenFiltersFilter::accept(FilterEntry selection) const
filter->shortcutString().length() + 1); filter->shortcutString().length() + 1);
} }
void QuickOpenFiltersFilter::refresh(QFutureInterface<void> &future) void LocatorFiltersFilter::refresh(QFutureInterface<void> &future)
{ {
Q_UNUSED(future) Q_UNUSED(future)
// Nothing to refresh // Nothing to refresh
} }
bool QuickOpenFiltersFilter::isConfigurable() const bool LocatorFiltersFilter::isConfigurable() const
{ {
return false; return false;
} }
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
** **
**************************************************************************/ **************************************************************************/
#ifndef QUICKOPENFILTERSFILTER_H #ifndef LOCATORFILTERSFILTER_H
#define QUICKOPENFILTERSFILTER_H #define LOCATORFILTERSFILTER_H
#include "ilocatorfilter.h" #include "ilocatorfilter.h"
...@@ -44,12 +44,12 @@ class LocatorWidget; ...@@ -44,12 +44,12 @@ class LocatorWidget;
This filter provides the user with the list of available QuickOpen filters. This filter provides the user with the list of available QuickOpen filters.
The list is only shown when nothing has been typed yet. The list is only shown when nothing has been typed yet.
*/ */
class QuickOpenFiltersFilter : public ILocatorFilter class LocatorFiltersFilter : public ILocatorFilter
{ {
Q_OBJECT Q_OBJECT
public: public:
QuickOpenFiltersFilter(LocatorPlugin *plugin, LocatorFiltersFilter(LocatorPlugin *plugin,
LocatorWidget *locatorWidget); LocatorWidget *locatorWidget);
// ILocatorFilter // ILocatorFilter
...@@ -70,4 +70,4 @@ private: ...@@ -70,4 +70,4 @@ private:
} // namespace Internal } // namespace Internal
} // namespace QuickOpen } // namespace QuickOpen
#endif // QUICKOPENFILTERSFILTER_H #endif // LOCATORFILTERSFILTER_H
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "locatorplugin.h" #include "locatorplugin.h"
#include "quickopenconstants.h" #include "quickopenconstants.h"
#include "quickopenfiltersfilter.h" #include "locatorfiltersfilter.h"
#include "locatormanager.h" #include "locatormanager.h"
#include "locatorwidget.h" #include "locatorwidget.h"
#include "opendocumentsfilter.h" #include "opendocumentsfilter.h"
...@@ -120,7 +120,7 @@ bool LocatorPlugin::initialize(const QStringList &, QString *) ...@@ -120,7 +120,7 @@ bool LocatorPlugin::initialize(const QStringList &, QString *)
m_fileSystemFilter = new FileSystemFilter(core->editorManager(), m_locatorWidget); m_fileSystemFilter = new FileSystemFilter(core->editorManager(), m_locatorWidget);
addObject(m_fileSystemFilter); addObject(m_fileSystemFilter);
addAutoReleasedObject(new QuickOpenFiltersFilter(this, m_locatorWidget)); addAutoReleasedObject(new LocatorFiltersFilter(this, m_locatorWidget));
connect(core, SIGNAL(coreOpened()), this, SLOT(startSettingsLoad())); connect(core, SIGNAL(coreOpened()), this, SLOT(startSettingsLoad()));
return true; return true;
......
...@@ -5,7 +5,7 @@ include(../../qtcreatorplugin.pri) ...@@ -5,7 +5,7 @@ include(../../qtcreatorplugin.pri)
include(quickopen_dependencies.pri) include(quickopen_dependencies.pri)
HEADERS += locatorplugin.h \ HEADERS += locatorplugin.h \
locatorwidget.h \ locatorwidget.h \
quickopenfiltersfilter.h \ locatorfiltersfilter.h \
settingspage.h \ settingspage.h \
ilocatorfilter.h \ ilocatorfilter.h \
opendocumentsfilter.h \ opendocumentsfilter.h \
...@@ -17,7 +17,7 @@ HEADERS += locatorplugin.h \ ...@@ -17,7 +17,7 @@ HEADERS += locatorplugin.h \
quickopen_global.h quickopen_global.h
SOURCES += locatorplugin.cpp \ SOURCES += locatorplugin.cpp \
locatorwidget.cpp \ locatorwidget.cpp \
quickopenfiltersfilter.cpp \ locatorfiltersfilter.cpp \
opendocumentsfilter.cpp \ opendocumentsfilter.cpp \
filesystemfilter.cpp \ filesystemfilter.cpp \
settingspage.cpp \ settingspage.cpp \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment