From 29355c7fc1941d49a7e8c07607f65b29e536e0ef Mon Sep 17 00:00:00 2001
From: Gary Wang <git@blumia.net>
Date: Tue, 22 Oct 2024 21:35:50 +0800
Subject: [PATCH] fix: actual proper fix for 471a3b1

---
 app/main.cpp     | 23 ++++++++++++-----------
 app/settings.cpp |  6 +-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index 569520c..ff8786d 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -20,12 +20,8 @@
 
 int main(int argc, char *argv[])
 {
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Settings::instance()->hiDpiScaleFactorBehavior());
-
-    QApplication a(argc, argv);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    a.setAttribute(Qt::ApplicationAttribute::AA_UseHighDpiPixmaps);
-#endif
+    QCoreApplication::setApplicationName("Pineapple Pictures");
+    QCoreApplication::setApplicationVersion(PPIC_VERSION_STRING);
 
     QTranslator translator;
     QString qmDir;
@@ -35,11 +31,16 @@ int main(int argc, char *argv[])
     qmDir = QT_STRINGIFY(QM_FILE_INSTALL_DIR);
 #endif
     if (translator.load(QLocale(), QLatin1String("PineapplePictures"), QLatin1String("_"), qmDir)) {
-        a.installTranslator(&translator);
+        QCoreApplication::installTranslator(&translator);
     }
-    a.setApplicationName("Pineapple Pictures");
-    a.setApplicationDisplayName(QCoreApplication::translate("main", "Pineapple Pictures"));
-    a.setApplicationVersion(PPIC_VERSION_STRING);
+
+    QGuiApplication::setApplicationDisplayName(QCoreApplication::translate("main", "Pineapple Pictures"));
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Settings::instance()->hiDpiScaleFactorBehavior());
+
+    QApplication a(argc, argv);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    a.setAttribute(Qt::ApplicationAttribute::AA_UseHighDpiPixmaps);
+#endif
 
     // commandline options
     QCommandLineOption supportedImageFormats(QStringLiteral("supported-image-formats"), QCoreApplication::translate("main", "List supported image format suffixes, and quit program."));
@@ -67,5 +68,5 @@ int main(int argc, char *argv[])
 
     w.initWindowSize();
 
-    return a.exec();
+    return QApplication::exec();
 }
diff --git a/app/settings.cpp b/app/settings.cpp
index 56e86fd..c9a7506 100644
--- a/app/settings.cpp
+++ b/app/settings.cpp
@@ -6,7 +6,6 @@
 
 #include <QApplication>
 #include <QStandardPaths>
-#include <QStringBuilder>
 #include <QDebug>
 #include <QDir>
 #include <QMetaEnum>
@@ -151,10 +150,7 @@ Settings::Settings()
 
     if (configPath.isEmpty()) {
         // Should be %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux.
-        // Sadly <APPNAME> is unknown when Settings object is created (it's before the creation
-        // of QApplication), so we'll need to append the app name manually.
-        configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) %
-                     QDir::separator() % QLatin1String("Pineapple Pictures");
+        configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
     }
 
     m_qsettings = new QSettings(QDir(configPath).absoluteFilePath("config.ini"), QSettings::IniFormat, this);