From a8573b8ba107752ac6c869949aee7862f6f30c4d Mon Sep 17 00:00:00 2001
From: Lana Black <lana@illuminati.industries>
Date: Sun, 2 Jun 2024 22:56:49 +0000
Subject: [PATCH] More progress.

---
 app/lattecorona.cpp | 2 ++
 app/lattecorona.h   | 9 +++++++--
 app/main.cpp        | 7 ++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/lattecorona.cpp b/app/lattecorona.cpp
index 459d8d4e1..94f312f3a 100644
--- a/app/lattecorona.cpp
+++ b/app/lattecorona.cpp
@@ -230,6 +230,7 @@ void Corona::load()
 
         connect(this, &Corona::availableScreenRectChangedFrom, this, &Plasma::Corona::availableScreenRectChanged, Qt::UniqueConnection);
         connect(this, &Corona::availableScreenRegionChangedFrom, this, &Plasma::Corona::availableScreenRegionChanged, Qt::UniqueConnection);
+        //
         connect(m_screenPool, &ScreenPool::primaryScreenChanged, this, &Corona::onScreenCountChanged, Qt::UniqueConnection);
 
         QString loadLayoutName = "";
@@ -648,6 +649,7 @@ QRegion Corona::availableScreenRegionWithCriteria(int id,
                     }
                 }
                 break;
+            default: break;
             }
 
             // Usually availableScreenRect is used by the desktop,
diff --git a/app/lattecorona.h b/app/lattecorona.h
index 9ced88a14..de65df67b 100644
--- a/app/lattecorona.h
+++ b/app/lattecorona.h
@@ -176,8 +176,13 @@ signals:
     void configurationShown(PlasmaQuick::ConfigView *configView);
     void viewLocationChanged();
     void raiseViewsTemporaryChanged();
-    void availableScreenRectChangedFrom(Latte::View *origin, int id);
-    void availableScreenRegionChangedFrom(Latte::View *origin, int id);
+//  FIXME:
+//    Old versions of these signals had Latte::View argument.
+//    Check if it is still needed somewhere.
+//    void availableScreenRectChangedFrom(Latte::View *origin, int id);
+//    void availableScreenRegionChangedFrom(Latte::View *origin, int id);
+    void availableScreenRectChangedFrom(int id);
+    void availableScreenRegionChangedFrom(int id);
     void verticalUnityViewHasFocus();
 
 private slots:
diff --git a/app/main.cpp b/app/main.cpp
index 4a4a63e9e..d1cbbd3da 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -36,7 +36,6 @@
 #include <KLocalizedString>
 #include <KAboutData>
 #include <KDBusService>
-#include <KQuickAddons/QtQuickSettings>
 
 //! COLORS
 #define CNORMAL  "\e[0m"
@@ -84,8 +83,6 @@ int main(int argc, char **argv)
         qunsetenv("QT_QPA_PLATFORM");
     }
 
-    KQuickAddons::QtQuickSettings::init();
-
     KLocalizedString::setApplicationDomain("latte-dock");
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("latte-dock")));
     //protect from closing app when changing to "alternative session" and back
@@ -250,11 +247,15 @@ int main(int argc, char **argv)
         return 0;
     }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     //! disable restore from session management
     //! based on spectacle solution at:
     //!   - https://bugs.kde.org/show_bug.cgi?id=430411
     //!   - https://invent.kde.org/graphics/spectacle/-/commit/8db27170d63f8a4aaff09615e51e3cc0fb115c4d
+    // FIXME:
+    // Remove this later when I'm sure nothing is broken in Qt6.
     QGuiApplication::setFallbackSessionManagementEnabled(false);
+#endif
 
     auto disableSessionManagement = [](QSessionManager &sm) {
         sm.setRestartHint(QSessionManager::RestartNever);