From 6e04d343b7f295fa6158ec419f42e7ce0577d359 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Wed, 26 May 2021 03:05:00 +0200
Subject: [PATCH] Use QGuiApplication instead of QApplication where appropriate

---
 src/controller.cpp | 13 +++++++------
 src/controller.h   |  1 -
 src/main.cpp       | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/controller.cpp b/src/controller.cpp
index 6ea2760a6..e58894d7f 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -20,7 +20,9 @@
 #include <QElapsedTimer>
 #include <QFile>
 #include <QFileInfo>
+#include <QGuiApplication>
 #include <QMovie>
+#include <QNetworkConfigurationManager>
 #include <QNetworkReply>
 #include <QPixmap>
 #include <QQuickWindow>
@@ -29,7 +31,6 @@
 #include <QSysInfo>
 #include <QTimer>
 #include <utility>
-#include <QNetworkConfigurationManager>
 
 #include <signal.h>
 
@@ -68,7 +69,7 @@ Controller::Controller(QObject *parent)
     if (NeoChatConfig::self()->systemTray()) {
         trayIcon->show();
         connect(trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
-        QApplication::setQuitOnLastWindowClosed(false);
+        QGuiApplication::setQuitOnLastWindowClosed(false);
     }
     connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, [=]() {
         if (NeoChatConfig::self()->systemTray()) {
@@ -78,7 +79,7 @@ Controller::Controller(QObject *parent)
             trayIcon->hide();
             disconnect(trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
         }
-        QApplication::setQuitOnLastWindowClosed(!NeoChatConfig::self()->systemTray());
+        QGuiApplication::setQuitOnLastWindowClosed(!NeoChatConfig::self()->systemTray());
     });
 #endif
 
@@ -86,7 +87,7 @@ Controller::Controller(QObject *parent)
         invokeLogin();
     });
 
-    QObject::connect(QApplication::instance(), &QCoreApplication::aboutToQuit, QApplication::instance(), [] {
+    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [] {
         NeoChatConfig::self()->save();
     });
 
@@ -497,13 +498,13 @@ int Controller::accountCount() const
 
 bool Controller::quitOnLastWindowClosed()
 {
-    return QApplication::quitOnLastWindowClosed();
+    return QGuiApplication::quitOnLastWindowClosed();
 }
 
 void Controller::setQuitOnLastWindowClosed(bool value)
 {
     if (quitOnLastWindowClosed() != value) {
-        QApplication::setQuitOnLastWindowClosed(value);
+        QGuiApplication::setQuitOnLastWindowClosed(value);
         Q_EMIT quitOnLastWindowClosedChanged();
     }
 }
diff --git a/src/controller.h b/src/controller.h
index 949d3de29..2f3f24a13 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QApplication>
 #include <QMediaPlayer>
 #include <QMenu>
 #include <QObject>
diff --git a/src/main.cpp b/src/main.cpp
index cf34c2486..4d42f4c25 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,12 @@
 #include <QQuickWindow>
 #include <QDebug>
 
+#if Q_OS_ANDROID
+#include <QGuiApplication>
+#else
+#include <QApplication>
+#endif
+
 #include <KAboutData>
 #ifdef HAVE_KDBUSADDONS
 #include <KDBusService>
@@ -57,7 +63,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
@@ -78,13 +84,13 @@ int main(int argc, char *argv[])
         freopen("CONOUT$", "w", stderr);
     }
 
-    QApplication::setStyle(QStringLiteral("breeze"));
+    QGuiApplication::setStyle(QStringLiteral("breeze"));
     auto font = app.font();
     font.setPointSize(10);
     app.setFont(font);
 #endif
 
-    QApplication::setOrganizationName("KDE");
+    QGuiApplication::setOrganizationName("KDE");
 
     KAboutData about(QStringLiteral("neochat"),
                      i18n("NeoChat"),
@@ -98,7 +104,7 @@ int main(int argc, char *argv[])
     about.setOrganizationDomain("kde.org");
 
     KAboutData::setApplicationData(about);
-    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat")));
+    QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat")));
 
 #ifdef HAVE_KDBUSADDONS
     KDBusService service(KDBusService::Unique);
@@ -224,5 +230,5 @@ int main(int argc, char *argv[])
         }
     }
 #endif
-    return QApplication::exec();
+    return app.exec();
 }