Set all internal qml versions to 1.0

They're useless and anything else just causes problem
This commit is contained in:
Tobias Fella
2020-11-11 20:14:43 +01:00
parent 146a6d6ea4
commit 3a70a9d91c
41 changed files with 169 additions and 169 deletions

View File

@@ -5,7 +5,7 @@
*/
import QtQuick 2.12
import NeoChat.Setting 0.1
import NeoChat.Setting 1.0
MouseArea {
signal primaryClicked()

View File

@@ -8,13 +8,13 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 2.0
import NeoChat.Component.Emoji 2.0
import NeoChat.Dialog 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Component.Emoji 1.0
import NeoChat.Dialog 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Control {
id: root

View File

@@ -8,10 +8,10 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12
import NeoChat.Component 2.0
import NeoChat.Component 1.0
import org.kde.neochat 0.1
import NeoChat.Setting 0.1
import org.kde.neochat 1.0
import NeoChat.Setting 1.0
ColumnLayout {
property string emojiCategory: "history"

View File

@@ -1,2 +1,2 @@
module NeoChat.Component.Emoji
EmojiPicker 2.0 EmojiPicker.qml
EmojiPicker 1.0 EmojiPicker.qml

View File

@@ -11,13 +11,13 @@ import Qt.labs.platform 1.0 as Platform
import QtMultimedia 5.12
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 0.1
import NeoChat.Setting 0.1
import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import NeoChat.Menu.Timeline 2.0
import NeoChat.Effect 2.0
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0
import NeoChat.Effect 1.0
RowLayout {
readonly property bool avatarVisible: !sentByMe && showAuthor

View File

@@ -11,13 +11,13 @@ import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0 as Platform
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 0.1
import NeoChat.Setting 0.1
import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import NeoChat.Menu.Timeline 2.0
import NeoChat.Effect 2.0
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0
import NeoChat.Effect 1.0
RowLayout {
readonly property bool avatarVisible: !sentByMe && showAuthor

View File

@@ -9,13 +9,13 @@ import QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0 as Platform
import org.kde.neochat 0.1
import NeoChat.Setting 0.1
import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import NeoChat.Menu.Timeline 2.0
import NeoChat.Effect 2.0
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0
import NeoChat.Effect 1.0
Image {
readonly property bool isAnimated: contentType === "image/gif"

View File

@@ -11,10 +11,10 @@ import QtGraphicalEffects 1.12
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 0.1
import NeoChat.Setting 0.1
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
RowLayout {
default property alias innerObject : column.children

View File

@@ -9,10 +9,10 @@ import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
RowLayout {
id: row

View File

@@ -12,14 +12,14 @@ import QtMultimedia 5.12
import Qt.labs.platform 1.0 as Platform
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 0.1
import NeoChat.Setting 0.1
import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import NeoChat.Menu.Timeline 2.0
import NeoChat.Effect 2.0
import NeoChat.Font 0.1
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0
import NeoChat.Effect 1.0
import NeoChat.Font 1.0
RowLayout {
readonly property bool avatarVisible: showAuthor && !sentByMe

View File

@@ -1,11 +1,11 @@
module NeoChat.Component.Timeline
TimelineContainer 2.0 TimelineContainer.qml
MessageDelegate 2.0 MessageDelegate.qml
TextDelegate 2.0 TextDelegate.qml
StateDelegate 2.0 StateDelegate.qml
SectionDelegate 2.0 SectionDelegate.qml
ImageDelegate 2.0 ImageDelegate.qml
FileDelegate 2.0 FileDelegate.qml
VideoDelegate 2.0 VideoDelegate.qml
ReactionDelegate 2.0 ReactionDelegate.qml
AudioDelegate 2.0 AudioDelegate.qml
TimelineContainer 1.0 TimelineContainer.qml
MessageDelegate 1.0 MessageDelegate.qml
TextDelegate 1.0 TextDelegate.qml
StateDelegate 1.0 StateDelegate.qml
SectionDelegate 1.0 SectionDelegate.qml
ImageDelegate 1.0 ImageDelegate.qml
FileDelegate 1.0 FileDelegate.qml
VideoDelegate 1.0 VideoDelegate.qml
ReactionDelegate 1.0 ReactionDelegate.qml
AudioDelegate 1.0 AudioDelegate.qml

View File

@@ -1,10 +1,10 @@
module NeoChat.Component
AutoMouseArea 2.0 AutoMouseArea.qml
MaterialIcon 2.0 MaterialIcon.qml
SideNavButton 2.0 SideNavButton.qml
ScrollHelper 2.0 ScrollHelper.qml
AutoListView 2.0 AutoListView.qml
AutoTextField 2.0 AutoTextField.qml
FullScreenImage 2.0 FullScreenImage.qml
AutoRectangle 2.0 AutoRectangle.qml
ChatTextInput 2.0 ChatTextInput.qml
AutoMouseArea 1.0 AutoMouseArea.qml
MaterialIcon 1.0 MaterialIcon.qml
SideNavButton 1.0 SideNavButton.qml
ScrollHelper 1.0 ScrollHelper.qml
AutoListView 1.0 AutoListView.qml
AutoTextField 1.0 AutoTextField.qml
FullScreenImage 1.0 FullScreenImage.qml
AutoRectangle 1.0 AutoRectangle.qml
ChatTextInput 1.0 ChatTextInput.qml

View File

@@ -7,9 +7,9 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import NeoChat.Component 2.0
import NeoChat.Component 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Dialog {
anchors.centerIn: parent

View File

@@ -7,8 +7,8 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import NeoChat.Component 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Setting 1.0
Dialog {
anchors.centerIn: parent

View File

@@ -8,11 +8,11 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Dialog {
property var room

View File

@@ -8,11 +8,11 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Dialog {
property var room

View File

@@ -7,11 +7,11 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import NeoChat.Component 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Dialog {
property var connection

View File

@@ -9,9 +9,9 @@ import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
Kirigami.OverlaySheet {
id: root

View File

@@ -1,13 +1,13 @@
module NeoChat.Dialog
RoomSettingsDialog 2.0 RoomSettingsDialog.qml
UserDetailDialog 2.0 UserDetailDialog.qml
MessageSourceDialog 2.0 MessageSourceDialog.qml
LoginDialog 2.0 LoginDialog.qml
CreateRoomDialog 2.0 CreateRoomDialog.qml
InviteUserDialog 2.0 InviteUserDialog.qml
AcceptInvitationDialog 2.0 AcceptInvitationDialog.qml
FontFamilyDialog 2.0 FontFamilyDialog.qml
OpenFileDialog 2.0 OpenFileDialog.qml
OpenFolderDialog 2.0 OpenFolderDialog.qml
ImageClipboardDialog 2.0 ImageClipboardDialog.qml
StartChatDialog 2.0 StartChatDialog.qml
RoomSettingsDialog 1.0 RoomSettingsDialog.qml
UserDetailDialog 1.0 UserDetailDialog.qml
MessageSourceDialog 1.0 MessageSourceDialog.qml
LoginDialog 1.0 LoginDialog.qml
CreateRoomDialog 1.0 CreateRoomDialog.qml
InviteUserDialog 1.0 InviteUserDialog.qml
AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml
FontFamilyDialog 1.0 FontFamilyDialog.qml
OpenFileDialog 1.0 OpenFileDialog.qml
OpenFolderDialog 1.0 OpenFolderDialog.qml
ImageClipboardDialog 1.0 ImageClipboardDialog.qml
StartChatDialog 1.0 StartChatDialog.qml

View File

@@ -7,8 +7,8 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.0
import NeoChat.Component 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Setting 1.0
AutoMouseArea {
id: ripple

View File

@@ -1,3 +1,3 @@
module NeoChat.Effect
ElevationEffect 2.0 ElevationEffect.qml
RippleEffect 2.0 RippleEffect.qml
ElevationEffect 1.0 ElevationEffect.qml
RippleEffect 1.0 RippleEffect.qml

View File

@@ -6,7 +6,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import NeoChat.Dialog 2.0
import NeoChat.Dialog 1.0
Menu {
signal viewSource()

View File

@@ -9,7 +9,7 @@ import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Dialog 2.0
import NeoChat.Dialog 1.0
Kirigami.OverlaySheet {
id: root

View File

@@ -1,3 +1,3 @@
module NeoChat.Menu.Timeline
MessageDelegateContextMenu 2.0 MessageDelegateContextMenu.qml
FileDelegateContextMenu 2.0 FileDelegateContextMenu.qml
MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml

View File

@@ -1,2 +1,2 @@
module NeoChat.Menu
RoomListContextMenu 2.0 RoomListContextMenu.qml
RoomListContextMenu 1.0 RoomListContextMenu.qml

View File

@@ -10,7 +10,7 @@ import QtQuick.Layouts 1.14
import org.kde.kirigami 2.12 as Kirigami
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Kirigami.ScrollablePage {
title: i18n("Accounts")

View File

@@ -9,12 +9,12 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat 2.0
import NeoChat.Component 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat 1.0
import NeoChat.Component 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Kirigami.ScrollablePage {
id: root

View File

@@ -8,9 +8,9 @@ import QtQuick 2.12
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.12
import org.kde.neochat 0.1
import org.kde.neochat 1.0
import NeoChat.Component 2.0
import NeoChat.Component 1.0
import org.kde.kirigami 2.12 as Kirigami

View File

@@ -10,11 +10,11 @@ import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import org.kde.kitemmodels 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
import NeoChat 2.0
import NeoChat.Component 2.0
import NeoChat.Menu 2.0
import NeoChat 1.0
import NeoChat.Component 1.0
import NeoChat.Menu 1.0
Kirigami.ScrollablePage {
id: page

View File

@@ -12,13 +12,13 @@ import QtQuick.Controls.Material 2.12
import org.kde.kirigami 2.13 as Kirigami
import org.kde.kitemmodels 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
import NeoChat.Component 2.0
import NeoChat.Component.Timeline 2.0
import NeoChat.Dialog 2.0
import NeoChat.Effect 2.0
import NeoChat.Menu.Timeline 2.0
import NeoChat.Component 1.0
import NeoChat.Component.Timeline 1.0
import NeoChat.Dialog 1.0
import NeoChat.Effect 1.0
import NeoChat.Menu.Timeline 1.0
Kirigami.ScrollablePage {
id: page

View File

@@ -1,6 +1,6 @@
module NeoChat.Page
LoadingPage 2.0 LoadingPage.qml
LoginPage 2.0 LoginPage.qml
RoomListPage 2.0 RoomListPage.qml
RoomPage 2.0 RoomPage.qml
JoinRoomPage 2.0 JoinRoomPage.qml
LoadingPage 1.0 LoadingPage.qml
LoginPage 1.0 LoginPage.qml
RoomListPage 1.0 RoomListPage.qml
RoomPage 1.0 RoomPage.qml
JoinRoomPage 1.0 JoinRoomPage.qml

View File

@@ -12,9 +12,9 @@ import org.kde.kirigami 2.12 as Kirigami
import SortFilterProxyModel 0.2
import NeoChat.Component 2.0
import NeoChat.Component.Timeline 2.0
import org.kde.neochat 0.1
import NeoChat.Component 1.0
import NeoChat.Component.Timeline 1.0
import org.kde.neochat 1.0
Kirigami.GlobalDrawer {
id: root

View File

@@ -11,12 +11,12 @@ import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 2.0
import NeoChat.Dialog 2.0
import NeoChat.Effect 2.0
import NeoChat.Setting 0.1
import NeoChat.Component 1.0
import NeoChat.Dialog 1.0
import NeoChat.Effect 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 0.1
import org.kde.neochat 1.0
Kirigami.OverlayDrawer {
property var room

View File

@@ -8,10 +8,10 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls.Material 2.12
import org.kde.neochat 0.1
import NeoChat.Effect 2.0
import NeoChat.Component 2.0
import NeoChat.Setting 0.1
import org.kde.neochat 1.0
import NeoChat.Effect 1.0
import NeoChat.Component 1.0
import NeoChat.Setting 1.0
Control {
signal clicked()

View File

@@ -12,8 +12,8 @@ import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import org.kde.kitemmodels 1.0
import NeoChat.Component 2.0
import org.kde.neochat 0.1
import NeoChat.Component 1.0
import org.kde.neochat 1.0
Kirigami.ScrollablePage {
id: page

View File

@@ -1,5 +1,5 @@
module NeoChat.Panel
RoomPanel 2.0 RoomPanel.qml
RoomListPanel 2.0 RoomListPanel.qml
RoomDrawer 2.0 RoomDrawer.qml
NeoChatSidebar 2.0 NeoChatSidebar.qml
RoomPanel 1.0 RoomPanel.qml
RoomListPanel 1.0 RoomListPanel.qml
RoomDrawer 1.0 RoomDrawer.qml
NeoChatSidebar 1.0 NeoChatSidebar.qml

View File

@@ -7,7 +7,7 @@
pragma Singleton
import QtQuick 2.14
import NeoChat.Page 2.0
import NeoChat.Page 1.0
/**
* Manage opening and close rooms

View File

@@ -1,3 +1,3 @@
module NeoChat.Setting
singleton MSettings 0.1 Setting.qml
singleton MPalette 0.1 Palette.qml
singleton MSettings 1.0 Setting.qml
singleton MPalette 1.0 Palette.qml

View File

@@ -1 +1 @@
singleton RoomManager 2.0 RoomManager.qml
singleton RoomManager 1.0 RoomManager.qml

View File

@@ -10,13 +10,13 @@ import QtQuick.Layouts 1.14
import org.kde.kirigami 2.12 as Kirigami
import org.kde.neochat 0.1
import NeoChat 2.0
import NeoChat.Component 2.0
import NeoChat.Panel 2.0
import NeoChat.Dialog 2.0
import NeoChat.Page 2.0
import NeoChat.Page 2.0
import org.kde.neochat 1.0
import NeoChat 1.0
import NeoChat.Component 1.0
import NeoChat.Panel 1.0
import NeoChat.Dialog 1.0
import NeoChat.Page 1.0
import NeoChat.Page 1.0
Kirigami.ApplicationWindow {
id: root

View File

@@ -60,21 +60,21 @@ int main(int argc, char *argv[])
Clipboard clipboard;
qmlRegisterSingletonInstance("org.kde.neochat", 0, 1, "Controller", &Controller::instance());
qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard);
qmlRegisterType<AccountListModel>("org.kde.neochat", 0, 1, "AccountListModel");
qmlRegisterType<RoomListModel>("org.kde.neochat", 0, 1, "RoomListModel");
qmlRegisterType<UserListModel>("org.kde.neochat", 0, 1, "UserListModel");
qmlRegisterType<MessageEventModel>("org.kde.neochat", 0, 1, "MessageEventModel");
qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 0, 1, "PublicRoomListModel");
qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 0, 1, "UserDirectoryListModel");
qmlRegisterType<EmojiModel>("org.kde.neochat", 0, 1, "EmojiModel");
qmlRegisterType<NotificationsManager>("org.kde.neochat", 0, 1, "NotificationsManager");
qmlRegisterType<TrayIcon>("org.kde.neochat", 0, 1, "TrayIcon");
qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 0, 1, "SortFilterRoomListModel");
qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 0, 1, "RoomMessageEvent", "ENUM");
qmlRegisterUncreatableType<RoomType>("org.kde.neochat", 0, 1, "RoomType", "ENUM");
qmlRegisterUncreatableType<UserType>("org.kde.neochat", 0, 1, "UserType", "ENUM");
qmlRegisterType<AccountListModel>("org.kde.neochat", 1, 0, "AccountListModel");
qmlRegisterType<RoomListModel>("org.kde.neochat", 1, 0, "RoomListModel");
qmlRegisterType<UserListModel>("org.kde.neochat", 1, 0, "UserListModel");
qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
qmlRegisterType<EmojiModel>("org.kde.neochat", 1, 0, "EmojiModel");
qmlRegisterType<NotificationsManager>("org.kde.neochat", 1, 0, "NotificationsManager");
qmlRegisterType<TrayIcon>("org.kde.neochat", 1, 0, "TrayIcon");
qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
qmlRegisterUncreatableType<RoomType>("org.kde.neochat", 1, 0, "RoomType", "ENUM");
qmlRegisterUncreatableType<UserType>("org.kde.neochat", 1, 0, "UserType", "ENUM");
qRegisterMetaType<User *>("User*");
qRegisterMetaType<User *>("const User*");