Move the qt models to their own folder

Felt like the src folder was getting a bit crowded so move all the models to a folder named models.

src/CMakeLists.txt

@@ -6,47 +6,47 @@
 add_library(neochat STATIC
     controller.cpp
     actionshandler.cpp
-    emojimodel.cpp
+    models/emojimodel.cpp
     emojitones.cpp
-    customemojimodel.cpp
+    models/customemojimodel.cpp
     clipboard.cpp
     matriximageprovider.cpp
-    messageeventmodel.cpp
+    models/messageeventmodel.cpp
-    messagefiltermodel.cpp
+    models/messagefiltermodel.cpp
-    roomlistmodel.cpp
+    models/roomlistmodel.cpp
-    sortfilterspacelistmodel.cpp
+    models/sortfilterspacelistmodel.cpp
     spacehierarchycache.cpp
     roommanager.cpp
     neochatroom.cpp
     neochatuser.cpp
-    userlistmodel.cpp
+    models/userlistmodel.cpp
-    userfiltermodel.cpp
+    models/userfiltermodel.cpp
-    publicroomlistmodel.cpp
+    models/publicroomlistmodel.cpp
-    userdirectorylistmodel.cpp
+    models/userdirectorylistmodel.cpp
-    keywordnotificationrulemodel.cpp
+    models/keywordnotificationrulemodel.cpp
     utils.cpp
     notificationsmanager.cpp
-    sortfilterroomlistmodel.cpp
+    models/sortfilterroomlistmodel.cpp
     chatdocumenthandler.cpp
-    devicesmodel.cpp
+    models/devicesmodel.cpp
     filetypesingleton.cpp
     login.cpp
     stickerevent.cpp
-    webshortcutmodel.cpp
+    models/webshortcutmodel.cpp
     blurhash.cpp
     blurhashimageprovider.cpp
     joinrulesevent.cpp
-    collapsestateproxymodel.cpp
+    models/collapsestateproxymodel.cpp
     urlhelper.cpp
     windowcontroller.cpp
     linkpreviewer.cpp
-    completionmodel.cpp
+    models/completionmodel.cpp
-    completionproxymodel.cpp
+    models/completionproxymodel.cpp
-    actionsmodel.cpp
+    models/actionsmodel.cpp
-    serverlistmodel.cpp
+    models/serverlistmodel.cpp
-    statemodel.cpp
+    models/statemodel.cpp
     filetransferpseudojob.cpp
-    searchmodel.cpp
+    models/searchmodel.cpp
 )
 
 add_executable(neochat-app

src/actionshandler.cpp

@@ -13,9 +13,9 @@
 #include <KLocalizedString>
 #include <QStringBuilder>
 
-#include "actionsmodel.h"
 #include "controller.h"
-#include "customemojimodel.h"
+#include "models/actionsmodel.h"
+#include "models/customemojimodel.h"
 #include "neochatconfig.h"
 #include "neochatuser.h"
 #include "roommanager.h"

src/chatdocumenthandler.cpp

@@ -14,9 +14,9 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
-#include "actionsmodel.h"
+#include "models/actionsmodel.h"
+#include "models/roomlistmodel.h"
 #include "neochatroom.h"
-#include "roomlistmodel.h"
 
 class SyntaxHighlighter : public QSyntaxHighlighter
 {

src/chatdocumenthandler.h

@@ -7,8 +7,8 @@
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
-#include "completionmodel.h"
+#include "models/completionmodel.h"
-#include "userlistmodel.h"
+#include "models/userlistmodel.h"
 
 class QTextDocument;
 class NeoChatRoom;

src/emojitones.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "emojitones.h"
-#include "emojimodel.h"
+#include "models/emojimodel.h"
 
 QMultiHash<QString, QVariant> EmojiTones::_tones = {
 #include "emojitones_data.h"

src/main.cpp

@@ -42,39 +42,39 @@
 #include "blurhashimageprovider.h"
 #include "chatdocumenthandler.h"
 #include "clipboard.h"
-#include "collapsestateproxymodel.h"
 #include "controller.h"
-#include "customemojimodel.h"
-#include "devicesmodel.h"
-#include "emojimodel.h"
 #include "filetypesingleton.h"
 #include "joinrulesevent.h"
 #include "linkpreviewer.h"
-#include "keywordnotificationrulemodel.h"
 #include "login.h"
 #include "matriximageprovider.h"
-#include "messageeventmodel.h"
+#include "models/collapsestateproxymodel.h"
-#include "messagefiltermodel.h"
+#include "models/customemojimodel.h"
+#include "models/devicesmodel.h"
+#include "models/emojimodel.h"
+#include "models/keywordnotificationrulemodel.h"
+#include "models/messageeventmodel.h"
+#include "models/messagefiltermodel.h"
+#include "models/publicroomlistmodel.h"
+#include "models/roomlistmodel.h"
+#include "models/searchmodel.h"
+#include "models/serverlistmodel.h"
+#include "models/sortfilterroomlistmodel.h"
+#include "models/sortfilterspacelistmodel.h"
+#include "models/userdirectorylistmodel.h"
+#include "models/userfiltermodel.h"
+#include "models/userlistmodel.h"
+#include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
-#include "searchmodel.h"
 #ifdef QUOTIENT_07
 #include "pollhandler.h"
 #endif
-#include "publicroomlistmodel.h"
-#include "roomlistmodel.h"
 #include "roommanager.h"
-#include "serverlistmodel.h"
-#include "sortfilterroomlistmodel.h"
-#include "sortfilterspacelistmodel.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
-#include "userdirectorylistmodel.h"
-#include "userfiltermodel.h"
-#include "userlistmodel.h"
-#include "webshortcutmodel.h"
 #include "windowcontroller.h"
 #ifdef QUOTIENT_07
 #include <keyverificationsession.h>
@@ -82,9 +82,9 @@
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
-#include "completionmodel.h"
+#include "models/completionmodel.h"
+#include "models/statemodel.h"
 #include "neochatuser.h"
-#include "statemodel.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"

src/models/customemojimodel.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <memory>
 #include <QRegularExpression>
+#include <memory>
 
 struct CustomEmoji {
     QString name; // with :semicolons:

src/models/userdirectorylistmodel.h

@@ -16,7 +16,7 @@ class Connection;
 class UserDirectoryListModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_PROPERTY(Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
     Q_PROPERTY(QString keyword READ keyword WRITE setKeyword NOTIFY keywordChanged)
     Q_PROPERTY(bool limited READ limited NOTIFY limitedChanged)
 

src/runner.h

@@ -11,8 +11,8 @@
 #include <QString>
 #include <QVariantMap>
 
-#include "roomlistmodel.h"
+#include "models/roomlistmodel.h"
-#include "sortfilterroomlistmodel.h"
+#include "models/sortfilterroomlistmodel.h"
 
 // Copied from KRunner/QueryMatch
 enum MatchType {