CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed qt5 build

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-06-15 00:37:32 +03:00
parent e0b901169a
commit cf4c1605eb
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/settings/INIFile.cpp
View File

@ -97,6 +97,20 @@ QString unescape(QString orig)
} }
return out; return out;
} }
QString unquete(QString str)
{
if ((str.contains(QChar(';')) || str.contains(QChar('=')) || str.contains(QChar(','))) && str.endsWith("\"") && str.startsWith("\"")) {
#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
str = str.remove(0, 1);
str = str.remove(str.size() - 1, 1);
#else
str = str.removeFirst().removeLast();
#endif
}
return str;
}
bool parseOldFileFormat(QIODevice& device, QSettings::SettingsMap& map) bool parseOldFileFormat(QIODevice& device, QSettings::SettingsMap& map)
{ {
QTextStream in(device.readAll()); QTextStream in(device.readAll());
@ -124,11 +138,7 @@ bool parseOldFileFormat(QIODevice& device, QSettings::SettingsMap& map)
QString key = line.left(eqPos).trimmed(); QString key = line.left(eqPos).trimmed();
QString valueStr = line.right(line.length() - eqPos - 1).trimmed(); QString valueStr = line.right(line.length() - eqPos - 1).trimmed();
valueStr = unescape(valueStr); valueStr = unquete(unescape(valueStr));
if ((valueStr.contains(QChar(';')) || valueStr.contains(QChar('=')) || valueStr.contains(QChar(','))) && valueStr.endsWith("\"") &&
valueStr.startsWith("\"")) {
valueStr = valueStr.removeFirst().removeLast();
}
QVariant value(valueStr); QVariant value(valueStr);
map.insert(key, value); map.insert(key, value);
@ -164,8 +174,7 @@ bool INIFile::loadFile(QString fileName)
if (auto valueStr = _settings_obj.value(key).toString(); if (auto valueStr = _settings_obj.value(key).toString();
(valueStr.contains(QChar(';')) || valueStr.contains(QChar('=')) || valueStr.contains(QChar(','))) && (valueStr.contains(QChar(';')) || valueStr.contains(QChar('=')) || valueStr.contains(QChar(','))) &&
valueStr.endsWith("\"") && valueStr.startsWith("\"")) { valueStr.endsWith("\"") && valueStr.startsWith("\"")) {
valueStr = valueStr.removeFirst().removeLast(); insert(key, unquete(valueStr));
insert(key, valueStr);
} else } else
insert(key, _settings_obj.value(key)); insert(key, _settings_obj.value(key));
} }