diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a1c36b..869d2fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,73 +1,73 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR) # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "20") set(KDE_APPLICATIONS_VERSION_MINOR "03") set(KDE_APPLICATIONS_VERSION_MICRO "70") set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(ksirk VERSION ${KDE_APPLICATIONS_VERSION}) set (QT_MIN_VERSION "5.7.0") set (KF5_MIN_VERSION "5.30.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg Test) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Completion Config ConfigWidgets CoreAddons Crash DocTools I18n IconThemes KIO NewStuff Wallet WidgetsAddons XmlGui ) find_package(KF5KDEGames 4.9.0 REQUIRED) find_package(Phonon4Qt5 REQUIRED) include(FeatureSummary) include(ECMAddAppIcon) include(ECMInstallIcons) include(ECMSetupVersion) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) find_package(Phonon4Qt5 CONFIG REQUIRED) find_package(Qca-qt5 2.1.0) set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Support for encryption" - URL "http://download.kde.org/stable/qca-qt5" + URL "https://download.kde.org/stable/qca-qt5" TYPE REQUIRED) kde_enable_exceptions() remove_definitions(-DQT_NO_STL) ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KSIRK VERSION_HEADER ksirk_version.h) if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) endif() add_subdirectory(ksirk) add_subdirectory(ksirkskineditor) add_subdirectory(doc) if (${ECM_VERSION} STRGREATER "5.58.0") install(FILES ksirk.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) else() install(FILES ksirk.categories DESTINATION ${KDE_INSTALL_CONFDIR}) endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/ksirk/main.cpp b/ksirk/main.cpp index ba4258f..8ce2c71 100644 --- a/ksirk/main.cpp +++ b/ksirk/main.cpp @@ -1,84 +1,84 @@ /*************************************************************************** main.cpp - description ------------------- begin : mer jui 11 22:27:28 EDT 2001 copyright : (C) 2001 by Gaël de Chalendar email : Gael.de.Chalendar@free.fr This is the standard main function of a KDE application simplified for KsirK ***************************************************************************/ /*************************************************************************** * * * 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 either version 2 of the License, or (at your option) any later version.of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "kgamewin.h" #include "GameLogic/gameautomaton.h" #include #include #include "ksirk_debug.h" #include #include #include "../ksirk_version.h" int main(int argc, char *argv[]) { qCDebug(KSIRK_LOG) << "Hello KsirK"; QApplication app(argc, argv); KLocalizedString::setApplicationDomain("ksirk"); KAboutData aboutData(QStringLiteral("ksirk"), i18n("KsirK"), QStringLiteral(KSIRK_VERSION_STRING), i18n("KsirK - World Domination Strategy Game"), KAboutLicense::GPL, i18n("(c) 2002-2015, Gaël de Chalendar\n"), i18n("For help and user manual, please see\nthe KsirK web site."), - QStringLiteral("http://games.kde.org/game.php?game=ksirk")); + QStringLiteral("https://kde.org/applications/games/org.kde.ksirk")); aboutData.addAuthor(i18n("Gael de Chalendar aka Kleag"),QStringLiteral(), QStringLiteral("kleag@free.fr")); aboutData.addAuthor(i18n("Nemanja Hirsl"),i18n("Current maintainer"), QStringLiteral("nemhirsl@gmail.com")); aboutData.addAuthor(i18n("Robin Doer")); aboutData.addAuthor(i18n("Albert Astals Cid")); aboutData.addAuthor(i18n("Michal Golunski (Polish translation)"),QStringLiteral(), QStringLiteral("michalgolunski@o2.pl")); aboutData.addAuthor(i18n("French students of the 'IUP ISI 2007-2008':")); aboutData.addAuthor(i18n("  Anthony Rey
  Benjamin Lucas
  Benjamin Moreau
  Gaël Clouet
  Guillaume Pelouas
  Joël Marco
  Laurent Dang
  Nicolas Linard
  Vincent Sac")); aboutData.setOrganizationDomain(QByteArray("kde.org")); aboutData.setProductName(QByteArray("ksirk")); app.setWindowIcon(QIcon::fromTheme(QStringLiteral("ksirk"))); KAboutData::setApplicationData(aboutData); KCrash::initialize(); QCommandLineParser parser; parser.addVersionOption(); parser.addHelpOption(); aboutData.setupCommandLine(&parser); parser.process(app); aboutData.processCommandLine(&parser); if (app.isSessionRestored()) { kRestoreMainWindows(); } else { qCDebug(KSIRK_LOG) << "Creating main window"; Ksirk::KGameWindow *ksirk = new Ksirk::KGameWindow(); ksirk->show(); } app.setWindowIcon(QIcon::fromTheme(QStringLiteral("ksirk"))); qCDebug(KSIRK_LOG) << "Executing app"; return app.exec(); } diff --git a/ksirkskineditor/main.cpp b/ksirkskineditor/main.cpp index 4b6f5f9..09654e8 100644 --- a/ksirkskineditor/main.cpp +++ b/ksirkskineditor/main.cpp @@ -1,85 +1,85 @@ /*************************************************************************** main.cpp - description ------------------- begin : mer jui 11 22:27:28 EDT 2001 copyright : (C) 2001 by Gaël de Chalendar email : Gael.de.Chalendar@free.fr This is the standard main function of a KDE application KsirK 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 ***************************************************************************/ #include "mainwindow.h" #include #include #include "ksirkskineditor_debug.h" #include "../ksirk_version.h" #include #include #include #include static const char *description = I18N_NOOP("KsirK Skin Editor"); // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE int main(int argc, char *argv[]) { qCDebug(KSIRKSKINEDITOR_LOG) << "Hello World!"; QApplication app(argc, argv); KLocalizedString::setApplicationDomain("ksirkskineditor"); KAboutData aboutData( QStringLiteral("ksirkskineditor"), i18n("KsirK Skin Editor"), QStringLiteral(KSIRK_VERSION_STRING), i18n(description), KAboutLicense::GPL, i18n("(c) 2008, Gaël de Chalendar\n"), i18n("For help and user manual, please see\nThe KsirK Web site"), - QStringLiteral("http://games.kde.org/game.php?game=ksirk")); + QStringLiteral("https://kde.org/applications/games/org.kde.ksirk")); aboutData.addAuthor(i18n("Gael de Chalendar aka Kleag"),QString(), QStringLiteral("kleag@free.fr")); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-locale"))); QCommandLineParser parser; KAboutData::setApplicationData(aboutData); parser.addVersionOption(); parser.addHelpOption(); //PORTING SCRIPT: adapt aboutdata variable if necessary parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("+[File]"), i18n("file to open"))); aboutData.setupCommandLine(&parser); parser.process(app); aboutData.processCommandLine(&parser); if (app.isSessionRestored()) { kRestoreMainWindows(); } else { qCDebug(KSIRKSKINEDITOR_LOG) << "Creating main window"; KsirkSkinEditor::MainWindow *ksirkskineditor = new KsirkSkinEditor::MainWindow(); ksirkskineditor->show(); } qCDebug(KSIRKSKINEDITOR_LOG) << "Executing app"; return app.exec(); }