From aef4f75c337c81c33f6caf5d879f95c79dc11fc3 Mon Sep 17 00:00:00 2001 From: James Graham Date: Mon, 7 Apr 2025 18:52:15 +0000 Subject: [PATCH] Move NeoChatConnection and NeoChatRoom to LibNeoChat Move `NeoChatConnection` and `NeoChatRoom` to `LibNeoChat` along with any required dependencies. --- src/CMakeLists.txt | 58 +------------------ src/libneochat/CMakeLists.txt | 48 +++++++++++++++ src/{ => libneochat}/chatbarcache.cpp | 5 -- src/{ => libneochat}/chatbarcache.h | 5 -- src/{ => libneochat}/clipboard.cpp | 0 src/{ => libneochat}/clipboard.h | 0 src/{ => libneochat}/emojis.h | 0 src/{ => libneochat}/emojitones.cpp | 0 src/{ => libneochat}/emojitones.h | 0 src/{ => libneochat}/emojitones_data.h | 0 .../enums/messagecomponenttype.h | 0 src/{ => libneochat}/enums/messagetype.h | 0 src/{ => libneochat}/enums/powerlevel.cpp | 0 src/{ => libneochat}/enums/powerlevel.h | 0 src/{ => libneochat}/enums/pushrule.h | 0 src/{ => libneochat}/eventhandler.cpp | 0 src/{ => libneochat}/eventhandler.h | 0 .../events/imagepackevent.cpp | 0 src/{ => libneochat}/events/imagepackevent.h | 0 .../events/locationbeaconevent.h | 0 src/{ => libneochat}/events/pollevent.cpp | 0 src/{ => libneochat}/events/pollevent.h | 0 src/{ => libneochat}/events/widgetevent.h | 0 .../filetransferpseudojob.cpp | 0 src/{ => libneochat}/filetransferpseudojob.h | 0 src/{ => libneochat}/linkpreviewer.cpp | 0 src/{ => libneochat}/linkpreviewer.h | 0 src/{ => libneochat}/messagecomponent.h | 0 src/{ => libneochat}/models/actionsmodel.cpp | 0 src/{ => libneochat}/models/actionsmodel.h | 0 .../models/customemojimodel.cpp | 0 .../models/customemojimodel.h | 0 src/{ => libneochat}/models/emojimodel.cpp | 0 src/{ => libneochat}/models/emojimodel.h | 0 src/{ => libneochat}/neochatconnection.cpp | 0 src/{ => libneochat}/neochatconnection.h | 0 src/{ => libneochat}/neochatroom.cpp | 1 + src/{ => libneochat}/neochatroom.h | 0 src/{ => libneochat}/neochatroommember.cpp | 0 src/{ => libneochat}/neochatroommember.h | 0 .../roomlastmessageprovider.cpp | 0 .../roomlastmessageprovider.h | 0 src/{ => libneochat}/spacehierarchycache.cpp | 0 src/{ => libneochat}/spacehierarchycache.h | 0 src/{ => libneochat}/texthandler.cpp | 0 src/{ => libneochat}/texthandler.h | 0 src/{ => libneochat}/urlhelper.cpp | 0 src/{ => libneochat}/urlhelper.h | 0 src/{ => libneochat}/utils.cpp | 0 src/{ => libneochat}/utils.h | 0 src/models/completionmodel.cpp | 6 +- src/models/messagecontentmodel.cpp | 2 +- src/models/permissionsmodel.cpp | 2 +- src/models/threadmodel.cpp | 2 +- 54 files changed, 57 insertions(+), 72 deletions(-) rename src/{ => libneochat}/chatbarcache.cpp (97%) rename src/{ => libneochat}/chatbarcache.h (98%) rename src/{ => libneochat}/clipboard.cpp (100%) rename src/{ => libneochat}/clipboard.h (100%) rename src/{ => libneochat}/emojis.h (100%) rename src/{ => libneochat}/emojitones.cpp (100%) rename src/{ => libneochat}/emojitones.h (100%) rename src/{ => libneochat}/emojitones_data.h (100%) rename src/{ => libneochat}/enums/messagecomponenttype.h (100%) rename src/{ => libneochat}/enums/messagetype.h (100%) rename src/{ => libneochat}/enums/powerlevel.cpp (100%) rename src/{ => libneochat}/enums/powerlevel.h (100%) rename src/{ => libneochat}/enums/pushrule.h (100%) rename src/{ => libneochat}/eventhandler.cpp (100%) rename src/{ => libneochat}/eventhandler.h (100%) rename src/{ => libneochat}/events/imagepackevent.cpp (100%) rename src/{ => libneochat}/events/imagepackevent.h (100%) rename src/{ => libneochat}/events/locationbeaconevent.h (100%) rename src/{ => libneochat}/events/pollevent.cpp (100%) rename src/{ => libneochat}/events/pollevent.h (100%) rename src/{ => libneochat}/events/widgetevent.h (100%) rename src/{ => libneochat}/filetransferpseudojob.cpp (100%) rename src/{ => libneochat}/filetransferpseudojob.h (100%) rename src/{ => libneochat}/linkpreviewer.cpp (100%) rename src/{ => libneochat}/linkpreviewer.h (100%) rename src/{ => libneochat}/messagecomponent.h (100%) rename src/{ => libneochat}/models/actionsmodel.cpp (100%) rename src/{ => libneochat}/models/actionsmodel.h (100%) rename src/{ => libneochat}/models/customemojimodel.cpp (100%) rename src/{ => libneochat}/models/customemojimodel.h (100%) rename src/{ => libneochat}/models/emojimodel.cpp (100%) rename src/{ => libneochat}/models/emojimodel.h (100%) rename src/{ => libneochat}/neochatconnection.cpp (100%) rename src/{ => libneochat}/neochatconnection.h (100%) rename src/{ => libneochat}/neochatroom.cpp (99%) rename src/{ => libneochat}/neochatroom.h (100%) rename src/{ => libneochat}/neochatroommember.cpp (100%) rename src/{ => libneochat}/neochatroommember.h (100%) rename src/{ => libneochat}/roomlastmessageprovider.cpp (100%) rename src/{ => libneochat}/roomlastmessageprovider.h (100%) rename src/{ => libneochat}/spacehierarchycache.cpp (100%) rename src/{ => libneochat}/spacehierarchycache.h (100%) rename src/{ => libneochat}/texthandler.cpp (100%) rename src/{ => libneochat}/texthandler.h (100%) rename src/{ => libneochat}/urlhelper.cpp (100%) rename src/{ => libneochat}/urlhelper.h (100%) rename src/{ => libneochat}/utils.cpp (100%) rename src/{ => libneochat}/utils.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e72b3a57c..0bc055090 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,14 +12,6 @@ add_subdirectory(libneochat) add_library(neochat STATIC controller.cpp controller.h - models/emojimodel.cpp - models/emojimodel.h - emojitones.cpp - emojitones.h - models/customemojimodel.cpp - models/customemojimodel.h - clipboard.cpp - clipboard.h models/timelinemessagemodel.cpp models/timelinemessagemodel.h models/messagefiltermodel.cpp @@ -30,12 +22,8 @@ add_library(neochat STATIC models/sortfilterspacelistmodel.h models/accountemoticonmodel.cpp models/accountemoticonmodel.h - spacehierarchycache.cpp - spacehierarchycache.h roommanager.cpp roommanager.h - neochatroom.cpp - neochatroom.h models/userlistmodel.cpp models/userlistmodel.h models/userfiltermodel.cpp @@ -77,38 +65,26 @@ add_library(neochat STATIC blurhashimageprovider.h models/mediamessagefiltermodel.cpp models/mediamessagefiltermodel.h - urlhelper.cpp - urlhelper.h windowcontroller.cpp windowcontroller.h - linkpreviewer.cpp - linkpreviewer.h models/completionmodel.cpp models/completionmodel.h models/completionproxymodel.cpp models/completionproxymodel.h - models/actionsmodel.cpp - models/actionsmodel.h models/serverlistmodel.cpp models/serverlistmodel.h models/statemodel.cpp models/statemodel.h models/statefiltermodel.cpp models/statefiltermodel.h - filetransferpseudojob.cpp - filetransferpseudojob.h models/searchmodel.cpp models/searchmodel.h - texthandler.cpp - texthandler.h logger.cpp logger.h models/stickermodel.cpp models/stickermodel.h models/imagepacksmodel.cpp models/imagepacksmodel.h - events/imagepackevent.cpp - events/imagepackevent.h models/reactionmodel.cpp models/reactionmodel.h models/livelocationsmodel.cpp @@ -117,39 +93,25 @@ add_library(neochat STATIC models/locationsmodel.h locationhelper.cpp locationhelper.h - events/pollevent.cpp pollhandler.cpp - utils.h - utils.cpp registration.cpp - neochatconnection.cpp - neochatconnection.h jobs/neochatgetcommonroomsjob.cpp jobs/neochatgetcommonroomsjob.h mediasizehelper.cpp mediasizehelper.h - eventhandler.cpp enums/delegatetype.h - roomlastmessageprovider.cpp - roomlastmessageprovider.h - chatbarcache.cpp - chatbarcache.h colorschemer.cpp colorschemer.h models/notificationsmodel.cpp models/notificationsmodel.h models/timelinemodel.cpp models/timelinemodel.h - enums/pushrule.h models/itinerarymodel.cpp models/itinerarymodel.h proxycontroller.cpp proxycontroller.h models/linemodel.cpp models/linemodel.h - events/locationbeaconevent.h - events/widgetevent.h - enums/messagecomponenttype.h models/messagecontentmodel.cpp models/messagecontentmodel.h enums/neochatroomtype.h @@ -170,20 +132,14 @@ add_library(neochat STATIC threepidaddhelper.h identityserverhelper.cpp identityserverhelper.h - enums/powerlevel.cpp - enums/powerlevel.h models/permissionsmodel.cpp models/permissionsmodel.h threepidbindhelper.cpp threepidbindhelper.h models/readmarkermodel.cpp models/readmarkermodel.h - neochatroommember.cpp - neochatroommember.h models/threadmodel.cpp models/threadmodel.h - enums/messagetype.h - messagecomponent.h enums/roomsortparameter.cpp enums/roomsortparameter.h models/roomsortparametermodel.cpp @@ -313,6 +269,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE QtCore QtQuick IMPORTS + org.kde.neochat.libneochat org.kde.neochat.timeline org.kde.neochat.settings org.kde.neochat.devtools @@ -360,13 +317,6 @@ ecm_qt_declare_logging_category(neochat EXPORT NEOCHAT ) -ecm_qt_declare_logging_category(neochat - HEADER "eventhandler_logging.h" - IDENTIFIER "EventHandling" - CATEGORY_NAME "org.kde.neochat.eventhandler" - DEFAULT_SEVERITY Info -) - ecm_qt_declare_logging_category(neochat HEADER "chatdocumenthandler_logging.h" IDENTIFIER "ChatDocumentHandling" @@ -400,9 +350,8 @@ if(NOT ANDROID) else() target_sources(neochat PRIVATE trayicon.cpp trayicon.h) endif() - target_link_libraries(neochat PUBLIC KF6::WindowSystem ICU::uc) + target_link_libraries(neochat PUBLIC KF6::WindowSystem) target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM) - target_compile_definitions(neochat PUBLIC -DHAVE_ICU) endif() if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU) @@ -439,9 +388,6 @@ target_link_libraries(neochat PUBLIC KF6::ColorScheme KF6::ItemModels QuotientQt6 - cmark::cmark - QCoro::Core - QCoro::Network ) if (TARGET KF6::Crash) diff --git a/src/libneochat/CMakeLists.txt b/src/libneochat/CMakeLists.txt index 8cba65d7a..7e0195982 100644 --- a/src/libneochat/CMakeLists.txt +++ b/src/libneochat/CMakeLists.txt @@ -4,7 +4,30 @@ add_library(LibNeoChat STATIC) target_sources(LibNeoChat PRIVATE + neochatconnection.cpp + neochatroom.cpp + neochatroommember.cpp + chatbarcache.cpp + clipboard.cpp delegatesizehelper.cpp + emojitones.cpp + eventhandler.cpp + filetransferpseudojob.cpp + linkpreviewer.cpp + roomlastmessageprovider.cpp + spacehierarchycache.cpp + texthandler.cpp + urlhelper.cpp + utils.cpp + enums/messagecomponenttype.h + enums/messagetype.h + enums/powerlevel.cpp + enums/pushrule.h + events/imagepackevent.cpp + events/pollevent.cpp + models/actionsmodel.cpp + models/customemojimodel.cpp + models/emojimodel.cpp ) ecm_add_qml_module(LibNeoChat GENERATE_PLUGIN_SOURCE @@ -12,8 +35,33 @@ ecm_add_qml_module(LibNeoChat GENERATE_PLUGIN_SOURCE OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/libneochat ) +ecm_qt_declare_logging_category(LibNeoChat + HEADER "eventhandler_logging.h" + IDENTIFIER "EventHandling" + CATEGORY_NAME "org.kde.neochat.eventhandler" + DEFAULT_SEVERITY Info +) + generate_export_header(LibNeoChat BASE_NAME LibNeoChat) +target_include_directories(LibNeoChat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/enums ${CMAKE_CURRENT_SOURCE_DIR}/events ${CMAKE_CURRENT_SOURCE_DIR}/models) target_link_libraries(LibNeoChat PUBLIC Qt::Core + Qt::Multimedia Qt::Quick + KF6::ConfigCore + KF6::CoreAddons + KF6::I18n + KF6::Kirigami + QuotientQt6 + cmark::cmark + QCoro::Core + QCoro::Network ) + +if(NOT ANDROID) + target_link_libraries(LibNeoChat PUBLIC + KF6::KIOWidgets + ICU::uc + ) + target_compile_definitions(LibNeoChat PUBLIC -DHAVE_ICU) +endif() diff --git a/src/chatbarcache.cpp b/src/libneochat/chatbarcache.cpp similarity index 97% rename from src/chatbarcache.cpp rename to src/libneochat/chatbarcache.cpp index 76ec6f975..488254fb6 100644 --- a/src/chatbarcache.cpp +++ b/src/libneochat/chatbarcache.cpp @@ -5,7 +5,6 @@ #include -#include "contentprovider.h" #include "eventhandler.h" #include "models/actionsmodel.h" #include "neochatroom.h" @@ -88,7 +87,6 @@ void ChatBarCache::setReplyId(const QString &replyId) m_relationType = Reply; } m_attachmentPath = QString(); - delete m_relationContentModel; Q_EMIT relationIdChanged(oldEventId, m_relationId); Q_EMIT attachmentPathChanged(); } @@ -118,7 +116,6 @@ void ChatBarCache::setEditId(const QString &editId) m_relationType = Edit; } m_attachmentPath = QString(); - delete m_relationContentModel; Q_EMIT relationIdChanged(oldEventId, m_relationId); Q_EMIT attachmentPathChanged(); } @@ -196,7 +193,6 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath) #if (Quotient_VERSION_MINOR < 10 && Quotient_VERSION_PATCH < 3) || Quotient_VERSION_MINOR < 9 m_relationType = None; const auto oldEventId = std::exchange(m_relationId, QString()); - delete m_relationContentModel; Q_EMIT relationIdChanged(oldEventId, m_relationId); #endif } @@ -206,7 +202,6 @@ void ChatBarCache::clearRelations() const auto oldEventId = std::exchange(m_relationId, QString()); const auto oldThreadId = std::exchange(m_threadId, QString()); m_attachmentPath = QString(); - delete m_relationContentModel; Q_EMIT relationIdChanged(oldEventId, m_relationId); Q_EMIT threadIdChanged(oldThreadId, m_threadId); Q_EMIT attachmentPathChanged(); diff --git a/src/chatbarcache.h b/src/libneochat/chatbarcache.h similarity index 98% rename from src/chatbarcache.h rename to src/libneochat/chatbarcache.h index 877a6aa67..dd369351d 100644 --- a/src/chatbarcache.h +++ b/src/libneochat/chatbarcache.h @@ -8,14 +8,11 @@ #include #include -#include "models/messagecontentmodel.h" - namespace Quotient { class RoomMember; } - /** * @brief Defines a user mention in the current chat or edit text. */ @@ -210,7 +207,5 @@ private: QList m_mentions; QString m_savedText; - QPointer m_relationContentModel; - void clearCache(); }; diff --git a/src/clipboard.cpp b/src/libneochat/clipboard.cpp similarity index 100% rename from src/clipboard.cpp rename to src/libneochat/clipboard.cpp diff --git a/src/clipboard.h b/src/libneochat/clipboard.h similarity index 100% rename from src/clipboard.h rename to src/libneochat/clipboard.h diff --git a/src/emojis.h b/src/libneochat/emojis.h similarity index 100% rename from src/emojis.h rename to src/libneochat/emojis.h diff --git a/src/emojitones.cpp b/src/libneochat/emojitones.cpp similarity index 100% rename from src/emojitones.cpp rename to src/libneochat/emojitones.cpp diff --git a/src/emojitones.h b/src/libneochat/emojitones.h similarity index 100% rename from src/emojitones.h rename to src/libneochat/emojitones.h diff --git a/src/emojitones_data.h b/src/libneochat/emojitones_data.h similarity index 100% rename from src/emojitones_data.h rename to src/libneochat/emojitones_data.h diff --git a/src/enums/messagecomponenttype.h b/src/libneochat/enums/messagecomponenttype.h similarity index 100% rename from src/enums/messagecomponenttype.h rename to src/libneochat/enums/messagecomponenttype.h diff --git a/src/enums/messagetype.h b/src/libneochat/enums/messagetype.h similarity index 100% rename from src/enums/messagetype.h rename to src/libneochat/enums/messagetype.h diff --git a/src/enums/powerlevel.cpp b/src/libneochat/enums/powerlevel.cpp similarity index 100% rename from src/enums/powerlevel.cpp rename to src/libneochat/enums/powerlevel.cpp diff --git a/src/enums/powerlevel.h b/src/libneochat/enums/powerlevel.h similarity index 100% rename from src/enums/powerlevel.h rename to src/libneochat/enums/powerlevel.h diff --git a/src/enums/pushrule.h b/src/libneochat/enums/pushrule.h similarity index 100% rename from src/enums/pushrule.h rename to src/libneochat/enums/pushrule.h diff --git a/src/eventhandler.cpp b/src/libneochat/eventhandler.cpp similarity index 100% rename from src/eventhandler.cpp rename to src/libneochat/eventhandler.cpp diff --git a/src/eventhandler.h b/src/libneochat/eventhandler.h similarity index 100% rename from src/eventhandler.h rename to src/libneochat/eventhandler.h diff --git a/src/events/imagepackevent.cpp b/src/libneochat/events/imagepackevent.cpp similarity index 100% rename from src/events/imagepackevent.cpp rename to src/libneochat/events/imagepackevent.cpp diff --git a/src/events/imagepackevent.h b/src/libneochat/events/imagepackevent.h similarity index 100% rename from src/events/imagepackevent.h rename to src/libneochat/events/imagepackevent.h diff --git a/src/events/locationbeaconevent.h b/src/libneochat/events/locationbeaconevent.h similarity index 100% rename from src/events/locationbeaconevent.h rename to src/libneochat/events/locationbeaconevent.h diff --git a/src/events/pollevent.cpp b/src/libneochat/events/pollevent.cpp similarity index 100% rename from src/events/pollevent.cpp rename to src/libneochat/events/pollevent.cpp diff --git a/src/events/pollevent.h b/src/libneochat/events/pollevent.h similarity index 100% rename from src/events/pollevent.h rename to src/libneochat/events/pollevent.h diff --git a/src/events/widgetevent.h b/src/libneochat/events/widgetevent.h similarity index 100% rename from src/events/widgetevent.h rename to src/libneochat/events/widgetevent.h diff --git a/src/filetransferpseudojob.cpp b/src/libneochat/filetransferpseudojob.cpp similarity index 100% rename from src/filetransferpseudojob.cpp rename to src/libneochat/filetransferpseudojob.cpp diff --git a/src/filetransferpseudojob.h b/src/libneochat/filetransferpseudojob.h similarity index 100% rename from src/filetransferpseudojob.h rename to src/libneochat/filetransferpseudojob.h diff --git a/src/linkpreviewer.cpp b/src/libneochat/linkpreviewer.cpp similarity index 100% rename from src/linkpreviewer.cpp rename to src/libneochat/linkpreviewer.cpp diff --git a/src/linkpreviewer.h b/src/libneochat/linkpreviewer.h similarity index 100% rename from src/linkpreviewer.h rename to src/libneochat/linkpreviewer.h diff --git a/src/messagecomponent.h b/src/libneochat/messagecomponent.h similarity index 100% rename from src/messagecomponent.h rename to src/libneochat/messagecomponent.h diff --git a/src/models/actionsmodel.cpp b/src/libneochat/models/actionsmodel.cpp similarity index 100% rename from src/models/actionsmodel.cpp rename to src/libneochat/models/actionsmodel.cpp diff --git a/src/models/actionsmodel.h b/src/libneochat/models/actionsmodel.h similarity index 100% rename from src/models/actionsmodel.h rename to src/libneochat/models/actionsmodel.h diff --git a/src/models/customemojimodel.cpp b/src/libneochat/models/customemojimodel.cpp similarity index 100% rename from src/models/customemojimodel.cpp rename to src/libneochat/models/customemojimodel.cpp diff --git a/src/models/customemojimodel.h b/src/libneochat/models/customemojimodel.h similarity index 100% rename from src/models/customemojimodel.h rename to src/libneochat/models/customemojimodel.h diff --git a/src/models/emojimodel.cpp b/src/libneochat/models/emojimodel.cpp similarity index 100% rename from src/models/emojimodel.cpp rename to src/libneochat/models/emojimodel.cpp diff --git a/src/models/emojimodel.h b/src/libneochat/models/emojimodel.h similarity index 100% rename from src/models/emojimodel.h rename to src/libneochat/models/emojimodel.h diff --git a/src/neochatconnection.cpp b/src/libneochat/neochatconnection.cpp similarity index 100% rename from src/neochatconnection.cpp rename to src/libneochat/neochatconnection.cpp diff --git a/src/neochatconnection.h b/src/libneochat/neochatconnection.h similarity index 100% rename from src/neochatconnection.h rename to src/libneochat/neochatconnection.h diff --git a/src/neochatroom.cpp b/src/libneochat/neochatroom.cpp similarity index 99% rename from src/neochatroom.cpp rename to src/libneochat/neochatroom.cpp index 8c431088b..567476bf5 100644 --- a/src/neochatroom.cpp +++ b/src/libneochat/neochatroom.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/src/neochatroom.h b/src/libneochat/neochatroom.h similarity index 100% rename from src/neochatroom.h rename to src/libneochat/neochatroom.h diff --git a/src/neochatroommember.cpp b/src/libneochat/neochatroommember.cpp similarity index 100% rename from src/neochatroommember.cpp rename to src/libneochat/neochatroommember.cpp diff --git a/src/neochatroommember.h b/src/libneochat/neochatroommember.h similarity index 100% rename from src/neochatroommember.h rename to src/libneochat/neochatroommember.h diff --git a/src/roomlastmessageprovider.cpp b/src/libneochat/roomlastmessageprovider.cpp similarity index 100% rename from src/roomlastmessageprovider.cpp rename to src/libneochat/roomlastmessageprovider.cpp diff --git a/src/roomlastmessageprovider.h b/src/libneochat/roomlastmessageprovider.h similarity index 100% rename from src/roomlastmessageprovider.h rename to src/libneochat/roomlastmessageprovider.h diff --git a/src/spacehierarchycache.cpp b/src/libneochat/spacehierarchycache.cpp similarity index 100% rename from src/spacehierarchycache.cpp rename to src/libneochat/spacehierarchycache.cpp diff --git a/src/spacehierarchycache.h b/src/libneochat/spacehierarchycache.h similarity index 100% rename from src/spacehierarchycache.h rename to src/libneochat/spacehierarchycache.h diff --git a/src/texthandler.cpp b/src/libneochat/texthandler.cpp similarity index 100% rename from src/texthandler.cpp rename to src/libneochat/texthandler.cpp diff --git a/src/texthandler.h b/src/libneochat/texthandler.h similarity index 100% rename from src/texthandler.h rename to src/libneochat/texthandler.h diff --git a/src/urlhelper.cpp b/src/libneochat/urlhelper.cpp similarity index 100% rename from src/urlhelper.cpp rename to src/libneochat/urlhelper.cpp diff --git a/src/urlhelper.h b/src/libneochat/urlhelper.h similarity index 100% rename from src/urlhelper.h rename to src/libneochat/urlhelper.h diff --git a/src/utils.cpp b/src/libneochat/utils.cpp similarity index 100% rename from src/utils.cpp rename to src/libneochat/utils.cpp diff --git a/src/utils.h b/src/libneochat/utils.h similarity index 100% rename from src/utils.h rename to src/libneochat/utils.h diff --git a/src/models/completionmodel.cpp b/src/models/completionmodel.cpp index f03edb704..c515e8373 100644 --- a/src/models/completionmodel.cpp +++ b/src/models/completionmodel.cpp @@ -4,10 +4,10 @@ #include "completionmodel.h" #include -#include "actionsmodel.h" #include "completionproxymodel.h" -#include "customemojimodel.h" -#include "emojimodel.h" +#include "models/actionsmodel.h" +#include "models/customemojimodel.h" +#include "models/emojimodel.h" #include "neochatroom.h" #include "roommanager.h" #include "userlistmodel.h" diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp index 9e8b14482..591ea6ae7 100644 --- a/src/models/messagecontentmodel.cpp +++ b/src/models/messagecontentmodel.cpp @@ -3,8 +3,8 @@ #include "messagecontentmodel.h" #include "contentprovider.h" +#include "enums/messagecomponenttype.h" #include "eventhandler.h" -#include "messagecomponenttype.h" #include "neochatconfig.h" #include diff --git a/src/models/permissionsmodel.cpp b/src/models/permissionsmodel.cpp index e407e55d3..76ebf9231 100644 --- a/src/models/permissionsmodel.cpp +++ b/src/models/permissionsmodel.cpp @@ -7,7 +7,7 @@ #include -#include "powerlevel.h" +#include "enums/powerlevel.h" using namespace Qt::Literals::StringLiterals; diff --git a/src/models/threadmodel.cpp b/src/models/threadmodel.cpp index 9650fa61e..ee7d15d7b 100644 --- a/src/models/threadmodel.cpp +++ b/src/models/threadmodel.cpp @@ -10,8 +10,8 @@ #include "chatbarcache.h" #include "contentprovider.h" +#include "enums/messagecomponenttype.h" #include "eventhandler.h" -#include "messagecomponenttype.h" #include "messagecontentmodel.h" #include "neochatroom.h"