diff options
author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-04-14 16:52:01 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-06-16 12:08:12 +0200 |
commit | 17febac88b8ecfde9a5502b27f72b58ab4277165 (patch) | |
tree | e71883b242d2ba6a22cef249cc4f53f6b6ea9879 /src/plugins/cpptools/cpplocatorfilter.cpp | |
parent | 4d812d86c6d35be3a459c476677df3f5c37c90a5 (diff) |
C++: Rename ModelItemInfo to IndexInfo.
And move it into its own header and source files.
Change-Id: I37401badd819e028e1d767425759dc0ff27afe31
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpplocatorfilter.cpp')
-rw-r--r-- | src/plugins/cpptools/cpplocatorfilter.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index c5d5af9e517..3c967c4d32f 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -48,11 +48,11 @@ CppLocatorFilter::~CppLocatorFilter() { } -Core::LocatorFilterEntry CppLocatorFilter::filterEntryFromModelItemInfo(ModelItemInfo::Ptr info) +Core::LocatorFilterEntry CppLocatorFilter::filterEntryFromIndexItem(IndexItem::Ptr info) { const QVariant id = qVariantFromValue(info); Core::LocatorFilterEntry filterEntry(this, info->scopedSymbolName(), id, info->icon()); - if (info->type() == ModelItemInfo::Class || info->type() == ModelItemInfo::Enum) + if (info->type() == IndexItem::Class || info->type() == IndexItem::Enum) filterEntry.extraInfo = info->shortNativeFilePath(); else filterEntry.extraInfo = info->symbolType(); @@ -65,9 +65,9 @@ void CppLocatorFilter::refresh(QFutureInterface<void> &future) Q_UNUSED(future) } -QList<QList<CppTools::ModelItemInfo::Ptr> > CppLocatorFilter::itemsToMatchUserInputAgainst() const +QList<QList<CppTools::IndexItem::Ptr> > CppLocatorFilter::itemsToMatchUserInputAgainst() const { - return QList<QList<CppTools::ModelItemInfo::Ptr> >() + return QList<QList<CppTools::IndexItem::Ptr> >() << m_data->classes() << m_data->functions() << m_data->enums(); @@ -94,16 +94,16 @@ QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor( bool hasColonColon = entry.contains(QLatin1String("::")); const Qt::CaseSensitivity caseSensitivityForPrefix = caseSensitivity(entry); - const QList<QList<CppTools::ModelItemInfo::Ptr> > itemLists = itemsToMatchUserInputAgainst(); - foreach (const QList<CppTools::ModelItemInfo::Ptr> &items, itemLists) { - foreach (ModelItemInfo::Ptr info, items) { + const QList<QList<CppTools::IndexItem::Ptr> > itemLists = itemsToMatchUserInputAgainst(); + foreach (const QList<CppTools::IndexItem::Ptr> &items, itemLists) { + foreach (IndexItem::Ptr info, items) { if (future.isCanceled()) break; const QString matchString = hasColonColon ? info->scopedSymbolName() : info->symbolName(); if ((hasWildcard && regexp.exactMatch(matchString)) || (!hasWildcard && matcher.indexIn(matchString) != -1)) { - const Core::LocatorFilterEntry filterEntry = filterEntryFromModelItemInfo(info); + const Core::LocatorFilterEntry filterEntry = filterEntryFromIndexItem(info); if (matchString.startsWith(entry, caseSensitivityForPrefix)) betterEntries.append(filterEntry); else @@ -123,6 +123,6 @@ QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor( void CppLocatorFilter::accept(Core::LocatorFilterEntry selection) const { - ModelItemInfo::Ptr info = qvariant_cast<CppTools::ModelItemInfo::Ptr>(selection.internalData); + IndexItem::Ptr info = qvariant_cast<CppTools::IndexItem::Ptr>(selection.internalData); Core::EditorManager::openEditorAt(info->fileName(), info->line(), info->column()); } |