From 725c6c30ce7deb7816d0edff427d9f0ad1d2a156 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Sun, 27 Aug 2023 16:17:56 +0000
Subject: [PATCH] Get KF6 Working

Minimal set of changes so that a compiled version of NeoChat on KF6 will run and at least be functional.
---
 src/qml/Page/ImageEditorPage.qml      | 10 +++++-----
 src/qml/Page/JoinRoomPage.qml         |  4 ++--
 src/qml/Page/RoomPage.qml             |  6 +++---
 src/qml/RoomDrawer/RoomDrawerPage.qml |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/qml/Page/ImageEditorPage.qml b/src/qml/Page/ImageEditorPage.qml
index ad3c9c402..355259fbd 100644
--- a/src/qml/Page/ImageEditorPage.qml
+++ b/src/qml/Page/ImageEditorPage.qml
@@ -31,15 +31,15 @@ Kirigami.Page {
         imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
     }
 
-    actions {
-        left: Kirigami.Action {
+    actions: [
+        Kirigami.Action {
             id: undoAction
             text: i18nc("@action:button Undo modification", "Undo")
             icon.name: "edit-undo"
             onTriggered: imageDoc.undo();
             visible: imageDoc.edited
-        }
-        main: Kirigami.Action {
+        },
+        Kirigami.Action {
             id: okAction
             text: i18nc("@action:button Accept image modification", "Accept")
             icon.name: "dialog-ok"
@@ -54,7 +54,7 @@ Kirigami.Page {
                 }
             }
         }
-    }
+    ]
 
 
 
diff --git a/src/qml/Page/JoinRoomPage.qml b/src/qml/Page/JoinRoomPage.qml
index 9125d3dbb..a0bff0de5 100644
--- a/src/qml/Page/JoinRoomPage.qml
+++ b/src/qml/Page/JoinRoomPage.qml
@@ -122,10 +122,10 @@ Kirigami.ScrollablePage {
 
                     title: i18nc("@title:window", "Add server")
 
-                    onSheetOpenChanged: if (!serverUrlField.isValidServer && !sheetOpen) {
+                    onOpened: if (!serverUrlField.isValidServer && !opened) {
                             serverField.currentIndex = 0
                             server = serverField.currentValue
-                        } else if (sheetOpen) {
+                        } else if (opened) {
                             serverUrlField.forceActiveFocus()
                         }
 
diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml
index cc76772e8..aa68bf3d7 100644
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -27,13 +27,13 @@ Kirigami.Page {
     focus: true
     padding: 0
 
-    actions {
-        main: Kirigami.Action {
+    actions: [
+        Kirigami.Action {
             visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode
             icon.name: "view-right-new"
             onTriggered: applicationWindow().openRoomDrawer()
         }
-    }
+    ]
 
     KeyNavigation.left: pageStack.get(0)
 
diff --git a/src/qml/RoomDrawer/RoomDrawerPage.qml b/src/qml/RoomDrawer/RoomDrawerPage.qml
index 25009c866..bb7bc1489 100644
--- a/src/qml/RoomDrawer/RoomDrawerPage.qml
+++ b/src/qml/RoomDrawer/RoomDrawerPage.qml
@@ -31,12 +31,12 @@ Kirigami.ScrollablePage {
 
     title: roomInformation.title
 
-    actions {
-        main: Kirigami.Action {
+    actions: [
+        Kirigami.Action {
             icon.name: "settings-configure"
             onTriggered: applicationWindow().pageStack.pushDialogLayer('qrc:/Categories.qml', {room: root.room}, { title: i18n("Room Settings") })
         }
-    }
+    ]
 
     RoomInformation {
         id: roomInformation