diff --git a/CMakeLists.txt b/CMakeLists.txt index acf09f76..8ad01dd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,100 +1,100 @@ cmake_minimum_required(VERSION 3.1) set(KDEPIM_VERSION_NUMBER "5.7.90") project(akregator VERSION ${KDEPIM_VERSION_NUMBER}) set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(ECMSetupVersion) include(ECMAddTests) include(ECMMarkNonGuiExecutable) include(GenerateExportHeader) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) include(FeatureSummary) include(CheckFunctionExists) include(ECMGeneratePriFile) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) include(ECMCoverageOption) # Do NOT add quote set(KDEPIM_DEV_VERSION beta) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") set(QT_REQUIRED_VERSION "5.8.0") -set(KONTACTINTERFACE_LIB_VERSION "5.7.80") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.80") -set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.7.80") -set(LIBKDEPIM_LIB_VERSION_LIB "5.7.80") -set(LIBKLEO_LIB_VERSION_LIB "5.7.80") -set(MESSAGELIB_LIB_VERSION_LIB "5.7.80") -set(PIMCOMMON_LIB_VERSION_LIB "5.7.80") -set(SYNDICATION_LIB_VERSION "5.7.80") +set(KONTACTINTERFACE_LIB_VERSION "5.8.90") +set(KPIMTEXTEDIT_LIB_VERSION "5.8.90") +set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.8.90") +set(LIBKDEPIM_LIB_VERSION_LIB "5.8.90") +set(LIBKLEO_LIB_VERSION_LIB "5.8.90") +set(MESSAGELIB_LIB_VERSION_LIB "5.8.90") +set(PIMCOMMON_LIB_VERSION_LIB "5.8.90") +set(SYNDICATION_LIB_VERSION "5.8.90") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets PrintSupport) find_package(Grantlee5 "5.1" CONFIG REQUIRED) # Find KF5 package find_package(KF5Crash ${KF5_VERSION} REQUIRED) find_package(KF5DocTools ${KF5_VERSION} REQUIRED) find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Notifications ${KF5_VERSION} CONFIG REQUIRED) # Find KdepimLibs Package find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Syndication ${SYNDICATION_LIB_VERSION} CONFIG REQUIRED) find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) # Fix plugin support for removing theses dependancies find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED) include_directories(${akregator_SOURCE_DIR} ${akregator_BINARY_DIR}) add_definitions(-DTRANSLATION_DOMAIN=\"akregator\") add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) add_definitions(-DQT_NO_CAST_FROM_ASCII) add_definitions(-DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) add_subdirectory(export) add_subdirectory(interfaces) add_subdirectory(plugins) add_subdirectory(configuration) add_subdirectory(src) add_subdirectory(kontactplugin) add_subdirectory(kconf_update) install(FILES akregator.renamecategories akregator.categories DESTINATION ${KDE_INSTALL_CONFDIR}) add_subdirectory(doc) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/configuration/settings_advanced.cpp b/configuration/settings_advanced.cpp index 38c9fa68..2ca972d2 100644 --- a/configuration/settings_advanced.cpp +++ b/configuration/settings_advanced.cpp @@ -1,95 +1,95 @@ /* This file is part of Akregator. Copyright (C) 2005-2007 Frank Osterfeld 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. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "settings_advanced.h" #include "akregatorconfig.h" #include "storagefactory.h" #include "storagefactoryregistry.h" #include #include #include #include #include using namespace Akregator; SettingsAdvanced::SettingsAdvanced(QWidget *parent, const char *name) : QWidget(parent) { setObjectName(QLatin1String(name)); setupUi(this); const QStringList backends = Backend::StorageFactoryRegistry::self()->list(); for (const QString &i : backends) { Backend::StorageFactory *const factory = Backend::StorageFactoryRegistry::self()->getFactory(i); if (!factory) { continue; } m_factories.insert(factory->key(), factory); cbBackend->addItem(factory->name(), factory->key()); } connect(pbBackendConfigure, &QPushButton::clicked, this, &SettingsAdvanced::slotConfigureStorage); - connect(cbBackend, static_cast(&KComboBox::activated), this, &SettingsAdvanced::slotFactorySelected); + connect(cbBackend, QOverload::of(&KComboBox::activated), this, &SettingsAdvanced::slotFactorySelected); connect(kcfg_UseMarkReadDelay, &QCheckBox::toggled, kcfg_MarkReadDelay, &KPluralHandlingSpinBox::setEnabled); kcfg_MarkReadDelay->setSuffix(ki18ncp("Mark selected article read after", " second", " seconds")); } QString SettingsAdvanced::selectedFactory() const { return cbBackend->itemData(cbBackend->currentIndex()).toString(); } void SettingsAdvanced::selectFactory(const QString &key) { const int idx = cbBackend->findData(key); if (idx < 0) { return; } cbBackend->setCurrentIndex(idx); const Backend::StorageFactory *const factory = m_factories.value(key); Q_ASSERT(factory); pbBackendConfigure->setEnabled(factory->isConfigurable()); } void SettingsAdvanced::slotConfigureStorage() { const QString key = cbBackend->itemData(cbBackend->currentIndex()).toString(); if (!key.isEmpty()) { Backend::StorageFactory *const factory = m_factories.value(key); Q_ASSERT(factory); factory->configure(); } } void SettingsAdvanced::slotFactorySelected(int pos) { const QString key = cbBackend->itemData(pos).toString(); const Backend::StorageFactory *const factory = m_factories.value(key); Q_ASSERT(factory); pbBackendConfigure->setEnabled(factory->isConfigurable()); }