From 594a5cf6ca7b14c00b2e8ec8224b9197c684fae1 Mon Sep 17 00:00:00 2001 From: James Graham Date: Sun, 22 Jan 2023 21:33:30 +0000 Subject: [PATCH] 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 | 42 +++++++++---------- src/actionshandler.cpp | 4 +- src/chatdocumenthandler.cpp | 4 +- src/chatdocumenthandler.h | 4 +- src/emojitones.cpp | 2 +- src/main.cpp | 38 ++++++++--------- src/{ => models}/actionsmodel.cpp | 0 src/{ => models}/actionsmodel.h | 0 src/{ => models}/collapsestateproxymodel.cpp | 0 src/{ => models}/collapsestateproxymodel.h | 0 src/{ => models}/completionmodel.cpp | 0 src/{ => models}/completionmodel.h | 0 src/{ => models}/completionproxymodel.cpp | 0 src/{ => models}/completionproxymodel.h | 0 src/{ => models}/customemojimodel.cpp | 0 src/{ => models}/customemojimodel.h | 2 +- src/{ => models}/customemojimodel_p.h | 0 src/{ => models}/devicesmodel.cpp | 0 src/{ => models}/devicesmodel.h | 0 src/{ => models}/emojimodel.cpp | 0 src/{ => models}/emojimodel.h | 0 .../keywordnotificationrulemodel.cpp | 0 .../keywordnotificationrulemodel.h | 0 src/{ => models}/messageeventmodel.cpp | 0 src/{ => models}/messageeventmodel.h | 0 src/{ => models}/messagefiltermodel.cpp | 0 src/{ => models}/messagefiltermodel.h | 0 src/{ => models}/publicroomlistmodel.cpp | 0 src/{ => models}/publicroomlistmodel.h | 0 src/{ => models}/roomlistmodel.cpp | 0 src/{ => models}/roomlistmodel.h | 0 src/{ => models}/searchmodel.cpp | 0 src/{ => models}/searchmodel.h | 0 src/{ => models}/serverlistmodel.cpp | 0 src/{ => models}/serverlistmodel.h | 0 src/{ => models}/sortfilterroomlistmodel.cpp | 0 src/{ => models}/sortfilterroomlistmodel.h | 0 src/{ => models}/sortfilterspacelistmodel.cpp | 0 src/{ => models}/sortfilterspacelistmodel.h | 0 src/{ => models}/statemodel.cpp | 0 src/{ => models}/statemodel.h | 0 src/{ => models}/userdirectorylistmodel.cpp | 0 src/{ => models}/userdirectorylistmodel.h | 2 +- src/{ => models}/userfiltermodel.cpp | 0 src/{ => models}/userfiltermodel.h | 0 src/{ => models}/userlistmodel.cpp | 0 src/{ => models}/userlistmodel.h | 0 src/{ => models}/webshortcutmodel.cpp | 0 src/{ => models}/webshortcutmodel.h | 0 src/runner.h | 4 +- 50 files changed, 51 insertions(+), 51 deletions(-) rename src/{ => models}/actionsmodel.cpp (100%) rename src/{ => models}/actionsmodel.h (100%) rename src/{ => models}/collapsestateproxymodel.cpp (100%) rename src/{ => models}/collapsestateproxymodel.h (100%) rename src/{ => models}/completionmodel.cpp (100%) rename src/{ => models}/completionmodel.h (100%) rename src/{ => models}/completionproxymodel.cpp (100%) rename src/{ => models}/completionproxymodel.h (100%) rename src/{ => models}/customemojimodel.cpp (100%) rename src/{ => models}/customemojimodel.h (100%) rename src/{ => models}/customemojimodel_p.h (100%) rename src/{ => models}/devicesmodel.cpp (100%) rename src/{ => models}/devicesmodel.h (100%) rename src/{ => models}/emojimodel.cpp (100%) rename src/{ => models}/emojimodel.h (100%) rename src/{ => models}/keywordnotificationrulemodel.cpp (100%) rename src/{ => models}/keywordnotificationrulemodel.h (100%) rename src/{ => models}/messageeventmodel.cpp (100%) rename src/{ => models}/messageeventmodel.h (100%) rename src/{ => models}/messagefiltermodel.cpp (100%) rename src/{ => models}/messagefiltermodel.h (100%) rename src/{ => models}/publicroomlistmodel.cpp (100%) rename src/{ => models}/publicroomlistmodel.h (100%) rename src/{ => models}/roomlistmodel.cpp (100%) rename src/{ => models}/roomlistmodel.h (100%) rename src/{ => models}/searchmodel.cpp (100%) rename src/{ => models}/searchmodel.h (100%) rename src/{ => models}/serverlistmodel.cpp (100%) rename src/{ => models}/serverlistmodel.h (100%) rename src/{ => models}/sortfilterroomlistmodel.cpp (100%) rename src/{ => models}/sortfilterroomlistmodel.h (100%) rename src/{ => models}/sortfilterspacelistmodel.cpp (100%) rename src/{ => models}/sortfilterspacelistmodel.h (100%) rename src/{ => models}/statemodel.cpp (100%) rename src/{ => models}/statemodel.h (100%) rename src/{ => models}/userdirectorylistmodel.cpp (100%) rename src/{ => models}/userdirectorylistmodel.h (93%) rename src/{ => models}/userfiltermodel.cpp (100%) rename src/{ => models}/userfiltermodel.h (100%) rename src/{ => models}/userlistmodel.cpp (100%) rename src/{ => models}/userlistmodel.h (100%) rename src/{ => models}/webshortcutmodel.cpp (100%) rename src/{ => models}/webshortcutmodel.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7d0ad5ad0..dcfecd487 100644 --- a/src/CMakeLists.txt +++ b/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 - messagefiltermodel.cpp - roomlistmodel.cpp - sortfilterspacelistmodel.cpp + models/messageeventmodel.cpp + models/messagefiltermodel.cpp + models/roomlistmodel.cpp + models/sortfilterspacelistmodel.cpp spacehierarchycache.cpp roommanager.cpp neochatroom.cpp neochatuser.cpp - userlistmodel.cpp - userfiltermodel.cpp - publicroomlistmodel.cpp - userdirectorylistmodel.cpp - keywordnotificationrulemodel.cpp + models/userlistmodel.cpp + models/userfiltermodel.cpp + models/publicroomlistmodel.cpp + models/userdirectorylistmodel.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 - completionproxymodel.cpp - actionsmodel.cpp - serverlistmodel.cpp - statemodel.cpp + models/completionmodel.cpp + models/completionproxymodel.cpp + models/actionsmodel.cpp + models/serverlistmodel.cpp + models/statemodel.cpp filetransferpseudojob.cpp - searchmodel.cpp + models/searchmodel.cpp ) add_executable(neochat-app diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp index 3c296bfc1..ee64c89e2 100644 --- a/src/actionshandler.cpp +++ b/src/actionshandler.cpp @@ -13,9 +13,9 @@ #include #include -#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" diff --git a/src/chatdocumenthandler.cpp b/src/chatdocumenthandler.cpp index 134a4efa4..e8f591d11 100644 --- a/src/chatdocumenthandler.cpp +++ b/src/chatdocumenthandler.cpp @@ -14,9 +14,9 @@ #include #include -#include "actionsmodel.h" +#include "models/actionsmodel.h" +#include "models/roomlistmodel.h" #include "neochatroom.h" -#include "roomlistmodel.h" class SyntaxHighlighter : public QSyntaxHighlighter { diff --git a/src/chatdocumenthandler.h b/src/chatdocumenthandler.h index 8dbc8a2aa..0e0f72b33 100644 --- a/src/chatdocumenthandler.h +++ b/src/chatdocumenthandler.h @@ -7,8 +7,8 @@ #include #include -#include "completionmodel.h" -#include "userlistmodel.h" +#include "models/completionmodel.h" +#include "models/userlistmodel.h" class QTextDocument; class NeoChatRoom; diff --git a/src/emojitones.cpp b/src/emojitones.cpp index b1028490c..437305b11 100644 --- a/src/emojitones.cpp +++ b/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 EmojiTones::_tones = { #include "emojitones_data.h" diff --git a/src/main.cpp b/src/main.cpp index 372cc09a4..81a81f1bd 100644 --- a/src/main.cpp +++ b/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 "messagefiltermodel.h" +#include "models/collapsestateproxymodel.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 @@ -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" diff --git a/src/actionsmodel.cpp b/src/models/actionsmodel.cpp similarity index 100% rename from src/actionsmodel.cpp rename to src/models/actionsmodel.cpp diff --git a/src/actionsmodel.h b/src/models/actionsmodel.h similarity index 100% rename from src/actionsmodel.h rename to src/models/actionsmodel.h diff --git a/src/collapsestateproxymodel.cpp b/src/models/collapsestateproxymodel.cpp similarity index 100% rename from src/collapsestateproxymodel.cpp rename to src/models/collapsestateproxymodel.cpp diff --git a/src/collapsestateproxymodel.h b/src/models/collapsestateproxymodel.h similarity index 100% rename from src/collapsestateproxymodel.h rename to src/models/collapsestateproxymodel.h diff --git a/src/completionmodel.cpp b/src/models/completionmodel.cpp similarity index 100% rename from src/completionmodel.cpp rename to src/models/completionmodel.cpp diff --git a/src/completionmodel.h b/src/models/completionmodel.h similarity index 100% rename from src/completionmodel.h rename to src/models/completionmodel.h diff --git a/src/completionproxymodel.cpp b/src/models/completionproxymodel.cpp similarity index 100% rename from src/completionproxymodel.cpp rename to src/models/completionproxymodel.cpp diff --git a/src/completionproxymodel.h b/src/models/completionproxymodel.h similarity index 100% rename from src/completionproxymodel.h rename to src/models/completionproxymodel.h diff --git a/src/customemojimodel.cpp b/src/models/customemojimodel.cpp similarity index 100% rename from src/customemojimodel.cpp rename to src/models/customemojimodel.cpp diff --git a/src/customemojimodel.h b/src/models/customemojimodel.h similarity index 100% rename from src/customemojimodel.h rename to src/models/customemojimodel.h index 868fdc43c..c758a7434 100644 --- a/src/customemojimodel.h +++ b/src/models/customemojimodel.h @@ -4,8 +4,8 @@ #pragma once #include -#include #include +#include struct CustomEmoji { QString name; // with :semicolons: diff --git a/src/customemojimodel_p.h b/src/models/customemojimodel_p.h similarity index 100% rename from src/customemojimodel_p.h rename to src/models/customemojimodel_p.h diff --git a/src/devicesmodel.cpp b/src/models/devicesmodel.cpp similarity index 100% rename from src/devicesmodel.cpp rename to src/models/devicesmodel.cpp diff --git a/src/devicesmodel.h b/src/models/devicesmodel.h similarity index 100% rename from src/devicesmodel.h rename to src/models/devicesmodel.h diff --git a/src/emojimodel.cpp b/src/models/emojimodel.cpp similarity index 100% rename from src/emojimodel.cpp rename to src/models/emojimodel.cpp diff --git a/src/emojimodel.h b/src/models/emojimodel.h similarity index 100% rename from src/emojimodel.h rename to src/models/emojimodel.h diff --git a/src/keywordnotificationrulemodel.cpp b/src/models/keywordnotificationrulemodel.cpp similarity index 100% rename from src/keywordnotificationrulemodel.cpp rename to src/models/keywordnotificationrulemodel.cpp diff --git a/src/keywordnotificationrulemodel.h b/src/models/keywordnotificationrulemodel.h similarity index 100% rename from src/keywordnotificationrulemodel.h rename to src/models/keywordnotificationrulemodel.h diff --git a/src/messageeventmodel.cpp b/src/models/messageeventmodel.cpp similarity index 100% rename from src/messageeventmodel.cpp rename to src/models/messageeventmodel.cpp diff --git a/src/messageeventmodel.h b/src/models/messageeventmodel.h similarity index 100% rename from src/messageeventmodel.h rename to src/models/messageeventmodel.h diff --git a/src/messagefiltermodel.cpp b/src/models/messagefiltermodel.cpp similarity index 100% rename from src/messagefiltermodel.cpp rename to src/models/messagefiltermodel.cpp diff --git a/src/messagefiltermodel.h b/src/models/messagefiltermodel.h similarity index 100% rename from src/messagefiltermodel.h rename to src/models/messagefiltermodel.h diff --git a/src/publicroomlistmodel.cpp b/src/models/publicroomlistmodel.cpp similarity index 100% rename from src/publicroomlistmodel.cpp rename to src/models/publicroomlistmodel.cpp diff --git a/src/publicroomlistmodel.h b/src/models/publicroomlistmodel.h similarity index 100% rename from src/publicroomlistmodel.h rename to src/models/publicroomlistmodel.h diff --git a/src/roomlistmodel.cpp b/src/models/roomlistmodel.cpp similarity index 100% rename from src/roomlistmodel.cpp rename to src/models/roomlistmodel.cpp diff --git a/src/roomlistmodel.h b/src/models/roomlistmodel.h similarity index 100% rename from src/roomlistmodel.h rename to src/models/roomlistmodel.h diff --git a/src/searchmodel.cpp b/src/models/searchmodel.cpp similarity index 100% rename from src/searchmodel.cpp rename to src/models/searchmodel.cpp diff --git a/src/searchmodel.h b/src/models/searchmodel.h similarity index 100% rename from src/searchmodel.h rename to src/models/searchmodel.h diff --git a/src/serverlistmodel.cpp b/src/models/serverlistmodel.cpp similarity index 100% rename from src/serverlistmodel.cpp rename to src/models/serverlistmodel.cpp diff --git a/src/serverlistmodel.h b/src/models/serverlistmodel.h similarity index 100% rename from src/serverlistmodel.h rename to src/models/serverlistmodel.h diff --git a/src/sortfilterroomlistmodel.cpp b/src/models/sortfilterroomlistmodel.cpp similarity index 100% rename from src/sortfilterroomlistmodel.cpp rename to src/models/sortfilterroomlistmodel.cpp diff --git a/src/sortfilterroomlistmodel.h b/src/models/sortfilterroomlistmodel.h similarity index 100% rename from src/sortfilterroomlistmodel.h rename to src/models/sortfilterroomlistmodel.h diff --git a/src/sortfilterspacelistmodel.cpp b/src/models/sortfilterspacelistmodel.cpp similarity index 100% rename from src/sortfilterspacelistmodel.cpp rename to src/models/sortfilterspacelistmodel.cpp diff --git a/src/sortfilterspacelistmodel.h b/src/models/sortfilterspacelistmodel.h similarity index 100% rename from src/sortfilterspacelistmodel.h rename to src/models/sortfilterspacelistmodel.h diff --git a/src/statemodel.cpp b/src/models/statemodel.cpp similarity index 100% rename from src/statemodel.cpp rename to src/models/statemodel.cpp diff --git a/src/statemodel.h b/src/models/statemodel.h similarity index 100% rename from src/statemodel.h rename to src/models/statemodel.h diff --git a/src/userdirectorylistmodel.cpp b/src/models/userdirectorylistmodel.cpp similarity index 100% rename from src/userdirectorylistmodel.cpp rename to src/models/userdirectorylistmodel.cpp diff --git a/src/userdirectorylistmodel.h b/src/models/userdirectorylistmodel.h similarity index 93% rename from src/userdirectorylistmodel.h rename to src/models/userdirectorylistmodel.h index 5652b299d..ade621aec 100644 --- a/src/userdirectorylistmodel.h +++ b/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) diff --git a/src/userfiltermodel.cpp b/src/models/userfiltermodel.cpp similarity index 100% rename from src/userfiltermodel.cpp rename to src/models/userfiltermodel.cpp diff --git a/src/userfiltermodel.h b/src/models/userfiltermodel.h similarity index 100% rename from src/userfiltermodel.h rename to src/models/userfiltermodel.h diff --git a/src/userlistmodel.cpp b/src/models/userlistmodel.cpp similarity index 100% rename from src/userlistmodel.cpp rename to src/models/userlistmodel.cpp diff --git a/src/userlistmodel.h b/src/models/userlistmodel.h similarity index 100% rename from src/userlistmodel.h rename to src/models/userlistmodel.h diff --git a/src/webshortcutmodel.cpp b/src/models/webshortcutmodel.cpp similarity index 100% rename from src/webshortcutmodel.cpp rename to src/models/webshortcutmodel.cpp diff --git a/src/webshortcutmodel.h b/src/models/webshortcutmodel.h similarity index 100% rename from src/webshortcutmodel.h rename to src/models/webshortcutmodel.h diff --git a/src/runner.h b/src/runner.h index a0ac55546..d9ec95afb 100644 --- a/src/runner.h +++ b/src/runner.h @@ -11,8 +11,8 @@ #include #include -#include "roomlistmodel.h" -#include "sortfilterroomlistmodel.h" +#include "models/roomlistmodel.h" +#include "models/sortfilterroomlistmodel.h" // Copied from KRunner/QueryMatch enum MatchType {