From 55e3302d56e1eb22ff174d8f6afd7a7b1c9db819 Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Sun, 19 Oct 2025 11:17:04 +0200
Subject: [PATCH] Fix build in latest Qt

---
 interfaces/conversationmessage.h | 93 ++++++++++++++++----------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/interfaces/conversationmessage.h b/interfaces/conversationmessage.h
index b60daea13..3b6c2a15a 100644
--- a/interfaces/conversationmessage.h
+++ b/interfaces/conversationmessage.h
@@ -11,8 +11,51 @@
 
 #include "kdeconnectinterfaces_export.h"
 
-class ConversationAddress;
-class Attachment;
+class KDECONNECTINTERFACES_EXPORT ConversationAddress
+{
+public:
+    ConversationAddress(QString address = QString());
+
+    QString address() const
+    {
+        return m_address;
+    }
+
+private:
+    QString m_address;
+};
+
+class KDECONNECTINTERFACES_EXPORT Attachment
+{
+public:
+    Attachment()
+    {
+    }
+    Attachment(qint64 prtID, QString mimeType, QString base64EncodedFile, QString uniqueIdentifier);
+
+    qint64 partID() const
+    {
+        return m_partID;
+    }
+    QString mimeType() const
+    {
+        return m_mimeType;
+    }
+    QString base64EncodedFile() const
+    {
+        return m_base64EncodedFile;
+    }
+    QString uniqueIdentifier() const
+    {
+        return m_uniqueIdentifier;
+    }
+
+private:
+    qint64 m_partID; // Part ID of the attachment of the message
+    QString m_mimeType; // Type of attachment (image, video, audio etc.)
+    QString m_base64EncodedFile; // Base64 encoded string of a file
+    QString m_uniqueIdentifier; // unique name of the attachment
+};
 
 class KDECONNECTINTERFACES_EXPORT ConversationMessage
 {
@@ -179,52 +222,6 @@ protected:
     QList<Attachment> m_attachments;
 };
 
-class KDECONNECTINTERFACES_EXPORT ConversationAddress
-{
-public:
-    ConversationAddress(QString address = QString());
-
-    QString address() const
-    {
-        return m_address;
-    }
-
-private:
-    QString m_address;
-};
-
-class KDECONNECTINTERFACES_EXPORT Attachment
-{
-public:
-    Attachment()
-    {
-    }
-    Attachment(qint64 prtID, QString mimeType, QString base64EncodedFile, QString uniqueIdentifier);
-
-    qint64 partID() const
-    {
-        return m_partID;
-    }
-    QString mimeType() const
-    {
-        return m_mimeType;
-    }
-    QString base64EncodedFile() const
-    {
-        return m_base64EncodedFile;
-    }
-    QString uniqueIdentifier() const
-    {
-        return m_uniqueIdentifier;
-    }
-
-private:
-    qint64 m_partID; // Part ID of the attachment of the message
-    QString m_mimeType; // Type of attachment (image, video, audio etc.)
-    QString m_base64EncodedFile; // Base64 encoded string of a file
-    QString m_uniqueIdentifier; // unique name of the attachment
-};
-
 inline QDBusArgument &operator<<(QDBusArgument &argument, const ConversationMessage &message)
 {
     argument.beginStructure();
-- 
GitLab