diff --git a/CMakeLists.txt b/CMakeLists.txt index 97253ea06..5c4d1a545 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +project(NeoChat VERSION 0.0.90) -set(IDENTIFIER "org.eu.encom.spectral") -set(COPYRIGHT "Copyright © 2018-2019 bhat@encom.eu.org") +set(REQUIRED_KF5_VERSION "5.57.0") +find_package(ECM ${REQUIRED_KF5_VERSION} REQUIRED NO_MODULE) -project(spectral VERSION 0.0.0 LANGUAGES CXX) +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) + +set(IDENTIFIER "org.kde.neochat") +set(COPYRIGHT "Copyright © 2018-2019 bhat@encom.eu.org, 2020 KDE Community") if(UNIX AND NOT APPLE) set(LINUX 1) @@ -86,14 +89,16 @@ if (NOT USE_INTREE_LIBQMC) endif () endif () -find_package(KF5Kirigami2 REQUIRED) +find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + Kirigami2 + ItemModels + I18n +) find_package(Qt5Keychain REQUIRED) find_package(cmark REQUIRED) -find_package(KF5ItemModels REQUIRED) - message( STATUS ) message( STATUS "=============================================================================" ) message( STATUS " Spectral Build Information" ) @@ -245,7 +250,7 @@ if(LINUX) install(FILES linux/${IDENTIFIER}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo ) - file(GLOB spectral_icons icons/hicolor/*-apps-org.eu.encom.spectral.png) + file(GLOB spectral_icons icons/hicolor/*-apps-org.kde.neochat.png) ecm_install_icons(ICONS ${spectral_icons} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons ) diff --git a/icons/hicolor/128-apps-org.eu.encom.spectral.png b/icons/hicolor/128-apps-org.kde.neochat.png similarity index 100% rename from icons/hicolor/128-apps-org.eu.encom.spectral.png rename to icons/hicolor/128-apps-org.kde.neochat.png diff --git a/icons/hicolor/256-apps-org.eu.encom.spectral.png b/icons/hicolor/256-apps-org.kde.neochat.png similarity index 100% rename from icons/hicolor/256-apps-org.eu.encom.spectral.png rename to icons/hicolor/256-apps-org.kde.neochat.png diff --git a/icons/hicolor/32-apps-org.eu.encom.spectral.png b/icons/hicolor/32-apps-org.kde.neochat.png similarity index 100% rename from icons/hicolor/32-apps-org.eu.encom.spectral.png rename to icons/hicolor/32-apps-org.kde.neochat.png diff --git a/icons/hicolor/512-apps-org.eu.encom.spectral.png b/icons/hicolor/512-apps-org.kde.neochat.png similarity index 100% rename from icons/hicolor/512-apps-org.eu.encom.spectral.png rename to icons/hicolor/512-apps-org.kde.neochat.png diff --git a/linux/org.eu.encom.spectral.appdata.xml b/linux/org.kde.neochat.appdata.xml similarity index 100% rename from linux/org.eu.encom.spectral.appdata.xml rename to linux/org.kde.neochat.appdata.xml diff --git a/linux/org.eu.encom.spectral.desktop b/linux/org.kde.neochat.desktop similarity index 100% rename from linux/org.eu.encom.spectral.desktop rename to linux/org.kde.neochat.desktop diff --git a/src/accountlistmodel.cpp b/src/accountlistmodel.cpp index 58b9058d9..7a7da12e1 100644 --- a/src/accountlistmodel.cpp +++ b/src/accountlistmodel.cpp @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #include "accountlistmodel.h" #include "room.h" diff --git a/src/accountlistmodel.h b/src/accountlistmodel.h index 5bbb976cc..09255ba4e 100644 --- a/src/accountlistmodel.h +++ b/src/accountlistmodel.h @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #ifndef ACCOUNTLISTMODEL_H #define ACCOUNTLISTMODEL_H diff --git a/src/controller.cpp b/src/controller.cpp index a655576e3..6d04554d9 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #include "controller.h" #include diff --git a/src/controller.h b/src/controller.h index 09130e9d7..80127309e 100644 --- a/src/controller.h +++ b/src/controller.h @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #ifndef CONTROLLER_H #define CONTROLLER_H diff --git a/src/emojimodel.cpp b/src/emojimodel.cpp index 9e0f8c4f1..5008086c3 100644 --- a/src/emojimodel.cpp +++ b/src/emojimodel.cpp @@ -1,18 +1,7 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris +/** + * SPDX-FileCopyrightText: 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-LicenseIdentifier: GPL-3.0-or-later */ #include diff --git a/src/emojimodel.h b/src/emojimodel.h index f0385f09c..88ce00b95 100644 --- a/src/emojimodel.h +++ b/src/emojimodel.h @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #ifndef EMOJIMODEL_H #define EMOJIMODEL_H diff --git a/src/imageclipboard.cpp b/src/imageclipboard.cpp index d8d10ae14..a9f8e76ae 100644 --- a/src/imageclipboard.cpp +++ b/src/imageclipboard.cpp @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #include "imageclipboard.h" #include diff --git a/src/imageclipboard.h b/src/imageclipboard.h index ce3c588af..1cdf32849 100644 --- a/src/imageclipboard.h +++ b/src/imageclipboard.h @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #ifndef IMAGECLIPBOARD_H #define IMAGECLIPBOARD_H diff --git a/src/main.cpp b/src/main.cpp index c4a89ccc7..36dfd0c13 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,3 +1,8 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #include #include #include diff --git a/src/matriximageprovider.cpp b/src/matriximageprovider.cpp index 0e5411101..5b939ac29 100644 --- a/src/matriximageprovider.cpp +++ b/src/matriximageprovider.cpp @@ -1,3 +1,9 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * SPDX-FileCopyrightText: 2019 Kitsune Ral + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #include "matriximageprovider.h" #include diff --git a/src/matriximageprovider.h b/src/matriximageprovider.h index 70f911e85..6def9cf54 100644 --- a/src/matriximageprovider.h +++ b/src/matriximageprovider.h @@ -1,3 +1,9 @@ +/** + * SPDX-FileCopyrightText: Black Hat + * SPDX-FileCopyrightText: 2019 Kitsune Ral + * + * SPDX-LicenseIdentifier: GPL-3.0-only + */ #ifndef MatrixImageProvider_H #define MatrixImageProvider_H #pragma once