From 0fa490f5324160a2b2001f35c0687a507131c628 Mon Sep 17 00:00:00 2001
From: Tobias Fella <tobias.fella@kde.org>
Date: Fri, 22 Aug 2025 18:04:42 +0200
Subject: [PATCH] Fix crash on shutdown and simplify code

---
 src/messagecontent/models/messagecontentmodel.cpp | 7 +++----
 src/messagecontent/models/messagecontentmodel.h   | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/messagecontent/models/messagecontentmodel.cpp b/src/messagecontent/models/messagecontentmodel.cpp
index 151940ccd..5de45080e 100644
--- a/src/messagecontent/models/messagecontentmodel.cpp
+++ b/src/messagecontent/models/messagecontentmodel.cpp
@@ -3,6 +3,8 @@
 
 #include "messagecontentmodel.h"
 
+#include <QStyleHints>
+
 #include <KLocalizedString>
 
 #include "chatbarcache.h"
@@ -18,10 +20,7 @@ MessageContentModel::MessageContentModel(NeoChatRoom *room, MessageContentModel
     , m_room(room)
     , m_eventId(eventId)
 {
-    m_theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
-    if (m_theme) {
-        connect(m_theme, &Kirigami::Platform::PlatformTheme::colorsChanged, this, &MessageContentModel::updateSpoilers);
-    }
+    connect(qGuiApp->styleHints(), &QStyleHints::colorSchemeChanged, this, &MessageContentModel::updateSpoilers);
 
     initializeModel();
 }
diff --git a/src/messagecontent/models/messagecontentmodel.h b/src/messagecontent/models/messagecontentmodel.h
index 5b09097d4..8e44756de 100644
--- a/src/messagecontent/models/messagecontentmodel.h
+++ b/src/messagecontent/models/messagecontentmodel.h
@@ -7,7 +7,6 @@
 #include <QQmlEngine>
 #include <QImageReader>
 
-#include <Kirigami/Platform/PlatformTheme>
 #ifndef Q_OS_ANDROID
 #include <KSyntaxHighlighting/Definition>
 #include <KSyntaxHighlighting/Repository>
@@ -240,7 +239,6 @@ private:
     QList<QUrl> m_removedLinkPreviews;
     MessageComponent linkPreviewComponent(const QUrl &link);
 
-    Kirigami::Platform::PlatformTheme *m_theme = nullptr;
     void updateSpoilers();
     void updateSpoiler(const QModelIndex &index);
 };