Use declarative type registration for remaining types

.gitignore

@@ -12,3 +12,4 @@ kate.project.ctags.*
 .idea/
 cmake-build-*
 src/res.generated.qrc
+.qmlls.ini

src/CMakeLists.txt

@@ -174,6 +174,7 @@ add_library(neochat STATIC
     sharehandler.h
     models/roomtreeitem.cpp
     models/roomtreeitem.h
+    foreigntypes.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES

src/devtools/FeatureFlagPage.qml

@@ -7,8 +7,6 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat.config
-
 FormCard.FormCardPage {
     id: root
 

src/foreigntypes.h

@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QQmlEngine>
+
+#include <Quotient/accountregistry.h>
+#include <Quotient/keyverificationsession.h>
+#if __has_include("Quotient/e2ee/sssshandler.h")
+#include <Quotient/e2ee/sssshandler.h>
+#endif
+
+#include "controller.h"
+#include "neochatconfig.h"
+
+struct ForeignConfig {
+    Q_GADGET
+    QML_FOREIGN(NeoChatConfig)
+    QML_NAMED_ELEMENT(Config)
+    QML_SINGLETON
+public:
+    static NeoChatConfig *create(QQmlEngine *, QJSEngine *)
+    {
+        QQmlEngine::setObjectOwnership(NeoChatConfig::self(), QQmlEngine::CppOwnership);
+        return NeoChatConfig::self();
+    }
+};
+
+struct ForeignAccountRegistry {
+    Q_GADGET
+    QML_FOREIGN(Quotient::AccountRegistry)
+    QML_NAMED_ELEMENT(AccountRegistry)
+    QML_SINGLETON
+public:
+    static Quotient::AccountRegistry *create(QQmlEngine *, QJSEngine *)
+    {
+        QQmlEngine::setObjectOwnership(&Controller::instance().accounts(), QQmlEngine::CppOwnership);
+        return &Controller::instance().accounts();
+    }
+};
+
+struct ForeignKeyVerificationSession {
+    Q_GADGET
+    QML_FOREIGN(Quotient::KeyVerificationSession)
+    QML_NAMED_ELEMENT(KeyVerificationSession)
+    QML_UNCREATABLE("")
+};
+
+#if __has_include("Quotient/e2ee/sssshandler.h")
+struct ForeignSSSSHandler {
+    Q_GADGET
+    QML_FOREIGN(Quotient::SSSSHandler)
+    QML_NAMED_ELEMENT(SSSSHandler)
+};
+#endif

src/login/WelcomePage.qml

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
 import org.kde.neochat.settings
-import org.kde.neochat.accounts
 
 FormCard.FormCardPage {
     id: root

src/main.cpp

@@ -35,11 +35,6 @@
 
 #include "neochat-version.h"
 
-#include <Quotient/accountregistry.h>
-#if __has_include("Quotient/e2ee/sssshandler.h")
-#include <Quotient/e2ee/sssshandler.h>
-#endif
-#include <Quotient/keyverificationsession.h>
 #include <Quotient/networkaccessmanager.h>
 
 #include "blurhashimageprovider.h"
@@ -234,13 +229,6 @@ int main(int argc, char *argv[])
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
 
     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());
-
-    qmlRegisterUncreatableType<KeyVerificationSession>("com.github.quotient_im.libquotient", 1, 0, "KeyVerificationSession", {});
-#if __has_include("Quotient/e2ee/sssshandler.h")
-    qmlRegisterType<SSSSHandler>("com.github.quotient_im.libquotient", 1, 0, "SSSSHandler");
-#endif
 
     QQmlApplicationEngine engine;
 

src/qml/AccountMenu.qml

@@ -10,7 +10,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.neochat
 import org.kde.neochat.settings
 import org.kde.neochat.devtools
-import org.kde.neochat.config
 
 QQC2.Menu {
     id: root

src/qml/AccountSwitchDialog.qml

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
-import org.kde.neochat.accounts
 
 Kirigami.Dialog {
     id: root

src/qml/ChatBar.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief A component for typing and sending chat messages.

src/qml/CollapsedRoomDelegate.qml

@@ -11,7 +11,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kitemmodels
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 QQC2.ItemDelegate {
     id: root

src/qml/DelegateContextMenu.qml

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief The base menu for most message types.

src/qml/EmojiSas.qml

@@ -5,8 +5,6 @@ import QtQuick
 import QtQuick.Controls as QQC2
 import QtQml
 
-import com.github.quotient_im.libquotient
-
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
 

src/qml/FileDelegateContextMenu.qml

@@ -8,7 +8,6 @@ import Qt.labs.platform
 import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief The menu for media messages.

src/qml/GlobalMenu.qml

@@ -9,8 +9,6 @@ import QtQuick.Layouts
 
 import org.kde.neochat
 import org.kde.neochat.settings
-import org.kde.neochat.config
-import org.kde.neochat.accounts
 
 Labs.MenuBar {
     id: root

src/qml/HoverActions.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief A component that provides a set of actions when a message is hovered in the timeline.

src/qml/KeyVerificationDialog.qml

@@ -6,8 +6,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import QtQml
 
-import com.github.quotient_im.libquotient
-
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.delegates as Delegates
 import org.kde.neochat

src/qml/Main.qml

@@ -10,8 +10,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.neochat
 import org.kde.neochat.login
 import org.kde.neochat.settings
-import org.kde.neochat.config
-import org.kde.neochat.accounts
 
 Kirigami.ApplicationWindow {
     id: root

src/qml/MessageDelegateContextMenu.qml

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief The menu for normal messages.

src/qml/NeochatMaximizeComponent.qml

@@ -10,7 +10,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as Components
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 Components.AlbumMaximizeComponent {
     id: root

src/qml/RoomDelegate.qml

@@ -12,7 +12,6 @@ import org.kde.kirigamiaddons.labs.components as Components
 import org.kde.kitemmodels
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 Delegates.RoundedItemDelegate {
     id: root

src/qml/RoomDrawer.qml

@@ -11,7 +11,6 @@ import org.kde.kitemmodels
 
 import org.kde.neochat
 import org.kde.neochat.settings
-import org.kde.neochat.config
 
 Kirigami.OverlayDrawer {
     id: root

src/qml/RoomInformation.qml

@@ -11,7 +11,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kitemmodels
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief Component for visualising the room information.

src/qml/RoomListPage.qml

@@ -13,8 +13,6 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
-import org.kde.neochat.config
-import org.kde.neochat.accounts
 
 Kirigami.Page {
     id: root

src/qml/RoomPage.qml

@@ -12,7 +12,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 Kirigami.Page {
     id: root

src/qml/TimelineView.qml

@@ -12,7 +12,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
 import org.kde.neochat
-import org.kde.neochat.config
 import org.kde.neochat.timeline
 
 QQC2.ScrollView {

src/qml/UnlockSSSSDialog.qml

@@ -9,8 +9,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import com.github.quotient_im.libquotient
-
 import org.kde.neochat
 
 FormCard.FormCardPage {

src/qml/UserInfo.qml

@@ -10,8 +10,6 @@ import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
 import org.kde.neochat.settings
-import org.kde.neochat.config
-import org.kde.neochat.accounts
 
 RowLayout {
     id: root

src/qml/VerificationCanceled.qml

@@ -4,8 +4,6 @@
 import QtQuick
 import QtQml
 
-import com.github.quotient_im.libquotient
-
 import org.kde.neochat
 
 Message {

src/settings/About.qml

@@ -2,12 +2,8 @@
 // SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
-import QtQuick.Layouts
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.neochat
-import org.kde.coreaddons
 
 FormCard.AboutPage {
     title: i18nc("@title:window", "About NeoChat")
-    aboutData: AboutData
 }

src/settings/AccountsPage.qml

@@ -12,7 +12,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
-import org.kde.neochat.accounts
 
 FormCard.FormCardPage {
     id: root

src/settings/AppearanceSettingsPage.qml

@@ -11,7 +11,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 FormCard.FormCardPage {
     id: root

src/settings/ColorScheme.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 FormCard.FormComboBoxDelegate {
     id: root

src/settings/NeoChatGeneralPage.qml

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
 import org.kde.neochat.devtools
-import org.kde.neochat.config
 
 FormCard.FormCardPage {
     title: i18nc("@title:window", "General")

src/settings/NetworkProxyPage.qml

@@ -7,8 +7,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat.config
-
 FormCard.FormCardPage {
     id: root
 

src/settings/Permissions.qml

@@ -9,7 +9,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.delegates as Delegates
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
-import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/timeline/FileComponent.qml

@@ -12,7 +12,6 @@ import org.kde.coreaddons
 import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief A component to show a file from a message.

src/timeline/MessageDelegate.qml

@@ -10,7 +10,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief The base delegate for all messages in the timeline.

src/timeline/ReactionDelegate.qml

@@ -6,7 +6,8 @@ import QtQuick
 import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
-import org.kde.neochat.config
+
+import org.kde.neochat
 
 Flow {
     id: root

src/timeline/SectionDelegate.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 
-import org.kde.neochat.config
+import org.kde.neochat
 
 QQC2.ItemDelegate {
     id: root

src/timeline/StateDelegate.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat.config
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for visualising an aggregated list of consecutive state events.

src/timeline/TimelineDelegate.qml

@@ -6,7 +6,6 @@ import QtQuick
 import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief The base Item for all delegates in the timeline.