Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -81,7 +81,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 : qAsConst(keys)) { + for (const auto &key : std::as_const(keys)) { // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString (); QVariantMap keyValue; if ( isservicePass (category, group, key) ) { @@ -129,17 +129,18 @@ { TKeysList keysList; for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) { - QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); + QRegularExpression regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); QString key = vKeys[keyIndex]; + QRegularExpressionMatch regxMatch = regx.match(key); int replacementCount = key.count(regx); QStringList keyList; for ( int j = 0; j < replacementCount; j++ ) { int pos = key.indexOf(regx); - int len = regx.matchedLength(); + int len = regxMatch.captured(j).length(); QString blk = key.mid(pos+1, len-2); keyList += key.mid(0, pos); keyList += ""; // value placeholder - key.remove(0, pos + regx.matchedLength()); + key.remove(0, pos + len); QStringList lst = blk.split(":"); quint16 id = lst[0].toUInt(); quint16 ix = lst[1].toUInt();