Use STL-style iterators instead of Java-style ones

components/config/gamesettings.cpp

@@ -165,12 +165,10 @@ bool Config::GameSettings::readFile(QTextStream& stream, QMultiMap<QString, QStr
 bool Config::GameSettings::writeFile(QTextStream& stream)
 {
     // Iterate in reverse order to preserve insertion order
-    QMapIterator<QString, QString> i(mUserSettings);
+    auto i = mUserSettings.end();
-    i.toBack();
+    while (i != mUserSettings.begin())
-
-    while (i.hasPrevious())
     {
-        i.previous();
+        i--;
 
         // path lines (e.g. 'data=...') need quotes and ampersands escaping to match how boost::filesystem::path uses
         // boost::io::quoted
@@ -388,12 +386,10 @@ bool Config::GameSettings::writeFileWithComments(QFile& file)
 
     // Iterate in reverse order to preserve insertion order
     QString settingLine;
-    QMapIterator<QString, QString> it(mUserSettings);
+    auto it = mUserSettings.end();
-    it.toBack();
+    while (it != mUserSettings.begin())
-
-    while (it.hasPrevious())
     {
-        it.previous();
+        it--;
 
         if (it.key() == QLatin1String("data") || it.key() == QLatin1String("data-local")
             || it.key() == QLatin1String("resources") || it.key() == QLatin1String("load-savegame"))

components/config/launchersettings.cpp

@@ -50,12 +50,10 @@ bool Config::LauncherSettings::writeFile(QTextStream& stream)
     QRegularExpression sectionRe("^([^/]+)/(.+)$");
     QMultiMap<QString, QString> settings = SettingsBase::getSettings();
 
-    QMapIterator<QString, QString> i(settings);
+    auto i = settings.end();
-    i.toBack();
+    while (i != settings.begin())
-
-    while (i.hasPrevious())
     {
-        i.previous();
+        i--;
 
         QString prefix;
         QString key;