feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: simplify ILocator interface

Browse Source 
Use data members instead of virtual functions for id, displayName and
priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator.

Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2013-01-18 11:16:53 +01:00
parent e7003283a5
commit baffa492d9
45 changed files with 168 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/help/helpindexfilter.cpp
View File

@@ -46,8 +46,11 @@ Q_DECLARE_METATYPE(ILocatorFilter*)
HelpIndexFilter::HelpIndexFilter()
{
setId("HelpIndexFilter");
setDisplayName(tr("Help Index"));
setIncludedByDefault(false);
setShortcutString(QString(QLatin1Char('?')));
m_icon = QIcon(QLatin1String(":/help/images/bookmark.png"));
}
@@ -55,21 +58,6 @@ HelpIndexFilter::~HelpIndexFilter()
{
}
QString HelpIndexFilter::displayName() const
{
return tr("Help Index");
}
QString HelpIndexFilter::id() const
{
return QLatin1String("HelpIndexFilter");
}
ILocatorFilter::Priority HelpIndexFilter::priority() const
{
return Medium;
}
QList<FilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry)
{
QStringList keywords;

3
src/plugins/help/helpindexfilter.h
View File

@@ -46,9 +46,6 @@ public:
~HelpIndexFilter();
// ILocatorFilter
QString displayName() const;
QString id() const;
Priority priority() const;
QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
void accept(Locator::FilterEntry selection) const;
void refresh(QFutureInterface<void> &future);

18
src/plugins/help/remotehelpfilter.cpp
View File

@@ -80,8 +80,11 @@ void RemoteFilterOptions::updateRemoveButton()
RemoteHelpFilter::RemoteHelpFilter()
{
setId("RemoteHelpFilter");
setDisplayName(tr("Web Search"));
setIncludedByDefault(false);
setShortcutString(QLatin1String("r"));
m_remoteUrls.append(QLatin1String("http://www.bing.com/search?q=%1"));
m_remoteUrls.append(QLatin1String("http://www.google.com/search?q=%1"));
m_remoteUrls.append(QLatin1String("http://search.yahoo.com/search?p=%1"));
@@ -93,21 +96,6 @@ RemoteHelpFilter::~RemoteHelpFilter()
{
}
QString RemoteHelpFilter::displayName() const
{
return tr("Web Search");
}
QString RemoteHelpFilter::id() const
{
return QLatin1String("RemoteHelpFilter");
}
Locator::ILocatorFilter::Priority RemoteHelpFilter::priority() const
{
return Medium;
}
QList<Locator::FilterEntry> RemoteHelpFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &pattern)
{
QList<Locator::FilterEntry> entries;

3
src/plugins/help/remotehelpfilter.h
View File

@@ -47,9 +47,6 @@ public:
~RemoteHelpFilter();
// ILocatorFilter
QString displayName() const;
QString id() const;
Priority priority() const;
QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
void accept(Locator::FilterEntry selection) const;
void refresh(QFutureInterface<void> &future);