Remove QML import versions

src/qml/Component/AvatarTabButton.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Templates 2.15 as T
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.kirigamiaddons.delegates 1.0 as Delegates
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
+import QtQuick.Templates as T
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 Delegates.RoundedItemDelegate {
     id: root
@@ -37,4 +37,4 @@ Delegates.RoundedItemDelegate {
         source: root.source
         name: root.text
     }
-}
+}

src/qml/Component/ChatBox/AttachmentPane.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 as QQC2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 ColumnLayout {
     id: root

src/qml/Component/ChatBox/ChatBar.qml

@@ -2,14 +2,14 @@
 // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Window 2.15
-import Qt.labs.platform 1.1 as Platform
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
+import QtQuick.Window
+import Qt.labs.platform as Platform
 
 import org.kde.kirigami as Kirigami
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief The component which handles the message sending.

src/qml/Component/ChatBox/ChatBox.qml

@@ -2,11 +2,11 @@
 // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 /**
  * @brief A component for typing and sending chat messages.

src/qml/Component/ChatBox/CompletionMenu.qml

@@ -2,16 +2,16 @@
 // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 as QQC2
-import Qt.labs.qmlmodels 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
+import Qt.labs.qmlmodels
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.delegates 1.0 as Delegates
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.Popup {
     id: root

src/qml/Component/ChatBox/LocationChooser.qml

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtLocation 5.15
-import QtPositioning 5.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
+import QtPositioning
 
-import org.kde.kirigamiaddons.labs.components 1.0 as Components
+import org.kde.kirigamiaddons.labs.components as Components
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Components.AbstractMaximizeComponent {
     id: root

src/qml/Component/ChatBox/PieProgressBar.qml

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
+import QtQuick
 
-import org.kde.kirigami 2.18 as Kirigami
-import org.kde.quickcharts 1.0 as Charts
+import org.kde.kirigami as Kirigami
+import org.kde.quickcharts as Charts
 
 /**
  * @brief A circular progress bar that fills an arc as progress goes up.

src/qml/Component/ChatBox/QuickFormatBar.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
 QQC2.Popup {
     id: root

src/qml/Component/ChatBox/ReplyPane.qml

@@ -2,14 +2,14 @@
 // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 as QQC2
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 GridLayout {
     id: root

src/qml/Component/Devtools/RoomData.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-import org.kde.kitemmodels 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.kitemmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 ColumnLayout {
     id: root

src/qml/Component/Devtools/ServerData.qml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-import org.kde.kitemmodels 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.kitemmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 ColumnLayout {
     id: root

src/qml/Component/Emoji/EmojiDelegate.qml

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import org.kde.kirigami 2.20 as Kirigami
+import QtQuick
+import QtQuick.Controls as QQC2
+import org.kde.kirigami as Kirigami
 
 QQC2.ItemDelegate {
     id: root

src/qml/Component/Emoji/EmojiGrid.qml

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.neochat 1.0
+import QtQuick
+import QtQuick.Controls as QQC2
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 QQC2.ScrollView {
     id: root

src/qml/Component/Emoji/EmojiPicker.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.neochat 1.0
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 ColumnLayout {
     id: root

src/qml/Component/Emoji/EmojiTonesPicker.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import org.kde.kirigami 2.20 as Kirigami
+import QtQuick
+import QtQuick.Controls as QQC2
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.Popup {
     id: root

src/qml/Component/FancyEffectsContainer.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2021 Alexey Andreyev <aa13q@ya.ru>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Particles 2.15
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Particles
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
 Item {
     id: root

src/qml/Component/FullScreenMap.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtLocation 5.15
-import QtPositioning 5.15
+import QtQuick
+import QtQuick.Controls
+import QtLocation
+import QtPositioning
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
 ApplicationWindow {
     id: root

src/qml/Component/HoverActions.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 /**
  * @brief A component that provides a set of actions when a message is hovered in the timeline.

src/qml/Component/InvitationView.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.PlaceholderMessage {
     id: root

src/qml/Component/LocationMapItem.qml

@@ -2,16 +2,16 @@
 // SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtLocation 5.15
-import QtPositioning 5.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
+import QtPositioning
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /** Location marker for any of the shared location maps. */
 MapQuickItem {

src/qml/Component/LocationPage.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtLocation 5.15
-import QtPositioning 5.15
+import QtQuick
+import QtLocation
+import QtPositioning
 
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 Kirigami.Page {
     id: root

src/qml/Component/Login/Captcha.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.14
-import QtQuick.Layouts 1.14
-import QtWebView 1.15
+import QtQuick
+import QtQuick.Layouts
+import QtWebView
 
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Email.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Homeserver.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Loading.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Login.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/LoginMethod.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/LoginRegister.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/LoginStep.qml

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.14
-import QtQuick.Controls 2.14 as QQC2
-import QtQuick.Layouts 1.14
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
 /// Step for the login/registration flow
 ColumnLayout {

src/qml/Component/Login/Password.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/RegisterPassword.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
+import QtQuick
 
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Sso.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Terms.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.12
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/Login/Username.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
+import QtQuick
 
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 LoginStep {
     id: root

src/qml/Component/NeochatMaximizeComponent.qml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import Qt.labs.platform 1.1 as Platform
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.platform as Platform
 
-import org.kde.kirigami 2.13 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as Components
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as Components
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Components.AlbumMaximizeComponent {
     id: root

src/qml/Component/QuickSwitcher.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.kitemmodels 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.kitemmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 import './RoomList' as RoomList
 
 QQC2.Dialog {

src/qml/Component/ShimmerGradient.qml

@@ -4,8 +4,8 @@
 // Not to be confused with the Shimmer project.
 // I like their gradiented GTK themes though.
 
-import QtQuick 2.15
-import org.kde.kirigami 2.15 as Kirigami
+import QtQuick
+import org.kde.kirigami as Kirigami
 
 Gradient {
     id: root

src/qml/Component/Timeline/AudioDelegate.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 import QtMultimedia
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for an audio message.

src/qml/Component/Timeline/AvatarFlow.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
+import QtQuick
+import QtQuick.Controls as QQC2
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 Flow {
     id: root

src/qml/Component/Timeline/EncryptedDelegate.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for an encrypted message that can't be decrypted.

src/qml/Component/Timeline/EventDelegate.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import Qt.labs.qmlmodels 1.0
+import Qt.labs.qmlmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 DelegateChooser {
     id: root

src/qml/Component/Timeline/FileDelegate.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.platform
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for an file message.

src/qml/Component/Timeline/ImageDelegate.qml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml.Models 2.15
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import QtQml.Models
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for an image message.

src/qml/Component/Timeline/LinkPreviewDelegate.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Loader {
     id: root

src/qml/Component/Timeline/LiveLocationDelegate.qml

@@ -2,14 +2,13 @@
 // SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtLocation 5.15
-import QtPositioning 5.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
+import QtPositioning
 
-
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for a location message.

src/qml/Component/Timeline/LocationDelegate.qml

@@ -1,14 +1,13 @@
 // SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtLocation 5.15
-import QtPositioning 5.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtLocation
+import QtPositioning
 
-
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for a location message.

src/qml/Component/Timeline/MessageDelegate.qml

@@ -1,14 +1,15 @@
 // SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.qmlmodels
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief The base delegate for all messages in the timeline.

src/qml/Component/Timeline/MessageEditComponent.qml

@@ -1,12 +1,13 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
-import org.kde.neochat 1.0
+
+import org.kde.neochat
 
 QQC2.TextArea {
     id: root

src/qml/Component/Timeline/MimeComponent.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
 RowLayout {
     property alias mimeIconSource: icon.source

src/qml/Component/Timeline/PollDelegate.qml

@@ -1,13 +1,12 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt.labs.platform
 
-
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for a poll message.

src/qml/Component/Timeline/ReactionDelegate.qml

@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
+import QtQuick
+import QtQuick.Controls as QQC2
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
 Flow {
     id: root

src/qml/Component/Timeline/ReadMarkerDelegate.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import Qt.labs.qmlmodels 1.0
-import org.kde.kirigami 2.15 as Kirigami
+import Qt.labs.qmlmodels
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 TimelineDelegate {
     id: root

src/qml/Component/Timeline/ReplyComponent.qml

@@ -2,14 +2,14 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A component to show a message that has been replied to.

src/qml/Component/Timeline/RichLabel.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.neochat 1.0
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.neochat
+import org.kde.kirigami as Kirigami
 
 /**
  * @brief A component to show the rich display text of text message.

src/qml/Component/Timeline/SectionDelegate.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.ItemDelegate {
     id: root

src/qml/Component/Timeline/StateComponent.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A component for visualising a single state event

src/qml/Component/Timeline/StateDelegate.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for visualising an aggregated list of consecutive state events.

src/qml/Component/Timeline/TimelineContainer.qml

@@ -0,0 +1,662 @@
+// SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
+
+import org.kde.neochat
+
+/**
+ * @brief The base delegate for all messages in the timeline.
+ *
+ * This supports a message bubble plus sender avatar for each message as well as reactions
+ * and read markers. A date section can be show for when the message is on a different
+ * day to the previous one.
+ *
+ * The component is designed for all messages, positioning them in the timeline with
+ * variable padding depending on the window width. Local user messages are highlighted
+ * and can also be aligned to the right if configured.
+ *
+ * This component also supports a compact mode where the padding is adjusted, the
+ * background is hidden and the delegate spans the full width of the timeline.
+ */
+ColumnLayout {
+    id: root
+
+    /**
+     * @brief The index of the delegate in the model.
+     */
+    required property var index
+
+    /**
+     * @brief The matrix ID of the message event.
+     */
+    required property string eventId
+
+    /**
+     * @brief The timestamp of the message.
+     */
+    required property var time
+
+    /**
+     * @brief The timestamp of the message as a string.
+     */
+    required property string timeString
+
+    /**
+     * @brief The message author.
+     *
+     * This should consist of the following:
+     *  - id - The matrix ID of the author.
+     *  - isLocalUser - Whether the author is the local user.
+     *  - avatarSource - The mxc URL for the author's avatar in the current room.
+     *  - avatarMediaId - The media ID of the author's avatar.
+     *  - avatarUrl - The mxc URL for the author's avatar.
+     *  - displayName - The display name of the author.
+     *  - display - The name of the author.
+     *  - color - The color for the author.
+     *  - object - The Quotient::User object for the author.
+     *
+     * @sa Quotient::User
+     */
+    required property var author
+
+    /**
+     * @brief Whether the author should be shown.
+     */
+    required property bool showAuthor
+
+    /**
+     * @brief Whether the author should always be shown.
+     *
+     * This is primarily used when these delegates are used in a filtered list of
+     * events rather than a sequential timeline, e.g. the media model view.
+     *
+     * @note This setting still respects the avatar configuration settings.
+     */
+    property bool alwaysShowAuthor: false
+
+    /**
+     * @brief The delegate type of the message.
+     */
+    required property int delegateType
+
+    /**
+     * @brief The display text of the message.
+     */
+    required property string display
+
+    /**
+     * @brief The display text of the message as plain text.
+     */
+    required property string plainText
+
+    /**
+     * @brief The date of the event as a string.
+     */
+    required property string section
+
+    /**
+     * @brief Whether the section header should be shown.
+     */
+    required property bool showSection
+
+    /**
+     * @brief A model with the reactions to the message in.
+     */
+    required property var reaction
+
+    /**
+     * @brief Whether the reaction component should be shown.
+     */
+    required property bool showReactions
+
+    /**
+     * @brief A model with the first 5 other user read markers for this message.
+     */
+    required property var readMarkers
+
+    /**
+     * @brief String with the display name and matrix ID of the other user read markers.
+     */
+    required property string readMarkersString
+
+    /**
+     * @brief The number of other users at the event after the first 5.
+     */
+    required property var excessReadMarkers
+
+    /**
+     * @brief Whether the other user read marker component should be shown.
+     */
+    required property bool showReadMarkers
+
+    /**
+     * @brief The matrix ID of the reply event.
+     */
+    required property var replyId
+
+    /**
+     * @brief The reply author.
+     *
+     * This should consist of the following:
+     *  - id - The matrix ID of the reply author.
+     *  - isLocalUser - Whether the reply author is the local user.
+     *  - avatarSource - The mxc URL for the reply author's avatar in the current room.
+     *  - avatarMediaId - The media ID of the reply author's avatar.
+     *  - avatarUrl - The mxc URL for the reply author's avatar.
+     *  - displayName - The display name of the reply author.
+     *  - display - The name of the reply author.
+     *  - color - The color for the reply author.
+     *  - object - The Quotient::User object for the reply author.
+     *
+     * @sa Quotient::User
+     */
+    required property var replyAuthor
+
+    /**
+     * @brief The delegate type of the message replied to.
+     */
+    required property int replyDelegateType
+
+    /**
+     * @brief The display text of the message replied to.
+     */
+    required property string replyDisplay
+
+    /**
+     * @brief The media info for the reply event.
+     *
+     * This could be an image, audio, video or file.
+     *
+     * This should consist of the following:
+     *  - source - The mxc URL for the media.
+     *  - mimeType - The MIME type of the media.
+     *  - mimeIcon - The MIME icon name.
+     *  - size - The file size in bytes.
+     *  - duration - The length in seconds of the audio media (audio/video only).
+     *  - width - The width in pixels of the audio media (image/video only).
+     *  - height - The height in pixels of the audio media (image/video only).
+     *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads (image/video only).
+     */
+    required property var replyMediaInfo
+
+    /**
+     * @brief Whether this message is replying to another.
+     */
+    required property bool isReply
+
+    /**
+     * @brief Whether this message has a local user mention.
+     */
+    required property bool isHighlighted
+
+    /**
+     * @brief Whether an event is waiting to be accepted by the server.
+     */
+    required property bool isPending
+
+    /**
+     * @brief Progress info when downloading files.
+     *
+     * @sa Quotient::FileTransferInfo
+     */
+    required property var progressInfo
+
+    /**
+     * @brief Whether an encrypted message is sent in a verified session.
+     */
+    required property bool verified
+
+    /**
+     * @brief The full message source JSON.
+     */
+    required property var jsonSource
+
+    /**
+     * @brief The x position of the message bubble.
+     *
+     * @note Used for positioning the hover actions.
+     */
+    readonly property real bubbleX: bubble.x + bubble.anchors.leftMargin
+
+    /**
+     * @brief The y position of the message bubble.
+     *
+     * @note Used for positioning the hover actions.
+     */
+    readonly property alias bubbleY: mainContainer.y
+
+    /**
+     * @brief The width of the message bubble.
+     *
+     * @note Used for sizing the hover actions.
+     */
+    readonly property alias bubbleWidth: bubble.width
+
+    /**
+     * @brief Whether this message is hovered.
+     */
+    readonly property alias hovered: bubble.hovered
+
+    required property NeoChatConnection connection
+
+    /**
+     * @brief Open the context menu for the message.
+     */
+    signal openContextMenu
+
+    /**
+     * @brief Open the any message media externally.
+     */
+    signal openExternally()
+
+    /**
+     * @brief The reply has been clicked.
+     */
+    signal replyClicked(string eventID)
+
+    onReplyClicked: eventID => ListView.view.goToEvent(eventID)
+
+    /**
+     * @brief The component to display the delegate type.
+     *
+     * This is used by the inherited delegates to assign a component to visualise
+     * the message content for that delegate type.
+     */
+    default property alias innerObject : column.children
+
+    /**
+     * @brief Whether the bubble background is enabled.
+     */
+    property bool cardBackground: true
+
+    /**
+     * @brief Whether the delegate should always stretch to the maximum availabel width.
+     */
+    property bool alwaysMaxWidth: false
+
+    /**
+     * @brief Whether local user messages should be aligned right.
+     *
+     * TODO: make private
+     */
+    property bool showUserMessageOnRight: Config.showLocalMessagesOnRight && root.author.isLocalUser && !Config.compactLayout && !alwaysMaxWidth
+
+    /**
+     * @brief Whether the message should be highlighted.
+     */
+    property bool showHighlight: root.isHighlighted || isTemporaryHighlighted
+
+    /**
+     * @brief Whether the message should temporarily be highlighted.
+     *
+     * Normally triggered when jumping to the event in the timeline, e.g. when a reply
+     * is clicked.
+     */
+    property bool isTemporaryHighlighted: false
+
+    onIsTemporaryHighlightedChanged: if (isTemporaryHighlighted) temporaryHighlightTimer.start()
+
+    Timer {
+        id: temporaryHighlightTimer
+
+        interval: 1500
+        onTriggered: isTemporaryHighlighted = false
+    }
+
+    readonly property int contentMaxWidth: bubbleSizeHelper.currentWidth
+
+    width: parent ? timelineDelegateSizeHelper.currentWidth : 0
+    spacing: Kirigami.Units.smallSpacing
+
+    state: Config.compactLayout || root.alwaysMaxWidth ? "alignLeft" : "alignCenter"
+    // Align left when in compact mode and center when using bubbles
+    states: [
+        State {
+            name: "alignLeft"
+            AnchorChanges {
+                target: root
+                anchors.horizontalCenter: undefined
+                anchors.left: parent ? parent.left : undefined
+            }
+        },
+        State {
+            name: "alignCenter"
+            AnchorChanges {
+                target: root
+                anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
+                anchors.left: undefined
+            }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic}
+        }
+    ]
+
+    SectionDelegate {
+        id: sectionDelegate
+        Layout.fillWidth: true
+        visible: root.showSection
+        labelText: root.section
+        colorSet: Config.compactLayout || root.alwaysMaxWidth ? Kirigami.Theme.View : Kirigami.Theme.Window
+    }
+
+    QQC2.ItemDelegate {
+        id: mainContainer
+
+        Layout.fillWidth: true
+        Layout.topMargin: root.showAuthor || root.alwaysShowAuthor ? Kirigami.Units.largeSpacing : (Config.compactLayout ? 1 : Kirigami.Units.smallSpacing)
+        Layout.leftMargin: Kirigami.Units.smallSpacing
+        Layout.rightMargin: Kirigami.Units.smallSpacing
+
+        implicitHeight: Math.max(root.showAuthor || root.alwaysShowAuthor ? avatar.implicitHeight : 0, bubble.height)
+
+        Component.onCompleted: {
+            if (root.isReply && root.replyDelegateType === DelegateType.Other) {
+                currentRoom.loadReply(root.eventId, root.replyId)
+            }
+        }
+
+        // show hover actions
+        onHoveredChanged: {
+            if (hovered && !Kirigami.Settings.isMobile) {
+                root.setHoverActionsToDelegate()
+            }
+        }
+
+        KirigamiComponents.Avatar {
+            id: avatar
+            width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2: 0
+            height: width
+            anchors {
+                left: parent.left
+                leftMargin: Kirigami.Units.smallSpacing
+                top: parent.top
+                topMargin: Kirigami.Units.smallSpacing
+            }
+
+            visible: (root.showAuthor || root.alwaysShowAuthor) &&
+                Config.showAvatarInTimeline &&
+                (Config.compactLayout || !showUserMessageOnRight)
+            name: root.author.displayName
+            source: root.author.avatarSource
+            color: root.author.color
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    RoomManager.visitUser(root.author.object, "mention")
+                }
+                cursorShape: Qt.PointingHandCursor
+            }
+        }
+
+        QQC2.Control {
+            id: bubble
+            topPadding: Config.compactLayout ? Kirigami.Units.smallSpacing / 2 : Kirigami.Units.largeSpacing
+            bottomPadding: Config.compactLayout ? Kirigami.Units.mediumSpacing / 2 : Kirigami.Units.largeSpacing
+            leftPadding: Config.compactLayout ? 0 : Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
+            rightPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
+            hoverEnabled: true
+
+            anchors {
+                left: avatar.right
+                leftMargin: Kirigami.Units.largeSpacing
+                rightMargin: Kirigami.Units.largeSpacing
+            }
+            // HACK: anchoring didn't reset anchors.right when switching from parent.right to undefined reliably
+            width: Config.compactLayout || root.alwaysMaxWidth ? mainContainer.width - (Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0) + Kirigami.Units.largeSpacing * 2 : implicitWidth
+
+            state: showUserMessageOnRight ? "userMessageOnRight" : "userMessageOnLeft"
+            // states for anchor animations on window resize
+            // as setting anchors to undefined did not work reliably
+            states: [
+                State {
+                    name: "userMessageOnRight"
+                    AnchorChanges {
+                        target: bubble
+                        anchors.left: undefined
+                        anchors.right: parent.right
+                    }
+                },
+                State {
+                    name: "userMessageOnLeft"
+                    AnchorChanges {
+                        target: bubble
+                        anchors.left: avatar.right
+                        anchors.right: undefined
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic}
+                }
+            ]
+
+            contentItem: RowLayout {
+                Kirigami.Icon {
+                    source: "content-loading-symbolic"
+                    width: height
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.small
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.small
+                    visible: root.isPending && Config.showLocalMessagesOnRight
+                }
+                ColumnLayout {
+                    id: column
+                    spacing: Kirigami.Units.smallSpacing
+                    RowLayout {
+                        id: rowLayout
+
+                        spacing: Kirigami.Units.smallSpacing
+                        visible: root.showAuthor || root.alwaysShowAuthor
+
+                        QQC2.Label {
+                            id: nameLabel
+
+                            Layout.maximumWidth: contentMaxWidth - timeLabel.implicitWidth - rowLayout.spacing
+
+                            text: visible ? root.author.displayName : ""
+                            textFormat: Text.PlainText
+                            font.weight: Font.Bold
+                            color: root.author.color
+                            elide: Text.ElideRight
+                            MouseArea {
+                                anchors.fill: parent
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: {
+                                    RoomManager.visitUser(root.author.object, "mention")
+                                }
+                            }
+                        }
+                        QQC2.Label {
+                            id: timeLabel
+
+                            text: root.timeString
+                            color: Kirigami.Theme.disabledTextColor
+                            QQC2.ToolTip.visible: hoverHandler.hovered
+                            QQC2.ToolTip.text: root.time.toLocaleString(Qt.locale(), Locale.LongFormat)
+                            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+
+                            HoverHandler {
+                                id: hoverHandler
+                            }
+                        }
+                    }
+                    Loader {
+                        id: replyLoader
+
+                        Layout.maximumWidth: contentMaxWidth
+
+                        active: root.isReply && root.replyDelegateType !== DelegateType.Other
+                        visible: active
+
+                        sourceComponent: ReplyComponent {
+                            author: root.replyAuthor
+                            type: root.replyDelegateType
+                            display: root.replyDisplay
+                            mediaInfo: root.replyMediaInfo
+                            contentMaxWidth: bubbleSizeHelper.currentWidth
+                        }
+
+                        Connections {
+                            target: replyLoader.item
+                            function onReplyClicked() {
+                                replyClicked(root.replyId)
+                            }
+                        }
+                    }
+                }
+                Kirigami.Icon {
+                    source: "content-loading-symbolic"
+                    width: height
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.small
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.small
+                    visible: root.isPending && !Config.showLocalMessagesOnRight
+                }
+            }
+
+            background: Item {
+                Kirigami.ShadowedRectangle {
+                    id: bubbleBackground
+                    visible: cardBackground && !Config.compactLayout
+                    anchors.fill: parent
+                    Kirigami.Theme.colorSet: Kirigami.Theme.View
+                    Kirigami.Theme.inherit: false
+                    color: if (root.author.isLocalUser) {
+                        return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
+                    } else if (root.showHighlight) {
+                        return Kirigami.Theme.positiveBackgroundColor
+                    } else {
+                        return Kirigami.Theme.backgroundColor
+                    }
+                    radius: Kirigami.Units.smallSpacing
+                    shadow {
+                        size:  Kirigami.Units.smallSpacing
+                        color: root.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
+                    }
+
+                    Behavior on color {
+                        ColorAnimation { duration: Kirigami.Units.shortDuration }
+                    }
+                }
+            }
+        }
+
+        background: Rectangle {
+            visible: mainContainer.hovered && (Config.compactLayout || root.alwaysMaxWidth)
+            color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
+            radius: Kirigami.Units.smallSpacing
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.RightButton
+            onTapped: root.openContextMenu()
+        }
+
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onLongPressed: root.openContextMenu()
+        }
+    }
+
+    ReactionDelegate {
+        Layout.maximumWidth: root.width - Kirigami.Units.largeSpacing * 2
+        Layout.alignment: showUserMessageOnRight ? Qt.AlignRight : Qt.AlignLeft
+        Layout.leftMargin: showUserMessageOnRight ? 0 : bubble.x + bubble.anchors.leftMargin
+        Layout.rightMargin: showUserMessageOnRight ? Kirigami.Units.largeSpacing : 0
+
+        visible: root.showReactions
+        model: root.reaction
+
+        onReactionClicked: (reaction) => currentRoom.toggleReaction(root.eventId, reaction)
+    }
+    AvatarFlow {
+        Layout.alignment: Qt.AlignRight
+        Layout.rightMargin: Kirigami.Units.largeSpacing
+        visible: root.showReadMarkers
+        model: root.readMarkers
+        toolTipText: root.readMarkersString
+        excessAvatars: root.excessReadMarkers
+    }
+
+    function isVisibleInTimeline() {
+        let yoff = Math.round(y - ListView.view.contentY);
+        return (yoff + height > 0 && yoff < ListView.view.height)
+    }
+
+    Component {
+        id: messageDelegateContextMenu
+        MessageDelegateContextMenu {}
+    }
+
+    Component {
+        id: fileDelegateContextMenu
+        FileDelegateContextMenu {}
+    }
+
+    /// Open message context dialog for file and videos
+    function openFileContext(file) {
+        const contextMenu = fileDelegateContextMenu.createObject(root, {
+            author: root.author,
+            eventId: root.eventId,
+            eventSource: root.jsonSource,
+            file: file,
+            progressInfo: root.progressInfo,
+            plainText: root.plainText,
+            htmlText: root.display,
+            connection: root.connection,
+        });
+        contextMenu.open();
+    }
+
+    /// Open context menu for normal message
+    function openMessageContext(selectedText) {
+        const contextMenu = messageDelegateContextMenu.createObject(root, {
+            selectedText: selectedText,
+            author: root.author,
+            eventId: root.eventId,
+            eventSource: root.jsonSource,
+            eventType: root.delegateType,
+            plainText: root.plainText,
+            htmlText: root.display,
+            connection: root.connection,
+        });
+        contextMenu.open();
+    }
+
+    function setHoverActionsToDelegate() {
+        if (ListView.view.setHoverActionsToDelegate) {
+            ListView.view.setHoverActionsToDelegate(root)
+        }
+    }
+
+    DelegateSizeHelper {
+        id: timelineDelegateSizeHelper
+        startBreakpoint: Kirigami.Units.gridUnit * 46
+        endBreakpoint: Kirigami.Units.gridUnit * 66
+        startPercentWidth: 100
+        endPercentWidth: Config.compactLayout || root.alwaysMaxWidth ? 100 : 85
+        maxWidth: Config.compactLayout || root.alwaysMaxWidth ? -1 : Kirigami.Units.gridUnit * 60
+
+        parentWidth: root.parent ? root.parent.width - (Config.compactLayout && root.ListView.view.width >= Kirigami.Units.gridUnit * 20 ? Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing : 0) : 0
+    }
+    DelegateSizeHelper {
+        id: bubbleSizeHelper
+        startBreakpoint: Kirigami.Units.gridUnit * 25
+        endBreakpoint: Kirigami.Units.gridUnit * 40
+        startPercentWidth: Config.compactLayout || root.alwaysMaxWidth ? 100 : 90
+        endPercentWidth: Config.compactLayout || root.alwaysMaxWidth ? 100 : 60
+
+        parentWidth: mainContainer.availableWidth - (Config.showAvatarInTimeline ? avatar.width + bubble.anchors.leftMargin : 0)
+    }
+}

src/qml/Component/Timeline/VideoDelegate.qml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 import QtMultimedia
-import Qt.labs.platform 1.1 as Platform
+import Qt.labs.platform as Platform
 
-import org.kde.kirigami 2.13 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief A timeline delegate for a video message.

src/qml/Component/TimelineView.qml

@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import Qt.labs.qmlmodels 1.0
-import QtQuick.Window 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.qmlmodels
+import QtQuick.Window
 
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.kitemmodels 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.kitemmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.ScrollView {
     id: root

src/qml/Component/TypingPane.qml

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 as QQC2
-import org.kde.kirigami 2.14 as Kirigami
-import org.kde.neochat 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 Loader {
     id: root

src/qml/Dialog/ConfirmDeactivateAccountDialog.qml

@@ -1,13 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
+import QtQuick
+import QtQuick.Layouts
 
-import QtQuick.Layouts 1.15
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 FormCard.FormCardPage {
     id: root

src/qml/Dialog/ConfirmEncryptionDialog.qml

@@ -2,12 +2,12 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.Dialog {
     id: root

src/qml/Dialog/ConfirmLogout.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.Dialog {
     id: root

src/qml/Dialog/CreateRoomDialog.qml

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
+import QtQuick
 
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 FormCard.FormCardPage {
     id: root

src/qml/Dialog/CreateSpaceDialog.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.20 as Kirigami
+import QtQuick
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.neochat
+import org.kde.kirigamiaddons.formcard as FormCard
 
 FormCard.FormCardPage {
     id: root

src/qml/Dialog/EmojiDialog.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
+import QtQuick
+import QtQuick.Controls as QQC2
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 QQC2.Popup {
     id: root

src/qml/Dialog/KeyVerification/EmojiItem.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQml
 
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 Column {
     id: root

src/qml/Dialog/KeyVerification/EmojiRow.qml

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQml 2.15
+import QtQuick
+import QtQml
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Row {
     id: root

src/qml/Dialog/KeyVerification/EmojiSas.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQml
 
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 Column {
     id: root

src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import QtQml
 
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 Kirigami.Page {
     id: root

src/qml/Dialog/KeyVerification/Message.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQml
 
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 Column {
     id: root

src/qml/Dialog/KeyVerification/VerificationCanceled.qml

@@ -1,10 +1,10 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQml 2.15
+import QtQuick
+import QtQml
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Message {
     id: root

src/qml/Dialog/OpenFileDialog.qml

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import Qt.labs.platform 1.1
+import QtQuick
+import Qt.labs.platform
 
 FileDialog {
     signal chosen(string path)

src/qml/Dialog/PowerLevelDialog.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.OverlaySheet {
     id: root

src/qml/Dialog/UserDetailDialog.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.Dialog {
     id: root

src/qml/Menu/EditMenu.qml

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
-import Qt.labs.platform 1.1 as Labs
-import QtQuick 2.15
-import QtQuick.Layouts 1.10
+import Qt.labs.platform as Labs
+import QtQuick
+import QtQuick.Layouts
 
 Labs.Menu {
     id: root

src/qml/Menu/GlobalMenu.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import Qt.labs.platform 1.1 as Labs
+import Qt.labs.platform as Labs
 
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Layouts 1.10
+import QtQuick
+import QtQuick.Window
+import QtQuick.Layouts
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Labs.MenuBar {
     id: root

src/qml/Menu/ShareAction.qml

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
-import QtQuick 2.7
-import QtQuick.Layouts 1.3
-import org.kde.kirigami 2.14 as Kirigami
+import QtQuick
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
 /**
  * Action that allows an user to share data with other apps and service
@@ -38,7 +38,7 @@ Kirigami.Action {
 
     property Instantiator _instantiator: Instantiator {
         Component.onCompleted: {
-            const purposeModel = Qt.createQmlObject('import org.kde.purpose 1.0 as Purpose;
+            const purposeModel = Qt.createQmlObject('import org.kde.purpose as Purpose;
 Purpose.PurposeAlternativesModel {
     pluginType: "Export"
 }', root._instantiator);

src/qml/Menu/ShareActionAndroid.qml

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
-import org.kde.kirigami 2.14 as Kirigami
+import org.kde.kirigami as Kirigami
 
 Kirigami.Action {
     property var inputData: ({})

src/qml/Menu/ShareDialog.qml

@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
  */
 
-import QtQuick 2.7
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.15 as QQC2
-import org.kde.purpose 1.0 as Purpose
-import org.kde.notification 1.0
-import org.kde.kirigami 2.14 as Kirigami
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
+import org.kde.purpose as Purpose
+import org.kde.notification
+import org.kde.kirigami as Kirigami
 
 Kirigami.Page {
     id: root

src/qml/Menu/Timeline/BanSheet.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.Page {
     id: root

src/qml/Menu/Timeline/FileDelegateContextMenu.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Controls as QQC2
+import Qt.labs.platform
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief The menu for media messages.

src/qml/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 /**
  * @brief The base menu for most message types.

src/qml/Menu/Timeline/MessageSourceSheet.qml

@@ -2,12 +2,13 @@
 // SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
+import QtQuick
+import QtQuick.Controls as QQC2
 
-import org.kde.syntaxhighlighting 1.0
 import org.kde.kirigami as Kirigami
-import org.kde.neochat 1.0
+import org.kde.syntaxhighlighting
+
+import org.kde.neochat
 
 Kirigami.Page {
     property string sourceText

src/qml/Menu/Timeline/RemoveSheet.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.Page {
     id: root

src/qml/Menu/Timeline/ReportSheet.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.Page {
     id: root

src/qml/Page/ChooseRoomDialog.qml

@@ -1,12 +1,12 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
 
-import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 import "./RoomList"
 

src/qml/Page/DevtoolsPage.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
+import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 FormCard.FormCardPage {
     id: root

src/qml/Page/ExplorerDelegate.qml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.delegates 1.0 as Delegates
-import org.kde.kirigamiaddons.labs.components 1.0 as Components
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as Components
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Delegates.RoundedItemDelegate {
     id: root

src/qml/Page/ImageEditorPage.qml

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: BSD-2-Clause
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import Qt.labs.platform 1.1 as Platform
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.platform as Platform
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
-import org.kde.kquickimageeditor 1.0 as KQuickImageEditor
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
+import org.kde.kquickimageeditor as KQuickImageEditor
 
 Kirigami.Page {
     id: rootEditorView

src/qml/Page/InviteUserPage.qml

@@ -1,15 +1,15 @@
 // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.delegates 1.0 as Delegates
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.ScrollablePage {
     id: root

src/qml/Page/JoinRoomPage.qml

@@ -2,15 +2,15 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import Qt.labs.qmlmodels 1.0
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.qmlmodels
 
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 Kirigami.ScrollablePage {
     id: root

src/qml/Page/LoadingPage.qml

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.19 as Kirigami
+import QtQuick.Layouts
+import org.kde.kirigami as Kirigami
 
 Kirigami.Page {
     title: i18n("Loading…")

src/qml/Page/RoomList/AccountMenu.qml

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
-import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 import '../Dialog' as Dialog
 
 QQC2.Menu {

src/qml/Page/RoomList/CollapsedRoomDelegate.qml

@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: 2023 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml.Models 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import QtQml.Models
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
-import org.kde.kitemmodels 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
+import org.kde.kitemmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 import './' as RoomList
 

src/qml/Page/RoomList/ContextMenu.qml

@@ -6,9 +6,9 @@ import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
-import org.kde.kirigami 2 as Kirigami
-import org.kde.kirigamiaddons.components 1 as KirigamiComponents
-import org.kde.kirigamiaddons.delegates 1 as Delegates
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.components as KirigamiComponents
+import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
 

src/qml/Page/RoomList/ExploreComponent.qml

@@ -5,8 +5,8 @@ import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
-import org.kde.kirigami 2 as Kirigami
-import org.kde.kirigamiaddons.delegates 1 as Delegates
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
 

src/qml/Page/RoomList/Page.qml

@@ -2,14 +2,14 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml.Models 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import QtQml.Models
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami as Kirigami
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 import './' as RoomList
 import '../' as NeoChat

src/qml/Page/RoomList/RoomDelegate.qml

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: 2023 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml.Models 2.15
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import QtQml.Models
 
-import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.delegates 1.0 as Delegates
-import org.kde.kirigamiaddons.labs.components 1.0 as Components
-import org.kde.kitemmodels 1.0
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as Components
+import org.kde.kitemmodels
 
-import org.kde.neochat 1.0
+import org.kde.neochat
 
 import './' as RoomList