MessageComponent

It feels weird to have anything that needs MessageComponent have to depend on all of MessageContentModel and pull in it's dependencies. This moves MessageComponent into its own header.

autotests/texthandlertest.cpp

@@ -12,9 +12,7 @@
 
 #include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
-#include "models/messagecontentmodel.h"
 #include "neochatconnection.h"
-#include "utils.h"
 
 #include "testutils.h"
 

src/CMakeLists.txt

@@ -195,6 +195,7 @@ add_library(neochat STATIC
     models/threadmodel.cpp
     models/threadmodel.h
     enums/messagetype.h
+    messagecomponent.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES

src/messagecomponent.h

@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include "enums/messagecomponenttype.h"
+
+struct MessageComponent {
+    MessageComponentType::Type type = MessageComponentType::Other;
+    QString content;
+    QVariantMap attributes;
+
+    int operator==(const MessageComponent &right) const
+    {
+        return type == right.type && content == right.content && attributes == right.attributes;
+    }
+
+    bool isEmpty() const
+    {
+        return type == MessageComponentType::Other;
+    }
+};

src/models/messagecontentmodel.h

@@ -11,24 +11,9 @@
 
 #include "enums/messagecomponenttype.h"
 #include "itinerarymodel.h"
+#include "messagecomponent.h"
 #include "neochatroommember.h"
 
-struct MessageComponent {
-    MessageComponentType::Type type = MessageComponentType::Other;
-    QString content;
-    QVariantMap attributes;
-
-    int operator==(const MessageComponent &right) const
-    {
-        return type == right.type && content == right.content && attributes == right.attributes;
-    }
-
-    bool isEmpty() const
-    {
-        return type == MessageComponentType::Other;
-    }
-};
-
 /**
  * @class MessageContentModel
  *

src/texthandler.cpp

@@ -17,7 +17,6 @@
 #include <Kirigami/Platform/PlatformTheme>
 
 #include "messagecomponenttype.h"
-#include "messagecontentmodel.h"
 #include "models/customemojimodel.h"
 #include "utils.h"
 

src/texthandler.h

@@ -6,7 +6,7 @@
 #include <QObject>
 #include <QString>
 
-#include "models/messagecontentmodel.h"
+#include "messagecomponent.h"
 #include "neochatroom.h"
 
 namespace Quotient