--wip-- [skip ci]

Author: Hamed Masafi

src/jsonserializer.cpp

@@ -330,14 +330,14 @@ QJsonValue JsonSerializer::toJson(QVariant v)
         case QVariant::Polygon: {
             QJsonArray arr;
             QPolygon poly = v.value<QPolygon>();
-            foreach (QPoint pt, poly)
+            for (auto &pt: poly)
                 arr.append(toJson(pt));
             return arr;
         }
         case QVariant::PolygonF: {
             QJsonArray arr;
             QPolygonF poly = v.value<QPolygonF>();
-            foreach (QPointF pt, poly)
+            for (auto &pt: poly)
                 arr.append(toJson(pt));
             return arr;
         }
@@ -356,7 +356,7 @@ QJsonValue JsonSerializer::toJson(QVariantList list)
         return QJsonArray();
 
     QJsonArray array;
-    foreach (QVariant v, list) {
+    for (auto &v: list) {
         array.append(toJson(v));
     }
 
@@ -369,7 +369,7 @@ QJsonValue JsonSerializer::toJson(QVariantList list)
 QJsonValue JsonSerializer::toJson(QStringList list)
 {
     QJsonArray array;
-    foreach (QVariant v, list) {
+    for (auto &v: list) {
         array.append(toJson(v));
     }
 
@@ -382,7 +382,7 @@ QJsonValue JsonSerializer::toJson(QStringList list)
 QJsonValue JsonSerializer::toJson(QVariantMap map)
 {
     QJsonObject mapObject;
-    foreach (QString key, map.keys()) {
+    for (auto &key: map.keys()) {
         mapObject.insert(key, toJson(map[key]));
     }
 
@@ -438,14 +438,14 @@ QVariant JsonSerializer::fromJson(const QMetaType::Type &type,
     case QMetaType::QPolygon: {
         QPolygon poly;
         auto arr = value.toArray();
-        foreach (QJsonValue val, arr)
+        for (auto val: arr)
             poly << fromJson(QMetaType::QPoint, val).toPoint();
         return poly;
     }
     case QMetaType::QPolygonF: {
         QPolygonF poly;
         auto arr = value.toArray();
-        foreach (QJsonValue val, arr)
+        for (auto val: arr)
             poly << fromJson(QMetaType::QPointF, val).toPointF();
         return poly;
     }
@@ -512,7 +512,7 @@ QVariant JsonSerializer::fromJson(const QMetaType::Type &type,
     //    if(type == QVariant::Map){
     QVariantMap map;
     //        QJsonObject mapObject = object[VARIANT_VALUE].toObject();
-    foreach (QString key, object.keys())
+    for (auto &key: object.keys())
         map.insert(key, fromJson(type, object[key]));
     return map;
     //    }
@@ -524,7 +524,7 @@ QVariant JsonSerializer::fromJson(const QMetaType::Type &type,
         QJsonObject mapObject
             = object[VARIANT_VALUE].toObject().value(VARIANT_VALUE).toObject();
 
-        foreach (QString key, mapObject.keys())
+        for (auto &key: mapObject.keys())
             map.insert(key, fromJson(type, mapObject[key].toObject()));
         int typeCode = QMetaType::type(typeName.toLatin1().data());
 
@@ -561,7 +561,7 @@ QVariant JsonSerializer::fromJson(const QMetaType::Type &type,
                                   const QJsonArray &array)
 {
     QVariantList list;
-    foreach (QJsonValue value, array)
+    for (auto value: array)
         list.append(fromJson(type, value));
     return list;
 }
@@ -574,7 +574,7 @@ QVariantMap JsonSerializer::mapFromJson(const QMetaType::Type &keyType,
     //    QString typeName = QMetaType::typeName(type);// =
     //    object[VARIANT_TYPE].toString();
     QVariantMap map;
-    foreach (QString key, object.keys())
+    for (auto &key: object.keys())
         map.insert(key, fromJson(valueType, object[key]));
     return map;
 }

src/stringserializer.cpp

@@ -174,7 +174,7 @@ QVariant StringSerializer::fromString(const QString &value, const QMetaType::Typ
     case QMetaType::QVariantMap: {
         QVariantMap ret;
         QStringList parts = value.split(QStringLiteral("\n"));
-        foreach (QString p, parts) {
+        for (auto &p: parts) {
             if (p.isEmpty())
                 continue;
             QString name;
@@ -188,7 +188,7 @@ QVariant StringSerializer::fromString(const QString &value, const QMetaType::Typ
     case QMetaType::QVariantList: {
         QVariantMap ret;
         QStringList parts = value.split(QStringLiteral("\n"));
-        foreach (QString p, parts) {
+        for (auto &p: parts) {
             if (p.isEmpty())
                 continue;
             QString name;
@@ -286,7 +286,7 @@ QString StringSerializer::toString(const QVariant &value) const
     case QMetaType::QStringList: {
         QString ret;
         QStringList sl = value.toStringList();
-        foreach (QString s, sl) {
+        for (auto &s: sl) {
             if (!ret.isEmpty())
                 ret.append(QStringLiteral(" "));
 
@@ -366,7 +366,7 @@ QString StringSerializer::toString(const QVariant &value) const
     case QMetaType::QVariantMap: {
         QString ret;
         QVariantMap map = value.toMap();
-        foreach (QString k, map.keys()) {
+        for (auto &k: map.keys()) {
             if (!ret.isEmpty())
                 ret.append(QStringLiteral("\n"));
             QVariant v = map.value(k);
@@ -434,7 +434,7 @@ QString StringSerializer::toString(const QVariant &value) const
         auto l = value.toList();
         QString ret;
 
-        foreach (QVariant v, l) {
+        for (auto &v: l) {
             if (!ret.isEmpty())
                 ret.append(QStringLiteral(", "));
             ret.append(toString(v));
@@ -460,7 +460,7 @@ QList<int> StringSerializer::toListInt(const QString &s, const QString &sep) con
 {
     auto parts = s.split(sep);
     QList<int> ret;
-    foreach (QString p, parts) {
+    for (auto &p: parts) {
         bool ok;
         ret.append(p.toInt(&ok));
         if (!ok)
@@ -478,7 +478,7 @@ QList<qreal> StringSerializer::toListReal(const QString &s) const
 QString StringSerializer::fromList(const QList<int> &list) const
 {
     QString ret;
-    foreach (int n, list) {
+    for (auto &n: list) {
         if (!ret.isEmpty())
             ret.append(QStringLiteral(","));
         ret.append(QString::number(n));
@@ -490,7 +490,7 @@ QList<qreal> StringSerializer::toListReal(const QString &s, const QString &sep)
 {
     auto parts = s.split(sep);
     QList<qreal> ret;
-    foreach (QString p, parts) {
+    for (auto &p: parts) {
         bool ok;
         ret.append(p.toDouble(&ok));
         if (!ok)
@@ -504,7 +504,7 @@ QList<float> StringSerializer::toListFloat(const QString &s) const
 {
     auto parts = s.split(QStringLiteral(","));
     QList<float> ret;
-    foreach (QString p, parts) {
+    for (auto &p: parts) {
         bool ok;
         ret.append(p.toFloat(&ok));
         if (!ok)
@@ -517,7 +517,7 @@ QList<float> StringSerializer::toListFloat(const QString &s) const
 QString StringSerializer::fromList(const QList<qreal> &list) const
 {
     QString ret;
-    foreach (qreal n, list) {
+    for (auto &n: list) {
         if (!ret.isEmpty())
             ret.append(QStringLiteral(","));
         ret.append(QString::number(n));
@@ -528,7 +528,7 @@ QString StringSerializer::fromList(const QList<qreal> &list) const
 QString StringSerializer::fromList(const QList<float> &list) const
 {
     QString ret;
-    foreach (float n, list) {
+    for (auto &n: list) {
         if (!ret.isEmpty())
             ret.append(QStringLiteral(","));
         ret.append(QString::number(static_cast<double>(n)));