aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2021-01-16 18:19:45 +0100
committerKitsune Ral <Kitsune-Ral@users.sf.net>2021-01-16 22:08:53 +0100
commit0a775d9b3209be15dea8b8915fc0a1c8e0046ba6 (patch)
tree3c75983f45acd1ac65b64a4d79e4492fcbf4ee71
parent8d9684a4ceec239daf66ff98effe46ab70a3f6a4 (diff)
downloadlibquotient-0a775d9b3209be15dea8b8915fc0a1c8e0046ba6.tar.gz
libquotient-0a775d9b3209be15dea8b8915fc0a1c8e0046ba6.zip
Updated copyright statements upon Git audit
After going through all the files and the history of commits on them it was clear that some copyright statements are obsolete (the code has been overwritten since) and some are missing. This commit tries best to remedy that, along with adding SPDX tags where they were still not used. Also, a minimal SPDX convention is documented for further contributions. Closes #426.
-rw-r--r--.clang-format8
-rw-r--r--CONTRIBUTING.md14
-rw-r--r--gtad/data.h.mustache4
-rw-r--r--gtad/operation.cpp.mustache4
-rw-r--r--gtad/operation.h.mustache4
-rw-r--r--lib/avatar.cpp7
-rw-r--r--lib/avatar.h9
-rw-r--r--lib/connection.cpp10
-rw-r--r--lib/connection.h9
-rw-r--r--lib/connectiondata.cpp8
-rw-r--r--lib/connectiondata.h8
-rw-r--r--lib/converters.cpp7
-rw-r--r--lib/converters.h7
-rw-r--r--lib/e2ee.h1
-rw-r--r--lib/encryptionmanager.cpp1
-rw-r--r--lib/encryptionmanager.h1
-rw-r--r--lib/eventitem.cpp7
-rw-r--r--lib/eventitem.h7
-rw-r--r--lib/events/accountdataevents.h7
-rw-r--r--lib/events/callanswerevent.cpp8
-rw-r--r--lib/events/callanswerevent.h8
-rw-r--r--lib/events/callcandidatesevent.cpp8
-rw-r--r--lib/events/callcandidatesevent.h9
-rw-r--r--lib/events/callhangupevent.cpp1
-rw-r--r--lib/events/callhangupevent.h8
-rw-r--r--lib/events/callinviteevent.cpp8
-rw-r--r--lib/events/callinviteevent.h8
-rw-r--r--lib/events/directchatevent.cpp7
-rw-r--r--lib/events/directchatevent.h7
-rw-r--r--lib/events/encryptedevent.cpp1
-rw-r--r--lib/events/encryptedevent.h1
-rw-r--r--lib/events/encryptionevent.cpp4
-rw-r--r--lib/events/encryptionevent.h8
-rw-r--r--lib/events/event.cpp7
-rw-r--r--lib/events/event.h7
-rw-r--r--lib/events/eventcontent.cpp7
-rw-r--r--lib/events/eventcontent.h7
-rw-r--r--lib/events/eventloader.h7
-rw-r--r--lib/events/reactionevent.cpp7
-rw-r--r--lib/events/reactionevent.h7
-rw-r--r--lib/events/receiptevent.cpp7
-rw-r--r--lib/events/receiptevent.h7
-rw-r--r--lib/events/redactionevent.cpp5
-rw-r--r--lib/events/redactionevent.h7
-rw-r--r--lib/events/roomavatarevent.h7
-rw-r--r--lib/events/roomcanonicalaliasevent.h8
-rw-r--r--lib/events/roomcreateevent.cpp7
-rw-r--r--lib/events/roomcreateevent.h7
-rw-r--r--lib/events/roomevent.cpp7
-rw-r--r--lib/events/roomevent.h7
-rw-r--r--lib/events/roomkeyevent.cpp3
-rw-r--r--lib/events/roomkeyevent.h3
-rw-r--r--lib/events/roommemberevent.cpp8
-rw-r--r--lib/events/roommemberevent.h9
-rw-r--r--lib/events/roommessageevent.cpp9
-rw-r--r--lib/events/roommessageevent.h9
-rw-r--r--lib/events/roompowerlevelsevent.cpp3
-rw-r--r--lib/events/roompowerlevelsevent.h3
-rw-r--r--lib/events/roomtombstoneevent.cpp7
-rw-r--r--lib/events/roomtombstoneevent.h7
-rw-r--r--lib/events/simplestateevents.h7
-rw-r--r--lib/events/stateevent.cpp7
-rw-r--r--lib/events/stateevent.h7
-rw-r--r--lib/events/typingevent.cpp7
-rw-r--r--lib/events/typingevent.h7
-rw-r--r--lib/jobs/basejob.cpp8
-rw-r--r--lib/jobs/basejob.h8
-rw-r--r--lib/jobs/downloadfilejob.cpp3
-rw-r--r--lib/jobs/downloadfilejob.h3
-rw-r--r--lib/jobs/mediathumbnailjob.cpp7
-rw-r--r--lib/jobs/mediathumbnailjob.h7
-rw-r--r--lib/jobs/requestdata.cpp3
-rw-r--r--lib/jobs/requestdata.h7
-rw-r--r--lib/jobs/syncjob.cpp7
-rw-r--r--lib/jobs/syncjob.h7
-rw-r--r--lib/joinstate.h7
-rw-r--r--lib/logging.cpp8
-rw-r--r--lib/logging.h8
-rw-r--r--lib/networkaccessmanager.cpp7
-rw-r--r--lib/networkaccessmanager.h7
-rw-r--r--lib/networksettings.cpp7
-rw-r--r--lib/networksettings.h7
-rw-r--r--lib/qt_connection_util.h7
-rw-r--r--lib/quotient_common.h1
-rw-r--r--lib/room.cpp13
-rw-r--r--lib/room.h13
-rw-r--r--lib/settings.cpp3
-rw-r--r--lib/settings.h7
-rw-r--r--lib/ssosession.cpp3
-rw-r--r--lib/ssosession.h3
-rw-r--r--lib/syncdata.cpp7
-rw-r--r--lib/syncdata.h7
-rw-r--r--lib/uri.cpp3
-rw-r--r--lib/uri.h3
-rw-r--r--lib/uriresolver.cpp3
-rw-r--r--lib/uriresolver.h3
-rw-r--r--lib/user.cpp8
-rw-r--r--lib/user.h8
-rw-r--r--lib/util.cpp8
-rw-r--r--lib/util.h8
-rw-r--r--tests/quotest.cpp2
101 files changed, 266 insertions, 378 deletions
diff --git a/.clang-format b/.clang-format
index 4df5ae84..4510d46e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,7 @@
-# Copyright (C) 2019 Project Quotient
-#
-# You may use this file under the terms of the LGPL-2.1 license
-# See the file LICENSE from this package for details.
+# SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+# SPDX-FileCopyrightText: 2019 Marc Deop <marc@marcdeop.com>
+
+# SPDX-License-Identifier: LGPL-2.1-or-later
# This is the clang-format configuration style to be used by libQuotient.
# Inspired by:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bda004df..f09b1529 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,8 +96,18 @@ All new contributed material that is not executable, including all text when not
-->
Any components proposed for reuse should have a license that permits releasing
-a derivative work under *LGPL v2.1 or later* or LGPL v3. Moreover, the license of
-a proposed component should be approved by OSI, no exceptions.
+a derivative work under *LGPL v3 or later* (that includes licenses permitting
+*LGPL v2.1 or later* but not *LGPL v2.1 only*). In any case, the component
+should be redistributable under a license from
+[the list approved by OSI](https://opensource.org/licenses), no exceptions.
+
+We use [SPDX](https://spdx.dev) conventions for copyright statements. Please
+follow them when making a sizable contribution: add your name and year to
+the top of the file. New files should begin with the following preamble:
+```cpp
+// SPDX-FileCopyrightText: 2021 Your Name <your@email.address>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+```
## Vulnerability reporting (security issues) - see [SECURITY.md](./SECURITY.md)
diff --git a/gtad/data.h.mustache b/gtad/data.h.mustache
index 32ea85ee..a2193380 100644
--- a/gtad/data.h.mustache
+++ b/gtad/data.h.mustache
@@ -1,3 +1,7 @@
+{{!
+SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+SPDX-License-Identifier: LGPL-2.1-or-later
+}}
{{>preamble}}
#pragma once
diff --git a/gtad/operation.cpp.mustache b/gtad/operation.cpp.mustache
index 3c3396e9..1d0ae476 100644
--- a/gtad/operation.cpp.mustache
+++ b/gtad/operation.cpp.mustache
@@ -1,3 +1,7 @@
+{{!
+SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+SPDX-License-Identifier: LGPL-2.1-or-later
+}}
{{>preamble}}
#include "{{filenameBase}}.h"
diff --git a/gtad/operation.h.mustache b/gtad/operation.h.mustache
index 36963b9a..135eee55 100644
--- a/gtad/operation.h.mustache
+++ b/gtad/operation.h.mustache
@@ -1,3 +1,7 @@
+{{!
+SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+SPDX-License-Identifier: LGPL-2.1-or-later
+}}
{{>preamble}}
#pragma once
diff --git a/lib/avatar.cpp b/lib/avatar.cpp
index 0573df5d..77648562 100644
--- a/lib/avatar.cpp
+++ b/lib/avatar.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "avatar.h"
diff --git a/lib/avatar.h b/lib/avatar.h
index 111f565d..be125c17 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
@@ -46,4 +43,4 @@ private:
};
} // namespace Quotient
/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient; \ No newline at end of file
+namespace QMatrixClient = Quotient;
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 015e73c9..d773f0d8 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -1,8 +1,8 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-FileCopyrightText: 2019 Ville Ranki <ville.ranki@iki.fi>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "connection.h"
diff --git a/lib/connection.h b/lib/connection.h
index f3d7d725..4f949641 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index 25ab775a..e54d909b 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "connectiondata.h"
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index a3b2d39b..7dd96f26 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/converters.cpp b/lib/converters.cpp
index 0df880a0..4338e8ed 100644
--- a/lib/converters.cpp
+++ b/lib/converters.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "converters.h"
diff --git a/lib/converters.h b/lib/converters.h
index d4f19b60..e07b6ee4 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/e2ee.h b/lib/e2ee.h
index 5f1857b6..4044aa02 100644
--- a/lib/e2ee.h
+++ b/lib/e2ee.h
@@ -1,6 +1,5 @@
// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-//
// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/encryptionmanager.cpp b/lib/encryptionmanager.cpp
index 8d241eb2..37f3b7c3 100644
--- a/lib/encryptionmanager.cpp
+++ b/lib/encryptionmanager.cpp
@@ -1,6 +1,5 @@
// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-//
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifdef Quotient_E2EE_ENABLED
diff --git a/lib/encryptionmanager.h b/lib/encryptionmanager.h
index 0f507337..714f95fd 100644
--- a/lib/encryptionmanager.h
+++ b/lib/encryptionmanager.h
@@ -1,5 +1,4 @@
// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
-//
// SPDX-License-Identifier: LGPL-2.1-or-later
#ifdef Quotient_E2EE_ENABLED
diff --git a/lib/eventitem.cpp b/lib/eventitem.cpp
index 9c47e50d..4f1595bc 100644
--- a/lib/eventitem.cpp
+++ b/lib/eventitem.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "eventitem.h"
diff --git a/lib/eventitem.h b/lib/eventitem.h
index 2d3d9ef6..1986ba77 100644
--- a/lib/eventitem.h
+++ b/lib/eventitem.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index d0abf577..8cea0ec8 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/callanswerevent.cpp b/lib/events/callanswerevent.cpp
index f3d0a9a0..be83d9d0 100644
--- a/lib/events/callanswerevent.cpp
+++ b/lib/events/callanswerevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "callanswerevent.h"
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h
index d7214468..6132cb44 100644
--- a/lib/events/callanswerevent.h
+++ b/lib/events/callanswerevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/callcandidatesevent.cpp b/lib/events/callcandidatesevent.cpp
index 9b765064..b87c8e9b 100644
--- a/lib/events/callcandidatesevent.cpp
+++ b/lib/events/callcandidatesevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "callcandidatesevent.h"
diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index ae3bb150..b9de7556 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/callhangupevent.cpp b/lib/events/callhangupevent.cpp
index 45b84cd4..43bc4db0 100644
--- a/lib/events/callhangupevent.cpp
+++ b/lib/events/callhangupevent.cpp
@@ -1,5 +1,6 @@
/******************************************************************************
* SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+ * SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
*
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index 432f72f5..24382ac2 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/callinviteevent.cpp b/lib/events/callinviteevent.cpp
index 86478ada..5ea54662 100644
--- a/lib/events/callinviteevent.cpp
+++ b/lib/events/callinviteevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "callinviteevent.h"
diff --git a/lib/events/callinviteevent.h b/lib/events/callinviteevent.h
index 304c89ac..d3454c4f 100644
--- a/lib/events/callinviteevent.h
+++ b/lib/events/callinviteevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/directchatevent.cpp b/lib/events/directchatevent.cpp
index 39d11072..0ee1f7b0 100644
--- a/lib/events/directchatevent.cpp
+++ b/lib/events/directchatevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "directchatevent.h"
diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 373e36dc..e2143779 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp
index dc9eaf2d..0290f973 100644
--- a/lib/events/encryptedevent.cpp
+++ b/lib/events/encryptedevent.cpp
@@ -1,5 +1,4 @@
// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
-//
// SPDX-License-Identifier: LGPL-2.1-or-later
#include "encryptedevent.h"
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index 9de08b00..eb7123eb 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -1,5 +1,4 @@
// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
-//
// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index f1bde621..490a5e8a 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "encryptionevent.h"
#include "e2ee.h"
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 3431ddd8..f9bbab12 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/event.cpp b/lib/events/event.cpp
index 97edb4e0..3d66ab55 100644
--- a/lib/events/event.cpp
+++ b/lib/events/event.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "event.h"
diff --git a/lib/events/event.h b/lib/events/event.h
index c5752a7a..f8f8311d 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/eventcontent.cpp b/lib/events/eventcontent.cpp
index 18b1b94b..b249b160 100644
--- a/lib/events/eventcontent.cpp
+++ b/lib/events/eventcontent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "eventcontent.h"
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index e247adbf..60d1f7b7 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index 0d95daf5..978668f2 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/reactionevent.cpp b/lib/events/reactionevent.cpp
index 9b43e372..b53fffd6 100644
--- a/lib/events/reactionevent.cpp
+++ b/lib/events/reactionevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "reactionevent.h"
diff --git a/lib/events/reactionevent.h b/lib/events/reactionevent.h
index 09166b24..777905f2 100644
--- a/lib/events/reactionevent.h
+++ b/lib/events/reactionevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index b6f0fcdd..4185d92d 100644
--- a/lib/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
/*
Example of a Receipt Event:
diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h
index ec297a6c..4feec9ea 100644
--- a/lib/events/receiptevent.h
+++ b/lib/events/receiptevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/redactionevent.cpp b/lib/events/redactionevent.cpp
deleted file mode 100644
index 5889773c..00000000
--- a/lib/events/redactionevent.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-//
-// SPDX-License-Identifier: CC0-1.0
-
-#include "redactionevent.h"
diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index 320db6f2..ed560331 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index 649412e8..a4257895 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roomcanonicalaliasevent.h b/lib/events/roomcanonicalaliasevent.h
index eda94d2d..bb8654e5 100644
--- a/lib/events/roomcanonicalaliasevent.h
+++ b/lib/events/roomcanonicalaliasevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2020 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2020 Ram Nad <ramnad1999@gmail.com>
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roomcreateevent.cpp b/lib/events/roomcreateevent.cpp
index 3d9ec4a3..6558bade 100644
--- a/lib/events/roomcreateevent.cpp
+++ b/lib/events/roomcreateevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "roomcreateevent.h"
diff --git a/lib/events/roomcreateevent.h b/lib/events/roomcreateevent.h
index 8328d38a..05e623ed 100644
--- a/lib/events/roomcreateevent.h
+++ b/lib/events/roomcreateevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 2b6ac2be..4fec9d2b 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "roomevent.h"
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 3fafecfd..fea509c0 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roomkeyevent.cpp b/lib/events/roomkeyevent.cpp
index 66580430..332be3f7 100644
--- a/lib/events/roomkeyevent.cpp
+++ b/lib/events/roomkeyevent.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "roomkeyevent.h"
using namespace Quotient;
diff --git a/lib/events/roomkeyevent.h b/lib/events/roomkeyevent.h
index b8cd2eae..14e80324 100644
--- a/lib/events/roomkeyevent.h
+++ b/lib/events/roomkeyevent.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#pragma once
#include "event.h"
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index d093286c..9634ca3a 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Karol Kosek <krkkx@protonmail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "roommemberevent.h"
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index b7a7c9df..f2fbe689 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Karol Kosek <krkkx@protonmail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index 19d460b8..14824277 100644
--- a/lib/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "roommessageevent.h"
diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index ebc9d564..8303ce4e 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/roompowerlevelsevent.cpp b/lib/events/roompowerlevelsevent.cpp
index 0a401752..8d262ddf 100644
--- a/lib/events/roompowerlevelsevent.cpp
+++ b/lib/events/roompowerlevelsevent.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "roompowerlevelsevent.h"
#include <QJsonDocument>
diff --git a/lib/events/roompowerlevelsevent.h b/lib/events/roompowerlevelsevent.h
index b832230e..0346fc0d 100644
--- a/lib/events/roompowerlevelsevent.h
+++ b/lib/events/roompowerlevelsevent.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#pragma once
#include "eventcontent.h"
diff --git a/lib/events/roomtombstoneevent.cpp b/lib/events/roomtombstoneevent.cpp
index 163e1d3a..080d269c 100644
--- a/lib/events/roomtombstoneevent.cpp
+++ b/lib/events/roomtombstoneevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "roomtombstoneevent.h"
diff --git a/lib/events/roomtombstoneevent.h b/lib/events/roomtombstoneevent.h
index 8d50aba0..30e53738 100644
--- a/lib/events/roomtombstoneevent.h
+++ b/lib/events/roomtombstoneevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 58ba3b5a..d6261a8f 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index 7bde12bb..42fc9054 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "stateevent.h"
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 0db37767..1415f709 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/events/typingevent.cpp b/lib/events/typingevent.cpp
index 7d3f71e5..e97e978f 100644
--- a/lib/events/typingevent.cpp
+++ b/lib/events/typingevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "typingevent.h"
diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h
index 8ca4f8e4..7456100a 100644
--- a/lib/events/typingevent.h
+++ b/lib/events/typingevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index a0c88581..48c2996d 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "basejob.h"
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index 3165edd3..ca91a781 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 0011a97c..0b0531ad 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "downloadfilejob.h"
#include <QtCore/QFile>
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index e00fd9e4..0752af89 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#pragma once
#include "csapi/content-repo.h"
diff --git a/lib/jobs/mediathumbnailjob.cpp b/lib/jobs/mediathumbnailjob.cpp
index fbea8797..7dbf4ab3 100644
--- a/lib/jobs/mediathumbnailjob.cpp
+++ b/lib/jobs/mediathumbnailjob.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "mediathumbnailjob.h"
diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index cb55a0b0..3183feb1 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/jobs/requestdata.cpp b/lib/jobs/requestdata.cpp
index cec15954..047e2920 100644
--- a/lib/jobs/requestdata.cpp
+++ b/lib/jobs/requestdata.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "requestdata.h"
#include <QtCore/QBuffer>
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 2a227646..4958e0f9 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp
index beb0a535..59a34ef3 100644
--- a/lib/jobs/syncjob.cpp
+++ b/lib/jobs/syncjob.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "syncjob.h"
diff --git a/lib/jobs/syncjob.h b/lib/jobs/syncjob.h
index a7d10ed8..830a7c71 100644
--- a/lib/jobs/syncjob.h
+++ b/lib/jobs/syncjob.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/joinstate.h b/lib/joinstate.h
index 1a7b1add..805ce73a 100644
--- a/lib/joinstate.h
+++ b/lib/joinstate.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/logging.cpp b/lib/logging.cpp
index 3f757393..af229684 100644
--- a/lib/logging.cpp
+++ b/lib/logging.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Elvis Angelaccio <elvid.angelaccio@kde.org>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Elvis Angelaccio <elvid.angelaccio@kde.org>
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "logging.h"
diff --git a/lib/logging.h b/lib/logging.h
index 21d05d8b..432ed16f 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Elvis Angelaccio <elvid.angelaccio@kde.org>
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index 43a8287a..a94ead34 100644
--- a/lib/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "networkaccessmanager.h"
diff --git a/lib/networkaccessmanager.h b/lib/networkaccessmanager.h
index 6075767a..47729a1b 100644
--- a/lib/networkaccessmanager.h
+++ b/lib/networkaccessmanager.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/networksettings.cpp b/lib/networksettings.cpp
index db16034a..ce46ce5f 100644
--- a/lib/networksettings.cpp
+++ b/lib/networksettings.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "networksettings.h"
diff --git a/lib/networksettings.h b/lib/networksettings.h
index 31602734..df11a9c8 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h
index 158d7a40..c6fa037a 100644
--- a/lib/qt_connection_util.h
+++ b/lib/qt_connection_util.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/quotient_common.h b/lib/quotient_common.h
index e2384f12..22fdbe94 100644
--- a/lib/quotient_common.h
+++ b/lib/quotient_common.h
@@ -1,5 +1,4 @@
// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-//
// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/room.cpp b/lib/room.cpp
index bc89464d..2e8641aa 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -1,8 +1,11 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-FileCopyrightText: 2018 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-FileCopyrightText: 2020 Ram Nad <ramnad1999@gmail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "room.h"
diff --git a/lib/room.h b/lib/room.h
index c9205e9c..a8275ce9 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -1,8 +1,11 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-FileCopyrightText: 2018 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-FileCopyrightText: 2020 Ram Nad <ramnad1999@gmail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/settings.cpp b/lib/settings.cpp
index dd086d9c..703f4320 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "settings.h"
#include "logging.h"
diff --git a/lib/settings.h b/lib/settings.h
index badabec2..84c54802 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/ssosession.cpp b/lib/ssosession.cpp
index 3c6ec48b..a1d27504 100644
--- a/lib/ssosession.cpp
+++ b/lib/ssosession.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "ssosession.h"
#include "connection.h"
diff --git a/lib/ssosession.h b/lib/ssosession.h
index 5845cd4d..72dd60c4 100644
--- a/lib/ssosession.h
+++ b/lib/ssosession.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#pragma once
#include <QtCore/QUrl>
diff --git a/lib/syncdata.cpp b/lib/syncdata.cpp
index f67ab6c7..adcba5cd 100644
--- a/lib/syncdata.cpp
+++ b/lib/syncdata.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "syncdata.h"
diff --git a/lib/syncdata.h b/lib/syncdata.h
index d9868e46..e69bac17 100644
--- a/lib/syncdata.h
+++ b/lib/syncdata.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/uri.cpp b/lib/uri.cpp
index e0912eb6..4b171e79 100644
--- a/lib/uri.cpp
+++ b/lib/uri.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "uri.h"
#include "logging.h"
diff --git a/lib/uri.h b/lib/uri.h
index 270766dd..d8b892b6 100644
--- a/lib/uri.h
+++ b/lib/uri.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#pragma once
#include "quotient_common.h"
diff --git a/lib/uriresolver.cpp b/lib/uriresolver.cpp
index 27360bcc..287e0552 100644
--- a/lib/uriresolver.cpp
+++ b/lib/uriresolver.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#include "uriresolver.h"
#include "connection.h"
diff --git a/lib/uriresolver.h b/lib/uriresolver.h
index 428ce04c..f290e58b 100644
--- a/lib/uriresolver.h
+++ b/lib/uriresolver.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
#pragma once
#include "uri.h"
diff --git a/lib/user.cpp b/lib/user.cpp
index 9c2b76b5..bed7be3a 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "user.h"
diff --git a/lib/user.h b/lib/user.h
index d5c892ed..f831865e 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/lib/util.cpp b/lib/util.cpp
index 14492ba6..904bfd5a 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "util.h"
diff --git a/lib/util.h b/lib/util.h
index 7547a75a..cb0ff44a 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#pragma once
diff --git a/tests/quotest.cpp b/tests/quotest.cpp
index 98c01cfc..5098bc02 100644
--- a/tests/quotest.cpp
+++ b/tests/quotest.cpp
@@ -1,3 +1,5 @@
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
#include "connection.h"
#include "room.h"