Replace foreach with range-based for

Use qAsConst to prevent detaching where it's needed.
qAsConst is not acceptable for rvalues, therefore catch them by
const auto.

Result: reduce text size.

Change-Id: If773827f24dc5a45c264ad2ed6060c1a99720040
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

8 files changed, 24 insertions, 23 deletions

diff --git a/src/virtualkeyboard/hunspellinputmethod_p.cpp b/src/virtualkeyboard/hunspellinputmethod_p.cpp
index 40d1bd1a..34f343d3 100644
--- a/src/virtualkeyboard/hunspellinputmethod_p.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod_p.cpp
@@ -85,7 +85,7 @@ bool HunspellInputMethodPrivate::createHunspell(const QString &locale)
                 << QStringLiteral("/usr/share/myspell/dicts")
 #endif
                    ;
-        foreach (const QString &defaultPath, defaultPaths) {
+        for (const QString &defaultPath : defaultPaths) {
             if (!searchPaths.contains(defaultPath))
                 searchPaths.append(defaultPath);
         }
diff --git a/src/virtualkeyboard/hunspellworker.cpp b/src/virtualkeyboard/hunspellworker.cpp
index 72812592..0deaf1ef 100644
--- a/src/virtualkeyboard/hunspellworker.cpp
+++ b/src/virtualkeyboard/hunspellworker.cpp
@@ -77,7 +77,7 @@ void HunspellLoadDictionaryTask::run()
 
     QString affPath;
     QString dicPath;
-    foreach (const QString &searchPath, searchPaths) {
+    for (const QString &searchPath : searchPaths) {
         affPath = QStringLiteral("%1/%2.aff").arg(searchPath).arg(locale);
         if (QFileInfo(affPath).exists()) {
             dicPath = QStringLiteral("%1/%2.dic").arg(searchPath).arg(locale);
diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp
index 6a120e70..6a8b7425 100644
--- a/src/virtualkeyboard/inputengine.cpp
+++ b/src/virtualkeyboard/inputengine.cpp
@@ -372,9 +372,9 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod)
             d->inputMethod->setTextCase(d->textCase);
 
             // Allocate selection lists for the input method
-            QList<SelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists();
+            const QList<SelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists();
             QList<SelectionListModel::Type> inactiveSelectionLists = d->selectionListModels.keys();
-            foreach (const SelectionListModel::Type &selectionListType, activeSelectionLists) {
+            for (const SelectionListModel::Type &selectionListType : activeSelectionLists) {
                 if (!d->selectionListModels.contains(selectionListType)) {
                     d->selectionListModels[selectionListType] = new SelectionListModel(this);
                     if (selectionListType == SelectionListModel::WordCandidateList) {
@@ -389,7 +389,7 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod)
             }
 
             // Deallocate inactive selection lists
-            foreach (const SelectionListModel::Type &selectionListType, inactiveSelectionLists) {
+            for (const SelectionListModel::Type &selectionListType : qAsConst(inactiveSelectionLists)) {
                 if (d->selectionListModels.contains(selectionListType)) {
                     d->selectionListModels[selectionListType]->setDataSource(0, selectionListType);
                     if (selectionListType == SelectionListModel::WordCandidateList) {
@@ -418,9 +418,8 @@ QList<int> InputEngine::inputModes() const
         return QList<int>();
     }
     QList<int> resultList;
-    foreach (const InputMode &inputMode, inputModeList) {
+    for (const InputMode &inputMode : qAsConst(inputModeList))
         resultList.append(inputMode);
-    }
     return resultList;
 }
 
@@ -475,7 +474,7 @@ QList<int> InputEngine::patternRecognitionModes() const
     if (patterRecognitionModeList.isEmpty())
         return QList<int>();
     QList<int> resultList;
-    foreach (const PatternRecognitionMode &patternRecognitionMode, patterRecognitionModeList)
+    for (const PatternRecognitionMode &patternRecognitionMode : qAsConst(patterRecognitionModeList))
         resultList.append(patternRecognitionMode);
     return resultList;
 }
diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp
index 33e66dd5..dc5e705b 100644
--- a/src/virtualkeyboard/inputmethod.cpp
+++ b/src/virtualkeyboard/inputmethod.cpp
@@ -234,9 +234,9 @@ QList<InputEngine::InputMode> InputMethod::inputModes(const QString &locale)
                               Q_RETURN_ARG(QVariant, result),
                               Q_ARG(QVariant, locale));
     QList<InputEngine::InputMode> inputModeList;
-    foreach (const QVariant &inputMode, result.toList()) {
+    const auto resultList = result.toList();
+    for (const QVariant &inputMode : resultList)
         inputModeList.append(static_cast<InputEngine::InputMode>(inputMode.toInt()));
-    }
     return inputModeList;
 }
 
@@ -276,9 +276,10 @@ QList<SelectionListModel::Type> InputMethod::selectionLists()
     QMetaObject::invokeMethod(this, "selectionLists",
                               Q_RETURN_ARG(QVariant, result));
     QList<SelectionListModel::Type> selectionListsList;
-    foreach (const QVariant &selectionListType, result.toList()) {
+    const auto resultList = result.toList();
+    for (const QVariant &selectionListType : resultList)
         selectionListsList.append(static_cast<SelectionListModel::Type>(selectionListType.toInt()));
-    }
+
     return selectionListsList;
 }
 
@@ -318,9 +319,10 @@ QList<InputEngine::PatternRecognitionMode> InputMethod::patternRecognitionModes(
     QMetaObject::invokeMethod(const_cast<InputMethod *>(this), "patternRecognitionModes",
                               Q_RETURN_ARG(QVariant, result));
     QList<InputEngine::PatternRecognitionMode> patterRecognitionModeList;
-    foreach (const QVariant &patterRecognitionMode, result.toList()) {
+    const auto resultList = result.toList();
+    for (const QVariant &patterRecognitionMode : resultList)
         patterRecognitionModeList.append(static_cast<InputEngine::PatternRecognitionMode>(patterRecognitionMode.toInt()));
-    }
+
     return patterRecognitionModeList;
 }
 
diff --git a/src/virtualkeyboard/lipiinputmethod.cpp b/src/virtualkeyboard/lipiinputmethod.cpp
index d2cef69b..a075eb93 100644
--- a/src/virtualkeyboard/lipiinputmethod.cpp
+++ b/src/virtualkeyboard/lipiinputmethod.cpp
@@ -189,7 +189,7 @@ public:
     int countActiveTraces() const
     {
         int count = 0;
-        foreach (Trace *trace, traceList) {
+        for (Trace *trace : qAsConst(traceList)) {
             if (!trace->isFinal())
                 count++;
         }
@@ -382,7 +382,7 @@ public:
                             bool matchesToExisting = true;
                             const qreal minimumSwipeLength = (swipeLength * (100.0 - MAXIMUM_WIDTH_VARIANCE) / 100.0);
                             const qreal maximumSwipeLength = (swipeLength * (100.0 + MAXIMUM_WIDTH_VARIANCE) / 100.0);
-                            foreach (const QVector2D &otherSwipeVector, swipeVectors) {
+                            for (const QVector2D &otherSwipeVector : qAsConst(swipeVectors)) {
                                 const qreal otherSwipeLength = otherSwipeVector.length();
                                 const qreal theta = qAcos(QVector2D::dotProduct(swipeVector, otherSwipeVector) / (swipeLength * otherSwipeLength));
 
@@ -468,7 +468,7 @@ public:
         const QVariantList points = trace->points();
         const QVariantList timeData = hasTime ? trace->channelData("t") : QVariantList();
         QVariantList::ConstIterator t = timeData.constBegin();
-        foreach (const QVariant &p, points) {
+        for (const QVariant &p : points) {
             const QPointF pt(p.toPointF());
             vector<float> point;
             point.push_back(pt.x());
@@ -582,7 +582,7 @@ public:
         recordedData.append(QStringLiteral(".POINTS_PER_SECOND %1").arg(deviceInfo->getSamplingRate()));
 
         qlonglong t0 = 0;
-        foreach (const Trace *trace, traceList) {
+        for (const Trace *trace : qAsConst(traceList)) {
             const QVariantList &points = trace->points();
             const bool hasTime = trace->channels().contains("t");
             const QVariantList timeData = hasTime ? trace->channelData("t") : QVariantList();
@@ -592,7 +592,7 @@ public:
 
             recordedData.append(QStringLiteral(".PEN_DOWN"));
 
-            foreach (const QVariant &point, points) {
+            for (const QVariant &point : points) {
                 const QPointF pt(point.toPointF());
                 QString pointStr(QStringLiteral("%1 %2 ").arg(qRound(pt.x())).arg(qRound(pt.y())));
                 if (hasTime) {
diff --git a/src/virtualkeyboard/styles/svgimageprovider.cpp b/src/virtualkeyboard/styles/svgimageprovider.cpp
index 421fe0b9..61d3db5e 100644
--- a/src/virtualkeyboard/styles/svgimageprovider.cpp
+++ b/src/virtualkeyboard/styles/svgimageprovider.cpp
@@ -51,7 +51,7 @@ QPixmap SvgImageProvider::requestPixmap(const QString &id, QSize *size, const QS
         const QString query = request.query();
         const QStringList paramList = query.split(QChar('&'), QString::SkipEmptyParts);
         QVariantMap params;
-        foreach (const QString &param, paramList) {
+        for (const QString &param : paramList) {
             QStringList keyValue = param.split(QChar('='), QString::SkipEmptyParts);
             if (keyValue.length() == 2)
                 params[keyValue[0]] = keyValue[1];
diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp
index 341b011d..71a166b3 100644
--- a/src/virtualkeyboard/t9writeinputmethod.cpp
+++ b/src/virtualkeyboard/t9writeinputmethod.cpp
@@ -653,7 +653,7 @@ public:
     int countActiveTraces() const
     {
         int count = 0;
-        foreach (Trace *trace, traceList) {
+        for (Trace *trace : qAsConst(traceList)) {
             if (!trace->isFinal())
                 count++;
         }
@@ -674,7 +674,7 @@ public:
         DECUMA_UINT32 arcID = (DECUMA_UINT32)trace->traceId();
         DECUMA_STATUS status;
 
-        foreach (const QVariant &p, points) {
+        for (const QVariant &p : points) {
             const QPoint pt(p.toPointF().toPoint());
             status = decumaAddPoint(decumaSession, (DECUMA_COORD)pt.x(),(DECUMA_COORD)pt.y(), arcID);
             Q_ASSERT(status == decumaNoError);
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index e5d74ba8..dadf94e1 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -77,7 +77,7 @@ public:
             }
         }
 
-        foreach (const QString &styleImportPath, styleImportPathList) {
+        for (const QString &styleImportPath : qAsConst(styleImportPathList)) {
             QString filePath = buildStyleFilePath(styleImportPath, name);
             bool pathExist = false;
 #ifdef COMPILING_QML