Revert "Revert "Implement selection across multiple MessageDelegates""

This reverts commit 3697146f44.

.gitlab-ci.yml

@@ -3,12 +3,8 @@
 
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml

.kde-ci.yml

@@ -2,35 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 Dependencies:
-- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
-  'require':
-    'frameworks/extra-cmake-modules': '@stable'
-    'frameworks/kcoreaddons': '@stable'
-    'frameworks/kirigami': '@stable'
-    'frameworks/ki18n': '@stable'
-    'frameworks/kconfig': '@stable'
-    'frameworks/syntax-highlighting': '@stable'
-    'frameworks/kitemmodels': '@stable'
-    'frameworks/kquickcharts': '@stable'
-    'frameworks/knotifications': '@stable'
-    'libraries/kquickimageeditor': '@stable'
-    'frameworks/sonnet': '@stable'
-    'libraries/kirigami-addons': '@latest'
-    'third-party/libquotient': '@latest'
-    'third-party/qtkeychain': '@latest'
-    'third-party/cmark': '@latest'
-    'third-party/qcoro': '@latest'
-- 'on': ['Windows/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5']
-  'require':
-    'frameworks/qqc2-desktop-style': '@stable'
-    'frameworks/kio': '@stable'
-    'frameworks/kwindowsystem': '@stable'
-    'frameworks/kconfigwidgets': '@stable'
-- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
-  'require':
-    'frameworks/kdbusaddons': '@stable'
-
-- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
+- 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
   'require':
     'frameworks/extra-cmake-modules': '@latest-kf6'
     'frameworks/kcoreaddons': '@latest-kf6'
@@ -48,21 +20,21 @@ Dependencies:
     'third-party/qtkeychain': '@latest'
     'third-party/cmark': '@latest'
     'third-party/qcoro': '@latest'
-- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6']
+- 'on': ['Windows', 'Linux', 'FreeBSD']
   'require':
     'frameworks/qqc2-desktop-style': '@latest-kf6'
     'frameworks/kio': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kconfigwidgets': '@latest-kf6'
-- 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
+- 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
     'frameworks/kstatusnotifieritem': '@latest-kf6'
 
-- 'on': ['Linux/Qt6', 'Linux/Qt5']
+- 'on': ['Linux']
   'require':
     'sdk/selenium-webdriver-at-spi': '@latest-kf6'
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ '@all' ]

.reuse/dep5

@@ -34,7 +34,7 @@ Files: src/neochat.notifyrc
 Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause
 
-Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
+Files: src/qml/confetti.png src/qml/glowdot.png
 Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0
 

CMakeLists.txt

@@ -14,11 +14,8 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "5.105.0")
-set(QT_MIN_VERSION "5.15.2")
-if (ANDROID)
-    set(QT_MIN_VERSION "5.15.10")
-endif()
+set(KF_MIN_VERSION "5.240.0")
+set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 
@@ -48,28 +45,6 @@ if(NEOCHAT_FLATPAK)
     include(cmake/Flatpak.cmake)
 endif()
 
-if(QT_MAJOR_VERSION STREQUAL "6")
-    set(BASICLISTITEM_BOLD "font.bold")
-    set(OVERLAYSHEET_OPEN "onOpened")
-    set(QTQUICK_MODULE_QML_VERSION "")
-    set(QTLOCATION_MODULE_QML_VERSION "")
-    set(QTMULTIMEDIA_MODULE_QML_VERSION "")
-    set(QTMULTIMEDIA_AUDIO "MediaPlayer")
-    # in Audio qt6 we don't have it but we disable it in qt5 => it seems ok
-    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "")
-    # In Video qml qt6 we don't have it.
-    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "")
-else()
-    set(BASICLISTITEM_BOLD "bold")
-    set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
-    set(QTQUICK_MODULE_QML_VERSION "2.15")
-    set(QTLOCATION_MODULE_QML_VERSION "5.15")
-    set(QTMULTIMEDIA_MODULE_QML_VERSION "5.15")
-    set(QTMULTIMEDIA_AUDIO "Audio")
-    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "autoLoad: false")
-    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "flushMode: VideoOutput.FirstFrame")
-endif()
-
 set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
 
 ecm_setup_version(${PROJECT_VERSION}
@@ -77,25 +52,21 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
-set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
+set_package_properties(Qt6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
-set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
+set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
+set_package_properties(KF6Kirigami2 PROPERTIES
         TYPE REQUIRED
         PURPOSE "Kirigami application UI framework"
         )
-find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
-
-if(QT_MAJOR_VERSION STREQUAL "6")
-    find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} REQUIRED)
-endif()
+find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
 
 if(ANDROID)
     find_package(OpenSSL)
@@ -104,24 +75,20 @@ if(ANDROID)
         PURPOSE "Encrypted communications"
     )
 else()
-    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
-    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
+    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem StatusNotifierItem)
+    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )
     ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
+    find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-if(QT_MAJOR_VERSION STREQUAL "6" AND NOT ANDROID AND NOT WIN32)
-    set(QUOTIENT_SUFFIX "Qt6")
-endif()
-
-find_package(Quotient${QUOTIENT_SUFFIX} 0.7)
-set_package_properties(Quotient${QUOTIENT_SUFFIX} PROPERTIES
+find_package(QuotientQt6 0.7)
+set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"
     URL "https://github.com/quotient-im/libQuotient/"
@@ -154,12 +121,12 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
+find_package(QCoro6 0.4 COMPONENTS Core REQUIRED)
 
 qcoro_enable_coroutines()
 
-find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
-set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
+find_package(KF6DocTools ${KF_MIN_VERSION})
+set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
     "Tools to generate documentation"
     TYPE OPTIONAL
 )
@@ -181,12 +148,12 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 
 if (BUILD_TESTING)
-    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
     add_subdirectory(autotests)
     add_subdirectory(appiumtests)
 endif()
 
-if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
+if(KF6DocTools_FOUND)
     kdoctools_install(po)
     add_subdirectory(doc)
 endif()

org.kde.neochat.appdata.xml

@@ -55,11 +55,13 @@
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
+  <summary xml:lang="ia">Starta Conversation conntu amicos sur matrix</summary>
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
   <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
   <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
   <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
   <summary xml:lang="nn">Prat med vennar på Matrix</summary>
+  <summary xml:lang="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</summary>
   <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
   <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
@@ -292,6 +294,7 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
       <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
       <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
@@ -318,6 +321,7 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="fi">Kirjautumisnäkymä</caption>
       <caption xml:lang="fr">Écran de connexion</caption>
       <caption xml:lang="gl">Pantalla de identificación.</caption>
+      <caption xml:lang="ia">Schermo de accesso</caption>
       <caption xml:lang="it">Schermata di accesso</caption>
       <caption xml:lang="ka">შესვლის ეკრანი</caption>
       <caption xml:lang="ko">로그인 화면</caption>

po/ca/docs/neochat/man-neochat.1.docbook

@@ -97,7 +97,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 >Vegeu també</title>
   <simplelist>
     <member
->Una llista de les preguntes més freqüents quan a Matrix <ulink url="https://matrix.org/faq/"
+>Una llista de les preguntes més freqüents quant a Matrix <ulink url="https://matrix.org/faq/"
 >https://matrix.org/faq/</ulink
 > </member>
     <member

src/CMakeLists.txt

@@ -3,15 +3,6 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
-configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
-configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
-configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
-configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
-configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
-configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
-
-configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
-
 add_library(neochat STATIC
     controller.cpp
     controller.h
@@ -64,8 +55,8 @@ add_library(neochat STATIC
     models/devicesmodel.cpp
     models/devicesmodel.h
     models/devicesproxymodel.cpp
-    filetypesingleton.cpp
-    filetypesingleton.h
+    filetype.cpp
+    filetype.h
     login.cpp
     login.h
     models/webshortcutmodel.cpp
@@ -138,6 +129,153 @@ add_library(neochat STATIC
     enums/delegatetype.h
 )
 
+qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
+    QML_FILES
+        qml/main.qml
+        qml/AccountMenu.qml
+        qml/ExploreComponent.qml
+        qml/ContextMenu.qml
+        qml/CollapsedRoomDelegate.qml
+        qml/RoomDelegate.qml
+        qml/RoomListPage.qml
+        qml/SpaceListContextMenu.qml
+        qml/UserInfo.qml
+        qml/LoadingPage.qml
+        qml/RoomPage.qml
+        qml/RoomWindow.qml
+        qml/JoinRoomPage.qml
+        qml/ExplorerDelegate.qml
+        qml/InviteUserPage.qml
+        qml/StartChatPage.qml
+        qml/ImageEditorPage.qml
+        qml/WelcomePage.qml
+        qml/General.qml
+        qml/Security.qml
+        qml/PushNotification.qml
+        qml/Categories.qml
+        qml/Permissions.qml
+        qml/NeochatMaximizeComponent.qml
+        qml/FancyEffectsContainer.qml
+        qml/TypingPane.qml
+        qml/ShimmerGradient.qml
+        qml/QuickSwitcher.qml
+        qml/HoverActions.qml
+        qml/ChatBox.qml
+        qml/ChatBar.qml
+        qml/AttachmentPane.qml
+        qml/ReplyPane.qml
+        qml/CompletionMenu.qml
+        qml/PieProgressBar.qml
+        qml/QuickFormatBar.qml
+        qml/RoomData.qml
+        qml/ServerData.qml
+        qml/EmojiPicker.qml
+        qml/TimelineDelegate.qml
+        qml/ReplyComponent.qml
+        qml/StateDelegate.qml
+        qml/RichLabel.qml
+        qml/MessageDelegate.qml
+        qml/Bubble.qml
+        qml/SectionDelegate.qml
+        qml/VideoDelegate.qml
+        qml/ReactionDelegate.qml
+        qml/LinkPreviewDelegate.qml
+        qml/AudioDelegate.qml
+        qml/FileDelegate.qml
+        qml/ImageDelegate.qml
+        qml/EncryptedDelegate.qml
+        qml/EventDelegate.qml
+        qml/TextDelegate.qml
+        qml/ReadMarkerDelegate.qml
+        qml/PollDelegate.qml
+        qml/MimeComponent.qml
+        qml/StateComponent.qml
+        qml/MessageEditComponent.qml
+        qml/AvatarFlow.qml
+        qml/LoginStep.qml
+        qml/Login.qml
+        qml/Homeserver.qml
+        qml/Username.qml
+        qml/RegisterPassword.qml
+        qml/Captcha.qml
+        qml/Terms.qml
+        qml/Email.qml
+        qml/Password.qml
+        qml/LoginRegister.qml
+        qml/Loading.qml
+        qml/LoginMethod.qml
+        qml/Sso.qml
+        qml/UserDetailDialog.qml
+        qml/CreateRoomDialog.qml
+        qml/CreateSpaceDialog.qml
+        qml/EmojiDialog.qml
+        qml/OpenFileDialog.qml
+        qml/KeyVerificationDialog.qml
+        qml/ConfirmLogoutDialog.qml
+        qml/PowerLevelDialog.qml
+        qml/Message.qml
+        qml/EmojiItem.qml
+        qml/EmojiRow.qml
+        qml/EmojiSas.qml
+        qml/ConfirmDeactivateAccountDialog.qml
+        qml/VerificationCanceled.qml
+        qml/GlobalMenu.qml
+        qml/EditMenu.qml
+        qml/MessageDelegateContextMenu.qml
+        qml/FileDelegateContextMenu.qml
+        qml/MessageSourceSheet.qml
+        qml/ReportSheet.qml
+        qml/SettingsPage.qml
+        qml/ThemeRadioButton.qml
+        qml/ColorScheme.qml
+        qml/GeneralSettingsPage.qml
+        qml/EmoticonsPage.qml
+        qml/EmoticonEditorPage.qml
+        qml/EmoticonFormCard.qml
+        qml/GlobalNotificationsPage.qml
+        qml/NotificationRuleItem.qml
+        qml/AppearanceSettingsPage.qml
+        qml/AccountsPage.qml
+        qml/AccountEditorPage.qml
+        qml/DevicesPage.qml
+        qml/DeviceDelegate.qml
+        qml/DevicesCard.qml
+        qml/About.qml
+        qml/AboutKDE.qml
+        qml/SonnetConfigPage.qml
+        qml/NetworkProxyPage.qml
+        qml/DevtoolsPage.qml
+        qml/ConfirmEncryptionDialog.qml
+        qml/RemoveSheet.qml
+        qml/BanSheet.qml
+        qml/EmojiTonesPicker.qml
+        qml/EmojiDelegate.qml
+        qml/EmojiGrid.qml
+        qml/SearchPage.qml
+        qml/LocationDelegate.qml
+        qml/LocationChooser.qml
+        qml/TimelineView.qml
+        qml/InvitationView.qml
+        qml/AvatarTabButton.qml
+        qml/SpaceDrawer.qml
+        qml/OsmLocationPlugin.qml
+        qml/LiveLocationDelegate.qml
+        qml/FullScreenMap.qml
+        qml/LocationsPage.qml
+        qml/LocationMapItem.qml
+        qml/RoomDrawer.qml
+        qml/RoomDrawerPage.qml
+        qml/DirectChatDrawerHeader.qml
+        qml/GroupChatDrawerHeader.qml
+        qml/RoomInformation.qml
+        qml/RoomMedia.qml
+        qml/ChooseRoomDialog.qml
+        qml/ShareAction.qml
+    RESOURCES
+        qml/confetti.png
+        qml/glowdot.png
+)
+
 ecm_qt_declare_logging_category(neochat
     HEADER "messageeventmodel_logging.h"
     IDENTIFIER "MessageEvent"
@@ -156,7 +294,6 @@ ecm_qt_declare_logging_category(neochat
 
 add_executable(neochat-app
     main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc
 )
 
 if(TARGET Qt::WebView)
@@ -178,28 +315,23 @@ if(NOT ANDROID)
     target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
     if (NOT WIN32 AND NOT APPLE)
         target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
-        if(QT_MAJOR_VERSION STREQUAL "6")
-            target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
-        endif()
+        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
     else()
         target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
     endif()
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
+    target_link_libraries(neochat PUBLIC KF6::ConfigWidgets KF6::WindowSystem)
     target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
     target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    target_sources(neochat-app PRIVATE res_desktop.qrc)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
     target_compile_definitions(neochat PUBLIC -DHAVE_X11)
     target_sources(neochat PRIVATE runner.cpp)
-else()
-    target_sources(neochat-app PRIVATE res_android.qrc)
 endif()
 
-target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels Quotient${QUOTIENT_SUFFIX} cmark::cmark QCoro::Core)
+target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF6::I18n KF6::Kirigami2 KF6::Notifications KF6::ConfigCore KF6::ConfigGui KF6::CoreAddons KF6::SonnetCore  KF6::ItemModels QuotientQt6 cmark::cmark QCoro::Core)
 
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
@@ -287,7 +419,7 @@ if(ANDROID)
         "gps"
     )
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 
@@ -295,12 +427,12 @@ if(NOT ANDROID)
     set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()
 
-if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::DBusAddons)
+if(TARGET KF6::DBusAddons)
+    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
     target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()
 
-if (TARGET KF${QT_MAJOR_VERSION}::KIOWidgets)
+if (TARGET KF6::KIOWidgets)
     target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()
 

src/actionshandler.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 
 #include <Quotient/events/roommessageevent.h>
 
@@ -32,6 +33,7 @@ class NeoChatRoom;
 class ActionsHandler : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The room that messages will be sent to.

src/chatdocumenthandler.cpp

@@ -134,7 +134,7 @@ int ChatDocumentHandler::completionStartIndex() const
         return 0;
     }
 
-#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
+#if !defined(Q_OS_ANDROID)
     const long long cursor = cursorPosition();
 #else
     const auto cursor = cursorPosition();

src/chatdocumenthandler.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
@@ -58,6 +59,7 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief Is the instance being used to handle an edit message.

src/clipboard.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 
 class QClipboard;
 class QImage;
@@ -18,6 +19,8 @@ class QImage;
 class Clipboard : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
     /**
      * @brief Whether the current clipboard content is an image.

src/colorschemer.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 
 class QAbstractItemModel;
 class KColorSchemeManager;
@@ -19,6 +20,8 @@ class KColorSchemeManager;
 class ColorSchemer : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
     /**
      * @brief A QAbstractItemModel of all available color schemes.

src/controller.cpp

@@ -4,11 +4,7 @@
 
 #include "controller.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <qt5keychain/keychain.h>
-#else
 #include <qt6keychain/keychain.h>
-#endif
 
 #include <KConfig>
 #include <KConfigGroup>

src/controller.h

@@ -5,6 +5,7 @@
 
 #include "models/pushrulemodel.h"
 #include <QObject>
+#include <QQmlEngine>
 #include <QQuickItem>
 
 #include <KFormat>
@@ -40,6 +41,8 @@ class ReadPasswordJob;
 class Controller : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
     /**
      * @brief The current connection for the rest of NeoChat to use.
@@ -90,6 +93,10 @@ public:
     Q_ENUM(PasswordStatus)
 
     static Controller &instance();
+    static Controller *create(QQmlEngine *, QJSEngine *)
+    {
+        return &instance();
+    }
 
     void setActiveConnection(NeoChatConnection *connection);
     [[nodiscard]] NeoChatConnection *activeConnection() const;

src/delegatesizehelper.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 
 /**
  * @class DelegateSizeHelper
@@ -23,6 +24,7 @@
 class DelegateSizeHelper : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The width of the component's parent.

src/enums/delegatetype.h

@@ -4,15 +4,18 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 
 /**
  * @class DelegateType
  *
  * This class is designed to define the DelegateType enumeration.
  */
-class DelegateType
+class DelegateType : public QObject
 {
-    Q_GADGET
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     /**

src/filetype.cpp

@@ -0,0 +1,116 @@
+// SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
+// SPDX-License-Identifier: LicenseRef-KDE-Accepted-LGPL
+
+#include "filetype.h"
+#include <QImageReader>
+#include <QMovie>
+
+static QStringList byteArrayListToStringList(const QByteArrayList &byteArrayList)
+{
+    QStringList stringList;
+    for (const QByteArray &byteArray : byteArrayList) {
+        stringList.append(QString::fromLocal8Bit(byteArray));
+    }
+    return stringList;
+}
+
+class FileTypePrivate
+{
+    Q_DECLARE_PUBLIC(FileType)
+    Q_DISABLE_COPY(FileTypePrivate)
+public:
+    FileTypePrivate(FileType *qq);
+    FileType *const q_ptr;
+    QMimeDatabase mimetypeDatabase;
+    QStringList supportedImageFormats = byteArrayListToStringList(QImageReader::supportedImageFormats());
+    QStringList supportedAnimatedImageFormats = byteArrayListToStringList(QMovie::supportedFormats());
+};
+
+FileTypePrivate::FileTypePrivate(FileType *qq)
+    : q_ptr(qq)
+{
+}
+
+FileType::FileType(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new FileTypePrivate(this))
+{
+}
+
+FileType::~FileType() noexcept
+{
+}
+
+QMimeType FileType::mimeTypeForName(const QString &nameOrAlias) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForName(nameOrAlias);
+}
+
+QMimeType FileType::mimeTypeForFile(const QString &fileName, MatchMode mode) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForFile(fileName, static_cast<QMimeDatabase::MatchMode>(mode));
+}
+
+QMimeType FileType::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForFile(fileInfo, static_cast<QMimeDatabase::MatchMode>(mode));
+}
+
+QList<QMimeType> FileType::mimeTypesForFileName(const QString &fileName) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypesForFileName(fileName);
+}
+
+QMimeType FileType::mimeTypeForData(const QByteArray &data) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForData(data);
+}
+
+QMimeType FileType::mimeTypeForData(QIODevice *device) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForData(device);
+}
+
+QMimeType FileType::mimeTypeForUrl(const QUrl &url) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForUrl(url);
+}
+
+QMimeType FileType::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, device);
+}
+
+QMimeType FileType::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, data);
+}
+
+QString FileType::suffixForFileName(const QString &fileName) const
+{
+    Q_D(const FileType);
+    return d->mimetypeDatabase.suffixForFileName(fileName);
+}
+
+QStringList FileType::supportedImageFormats() const
+{
+    Q_D(const FileType);
+    return d->supportedImageFormats;
+}
+
+QStringList FileType::supportedAnimatedImageFormats() const
+{
+    Q_D(const FileType);
+    return d->supportedAnimatedImageFormats;
+}
+
+#include "moc_filetype.cpp"

src/filetype.h

@@ -8,9 +8,10 @@
 #include <QFileInfo>
 #include <QMimeDatabase>
 #include <QObject>
+#include <QQmlEngine>
 #include <qqml.h>
 
-class FileTypeSingletonPrivate;
+class FileTypePrivate;
 
 /**
  * @class FileTypeSingleton
@@ -19,9 +20,11 @@ class FileTypeSingletonPrivate;
  *
  * @sa QMimeDatabase
  */
-class FileTypeSingleton : public QObject
+class FileType : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
     /**
      * @brief List of supported image formats.
@@ -37,12 +40,9 @@ class FileTypeSingleton : public QObject
      */
     Q_PROPERTY(QStringList supportedAnimatedImageFormats READ supportedAnimatedImageFormats CONSTANT FINAL)
 
-    QML_NAMED_ELEMENT(FileType)
-    QML_SINGLETON
-
 public:
-    explicit FileTypeSingleton(QObject *parent = nullptr);
-    ~FileTypeSingleton();
+    explicit FileType(QObject *parent = nullptr);
+    ~FileType();
 
     /**
      * @brief Returns a MIME type for nameOrAlias or an invalid one if none found.
@@ -59,14 +59,14 @@ public:
      *
      * @sa QMimeDatabase
      */
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileTypeSingleton::MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileType::MatchMode mode = MatchDefault) const;
 
     /**
      * @brief Returns a MIME type for fileInfo.
      *
      * @sa QMimeDatabase
      */
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileTypeSingleton::MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileType::MatchMode mode = MatchDefault) const;
 
     /**
      * @brief Returns the MIME types for the file name fileName.
@@ -121,9 +121,7 @@ public:
     QStringList supportedAnimatedImageFormats() const;
 
 private:
-    const QScopedPointer<FileTypeSingletonPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(FileTypeSingleton)
-    Q_DISABLE_COPY(FileTypeSingleton)
+    const QScopedPointer<FileTypePrivate> d_ptr;
+    Q_DECLARE_PRIVATE(FileType)
+    Q_DISABLE_COPY(FileType)
 };
-
-QML_DECLARE_TYPE(FileTypeSingleton)

src/filetypesingleton.cpp

@@ -1,116 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: LicenseRef-KDE-Accepted-LGPL
-
-#include "filetypesingleton.h"
-#include <QImageReader>
-#include <QMovie>
-
-static QStringList byteArrayListToStringList(const QByteArrayList &byteArrayList)
-{
-    QStringList stringList;
-    for (const QByteArray &byteArray : byteArrayList) {
-        stringList.append(QString::fromLocal8Bit(byteArray));
-    }
-    return stringList;
-}
-
-class FileTypeSingletonPrivate
-{
-    Q_DECLARE_PUBLIC(FileTypeSingleton)
-    Q_DISABLE_COPY(FileTypeSingletonPrivate)
-public:
-    FileTypeSingletonPrivate(FileTypeSingleton *qq);
-    FileTypeSingleton *const q_ptr;
-    QMimeDatabase mimetypeDatabase;
-    QStringList supportedImageFormats = byteArrayListToStringList(QImageReader::supportedImageFormats());
-    QStringList supportedAnimatedImageFormats = byteArrayListToStringList(QMovie::supportedFormats());
-};
-
-FileTypeSingletonPrivate::FileTypeSingletonPrivate(FileTypeSingleton *qq)
-    : q_ptr(qq)
-{
-}
-
-FileTypeSingleton::FileTypeSingleton(QObject *parent)
-    : QObject(parent)
-    , d_ptr(new FileTypeSingletonPrivate(this))
-{
-}
-
-FileTypeSingleton::~FileTypeSingleton() noexcept
-{
-}
-
-QMimeType FileTypeSingleton::mimeTypeForName(const QString &nameOrAlias) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForName(nameOrAlias);
-}
-
-QMimeType FileTypeSingleton::mimeTypeForFile(const QString &fileName, MatchMode mode) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForFile(fileName, static_cast<QMimeDatabase::MatchMode>(mode));
-}
-
-QMimeType FileTypeSingleton::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForFile(fileInfo, static_cast<QMimeDatabase::MatchMode>(mode));
-}
-
-QList<QMimeType> FileTypeSingleton::mimeTypesForFileName(const QString &fileName) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypesForFileName(fileName);
-}
-
-QMimeType FileTypeSingleton::mimeTypeForData(const QByteArray &data) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForData(data);
-}
-
-QMimeType FileTypeSingleton::mimeTypeForData(QIODevice *device) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForData(device);
-}
-
-QMimeType FileTypeSingleton::mimeTypeForUrl(const QUrl &url) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForUrl(url);
-}
-
-QMimeType FileTypeSingleton::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, device);
-}
-
-QMimeType FileTypeSingleton::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, data);
-}
-
-QString FileTypeSingleton::suffixForFileName(const QString &fileName) const
-{
-    Q_D(const FileTypeSingleton);
-    return d->mimetypeDatabase.suffixForFileName(fileName);
-}
-
-QStringList FileTypeSingleton::supportedImageFormats() const
-{
-    Q_D(const FileTypeSingleton);
-    return d->supportedImageFormats;
-}
-
-QStringList FileTypeSingleton::supportedAnimatedImageFormats() const
-{
-    Q_D(const FileTypeSingleton);
-    return d->supportedAnimatedImageFormats;
-}
-
-#include "moc_filetypesingleton.cpp"

src/linkpreviewer.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 #include <QUrl>
 
 class NeoChatRoom;
@@ -19,6 +20,8 @@ class NeoChatRoom;
 class LinkPreviewer : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+
     /**
      * @brief The URL to get the preview for.
      */

src/locationhelper.h

@@ -2,14 +2,17 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 #pragma once
 
-#include "linkpreviewer.h"
 #include <QMetaType>
+#include <QObject>
+#include <QQmlEngine>
 #include <QRectF>
 
 /** Location related helper functions for QML. */
-class LocationHelper
+class LocationHelper : public QObject
 {
-    Q_GADGET
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 public:
     /** Unite two rectanlges. */
     Q_INVOKABLE static QRectF unite(const QRectF &r1, const QRectF &r2);

src/login.cpp

@@ -13,13 +13,13 @@
 
 using namespace Quotient;
 
-Login::Login(QObject *parent)
+LoginHelper::LoginHelper(QObject *parent)
     : QObject(parent)
 {
     init();
 }
 
-void Login::init()
+void LoginHelper::init()
 {
     m_homeserverReachable = false;
     m_connection = new NeoChatConnection();
@@ -31,7 +31,7 @@ void Login::init()
     m_supportsPassword = false;
     m_ssoUrl = QUrl();
 
-    connect(this, &Login::matrixIdChanged, this, [this]() {
+    connect(this, &LoginHelper::matrixIdChanged, this, [this]() {
         setHomeserverReachable(false);
         QRegularExpression validator(QStringLiteral("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$"));
         if (!validator.match(m_matrixId).hasMatch()) {
@@ -105,23 +105,23 @@ void Login::init()
     });
 }
 
-void Login::setHomeserverReachable(bool reachable)
+void LoginHelper::setHomeserverReachable(bool reachable)
 {
     m_homeserverReachable = reachable;
     Q_EMIT homeserverReachableChanged();
 }
 
-bool Login::homeserverReachable() const
+bool LoginHelper::homeserverReachable() const
 {
     return m_homeserverReachable;
 }
 
-QString Login::matrixId() const
+QString LoginHelper::matrixId() const
 {
     return m_matrixId;
 }
 
-void Login::setMatrixId(const QString &matrixId)
+void LoginHelper::setMatrixId(const QString &matrixId)
 {
     m_matrixId = matrixId;
     if (!m_matrixId.startsWith(QLatin1Char('@'))) {
@@ -130,30 +130,30 @@ void Login::setMatrixId(const QString &matrixId)
     Q_EMIT matrixIdChanged();
 }
 
-QString Login::password() const
+QString LoginHelper::password() const
 {
     return m_password;
 }
 
-void Login::setPassword(const QString &password)
+void LoginHelper::setPassword(const QString &password)
 {
     setInvalidPassword(false);
     m_password = password;
     Q_EMIT passwordChanged();
 }
 
-QString Login::deviceName() const
+QString LoginHelper::deviceName() const
 {
     return m_deviceName;
 }
 
-void Login::setDeviceName(const QString &deviceName)
+void LoginHelper::setDeviceName(const QString &deviceName)
 {
     m_deviceName = deviceName;
     Q_EMIT deviceNameChanged();
 }
 
-void Login::login()
+void LoginHelper::login()
 {
     m_isLoggingIn = true;
     Q_EMIT isLoggingInChanged();
@@ -164,22 +164,22 @@ void Login::login()
     m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
 }
 
-bool Login::supportsPassword() const
+bool LoginHelper::supportsPassword() const
 {
     return m_supportsPassword;
 }
 
-bool Login::supportsSso() const
+bool LoginHelper::supportsSso() const
 {
     return m_supportsSso;
 }
 
-QUrl Login::ssoUrl() const
+QUrl LoginHelper::ssoUrl() const
 {
     return m_ssoUrl;
 }
 
-void Login::loginWithSso()
+void LoginHelper::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
     connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
@@ -189,28 +189,28 @@ void Login::loginWithSso()
     });
 }
 
-bool Login::testing() const
+bool LoginHelper::testing() const
 {
     return m_testing;
 }
 
-bool Login::isLoggingIn() const
+bool LoginHelper::isLoggingIn() const
 {
     return m_isLoggingIn;
 }
 
-bool Login::isLoggedIn() const
+bool LoginHelper::isLoggedIn() const
 {
     return m_isLoggedIn;
 }
 
-void Login::setInvalidPassword(bool invalid)
+void LoginHelper::setInvalidPassword(bool invalid)
 {
     m_invalidPassword = invalid;
     Q_EMIT isInvalidPasswordChanged();
 }
 
-bool Login::isInvalidPassword() const
+bool LoginHelper::isInvalidPassword() const
 {
     return m_invalidPassword;
 }

src/login.h

@@ -4,18 +4,21 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 #include <QUrl>
 
 class NeoChatConnection;
 
 /**
- * @class Login
+ * @class LoginHelper
  *
  * A helper class for logging into a Matrix account.
  */
-class Login : public QObject
+class LoginHelper : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
     /**
      * @brief Whether the home server for the account is reachable.
@@ -76,7 +79,7 @@ class Login : public QObject
     Q_PROPERTY(bool isInvalidPassword READ isInvalidPassword NOTIFY isInvalidPasswordChanged)
 
 public:
-    explicit Login(QObject *parent = nullptr);
+    explicit LoginHelper(QObject *parent = nullptr);
 
     Q_INVOKABLE void init();
 

src/main.cpp

@@ -44,11 +44,9 @@
 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
 #include "chatdocumenthandler.h"
-#include "clipboard.h"
 #include "controller.h"
 #include "delegatesizehelper.h"
 #include "enums/delegatetype.h"
-#include "filetypesingleton.h"
 #include "linkpreviewer.h"
 #include "locationhelper.h"
 #include "logger.h"
@@ -82,9 +80,6 @@
 #include "models/userlistmodel.h"
 #include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
-#include "neochatconnection.h"
-#include "neochatroom.h"
-#include "notificationsmanager.h"
 #include "pollhandler.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
@@ -109,6 +104,8 @@
 
 using namespace Quotient;
 
+void qml_register_types_org_kde_neochat();
+
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
     QNetworkAccessManager *create(QObject *) override
@@ -140,19 +137,13 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
 #ifdef HAVE_WEBVIEW
     QtWebView::initialize();
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif
-#endif
 
 #ifdef Q_OS_ANDROID
     QGuiApplication app(argc, argv);
@@ -221,99 +212,18 @@ int main(int argc, char *argv[])
                 QStringLiteral("/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"));
 #endif
 
-    Clipboard clipboard;
-    auto config = NeoChatConfig::self();
-    FileTypeSingleton fileTypeSingleton;
-
-    Login *login = new Login();
-    UrlHelper urlHelper;
-
 #ifdef HAVE_COLORSCHEME
     ColorSchemer colorScheme;
-    qmlRegisterSingletonInstance<ColorSchemer>("org.kde.neochat", 1, 0, "ColorSchemer", &colorScheme);
-    if (!config->colorScheme().isEmpty()) {
-        colorScheme.apply(config->colorScheme());
+    if (!NeoChatConfig::self()->colorScheme().isEmpty()) {
+        colorScheme.apply(NeoChatConfig::self()->colorScheme());
     }
 #endif
 
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "NotificationsManager", &NotificationsManager::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Config", config);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "RoomManager", &RoomManager::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "FileType", &fileTypeSingleton);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Controller::instance().accounts());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Registration", &Registration::instance());
-    qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
-    qmlRegisterType<ChatDocumentHandler>("org.kde.neochat", 1, 0, "ChatDocumentHandler");
-    qmlRegisterType<RoomListModel>("org.kde.neochat", 1, 0, "RoomListModel");
-    qmlRegisterType<KWebShortcutModel>("org.kde.neochat", 1, 0, "WebShortcutModel");
-    qmlRegisterType<UserListModel>("org.kde.neochat", 1, 0, "UserListModel");
-    qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
-    qmlRegisterType<ReactionModel>("org.kde.neochat", 1, 0, "ReactionModel");
-    qmlRegisterType<MediaMessageFilterModel>("org.kde.neochat", 1, 0, "MediaMessageFilterModel");
-    qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
-    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
-    qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
-    qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
-    qmlRegisterType<ServerListModel>("org.kde.neochat", 1, 0, "ServerListModel");
-    qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
-    qmlRegisterType<SortFilterSpaceListModel>("org.kde.neochat", 1, 0, "SortFilterSpaceListModel");
-    qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
-    qmlRegisterType<DevicesProxyModel>("org.kde.neochat", 1, 0, "DevicesProxyModel");
-    qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
-    qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
-    qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
-    qmlRegisterType<StateFilterModel>("org.kde.neochat", 1, 0, "StateFilterModel");
-    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
-    qmlRegisterType<LiveLocationsModel>("org.kde.neochat", 1, 0, "LiveLocationsModel");
-    qmlRegisterType<LocationsModel>("org.kde.neochat", 1, 0, "LocationsModel");
-    qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
-    qmlRegisterType<PushRuleModel>("org.kde.neochat", 1, 0, "PushRuleModel");
-    qmlRegisterType<StickerModel>("org.kde.neochat", 1, 0, "StickerModel");
-    qmlRegisterType<ImagePacksModel>("org.kde.neochat", 1, 0, "ImagePacksModel");
-    qmlRegisterType<AccountEmoticonModel>("org.kde.neochat", 1, 0, "AccountEmoticonModel");
-    qmlRegisterType<EmoticonFilterModel>("org.kde.neochat", 1, 0, "EmoticonFilterModel");
-    qmlRegisterType<DelegateSizeHelper>("org.kde.neochat", 1, 0, "DelegateSizeHelper");
-    qmlRegisterType<MediaSizeHelper>("org.kde.neochat", 1, 0, "MediaSizeHelper");
-    qmlRegisterUncreatableType<DelegateType>("org.kde.neochat", 1, 0, "DelegateType", "ENUM"_ls);
-    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM"_ls);
-    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM"_ls);
-    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM"_ls);
-    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM"_ls);
-    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM"_ls);
-    qmlRegisterUncreatableType<User>("org.kde.neochat", 1, 0, "User", {});
-    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
-    qmlRegisterUncreatableType<NeoChatConnection>("org.kde.neochat", 1, 0, "NeoChatConnection", {});
+    qml_register_types_org_kde_neochat();
+    qmlRegisterSingletonInstance("org.kde.neochat.config", 1, 0, "Config", NeoChatConfig::self());
+    qmlRegisterSingletonInstance("org.kde.neochat.accounts", 1, 0, "AccountRegistry", &Controller::instance().accounts());
 
-    qRegisterMetaType<User *>("User*");
-    qRegisterMetaType<User *>("const User*");
-    qRegisterMetaType<User *>("const Quotient::User*");
-    qRegisterMetaType<Room *>("Room*");
-    qRegisterMetaType<MessageEventType>("MessageEventType");
-    qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
-    qRegisterMetaType<User *>("User*");
-    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
-    qRegisterMetaType<QMimeType>("QMimeType");
-    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
-    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
-    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
-    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
-        return engine->toScriptValue(KAboutData::applicationData());
-    });
-    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"_ls), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
-    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "LocationHelper", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
-        return engine->toScriptValue(LocationHelper());
-    });
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    qRegisterMetaTypeStreamOperators<Emoji>();
-#endif
+    // qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
 
     QQmlApplicationEngine engine;
 
@@ -364,7 +274,7 @@ int main(int argc, char *argv[])
     engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
-    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/org/kde/neochat/qml/main.qml")));
     if (engine.rootObjects().isEmpty()) {
         return -1;
     }

src/mediasizehelper.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 #include <QSize>
 
 /**
@@ -28,6 +29,7 @@
 class MediaSizeHelper : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The maximum width (in px) the media can be.

src/models/accountemoticonmodel.h

@@ -9,6 +9,7 @@
 #include <QCoroTask>
 #include <QObject>
 #include <QPointer>
+#include <QQmlEngine>
 #include <QVector>
 
 #include <Quotient/connection.h>
@@ -23,6 +24,8 @@
 class AccountEmoticonModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+
     /**
      * @brief The connection to get emoticons from.
      */

src/models/completionmodel.cpp

@@ -87,8 +87,11 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
         }
         if (role == IconNameRole) {
-            return QStringLiteral("mxc://%1")
-                .arg(m_roomListModel->connection()->makeMediaUrl(m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toUrl()).toString());
+            auto mediaId = m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toString();
+            if (mediaId.isEmpty()) {
+                return QVariant();
+            }
+            return m_room->connection()->makeMediaUrl(QUrl(QStringLiteral("mxc://%1").arg(mediaId)));
         }
     }
     if (m_autoCompletionType == Emoji) {
@@ -145,7 +148,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':')) && text().size() > 1 && !text()[1].isUpper()
                && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
         m_filterModel->setSourceModel(m_emojiModel);

src/models/completionmodel.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QConcatenateTablesProxyModel>
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 #include "roomlistmodel.h"
@@ -24,6 +25,7 @@ class RoomListModel;
 class CompletionModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current text to search for completions.

src/models/completionproxymodel.cpp

@@ -22,11 +22,7 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
             && sourceModel()
                    ->data(sourceModel()->index(sourceRow, 0), secondaryFilterRole())
                    .toString()
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
                    .startsWith(QStringView(m_filterText).sliced(1), Qt::CaseInsensitive));
-#else
-                   .startsWith(m_filterText.midRef(1), Qt::CaseInsensitive));
-#endif
 }
 
 bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const

src/models/customemojimodel.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 #include <QRegularExpression>
 #include <memory>
 
@@ -27,6 +28,8 @@ struct CustomEmoji {
 class CustomEmojiModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
 public:
     /**
@@ -48,6 +51,10 @@ public:
         static CustomEmojiModel _instance;
         return _instance;
     }
+    static CustomEmojiModel *create(QQmlEngine *, QJSEngine *)
+    {
+        return &instance();
+    }
 
     /**
      * @brief Get the given role value at the given index.

src/models/devicesmodel.h

@@ -5,6 +5,7 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
+#include <QQmlEngine>
 
 #include <Quotient/csapi/definitions/client_device.h>
 
@@ -25,6 +26,7 @@ class Connection;
 class DevicesModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its devices from.

src/models/devicesproxymodel.h

@@ -3,11 +3,14 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 class DevicesProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
+
     Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged)
 
 public:

src/models/emojimodel.h

@@ -5,6 +5,7 @@
 
 #include <QAbstractListModel>
 #include <QObject>
+#include <QQmlEngine>
 #include <QSettings>
 
 struct Emoji {
@@ -59,6 +60,8 @@ Q_DECLARE_METATYPE(Emoji)
 class EmojiModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
 
     /**
      * @brief Return a list of recently used emojis.
@@ -83,6 +86,10 @@ public:
         static EmojiModel _instance;
         return _instance;
     }
+    static EmojiModel *create(QQmlEngine *, QJSEngine *)
+    {
+        return &instance();
+    }
 
     /**
      * @brief Defines the model roles.

src/models/emoticonfiltermodel.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -14,6 +15,7 @@
 class EmoticonFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief Whether stickers should be shown

src/models/imagepacksmodel.h

@@ -6,6 +6,7 @@
 #include "events/imagepackevent.h"
 #include <QAbstractListModel>
 #include <QPointer>
+#include <QQmlEngine>
 #include <QVector>
 
 class NeoChatRoom;
@@ -21,6 +22,7 @@ class NeoChatRoom;
 class ImagePacksModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current room that the model is being used in.

src/models/livelocationsmodel.h

@@ -8,6 +8,7 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
+#include <QQmlEngine>
 #include <QRectF>
 
 struct LiveLocationData {
@@ -24,6 +25,8 @@ bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs);
 class LiveLocationsModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+
     Q_PROPERTY(NeoChatRoom *room MEMBER m_room NOTIFY roomChanged)
     /** The event id of the beacon start event, ie. the one all suspequent
      *  events use to relate to the same beacon.

src/models/locationsmodel.h

@@ -5,6 +5,7 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
+#include <QQmlEngine>
 #include <QRectF>
 
 #include "neochatroom.h"
@@ -15,6 +16,7 @@
 class LocationsModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
 public:
     enum Roles {

src/models/mediamessagefiltermodel.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
-#include <qobjectdefs.h>
 
 #include "models/messagefiltermodel.h"
 
@@ -20,6 +20,8 @@ class MessageFilterModel;
 class MediaMessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
+
 public:
     enum MediaType {
         Image = 0,

src/models/messageeventmodel.cpp

@@ -55,7 +55,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ShowReadMarkersRole] = "showReadMarkers";
     roles[ReactionRole] = "reaction";
     roles[ShowReactionsRole] = "showReactions";
-    roles[SourceRole] = "jsonSource";
     roles[AuthorIdRole] = "authorId";
     roles[VerifiedRole] = "verified";
     roles[AuthorDisplayNameRole] = "authorDisplayName";
@@ -467,10 +466,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getPlainBody();
     }
 
-    if (role == SourceRole) {
-        return QJsonDocument(evt.fullJson()).toJson();
-    }
-
     if (role == DelegateTypeRole) {
         return eventHandler.getDelegateType();
     }

src/models/messageeventmodel.h

@@ -5,6 +5,7 @@
 
 #include <KFormat>
 #include <QAbstractListModel>
+#include <QQmlEngine>
 
 #include "linkpreviewer.h"
 #include "neochatroom.h"
@@ -25,6 +26,7 @@ class ReactionModel;
 class MessageEventModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current room that the model is getting its messages from.
@@ -70,7 +72,6 @@ public:
         ShowReadMarkersRole, /**< Whether there are any other user read markers to be shown. */
         ReactionRole, /**< List model for this event. */
         ShowReactionsRole, /**< Whether there are any reactions to be shown. */
-        SourceRole, /**< The full message source JSON. */
 
         AuthorIdRole, /**< Matrix ID of the message author. */
 

src/models/messagefiltermodel.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 #include "messageeventmodel.h"
@@ -21,6 +22,8 @@
 class MessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
+
 public:
     /**
      * @brief Defines the model roles.

src/models/publicroomlistmodel.h

@@ -5,6 +5,7 @@
 
 #include <QAbstractListModel>
 #include <QObject>
+#include <QQmlEngine>
 
 #include <Quotient/csapi/list_public_rooms.h>
 
@@ -27,6 +28,7 @@ class Connection;
 class PublicRoomListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its rooms from.

src/models/pushrulemodel.cpp

@@ -171,7 +171,7 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
         if (!testUserId.startsWith(u'@')) {
             testUserId.prepend(u'@');
         }
-        if (connection->user(testUserId) != nullptr) {
+        if (testUserId.startsWith(u'@') && !Quotient::serverPart(testUserId).isEmpty() && connection->user(testUserId) != nullptr) {
             return PushNotificationSection::Undefined;
         }
         // If the rule has push conditions and one is a room ID it is a room only keyword.

src/models/pushrulemodel.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 
 #include <Quotient/csapi/definitions/push_rule.h>
 
@@ -20,6 +21,8 @@
 class PushNotificationKind : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     /**
@@ -71,6 +74,8 @@ public:
 class PushNotificationSection : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     /**
@@ -130,6 +135,7 @@ public:
 class PushRuleModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The default state for any newly created keyword rule.

src/models/reactionmodel.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 
 namespace Quotient
 {
@@ -18,6 +19,7 @@ class User;
 class ReactionModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
 public:
     /**

src/models/roomlistmodel.h

@@ -6,6 +6,7 @@
 #include <Quotient/events/roomevent.h>
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 
 class NeoChatRoom;
 
@@ -18,6 +19,8 @@ class Room;
 class NeoChatRoomType : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     /**
@@ -42,6 +45,7 @@ public:
 class RoomListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its rooms from.

src/models/searchmodel.cpp

@@ -184,7 +184,6 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {MimeTypeRole, "mimeType"},
         {ShowLinkPreviewRole, "showLinkPreview"},
         {LinkPreviewRole, "linkPreview"},
-        {SourceRole, "jsonSource"},
     };
 }
 

src/models/searchmodel.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 #include <QString>
 
 #include <Quotient/csapi/search.h>
@@ -23,6 +24,7 @@ class NeoChatRoom;
 class SearchModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The text to search messages for.
@@ -83,7 +85,6 @@ public:
         MimeTypeRole,
         ShowLinkPreviewRole,
         LinkPreviewRole,
-        SourceRole,
     };
     Q_ENUM(Roles)
     explicit SearchModel(QObject *parent = nullptr);

src/models/serverlistmodel.h

@@ -7,6 +7,7 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
+#include <QQmlEngine>
 #include <QUrl>
 
 /**
@@ -24,6 +25,7 @@
 class ServerListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
 public:
     /**

src/models/sortfilterroomlistmodel.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -27,6 +28,7 @@
 class SortFilterRoomListModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The order by which the rooms will be sorted.

src/models/sortfilterspacelistmodel.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -16,6 +17,8 @@
 class SortFilterSpaceListModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
+
     /**
      * @brief The number of spaces in the model.
      */

src/models/statefiltermodel.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -14,6 +15,7 @@
 class StateFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
 public:
     /**

src/models/statemodel.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 
 #include "neochatroom.h"
 
@@ -15,6 +16,7 @@
 class StateModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current room that the model is getting its state events from.

src/models/stickermodel.h

@@ -7,6 +7,7 @@
 #include "neochatroom.h"
 #include <QAbstractListModel>
 #include <QObject>
+#include <QQmlEngine>
 #include <QVector>
 
 class ImagePacksModel;
@@ -22,6 +23,7 @@ class ImagePacksModel;
 class StickerModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The image pack that the stickers come from.

src/models/userdirectorylistmodel.h

@@ -5,6 +5,7 @@
 
 #include <QAbstractListModel>
 #include <QObject>
+#include <QQmlEngine>
 
 #include <Quotient/csapi/users.h>
 
@@ -26,6 +27,7 @@ class Connection;
 class UserDirectoryListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting users from.

src/models/userfiltermodel.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -15,6 +16,7 @@
 class UserFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief This property hold the text of the filter.

src/models/userlistmodel.h

@@ -8,6 +8,7 @@
 #include <QAbstractListModel>
 #include <QObject>
 #include <QPointer>
+#include <QQmlEngine>
 
 class NeoChatRoom;
 
@@ -29,6 +30,7 @@ class User;
 class UserListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The room that the model is getting its users from.

src/models/webshortcutmodel.cpp

@@ -10,7 +10,7 @@
 #endif
 #include <KStringHandler>
 
-struct KWebShortcutModelPrivate {
+struct WebShortcutModelPrivate {
     QString selectedText;
 #ifdef HAVE_KIO
     KUriFilterData filterData;
@@ -18,27 +18,27 @@ struct KWebShortcutModelPrivate {
     QStringList searchProviders;
 };
 
-KWebShortcutModel::KWebShortcutModel(QObject *parent)
+WebShortcutModel::WebShortcutModel(QObject *parent)
     : QAbstractListModel(parent)
-    , d(new KWebShortcutModelPrivate)
+    , d(new WebShortcutModelPrivate)
 {
 }
 
-KWebShortcutModel::~KWebShortcutModel()
+WebShortcutModel::~WebShortcutModel()
 {
 }
 
-QString KWebShortcutModel::selectedText() const
+QString WebShortcutModel::selectedText() const
 {
     return d->selectedText;
 }
 
-QString KWebShortcutModel::trunkatedSearchText() const
+QString WebShortcutModel::trunkatedSearchText() const
 {
     return KStringHandler::rsqueeze(d->selectedText, 21);
 }
 
-bool KWebShortcutModel::enabled() const
+bool WebShortcutModel::enabled() const
 {
 #ifdef HAVE_KIO
     return true;
@@ -47,7 +47,7 @@ bool KWebShortcutModel::enabled() const
 #endif
 }
 
-void KWebShortcutModel::setSelectedText(const QString &selectedText)
+void WebShortcutModel::setSelectedText(const QString &selectedText)
 {
     if (d->selectedText == selectedText) {
         return;
@@ -80,7 +80,7 @@ void KWebShortcutModel::setSelectedText(const QString &selectedText)
     Q_EMIT selectedTextChanged();
 }
 
-int KWebShortcutModel::rowCount(const QModelIndex &parent) const
+int WebShortcutModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
 #ifdef HAVE_KIO
@@ -91,7 +91,7 @@ int KWebShortcutModel::rowCount(const QModelIndex &parent) const
     return 0;
 }
 
-QVariant KWebShortcutModel::data(const QModelIndex &index, int role) const
+QVariant WebShortcutModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) {
         return {};
@@ -110,7 +110,7 @@ QVariant KWebShortcutModel::data(const QModelIndex &index, int role) const
     return {};
 }
 
-void KWebShortcutModel::trigger(const QString &data)
+void WebShortcutModel::trigger(const QString &data)
 {
 #ifdef HAVE_KIO
     KUriFilterData filterData(data);
@@ -122,7 +122,7 @@ void KWebShortcutModel::trigger(const QString &data)
 #endif
 }
 
-void KWebShortcutModel::configureWebShortcuts()
+void WebShortcutModel::configureWebShortcuts()
 {
 #ifdef HAVE_KIO
     auto job = new KIO::CommandLauncherJob(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("webshortcuts"), this);

src/models/webshortcutmodel.h

@@ -4,12 +4,13 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QQmlEngine>
 #include <memory>
 
-struct KWebShortcutModelPrivate;
+struct WebShortcutModelPrivate;
 
 /**
- * @class KWebShortcutModel
+ * @class WebShortcutModel
  *
  * This class defines the model for listing web shortcuts for a specified selectedText.
  *
@@ -45,9 +46,10 @@ struct KWebShortcutModelPrivate;
  *  }
  *  ```
  */
-class KWebShortcutModel : public QAbstractListModel
+class WebShortcutModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
 
     /**
      * @brief The text to find web shortcuts for.
@@ -64,8 +66,8 @@ class KWebShortcutModel : public QAbstractListModel
      */
     Q_PROPERTY(bool enabled READ enabled CONSTANT)
 public:
-    explicit KWebShortcutModel(QObject *parent = nullptr);
-    ~KWebShortcutModel();
+    explicit WebShortcutModel(QObject *parent = nullptr);
+    ~WebShortcutModel();
 
     QString selectedText() const;
     void setSelectedText(const QString &selectedText);
@@ -103,5 +105,5 @@ Q_SIGNALS:
     void openUrl(const QUrl &url);
 
 private:
-    std::unique_ptr<KWebShortcutModelPrivate> d;
+    std::unique_ptr<WebShortcutModelPrivate> d;
 };

src/neochatconnection.cpp

@@ -10,11 +10,7 @@
 #include "jobs/neochatdeactivateaccountjob.h"
 #include "roommanager.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <qt5keychain/keychain.h>
-#else
 #include <qt6keychain/keychain.h>
-#endif
 
 #include <KLocalizedString>
 

src/neochatconnection.h

@@ -4,12 +4,15 @@
 #pragma once
 
 #include <QObject>
+#include <QQmlEngine>
 
 #include <Quotient/connection.h>
 
 class NeoChatConnection : public Quotient::Connection
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
     /**
      * @brief The account label for this account.