Improve QML types

2023-06-06 21:06:58 +02:00
parent 72c85af407
commit 47c28ce9a2
30 changed files with 35 additions and 30 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -261,6 +261,7 @@ int main(int argc, char *argv[])
    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
    qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
+    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});

    qRegisterMetaType<User *>("User*");
    qRegisterMetaType<User *>("const User*");
--- a/src/qml/Component/ChatBox/ChatBar.qml
+++ b/src/qml/Component/ChatBox/ChatBar.qml
@@ -36,7 +36,7 @@ QQC2.Control {
    /**
     * @brief The current room that user is viewing.
     */
-    property var currentRoom
+    property NeoChatRoom currentRoom

    /**
     * @brief The QQC2.TextArea object.
--- a/src/qml/Component/ChatBox/ChatBox.qml
+++ b/src/qml/Component/ChatBox/ChatBox.qml
@@ -35,7 +35,7 @@ ColumnLayout {
    /**
     * @brief The current room that user is viewing.
     */
-    property var currentRoom
+    property NeoChatRoom currentRoom

    /**
     * @brief The chatBar object
--- a/src/qml/Component/ChatBox/LocationChooser.qml
+++ b/src/qml/Component/ChatBox/LocationChooser.qml
@@ -11,10 +11,12 @@ import org.kde.kirigamiaddons.labs.components 1.0 as Components

 import org.kde.kirigami 2.15 as Kirigami

+import org.kde.neochat 1.0
+
 Components.AbstractMaximizeComponent {
    id: root

-    required property var room
+    required property NeoChatRoom room
    property var location

    title: i18n("Choose a Location")
--- a/src/qml/Component/InvitationView.qml
+++ b/src/qml/Component/InvitationView.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 Kirigami.PlaceholderMessage {
    id: root

-    required property var currentRoom
+    required property NeoChatRoom currentRoom

    text: i18n("Accept this invitation?")
    RowLayout {
@@ -32,4 +32,4 @@ Kirigami.PlaceholderMessage {
            }
        }
    }
-}
+}
--- a/src/qml/Component/QuickSwitcher.qml
+++ b/src/qml/Component/QuickSwitcher.qml
@@ -89,7 +89,7 @@ QQC2.Dialog {
            delegate: Kirigami.BasicListItem {
                id: roomListItem

-                required property var currentRoom
+                required property NeoChatRoom currentRoom
                required property string displayName
                required property int index
                required property int notificationCount
--- a/src/qml/Component/Timeline/MessageEditComponent.qml
+++ b/src/qml/Component/Timeline/MessageEditComponent.qml
@@ -11,7 +11,7 @@ import org.kde.neochat 1.0
 QQC2.TextArea {
    id: root

-    property var room
+    property NeoChatRoom room
    onRoomChanged: room.chatBoxEditIdChanged.connect(updateEditText)

    property string messageId
--- a/src/qml/Component/TimelineView.qml
+++ b/src/qml/Component/TimelineView.qml
@@ -15,7 +15,7 @@ import org.kde.neochat 1.0

 QQC2.ScrollView {
    id: root
-    required property var currentRoom
+    required property NeoChatRoom currentRoom
    readonly property bool isLoaded: root.width * root.height > 10
    readonly property bool atYEnd: messageListView.atYEnd

--- a/src/qml/Dialog/ConfirmEncryptionDialog.qml
+++ b/src/qml/Dialog/ConfirmEncryptionDialog.qml
@@ -10,7 +10,7 @@ import org.kde.kirigami 2.15 as Kirigami
 QQC2.Dialog {
    id: confirmEncryptionDialog

-    property var room
+    property NeoChatRoom room

    ColumnLayout {
        Kirigami.Heading {
--- a/src/qml/Dialog/PowerLevelDialog.qml
+++ b/src/qml/Dialog/PowerLevelDialog.qml
@@ -13,7 +13,7 @@ Kirigami.OverlaySheet {
    id: root
    title: i18n("Edit user power level")

-    property var room
+    property NeoChatRoom room
    property var userId
    property int powerLevel

--- a/src/qml/Dialog/UserDetailDialog.qml
+++ b/src/qml/Dialog/UserDetailDialog.qml
@@ -15,7 +15,7 @@ Kirigami.OverlaySheet {

    signal closed()

-    property var room
+    property NeoChatRoom room
    property var user

    parent: applicationWindow().overlay
--- a/src/qml/Menu/Timeline/BanSheet.qml
+++ b/src/qml/Menu/Timeline/BanSheet.qml
@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
 Kirigami.Page {
    id: banSheet

-    property var room
+    property NeoChatRoom room
    property string userId

    title: i18n("Ban User")
--- a/src/qml/Menu/Timeline/RemoveSheet.qml
+++ b/src/qml/Menu/Timeline/RemoveSheet.qml
@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
 Kirigami.Page {
    id: deleteSheet

-    property var room
+    property NeoChatRoom room
    property string eventId

    property string userId: ""
--- a/src/qml/Menu/Timeline/ReportSheet.qml
+++ b/src/qml/Menu/Timeline/ReportSheet.qml
@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
 Kirigami.Page {
    id: reportSheet

-    property var room
+    property NeoChatRoom room
    property string eventId

    title: i18n("Report Message")
--- a/src/qml/Page/DevtoolsPage.qml
+++ b/src/qml/Page/DevtoolsPage.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 Kirigami.Page {
    id: devtoolsPage

-    property var room
+    property NeoChatRoom room

    title: i18n("Developer Tools")

--- a/src/qml/Page/InviteUserPage.qml
+++ b/src/qml/Page/InviteUserPage.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 Kirigami.ScrollablePage {
    id: root

-    property var room
+    property NeoChatRoom room

    title: i18n("Invite a User")

--- a/src/qml/Page/JoinRoomPage.qml
+++ b/src/qml/Page/JoinRoomPage.qml
@@ -28,7 +28,7 @@ Kirigami.ScrollablePage {
            Kirigami.SearchField {
                id: identifierField
                property bool isRoomAlias: text.match(/#(.+):(.+)/g)
-                property var room: isRoomAlias ? connection.roomByAlias(text) : null
+                property NeoChatRoom room: isRoomAlias ? connection.roomByAlias(text) : null
                property bool isJoined: room != null

                Layout.fillWidth: true
--- a/src/qml/Page/RoomList/CollapsedRoomDelegate.qml
+++ b/src/qml/Page/RoomList/CollapsedRoomDelegate.qml
@@ -16,7 +16,7 @@ import './' as RoomList
 QQC2.ItemDelegate {
    id: root

-    required property var currentRoom
+    required property NeoChatRoom currentRoom
    required property bool categoryVisible
    required property string filterText
    required property string avatar
--- a/src/qml/Page/RoomList/ContextMenu.qml
+++ b/src/qml/Page/RoomList/ContextMenu.qml
@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
 */
 Loader {
    id: root
-    property var room
+    property NeoChatRoom room
    signal closed()

    Component {
--- a/src/qml/Page/RoomList/RoomDelegate.qml
+++ b/src/qml/Page/RoomList/RoomDelegate.qml
@@ -19,7 +19,7 @@ Kirigami.BasicListItem {
    required property int index
    required property int notificationCount
    required property int highlightCount
-    required property var currentRoom
+    required property NeoChatRoom currentRoom
    required property bool categoryVisible
    required property string filterText
    required property string avatar
--- a/src/qml/Page/RoomList/SpaceListContextMenu.qml
+++ b/src/qml/Page/RoomList/SpaceListContextMenu.qml
@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
 */
 Loader {
    id: root
-    property var room
+    property NeoChatRoom room
    signal closed()

    Component {
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -16,7 +16,7 @@ Kirigami.Page {
    id: root

    /// Not readonly because of the separate window view.
-    property var currentRoom: RoomManager.currentRoom
+    property NeoChatRoom currentRoom: RoomManager.currentRoom
    property bool loading: !root.currentRoom || (root.currentRoom.timelineSize === 0 && !root.currentRoom.allHistoryLoaded)
    /// Used to determine if scrolling to the bottom should mark the message as unread
    property bool hasScrolledUpBefore: false;
--- a/src/qml/Page/RoomWindow.qml
+++ b/src/qml/Page/RoomWindow.qml
@@ -7,9 +7,11 @@ import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami

+import org.kde.neochat 1.0
+
 Kirigami.ApplicationWindow {
    id: window
-    required property var currentRoom
+    required property NeoChatRoom currentRoom
    minimumWidth: Kirigami.Units.gridUnit * 10
    minimumHeight: Kirigami.Units.gridUnit * 15

--- a/src/qml/Page/SearchPage.qml
+++ b/src/qml/Page/SearchPage.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 Kirigami.ScrollablePage {
    id: searchPage

-    property var currentRoom
+    property NeoChatRoom currentRoom

    title: i18nc("@action:title", "Search Messages")

--- a/src/qml/Panel/RoomDrawer.qml
+++ b/src/qml/Panel/RoomDrawer.qml
@@ -13,7 +13,7 @@ import org.kde.neochat 1.0

 Kirigami.OverlayDrawer {
    id: roomDrawer
-    readonly property var room: RoomManager.currentRoom
+    readonly property NeoChatRoom room: RoomManager.currentRoom

    width: actualWidth

--- a/src/qml/RoomSettings/Categories.qml
+++ b/src/qml/RoomSettings/Categories.qml
@@ -7,7 +7,7 @@ import QtQuick.Layouts 1.15

 Kirigami.CategorizedSettings {
    id: root
-    property var room
+    property NeoChatRoom room

    objectName: "settingsPage"
    actions: [
--- a/src/qml/RoomSettings/General.qml
+++ b/src/qml/RoomSettings/General.qml
@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
 Kirigami.ScrollablePage {
    id: root

-    property var room
+    property NeoChatRoom room

    title: i18n("General")

--- a/src/qml/RoomSettings/Permissions.qml
+++ b/src/qml/RoomSettings/Permissions.qml
@@ -14,7 +14,7 @@ import org.kde.neochat 1.0
 Kirigami.ScrollablePage {
    id: root

-    property var room
+    property NeoChatRoom room

    title: i18nc('@title:window', 'Permissions')

--- a/src/qml/RoomSettings/PushNotification.qml
+++ b/src/qml/RoomSettings/PushNotification.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0

 Kirigami.ScrollablePage {

-    property var room
+    property NeoChatRoom room

    title: i18nc('@title:window', 'Notifications')

--- a/src/qml/RoomSettings/Security.qml
+++ b/src/qml/RoomSettings/Security.qml
@@ -13,7 +13,7 @@ import org.kde.neochat 1.0
 Kirigami.ScrollablePage {
    id: root

-    property var room
+    property NeoChatRoom room
    property string needUpgradeRoom: i18n("You need to upgrade this room to a newer version to enable this setting.")

    title: i18n("Security")