Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision f68b226e67eb500758ee94fe015df48931240013)
@@ -66,7 +66,7 @@
                                      updateInstructions(group                   );
             }
             else { //TODO: Since it is global system settings, move this to the settings controller so the C++ backend can also use it. like Date/Time formats.
-                for (const auto &key : keys) {
+                for (const auto &key : qAsConst(keys)) {
                     // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString  ();
                     QVariantMap           keyValue;
                     if ( isservicePass      (category, group, key) ) {
@@ -92,8 +92,6 @@
                     else {
                         keyValue[key]   = _Settings.value(category, group, key);
                     }
-                    QVariantMap           groups;
-                    groups  [group]     = keyValue;
                 }
             }
         }
@@ -186,7 +184,7 @@
     if (_replacements.contains(id)) {
         isChanged = true;
         //DEBUG: qDebug() << _replacements[id].count();
-        for ( auto item : _replacements[id]) {
+        for ( const auto &item : _replacements[id]) {
             //DEBUG: qDebug() << id << item.group << item.keyIndex << item.locIndex << item.prmIndex;
             QString   value;
             quint16 len = vData.length();