From 968e3fc23be44ce68f8741be9abc4039242f1a0d Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Fri, 26 Apr 2024 22:59:06 +0200
Subject: [PATCH] Cleanup Main.qml

---
 src/qml/Main.qml | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/qml/Main.qml b/src/qml/Main.qml
index d5d163c4e..40f268849 100644
--- a/src/qml/Main.qml
+++ b/src/qml/Main.qml
@@ -107,7 +107,7 @@ Kirigami.ApplicationWindow {
         target: RoomManager
 
         function onAskJoinRoom(room) {
-            joinRoomDialog.createObject(applicationWindow(), {
+            Qt.createComponent("org.kde.neochat", "JoinRoomDialog").createObject(applicationWindow(), {
                 room: room,
                 connection: root.connection
             }).open();
@@ -290,12 +290,6 @@ Kirigami.ApplicationWindow {
         }
     }
 
-    Component {
-        id: keyVerificationDialogComponent
-        KeyVerificationDialog {}
-    }
-
-
     Connections {
         target: root.connection
 
@@ -303,7 +297,7 @@ Kirigami.ApplicationWindow {
             RoomManager.resolveResource(directChat.id);
         }
         function onNewKeyVerificationSession(session) {
-            applicationWindow().pageStack.pushDialogLayer(keyVerificationDialogComponent, {
+            applicationWindow().pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "KeyVerificationDialog"), {
                 session: session
             }, {
                 title: i18nc("@title:window", "Session Verification")
@@ -354,11 +348,6 @@ Kirigami.ApplicationWindow {
         }
     }
 
-    Component {
-        id: joinRoomDialog
-        JoinRoomDialog {}
-    }
-
     Component {
         id: askDirectChatConfirmationComponent
 
@@ -449,7 +438,7 @@ Kirigami.ApplicationWindow {
         })
     }
     function showUserDetail(user) {
-        userDetailDialog.createObject(root.QQC2.ApplicationWindow.window, {
+        Qt.createComponent("org.kde.neochat", "UserDetailDialog").createObject(root.QQC2.ApplicationWindow.window, {
             room: RoomManager.currentRoom ? RoomManager.currentRoom : null,
             user: RoomManager.currentRoom ? RoomManager.currentRoom.getUser(user.id) : QmlUtils.getUser(user),
             connection: root.connection
@@ -464,9 +453,4 @@ Kirigami.ApplicationWindow {
         });
         roomPage.forceActiveFocus();
     }
-
-    Component {
-        id: userDetailDialog
-        UserDetailDialog {}
-    }
 }