Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'qregexp' into 'master'

Browse source 
Replace QRegExp by QRegularExpression

See merge request OpenMW/openmw!2683
This commit is contained in:
Andrei Kortunov 2023-02-05 15:05:06 +00:00
commit 72efd3a650
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/config/launchersettings.cpp
View file

@ -303,8 +303,8 @@ bool Config::LauncherSettings::setValue(const QString& sectionPrefix, const QStr
void Config::LauncherSettings::readFile(QTextStream& stream)
{
const QRegExp sectionRe("^\\[([^]]+)\\]");
const QRegExp keyRe("^([^=]+)\\s*=\\s*(.+)$");
const QRegularExpression sectionRe("^\\[([^]]+)\\]$");
const QRegularExpression keyRe("^([^=]+)\\s*=\\s*(.+)$");
QString section;
@ -315,20 +315,22 @@ void Config::LauncherSettings::readFile(QTextStream& stream)
if (line.isEmpty() || line.startsWith("#"))
continue;
if (sectionRe.exactMatch(line))
const QRegularExpressionMatch sectionMatch = sectionRe.match(line);
if (sectionMatch.hasMatch())
{
section = sectionRe.cap(1);
section = sectionMatch.captured(1);
continue;
}
if (section.isEmpty())
continue;
if (keyRe.indexIn(line) == -1)
const QRegularExpressionMatch keyMatch = keyRe.match(line);
if (!keyMatch.hasMatch())
continue;
const QString key = keyRe.cap(1).trimmed();
const QString value = keyRe.cap(2).trimmed();
const QString key = keyMatch.captured(1).trimmed();
const QString value = keyMatch.captured(2).trimmed();
if (!setValue(section, key, value))
Log(Debug::Warning) << "Unsupported setting in the launcher config file: section: "