Merge pull request #505 from Nheko-Reborn/license-headers

License headers

.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

.ci/licenses.sh

+#!/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

.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

Makefile

@@ -41,6 +41,9 @@ macos-app-install:
 lint:
 	./.ci/format.sh
 
+license:
+	./.ci/licenses.sh
+
 image:
 	docker build -t nheko-app-image .
 

resources/qml/Avatar.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./ui"
 import QtGraphicalEffects 1.0
 import QtQuick 2.6

resources/qml/Completer.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./ui"
 import QtQuick 2.9
 import QtQuick.Controls 2.3

resources/qml/EncryptionIndicator.qml

+// 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

resources/qml/ImageButton.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./ui"
 import QtQuick 2.3
 import QtQuick.Controls 2.3

resources/qml/MatrixText.qml

+// 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

resources/qml/MessageInput.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./voip"
 import QtQuick 2.12
 import QtQuick.Controls 2.3

resources/qml/MessageView.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./delegates"
 import QtGraphicalEffects 1.0
 import QtQuick 2.12
@@ -203,7 +207,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 {

resources/qml/NhekoBusyIndicator.qml

+// 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

resources/qml/PrivacyScreen.qml

+// 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

resources/qml/Reactions.qml

+// 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

resources/qml/ReplyPopup.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./delegates/"
 import QtQuick 2.9
 import QtQuick.Controls 2.3

resources/qml/RoomSettings.qml

+// 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

resources/qml/ScrollHelper.qml

-/*
- *  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
- *  Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsystems.com>
- *
- *  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, <michael.bohlender@kdemail.net>
+// Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsystems.com>
+// 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
@@ -90,7 +78,7 @@ MouseArea {
         // Show the scrollbars
         flickable.flick(0, 0);
         flickable.contentY = newPos;
-        cancelFlickStateTimer.start();
+        cancelFlickStateTimer.restart();
     }
 
     Timer {

resources/qml/StatusIndicator.qml

+// 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

resources/qml/TimelineRow.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./delegates"
 import "./emoji"
 import QtQuick 2.12

resources/qml/TimelineView.qml

+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 import "./delegates"
 import "./device-verification"
 import "./emoji"