ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use declarative type registration for remaining types

Browse Source
This commit is contained in:
Tobias Fella
2024-04-10 20:47:29 +02:00
parent c344a3ee55
commit 3c4c538de8
41 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -12,3 +12,4 @@ kate.project.ctags.*
.idea/
cmake-build-*
src/res.generated.qrc
.qmlls.ini

1
src/CMakeLists.txt
View File

@@ -174,6 +174,7 @@ add_library(neochat STATIC
sharehandler.h
models/roomtreeitem.cpp
models/roomtreeitem.h
foreigntypes.h
)
set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES

2
src/devtools/FeatureFlagPage.qml
View File

@@ -7,8 +7,6 @@ import QtQuick.Layouts
import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat.config
FormCard.FormCardPage {
id: root

56
src/foreigntypes.h Normal file
View File

@@ -0,0 +1,56 @@
// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
// SPDX-License-Identifier: LGPL-2.0-or-later
#pragma once
#include <QQmlEngine>
#include <Quotient/accountregistry.h>
#include <Quotient/keyverificationsession.h>
#if __has_include("Quotient/e2ee/sssshandler.h")
#include <Quotient/e2ee/sssshandler.h>
#endif
#include "controller.h"
#include "neochatconfig.h"
struct ForeignConfig {
Q_GADGET
QML_FOREIGN(NeoChatConfig)
QML_NAMED_ELEMENT(Config)
QML_SINGLETON
public:
static NeoChatConfig *create(QQmlEngine *, QJSEngine *)
{
QQmlEngine::setObjectOwnership(NeoChatConfig::self(), QQmlEngine::CppOwnership);
return NeoChatConfig::self();
}
};
struct ForeignAccountRegistry {
Q_GADGET
QML_FOREIGN(Quotient::AccountRegistry)
QML_NAMED_ELEMENT(AccountRegistry)
QML_SINGLETON
public:
static Quotient::AccountRegistry *create(QQmlEngine *, QJSEngine *)
{
QQmlEngine::setObjectOwnership(&Controller::instance().accounts(), QQmlEngine::CppOwnership);
return &Controller::instance().accounts();
}
};
struct ForeignKeyVerificationSession {
Q_GADGET
QML_FOREIGN(Quotient::KeyVerificationSession)
QML_NAMED_ELEMENT(KeyVerificationSession)
QML_UNCREATABLE("")
};
#if __has_include("Quotient/e2ee/sssshandler.h")
struct ForeignSSSSHandler {
Q_GADGET
QML_FOREIGN(Quotient::SSSSHandler)
QML_NAMED_ELEMENT(SSSSHandler)
};
#endif

1
src/login/WelcomePage.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat
import org.kde.neochat.settings
import org.kde.neochat.accounts
FormCard.FormCardPage {
id: root

12
src/main.cpp
View File

@@ -35,11 +35,6 @@
#include "neochat-version.h"
#include <Quotient/accountregistry.h>
#if __has_include("Quotient/e2ee/sssshandler.h")
#include <Quotient/e2ee/sssshandler.h>
#endif
#include <Quotient/keyverificationsession.h>
#include <Quotient/networkaccessmanager.h>
#include "blurhashimageprovider.h"
@@ -234,13 +229,6 @@ int main(int argc, char *argv[])
Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
qml_register_types_org_kde_neochat();
qmlRegisterSingletonInstance("org.kde.neochat.config", 1, 0, "Config", NeoChatConfig::self());
qmlRegisterSingletonInstance("org.kde.neochat.accounts", 1, 0, "AccountRegistry", &Controller::instance().accounts());
qmlRegisterUncreatableType<KeyVerificationSession>("com.github.quotient_im.libquotient", 1, 0, "KeyVerificationSession", {});
#if __has_include("Quotient/e2ee/sssshandler.h")
qmlRegisterType<SSSSHandler>("com.github.quotient_im.libquotient", 1, 0, "SSSSHandler");
#endif
QQmlApplicationEngine engine;

1
src/qml/AccountMenu.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.settings
import org.kde.neochat.devtools
import org.kde.neochat.config
QQC2.Menu {
id: root

1
src/qml/AccountSwitchDialog.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.kirigamiaddons.delegates as Delegates
import org.kde.neochat
import org.kde.neochat.accounts
Kirigami.Dialog {
id: root

1
src/qml/ChatBar.qml
View File

@@ -9,7 +9,6 @@ import QtQuick.Layouts
import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief A component for typing and sending chat messages.

1
src/qml/CollapsedRoomDelegate.qml
View File

@@ -11,7 +11,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.kitemmodels
import org.kde.neochat
import org.kde.neochat.config
QQC2.ItemDelegate {
id: root

1
src/qml/DelegateContextMenu.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief The base menu for most message types.

2
src/qml/EmojiSas.qml
View File

@@ -5,8 +5,6 @@ import QtQuick
import QtQuick.Controls as QQC2
import QtQml
import com.github.quotient_im.libquotient
import org.kde.kirigami as Kirigami
import org.kde.neochat

1
src/qml/FileDelegateContextMenu.qml
View File

@@ -8,7 +8,6 @@ import Qt.labs.platform
import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief The menu for media messages.

2
src/qml/GlobalMenu.qml
View File

@@ -9,8 +9,6 @@ import QtQuick.Layouts
import org.kde.neochat
import org.kde.neochat.settings
import org.kde.neochat.config
import org.kde.neochat.accounts
Labs.MenuBar {
id: root

1
src/qml/HoverActions.qml
View File

@@ -7,7 +7,6 @@ import QtQuick.Layouts
import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief A component that provides a set of actions when a message is hovered in the timeline.

2
src/qml/KeyVerificationDialog.qml
View File

@@ -6,8 +6,6 @@ import QtQuick.Controls as QQC2
import QtQuick.Layouts
import QtQml
import com.github.quotient_im.libquotient
import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.delegates as Delegates
import org.kde.neochat

2
src/qml/Main.qml
View File

@@ -10,8 +10,6 @@ import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.login
import org.kde.neochat.settings
import org.kde.neochat.config
import org.kde.neochat.accounts
Kirigami.ApplicationWindow {
id: root

1
src/qml/MessageDelegateContextMenu.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief The menu for normal messages.

1
src/qml/NeochatMaximizeComponent.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.labs.components as Components
import org.kde.neochat
import org.kde.neochat.config
Components.AlbumMaximizeComponent {
id: root

1
src/qml/RoomDelegate.qml
View File

@@ -12,7 +12,6 @@ import org.kde.kirigamiaddons.labs.components as Components
import org.kde.kitemmodels
import org.kde.neochat
import org.kde.neochat.config
Delegates.RoundedItemDelegate {
id: root

1
src/qml/RoomDrawer.qml
View File

@@ -11,7 +11,6 @@ import org.kde.kitemmodels
import org.kde.neochat
import org.kde.neochat.settings
import org.kde.neochat.config
Kirigami.OverlayDrawer {
id: root

1
src/qml/RoomInformation.qml
View File

@@ -11,7 +11,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.kitemmodels
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief Component for visualising the room information.

2
src/qml/RoomListPage.qml
View File

@@ -13,8 +13,6 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
import org.kde.kirigamiaddons.delegates as Delegates
import org.kde.neochat
import org.kde.neochat.config
import org.kde.neochat.accounts
Kirigami.Page {
id: root

1
src/qml/RoomPage.qml
View File

@@ -12,7 +12,6 @@ import org.kde.kirigami as Kirigami
import org.kde.kitemmodels
import org.kde.neochat
import org.kde.neochat.config
Kirigami.Page {
id: root

1
src/qml/TimelineView.qml
View File

@@ -12,7 +12,6 @@ import org.kde.kirigami as Kirigami
import org.kde.kitemmodels
import org.kde.neochat
import org.kde.neochat.config
import org.kde.neochat.timeline
QQC2.ScrollView {

2
src/qml/UnlockSSSSDialog.qml
View File

@@ -9,8 +9,6 @@ import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import com.github.quotient_im.libquotient
import org.kde.neochat
FormCard.FormCardPage {

2
src/qml/UserInfo.qml
View File

@@ -10,8 +10,6 @@ import org.kde.kirigamiaddons.delegates as Delegates
import org.kde.neochat
import org.kde.neochat.settings
import org.kde.neochat.config
import org.kde.neochat.accounts
RowLayout {
id: root

2
src/qml/VerificationCanceled.qml
View File

@@ -4,8 +4,6 @@
import QtQuick
import QtQml
import com.github.quotient_im.libquotient
import org.kde.neochat
Message {

4
src/settings/About.qml
View File

@@ -2,12 +2,8 @@
// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
// SPDX-License-Identifier: LGPL-2.0-or-later
import QtQuick.Layouts
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat
import org.kde.coreaddons
FormCard.AboutPage {
title: i18nc("@title:window", "About NeoChat")
aboutData: AboutData
}

1
src/settings/AccountsPage.qml
View File

@@ -12,7 +12,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.neochat
import org.kde.neochat.accounts
FormCard.FormCardPage {
id: root

1
src/settings/AppearanceSettingsPage.qml
View File

@@ -11,7 +11,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.neochat
import org.kde.neochat.config
FormCard.FormCardPage {
id: root

1
src/settings/ColorScheme.qml
View File

@@ -7,7 +7,6 @@ import QtQuick.Layouts
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat
import org.kde.neochat.config
FormCard.FormComboBoxDelegate {
id: root

1
src/settings/NeoChatGeneralPage.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat
import org.kde.neochat.devtools
import org.kde.neochat.config
FormCard.FormCardPage {
title: i18nc("@title:window", "General")

2
src/settings/NetworkProxyPage.qml
View File

@@ -7,8 +7,6 @@ import QtQuick.Layouts
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.neochat.config
FormCard.FormCardPage {
id: root

1
src/settings/Permissions.qml
View File

@@ -9,7 +9,6 @@ import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard as FormCard
import org.kde.kirigamiaddons.delegates as Delegates
import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.kitemmodels
import org.kde.neochat

1
src/timeline/FileComponent.qml
View File

@@ -12,7 +12,6 @@ import org.kde.coreaddons
import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief A component to show a file from a message.

1
src/timeline/MessageDelegate.qml
View File

@@ -10,7 +10,6 @@ import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.components as KirigamiComponents
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief The base delegate for all messages in the timeline.

3
src/timeline/ReactionDelegate.qml
View File

@@ -6,7 +6,8 @@ import QtQuick
import QtQuick.Controls as QQC2
import org.kde.kirigami as Kirigami
import org.kde.neochat.config
import org.kde.neochat
Flow {
id: root

2
src/timeline/SectionDelegate.qml
View File

@@ -8,7 +8,7 @@ import QtQuick.Layouts
import org.kde.kirigami as Kirigami
import org.kde.neochat.config
import org.kde.neochat
QQC2.ItemDelegate {
id: root

2
src/timeline/StateDelegate.qml
View File

@@ -8,7 +8,7 @@ import QtQuick.Layouts
import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.labs.components as KirigamiComponents
import org.kde.neochat.config
import org.kde.neochat
/**
* @brief A timeline delegate for visualising an aggregated list of consecutive state events.

1
src/timeline/TimelineDelegate.qml
View File

@@ -6,7 +6,6 @@ import QtQuick
import org.kde.kirigami as Kirigami
import org.kde.neochat
import org.kde.neochat.config
/**
* @brief The base Item for all delegates in the timeline.