tools: use const (and const APIs) more

For CoW types, prefer const methods to avoid needless detach()ing.

Change-Id: If9018391c001eba3b4b2061d06c4caa8136811ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

6 files changed, 28 insertions, 28 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index be62500858..fdfc66f3a6 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -463,7 +463,7 @@ int main(int argc, char *argv[])
     QString dummyDir;
 
     //Handle main arguments
-    QStringList argList = app->arguments();
+    const QStringList argList = app->arguments();
     for (int i = 1; i < argList.count(); i++) {
         const QString &arg = argList[i];
         if (arg == QLatin1String("-quiet"))
diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp
index 6fee013c62..d54a101b69 100644
--- a/tools/qmleasing/splineeditor.cpp
+++ b/tools/qmleasing/splineeditor.cpp
@@ -620,7 +620,7 @@ void SplineEditor::mouseMoveEvent(QMouseEvent *e)
         if (indexIsRealPoint(m_activeControlPoint)) {
             //move also the tangents
             QPointF targetPoint = p;
-            QPointF distance = targetPoint - m_controlPoints[m_activeControlPoint];
+            QPointF distance = targetPoint - m_controlPoints.at(m_activeControlPoint);
             m_controlPoints[m_activeControlPoint] = targetPoint;
             m_controlPoints[m_activeControlPoint - 1] += distance;
             m_controlPoints[m_activeControlPoint + 1] += distance;
@@ -629,7 +629,7 @@ void SplineEditor::mouseMoveEvent(QMouseEvent *e)
                 m_controlPoints[m_activeControlPoint] = p;
             } else {
                 QPointF targetPoint = p;
-                QPointF distance = targetPoint - m_controlPoints[m_activeControlPoint];
+                QPointF distance = targetPoint - m_controlPoints.at(m_activeControlPoint);
                 m_controlPoints[m_activeControlPoint] = p;
 
                 if ((m_activeControlPoint > 1) && (m_activeControlPoint % 3) == 0) { //right control point
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 3c4dccf806..8f476649e9 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -145,7 +145,7 @@ QVariantMap pluginsForModulePath(const QString &modulePath) {
             classnames += QString::fromUtf8(line.split(' ').at(1));
             classnames += QLatin1Char(' ');
         } else if (line.startsWith("depends")) {
-            QList<QByteArray> dep = line.split(' ');
+            const QList<QByteArray> dep = line.split(' ');
             if (dep.length() != 3)
                 std::cerr << "depends: expected 2 arguments: module identifier and version" << std::endl;
             else
@@ -217,8 +217,8 @@ QVariantList findPathsForModuleImports(const QVariantList &imports)
     QVariantList importsCopy(imports);
 
     for (int i = 0; i < importsCopy.length(); ++i) {
-        QVariantMap import = qvariant_cast<QVariantMap>(importsCopy[i]);
-        if (import[typeLiteral()] == QLatin1String("module")) {
+        QVariantMap import = qvariant_cast<QVariantMap>(importsCopy.at(i));
+        if (import.value(typeLiteral()) == QLatin1String("module")) {
             QString path = resolveImportPath(import.value(nameLiteral()).toString(), import.value(versionLiteral()).toString());
             if (!path.isEmpty())
                 import[pathLiteral()] = path;
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp
index 964afc265b..44ff37b925 100644
--- a/tools/qmljs/qmljs.cpp
+++ b/tools/qmljs/qmljs.cpp
@@ -145,22 +145,22 @@ int main(int argc, char *argv[])
     bool runAsQml = false;
 
     if (!args.isEmpty()) {
-        if (args.first() == QLatin1String("--jit")) {
+        if (args.constFirst() == QLatin1String("--jit")) {
             mode = use_masm;
             args.removeFirst();
         }
 
-        if (args.first() == QLatin1String("--interpret")) {
+        if (args.constFirst() == QLatin1String("--interpret")) {
             mode = use_moth;
             args.removeFirst();
         }
 
-        if (args.first() == QLatin1String("--qml")) {
+        if (args.constFirst() == QLatin1String("--qml")) {
             runAsQml = true;
             args.removeFirst();
         }
 
-        if (args.first() == QLatin1String("--help")) {
+        if (args.constFirst() == QLatin1String("--help")) {
             std::cerr << "Usage: qmljs [|--jit|--interpret|--qml] file..." << std::endl;
             return EXIT_SUCCESS;
         }
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index a5f825907a..de8d238578 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -881,20 +881,20 @@ bool compactDependencies(QStringList *dependencies)
     if (dependencies->isEmpty())
         return false;
     dependencies->sort();
-    QStringList oldDep = dependencies->first().split(QLatin1Char(' '));
+    QStringList oldDep = dependencies->constFirst().split(QLatin1Char(' '));
     Q_ASSERT(oldDep.size() == 2);
     int oldPos = 0;
     for (int idep = 1; idep < dependencies->size(); ++idep) {
         QString depStr = dependencies->at(idep);
         const QStringList newDep = depStr.split(QLatin1Char(' '));
         Q_ASSERT(newDep.size() == 2);
-        if (newDep.first() != oldDep.first()) {
+        if (newDep.constFirst() != oldDep.constFirst()) {
             if (++oldPos != idep)
                 dependencies->replace(oldPos, depStr);
             oldDep = newDep;
         } else {
-            QStringList v1 = oldDep.last().split(QLatin1Char('.'));
-            QStringList v2 = newDep.last().split(QLatin1Char('.'));
+            const QStringList v1 = oldDep.constLast().split(QLatin1Char('.'));
+            const QStringList v2 = newDep.constLast().split(QLatin1Char('.'));
             Q_ASSERT(v1.size() == 2);
             Q_ASSERT(v2.size() == 2);
             bool ok;
@@ -903,9 +903,9 @@ bool compactDependencies(QStringList *dependencies)
             int major2 = v2.first().toInt(&ok);
             Q_ASSERT(ok);
             if (major1 != major2) {
-                std::cerr << "Found a dependency on " << qPrintable(oldDep.first())
-                          << " with two major versions:" << qPrintable(oldDep.last())
-                          << " and " << qPrintable(newDep.last())
+                std::cerr << "Found a dependency on " << qPrintable(oldDep.constFirst())
+                          << " with two major versions:" << qPrintable(oldDep.constLast())
+                          << " and " << qPrintable(newDep.constLast())
                           << " which is unsupported, discarding smaller version" << std::endl;
                 if (major1 < major2)
                     dependencies->replace(oldPos, depStr);
@@ -1061,18 +1061,18 @@ int main(int argc, char *argv[])
                 std::cerr << "Incorrect number of positional arguments" << std::endl;
                 return EXIT_INVALIDARGUMENTS;
             }
-            pluginImportUri = positionalArgs[1];
+            pluginImportUri = positionalArgs.at(1);
             pluginImportVersion = positionalArgs[2];
             if (positionalArgs.size() >= 4)
-                pluginImportPath = positionalArgs[3];
+                pluginImportPath = positionalArgs.at(3);
         } else if (action == Path) {
             if (positionalArgs.size() != 2 && positionalArgs.size() != 3) {
                 std::cerr << "Incorrect number of positional arguments" << std::endl;
                 return EXIT_INVALIDARGUMENTS;
             }
-            pluginImportPath = QDir::fromNativeSeparators(positionalArgs[1]);
+            pluginImportPath = QDir::fromNativeSeparators(positionalArgs.at(1));
             if (positionalArgs.size() == 3)
-                pluginImportVersion = positionalArgs[2];
+                pluginImportVersion = positionalArgs.at(2);
         } else if (action == Builtins) {
             if (positionalArgs.size() != 1) {
                 std::cerr << "Incorrect number of positional arguments" << std::endl;
@@ -1094,7 +1094,7 @@ int main(int argc, char *argv[])
     QStringList mergeDependencies;
     QString mergeComponents;
     if (!mergeFile.isEmpty()) {
-        QStringList merge = readQmlTypes(mergeFile);
+        const QStringList merge = readQmlTypes(mergeFile);
         if (!merge.isEmpty()) {
             QRegularExpression re("(\\w+\\.*\\w*\\s*\\d+\\.\\d+)");
             QRegularExpressionMatchIterator i = re.globalMatch(merge[1]);
@@ -1167,7 +1167,7 @@ int main(int argc, char *argv[])
         }
     } else if (pluginImportUri == QLatin1String("QtQml")) {
         bool ok = false;
-        const uint major = pluginImportVersion.split('.')[0].toUInt(&ok, 10);
+        const uint major = pluginImportVersion.splitRef('.').at(0).toUInt(&ok, 10);
         if (!ok) {
             std::cerr << "Malformed version string \""<< qPrintable(pluginImportVersion) << "\"."
                       << std::endl;
diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index 048c92bb93..668cb3ce2d 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -403,23 +403,23 @@ void QmlProfilerData::computeQmlTime()
     int level = minimumLevel;
 
     for (int i = 0; i < d->startInstanceList.count(); i++) {
-        qint64 st = d->startInstanceList[i].startTime;
+        qint64 st = d->startInstanceList.at(i).startTime;
 
-        if (d->startInstanceList[i].data->rangeType == QQmlProfilerDefinitions::Painting) {
+        if (d->startInstanceList.at(i).data->rangeType == QQmlProfilerDefinitions::Painting) {
             continue;
         }
 
         // general level
-        if (endtimesPerLevel[level] > st) {
+        if (endtimesPerLevel.value(level) > st) {
             level++;
         } else {
             while (level > minimumLevel && endtimesPerLevel[level-1] <= st)
                 level--;
         }
-        endtimesPerLevel[level] = st + d->startInstanceList[i].duration;
+        endtimesPerLevel[level] = st + d->startInstanceList.at(i).duration;
 
         if (level == minimumLevel) {
-            d->qmlMeasuredTime += d->startInstanceList[i].duration;
+            d->qmlMeasuredTime += d->startInstanceList.at(i).duration;
         }
     }
 }