aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/app/qbs/parser/commandlineparser.cpp4
-rw-r--r--src/lib/corelib/buildgraph/rulesapplicator.cpp10
-rw-r--r--src/lib/corelib/language/evaluatorscriptclass.cpp3
-rw-r--r--src/lib/corelib/language/itemreaderastvisitor.cpp3
-rw-r--r--src/lib/corelib/language/moduleloader.cpp4
-rw-r--r--src/lib/corelib/language/projectresolver.cpp4
-rw-r--r--src/lib/corelib/language/scriptengine.cpp4
-rw-r--r--src/lib/corelib/tools/executablefinder.cpp7
-rw-r--r--src/lib/corelib/tools/fileinfo.cpp3
-rw-r--r--src/lib/corelib/tools/hostosinfo.h3
-rw-r--r--src/lib/corelib/tools/shellutils.cpp4
-rw-r--r--src/lib/qtprofilesetup/qtmoduleinfo.cpp25
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp4
-rw-r--r--tests/auto/blackbox/tst_blackboxandroid.cpp3
-rw-r--r--tests/auto/blackbox/tst_blackboxbase.cpp3
-rw-r--r--tests/auto/blackbox/tst_blackboxjava.cpp3
-rw-r--r--tests/auto/tools/tst_tools.cpp4
-rw-r--r--tests/fuzzy-test/fuzzytester.cpp4
18 files changed, 40 insertions, 55 deletions
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index 1f62e716c..2fe477418 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -450,10 +450,8 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildOptions()
buildOptions.setDryRun(dryRun());
QStringList changedFiles = optionPool.changedFilesOption()->arguments();
QDir currentDir;
- for (int i = 0; i < changedFiles.size(); ++i) {
- QString &file = changedFiles[i];
+ for (QString &file : changedFiles)
file = QDir::fromNativeSeparators(currentDir.absoluteFilePath(file));
- }
buildOptions.setChangedFiles(changedFiles);
buildOptions.setKeepGoing(optionPool.keepGoingOption()->enabled());
buildOptions.setForceTimestampCheck(optionPool.forceTimestampCheckOption()->enabled());
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index 3ebf27fe4..7def041cc 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -217,13 +217,14 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p
QScriptValue scriptValue;
if (!ruleArtifactArtifactMap.empty())
engine()->setGlobalObject(prepareScriptContext);
- for (int i = ruleArtifactArtifactMap.size(); --i >= 0;) {
- const RuleArtifact *ra = ruleArtifactArtifactMap.at(i).first;
+ for (auto it = ruleArtifactArtifactMap.crbegin(), end = ruleArtifactArtifactMap.crend();
+ it != end; ++it) {
+ const RuleArtifact *ra = it->first;
if (ra->bindings.empty())
continue;
// expose attributes of this artifact
- Artifact *outputArtifact = ruleArtifactArtifactMap.at(i).second;
+ Artifact *outputArtifact = it->second;
outputArtifact->properties = outputArtifact->properties->clone();
scope().setProperty(QLatin1String("fileName"),
@@ -367,8 +368,7 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F
FileTags outputArtifactFileTags = fileTags.empty()
? m_product->fileTagsForFileName(outputArtifact->fileName()) : fileTags;
- for (int i = 0; i < m_product->artifactProperties.size(); ++i) {
- const ArtifactPropertiesConstPtr &props = m_product->artifactProperties.at(i);
+ for (const ArtifactPropertiesConstPtr &props : qAsConst(m_product->artifactProperties)) {
if (outputArtifactFileTags.intersects(props->fileTagsFilter())) {
outputArtifact->properties = props->propertyMap();
outputArtifactFileTags += props->extraFileTags();
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index 533025ff6..6fcbd82c3 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -428,8 +428,7 @@ void EvaluatorScriptClass::collectValuesFromNextChain(const EvaluationData *data
*result = engine()->newArray();
quint32 k = 0;
- for (int i = 0; i < lst.size(); ++i) {
- const QScriptValue &v = lst.at(i);
+ for (const QScriptValue &v : qAsConst(lst)) {
QBS_ASSERT(!v.isError(), continue);
if (v.isArray()) {
const quint32 vlen = v.property(QStringLiteral("length")).toInt32();
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp
index d43e14927..b5d9245f1 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.cpp
+++ b/src/lib/corelib/language/itemreaderastvisitor.cpp
@@ -284,8 +284,7 @@ Item *ItemReaderASTVisitor::targetItemForBinding(const QStringList &bindingName,
void ItemReaderASTVisitor::inheritItem(Item *dst, const Item *src)
{
int insertPos = 0;
- for (int i = 0; i < src->m_children.size(); ++i) {
- Item *child = src->m_children.at(i);
+ for (Item *child : qAsConst(src->m_children)) {
dst->m_children.insert(insertPos++, child);
child->m_parent = dst;
}
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 0f2e5796a..bf5aa0add 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -3309,8 +3309,8 @@ void ModuleLoader::copyGroupsFromModuleToProduct(const ProductContext &productCo
const Item::Module &module,
const Item *modulePrototype)
{
- for (int i = 0; i < modulePrototype->children().size(); ++i) {
- Item * const child = modulePrototype->children().at(i);
+ const auto children = modulePrototype->children();
+ for (Item * const child : children) {
if (child->type() == ItemType::Group) {
Item * const clonedGroup = child->clone();
clonedGroup->setScope(productContext.scope);
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index ba6ce1673..997f2d42b 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -737,8 +737,8 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont
if (!prefixWasSet && m_productContext->currentGroup)
group->prefix = m_productContext->currentGroup->prefix;
if (!group->prefix.isEmpty()) {
- for (int i = files.size(); --i >= 0;)
- files[i].prepend(group->prefix);
+ for (auto it = files.rbegin(), end = files.rend(); it != end; ++it)
+ it->prepend(group->prefix);
}
group->location = item->location();
group->enabled = isEnabled;
diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp
index 6c779801c..5a79d0062 100644
--- a/src/lib/corelib/language/scriptengine.cpp
+++ b/src/lib/corelib/language/scriptengine.cpp
@@ -601,8 +601,8 @@ QScriptValueList ScriptEngine::argumentList(const QStringList &argumentNames,
const QScriptValue &context)
{
QScriptValueList result;
- for (int i = 0; i < argumentNames.size(); ++i)
- result += context.property(argumentNames.at(i));
+ for (const auto &name : argumentNames)
+ result += context.property(name);
return result;
}
diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp
index 2a55fe99b..eaa10cab6 100644
--- a/src/lib/corelib/tools/executablefinder.cpp
+++ b/src/lib/corelib/tools/executablefinder.cpp
@@ -98,8 +98,8 @@ QString ExecutableFinder::findBySuffix(const QString &filePath) const
bool ExecutableFinder::candidateCheck(const QString &directory, const QString &program,
QString &fullProgramPath) const
{
- for (int i = 0; i < m_executableSuffixes.size(); ++i) {
- QString candidate = directory + program + m_executableSuffixes.at(i);
+ for (const QString &suffix : qAsConst(m_executableSuffixes)) {
+ QString candidate = directory + program + suffix;
qCDebug(lcExec) << "candidate:" << candidate;
QFileInfo fi(candidate);
if (fi.isFile() && fi.isExecutable()) {
@@ -122,8 +122,7 @@ QString ExecutableFinder::findInPath(const QString &filePath, const QString &wor
.split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts);
if (HostOsInfo::isWindowsHost())
pathEnv.prepend(QLatin1String("."));
- for (int i = 0; i < pathEnv.size(); ++i) {
- QString directory = pathEnv.at(i);
+ for (QString directory : qAsConst(pathEnv)) {
if (directory == QLatin1String("."))
directory = workingDirPath;
if (!directory.isEmpty()) {
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index 3e2f0d36c..958116412 100644
--- a/src/lib/corelib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
@@ -168,8 +168,7 @@ bool FileInfo::isPattern(const QString &str)
bool FileInfo::isPattern(const QStringRef &str)
{
- for (int i = 0; i < str.size(); ++i) {
- const QChar ch = str.at(i);
+ for (const QChar &ch : str) {
if (ch == QLatin1Char('*') || ch == QLatin1Char('?')
|| ch == QLatin1Char(']') || ch == QLatin1Char('[')) {
return true;
diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h
index ca5fafa91..7ba4b2d4d 100644
--- a/src/lib/corelib/tools/hostosinfo.h
+++ b/src/lib/corelib/tools/hostosinfo.h
@@ -233,8 +233,7 @@ bool HostOsInfo::isAnyUnixHost()
QString HostOsInfo::rfc1034Identifier(const QString &str)
{
QString s = str;
- for (int i = 0; i < s.size(); ++i) {
- QCharRef ch = s[i];
+ for (QChar &ch : s) {
const char c = ch.toLatin1();
const bool okChar = (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z')
diff --git a/src/lib/corelib/tools/shellutils.cpp b/src/lib/corelib/tools/shellutils.cpp
index 9c49d9b6d..3f2855ef8 100644
--- a/src/lib/corelib/tools/shellutils.cpp
+++ b/src/lib/corelib/tools/shellutils.cpp
@@ -73,8 +73,8 @@ inline static bool isSpecialChar(ushort c, const uchar (&iqm)[16])
inline static bool hasSpecialChars(const QString &arg, const uchar (&iqm)[16])
{
- for (int x = arg.length() - 1; x >= 0; --x) {
- if (isSpecialChar(arg.unicode()[x].unicode(), iqm))
+ for (auto it = arg.crbegin(), end = arg.crend(); it != end; ++it) {
+ if (isSpecialChar(it->unicode(), iqm))
return true;
}
return false;
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
index 901ef55e9..fa97f1632 100644
--- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp
+++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
@@ -56,8 +56,7 @@ namespace Internal {
typedef QHash<QString, QString> NamePathHash;
static void replaceQtLibNamesWithFilePath(const NamePathHash &namePathHash, QStringList *libList)
{
- for (int i = 0; i < libList->size(); ++i) {
- QString &lib = (*libList)[i];
+ for (QString &lib : *libList) {
const NamePathHash::ConstIterator it = namePathHash.find(lib);
if (it != namePathHash.constEnd())
lib = it.value();
@@ -77,8 +76,7 @@ static void replaceQtLibNamesWithFilePath(QList<QtModuleInfo> *modules, const Qt
linkerNamesToFilePathsRelease.insert(m.libNameForLinker(qtEnv, false),
m.libFilePathRelease);
}
- for (int i = 0; i < modules->size(); ++i) {
- QtModuleInfo &module = (*modules)[i];
+ for (QtModuleInfo &module : *modules) {
replaceQtLibNamesWithFilePath(linkerNamesToFilePathsDebug, &module.dynamicLibrariesDebug);
replaceQtLibNamesWithFilePath(linkerNamesToFilePathsDebug, &module.staticLibrariesDebug);
replaceQtLibNamesWithFilePath(linkerNamesToFilePathsRelease,
@@ -487,16 +485,15 @@ QList<QtModuleInfo> allQt4Modules(const QtEnvironment &qtEnvironment)
<< QLatin1String("webkit") << QLatin1String("script") << QLatin1String("scripttools")
<< QLatin1String("declarative") << QLatin1String("gui") << QLatin1String("dbus")
<< QLatin1String("opengl") << QLatin1String("openvg");
- for (int i = 0; i < modules.size(); ++i) {
- QString name = modules[i].qbsName;
+ for (auto &module : modules) {
+ QString name = module.qbsName;
name.remove(QLatin1String("-private"));
if (modulesThatCanBeDisabled.contains(name))
- modules[i].mustExist = false;
+ module.mustExist = false;
}
Internal::Set<QString> nonExistingPrlFiles;
- for (int i = 0; i < modules.size(); ++i) {
- QtModuleInfo &module = modules[i];
+ for (QtModuleInfo &module : modules) {
if (qtEnvironment.staticBuild)
module.isStaticLibrary = true;
module.setupLibraries(qtEnvironment, &nonExistingPrlFiles);
@@ -585,10 +582,8 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q
hasModuleEntry = true;
} else if (key.endsWith(".depends")) {
moduleInfo.dependencies = QString::fromLocal8Bit(value).split(QLatin1Char(' '));
- for (int i = 0; i < moduleInfo.dependencies.size(); ++i) {
- moduleInfo.dependencies[i].replace(QLatin1String("_private"),
- QLatin1String("-private"));
- }
+ for (auto &dependency : moduleInfo.dependencies)
+ dependency.replace(QLatin1String("_private"), QLatin1String("-private"));
} else if (key.endsWith(".module_config")) {
const auto elems = value.split(' ');
for (const QByteArray &elem : elems) {
@@ -603,8 +598,8 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q
}
} else if (key.endsWith(".includes")) {
moduleInfo.includePaths = QString::fromLocal8Bit(value).split(QLatin1Char(' '));
- for (int i = 0; i < moduleInfo.includePaths.size(); ++i) {
- moduleInfo.includePaths[i]
+ for (auto &includePath : moduleInfo.includePaths) {
+ includePath
.replace(QLatin1String("$$QT_MODULE_INCLUDE_BASE"),
qtEnvironment.includePath)
.replace(QLatin1String("$$QT_MODULE_LIB_BASE"),
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 7351777e8..15440f838 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -2094,8 +2094,8 @@ void TestBlackbox::responseFiles()
<< "foo" << qbs::Internal::shellQuote(QStringLiteral("with space")).toUtf8()
<< "bar" << "";
QList<QByteArray> lines = file.readAll().split('\n');
- for (int i = 0; i < lines.size(); ++i)
- lines[i] = lines.at(i).trimmed();
+ for (auto &line : lines)
+ line = line.trimmed();
QCOMPARE(lines, expected);
}
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index 8fba0d78e..a06dbbf8e 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -98,8 +98,7 @@ void TestBlackboxAndroid::android()
"modules.Android.ndk.platform:android-21" });
params.profile = p.name();
QCOMPARE(runQbs(params), 0);
- for (int i = 0; i < productNames.size(); ++i) {
- const QString productName = productNames.at(i);
+ for (const QString &productName : qAsConst(productNames)) {
QVERIFY(m_qbsStdout.contains(productName.toLocal8Bit() + ".apk"));
const QString apkFilePath = relativeProductBuildDir(productName)
+ '/' + productName + ".apk";
diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp
index 6db5f66e0..cb36e13e1 100644
--- a/tests/auto/blackbox/tst_blackboxbase.cpp
+++ b/tests/auto/blackbox/tst_blackboxbase.cpp
@@ -152,8 +152,7 @@ QByteArray TestBlackboxBase::unifiedLineEndings(const QByteArray &ba)
if (HostOsInfo::isWindowsHost()) {
QByteArray result;
result.reserve(ba.size());
- for (int i = 0; i < ba.size(); ++i) {
- char c = ba.at(i);
+ for (const char &c : ba) {
if (c != '\r')
result.append(c);
}
diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp
index 3acb6bcef..6c76019db 100644
--- a/tests/auto/blackbox/tst_blackboxjava.cpp
+++ b/tests/auto/blackbox/tst_blackboxjava.cpp
@@ -78,8 +78,7 @@ void TestBlackboxJava::java()
const QStringList classFiles =
QStringList() << "Jet" << "Ship" << "Vehicles";
QStringList classFiles1 = QStringList(classFiles) << "io/qt/qbs/HelloWorld" << "NoPackage";
- for (int i = 0; i < classFiles1.size(); ++i) {
- QString &classFile = classFiles1[i];
+ for (QString &classFile : classFiles1) {
classFile = relativeProductBuildDir("class_collection") + "/classes/"
+ classFile + ".class";
QVERIFY2(regularFileExists(classFile), qPrintable(classFile));
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index 9707cb4ff..957f08885 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -427,8 +427,8 @@ void TestTools::testProcessNameByPid()
int toNumber(const QString &str)
{
int res = 0;
- for (int i = 0; i < str.length(); ++i)
- res = (res * 10) + str[i].digitValue();
+ for (const QChar &c : str)
+ res = (res * 10) + c.digitValue();
return res;
}
diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp
index 09a5f25f3..37a6c56fe 100644
--- a/tests/fuzzy-test/fuzzytester.cpp
+++ b/tests/fuzzy-test/fuzzytester.cpp
@@ -158,8 +158,8 @@ QString FuzzyTester::findWorkingStartCommit(const QString &startCommit)
const QStringList allCommits = findAllCommits(startCommit);
QString qbsError;
m_currentActivity = buildFromScratchActivity();
- for (int i = allCommits.size() - 1; i >= 0; --i) {
- m_currentCommit = allCommits.at(i);
+ for (auto it = allCommits.crbegin(), end = allCommits.crend(); it != end; ++it) {
+ m_currentCommit = *it;
if (m_unbuildableCommits.contains(m_currentCommit)) {
qDebug("Skipping known bad commit %s.", qPrintable(m_currentCommit));
continue;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 22:30:21 +0000