Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2022-04-23 19:45:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Sat Apr 23 19:45:23 2022 rev:68 rq:971378 version:22.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2022-03-04 20:17:31.628777096 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.1538/akonadiconsole.changes 2022-04-23 19:45:41.158963331 +0200 @@ -1,0 +2,30 @@ +Mon Apr 18 07:50:35 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.04.0/ + +------------------------------------------------------------------- +Fri Apr 8 18:16:47 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.90 + * New feature release + +------------------------------------------------------------------- +Wed Mar 23 08:13:26 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.80 + * New feature release +- Changes since 21.12.3: + * Fix Akonadi Search include + * Fix compile without deprecated method + * Fix includes path (help fixing qt6 build) + * Use new akonadi contact include + * code will be removed in qt6 + * Fix compile against last libkdepim + * Adapt build system for building against qt6 + * We don't translate it. => not necessary to try to install po file + * Correct prefix to other PIM repositories in .kde-ci.yml + +------------------------------------------------------------------- Old: ---- akonadiconsole-21.12.3.tar.xz akonadiconsole-21.12.3.tar.xz.sig New: ---- akonadiconsole-22.04.0.tar.xz akonadiconsole-22.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.kPUSRd/_old 2022-04-23 19:45:41.690963963 +0200 +++ /var/tmp/diff_new_pack.kPUSRd/_new 2022-04-23 19:45:41.694963968 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: akonadiconsole -Version: 21.12.3 +Version: 22.04.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ akonadiconsole-21.12.3.tar.xz -> akonadiconsole-22.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/.git-blame-ignore-revs new/akonadiconsole-22.04.0/.git-blame-ignore-revs --- old/akonadiconsole-21.12.3/.git-blame-ignore-revs 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/.git-blame-ignore-revs 2022-04-13 04:49:18.000000000 +0200 @@ -1,2 +1,4 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: none # clang-format e8960ad91fd9ad20ea1b08fc518ec08f50ae99d9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/.gitignore new/akonadiconsole-22.04.0/.gitignore --- old/akonadiconsole-21.12.3/.gitignore 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/.gitignore 2022-04-13 04:49:18.000000000 +0200 @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: none # Ignore the following files *~ *.[oa] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/.gitlab-ci.yml new/akonadiconsole-22.04.0/.gitlab-ci.yml --- old/akonadiconsole-21.12.3/.gitlab-ci.yml 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/.gitlab-ci.yml 2022-04-13 04:49:18.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/CMakeLists.txt new/akonadiconsole-22.04.0/CMakeLists.txt --- old/akonadiconsole-21.12.3/CMakeLists.txt 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/CMakeLists.txt 2022-04-13 04:49:18.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.19.3") +set(PIM_VERSION "5.20.0") project(akonadiconsole VERSION ${PIM_VERSION}) # Needs C++17 because Akonadi uses it and we link # against its private API -set(KF5_MIN_VERSION "5.87.0") +set(KF5_MIN_VERSION "5.91.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -30,6 +30,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) # Do NOT add quote @@ -39,23 +40,23 @@ if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() -set(RELEASE_SERVICE_VERSION "21.12.3") +set(RELEASE_SERVICE_VERSION "22.04.0") set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.19.3") -set(CALENDARSUPPORT_LIB_VERSION "5.19.3") -set(AKONADI_VERSION "5.19.3") -set(AKONADI_SEARCH_VERSION "5.19.3") +set(AKONADI_CONTACT_VERSION "5.20.0") +set(CALENDARSUPPORT_LIB_VERSION "5.20.0") +set(AKONADI_VERSION "5.20.0") +set(AKONADI_SEARCH_VERSION "5.20.0") set(QT_REQUIRED_VERSION "5.15.2") -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION "5.19.3") -set(LIBKDEPIM_LIB_VERSION "5.19.3") -set(KMIME_LIB_VERSION "5.19.3") +find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) +set(MESSAGELIB_LIB_VERSION "5.20.0") +set(LIBKDEPIM_LIB_VERSION "5.20.0") +set(KMIME_LIB_VERSION "5.20.0") # Find KF5 package @@ -109,8 +110,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") endif() -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) +ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.92.0) + include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) configure_file(akonadiconsole-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadiconsole-version.h @ONLY) @@ -127,5 +128,4 @@ add_subdirectory(autotests) endif() kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) -ki18n_install(po) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/CMakePresets.json new/akonadiconsole-22.04.0/CMakePresets.json --- old/akonadiconsole-21.12.3/CMakePresets.json 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/CMakePresets.json 2022-04-13 04:49:18.000000000 +0200 @@ -13,6 +13,30 @@ "installDir": "$env{KF5}" }, { + "name": "coverage", + "displayName": "Build as debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_COVERAGE": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-qt6", + "displayName": "Build against qt6", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-qt6", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_WITH_QT6": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF6}" + }, + { "name": "dev-disable-deprecated", "displayName": "Build as without deprecated methods", "generator": "Ninja", @@ -118,6 +142,10 @@ "configurePreset": "dev" }, { + "name": "dev-qt6", + "configurePreset": "dev-qt6" + }, + { "name": "dev-disable-deprecated", "configurePreset": "dev-disable-deprecated" }, @@ -130,6 +158,10 @@ "configurePreset": "release" }, { + "name": "coverage", + "configurePreset": "coverage" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/CMakePresets.json.license new/akonadiconsole-22.04.0/CMakePresets.json.license --- old/akonadiconsole-21.12.3/CMakePresets.json.license 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/CMakePresets.json.license 2022-04-13 04:49:18.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/LICENSES/BSD-3-Clause.txt new/akonadiconsole-22.04.0/LICENSES/BSD-3-Clause.txt --- old/akonadiconsole-21.12.3/LICENSES/BSD-3-Clause.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadiconsole-22.04.0/LICENSES/BSD-3-Clause.txt 2022-04-13 04:49:18.000000000 +0200 @@ -0,0 +1,26 @@ +Copyright (c) <year> <owner>. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/akonadiconsole-version.h.cmake new/akonadiconsole-22.04.0/akonadiconsole-version.h.cmake --- old/akonadiconsole-21.12.3/akonadiconsole-version.h.cmake 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/akonadiconsole-version.h.cmake 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2019-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2019-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/CMakeLists.txt new/akonadiconsole-22.04.0/autotests/CMakeLists.txt --- old/akonadiconsole-21.12.3/autotests/CMakeLists.txt 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/CMakeLists.txt 2022-04-13 04:49:18.000000000 +0200 @@ -7,9 +7,9 @@ ecm_mark_as_test(akonadiconsole-${_name}) set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1") target_link_libraries( ${_name} - Qt::Test + Qt${QT_MAJOR_VERSION}::Test KF5::I18n - Qt::Widgets + Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigCore KF5::WidgetsAddons KF5::ItemViews diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/jobtrackermodeltest.cpp new/akonadiconsole-22.04.0/autotests/jobtrackermodeltest.cpp --- old/akonadiconsole-21.12.3/autotests/jobtrackermodeltest.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/jobtrackermodeltest.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-FileCopyrightText: 2017 David Faure <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later @@ -33,9 +33,7 @@ { } -JobTrackerModelTest::~JobTrackerModelTest() -{ -} +JobTrackerModelTest::~JobTrackerModelTest() = default; void JobTrackerModelTest::initTestCase() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/jobtrackermodeltest.h new/akonadiconsole-22.04.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-21.12.3/autotests/jobtrackermodeltest.h 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/jobtrackermodeltest.h 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-FileCopyrightText: 2017 David Faure <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/jobtrackersearchwidgettest.cpp new/akonadiconsole-22.04.0/autotests/jobtrackersearchwidgettest.cpp --- old/akonadiconsole-21.12.3/autotests/jobtrackersearchwidgettest.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/jobtrackersearchwidgettest.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ @@ -18,9 +18,7 @@ { } -JobTrackerSearchWidgetTest::~JobTrackerSearchWidgetTest() -{ -} +JobTrackerSearchWidgetTest::~JobTrackerSearchWidgetTest() = default; void JobTrackerSearchWidgetTest::shouldHaveDefaultValue() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-22.04.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-21.12.3/autotests/jobtrackersearchwidgettest.h 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/jobtrackersearchwidgettest.h 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/jobtrackertest.cpp new/akonadiconsole-22.04.0/autotests/jobtrackertest.cpp --- old/akonadiconsole-21.12.3/autotests/jobtrackertest.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/jobtrackertest.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-FileCopyrightText: 2017 David Faure <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later @@ -29,9 +29,7 @@ { } -JobTrackerTest::~JobTrackerTest() -{ -} +JobTrackerTest::~JobTrackerTest() = default; void JobTrackerTest::initTestCase() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/autotests/jobtrackertest.h new/akonadiconsole-22.04.0/autotests/jobtrackertest.h --- old/akonadiconsole-21.12.3/autotests/jobtrackertest.h 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/autotests/jobtrackertest.h 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-FileCopyrightText: 2017 David Faure <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/sanitizers.supp new/akonadiconsole-22.04.0/sanitizers.supp --- old/akonadiconsole-21.12.3/sanitizers.supp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/sanitizers.supp 2022-04-13 04:49:18.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/CMakeLists.txt new/akonadiconsole-22.04.0/src/CMakeLists.txt --- old/akonadiconsole-21.12.3/src/CMakeLists.txt 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/CMakeLists.txt 2022-04-13 04:49:18.000000000 +0200 @@ -148,7 +148,7 @@ KF5::Mime KF5::Contacts KF5::CalendarCore - Qt::Sql + Qt${QT_MAJOR_VERSION}::Sql KF5::Completion KF5::ItemViews KF5::TextWidgets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/agentconfigmodel.cpp new/akonadiconsole-22.04.0/src/agentconfigmodel.cpp --- old/akonadiconsole-21.12.3/src/agentconfigmodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/agentconfigmodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -82,7 +82,7 @@ QVariant AgentConfigModel::data(const QModelIndex &index, int role) const { if (index.row() < 0 || index.row() >= m_settings.size()) { - return QVariant(); + return {}; } QPair<QString, QVariant> setting = m_settings.at(index.row()); if (role == Qt::DisplayRole || role == Qt::EditRole) { @@ -98,7 +98,7 @@ return QLatin1String(setting.second.typeName()); } } - return QVariant(); + return {}; } bool AgentConfigModel::setData(const QModelIndex &index, const QVariant &value, int role) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/agentwidget.cpp new/akonadiconsole-22.04.0/src/agentwidget.cpp --- old/akonadiconsole-21.12.3/src/agentwidget.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/agentwidget.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -408,16 +408,16 @@ QString agentStatus; switch (instance.status()) { case AgentInstance::Idle: - agentStatus = i18nc("agent is in an idle state", "Idle"); + agentStatus = QStringLiteral("Idle"); break; case AgentInstance::Running: - agentStatus = i18nc("agent is running", "Running (%1%)", instance.progress()); + agentStatus = QStringLiteral("Running (%1%)").arg(instance.progress()); break; case AgentInstance::Broken: - agentStatus = i18nc("agent is broken somehow", "Broken"); + agentStatus = QStringLiteral("Broken"); break; case AgentInstance::NotConfigured: - agentStatus = i18nc("agent is not yet configured", "Not Configured"); + agentStatus = QStringLiteral("Not Configured"); break; } ui.statusLabel->setText(i18nc("Two statuses, for example \"Online, Running (66%)\" or \"Offline, Broken\"", "%1, %2", onlineStatus, agentStatus)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/akonadibrowsermodel.cpp new/akonadiconsole-22.04.0/src/akonadibrowsermodel.cpp --- old/akonadiconsole-21.12.3/src/akonadibrowsermodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/akonadibrowsermodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -19,14 +19,12 @@ class AkonadiBrowserModel::State { public: - virtual ~State() - { - } + virtual ~State() = default; QStringList m_collectionHeaders; QStringList m_itemHeaders; - virtual QVariant entityData(const Item &item, int column, int role) const = 0; + Q_REQUIRED_RESULT virtual QVariant entityData(const Item &item, int column, int role) const = 0; }; class GenericState : public AkonadiBrowserModel::State @@ -38,16 +36,14 @@ m_itemHeaders << QStringLiteral("Id") << QStringLiteral("Remote Id") << QStringLiteral("GID") << QStringLiteral("MimeType"); } - ~GenericState() override - { - } + ~GenericState() override = default; enum Columns { IdColumn = 0, RemoteIdColumn = 1, GIDColumn = 2, MimeTypeColumn = 3 }; - QVariant entityData(const Item &item, int column, int role) const override + Q_REQUIRED_RESULT QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { - return QVariant(); + return {}; } switch (column) { @@ -60,7 +56,7 @@ case MimeTypeColumn: return item.mimeType(); } - return QVariant(); + return {}; } }; @@ -73,18 +69,16 @@ m_itemHeaders << QStringLiteral("Subject") << QStringLiteral("Sender") << QStringLiteral("Date"); } - ~MailState() override - { - } + ~MailState() override = default; - QVariant entityData(const Item &item, int column, int role) const override + Q_REQUIRED_RESULT QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { - return QVariant(); + return {}; } if (!item.hasPayload<KMime::Message::Ptr>()) { - return QVariant(); + return {}; } const auto mail = item.payload<KMime::Message::Ptr>(); @@ -110,7 +104,7 @@ } } - return QVariant(); + return {}; } }; @@ -123,18 +117,16 @@ m_itemHeaders << QStringLiteral("Given Name") << QStringLiteral("Family Name") << QStringLiteral("Email"); } - ~ContactsState() override - { - } + ~ContactsState() override = default; - QVariant entityData(const Item &item, int column, int role) const override + Q_REQUIRED_RESULT QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { - return QVariant(); + return {}; } if (!item.hasPayload<KContacts::Addressee>() && !item.hasPayload<KContacts::ContactGroup>()) { - return QVariant(); + return {}; } if (item.hasPayload<KContacts::Addressee>()) { @@ -148,7 +140,7 @@ case 2: return addr.preferredEmail(); } - return QVariant(); + return {}; } if (item.hasPayload<KContacts::ContactGroup>()) { switch (column) { @@ -156,9 +148,9 @@ const auto group = item.payload<KContacts::ContactGroup>(); return group.name(); } - return QVariant(); + return {}; } - return QVariant(); + return {}; } }; @@ -172,18 +164,16 @@ << QStringLiteral("Type"); } - ~CalendarState() override - { - } + ~CalendarState() override = default; - QVariant entityData(const Item &item, int column, int role) const override + Q_REQUIRED_RESULT QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { - return QVariant(); + return {}; } if (!item.hasPayload<IncidencePtr>()) { - return QVariant(); + return {}; } const auto incidence = item.payload<IncidencePtr>(); // NOTE: remember to update AkonadiBrowserSortModel::lessThan if you insert/move columns @@ -201,7 +191,7 @@ default: break; } - return QVariant(); + return {}; } }; @@ -258,7 +248,7 @@ QVariant AkonadiBrowserModel::entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const { if (section < 0) { - return QVariant(); + return {}; } if (orientation == Qt::Vertical) { @@ -268,14 +258,14 @@ if (headerGroup == EntityTreeModel::CollectionTreeHeaders) { if (role == Qt::DisplayRole) { if (section >= m_currentState->m_collectionHeaders.size()) { - return QVariant(); + return {}; } return m_currentState->m_collectionHeaders.at(section); } } else if (headerGroup == EntityTreeModel::ItemListHeaders) { if (role == Qt::DisplayRole) { if (section >= m_currentState->m_itemHeaders.size()) { - return QVariant(); + return {}; } return m_currentState->m_itemHeaders.at(section); } @@ -335,9 +325,7 @@ { } -AkonadiBrowserSortModel::~AkonadiBrowserSortModel() -{ -} +AkonadiBrowserSortModel::~AkonadiBrowserSortModel() = default; bool AkonadiBrowserSortModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/browserwidget.cpp new/akonadiconsole-22.04.0/src/browserwidget.cpp --- old/akonadiconsole-21.12.3/src/browserwidget.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/browserwidget.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -65,8 +65,8 @@ #include <QVBoxLayout> #ifdef ENABLE_CONTENTVIEWS -#include <Akonadi/Contact/ContactGroupViewer> -#include <Akonadi/Contact/ContactViewer> +#include <Akonadi/ContactGroupViewer> +#include <Akonadi/ContactViewer> #include <CalendarSupport/IncidenceViewer> #include <MessageViewer/Viewer> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/connectionpage.cpp new/akonadiconsole-22.04.0/src/connectionpage.cpp --- old/akonadiconsole-21.12.3/src/connectionpage.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/connectionpage.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -11,7 +11,7 @@ #include "debugfiltermodel.h" #include "debugmodel.h" -#include <KCheckComboBox> +#include <Libkdepim/KCheckComboBox> #include <QHeaderView> #include <QLabel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/debugfiltermodel.cpp new/akonadiconsole-22.04.0/src/debugfiltermodel.cpp --- old/akonadiconsole-21.12.3/src/debugfiltermodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/debugfiltermodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -8,7 +8,7 @@ #include "akonadiconsole_debug.h" #include "debugmodel.h" -#include <KCheckComboBox> +#include <Libkdepim/KCheckComboBox> #include <chrono> using namespace std::chrono_literals; @@ -27,9 +27,7 @@ connect(&mInvalidateTimer, &QTimer::timeout, this, &DebugFilterModel::invalidate); } -DebugFilterModel::~DebugFilterModel() -{ -} +DebugFilterModel::~DebugFilterModel() = default; void DebugFilterModel::setSenderFilter(KCheckComboBox *senderFilter) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/debugmodel.cpp new/akonadiconsole-22.04.0/src/debugmodel.cpp --- old/akonadiconsole-21.12.3/src/debugmodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/debugmodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -18,9 +18,7 @@ { } -DebugModel::~DebugModel() -{ -} +DebugModel::~DebugModel() = default; QString DebugModel::displaySender(const QString &identifer) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/jobtracker.cpp new/akonadiconsole-22.04.0/src/jobtracker.cpp --- old/akonadiconsole-21.12.3/src/jobtracker.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/jobtracker.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -48,7 +48,7 @@ QObject::connect(&timer, &QTimer::timeout, q, &JobTracker::signalUpdates); } - bool isSession(int id) const + Q_REQUIRED_RESULT bool isSession(int id) const { return id < -1; } @@ -228,7 +228,7 @@ if (!d->sessions.isEmpty()) { return d->sessions.at(id); } else { - return QString(); + return {}; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/jobtrackerfilterproxymodel.cpp new/akonadiconsole-22.04.0/src/jobtrackerfilterproxymodel.cpp --- old/akonadiconsole-21.12.3/src/jobtrackerfilterproxymodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/jobtrackerfilterproxymodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ @@ -16,9 +16,7 @@ setDynamicSortFilter(true); } -JobTrackerFilterProxyModel::~JobTrackerFilterProxyModel() -{ -} +JobTrackerFilterProxyModel::~JobTrackerFilterProxyModel() = default; bool JobTrackerFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-22.04.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-21.12.3/src/jobtrackerfilterproxymodel.h 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/jobtrackerfilterproxymodel.h 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/jobtrackermodel.cpp new/akonadiconsole-22.04.0/src/jobtrackermodel.cpp --- old/akonadiconsole-21.12.3/src/jobtrackermodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/jobtrackermodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -27,7 +27,7 @@ { } - int rowForParentId(int parentid) const + Q_REQUIRED_RESULT int rowForParentId(int parentid) const { const int grandparentid = tracker.parentId(parentid); int row = -1; @@ -69,21 +69,21 @@ QModelIndex JobTrackerModel::index(int row, int column, const QModelIndex &parent) const { if (column < 0 || column >= NumColumns) { - return QModelIndex(); + return {}; } if (!parent.isValid()) { // session, at top level if (row < 0 || row >= d->tracker.sessions().size()) { - return QModelIndex(); + return {}; } return createIndex(row, column, d->tracker.idForSession(d->tracker.sessions().at(row))); } if (parent.column() != 0) { - return QModelIndex(); + return {}; } // job, i.e. non-toplevel const int jobCount = d->tracker.jobCount(parent.internalId()); if (row < 0 || row >= jobCount) { - return QModelIndex(); + return {}; } return createIndex(row, column, d->tracker.jobIdAt(row, parent.internalId())); } @@ -91,19 +91,19 @@ QModelIndex JobTrackerModel::parent(const QModelIndex &idx) const { if (!idx.isValid()) { - return QModelIndex(); + return {}; } const int parentid = d->tracker.parentId(idx.internalId()); if (parentid == -1) { - return QModelIndex(); // top level session + return {}; // top level session } const int row = d->rowForParentId(parentid); if (row >= 0) { return createIndex(row, 0, parentid); } else { - return QModelIndex(); + return {}; } } @@ -151,7 +151,7 @@ const int id = idx.internalId(); if (role != Qt::DisplayRole && role != Qt::ForegroundRole && role != Qt::FontRole && role != Qt::ToolTipRole && role != FailedIdRole) { // Avoid the QHash lookup for all other roles - return QVariant(); + return {}; } const JobInfo info = d->tracker.info(id); if (role == Qt::DisplayRole) { @@ -195,7 +195,7 @@ return info.state == JobInfo::Failed; } } - return QVariant(); + return {}; } QVariant JobTrackerModel::headerData(int section, Qt::Orientation orientation, int role) const @@ -220,7 +220,7 @@ } } } - return QVariant(); + return {}; } void JobTrackerModel::resetTracker() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/jobtrackersearchwidget.cpp new/akonadiconsole-22.04.0/src/jobtrackersearchwidget.cpp --- old/akonadiconsole-21.12.3/src/jobtrackersearchwidget.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/jobtrackersearchwidget.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ @@ -44,9 +44,7 @@ connect(mSelectColumn, &QComboBox::currentIndexChanged, this, &JobTrackerSearchWidget::slotColumnChanged); } -JobTrackerSearchWidget::~JobTrackerSearchWidget() -{ -} +JobTrackerSearchWidget::~JobTrackerSearchWidget() = default; void JobTrackerSearchWidget::slotColumnChanged(int index) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/jobtrackersearchwidget.h new/akonadiconsole-22.04.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-21.12.3/src/jobtrackersearchwidget.h 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/jobtrackersearchwidget.h 2022-04-13 04:49:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2021 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2017-2022 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/logging.cpp new/akonadiconsole-22.04.0/src/logging.cpp --- old/akonadiconsole-21.12.3/src/logging.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/logging.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -20,7 +20,7 @@ #include <QStandardItemModel> #include <QTreeView> -#include <KCheckComboBox> +#include <Libkdepim/KCheckComboBox> #include <KConfigGroup> #include <KSharedConfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/loggingfiltermodel.cpp new/akonadiconsole-22.04.0/src/loggingfiltermodel.cpp --- old/akonadiconsole-21.12.3/src/loggingfiltermodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/loggingfiltermodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -8,7 +8,7 @@ #include "akonadiconsole_debug.h" #include "loggingmodel.h" -#include <KCheckComboBox> +#include <Libkdepim/KCheckComboBox> #ifndef COMPILE_WITH_UNITY_CMAKE_SUPPORT Q_DECLARE_METATYPE(LoggingModel::Message) #endif @@ -25,9 +25,7 @@ connect(&mInvalidateTimer, &QTimer::timeout, this, &LoggingFilterModel::invalidate); } -LoggingFilterModel::~LoggingFilterModel() -{ -} +LoggingFilterModel::~LoggingFilterModel() = default; void LoggingFilterModel::setAppFilter(KCheckComboBox *appFilter) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/loggingmodel.cpp new/akonadiconsole-22.04.0/src/loggingmodel.cpp --- old/akonadiconsole-21.12.3/src/loggingmodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/loggingmodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -17,9 +17,7 @@ { } -LoggingModel::~LoggingModel() -{ -} +LoggingModel::~LoggingModel() = default; QString LoggingModel::cacheString(const QString &str, QSet<QString> &cache, QStandardItemModel *model) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/main.cpp new/akonadiconsole-22.04.0/src/main.cpp --- old/akonadiconsole-21.12.3/src/main.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/main.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -9,7 +9,7 @@ #include "akonadiconsole-version.h" #include "instanceselector.h" #include <kcoreaddons_version.h> -#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <Kdelibs4ConfigMigrator> #endif @@ -24,10 +24,12 @@ int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); +#endif QApplication app(argc, argv); -#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) Kdelibs4ConfigMigrator migrate(QStringLiteral("akonadiconsole")); migrate.setConfigFiles(QStringList() << QStringLiteral("akonadiconsolerc")); migrate.setUiFiles(QStringList() << QStringLiteral("akonadiconsoleui.rc")); @@ -38,7 +40,7 @@ QStringLiteral(KDEPIM_VERSION), QStringLiteral("The Management and Debugging Console for Akonadi"), KAboutLicense::GPL, - QStringLiteral("(c) 2006-2021 the Akonadi developer"), + QStringLiteral("(c) 2006-2022 the Akonadi developer"), QString(), QStringLiteral("https://community.kde.org/KDE_PIM/akonadi";)); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("akonadi"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/monitorsmodel.cpp new/akonadiconsole-22.04.0/src/monitorsmodel.cpp --- old/akonadiconsole-21.12.3/src/monitorsmodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/monitorsmodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -22,9 +22,7 @@ QTimer::singleShot(0, this, &MonitorsModel::init); } -MonitorsModel::~MonitorsModel() -{ -} +MonitorsModel::~MonitorsModel() = default; void MonitorsModel::init() { @@ -100,13 +98,13 @@ } } - return QVariant(); + return {}; } QVariant MonitorsModel::data(const QModelIndex &index, int role) const { if (!index.isValid() || index.column() != 0) { - return QVariant(); + return {}; } if ((int)index.internalId() == -1) { if (index.row() >= mSessions.count()) { @@ -130,7 +128,7 @@ } } - return QVariant(); + return {}; } int MonitorsModel::columnCount(const QModelIndex &parent) const @@ -161,7 +159,7 @@ return index(child.internalId(), 0, {}); } - return QModelIndex(); + return {}; } QModelIndex MonitorsModel::index(int row, int column, const QModelIndex &parent) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/notificationfiltermodel.cpp new/akonadiconsole-22.04.0/src/notificationfiltermodel.cpp --- old/akonadiconsole-21.12.3/src/notificationfiltermodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/notificationfiltermodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -8,7 +8,7 @@ #include "notificationfiltermodel.h" #include "notificationmodel.h" -#include <KCheckComboBox> +#include <Libkdepim/KCheckComboBox> #include <QStandardItemModel> #include <chrono> @@ -26,9 +26,7 @@ connect(&mInvalidateTimer, &QTimer::timeout, this, &NotificationFilterModel::invalidateFilter); } -NotificationFilterModel::~NotificationFilterModel() -{ -} +NotificationFilterModel::~NotificationFilterModel() = default; void NotificationFilterModel::setTypeFilter(KPIM::KCheckComboBox *typeFilter) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/notificationmodel.cpp new/akonadiconsole-22.04.0/src/notificationmodel.cpp --- old/akonadiconsole-21.12.3/src/notificationmodel.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/notificationmodel.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -57,7 +57,7 @@ QVariant NotificationModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) { - return QVariant(); + return {}; } if (role == Qt::DisplayRole || role == Qt::ToolTipRole) { @@ -194,7 +194,7 @@ return QVariant::fromValue(m_data.at(index.row())); } - return QVariant(); + return {}; } QVariant NotificationModel::headerData(int section, Qt::Orientation orientation, int role) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/notificationmonitor.cpp new/akonadiconsole-22.04.0/src/notificationmonitor.cpp --- old/akonadiconsole-21.12.3/src/notificationmonitor.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/notificationmonitor.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -29,9 +29,9 @@ #include <QTreeView> #include <QVBoxLayout> -#include <KCheckComboBox> #include <KConfigGroup> #include <KSharedConfig> +#include <Libkdepim/KCheckComboBox> using KPIM::KCheckComboBox; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-22.04.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-21.12.3/src/org.kde.akonadiconsole.desktop 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/org.kde.akonadiconsole.desktop 2022-04-13 04:49:18.000000000 +0200 @@ -4,7 +4,7 @@ Name[ast]=Consola d'Akonadi Name[az]=Akonadi Konsolu Name[ca]=Consola de l'Akonadi -Name[ca@valencia]=Consola de l'Akonadi +Name[ca@valencia]=Consola d'Akonadi Name[cs]=Konzole Akonadi Name[de]=Akonadi-Konsole Name[el]=?????????????? Akonadi @@ -35,8 +35,9 @@ Name[sr@ijekavianlatin]=Akonadijeva konzola Name[sr@latin]=Akonadijeva konzola Name[sv]=Akonadi-terminal -Name[tr]=Akonadi U??birimi +Name[tr]=Akonadi Konsolu Name[uk]=???????????????? Akonadi +Name[vi]=B??n ??i???u khi???n Akonadi Name[x-test]=xxAkonadi Consolexx Name[zh_CN]=Akonadi ????????? Name[zh_TW]=Akonadi ????????? @@ -48,7 +49,7 @@ Comment[ast]=Consola de xesti??n y depuraci??n d'Akonadi Comment[az]=Akonadi ??dar??etm?? v?? X??ta Sazlama Konsolu Comment[ca]=Consola de gesti?? i depuraci?? per a l'Akonadi -Comment[ca@valencia]=Consola de gesti?? i depuraci?? per a l'Akonadi +Comment[ca@valencia]=Consola de gesti?? i depuraci?? per a Akonadi Comment[cs]=Spr??va Akonadi a ladic?? konzole Comment[de]=Akonadi-Konsole zur Verwaltung und Fehlersuche Comment[el]=?????????????????? ?????????????????????? ?????? ???????????????????????????? Akonadi @@ -79,8 +80,9 @@ Comment[sr@ijekavianlatin]=Akonadijeva konzola za upravljanje i ispravljanje Comment[sr@latin]=Akonadijeva konzola za upravljanje i ispravljanje Comment[sv]=Akonadi hanterings- och fels??kningsterminal -Comment[tr]=Akonadi Y??netim ve Hata Ay??klama U??birimi +Comment[tr]=Akonadi Y??netim ve Hata Ay??klama Konsolu Comment[uk]=???????????????? ?????????????????? ?? ?????????????????????? Akonadi +Comment[vi]=B??n ??i???u khi???n qu???n l?? v?? g??? l???i Akonadi Comment[x-test]=xxAkonadi Management and Debugging Consolexx Comment[zh_CN]=????????????????????? Akonadi ???????????? Comment[zh_TW]=Akonadi ???????????????????????? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/querydebugger.cpp new/akonadiconsole-22.04.0/src/querydebugger.cpp --- old/akonadiconsole-21.12.3/src/querydebugger.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/querydebugger.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -72,9 +72,7 @@ class Node { public: - virtual ~Node() - { - } + virtual ~Node() = default; Node *parent; RowType type; @@ -250,7 +248,7 @@ } } - int rowCount(const QModelIndex &parent) const override + Q_REQUIRED_RESULT int rowCount(const QModelIndex &parent) const override { if (!parent.isValid()) { return mConnections.count(); @@ -269,22 +267,22 @@ Q_UNREACHABLE(); } - int columnCount(const QModelIndex &parent = QModelIndex()) const override + Q_REQUIRED_RESULT int columnCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent) return 5; } - QModelIndex parent(const QModelIndex &child) const override + Q_REQUIRED_RESULT QModelIndex parent(const QModelIndex &child) const override { if (!child.isValid() || !child.internalPointer()) { - return QModelIndex(); + return {}; } Node *childNode = reinterpret_cast<Node *>(child.internalPointer()); // childNode is a Connection if (!childNode->parent) { - return QModelIndex(); + return {}; } // childNode is a query in transaction @@ -298,13 +296,13 @@ } } - QModelIndex index(int row, int column, const QModelIndex &parent) const override + Q_REQUIRED_RESULT QModelIndex index(int row, int column, const QModelIndex &parent) const override { if (!parent.isValid()) { if (row < mConnections.count()) { return createIndex(row, column, mConnections.at(row)); } else { - return QModelIndex(); + return {}; } } @@ -314,26 +312,26 @@ if (row < static_cast<ConnectionNode *>(parentNode)->queries.count()) { return createIndex(row, column, static_cast<ConnectionNode *>(parentNode)->queries.at(row)); } else { - return QModelIndex(); + return {}; } case Transaction: if (row < static_cast<TransactionNode *>(parentNode)->queries.count()) { return createIndex(row, column, static_cast<TransactionNode *>(parentNode)->queries.at(row)); } else { - return QModelIndex(); + return {}; } case Query: // Query can never have children - return QModelIndex(); + return {}; } Q_UNREACHABLE(); } - QVariant headerData(int section, Qt::Orientation orientation, int role) const override + Q_REQUIRED_RESULT QVariant headerData(int section, Qt::Orientation orientation, int role) const override { if (orientation != Qt::Horizontal || role != Qt::DisplayRole) { - return QVariant(); + return {}; } switch (section) { @@ -349,13 +347,13 @@ return QStringLiteral("Error"); } - return QVariant(); + return {}; } - QVariant data(const QModelIndex &index, int role) const override + Q_REQUIRED_RESULT QVariant data(const QModelIndex &index, int role) const override { if (!index.isValid()) { - return QVariant(); + return {}; } Node *node = reinterpret_cast<Node *>(index.internalPointer()); @@ -419,7 +417,7 @@ } private: - QString fromMSecsSinceEpoch(qint64 msecs) const + Q_REQUIRED_RESULT QString fromMSecsSinceEpoch(qint64 msecs) const { return QDateTime::fromMSecsSinceEpoch(msecs).toString(QStringLiteral("dd.MM.yyyy HH:mm:ss.zzz")); } @@ -427,7 +425,7 @@ QVariant connectionData(ConnectionNode *connection, int column, int role) const { if (role != Qt::DisplayRole) { - return QVariant(); + return {}; } switch (column) { @@ -437,7 +435,7 @@ return fromMSecsSinceEpoch(connection->start); } - return QVariant(); + return {}; } QVariant transactionData(TransactionNode *transaction, int column, int role) const @@ -493,7 +491,7 @@ return query->values; } - return QVariant(); + return {}; } QVector<ConnectionNode *> mConnections; @@ -515,10 +513,10 @@ enum SPECIAL_ROWS { TOTAL, NUM_SPECIAL_ROWS }; enum COLUMNS { DurationColumn, CallsColumn, AvgDurationColumn, QueryColumn, NUM_COLUMNS }; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override + Q_REQUIRED_RESULT QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override { if (orientation == Qt::Vertical || section < 0 || section >= NUM_COLUMNS || (role != Qt::DisplayRole && role != Qt::ToolTipRole)) { - return QVariant(); + return {}; } if (section == QueryColumn) { @@ -531,22 +529,22 @@ return QStringLiteral("Avg. Duration [ms]"); } - return QVariant(); + return {}; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override + Q_REQUIRED_RESULT QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { if (role != Qt::DisplayRole && role != Qt::ToolTipRole) { - return QVariant(); + return {}; } const int row = index.row(); if (row < 0 || row >= rowCount(index.parent())) { - return QVariant(); + return {}; } const int column = index.column(); if (column < 0 || column >= NUM_COLUMNS) { - return QVariant(); + return {}; } const QueryInfo &info = (row < NUM_SPECIAL_ROWS) ? mSpecialRows[row] : mQueries.at(row - NUM_SPECIAL_ROWS); @@ -565,10 +563,10 @@ return float(info.duration) / info.calls; } - return QVariant(); + return {}; } - int rowCount(const QModelIndex &parent = QModelIndex()) const override + Q_REQUIRED_RESULT int rowCount(const QModelIndex &parent = QModelIndex()) const override { if (!parent.isValid()) { return mQueries.size() + NUM_SPECIAL_ROWS; @@ -577,7 +575,7 @@ } } - int columnCount(const QModelIndex &parent = QModelIndex()) const override + Q_REQUIRED_RESULT int columnCount(const QModelIndex &parent = QModelIndex()) const override { if (!parent.isValid()) { return NUM_COLUMNS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/searchwidget.cpp new/akonadiconsole-22.04.0/src/searchwidget.cpp --- old/akonadiconsole-21.12.3/src/searchwidget.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/searchwidget.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -17,8 +17,8 @@ #include <Akonadi/ItemSearchJob> #include <Akonadi/SearchQuery> -#include <AkonadiSearch/Core/searchstore.h> -#include <AkonadiSearch/Xapian/xapiansearchstore.h> +#include <Core/SearchStore> +#include <Xapian/xapiansearchstore.h> #include <KComboBox> #include <KConfigGroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.12.3/src/tagpropertiesdialog.cpp new/akonadiconsole-22.04.0/src/tagpropertiesdialog.cpp --- old/akonadiconsole-21.12.3/src/tagpropertiesdialog.cpp 2022-02-07 07:07:51.000000000 +0100 +++ new/akonadiconsole-22.04.0/src/tagpropertiesdialog.cpp 2022-04-13 04:49:18.000000000 +0200 @@ -29,9 +29,7 @@ setupUi(); } -TagPropertiesDialog::~TagPropertiesDialog() -{ -} +TagPropertiesDialog::~TagPropertiesDialog() = default; Tag TagPropertiesDialog::tag() const {
