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

Locator: Rename variables for consistency

Browse Source 
Change-Id: Ifc2228b4b18a8ce6ba19390f796f1f3c05e381d4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2013-08-07 10:41:03 +03:00
committed by hjk
parent f1583c98fe
commit d87f10a920
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/locator/basefilefilter.cpp
View File

@@ -47,15 +47,15 @@ BaseFileFilter::BaseFileFilter()
QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &origEntry) QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &origEntry)
{ {
updateFiles(); updateFiles();
QList<FilterEntry> matches; QList<FilterEntry> betterEntries;
QList<FilterEntry> badMatches; QList<FilterEntry> goodEntries;
QString needle = trimWildcards(origEntry); QString needle = trimWildcards(origEntry);
const QString lineNoSuffix = EditorManager::splitLineNumber(&needle); const QString lineNoSuffix = EditorManager::splitLineNumber(&needle);
QStringMatcher matcher(needle, Qt::CaseInsensitive); QStringMatcher matcher(needle, Qt::CaseInsensitive);
const QChar asterisk = QLatin1Char('*'); const QChar asterisk = QLatin1Char('*');
QRegExp regexp(asterisk + needle+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard); QRegExp regexp(asterisk + needle+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid()) if (!regexp.isValid())
return matches; return betterEntries;
const bool hasWildcard = needle.contains(asterisk) || needle.contains(QLatin1Char('?')); const bool hasWildcard = needle.contains(asterisk) || needle.contains(QLatin1Char('?'));
QStringList searchListPaths; QStringList searchListPaths;
QStringList searchListNames; QStringList searchListNames;
@@ -86,16 +86,16 @@ QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEn
entry.extraInfo = FileUtils::shortNativePath(FileName(fi)); entry.extraInfo = FileUtils::shortNativePath(FileName(fi));
entry.fileName = path; entry.fileName = path;
if (name.startsWith(needle, caseSensitivityForPrefix)) if (name.startsWith(needle, caseSensitivityForPrefix))
matches.append(entry); betterEntries.append(entry);
else else
badMatches.append(entry); goodEntries.append(entry);
m_previousResultPaths.append(path); m_previousResultPaths.append(path);
m_previousResultNames.append(name); m_previousResultNames.append(name);
} }
} }
matches.append(badMatches); betterEntries.append(goodEntries);
return matches; return betterEntries;
} }
void BaseFileFilter::accept(Locator::FilterEntry selection) const void BaseFileFilter::accept(Locator::FilterEntry selection) const