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

refactor: fix deprecation up to Qt 5.15

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2022-05-02 19:10:45 +02:00
parent c1bcbf8c63
commit 984692dc62
54 changed files with 199 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/modplatform/flame/PackManifest.h
View File

@ -25,7 +25,7 @@ struct File
bool resolved = false;
QString fileName;
QUrl url;
QString targetFolder = QLatin1Literal("mods");
QString targetFolder = QStringLiteral("mods");
enum class Type
{
Unknown,

8
launcher/modplatform/legacy_ftb/PrivatePackManager.cpp
View File

@ -10,7 +10,13 @@ void PrivatePackManager::load()
{
try
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
auto foo = QString::fromUtf8(FS::read(m_filename)).split('\n', Qt::SkipEmptyParts);
currentPacks = QSet<QString>(foo.begin(), foo.end());
#else
currentPacks = QString::fromUtf8(FS::read(m_filename)).split('\n', QString::SkipEmptyParts).toSet();
#endif
dirty = false;
}
catch(...)
@ -28,7 +34,7 @@ void PrivatePackManager::save() const
}
try
{
QStringList list = currentPacks.toList();
QStringList list = currentPacks.values();
FS::write(m_filename, list.join('\n').toUtf8());
dirty = false;
}