aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/dialogs/ExportInstanceDialog.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-17 14:23:37 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-17 14:23:37 +0300
commit4a1d85f99913d0bacf8cdd118c81401378c758b6 (patch)
treee8389ba64e1b1a303545f1dad242c9a9124ddca9 /launcher/ui/dialogs/ExportInstanceDialog.cpp
parent939a2d67ed75be714e9f3b1b918250d006b3860a (diff)
parent85f36ebed7e1295547cd2324d1baf7834be89c31 (diff)
downloadPrismLauncher-4a1d85f99913d0bacf8cdd118c81401378c758b6.tar.gz
PrismLauncher-4a1d85f99913d0bacf8cdd118c81401378c758b6.tar.bz2
PrismLauncher-4a1d85f99913d0bacf8cdd118c81401378c758b6.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Diffstat (limited to 'launcher/ui/dialogs/ExportInstanceDialog.cpp')
-rw-r--r--launcher/ui/dialogs/ExportInstanceDialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp
index d6a503cc..703736d6 100644
--- a/launcher/ui/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp
@@ -195,8 +195,8 @@ void ExportInstanceDialog::loadPackIgnore()
if (!ignoreFile.open(QIODevice::ReadOnly)) {
return;
}
- auto data = ignoreFile.readAll();
- auto string = QString::fromUtf8(data);
+ auto ignoreData = ignoreFile.readAll();
+ auto string = QString::fromUtf8(ignoreData);
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
proxyModel->setBlockedPaths(string.split('\n', Qt::SkipEmptyParts));
#else
@@ -206,10 +206,10 @@ void ExportInstanceDialog::loadPackIgnore()
void ExportInstanceDialog::savePackIgnore()
{
- auto data = proxyModel->blockedPaths().toStringList().join('\n').toUtf8();
+ auto ignoreData = proxyModel->blockedPaths().toStringList().join('\n').toUtf8();
auto filename = ignoreFileName();
try {
- FS::write(filename, data);
+ FS::write(filename, ignoreData);
} catch (const Exception& e) {
qWarning() << e.cause();
}