From d87f10a92041d41bf95d7dee20fff5cde442911c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 7 Aug 2013 10:41:03 +0300
Subject: [PATCH] Locator: Rename variables for consistency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ifc2228b4b18a8ce6ba19390f796f1f3c05e381d4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/locator/basefilefilter.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/locator/basefilefilter.cpp b/src/plugins/locator/basefilefilter.cpp
index 3df7ff8cd58..b04d631c91c 100644
--- a/src/plugins/locator/basefilefilter.cpp
+++ b/src/plugins/locator/basefilefilter.cpp
@@ -47,15 +47,15 @@ BaseFileFilter::BaseFileFilter()
QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &origEntry)
{
updateFiles();
- QList<FilterEntry> matches;
- QList<FilterEntry> badMatches;
+ QList<FilterEntry> betterEntries;
+ QList<FilterEntry> goodEntries;
QString needle = trimWildcards(origEntry);
const QString lineNoSuffix = EditorManager::splitLineNumber(&needle);
QStringMatcher matcher(needle, Qt::CaseInsensitive);
const QChar asterisk = QLatin1Char('*');
QRegExp regexp(asterisk + needle+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
if (!regexp.isValid())
- return matches;
+ return betterEntries;
const bool hasWildcard = needle.contains(asterisk) || needle.contains(QLatin1Char('?'));
QStringList searchListPaths;
QStringList searchListNames;
@@ -86,16 +86,16 @@ QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEn
entry.extraInfo = FileUtils::shortNativePath(FileName(fi));
entry.fileName = path;
if (name.startsWith(needle, caseSensitivityForPrefix))
- matches.append(entry);
+ betterEntries.append(entry);
else
- badMatches.append(entry);
+ goodEntries.append(entry);
m_previousResultPaths.append(path);
m_previousResultNames.append(name);
}
}
- matches.append(badMatches);
- return matches;
+ betterEntries.append(goodEntries);
+ return betterEntries;
}
void BaseFileFilter::accept(Locator::FilterEntry selection) const
--
GitLab