forked from qt-creator/qt-creator
"foreach (QString" -> "foreach (const QString &"
Change-Id: Idb866407347722766edbc85ce20799b088ce36dd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -1000,7 +1000,7 @@ void ModelManagerInterface::importScan(QFutureInterface<void> &future,
|
|||||||
QStringList subDirs(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot));
|
QStringList subDirs(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot));
|
||||||
workDone += 1;
|
workDone += 1;
|
||||||
totalWork += pathBudget / 2 * subDirs.size() - pathBudget * 3 / 4 + 1;
|
totalWork += pathBudget / 2 * subDirs.size() - pathBudget * 3 / 4 + 1;
|
||||||
foreach (const QString path, subDirs)
|
foreach (const QString &path, subDirs)
|
||||||
pathsToScan.append(ScanItem(dir.absoluteFilePath(path), toScan.depth + 1));
|
pathsToScan.append(ScanItem(dir.absoluteFilePath(path), toScan.depth + 1));
|
||||||
} else {
|
} else {
|
||||||
workDone += pathBudget * 3 / 4;
|
workDone += pathBudget * 3 / 4;
|
||||||
@@ -1040,7 +1040,7 @@ void ModelManagerInterface::maybeScan(const QStringList &importPaths,
|
|||||||
QStringList pathToScan;
|
QStringList pathToScan;
|
||||||
{
|
{
|
||||||
QMutexLocker l(&m_mutex);
|
QMutexLocker l(&m_mutex);
|
||||||
foreach (QString importPath, importPaths)
|
foreach (const QString &importPath, importPaths)
|
||||||
if (!m_scannedPaths.contains(importPath)) {
|
if (!m_scannedPaths.contains(importPath)) {
|
||||||
pathToScan.append(importPath);
|
pathToScan.append(importPath);
|
||||||
}
|
}
|
||||||
|
@@ -247,7 +247,7 @@ void AndroidDeployQtStep::run(QFutureInterface<bool> &fi)
|
|||||||
|
|
||||||
ProjectExplorer::ProcessParameters *pp = processParameters();
|
ProjectExplorer::ProcessParameters *pp = processParameters();
|
||||||
QString args;
|
QString args;
|
||||||
foreach (const QString arg, AndroidDeviceInfo::adbSelector(m_serialNumber))
|
foreach (const QString &arg, AndroidDeviceInfo::adbSelector(m_serialNumber))
|
||||||
Utils::QtcProcess::addArg(&args, arg);
|
Utils::QtcProcess::addArg(&args, arg);
|
||||||
|
|
||||||
Utils::QtcProcess::addArg(&args, QLatin1String("install"));
|
Utils::QtcProcess::addArg(&args, QLatin1String("install"));
|
||||||
|
@@ -196,7 +196,7 @@ void AbstractSettings::save()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// remove old files
|
// remove old files
|
||||||
foreach (const QString file, m_stylesToRemove)
|
foreach (const QString &file, m_stylesToRemove)
|
||||||
m_styleDir.remove(file);
|
m_styleDir.remove(file);
|
||||||
m_stylesToRemove.clear();
|
m_stylesToRemove.clear();
|
||||||
|
|
||||||
@@ -239,7 +239,7 @@ void AbstractSettings::read()
|
|||||||
s->beginGroup(QLatin1String(Constants::SETTINGS_GROUP));
|
s->beginGroup(QLatin1String(Constants::SETTINGS_GROUP));
|
||||||
s->beginGroup(m_name);
|
s->beginGroup(m_name);
|
||||||
const QStringList keys = s->allKeys();
|
const QStringList keys = s->allKeys();
|
||||||
foreach (const QString key, keys) {
|
foreach (const QString &key, keys) {
|
||||||
if (key == QLatin1String("command"))
|
if (key == QLatin1String("command"))
|
||||||
setCommand(s->value(key).toString());
|
setCommand(s->value(key).toString());
|
||||||
else if (m_settings.contains(key))
|
else if (m_settings.contains(key))
|
||||||
@@ -259,7 +259,7 @@ void AbstractSettings::read()
|
|||||||
const QStringList files
|
const QStringList files
|
||||||
= m_styleDir.entryList(QStringList() << QLatin1Char('*') + m_ending,
|
= m_styleDir.entryList(QStringList() << QLatin1Char('*') + m_ending,
|
||||||
QDir::Files | QDir::Readable | QDir::NoDotAndDotDot);
|
QDir::Files | QDir::Readable | QDir::NoDotAndDotDot);
|
||||||
foreach (const QString filename, files) {
|
foreach (const QString &filename, files) {
|
||||||
// do not allow empty file names
|
// do not allow empty file names
|
||||||
if (filename == m_ending)
|
if (filename == m_ending)
|
||||||
continue;
|
continue;
|
||||||
|
@@ -87,7 +87,7 @@ bool ActivitySelector::refresh()
|
|||||||
int current;
|
int current;
|
||||||
QList<QStringPair> activities = m_plugin->activities(¤t);
|
QList<QStringPair> activities = m_plugin->activities(¤t);
|
||||||
m_cmbActivity->clear();
|
m_cmbActivity->clear();
|
||||||
foreach (QStringPair activity, activities)
|
foreach (const QStringPair &activity, activities)
|
||||||
m_cmbActivity->addItem(activity.second, activity.first);
|
m_cmbActivity->addItem(activity.second, activity.first);
|
||||||
m_cmbActivity->setCurrentIndex(current);
|
m_cmbActivity->setCurrentIndex(current);
|
||||||
m_cmbActivity->updateGeometry();
|
m_cmbActivity->updateGeometry();
|
||||||
|
@@ -140,7 +140,7 @@ void MakeStep::activeBuildConfigurationChanged()
|
|||||||
void MakeStep::buildTargetsChanged()
|
void MakeStep::buildTargetsChanged()
|
||||||
{
|
{
|
||||||
QStringList filteredTargets;
|
QStringList filteredTargets;
|
||||||
foreach (const QString t, static_cast<CMakeProject *>(project())->buildTargetTitles()) {
|
foreach (const QString &t, static_cast<CMakeProject *>(project())->buildTargetTitles()) {
|
||||||
if (m_buildTargets.contains(t))
|
if (m_buildTargets.contains(t))
|
||||||
filteredTargets.append(t);
|
filteredTargets.append(t);
|
||||||
}
|
}
|
||||||
|
@@ -978,7 +978,7 @@ bool QmakePriFileNode::addFiles(const QStringList &filePaths, QStringList *notAd
|
|||||||
typedef QMap<QString, QStringList> TypeFileMap;
|
typedef QMap<QString, QStringList> TypeFileMap;
|
||||||
// Split into lists by file type and bulk-add them.
|
// Split into lists by file type and bulk-add them.
|
||||||
TypeFileMap typeFileMap;
|
TypeFileMap typeFileMap;
|
||||||
foreach (const QString file, filePaths) {
|
foreach (const QString &file, filePaths) {
|
||||||
const Core::MimeType mt = Core::MimeDatabase::findByFile(file);
|
const Core::MimeType mt = Core::MimeDatabase::findByFile(file);
|
||||||
typeFileMap[mt.type()] << file;
|
typeFileMap[mt.type()] << file;
|
||||||
}
|
}
|
||||||
@@ -1025,7 +1025,7 @@ bool QmakePriFileNode::removeFiles(const QStringList &filePaths,
|
|||||||
typedef QMap<QString, QStringList> TypeFileMap;
|
typedef QMap<QString, QStringList> TypeFileMap;
|
||||||
// Split into lists by file type and bulk-add them.
|
// Split into lists by file type and bulk-add them.
|
||||||
TypeFileMap typeFileMap;
|
TypeFileMap typeFileMap;
|
||||||
foreach (const QString file, filePaths) {
|
foreach (const QString &file, filePaths) {
|
||||||
const Core::MimeType mt = Core::MimeDatabase::findByFile(file);
|
const Core::MimeType mt = Core::MimeDatabase::findByFile(file);
|
||||||
typeFileMap[mt.type()] << file;
|
typeFileMap[mt.type()] << file;
|
||||||
}
|
}
|
||||||
|
@@ -244,7 +244,7 @@ void BlackBerrySigningUtils::saveDebugTokens()
|
|||||||
settings->beginGroup(DebugTokensGroup);
|
settings->beginGroup(DebugTokensGroup);
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
foreach (QString dt, m_debugTokens) {
|
foreach (const QString &dt, m_debugTokens) {
|
||||||
settings->beginGroup(QString::fromLatin1("debugToken_%1").arg(++count));
|
settings->beginGroup(QString::fromLatin1("debugToken_%1").arg(++count));
|
||||||
settings->setValue(DebugTokensPath, dt);
|
settings->setValue(DebugTokensPath, dt);
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
@@ -94,11 +94,11 @@ static QString updateVariable(const QString &varStr, const QString &varsToAdd,
|
|||||||
QSet<QString> var = parseVariable(varStr);
|
QSet<QString> var = parseVariable(varStr);
|
||||||
|
|
||||||
QSet<QString> ss = parseVariable(varsToAdd);
|
QSet<QString> ss = parseVariable(varsToAdd);
|
||||||
foreach (QString s, ss)
|
foreach (const QString &s, ss)
|
||||||
var << s;
|
var << s;
|
||||||
|
|
||||||
ss = parseVariable(varsToRemove);
|
ss = parseVariable(varsToRemove);
|
||||||
foreach (QString s, ss)
|
foreach (const QString &s, ss)
|
||||||
var.remove(s);
|
var.remove(s);
|
||||||
|
|
||||||
QStringList sl = QStringList::fromSet(var);
|
QStringList sl = QStringList::fromSet(var);
|
||||||
|
@@ -96,7 +96,7 @@ bool WinRtPackageDeploymentStep::init()
|
|||||||
raiseError(tr("Cannot parse manifest file %1.").arg(fullManifestPath));
|
raiseError(tr("Cannot parse manifest file %1.").arg(fullManifestPath));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
foreach (QString icon, iconsToDeploy) {
|
foreach (const QString &icon, iconsToDeploy) {
|
||||||
m_mappingFileContent += QLatin1Char('"')
|
m_mappingFileContent += QLatin1Char('"')
|
||||||
+ QDir::toNativeSeparators(targetDir + icon) + QLatin1String("\" \"")
|
+ QDir::toNativeSeparators(targetDir + icon) + QLatin1String("\" \"")
|
||||||
+ QDir::toNativeSeparators(icon) + QLatin1String("\"\n");
|
+ QDir::toNativeSeparators(icon) + QLatin1String("\"\n");
|
||||||
|
Reference in New Issue
Block a user