From e3803ceb9a9fa437fbd41a2d70c3c37ab916480f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 3 Mar 2021 21:34:24 +0100 Subject: [PATCH 1/2] Avoid some duplicate property queries --- resources/qml/MessageView.qml | 2 +- resources/qml/ScrollHelper.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index eefde046..0503f467 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -203,7 +203,7 @@ ScrollView { TimelineRow { id: timelinerow - y: section.active && section.visible ? section.y + section.height : 0 + y: section.visible && section.active ? section.y + section.height : 0 } Connections { diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml index 7dc31464..ab955552 100644 --- a/resources/qml/ScrollHelper.qml +++ b/resources/qml/ScrollHelper.qml @@ -90,7 +90,7 @@ MouseArea { // Show the scrollbars flickable.flick(0, 0); flickable.contentY = newPos; - cancelFlickStateTimer.start(); + cancelFlickStateTimer.restart(); } Timer { From a6f0d2ea7d8eb359e7d9ca7b5aac91ffe9d140ec Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Fri, 5 Mar 2021 00:35:15 +0100 Subject: [PATCH 2/2] Update license headers --- .ci/format.sh | 2 +- .ci/licenses.sh | 14 +++++++++++ .gitlab-ci.yml | 5 +++- Makefile | 3 +++ resources/qml/Avatar.qml | 4 ++++ resources/qml/Completer.qml | 4 ++++ resources/qml/EncryptionIndicator.qml | 4 ++++ resources/qml/ImageButton.qml | 4 ++++ resources/qml/MatrixText.qml | 4 ++++ resources/qml/MessageInput.qml | 4 ++++ resources/qml/MessageView.qml | 4 ++++ resources/qml/NhekoBusyIndicator.qml | 4 ++++ resources/qml/PrivacyScreen.qml | 4 ++++ resources/qml/Reactions.qml | 4 ++++ resources/qml/ReplyPopup.qml | 4 ++++ resources/qml/RoomSettings.qml | 4 ++++ resources/qml/ScrollHelper.qml | 24 +++++-------------- resources/qml/StatusIndicator.qml | 4 ++++ resources/qml/TimelineRow.qml | 4 ++++ resources/qml/TimelineView.qml | 4 ++++ resources/qml/ToggleButton.qml | 4 ++++ resources/qml/TopBar.qml | 4 ++++ resources/qml/TypingIndicator.qml | 4 ++++ resources/qml/UserProfile.qml | 4 ++++ resources/qml/delegates/FileMessage.qml | 4 ++++ resources/qml/delegates/ImageMessage.qml | 4 ++++ resources/qml/delegates/MessageDelegate.qml | 4 ++++ resources/qml/delegates/NoticeMessage.qml | 4 ++++ resources/qml/delegates/Pill.qml | 4 ++++ resources/qml/delegates/Placeholder.qml | 4 ++++ .../qml/delegates/PlayableMediaMessage.qml | 4 ++++ resources/qml/delegates/Reply.qml | 4 ++++ resources/qml/delegates/TextMessage.qml | 4 ++++ .../AwaitingVerificationConfirmation.qml | 4 ++++ .../DeviceVerification.qml | 4 ++++ .../device-verification/DigitVerification.qml | 4 ++++ .../qml/device-verification/EmojiElement.qml | 4 ++++ .../device-verification/EmojiVerification.qml | 4 ++++ resources/qml/device-verification/Failed.qml | 4 ++++ .../NewVerificationRequest.qml | 4 ++++ resources/qml/device-verification/Success.qml | 4 ++++ resources/qml/device-verification/Waiting.qml | 4 ++++ resources/qml/emoji/EmojiButton.qml | 4 ++++ resources/qml/emoji/EmojiPicker.qml | 4 ++++ resources/qml/ui/Ripple.qml | 4 ++++ resources/qml/voip/ActiveCallBar.qml | 4 ++++ resources/qml/voip/CallDevices.qml | 4 ++++ resources/qml/voip/CallInvite.qml | 4 ++++ resources/qml/voip/CallInviteBar.qml | 4 ++++ resources/qml/voip/DeviceError.qml | 4 ++++ resources/qml/voip/PlaceCall.qml | 4 ++++ resources/qml/voip/ScreenShare.qml | 4 ++++ resources/qml/voip/VideoCall.qml | 4 ++++ src/AvatarProvider.cpp | 20 ++++------------ src/AvatarProvider.h | 20 ++++------------ src/BlurhashProvider.cpp | 4 ++++ src/BlurhashProvider.h | 4 ++++ src/Cache.cpp | 20 ++++------------ src/Cache.h | 20 ++++------------ src/CacheCryptoStructs.h | 4 ++++ src/CacheStructs.h | 4 ++++ src/Cache_p.h | 22 ++++------------- src/CallDevices.cpp | 4 ++++ src/CallDevices.h | 4 ++++ src/CallManager.cpp | 4 ++++ src/CallManager.h | 4 ++++ src/ChatPage.cpp | 20 ++++------------ src/ChatPage.h | 20 ++++------------ src/ColorImageProvider.cpp | 4 ++++ src/ColorImageProvider.h | 4 ++++ src/CommunitiesList.cpp | 4 ++++ src/CommunitiesList.h | 4 ++++ src/CommunitiesListItem.cpp | 4 ++++ src/CommunitiesListItem.h | 4 ++++ src/CompletionModelRoles.h | 4 ++++ src/CompletionProxyModel.cpp | 4 ++++ src/CompletionProxyModel.h | 4 ++++ src/Config.h | 4 ++++ src/DeviceVerificationFlow.cpp | 4 ++++ src/DeviceVerificationFlow.h | 4 ++++ src/EventAccessors.cpp | 4 ++++ src/EventAccessors.h | 4 ++++ src/InviteeItem.cpp | 4 ++++ src/InviteeItem.h | 4 ++++ src/Logging.cpp | 4 ++++ src/Logging.h | 4 ++++ src/LoginPage.cpp | 20 ++++------------ src/LoginPage.h | 20 ++++------------ src/MainWindow.cpp | 20 ++++------------ src/MainWindow.h | 20 ++++------------ src/MatrixClient.cpp | 4 ++++ src/MatrixClient.h | 4 ++++ src/MxcImageProvider.cpp | 4 ++++ src/MxcImageProvider.h | 4 ++++ src/Olm.cpp | 4 ++++ src/Olm.h | 4 ++++ src/QuickSwitcher.cpp | 20 ++++------------ src/QuickSwitcher.h | 20 ++++------------ src/RegisterPage.cpp | 20 ++++------------ src/RegisterPage.h | 20 ++++------------ src/RoomInfoListItem.cpp | 20 ++++------------ src/RoomInfoListItem.h | 20 ++++------------ src/RoomList.cpp | 20 ++++------------ src/RoomList.h | 20 ++++------------ src/RoomsModel.cpp | 4 ++++ src/RoomsModel.h | 4 ++++ src/SSOHandler.cpp | 4 ++++ src/SSOHandler.h | 4 ++++ src/SideBarActions.cpp | 4 ++++ src/SideBarActions.h | 4 ++++ src/Splitter.cpp | 20 ++++------------ src/Splitter.h | 20 ++++------------ src/TrayIcon.cpp | 20 ++++------------ src/TrayIcon.h | 20 ++++------------ src/UserInfoWidget.cpp | 21 ++++------------ src/UserInfoWidget.h | 20 ++++------------ src/UserSettingsPage.cpp | 20 ++++------------ src/UserSettingsPage.h | 20 ++++------------ src/UsersModel.cpp | 4 ++++ src/UsersModel.h | 4 ++++ src/Utils.cpp | 4 ++++ src/Utils.h | 4 ++++ src/WebRTCSession.cpp | 4 ++++ src/WebRTCSession.h | 4 ++++ src/WelcomePage.cpp | 20 ++++------------ src/WelcomePage.h | 4 ++++ src/dialogs/CreateRoom.cpp | 4 ++++ src/dialogs/CreateRoom.h | 4 ++++ src/dialogs/FallbackAuth.cpp | 4 ++++ src/dialogs/FallbackAuth.h | 4 ++++ src/dialogs/ImageOverlay.cpp | 20 ++++------------ src/dialogs/ImageOverlay.h | 20 ++++------------ src/dialogs/InviteUsers.cpp | 4 ++++ src/dialogs/InviteUsers.h | 4 ++++ src/dialogs/JoinRoom.cpp | 4 ++++ src/dialogs/JoinRoom.h | 4 ++++ src/dialogs/LeaveRoom.cpp | 4 ++++ src/dialogs/LeaveRoom.h | 4 ++++ src/dialogs/Logout.cpp | 20 ++++------------ src/dialogs/Logout.h | 20 ++++------------ src/dialogs/MemberList.cpp | 4 ++++ src/dialogs/MemberList.h | 4 ++++ src/dialogs/PreviewUploadOverlay.cpp | 20 ++++------------ src/dialogs/PreviewUploadOverlay.h | 20 ++++------------ src/dialogs/RawMessage.h | 4 ++++ src/dialogs/ReCaptcha.cpp | 4 ++++ src/dialogs/ReCaptcha.h | 4 ++++ src/dialogs/ReadReceipts.cpp | 4 ++++ src/dialogs/ReadReceipts.h | 4 ++++ src/emoji/EmojiModel.cpp | 4 ++++ src/emoji/EmojiModel.h | 4 ++++ src/emoji/EmojiSearchModel.h | 4 ++++ src/emoji/MacHelper.h | 4 ++++ src/emoji/Provider.cpp | 4 ++++ src/emoji/Provider.h | 20 ++++------------ src/main.cpp | 20 ++++------------ src/notifications/Manager.h | 4 ++++ src/notifications/ManagerLinux.cpp | 13 +++++----- src/notifications/ManagerWin.cpp | 4 ++++ src/popups/PopupItem.cpp | 4 ++++ src/popups/PopupItem.h | 4 ++++ src/popups/SuggestionsPopup.cpp | 4 ++++ src/popups/SuggestionsPopup.h | 4 ++++ src/popups/UserMentions.cpp | 4 ++++ src/popups/UserMentions.h | 4 ++++ src/timeline/DelegateChooser.cpp | 4 ++++ src/timeline/DelegateChooser.h | 4 ++++ src/timeline/EventStore.cpp | 4 ++++ src/timeline/EventStore.h | 4 ++++ src/timeline/InputBar.cpp | 4 ++++ src/timeline/InputBar.h | 4 ++++ src/timeline/Reaction.cpp | 4 ++++ src/timeline/Reaction.h | 4 ++++ src/timeline/TimelineModel.cpp | 4 ++++ src/timeline/TimelineModel.h | 4 ++++ src/timeline/TimelineViewManager.cpp | 4 ++++ src/timeline/TimelineViewManager.h | 4 ++++ src/ui/Avatar.cpp | 4 ++++ src/ui/Avatar.h | 4 ++++ src/ui/Badge.cpp | 4 ++++ src/ui/Badge.h | 4 ++++ src/ui/DropShadow.cpp | 4 ++++ src/ui/DropShadow.h | 4 ++++ src/ui/FlatButton.cpp | 4 ++++ src/ui/FlatButton.h | 4 ++++ src/ui/FloatingButton.cpp | 4 ++++ src/ui/FloatingButton.h | 4 ++++ src/ui/InfoMessage.cpp | 4 ++++ src/ui/InfoMessage.h | 4 ++++ src/ui/Label.cpp | 20 ++++------------ src/ui/Label.h | 4 ++++ src/ui/LoadingIndicator.cpp | 4 ++++ src/ui/LoadingIndicator.h | 4 ++++ src/ui/Menu.h | 4 ++++ src/ui/NhekoCursorShape.cpp | 4 ++++ src/ui/NhekoCursorShape.h | 4 ++++ src/ui/NhekoDropArea.cpp | 4 ++++ src/ui/NhekoDropArea.h | 4 ++++ src/ui/OverlayModal.cpp | 20 ++++------------ src/ui/OverlayModal.h | 20 ++++------------ src/ui/OverlayWidget.cpp | 4 ++++ src/ui/OverlayWidget.h | 4 ++++ src/ui/Painter.h | 4 ++++ src/ui/RaisedButton.cpp | 4 ++++ src/ui/RaisedButton.h | 4 ++++ src/ui/Ripple.cpp | 4 ++++ src/ui/Ripple.h | 4 ++++ src/ui/RippleOverlay.cpp | 4 ++++ src/ui/RippleOverlay.h | 4 ++++ src/ui/RoomSettings.cpp | 4 ++++ src/ui/RoomSettings.h | 4 ++++ src/ui/SnackBar.cpp | 4 ++++ src/ui/SnackBar.h | 4 ++++ src/ui/TextField.cpp | 4 ++++ src/ui/TextField.h | 4 ++++ src/ui/TextLabel.cpp | 4 ++++ src/ui/TextLabel.h | 4 ++++ src/ui/Theme.cpp | 4 ++++ src/ui/Theme.h | 4 ++++ src/ui/ThemeManager.cpp | 4 ++++ src/ui/ThemeManager.h | 4 ++++ src/ui/ToggleButton.cpp | 4 ++++ src/ui/ToggleButton.h | 4 ++++ src/ui/UserProfile.cpp | 4 ++++ src/ui/UserProfile.h | 4 ++++ 225 files changed, 911 insertions(+), 653 deletions(-) create mode 100755 .ci/licenses.sh diff --git a/.ci/format.sh b/.ci/format.sh index cdbc0464..2d922ee1 100755 --- a/.ci/format.sh +++ b/.ci/format.sh @@ -7,7 +7,7 @@ set -eu -FILES=$(find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \)) +FILES=$(find src -type f \( -iname "*.cpp" -o -iname "*.h" \)) for f in $FILES do diff --git a/.ci/licenses.sh b/.ci/licenses.sh new file mode 100755 index 00000000..cdcd305f --- /dev/null +++ b/.ci/licenses.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +# Runs the license update +# Return codes: +# - 1 there are files to be formatted +# - 0 everything looks fine + +set -eu + +FILES=$(find src resources/qml -type f \( -iname "*.cpp" -o -iname "*.h" -o -iname "*.qml" \)) + +reuse addheader --copyright="Nheko Contributors" --license="GPL-3.0-or-later" $FILES + +git diff --exit-code diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b44e740b..95fec7ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,9 +143,12 @@ linting: image: alpine:latest tags: [docker] before_script: - - apk update && apk add clang make git + - apk update && apk add clang make git python3 py3-pip + - export PATH="$PATH:/root/.local/bin" + - pip3 install --user reuse script: - make lint + - make license appimage-amd64: stage: build diff --git a/Makefile b/Makefile index 7f603dcb..f04ce540 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,9 @@ macos-app-install: lint: ./.ci/format.sh +license: + ./.ci/licenses.sh + image: docker build -t nheko-app-image . diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index f01911bb..07e68e10 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./ui" import QtGraphicalEffects 1.0 import QtQuick 2.6 diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml index f77f50e9..e1b5c129 100644 --- a/resources/qml/Completer.qml +++ b/resources/qml/Completer.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./ui" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml index 00efe9e4..ebb9031a 100644 --- a/resources/qml/EncryptionIndicator.qml +++ b/resources/qml/EncryptionIndicator.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.12 import QtQuick.Controls 2.1 import im.nheko 1.0 diff --git a/resources/qml/ImageButton.qml b/resources/qml/ImageButton.qml index 159c750f..76cc0b42 100644 --- a/resources/qml/ImageButton.qml +++ b/resources/qml/ImageButton.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./ui" import QtQuick 2.3 import QtQuick.Controls 2.3 diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml index 4ea15518..dfe7122d 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.5 import QtQuick.Controls 2.3 import im.nheko 1.0 diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml index c526aa2c..7b651bc0 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./voip" import QtQuick 2.12 import QtQuick.Controls 2.3 diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index 0503f467..bdde8d47 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./delegates" import QtGraphicalEffects 1.0 import QtQuick 2.12 diff --git a/resources/qml/NhekoBusyIndicator.qml b/resources/qml/NhekoBusyIndicator.qml index 89a40dd5..917e11dc 100644 --- a/resources/qml/NhekoBusyIndicator.qml +++ b/resources/qml/NhekoBusyIndicator.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 diff --git a/resources/qml/PrivacyScreen.qml b/resources/qml/PrivacyScreen.qml index 76520706..ca73cfd7 100644 --- a/resources/qml/PrivacyScreen.qml +++ b/resources/qml/PrivacyScreen.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtGraphicalEffects 1.0 import QtQuick 2.12 import im.nheko 1.0 diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index 836087ef..f53c89ad 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.6 import QtQuick.Controls 2.2 import im.nheko 1.0 diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml index c07c2c44..37b6f6cc 100644 --- a/resources/qml/ReplyPopup.qml +++ b/resources/qml/ReplyPopup.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./delegates/" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml index 1808ebf0..2117e513 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import Qt.labs.platform 1.1 as Platform import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml index ab955552..2dd56f27 100644 --- a/resources/qml/ScrollHelper.qml +++ b/resources/qml/ScrollHelper.qml @@ -1,21 +1,9 @@ -/* - * Copyright (C) 2016 Michael Bohlender, - * Copyright (C) 2017 Christian Mollekopf, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +// 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 165e730d..3d2d8278 100644 --- a/resources/qml/StatusIndicator.qml +++ b/resources/qml/StatusIndicator.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.5 import QtQuick.Controls 2.1 import im.nheko 1.0 diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index b731d29d..4c010ca4 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./delegates" import "./emoji" import QtQuick 2.12 diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 4eac48f2..905926c4 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./delegates" import "./device-verification" import "./emoji" diff --git a/resources/qml/ToggleButton.qml b/resources/qml/ToggleButton.qml index 9f079c62..bd82e4f9 100644 --- a/resources/qml/ToggleButton.qml +++ b/resources/qml/ToggleButton.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.5 import QtQuick 2.12 import QtQuick.Controls 2.12 diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 967aa11e..444a4572 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 diff --git a/resources/qml/TypingIndicator.qml b/resources/qml/TypingIndicator.qml index 239fd662..ffe88fb6 100644 --- a/resources/qml/TypingIndicator.qml +++ b/resources/qml/TypingIndicator.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml index 4797a38e..dbf13796 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "./device-verification" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml index 4bc202eb..293b7a78 100644 --- a/resources/qml/delegates/FileMessage.qml +++ b/resources/qml/delegates/FileMessage.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.12 import QtQuick.Layouts 1.2 import im.nheko 1.0 diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index 3bb9eb05..0521258e 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.12 import im.nheko 1.0 diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index 816ab183..211e03a6 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.6 import im.nheko 1.0 diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml index c38cb555..ef15ac26 100644 --- a/resources/qml/delegates/NoticeMessage.qml +++ b/resources/qml/delegates/NoticeMessage.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + TextMessage { font.italic: true color: colors.buttonText diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml index 88f6c7fd..a3fa0d9e 100644 --- a/resources/qml/delegates/Pill.qml +++ b/resources/qml/delegates/Pill.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.5 import QtQuick.Controls 2.1 diff --git a/resources/qml/delegates/Placeholder.qml b/resources/qml/delegates/Placeholder.qml index db023d8a..addbc7e7 100644 --- a/resources/qml/delegates/Placeholder.qml +++ b/resources/qml/delegates/Placeholder.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import ".." MatrixText { diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index 70f39e43..f871e492 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtMultimedia 5.6 import QtQuick 2.12 import QtQuick.Controls 2.1 diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index 28c4bf6e..6763b71b 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.12 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml index 82d0d0e4..1624d95c 100644 --- a/resources/qml/delegates/TextMessage.qml +++ b/resources/qml/delegates/TextMessage.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import ".." import im.nheko 1.0 diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml index 43f6d086..ae62c334 100644 --- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml +++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml index 93cbc9bd..fee0284a 100644 --- a/resources/qml/device-verification/DeviceVerification.qml +++ b/resources/qml/device-verification/DeviceVerification.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Window 2.10 diff --git a/resources/qml/device-verification/DigitVerification.qml b/resources/qml/device-verification/DigitVerification.qml index cfc246e0..a387756d 100644 --- a/resources/qml/device-verification/DigitVerification.qml +++ b/resources/qml/device-verification/DigitVerification.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/EmojiElement.qml b/resources/qml/device-verification/EmojiElement.qml index e498017e..f5c87a56 100644 --- a/resources/qml/device-verification/EmojiElement.qml +++ b/resources/qml/device-verification/EmojiElement.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml index 90cb4932..be9e3938 100644 --- a/resources/qml/device-verification/EmojiVerification.qml +++ b/resources/qml/device-verification/EmojiVerification.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/Failed.qml b/resources/qml/device-verification/Failed.qml index 5e44fc6e..5c71b02e 100644 --- a/resources/qml/device-verification/Failed.qml +++ b/resources/qml/device-verification/Failed.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml index b37c4641..e8589cf7 100644 --- a/resources/qml/device-verification/NewVerificationRequest.qml +++ b/resources/qml/device-verification/NewVerificationRequest.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/Success.qml b/resources/qml/device-verification/Success.qml index 1336df65..f2657b12 100644 --- a/resources/qml/device-verification/Success.qml +++ b/resources/qml/device-verification/Success.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml index 68c73d5d..3bfa153d 100644 --- a/resources/qml/device-verification/Waiting.qml +++ b/resources/qml/device-verification/Waiting.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 diff --git a/resources/qml/emoji/EmojiButton.qml b/resources/qml/emoji/EmojiButton.qml index dd7530a6..cec51d75 100644 --- a/resources/qml/emoji/EmojiButton.qml +++ b/resources/qml/emoji/EmojiButton.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtQuick 2.10 import QtQuick.Controls 2.1 diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index 7c75e010..2db9dc07 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtGraphicalEffects 1.0 import QtQuick 2.9 diff --git a/resources/qml/ui/Ripple.qml b/resources/qml/ui/Ripple.qml index ccf93c83..b240f421 100644 --- a/resources/qml/ui/Ripple.qml +++ b/resources/qml/ui/Ripple.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtGraphicalEffects 1.0 import QtQuick 2.10 import QtQuick.Controls 2.3 diff --git a/resources/qml/voip/ActiveCallBar.qml b/resources/qml/voip/ActiveCallBar.qml index d7f3c6fd..68d3bc4a 100644 --- a/resources/qml/voip/ActiveCallBar.qml +++ b/resources/qml/voip/ActiveCallBar.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml index 3c1108fb..11644797 100644 --- a/resources/qml/voip/CallDevices.qml +++ b/resources/qml/voip/CallDevices.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 diff --git a/resources/qml/voip/CallInvite.qml b/resources/qml/voip/CallInvite.qml index df3343ed..15d987e7 100644 --- a/resources/qml/voip/CallInvite.qml +++ b/resources/qml/voip/CallInvite.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml index 7fc8cd05..fe3f791f 100644 --- a/resources/qml/voip/CallInviteBar.qml +++ b/resources/qml/voip/CallInviteBar.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/voip/DeviceError.qml b/resources/qml/voip/DeviceError.qml index a5000ada..05cfd409 100644 --- a/resources/qml/voip/DeviceError.qml +++ b/resources/qml/voip/DeviceError.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.2 diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml index 5dbeb6e1..c9aa8ea1 100644 --- a/resources/qml/voip/PlaceCall.qml +++ b/resources/qml/voip/PlaceCall.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/voip/ScreenShare.qml b/resources/qml/voip/ScreenShare.qml index 6402e563..af473c04 100644 --- a/resources/qml/voip/ScreenShare.qml +++ b/resources/qml/voip/ScreenShare.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import "../" import QtQuick 2.9 import QtQuick.Controls 2.3 diff --git a/resources/qml/voip/VideoCall.qml b/resources/qml/voip/VideoCall.qml index 14408b6e..23651033 100644 --- a/resources/qml/voip/VideoCall.qml +++ b/resources/qml/voip/VideoCall.qml @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.9 import org.freedesktop.gstreamer.GLVideoItem 1.0 diff --git a/src/AvatarProvider.cpp b/src/AvatarProvider.cpp index 4c3969be..1834e040 100644 --- a/src/AvatarProvider.cpp +++ b/src/AvatarProvider.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/AvatarProvider.h b/src/AvatarProvider.h index 47ed028e..0bea1a8f 100644 --- a/src/AvatarProvider.h +++ b/src/AvatarProvider.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/BlurhashProvider.cpp b/src/BlurhashProvider.cpp index acaef400..12a27b82 100644 --- a/src/BlurhashProvider.cpp +++ b/src/BlurhashProvider.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "BlurhashProvider.h" #include diff --git a/src/BlurhashProvider.h b/src/BlurhashProvider.h index 48c945de..ee89302c 100644 --- a/src/BlurhashProvider.h +++ b/src/BlurhashProvider.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/Cache.cpp b/src/Cache.cpp index dccf1e70..f942d1be 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/Cache.h b/src/Cache.h index e60fc970..f7e5f749 100644 --- a/src/Cache.h +++ b/src/Cache.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/CacheCryptoStructs.h b/src/CacheCryptoStructs.h index eb2cc445..383d7b05 100644 --- a/src/CacheCryptoStructs.h +++ b/src/CacheCryptoStructs.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/CacheStructs.h b/src/CacheStructs.h index 10f8cc54..ad9aab98 100644 --- a/src/CacheStructs.h +++ b/src/CacheStructs.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/Cache_p.h b/src/Cache_p.h index eb5506c3..09fc277d 100644 --- a/src/Cache_p.h +++ b/src/Cache_p.h @@ -1,20 +1,8 @@ -/* - * nheko Copyright (C) 2019 The nheko authors - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2019 The nheko authors +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/CallDevices.cpp b/src/CallDevices.cpp index f182c133..0dfc2aad 100644 --- a/src/CallDevices.cpp +++ b/src/CallDevices.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/CallDevices.h b/src/CallDevices.h index 6d9e18c6..69325f97 100644 --- a/src/CallDevices.h +++ b/src/CallDevices.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/CallManager.cpp b/src/CallManager.cpp index eec5922e..4931a26a 100644 --- a/src/CallManager.cpp +++ b/src/CallManager.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/CallManager.h b/src/CallManager.h index be3c824d..1d973191 100644 --- a/src/CallManager.h +++ b/src/CallManager.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index c21c3571..862d1e3b 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/ChatPage.h b/src/ChatPage.h index dc6b8299..6c16926d 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/ColorImageProvider.cpp b/src/ColorImageProvider.cpp index c580c394..41fd5d8f 100644 --- a/src/ColorImageProvider.cpp +++ b/src/ColorImageProvider.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "ColorImageProvider.h" #include diff --git a/src/ColorImageProvider.h b/src/ColorImageProvider.h index 21f36c12..9ae8c85e 100644 --- a/src/ColorImageProvider.h +++ b/src/ColorImageProvider.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include class ColorImageProvider : public QQuickImageProvider diff --git a/src/CommunitiesList.cpp b/src/CommunitiesList.cpp index 8bc71d91..f644ebee 100644 --- a/src/CommunitiesList.cpp +++ b/src/CommunitiesList.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "CommunitiesList.h" #include "Cache.h" #include "Logging.h" diff --git a/src/CommunitiesList.h b/src/CommunitiesList.h index 5113e7ed..2586f6f5 100644 --- a/src/CommunitiesList.h +++ b/src/CommunitiesList.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/CommunitiesListItem.cpp b/src/CommunitiesListItem.cpp index 01c39fdc..3a121dc0 100644 --- a/src/CommunitiesListItem.cpp +++ b/src/CommunitiesListItem.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "CommunitiesListItem.h" #include diff --git a/src/CommunitiesListItem.h b/src/CommunitiesListItem.h index a80e3200..006511c8 100644 --- a/src/CommunitiesListItem.h +++ b/src/CommunitiesListItem.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/CompletionModelRoles.h b/src/CompletionModelRoles.h index 7c7307d3..8505e761 100644 --- a/src/CompletionModelRoles.h +++ b/src/CompletionModelRoles.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/CompletionProxyModel.cpp b/src/CompletionProxyModel.cpp index fa5b3c2d..44a14911 100644 --- a/src/CompletionProxyModel.cpp +++ b/src/CompletionProxyModel.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "CompletionProxyModel.h" #include diff --git a/src/CompletionProxyModel.h b/src/CompletionProxyModel.h index 1517505f..1b8e18f7 100644 --- a/src/CompletionProxyModel.h +++ b/src/CompletionProxyModel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once // Class for showing a limited amount of completions at a time diff --git a/src/Config.h b/src/Config.h index c0624709..d3fee836 100644 --- a/src/Config.h +++ b/src/Config.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/DeviceVerificationFlow.cpp b/src/DeviceVerificationFlow.cpp index c6277a9d..90670b28 100644 --- a/src/DeviceVerificationFlow.cpp +++ b/src/DeviceVerificationFlow.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "DeviceVerificationFlow.h" #include "Cache.h" diff --git a/src/DeviceVerificationFlow.h b/src/DeviceVerificationFlow.h index 6c613545..4685a450 100644 --- a/src/DeviceVerificationFlow.h +++ b/src/DeviceVerificationFlow.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/EventAccessors.cpp b/src/EventAccessors.cpp index e6bc61b0..cfc41a98 100644 --- a/src/EventAccessors.cpp +++ b/src/EventAccessors.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "EventAccessors.h" #include diff --git a/src/EventAccessors.h b/src/EventAccessors.h index 7bf695fc..ced159c1 100644 --- a/src/EventAccessors.h +++ b/src/EventAccessors.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/InviteeItem.cpp b/src/InviteeItem.cpp index a6b471dc..27f02560 100644 --- a/src/InviteeItem.cpp +++ b/src/InviteeItem.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/InviteeItem.h b/src/InviteeItem.h index 54c61938..014541ea 100644 --- a/src/InviteeItem.h +++ b/src/InviteeItem.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/Logging.cpp b/src/Logging.cpp index e537ef7a..436de811 100644 --- a/src/Logging.cpp +++ b/src/Logging.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "Logging.h" #include "config/nheko.h" diff --git a/src/Logging.h b/src/Logging.h index f572afae..e09705d1 100644 --- a/src/Logging.h +++ b/src/Logging.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index cd54431d..8e2aef26 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/LoginPage.h b/src/LoginPage.h index f6428cbb..2e1eb9b9 100644 --- a/src/LoginPage.h +++ b/src/LoginPage.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index ae532ef3..c405f853 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/MainWindow.h b/src/MainWindow.h index 4a8ea642..4122e4c1 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/MatrixClient.cpp b/src/MatrixClient.cpp index 669dc270..196a9322 100644 --- a/src/MatrixClient.cpp +++ b/src/MatrixClient.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "MatrixClient.h" #include diff --git a/src/MatrixClient.h b/src/MatrixClient.h index 4db51095..605ba5e0 100644 --- a/src/MatrixClient.h +++ b/src/MatrixClient.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp index b48fe011..e4f629a5 100644 --- a/src/MxcImageProvider.cpp +++ b/src/MxcImageProvider.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "MxcImageProvider.h" #include diff --git a/src/MxcImageProvider.h b/src/MxcImageProvider.h index 2c197a13..f7580bca 100644 --- a/src/MxcImageProvider.h +++ b/src/MxcImageProvider.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/Olm.cpp b/src/Olm.cpp index 54be4751..311aeb7f 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "Olm.h" #include diff --git a/src/Olm.h b/src/Olm.h index 7058782b..bcb486a3 100644 --- a/src/Olm.h +++ b/src/Olm.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/QuickSwitcher.cpp b/src/QuickSwitcher.cpp index 046c774d..ad2be23d 100644 --- a/src/QuickSwitcher.cpp +++ b/src/QuickSwitcher.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/QuickSwitcher.h b/src/QuickSwitcher.h index 5bc31650..41c53016 100644 --- a/src/QuickSwitcher.h +++ b/src/QuickSwitcher.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index 004d5b98..6425e0b5 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/RegisterPage.h b/src/RegisterPage.h index 6d212955..2f05d04c 100644 --- a/src/RegisterPage.h +++ b/src/RegisterPage.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/RoomInfoListItem.cpp b/src/RoomInfoListItem.cpp index b5ba5af1..d74f9dc9 100644 --- a/src/RoomInfoListItem.cpp +++ b/src/RoomInfoListItem.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/RoomInfoListItem.h b/src/RoomInfoListItem.h index c2826f6f..a5e0009e 100644 --- a/src/RoomInfoListItem.h +++ b/src/RoomInfoListItem.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/RoomList.cpp b/src/RoomList.cpp index 10042c94..8a807e71 100644 --- a/src/RoomList.cpp +++ b/src/RoomList.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/RoomList.h b/src/RoomList.h index 5350a2ab..74152c55 100644 --- a/src/RoomList.h +++ b/src/RoomList.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/RoomsModel.cpp b/src/RoomsModel.cpp index 4286f87b..1c3085ea 100644 --- a/src/RoomsModel.cpp +++ b/src/RoomsModel.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "RoomsModel.h" #include diff --git a/src/RoomsModel.h b/src/RoomsModel.h index 0e006448..255f207c 100644 --- a/src/RoomsModel.h +++ b/src/RoomsModel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include "Cache.h" diff --git a/src/SSOHandler.cpp b/src/SSOHandler.cpp index cacbbaa9..8fd0828c 100644 --- a/src/SSOHandler.cpp +++ b/src/SSOHandler.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "SSOHandler.h" #include diff --git a/src/SSOHandler.h b/src/SSOHandler.h index 325b7a58..bd0d424d 100644 --- a/src/SSOHandler.h +++ b/src/SSOHandler.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "httplib.h" #include diff --git a/src/SideBarActions.cpp b/src/SideBarActions.cpp index 5af01cc2..0b7756f0 100644 --- a/src/SideBarActions.cpp +++ b/src/SideBarActions.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/SideBarActions.h b/src/SideBarActions.h index 662750b3..566aa76b 100644 --- a/src/SideBarActions.h +++ b/src/SideBarActions.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/Splitter.cpp b/src/Splitter.cpp index a2757d8e..15e3f5c5 100644 --- a/src/Splitter.cpp +++ b/src/Splitter.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include diff --git a/src/Splitter.h b/src/Splitter.h index 7bde89de..94622f89 100644 --- a/src/Splitter.h +++ b/src/Splitter.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp index 6ab011d1..f2a01432 100644 --- a/src/TrayIcon.cpp +++ b/src/TrayIcon.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/TrayIcon.h b/src/TrayIcon.h index 24ac81da..10dfafc5 100644 --- a/src/TrayIcon.h +++ b/src/TrayIcon.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/UserInfoWidget.cpp b/src/UserInfoWidget.cpp index 5bcb44a9..3d526b8b 100644 --- a/src/UserInfoWidget.cpp +++ b/src/UserInfoWidget.cpp @@ -1,20 +1,7 @@ - -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/UserInfoWidget.h b/src/UserInfoWidget.h index bfcfbc0b..5aec1cda 100644 --- a/src/UserInfoWidget.h +++ b/src/UserInfoWidget.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 7410e35b..0714ed40 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index dfb5acf4..f0b452cb 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/UsersModel.cpp b/src/UsersModel.cpp index 4be37503..dd77e512 100644 --- a/src/UsersModel.cpp +++ b/src/UsersModel.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "UsersModel.h" #include "Cache.h" diff --git a/src/UsersModel.h b/src/UsersModel.h index cd9b780c..5bc94b0f 100644 --- a/src/UsersModel.h +++ b/src/UsersModel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/Utils.cpp b/src/Utils.cpp index 991fa550..07fe8a00 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "Utils.h" #include diff --git a/src/Utils.h b/src/Utils.h index 6de3d458..373bed01 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/WebRTCSession.cpp b/src/WebRTCSession.cpp index 74855835..b78b28d7 100644 --- a/src/WebRTCSession.cpp +++ b/src/WebRTCSession.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/WebRTCSession.h b/src/WebRTCSession.h index 7c77a94d..5d2e660f 100644 --- a/src/WebRTCSession.h +++ b/src/WebRTCSession.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/WelcomePage.cpp b/src/WelcomePage.cpp index 22b73ac7..2cce7b8d 100644 --- a/src/WelcomePage.cpp +++ b/src/WelcomePage.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/WelcomePage.h b/src/WelcomePage.h index ae660215..d2dcc0c9 100644 --- a/src/WelcomePage.h +++ b/src/WelcomePage.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/CreateRoom.cpp b/src/dialogs/CreateRoom.cpp index fed46e02..ba385436 100644 --- a/src/dialogs/CreateRoom.cpp +++ b/src/dialogs/CreateRoom.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/CreateRoom.h b/src/dialogs/CreateRoom.h index a482a636..d4c6474d 100644 --- a/src/dialogs/CreateRoom.h +++ b/src/dialogs/CreateRoom.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/FallbackAuth.cpp b/src/dialogs/FallbackAuth.cpp index a0633c1e..c7b179f4 100644 --- a/src/dialogs/FallbackAuth.cpp +++ b/src/dialogs/FallbackAuth.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/FallbackAuth.h b/src/dialogs/FallbackAuth.h index 245fa03e..8e4e28ea 100644 --- a/src/dialogs/FallbackAuth.h +++ b/src/dialogs/FallbackAuth.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/ImageOverlay.cpp b/src/dialogs/ImageOverlay.cpp index e075fb67..f38b29f5 100644 --- a/src/dialogs/ImageOverlay.cpp +++ b/src/dialogs/ImageOverlay.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/dialogs/ImageOverlay.h b/src/dialogs/ImageOverlay.h index bf566ce4..93b6afdc 100644 --- a/src/dialogs/ImageOverlay.h +++ b/src/dialogs/ImageOverlay.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/dialogs/InviteUsers.cpp b/src/dialogs/InviteUsers.cpp index 8f1097fa..9dd6085f 100644 --- a/src/dialogs/InviteUsers.cpp +++ b/src/dialogs/InviteUsers.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/InviteUsers.h b/src/dialogs/InviteUsers.h index 684f60b4..e40183c1 100644 --- a/src/dialogs/InviteUsers.h +++ b/src/dialogs/InviteUsers.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/JoinRoom.cpp b/src/dialogs/JoinRoom.cpp index b5c26e69..dc2e4804 100644 --- a/src/dialogs/JoinRoom.cpp +++ b/src/dialogs/JoinRoom.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/JoinRoom.h b/src/dialogs/JoinRoom.h index 257cb950..f399f1fb 100644 --- a/src/dialogs/JoinRoom.h +++ b/src/dialogs/JoinRoom.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/LeaveRoom.cpp b/src/dialogs/LeaveRoom.cpp index e3aea439..5246d693 100644 --- a/src/dialogs/LeaveRoom.cpp +++ b/src/dialogs/LeaveRoom.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/LeaveRoom.h b/src/dialogs/LeaveRoom.h index a35cf04d..e9465579 100644 --- a/src/dialogs/LeaveRoom.h +++ b/src/dialogs/LeaveRoom.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/Logout.cpp b/src/dialogs/Logout.cpp index 7c44b23c..fdfc3338 100644 --- a/src/dialogs/Logout.cpp +++ b/src/dialogs/Logout.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/dialogs/Logout.h b/src/dialogs/Logout.h index b7e962eb..9d8d0f4b 100644 --- a/src/dialogs/Logout.h +++ b/src/dialogs/Logout.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp index 54e7bf96..21eb72b0 100644 --- a/src/dialogs/MemberList.cpp +++ b/src/dialogs/MemberList.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/MemberList.h b/src/dialogs/MemberList.h index c01b6829..b822eec8 100644 --- a/src/dialogs/MemberList.h +++ b/src/dialogs/MemberList.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/PreviewUploadOverlay.cpp b/src/dialogs/PreviewUploadOverlay.cpp index bd207642..55421a7d 100644 --- a/src/dialogs/PreviewUploadOverlay.cpp +++ b/src/dialogs/PreviewUploadOverlay.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/dialogs/PreviewUploadOverlay.h b/src/dialogs/PreviewUploadOverlay.h index 5139e3f2..7493f67c 100644 --- a/src/dialogs/PreviewUploadOverlay.h +++ b/src/dialogs/PreviewUploadOverlay.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/dialogs/RawMessage.h b/src/dialogs/RawMessage.h index c69fad60..e95f675c 100644 --- a/src/dialogs/RawMessage.h +++ b/src/dialogs/RawMessage.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/ReCaptcha.cpp b/src/dialogs/ReCaptcha.cpp index 21dc8c77..c7b95f1a 100644 --- a/src/dialogs/ReCaptcha.cpp +++ b/src/dialogs/ReCaptcha.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/ReCaptcha.h b/src/dialogs/ReCaptcha.h index 88ff3722..0c9f7539 100644 --- a/src/dialogs/ReCaptcha.h +++ b/src/dialogs/ReCaptcha.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp index 7dcffc28..fa7132fd 100644 --- a/src/dialogs/ReadReceipts.cpp +++ b/src/dialogs/ReadReceipts.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/dialogs/ReadReceipts.h b/src/dialogs/ReadReceipts.h index 2e7a0217..5c6c5d2b 100644 --- a/src/dialogs/ReadReceipts.h +++ b/src/dialogs/ReadReceipts.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/emoji/EmojiModel.cpp b/src/emoji/EmojiModel.cpp index f207c740..70b85934 100644 --- a/src/emoji/EmojiModel.cpp +++ b/src/emoji/EmojiModel.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "EmojiModel.h" #include diff --git a/src/emoji/EmojiModel.h b/src/emoji/EmojiModel.h index 938db46d..1a8bf029 100644 --- a/src/emoji/EmojiModel.h +++ b/src/emoji/EmojiModel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/emoji/EmojiSearchModel.h b/src/emoji/EmojiSearchModel.h index 7dbe6732..64af83dd 100644 --- a/src/emoji/EmojiSearchModel.h +++ b/src/emoji/EmojiSearchModel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include "EmojiModel.h" diff --git a/src/emoji/MacHelper.h b/src/emoji/MacHelper.h index a2e94158..b3e2e631 100644 --- a/src/emoji/MacHelper.h +++ b/src/emoji/MacHelper.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/emoji/Provider.cpp b/src/emoji/Provider.cpp index b780542c..70ac474e 100644 --- a/src/emoji/Provider.cpp +++ b/src/emoji/Provider.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "emoji/Provider.h" using namespace emoji; diff --git a/src/emoji/Provider.h b/src/emoji/Provider.h index 068162f4..43c880a2 100644 --- a/src/emoji/Provider.h +++ b/src/emoji/Provider.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/main.cpp b/src/main.cpp index 0c7c9f60..fe1a9ee3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include diff --git a/src/notifications/Manager.h b/src/notifications/Manager.h index 950740ba..e2b3236a 100644 --- a/src/notifications/Manager.h +++ b/src/notifications/Manager.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp index c7fd4023..a222bd36 100644 --- a/src/notifications/ManagerLinux.cpp +++ b/src/notifications/ManagerLinux.cpp @@ -44,12 +44,11 @@ NotificationsManager::NotificationsManager(QObject *parent) SLOT(notificationReplied(uint, QString))); } -/** - * This function is based on code from - * https://github.com/rohieb/StratumsphereTrayIcon - * Copyright (C) 2012 Roland Hieber - * Licensed under the GNU General Public License, version 3 - */ +// SPDX-FileCopyrightText: 2012 Roland Hieber +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + void NotificationsManager::postNotification(const mtx::responses::Notification ¬ification, const QImage &icon) @@ -174,7 +173,7 @@ NotificationsManager::notificationClosed(uint id, uint reason) * http://www.clementine-player.org) and licensed under the GNU General Public * License, version 3 or later. * - * Copyright 2010, David Sansome + * SPDX-FileCopyrightText: 2010 David Sansome */ QDBusArgument & operator<<(QDBusArgument &arg, const QImage &image) diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp index 85abe642..3152d84f 100644 --- a/src/notifications/ManagerWin.cpp +++ b/src/notifications/ManagerWin.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "notifications/Manager.h" #include "wintoastlib.h" diff --git a/src/popups/PopupItem.cpp b/src/popups/PopupItem.cpp index 37fe142a..2daa6143 100644 --- a/src/popups/PopupItem.cpp +++ b/src/popups/PopupItem.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/popups/PopupItem.h b/src/popups/PopupItem.h index 499d6b33..fc24915e 100644 --- a/src/popups/PopupItem.h +++ b/src/popups/PopupItem.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/popups/SuggestionsPopup.cpp b/src/popups/SuggestionsPopup.cpp index 8add4313..7b545d61 100644 --- a/src/popups/SuggestionsPopup.cpp +++ b/src/popups/SuggestionsPopup.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/popups/SuggestionsPopup.h b/src/popups/SuggestionsPopup.h index 6a0157a1..281edddb 100644 --- a/src/popups/SuggestionsPopup.h +++ b/src/popups/SuggestionsPopup.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/popups/UserMentions.cpp b/src/popups/UserMentions.cpp index 23a679f1..56b57503 100644 --- a/src/popups/UserMentions.cpp +++ b/src/popups/UserMentions.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/popups/UserMentions.h b/src/popups/UserMentions.h index 885fe67d..f0b662d8 100644 --- a/src/popups/UserMentions.h +++ b/src/popups/UserMentions.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/timeline/DelegateChooser.cpp b/src/timeline/DelegateChooser.cpp index 8598fa77..39c8fa17 100644 --- a/src/timeline/DelegateChooser.cpp +++ b/src/timeline/DelegateChooser.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "DelegateChooser.h" #include "Logging.h" diff --git a/src/timeline/DelegateChooser.h b/src/timeline/DelegateChooser.h index 2524b068..22e423a2 100644 --- a/src/timeline/DelegateChooser.h +++ b/src/timeline/DelegateChooser.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + // A DelegateChooser like the one, that was added to Qt5.12 (in labs), but compatible with older Qt // versions see KDE/kquickitemviews see qtdeclarative/qqmldelagatecomponent diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index 94d43a83..6104ad00 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "EventStore.h" #include diff --git a/src/timeline/EventStore.h b/src/timeline/EventStore.h index ced7bdc0..a10c2126 100644 --- a/src/timeline/EventStore.h +++ b/src/timeline/EventStore.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index b1580f97..490fccc3 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "InputBar.h" #include diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h index 4cb6da7b..5af46b0d 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/timeline/Reaction.cpp b/src/timeline/Reaction.cpp index 343c4649..963e04d6 100644 --- a/src/timeline/Reaction.cpp +++ b/src/timeline/Reaction.cpp @@ -1 +1,5 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "Reaction.h" diff --git a/src/timeline/Reaction.h b/src/timeline/Reaction.h index 5f122e0a..47dac617 100644 --- a/src/timeline/Reaction.h +++ b/src/timeline/Reaction.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 3b1bbd6c..7afc75f7 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "TimelineModel.h" #include diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index e02539bb..06da95c6 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index f2e6d571..74427855 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "TimelineViewManager.h" #include diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h index 61fce574..097fccfc 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Avatar.cpp b/src/ui/Avatar.cpp index 0d1bb924..53e72618 100644 --- a/src/ui/Avatar.cpp +++ b/src/ui/Avatar.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/ui/Avatar.h b/src/ui/Avatar.h index 229a980d..bbf05be3 100644 --- a/src/ui/Avatar.h +++ b/src/ui/Avatar.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Badge.cpp b/src/ui/Badge.cpp index 6701f9b7..66210d06 100644 --- a/src/ui/Badge.cpp +++ b/src/ui/Badge.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include "Badge.h" diff --git a/src/ui/Badge.h b/src/ui/Badge.h index 748b56fd..98e16873 100644 --- a/src/ui/Badge.h +++ b/src/ui/Badge.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/DropShadow.cpp b/src/ui/DropShadow.cpp index d437975c..a413e3f7 100644 --- a/src/ui/DropShadow.cpp +++ b/src/ui/DropShadow.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "DropShadow.h" #include diff --git a/src/ui/DropShadow.h b/src/ui/DropShadow.h index 6997e1a0..4ace4731 100644 --- a/src/ui/DropShadow.h +++ b/src/ui/DropShadow.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/FlatButton.cpp b/src/ui/FlatButton.cpp index 6660c58d..c036401b 100644 --- a/src/ui/FlatButton.cpp +++ b/src/ui/FlatButton.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/ui/FlatButton.h b/src/ui/FlatButton.h index 3749a0d9..c79945b7 100644 --- a/src/ui/FlatButton.h +++ b/src/ui/FlatButton.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/FloatingButton.cpp b/src/ui/FloatingButton.cpp index f3a09ccd..95b6ae1d 100644 --- a/src/ui/FloatingButton.cpp +++ b/src/ui/FloatingButton.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include diff --git a/src/ui/FloatingButton.h b/src/ui/FloatingButton.h index 91e99ebb..b59b3854 100644 --- a/src/ui/FloatingButton.h +++ b/src/ui/FloatingButton.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include "RaisedButton.h" diff --git a/src/ui/InfoMessage.cpp b/src/ui/InfoMessage.cpp index 0b69564d..fb3b306a 100644 --- a/src/ui/InfoMessage.cpp +++ b/src/ui/InfoMessage.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "InfoMessage.h" #include "Config.h" diff --git a/src/ui/InfoMessage.h b/src/ui/InfoMessage.h index f8f457e3..cc0c57dc 100644 --- a/src/ui/InfoMessage.h +++ b/src/ui/InfoMessage.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Label.cpp b/src/ui/Label.cpp index 8bd8c54e..2e8f8e1d 100644 --- a/src/ui/Label.cpp +++ b/src/ui/Label.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include "Label.h" #include diff --git a/src/ui/Label.h b/src/ui/Label.h index 09cf27d7..a3eb511b 100644 --- a/src/ui/Label.h +++ b/src/ui/Label.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/LoadingIndicator.cpp b/src/ui/LoadingIndicator.cpp index d2b1240d..fb3c761c 100644 --- a/src/ui/LoadingIndicator.cpp +++ b/src/ui/LoadingIndicator.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "LoadingIndicator.h" #include diff --git a/src/ui/LoadingIndicator.h b/src/ui/LoadingIndicator.h index 678ef611..ba56b449 100644 --- a/src/ui/LoadingIndicator.h +++ b/src/ui/LoadingIndicator.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Menu.h b/src/ui/Menu.h index d0427851..fd2946dd 100644 --- a/src/ui/Menu.h +++ b/src/ui/Menu.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/NhekoCursorShape.cpp b/src/ui/NhekoCursorShape.cpp index 06b0a321..b36eedbd 100644 --- a/src/ui/NhekoCursorShape.cpp +++ b/src/ui/NhekoCursorShape.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "NhekoCursorShape.h" #include diff --git a/src/ui/NhekoCursorShape.h b/src/ui/NhekoCursorShape.h index 2eab5e42..6f6a2b82 100644 --- a/src/ui/NhekoCursorShape.h +++ b/src/ui/NhekoCursorShape.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once // see diff --git a/src/ui/NhekoDropArea.cpp b/src/ui/NhekoDropArea.cpp index 14b71524..54f48d3c 100644 --- a/src/ui/NhekoDropArea.cpp +++ b/src/ui/NhekoDropArea.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "NhekoDropArea.h" #include diff --git a/src/ui/NhekoDropArea.h b/src/ui/NhekoDropArea.h index b03620f2..9fbf1737 100644 --- a/src/ui/NhekoDropArea.h +++ b/src/ui/NhekoDropArea.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include class NhekoDropArea : public QQuickItem diff --git a/src/ui/OverlayModal.cpp b/src/ui/OverlayModal.cpp index abd1827a..f5f28732 100644 --- a/src/ui/OverlayModal.cpp +++ b/src/ui/OverlayModal.cpp @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #include #include diff --git a/src/ui/OverlayModal.h b/src/ui/OverlayModal.h index e1fe8ec0..005614fa 100644 --- a/src/ui/OverlayModal.h +++ b/src/ui/OverlayModal.h @@ -1,19 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// SPDX-FileCopyrightText: 2017 Konstantinos Sideris +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/ui/OverlayWidget.cpp b/src/ui/OverlayWidget.cpp index a32d86b6..c8c95581 100644 --- a/src/ui/OverlayWidget.cpp +++ b/src/ui/OverlayWidget.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "OverlayWidget.h" #include diff --git a/src/ui/OverlayWidget.h b/src/ui/OverlayWidget.h index ed3ef52d..05bb8696 100644 --- a/src/ui/OverlayWidget.h +++ b/src/ui/OverlayWidget.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Painter.h b/src/ui/Painter.h index c69dca95..3353f0c7 100644 --- a/src/ui/Painter.h +++ b/src/ui/Painter.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/RaisedButton.cpp b/src/ui/RaisedButton.cpp index c519f84f..563cb8e5 100644 --- a/src/ui/RaisedButton.cpp +++ b/src/ui/RaisedButton.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include diff --git a/src/ui/RaisedButton.h b/src/ui/RaisedButton.h index 47ef1acd..dcb579bb 100644 --- a/src/ui/RaisedButton.h +++ b/src/ui/RaisedButton.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Ripple.cpp b/src/ui/Ripple.cpp index ef8a62dd..f0455f0b 100644 --- a/src/ui/Ripple.cpp +++ b/src/ui/Ripple.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "Ripple.h" #include "RippleOverlay.h" diff --git a/src/ui/Ripple.h b/src/ui/Ripple.h index 3701fb6c..2ad42b9e 100644 --- a/src/ui/Ripple.h +++ b/src/ui/Ripple.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/RippleOverlay.cpp b/src/ui/RippleOverlay.cpp index 20e98c0f..00915deb 100644 --- a/src/ui/RippleOverlay.cpp +++ b/src/ui/RippleOverlay.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include "Ripple.h" diff --git a/src/ui/RippleOverlay.h b/src/ui/RippleOverlay.h index 5d12aff7..7ae3e4f1 100644 --- a/src/ui/RippleOverlay.h +++ b/src/ui/RippleOverlay.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp index a264c78b..cb82cc4e 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "RoomSettings.h" #include diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h index 25c6e588..367f3111 100644 --- a/src/ui/RoomSettings.h +++ b/src/ui/RoomSettings.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp index 51a0ff38..03609802 100644 --- a/src/ui/SnackBar.cpp +++ b/src/ui/SnackBar.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include diff --git a/src/ui/SnackBar.h b/src/ui/SnackBar.h index 15cbf626..5459159e 100644 --- a/src/ui/SnackBar.h +++ b/src/ui/SnackBar.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/TextField.cpp b/src/ui/TextField.cpp index 055fe73b..7d015e89 100644 --- a/src/ui/TextField.cpp +++ b/src/ui/TextField.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "TextField.h" #include diff --git a/src/ui/TextField.h b/src/ui/TextField.h index 01fd5782..ac4c396e 100644 --- a/src/ui/TextField.h +++ b/src/ui/TextField.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/TextLabel.cpp b/src/ui/TextLabel.cpp index 8ea2bb54..3568e15c 100644 --- a/src/ui/TextLabel.cpp +++ b/src/ui/TextLabel.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include "ui/TextLabel.h" #include diff --git a/src/ui/TextLabel.h b/src/ui/TextLabel.h index 56778dcc..bc095823 100644 --- a/src/ui/TextLabel.h +++ b/src/ui/TextLabel.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/Theme.cpp b/src/ui/Theme.cpp index 7209864a..4341bd63 100644 --- a/src/ui/Theme.cpp +++ b/src/ui/Theme.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include "Theme.h" diff --git a/src/ui/Theme.h b/src/ui/Theme.h index 34971280..3243c076 100644 --- a/src/ui/Theme.h +++ b/src/ui/Theme.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp index 7baed1f3..834f5083 100644 --- a/src/ui/ThemeManager.cpp +++ b/src/ui/ThemeManager.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include "ThemeManager.h" diff --git a/src/ui/ThemeManager.h b/src/ui/ThemeManager.h index d35ff754..f2099730 100644 --- a/src/ui/ThemeManager.h +++ b/src/ui/ThemeManager.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/ToggleButton.cpp b/src/ui/ToggleButton.cpp index 40ea82ac..33bf8f92 100644 --- a/src/ui/ToggleButton.cpp +++ b/src/ui/ToggleButton.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/ui/ToggleButton.h b/src/ui/ToggleButton.h index 14c3450b..2413b086 100644 --- a/src/ui/ToggleButton.h +++ b/src/ui/ToggleButton.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp index 77f6ced5..dfb0c926 100644 --- a/src/ui/UserProfile.cpp +++ b/src/ui/UserProfile.cpp @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #include #include #include diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h index ffc5dcae..7c9c7495 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + #pragma once #include