From c03f716e8bfdf4d8e96bec2ee1abb9831ec15cab Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 7 Mar 2021 05:57:56 +0100 Subject: [PATCH] Fix conflict between qmlformat and license check --- resources/qml/Avatar.qml | 1 + resources/qml/Completer.qml | 1 + resources/qml/EncryptionIndicator.qml | 1 + resources/qml/ImageButton.qml | 1 + resources/qml/MatrixText.qml | 1 + resources/qml/MessageInput.qml | 1 + resources/qml/MessageView.qml | 1 + resources/qml/NhekoBusyIndicator.qml | 1 + resources/qml/PrivacyScreen.qml | 1 + resources/qml/Reactions.qml | 1 + resources/qml/ReplyPopup.qml | 1 + resources/qml/RoomSettings.qml | 1 + resources/qml/ScrollHelper.qml | 2 ++ resources/qml/StatusIndicator.qml | 1 + resources/qml/TimelineRow.qml | 1 + resources/qml/TimelineView.qml | 1 + resources/qml/ToggleButton.qml | 1 + resources/qml/TopBar.qml | 1 + resources/qml/TypingIndicator.qml | 1 + resources/qml/UserProfile.qml | 1 + resources/qml/delegates/FileMessage.qml | 1 + resources/qml/delegates/ImageMessage.qml | 1 + resources/qml/delegates/MessageDelegate.qml | 1 + resources/qml/delegates/NoticeMessage.qml | 1 + resources/qml/delegates/Pill.qml | 1 + resources/qml/delegates/Placeholder.qml | 1 + resources/qml/delegates/PlayableMediaMessage.qml | 1 + resources/qml/delegates/Reply.qml | 1 + resources/qml/delegates/TextMessage.qml | 1 + .../device-verification/AwaitingVerificationConfirmation.qml | 1 + resources/qml/device-verification/DeviceVerification.qml | 1 + resources/qml/device-verification/DigitVerification.qml | 1 + resources/qml/device-verification/EmojiElement.qml | 1 + resources/qml/device-verification/EmojiVerification.qml | 1 + resources/qml/device-verification/Failed.qml | 1 + resources/qml/device-verification/NewVerificationRequest.qml | 1 + resources/qml/device-verification/Success.qml | 1 + resources/qml/device-verification/Waiting.qml | 1 + resources/qml/emoji/EmojiButton.qml | 1 + resources/qml/emoji/EmojiPicker.qml | 1 + resources/qml/ui/Ripple.qml | 1 + resources/qml/voip/ActiveCallBar.qml | 1 + resources/qml/voip/CallDevices.qml | 1 + resources/qml/voip/CallInvite.qml | 1 + resources/qml/voip/CallInviteBar.qml | 1 + resources/qml/voip/DeviceError.qml | 1 + resources/qml/voip/PlaceCall.qml | 1 + resources/qml/voip/ScreenShare.qml | 1 + resources/qml/voip/VideoCall.qml | 1 + 49 files changed, 50 insertions(+) diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index f53dfe3a..07e68e10 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./ui" diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml index 993ccbea..e1b5c129 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./ui" diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml index 5fcc0ada..58805f48 100644 --- a/resources/qml/EncryptionIndicator.qml +++ b/resources/qml/EncryptionIndicator.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/ImageButton.qml b/resources/qml/ImageButton.qml index f25705f0..76cc0b42 100644 --- a/resources/qml/ImageButton.qml +++ b/resources/qml/ImageButton.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./ui" diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml index 073956f4..dfe7122d 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml index cf3013ba..7b651bc0 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./voip" diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index baf6b800..1bc10b60 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates" diff --git a/resources/qml/NhekoBusyIndicator.qml b/resources/qml/NhekoBusyIndicator.qml index e45d71ec..917e11dc 100644 --- a/resources/qml/NhekoBusyIndicator.qml +++ b/resources/qml/NhekoBusyIndicator.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index bd146dac..ca73cfd7 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtGraphicalEffects 1.0 diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index 335d5b29..f53c89ad 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.6 diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml index eb70585e..37b6f6cc 100644 --- a/resources/qml/ReplyPopup.qml +++ b/resources/qml/ReplyPopup.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates/" diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml index ed1a5bd9..2117e513 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import Qt.labs.platform 1.1 as Platform diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml index 2d315a6d..2dd56f27 100644 --- a/resources/qml/ScrollHelper.qml +++ b/resources/qml/ScrollHelper.qml @@ -1,7 +1,9 @@ // Copyright (C) 2016 Michael Bohlender, // Copyright (C) 2017 Christian Mollekopf, // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later + /* * Shamelessly stolen from: * https://cgit.kde.org/kube.git/tree/framework/qml/ScrollHelper.qml diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml index f2b6c12d..3d2d8278 100644 --- a/resources/qml/StatusIndicator.qml +++ b/resources/qml/StatusIndicator.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index 2761de26..ace7fc87 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates" diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 4efada8d..905926c4 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./delegates" diff --git a/resources/qml/ToggleButton.qml b/resources/qml/ToggleButton.qml index 3791a5b4..bd82e4f9 100644 --- a/resources/qml/ToggleButton.qml +++ b/resources/qml/ToggleButton.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index e158a8ba..444a4572 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/TypingIndicator.qml b/resources/qml/TypingIndicator.qml index 2e36e8ad..ffe88fb6 100644 --- a/resources/qml/TypingIndicator.qml +++ b/resources/qml/TypingIndicator.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml index 05d2a391..dbf13796 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "./device-verification" diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml index e73d6a50..293b7a78 100644 --- a/resources/qml/delegates/FileMessage.qml +++ b/resources/qml/delegates/FileMessage.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index 829d29ed..0521258e 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index dcf6eb3b..211e03a6 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.6 diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml index 6c604c5e..4f8fbfd2 100644 --- a/resources/qml/delegates/NoticeMessage.qml +++ b/resources/qml/delegates/NoticeMessage.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later TextMessage { diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml index 8efa491c..a3fa0d9e 100644 --- a/resources/qml/delegates/Pill.qml +++ b/resources/qml/delegates/Pill.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.5 diff --git a/resources/qml/delegates/Placeholder.qml b/resources/qml/delegates/Placeholder.qml index 50486439..addbc7e7 100644 --- a/resources/qml/delegates/Placeholder.qml +++ b/resources/qml/delegates/Placeholder.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import ".." diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index 7d00de21..f871e492 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtMultimedia 5.6 diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index 728e9739..6763b71b 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.12 diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml index ec0866ad..1624d95c 100644 --- a/resources/qml/delegates/TextMessage.qml +++ b/resources/qml/delegates/TextMessage.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import ".." diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml index 8d57c8d6..ae62c334 100644 --- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml +++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml index cb3cd8ab..fee0284a 100644 --- a/resources/qml/device-verification/DeviceVerification.qml +++ b/resources/qml/device-verification/DeviceVerification.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.10 diff --git a/resources/qml/device-verification/DigitVerification.qml b/resources/qml/device-verification/DigitVerification.qml index cf5f75ed..a387756d 100644 --- a/resources/qml/device-verification/DigitVerification.qml +++ b/resources/qml/device-verification/DigitVerification.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/EmojiElement.qml b/resources/qml/device-verification/EmojiElement.qml index 1b1ecbcf..f5c87a56 100644 --- a/resources/qml/device-verification/EmojiElement.qml +++ b/resources/qml/device-verification/EmojiElement.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml index e179b0ed..be9e3938 100644 --- a/resources/qml/device-verification/EmojiVerification.qml +++ b/resources/qml/device-verification/EmojiVerification.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/Failed.qml b/resources/qml/device-verification/Failed.qml index bc7dd5fc..5c71b02e 100644 --- a/resources/qml/device-verification/Failed.qml +++ b/resources/qml/device-verification/Failed.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml index 7af19b42..e8589cf7 100644 --- a/resources/qml/device-verification/NewVerificationRequest.qml +++ b/resources/qml/device-verification/NewVerificationRequest.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/Success.qml b/resources/qml/device-verification/Success.qml index a454d56e..f2657b12 100644 --- a/resources/qml/device-verification/Success.qml +++ b/resources/qml/device-verification/Success.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml index c8dc2a77..3bfa153d 100644 --- a/resources/qml/device-verification/Waiting.qml +++ b/resources/qml/device-verification/Waiting.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.3 diff --git a/resources/qml/emoji/EmojiButton.qml b/resources/qml/emoji/EmojiButton.qml index 71f8bc01..cec51d75 100644 --- a/resources/qml/emoji/EmojiButton.qml +++ b/resources/qml/emoji/EmojiButton.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index ed8fdec4..2db9dc07 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/ui/Ripple.qml b/resources/qml/ui/Ripple.qml index 7a8688f5..b240f421 100644 --- a/resources/qml/ui/Ripple.qml +++ b/resources/qml/ui/Ripple.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtGraphicalEffects 1.0 diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml index c8bd6037..68d3bc4a 100644 --- a/resources/qml/voip/ActiveCallBar.qml +++ b/resources/qml/voip/ActiveCallBar.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml index 02340b4b..11644797 100644 --- a/resources/qml/voip/CallDevices.qml +++ b/resources/qml/voip/CallDevices.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/voip/CallInvite.qml b/resources/qml/voip/CallInvite.qml index ed706f12..15d987e7 100644 --- a/resources/qml/voip/CallInvite.qml +++ b/resources/qml/voip/CallInvite.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml index c8474264..fe3f791f 100644 --- a/resources/qml/voip/CallInviteBar.qml +++ b/resources/qml/voip/CallInviteBar.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/DeviceError.qml b/resources/qml/voip/DeviceError.qml index a1ec7f12..05cfd409 100644 --- a/resources/qml/voip/DeviceError.qml +++ b/resources/qml/voip/DeviceError.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml index f340bb4e..c9aa8ea1 100644 --- a/resources/qml/voip/PlaceCall.qml +++ b/resources/qml/voip/PlaceCall.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/ScreenShare.qml b/resources/qml/voip/ScreenShare.qml index 908500ee..af473c04 100644 --- a/resources/qml/voip/ScreenShare.qml +++ b/resources/qml/voip/ScreenShare.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import "../" diff --git a/resources/qml/voip/VideoCall.qml b/resources/qml/voip/VideoCall.qml index 8dd5fb90..23651033 100644 --- a/resources/qml/voip/VideoCall.qml +++ b/resources/qml/voip/VideoCall.qml @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2021 Nheko Contributors +// // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9