From e05e0f54899d72295986c53bcb46d311e5fc46ef Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Wed, 30 Aug 2023 19:12:11 +0200
Subject: [PATCH] Improve QML types

---
 src/qml/Dialog/ConfirmDeactivateAccountDialog.qml | 2 +-
 src/qml/Dialog/ConfirmLogout.qml                  | 2 +-
 src/qml/Page/JoinRoomPage.qml                     | 3 ++-
 src/qml/Page/RoomList/UserInfo.qml                | 2 +-
 src/qml/Page/StartChatPage.qml                    | 2 +-
 src/qml/Settings/DevicesPage.qml                  | 5 ++++-
 src/qml/Settings/SettingsPage.qml                 | 4 +++-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml b/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml
index 5de4a225e..2dfd9b9fd 100644
--- a/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml
+++ b/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml
@@ -14,7 +14,7 @@ import org.kde.neochat 1.0
 FormCard.FormCardPage {
     id: root
 
-    property var connection
+    required property NeoChatConnection connection
 
     title: i18nc("@title", "Deactivate Account")
 
diff --git a/src/qml/Dialog/ConfirmLogout.qml b/src/qml/Dialog/ConfirmLogout.qml
index 15eb1c7e8..952ebcd54 100644
--- a/src/qml/Dialog/ConfirmLogout.qml
+++ b/src/qml/Dialog/ConfirmLogout.qml
@@ -11,7 +11,7 @@ import org.kde.neochat 1.0
 QQC2.Dialog {
     id: root
 
-    property var connection
+    required property NeoChatConnection connection
 
     ColumnLayout {
         Kirigami.Heading {
diff --git a/src/qml/Page/JoinRoomPage.qml b/src/qml/Page/JoinRoomPage.qml
index 9125d3dbb..ce6944340 100644
--- a/src/qml/Page/JoinRoomPage.qml
+++ b/src/qml/Page/JoinRoomPage.qml
@@ -14,7 +14,8 @@ import org.kde.neochat 1.0
 
 Kirigami.ScrollablePage {
     id: root
-    property var connection
+
+    required property NeoChatConnection connection
 
     property alias keyword: identifierField.text
     property string server
diff --git a/src/qml/Page/RoomList/UserInfo.qml b/src/qml/Page/RoomList/UserInfo.qml
index 75832fe00..9c7dc7c80 100644
--- a/src/qml/Page/RoomList/UserInfo.qml
+++ b/src/qml/Page/RoomList/UserInfo.qml
@@ -100,7 +100,7 @@ QQC2.ToolBar {
             delegate: Delegates.RoundedItemDelegate {
                 id: userDelegate
 
-                required property var connection
+                required property NeoChatConnection connection
 
                 width: parent.width
                 text: connection.localUser.displayName
diff --git a/src/qml/Page/StartChatPage.qml b/src/qml/Page/StartChatPage.qml
index e0bb7b2bf..5493eb09e 100644
--- a/src/qml/Page/StartChatPage.qml
+++ b/src/qml/Page/StartChatPage.qml
@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
 Kirigami.ScrollablePage {
     id: root
 
-    property var connection
+    property NeoChatConnection connection
 
     title: i18n("Start a Chat")
 
diff --git a/src/qml/Settings/DevicesPage.qml b/src/qml/Settings/DevicesPage.qml
index 1b43e6c82..d9ad558ac 100644
--- a/src/qml/Settings/DevicesPage.qml
+++ b/src/qml/Settings/DevicesPage.qml
@@ -12,15 +12,18 @@ import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
 import org.kde.neochat 1.0
 
 Kirigami.ScrollablePage {
+    id: root
+
     title: i18n("Devices")
 
-    property alias connection: devicesModel.connection
+    required property NeoChatConnection connection
 
     leftPadding: 0
     rightPadding: 0
 
     DevicesModel {
         id: devicesModel
+        connection: root.connection
     }
 
     ColumnLayout {
diff --git a/src/qml/Settings/SettingsPage.qml b/src/qml/Settings/SettingsPage.qml
index e017ca6d6..b3529b877 100644
--- a/src/qml/Settings/SettingsPage.qml
+++ b/src/qml/Settings/SettingsPage.qml
@@ -6,10 +6,12 @@ import org.kde.kirigami 2.18 as Kirigami
 import org.kde.kirigamiaddons.settings 1.0 as KirigamiSettings
 import QtQuick.Layouts 1.15
 
+import org.kde.neochat 1.0
+
 KirigamiSettings.CategorizedSettings {
     id: settingsPage
 
-    required property var connection
+    required property NeoChatConnection connection
 
     objectName: "settingsPage"
     actions: [