Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2021-12-13 20:42:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Mon Dec 13 20:42:23 2021 rev:64 rq:937856 version:21.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2021-11-06 18:18:37.964903241 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.2520/akonadiconsole.changes 2021-12-13 20:47:03.412506735 +0100 @@ -1,0 +2,34 @@ +Fri Dec 3 19:21:17 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.12.0/ +- Changes since 21.11.90: + * Enable new GitLab CI on stable branch. + +------------------------------------------------------------------- +Sat Nov 27 10:10:11 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:54:06 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.11.80 + * New feature release +- Changes since 21.08.3: + * Improve the Database Browser tab + * Allow to show header in qtc6 + * Remove unused includes + * Not necessary now to use qOverload + * Fix akonadi include + * Remove some qOverload as we remove deprecated qt5.15 signal + * Add KDE CI file + * Use qOverload directly (scripted) + * Use chrono_literals + * Add alpha as name + +------------------------------------------------------------------- Old: ---- akonadiconsole-21.08.3.tar.xz akonadiconsole-21.08.3.tar.xz.sig New: ---- akonadiconsole-21.12.0.tar.xz akonadiconsole-21.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.Xk2dXk/_old 2021-12-13 20:47:03.860507022 +0100 +++ /var/tmp/diff_new_pack.Xk2dXk/_new 2021-12-13 20:47:03.864507025 +0100 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadiconsole -Version: 21.08.3 +Version: 21.12.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -94,6 +94,5 @@ %{_kf5_debugdir}/akonadiconsole.renamecategories %{_kf5_iconsdir}/hicolor/*/apps/akonadiconsole.png %{_kf5_libdir}/libakonadiconsole.so.* -%{_kf5_sharedir}/kconf_update/ %changelog ++++++ akonadiconsole-21.08.3.tar.xz -> akonadiconsole-21.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/.gitlab-ci.yml new/akonadiconsole-21.12.0/.gitlab-ci.yml --- old/akonadiconsole-21.08.3/.gitlab-ci.yml 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/.gitlab-ci.yml 2021-11-30 21:55:16.000000000 +0100 @@ -1,34 +1,6 @@ # SPDX-FileCopyrightText: 2020-2021 Laurent Montel <mon...@kde.org> -# SPDX-FileCopyrightText: 2021 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml - -build_clazy_clang_tidy: - stage: build - image: kdeorg/ci-suse-qt515 - extends: .linux - #only: - # - merge_requests - before_script: - - zypper install -y clazy - - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git $CI_TOOLING - - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git $CI_TOOLING/repo-metadata - - git clone --depth=1 https://invent.kde.org/sysadmin/kde-build-metadata.git $CI_TOOLING/kde-build-metadata - - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git $CI_TOOLING/kde-dev-scripts - - script: - - export CXX=clazy - - export CC=clang - - export CXXFLAGS="-Wno-deprecated-declarations" - - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$' - - export CLAZY_CHECKS="level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs" - - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX - - cd build && run-clang-tidy - variables: - PLATFORM: SUSEQt5.15 - BRANCH_GROUP: stable-kf5-qt5 + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/.kde-ci.yml new/akonadiconsole-21.12.0/.kde-ci.yml --- old/akonadiconsole-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadiconsole-21.12.0/.kde-ci.yml 2021-11-30 21:55:16.000000000 +0100 @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@latest' + 'frameworks/kcontacts' : '@latest' + 'frameworks/kcalendarcore' : '@latest' + 'pim/akonadi' : '@same' + 'pim/akonadi-contacts' : '@same' + 'pim/akonadi-mime' : '@same' + 'pim/akonadi-search' : '@same' + 'pim/calendarsupport' : '@same' + 'pim/kimap' : '@same' + 'pim/kmime' : '@same' + 'pim/kpimtextedit' : '@same' + 'pim/libkdepim' : '@same' + 'pim/libkleo' : '@same' + 'pim/messagelib' : '@same' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/CMakeLists.txt new/akonadiconsole-21.12.0/CMakeLists.txt --- old/akonadiconsole-21.08.3/CMakeLists.txt 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/CMakeLists.txt 2021-11-30 21:55:16.000000000 +0100 @@ -1,13 +1,11 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.3") +set(PIM_VERSION "5.19.0") project(akonadiconsole VERSION ${PIM_VERSION}) # Needs C++17 because Akonadi uses it and we link # against its private API -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(KF5_MIN_VERSION "5.83.0") +set(KF5_MIN_VERSION "5.87.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -22,41 +20,42 @@ include(FeatureSummary) include(KDEGitCommitHooks) +include(KDEClangFormat) +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) include(CheckFunctionExists) -include(ECMGeneratePriFile) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) # Do NOT add quote -set(KDEPIM_DEV_VERSION ) +set(KDEPIM_DEV_VERSION) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() -set(RELEASE_SERVICE_VERSION "21.08.3") +set(RELEASE_SERVICE_VERSION "21.12.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.18.3") -set(CALENDARSUPPORT_LIB_VERSION "5.18.3") -set(AKONADI_VERSION "5.15.91") -set(AKONADI_SEARCH_VERSION "5.18.3") +set(AKONADI_CONTACT_VERSION "5.19.0") +set(CALENDARSUPPORT_LIB_VERSION "5.19.0") +set(AKONADI_VERSION "5.19.0") +set(AKONADI_SEARCH_VERSION "5.19.0") -set(QT_REQUIRED_VERSION "5.15.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.18.3") -set(LIBKDEPIM_LIB_VERSION "5.18.3") -set(KMIME_LIB_VERSION "5.18.3") -set(GRANTLEETHEME_LIB_VERSION "5.18.3") +set(MESSAGELIB_LIB_VERSION "5.19.0") +set(LIBKDEPIM_LIB_VERSION "5.19.0") +set(KMIME_LIB_VERSION "5.19.0") # Find KF5 package @@ -81,7 +80,6 @@ find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) # Because of KPIM::KCheckComboBox -find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED) if (NOT WIN32) find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) @@ -111,8 +109,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") endif() -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/CMakePresets.json new/akonadiconsole-21.12.0/CMakePresets.json --- old/akonadiconsole-21.08.3/CMakePresets.json 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/CMakePresets.json 2021-11-30 21:55:16.000000000 +0100 @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "configurePresets": [ { "name": "dev", @@ -8,8 +8,21 @@ "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-disable-deprecated", + "displayName": "Build as without deprecated methods", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-disable-deprecated", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" + }, + "installDir": "$env{KF5}" }, { "name": "asan", @@ -19,8 +32,21 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "pch", + "displayName": "Build with PCH support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "dev-clang", @@ -34,7 +60,8 @@ "environment": { "CXX": "clang++", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" }, { "name": "unity", @@ -43,9 +70,10 @@ "binaryDir": "${sourceDir}/build-unity", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "USE_UNITY_CMAKE_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "release", @@ -54,7 +82,8 @@ "binaryDir": "${sourceDir}/build-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" - } + }, + "installDir": "$env{KF5}" }, { "name": "profile", @@ -63,8 +92,9 @@ "binaryDir": "${sourceDir}/build-profile", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "clazy", @@ -77,7 +107,8 @@ "environment": { "CXX": "clazy", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" } ], @@ -87,6 +118,14 @@ "configurePreset": "dev" }, { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "pch", + "configurePreset": "pch" + }, + { "name": "release", "configurePreset": "release" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/autotests/jobtrackermodeltest.h new/akonadiconsole-21.12.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-21.08.3/autotests/jobtrackermodeltest.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/autotests/jobtrackermodeltest.h 2021-11-30 21:55:16.000000000 +0100 @@ -15,7 +15,7 @@ Q_OBJECT public: explicit JobTrackerModelTest(QObject *parent = nullptr); - ~JobTrackerModelTest(); + ~JobTrackerModelTest() override; private Q_SLOTS: void initTestCase(); void shouldBeEmpty(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-21.12.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-21.08.3/autotests/jobtrackersearchwidgettest.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/autotests/jobtrackersearchwidgettest.h 2021-11-30 21:55:16.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit JobTrackerSearchWidgetTest(QObject *parent = nullptr); - ~JobTrackerSearchWidgetTest(); + ~JobTrackerSearchWidgetTest() override; private Q_SLOTS: void shouldHaveDefaultValue(); void shouldEmitSignal(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/autotests/jobtrackertest.h new/akonadiconsole-21.12.0/autotests/jobtrackertest.h --- old/akonadiconsole-21.08.3/autotests/jobtrackertest.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/autotests/jobtrackertest.h 2021-11-30 21:55:16.000000000 +0100 @@ -15,7 +15,7 @@ Q_OBJECT public: explicit JobTrackerTest(QObject *parent = nullptr); - ~JobTrackerTest(); + ~JobTrackerTest() override; private Q_SLOTS: void initTestCase(); void shouldBeEmpty(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/CMakeLists.txt new/akonadiconsole-21.12.0/src/CMakeLists.txt --- old/akonadiconsole-21.08.3/src/CMakeLists.txt 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/CMakeLists.txt 2021-11-30 21:55:16.000000000 +0100 @@ -2,7 +2,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(icons) -add_subdirectory(kconf_update) set(libakonadiconsole_tracker_SRCS jobtracker.cpp @@ -42,6 +41,42 @@ querydebugger.cpp tagpropertiesdialog.cpp uistatesaver.cpp + monitorsmodel.h + notificationfiltermodel.h + collectionaclpage.h + utils.h + jobtrackermodel.h + metatypes.h + jobtrackersearchwidget.h + debugwidget.h + jobtracker.h + collectioninternalspage.h + mainwindow.h + browserwidget.h + akonadibrowsermodel.h + collectionattributespage.h + notificationmonitor.h + agentconfigmodel.h + monitorswidget.h + notificationmodel.h + mainwidget.h + dbconsole.h + tagpropertiesdialog.h + querydebugger.h + logging.h + uistatesaver.h + debugfiltermodel.h + loggingfiltermodel.h + dbbrowser.h + agentconfigdialog.h + jobtrackerwidget.h + connectionpage.h + jobtrackerfilterproxymodel.h + loggingmodel.h + agentwidget.h + dbaccess.h + debugmodel.h + instanceselector.h ${libakonadiconsole_tracker_SRCS} ) @@ -49,6 +84,7 @@ set(libakonadiconsole_SRCS ${libakonadiconsole_SRCS} searchwidget.cpp + searchwidget.h ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/agentconfigdialog.h new/akonadiconsole-21.12.0/src/agentconfigdialog.h --- old/akonadiconsole-21.08.3/src/agentconfigdialog.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/agentconfigdialog.h 2021-11-30 21:55:16.000000000 +0100 @@ -7,7 +7,7 @@ #pragma once #include "ui_agentconfigdialog.h" -#include <AkonadiCore/AgentInstance> +#include <Akonadi/AgentInstance> #include <QDialog> class AgentConfigModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/agentconfigmodel.h new/akonadiconsole-21.12.0/src/agentconfigmodel.h --- old/akonadiconsole-21.08.3/src/agentconfigmodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/agentconfigmodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -6,7 +6,7 @@ #pragma once -#include <AkonadiCore/AgentInstance> +#include <Akonadi/AgentInstance> #include <QAbstractItemModel> #include <QVector> @@ -18,7 +18,7 @@ Q_OBJECT public: explicit AgentConfigModel(QObject *parent = nullptr); - ~AgentConfigModel(); + ~AgentConfigModel() override; void setAgentInstance(const Akonadi::AgentInstance &instance); int columnCount(const QModelIndex &parent = QModelIndex()) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/agentwidget.cpp new/akonadiconsole-21.12.0/src/agentwidget.cpp --- old/akonadiconsole-21.08.3/src/agentwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/agentwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -10,13 +10,13 @@ #include "agentconfigdialog.h" #include "akonadiconsole_debug.h" -#include <AkonadiCore/AgentFilterProxyModel> -#include <AkonadiCore/agentinstancecreatejob.h> -#include <AkonadiCore/agentmanager.h> -#include <AkonadiWidgets/AgentConfigurationDialog> -#include <AkonadiWidgets/agentinstancewidget.h> -#include <AkonadiWidgets/agenttypedialog.h> -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/AgentConfigurationDialog> +#include <Akonadi/AgentFilterProxyModel> +#include <Akonadi/AgentInstanceCreateJob> +#include <Akonadi/AgentInstanceWidget> +#include <Akonadi/AgentManager> +#include <Akonadi/AgentTypeDialog> +#include <Akonadi/ControlGui> #include <KLocalizedString> #include <KMessageBox> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/agentwidget.h new/akonadiconsole-21.12.0/src/agentwidget.h --- old/akonadiconsole-21.08.3/src/agentwidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/agentwidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -10,7 +10,7 @@ #include "ui_agentwidget.h" -#include <AkonadiCore/agentinstance.h> +#include <Akonadi/AgentInstance> class KJob; class QMenu; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/agentwidget.ui new/akonadiconsole-21.12.0/src/agentwidget.ui --- old/akonadiconsole-21.08.3/src/agentwidget.ui 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/agentwidget.ui 2021-11-30 21:55:16.000000000 +0100 @@ -246,6 +246,13 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>Akonadi::AgentInstanceWidget</class> + <extends>QWidget</extends> + <header location="global">Akonadi/AgentInstanceWidget</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/akonadibrowsermodel.cpp new/akonadiconsole-21.12.0/src/akonadibrowsermodel.cpp --- old/akonadiconsole-21.08.3/src/akonadibrowsermodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/akonadibrowsermodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -6,10 +6,10 @@ #include "akonadibrowsermodel.h" -#include <kmime/kmime_message.h> +#include <KMime/KMimeMessage> -#include <kcontacts/addressee.h> -#include <kcontacts/contactgroup.h> +#include <KContacts/Addressee> +#include <KContacts/ContactGroup> #include <KCalendarCore/Event> #include <KCalendarCore/Incidence> @@ -38,7 +38,7 @@ m_itemHeaders << QStringLiteral("Id") << QStringLiteral("Remote Id") << QStringLiteral("GID") << QStringLiteral("MimeType"); } - virtual ~GenericState() + ~GenericState() override { } @@ -73,7 +73,7 @@ m_itemHeaders << QStringLiteral("Subject") << QStringLiteral("Sender") << QStringLiteral("Date"); } - virtual ~MailState() + ~MailState() override { } @@ -123,7 +123,7 @@ m_itemHeaders << QStringLiteral("Given Name") << QStringLiteral("Family Name") << QStringLiteral("Email"); } - virtual ~ContactsState() + ~ContactsState() override { } @@ -172,7 +172,7 @@ << QStringLiteral("Type"); } - virtual ~CalendarState() + ~CalendarState() override { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/akonadibrowsermodel.h new/akonadiconsole-21.12.0/src/akonadibrowsermodel.h --- old/akonadiconsole-21.08.3/src/akonadibrowsermodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/akonadibrowsermodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -6,8 +6,8 @@ #pragma once -#include <AkonadiCore/changerecorder.h> -#include <AkonadiCore/entitytreemodel.h> +#include <Akonadi/ChangeRecorder> +#include <Akonadi/EntityTreeModel> #include <QSortFilterProxyModel> @@ -18,7 +18,7 @@ Q_OBJECT public: explicit AkonadiBrowserModel(ChangeRecorder *monitor, QObject *parent = nullptr); - ~AkonadiBrowserModel(); + ~AkonadiBrowserModel() override; enum ItemDisplayMode { GenericMode, MailMode, ContactsMode, CalendarMode }; @@ -52,7 +52,7 @@ Q_OBJECT public: explicit AkonadiBrowserSortModel(AkonadiBrowserModel *browserModel, QObject *parent = nullptr); - ~AkonadiBrowserSortModel(); + ~AkonadiBrowserSortModel() override; protected: bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/browserwidget.cpp new/akonadiconsole-21.12.0/src/browserwidget.cpp --- old/akonadiconsole-21.08.3/src/browserwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/browserwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -14,38 +14,38 @@ #include "dbaccess.h" #include "tagpropertiesdialog.h" -#include <AkonadiCore/TagFetchScope> -#include <AkonadiCore/attributefactory.h> -#include <AkonadiCore/changerecorder.h> -#include <AkonadiCore/collectionfilterproxymodel.h> -#include <AkonadiCore/entitymimetypefiltermodel.h> -#include <AkonadiCore/favoritecollectionsmodel.h> -#include <AkonadiCore/itemfetchjob.h> -#include <AkonadiCore/itemfetchscope.h> -#include <AkonadiCore/itemmodifyjob.h> -#include <AkonadiCore/job.h> -#include <AkonadiCore/selectionproxymodel.h> -#include <AkonadiCore/session.h> -#include <AkonadiCore/statisticsproxymodel.h> -#include <AkonadiCore/tagdeletejob.h> -#include <AkonadiCore/tagmodel.h> -#include <AkonadiWidgets/collectionpropertiesdialog.h> -#include <AkonadiWidgets/controlgui.h> -#include <AkonadiWidgets/entitylistview.h> -#include <AkonadiWidgets/entitytreeview.h> -#include <AkonadiWidgets/standardactionmanager.h> -#include <AkonadiXml/XmlWriteJob> +#include <Akonadi/AttributeFactory> +#include <Akonadi/ChangeRecorder> +#include <Akonadi/CollectionFilterProxyModel> +#include <Akonadi/CollectionPropertiesDialog> +#include <Akonadi/ControlGui> +#include <Akonadi/EntityListView> +#include <Akonadi/EntityMimeTypeFilterModel> +#include <Akonadi/EntityTreeView> +#include <Akonadi/FavoriteCollectionsModel> +#include <Akonadi/ItemFetchJob> +#include <Akonadi/ItemFetchScope> +#include <Akonadi/ItemModifyJob> +#include <Akonadi/Job> +#include <Akonadi/SelectionProxyModel> +#include <Akonadi/Session> +#include <Akonadi/StandardActionManager> +#include <Akonadi/StatisticsProxyModel> +#include <Akonadi/TagDeleteJob> +#include <Akonadi/TagFetchScope> +#include <Akonadi/TagModel> +#include <Akonadi/XmlWriteJob> #include <KViewStateMaintainer> #include <akonadi/private/compressionstream_p.h> #include <KCalendarCore/ICalFormat> #include <KCalendarCore/Incidence> -#include <kcontacts/addressee.h> -#include <kcontacts/contactgroup.h> +#include <KContacts/Addressee> +#include <KContacts/ContactGroup> #include "akonadiconsole_debug.h" -#include <AkonadiCore/tagcreatejob.h> -#include <AkonadiCore/tagmodifyjob.h> +#include <Akonadi/TagCreateJob> +#include <Akonadi/TagModifyJob> #include <KActionCollection> #include <KConfig> #include <KConfigGroup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/browserwidget.h new/akonadiconsole-21.12.0/src/browserwidget.h --- old/akonadiconsole-21.08.3/src/browserwidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/browserwidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -9,9 +9,9 @@ #include <ui_browserwidget_contentview.h> #include <ui_browserwidget_itemview.h> -#include <AkonadiCore/collection.h> -#include <AkonadiCore/item.h> -#include <AkonadiWidgets/etmviewstatesaver.h> +#include <Akonadi/Collection> +#include <Akonadi/ETMViewStateSaver> +#include <Akonadi/Item> #include <QWidget> @@ -55,7 +55,7 @@ public: explicit BrowserWidget(KXmlGuiWindow *xmlGuiWindow, QWidget *parent = nullptr); - ~BrowserWidget(); + ~BrowserWidget() override; public Q_SLOTS: void dumpToXml(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/browserwidget_itemview.ui new/akonadiconsole-21.12.0/src/browserwidget_itemview.ui --- old/akonadiconsole-21.08.3/src/browserwidget_itemview.ui 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/browserwidget_itemview.ui 2021-11-30 21:55:16.000000000 +0100 @@ -57,7 +57,7 @@ <customwidget> <class>Akonadi::EntityTreeView</class> <extends>QTreeView</extends> - <header location="global">AkonadiWidgets/entitytreeview.h</header> + <header location="global">Akonadi/EntityTreeView</header> </customwidget> <customwidget> <class>KComboBox</class> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/collectionaclpage.cpp new/akonadiconsole-21.12.0/src/collectionaclpage.cpp --- old/akonadiconsole-21.08.3/src/collectionaclpage.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/collectionaclpage.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -6,7 +6,7 @@ #include "collectionaclpage.h" -#include <AkonadiCore/collection.h> +#include <Akonadi/Collection> using namespace Akonadi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/collectionaclpage.h new/akonadiconsole-21.12.0/src/collectionaclpage.h --- old/akonadiconsole-21.08.3/src/collectionaclpage.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/collectionaclpage.h 2021-11-30 21:55:16.000000000 +0100 @@ -8,7 +8,7 @@ #include "ui_collectionaclpage.h" -#include <AkonadiWidgets/collectionpropertiespage.h> +#include <Akonadi/CollectionPropertiesPage> class CollectionAclPage : public Akonadi::CollectionPropertiesPage { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/collectionattributespage.cpp new/akonadiconsole-21.12.0/src/collectionattributespage.cpp --- old/akonadiconsole-21.08.3/src/collectionattributespage.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/collectionattributespage.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -6,8 +6,8 @@ #include "collectionattributespage.h" -#include <AkonadiCore/attributefactory.h> -#include <AkonadiCore/collection.h> +#include <Akonadi/AttributeFactory> +#include <Akonadi/Collection> #include <QStandardItemModel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/collectionattributespage.h new/akonadiconsole-21.12.0/src/collectionattributespage.h --- old/akonadiconsole-21.08.3/src/collectionattributespage.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/collectionattributespage.h 2021-11-30 21:55:16.000000000 +0100 @@ -8,7 +8,7 @@ #include "ui_collectionattributespage.h" -#include <AkonadiWidgets/collectionpropertiespage.h> +#include <Akonadi/CollectionPropertiesPage> class QStandardItem; class QStandardItemModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/collectioninternalspage.cpp new/akonadiconsole-21.12.0/src/collectioninternalspage.cpp --- old/akonadiconsole-21.08.3/src/collectioninternalspage.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/collectioninternalspage.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -6,7 +6,7 @@ #include "collectioninternalspage.h" -#include <AkonadiCore/collection.h> +#include <Akonadi/Collection> using namespace Akonadi; CollectionInternalsPage::CollectionInternalsPage(QWidget *parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/collectioninternalspage.h new/akonadiconsole-21.12.0/src/collectioninternalspage.h --- old/akonadiconsole-21.08.3/src/collectioninternalspage.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/collectioninternalspage.h 2021-11-30 21:55:16.000000000 +0100 @@ -8,7 +8,7 @@ #include "ui_collectioninternalspage.h" -#include <AkonadiWidgets/collectionpropertiespage.h> +#include <Akonadi/CollectionPropertiesPage> class CollectionInternalsPage : public Akonadi::CollectionPropertiesPage { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/dbaccess.cpp new/akonadiconsole-21.12.0/src/dbaccess.cpp --- old/akonadiconsole-21.08.3/src/dbaccess.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/dbaccess.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -6,7 +6,7 @@ #include "dbaccess.h" -#include <AkonadiCore/servermanager.h> +#include <Akonadi/ServerManager> #include <QSettings> #include <QSqlDatabase> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/debugfiltermodel.cpp new/akonadiconsole-21.12.0/src/debugfiltermodel.cpp --- old/akonadiconsole-21.08.3/src/debugfiltermodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/debugfiltermodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -9,6 +9,9 @@ #include "debugmodel.h" #include <KCheckComboBox> +#include <chrono> + +using namespace std::chrono_literals; #ifndef COMPILE_WITH_UNITY_CMAKE_SUPPORT Q_DECLARE_METATYPE(DebugModel::Message) @@ -19,7 +22,7 @@ DebugFilterModel::DebugFilterModel(QObject *parent) : QSortFilterProxyModel(parent) { - mInvalidateTimer.setInterval(50); + mInvalidateTimer.setInterval(50ms); mInvalidateTimer.setSingleShot(true); connect(&mInvalidateTimer, &QTimer::timeout, this, &DebugFilterModel::invalidate); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/debugfiltermodel.h new/akonadiconsole-21.12.0/src/debugfiltermodel.h --- old/akonadiconsole-21.08.3/src/debugfiltermodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/debugfiltermodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -20,7 +20,7 @@ Q_OBJECT public: explicit DebugFilterModel(QObject *parent = nullptr); - ~DebugFilterModel(); + ~DebugFilterModel() override; void setSenderFilter(KPIM::KCheckComboBox *appFilter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/debugmodel.cpp new/akonadiconsole-21.12.0/src/debugmodel.cpp --- old/akonadiconsole-21.08.3/src/debugmodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/debugmodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -7,9 +7,6 @@ #include "debugmodel.h" #include <QColor> -#include <QDateTime> -#include <QDebug> -#include <QDir> #include <QStandardItemModel> #ifndef COMPILE_WITH_UNITY_CMAKE_SUPPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/debugwidget.cpp new/akonadiconsole-21.12.0/src/debugwidget.cpp --- old/akonadiconsole-21.08.3/src/debugwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/debugwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -11,11 +11,10 @@ #include "connectionpage.h" #include "tracernotificationinterface.h" -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/ControlGui> -#include <AkonadiCore/ServerManager> +#include <Akonadi/ServerManager> #include <KTextEdit> -#include <QTabWidget> #include <QCheckBox> #include <QFileDialog> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/instanceselector.cpp new/akonadiconsole-21.12.0/src/instanceselector.cpp --- old/akonadiconsole-21.08.3/src/instanceselector.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/instanceselector.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -17,7 +17,6 @@ #include <QApplication> #include <QDBusConnection> #include <QDBusConnectionInterface> -#include <QDBusInterface> #include <QDialogButtonBox> #include <QPushButton> #include <QStandardItemModel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/instanceselector.h new/akonadiconsole-21.12.0/src/instanceselector.h --- old/akonadiconsole-21.08.3/src/instanceselector.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/instanceselector.h 2021-11-30 21:55:16.000000000 +0100 @@ -26,7 +26,7 @@ Q_OBJECT public: explicit InstanceSelector(const QString &remoteHost, QWidget *parent = nullptr, Qt::WindowFlags flags = {}); - virtual ~InstanceSelector(); + ~InstanceSelector() override; private Q_SLOTS: void slotAccept(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtracker.cpp new/akonadiconsole-21.12.0/src/jobtracker.cpp --- old/akonadiconsole-21.08.3/src/jobtracker.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtracker.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -15,7 +15,9 @@ #include <akonadi/private/instance_p.h> #include <cassert> +#include <chrono> +using namespace std::chrono_literals; QString JobInfo::stateAsString() const { switch (state) { @@ -32,18 +34,18 @@ } } -class JobTracker::Private +class JobTrackerPrivate { public: - Private(JobTracker *_q) + explicit JobTrackerPrivate(JobTracker *_q) : lastId(42) , timer(_q) , disabled(false) , q(_q) { timer.setSingleShot(true); - timer.setInterval(200); - connect(&timer, &QTimer::timeout, q, &JobTracker::signalUpdates); + timer.setInterval(200ms); + QObject::connect(&timer, &QTimer::timeout, q, &JobTracker::signalUpdates); } bool isSession(int id) const @@ -73,7 +75,7 @@ JobTracker::JobTracker(const char *name, QObject *parent) : QObject(parent) - , d(new Private(this)) + , d(new JobTrackerPrivate(this)) { new JobTrackerAdaptor(this); const QString suffix = Akonadi::Instance::identifier().isEmpty() ? QString() : QLatin1Char('-') + Akonadi::Instance::identifier(); @@ -81,10 +83,7 @@ QDBusConnection::sessionBus().registerObject(QLatin1Char('/') + QLatin1String(name), this, QDBusConnection::ExportAdaptors); } -JobTracker::~JobTracker() -{ - delete d; -} +JobTracker::~JobTracker() = default; void JobTracker::jobCreated(const QString &session, const QString &jobName, const QString &parent, const QString &jobType, const QString &debugString) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtracker.h new/akonadiconsole-21.12.0/src/jobtracker.h --- old/akonadiconsole-21.08.3/src/jobtracker.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtracker.h 2021-11-30 21:55:16.000000000 +0100 @@ -14,6 +14,9 @@ #include <QList> #include <QObject> #include <QPair> + +#include <memory> + class JobInfo { public: @@ -41,6 +44,8 @@ QString stateAsString() const; }; +class JobTrackerPrivate; + class LIBAKONADICONSOLE_EXPORT JobTracker : public QObject { Q_OBJECT @@ -48,7 +53,7 @@ public: explicit JobTracker(const char *name, QObject *parent = nullptr); - ~JobTracker(); + ~JobTracker() override; QStringList sessions() const; @@ -106,7 +111,7 @@ QVector<int> childJobs(int parentId) const; int idForJob(const QString &job) const; - class Private; - Private *const d; +private: + std::unique_ptr<JobTrackerPrivate> const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-21.12.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-21.08.3/src/jobtrackerfilterproxymodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackerfilterproxymodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit JobTrackerFilterProxyModel(QObject *parent = nullptr); - ~JobTrackerFilterProxyModel(); + ~JobTrackerFilterProxyModel() override; void setSearchColumn(int column); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackermodel.cpp new/akonadiconsole-21.12.0/src/jobtrackermodel.cpp --- old/akonadiconsole-21.08.3/src/jobtrackermodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackermodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -12,17 +12,16 @@ #include <QColor> #include <QFont> -#include <QLocale> #include <QModelIndex> #include <QPair> #include <QStringList> #include <cassert> -class JobTrackerModel::Private +class JobTrackerModelPrivate { public: - Private(const char *name, JobTrackerModel *_q) + JobTrackerModelPrivate(const char *name, JobTrackerModel *_q) : q(_q) , tracker(name) { @@ -53,17 +52,14 @@ JobTrackerModel::JobTrackerModel(const char *name, QObject *parent) : QAbstractItemModel(parent) - , d(new Private(name, this)) + , d(new JobTrackerModelPrivate(name, this)) { connect(&d->tracker, &JobTracker::aboutToAdd, this, &JobTrackerModel::jobAboutToBeAdded); connect(&d->tracker, &JobTracker::added, this, &JobTrackerModel::jobAdded); connect(&d->tracker, &JobTracker::updated, this, &JobTrackerModel::jobsUpdated); } -JobTrackerModel::~JobTrackerModel() -{ - delete d; -} +JobTrackerModel::~JobTrackerModel() = default; JobTracker &JobTrackerModel::jobTracker() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackermodel.h new/akonadiconsole-21.12.0/src/jobtrackermodel.h --- old/akonadiconsole-21.08.3/src/jobtrackermodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackermodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -11,14 +11,17 @@ #include "libakonadiconsole_export.h" #include <QAbstractItemModel> +#include <memory> + class JobTracker; +class JobTrackerModelPrivate; class LIBAKONADICONSOLE_EXPORT JobTrackerModel : public QAbstractItemModel { Q_OBJECT public: explicit JobTrackerModel(const char *name, QObject *parent = nullptr); - virtual ~JobTrackerModel(); + ~JobTrackerModel() override; JobTracker &jobTracker(); // for the unittest @@ -55,7 +58,6 @@ void jobsUpdated(const QList<QPair<int, int>> &); private: - class Private; - Private *const d; + std::unique_ptr<JobTrackerModelPrivate> const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackersearchwidget.cpp new/akonadiconsole-21.12.0/src/jobtrackersearchwidget.cpp --- old/akonadiconsole-21.08.3/src/jobtrackersearchwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackersearchwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -41,7 +41,7 @@ mSelectColumn->addItem(QStringLiteral("Job Type"), 4); mSelectColumn->addItem(QStringLiteral("State"), 5); mSelectColumn->addItem(QStringLiteral("Info"), 6); - connect(mSelectColumn, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &JobTrackerSearchWidget::slotColumnChanged); + connect(mSelectColumn, &QComboBox::currentIndexChanged, this, &JobTrackerSearchWidget::slotColumnChanged); } JobTrackerSearchWidget::~JobTrackerSearchWidget() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackersearchwidget.h new/akonadiconsole-21.12.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-21.08.3/src/jobtrackersearchwidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackersearchwidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -18,7 +18,7 @@ Q_OBJECT public: explicit JobTrackerSearchWidget(QWidget *parent = nullptr); - ~JobTrackerSearchWidget(); + ~JobTrackerSearchWidget() override; Q_SIGNALS: void searchTextChanged(const QString &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackerwidget.cpp new/akonadiconsole-21.12.0/src/jobtrackerwidget.cpp --- old/akonadiconsole-21.08.3/src/jobtrackerwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackerwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -13,7 +13,7 @@ #include "jobtrackermodel.h" #include "jobtrackersearchwidget.h" -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/ControlGui> #include <QApplication> #include <QClipboard> @@ -25,7 +25,7 @@ #include <QTreeView> #include <QVBoxLayout> -class JobTrackerWidget::Private +class JobTrackerWidgetPrivate { public: JobTrackerModel *model = nullptr; @@ -36,7 +36,7 @@ JobTrackerWidget::JobTrackerWidget(const char *name, QWidget *parent, const QString &checkboxText) : QWidget(parent) - , d(new Private) + , d(new JobTrackerWidgetPrivate) { d->model = new JobTrackerModel(name, this); @@ -77,10 +77,7 @@ Akonadi::ControlGui::widgetNeedsAkonadi(this); } -JobTrackerWidget::~JobTrackerWidget() -{ - delete d; -} +JobTrackerWidget::~JobTrackerWidget() = default; void JobTrackerWidget::selectOnlyErrorChanged(bool state) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/jobtrackerwidget.h new/akonadiconsole-21.12.0/src/jobtrackerwidget.h --- old/akonadiconsole-21.08.3/src/jobtrackerwidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/jobtrackerwidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -10,15 +10,19 @@ #include <QWidget> +#include <memory> + class QModelIndex; class QFile; +class JobTrackerWidgetPrivate; + class JobTrackerWidget : public QWidget { Q_OBJECT public: explicit JobTrackerWidget(const char *name, QWidget *parent, const QString &checkboxText); - ~JobTrackerWidget(); + ~JobTrackerWidget() override; private Q_SLOTS: void contextMenu(const QPoint &pos); void slotSaveToFile(); @@ -32,7 +36,7 @@ void textFilterChanged(const QString &str); void writeRows(const QModelIndex &parent, QFile &file, int indentLevel); - class Private; - Private *const d; +private: + std::unique_ptr<JobTrackerWidgetPrivate> const d; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/kconf_update/CMakeLists.txt new/akonadiconsole-21.12.0/src/kconf_update/CMakeLists.txt --- old/akonadiconsole-21.08.3/src/kconf_update/CMakeLists.txt 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/kconf_update/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -install(FILES akonadiconsole.upd - DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} -) -install(PROGRAMS akonadiconsole-15.08-kickoff.sh - DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/kconf_update/akonadiconsole-15.08-kickoff.sh new/akonadiconsole-21.12.0/src/kconf_update/akonadiconsole-15.08-kickoff.sh --- old/akonadiconsole-21.08.3/src/kconf_update/akonadiconsole-15.08-kickoff.sh 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/kconf_update/akonadiconsole-15.08-kickoff.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#!/bin/sh - -kickoffrcname=`qtpaths --locate-file GenericConfigLocation kickoffrc` -if [ -f "$kickoffrcname" ]; then - sed -i "s/\/akonadiconsole.desktop/\/org.kde.akonadiconsole.desktop/" $kickoffrcname -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/kconf_update/akonadiconsole.upd new/akonadiconsole-21.12.0/src/kconf_update/akonadiconsole.upd --- old/akonadiconsole-21.08.3/src/kconf_update/akonadiconsole.upd 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/kconf_update/akonadiconsole.upd 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -Version=5 - -# Update entry in kickoffrc after the .desktop file has been renamed in 15.08 -Id=akonadiconsole-15.08-kickoff -Script=akonadiconsole-15.08-kickoff.sh,sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/logging.h new/akonadiconsole-21.12.0/src/logging.h --- old/akonadiconsole-21.08.3/src/logging.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/logging.h 2021-11-30 21:55:16.000000000 +0100 @@ -24,7 +24,7 @@ public: explicit Logging(QWidget *parent = nullptr); - ~Logging(); + ~Logging() override; bool enabled() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/loggingfiltermodel.cpp new/akonadiconsole-21.12.0/src/loggingfiltermodel.cpp --- old/akonadiconsole-21.08.3/src/loggingfiltermodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/loggingfiltermodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -12,13 +12,15 @@ #ifndef COMPILE_WITH_UNITY_CMAKE_SUPPORT Q_DECLARE_METATYPE(LoggingModel::Message) #endif +#include <chrono> +using namespace std::chrono_literals; using namespace KPIM; LoggingFilterModel::LoggingFilterModel(QObject *parent) : QSortFilterProxyModel(parent) { - mInvalidateTimer.setInterval(50); + mInvalidateTimer.setInterval(50ms); mInvalidateTimer.setSingleShot(true); connect(&mInvalidateTimer, &QTimer::timeout, this, &LoggingFilterModel::invalidate); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/loggingfiltermodel.h new/akonadiconsole-21.12.0/src/loggingfiltermodel.h --- old/akonadiconsole-21.08.3/src/loggingfiltermodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/loggingfiltermodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -20,7 +20,7 @@ Q_OBJECT public: explicit LoggingFilterModel(QObject *parent = nullptr); - ~LoggingFilterModel(); + ~LoggingFilterModel() override; void setAppFilter(KPIM::KCheckComboBox *appFilter); void setCategoryFilter(KPIM::KCheckComboBox *categoryFilter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/mainwidget.cpp new/akonadiconsole-21.12.0/src/mainwidget.cpp --- old/akonadiconsole-21.08.3/src/mainwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/mainwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -22,11 +22,11 @@ #include "notificationmonitor.h" #include "querydebugger.h" -#include <AkonadiCore/agentfilterproxymodel.h> -#include <AkonadiCore/searchcreatejob.h> -#include <AkonadiCore/servermanager.h> -#include <AkonadiWidgets/agentinstancewidget.h> -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/AgentFilterProxyModel> +#include <Akonadi/AgentInstanceWidget> +#include <Akonadi/ControlGui> +#include <Akonadi/SearchCreateJob> +#include <Akonadi/ServerManager> #include <KActionCollection> #include <KXmlGuiWindow> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/mainwidget.h new/akonadiconsole-21.12.0/src/mainwidget.h --- old/akonadiconsole-21.08.3/src/mainwidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/mainwidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -20,7 +20,7 @@ public: explicit MainWidget(KXmlGuiWindow *parent = nullptr); - ~MainWidget(); + ~MainWidget() override; private Q_SLOTS: void startServer(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/mainwindow.h new/akonadiconsole-21.12.0/src/mainwindow.h --- old/akonadiconsole-21.08.3/src/mainwindow.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/mainwindow.h 2021-11-30 21:55:16.000000000 +0100 @@ -18,7 +18,7 @@ public: explicit MainWindow(QWidget *parent = nullptr); - ~MainWindow(); + ~MainWindow() override; protected: void closeEvent(QCloseEvent *event) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/monitorsmodel.cpp new/akonadiconsole-21.12.0/src/monitorsmodel.cpp --- old/akonadiconsole-21.08.3/src/monitorsmodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/monitorsmodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -7,8 +7,8 @@ #include "monitorsmodel.h" #include "akonadiconsole_debug.h" -#include <AkonadiCore/Monitor> -#include <AkonadiCore/Session> +#include <Akonadi/Monitor> +#include <Akonadi/Session> #include <QTimer> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/monitorsmodel.h new/akonadiconsole-21.12.0/src/monitorsmodel.h --- old/akonadiconsole-21.08.3/src/monitorsmodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/monitorsmodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -8,7 +8,7 @@ #pragma once #include "libakonadiconsole_export.h" -#include <AkonadiCore/NotificationSubscriber> +#include <Akonadi/NotificationSubscriber> #include <QAbstractItemModel> namespace Akonadi @@ -24,7 +24,7 @@ enum Roles { SubscriberRole = Qt::UserRole }; explicit MonitorsModel(QObject *parent = nullptr); - virtual ~MonitorsModel(); + ~MonitorsModel() override; void setEnabled(bool enabled); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/monitorswidget.cpp new/akonadiconsole-21.12.0/src/monitorswidget.cpp --- old/akonadiconsole-21.08.3/src/monitorswidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/monitorswidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -9,16 +9,16 @@ #include "monitorsmodel.h" #include "utils.h" +#include <QHBoxLayout> #include <QSortFilterProxyModel> #include <QStandardItemModel> -#include <QVBoxLayout> #include <qheaderview.h> -#include <AkonadiCore/CollectionFetchScope> -#include <AkonadiCore/ItemFetchScope> -#include <AkonadiCore/NotificationSubscriber> -#include <AkonadiCore/TagFetchScope> -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/CollectionFetchScope> +#include <Akonadi/ControlGui> +#include <Akonadi/ItemFetchScope> +#include <Akonadi/NotificationSubscriber> +#include <Akonadi/TagFetchScope> #include <KConfigGroup> #include <KSharedConfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/monitorswidget.h new/akonadiconsole-21.12.0/src/monitorswidget.h --- old/akonadiconsole-21.08.3/src/monitorswidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/monitorswidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -25,7 +25,7 @@ public: explicit MonitorsWidget(QWidget *parent = nullptr); - virtual ~MonitorsWidget(); + ~MonitorsWidget() override; private Q_SLOTS: void onSubscriberSelected(const QModelIndex &index); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/notificationfiltermodel.cpp new/akonadiconsole-21.12.0/src/notificationfiltermodel.cpp --- old/akonadiconsole-21.08.3/src/notificationfiltermodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/notificationfiltermodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -10,6 +10,9 @@ #include <KCheckComboBox> #include <QStandardItemModel> +#include <chrono> + +using namespace std::chrono_literals; using KPIM::KCheckComboBox; @@ -18,7 +21,7 @@ NotificationFilterModel::NotificationFilterModel(QObject *parent) : QSortFilterProxyModel(parent) { - mInvalidateTimer.setInterval(50); + mInvalidateTimer.setInterval(50ms); mInvalidateTimer.setSingleShot(true); connect(&mInvalidateTimer, &QTimer::timeout, this, &NotificationFilterModel::invalidateFilter); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/notificationfiltermodel.h new/akonadiconsole-21.12.0/src/notificationfiltermodel.h --- old/akonadiconsole-21.08.3/src/notificationfiltermodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/notificationfiltermodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -8,7 +8,7 @@ #include <QSortFilterProxyModel> -#include <AkonadiCore/ChangeNotification> +#include <Akonadi/ChangeNotification> #include <QSet> #include <QTimer> @@ -27,7 +27,7 @@ public: explicit NotificationFilterModel(QObject *parent = nullptr); - ~NotificationFilterModel(); + ~NotificationFilterModel() override; void setTypeFilter(KPIM::KCheckComboBox *typeFilter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/notificationmodel.cpp new/akonadiconsole-21.12.0/src/notificationmodel.cpp --- old/akonadiconsole-21.08.3/src/notificationmodel.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/notificationmodel.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -6,10 +6,9 @@ #include "notificationmodel.h" -#include <QLocale> #include "akonadiconsole_debug.h" -#include <AkonadiCore/ServerManager> +#include <Akonadi/ServerManager> #include <QMetaMethod> #include <akonadi/private/imapparser_p.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/notificationmodel.h new/akonadiconsole-21.12.0/src/notificationmodel.h --- old/akonadiconsole-21.08.3/src/notificationmodel.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/notificationmodel.h 2021-11-30 21:55:16.000000000 +0100 @@ -8,8 +8,8 @@ #include <QAbstractItemModel> -#include <AkonadiCore/ChangeNotification> -#include <AkonadiCore/Monitor> +#include <Akonadi/ChangeNotification> +#include <Akonadi/Monitor> namespace Akonadi { @@ -36,7 +36,7 @@ }; explicit NotificationModel(QObject *parent); - ~NotificationModel(); + ~NotificationModel() override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/notificationmonitor.cpp new/akonadiconsole-21.12.0/src/notificationmonitor.cpp --- old/akonadiconsole-21.08.3/src/notificationmonitor.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/notificationmonitor.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -9,7 +9,7 @@ #include "notificationmodel.h" #include "utils.h" -#include <AkonadiWidgets/ControlGui> +#include <Akonadi/ControlGui> #include <QCheckBox> #include <QFile> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/querydebugger.cpp new/akonadiconsole-21.12.0/src/querydebugger.cpp --- old/akonadiconsole-21.08.3/src/querydebugger.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/querydebugger.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -23,8 +23,8 @@ #include <QDBusArgument> #include <QDBusConnection> -#include <AkonadiCore/servermanager.h> -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/ControlGui> +#include <Akonadi/ServerManager> #include <KColorScheme> @@ -95,7 +95,7 @@ class TransactionNode : public QueryNode { public: - ~TransactionNode() + ~TransactionNode() override { qDeleteAll(queries); } @@ -108,7 +108,7 @@ class ConnectionNode : public Node { public: - ~ConnectionNode() + ~ConnectionNode() override { qDeleteAll(queries); } @@ -125,7 +125,7 @@ { } - ~QueryTreeModel() + ~QueryTreeModel() override { qDeleteAll(mConnections); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/querydebugger.h new/akonadiconsole-21.12.0/src/querydebugger.h --- old/akonadiconsole-21.08.3/src/querydebugger.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/querydebugger.h 2021-11-30 21:55:16.000000000 +0100 @@ -43,7 +43,7 @@ public: explicit QueryDebugger(QWidget *parent = nullptr); - virtual ~QueryDebugger(); + ~QueryDebugger() override; private Q_SLOTS: void debuggerToggled(bool on); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/searchwidget.cpp new/akonadiconsole-21.12.0/src/searchwidget.cpp --- old/akonadiconsole-21.08.3/src/searchwidget.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/searchwidget.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -11,11 +11,11 @@ #include "akonadiconsole_debug.h" #include "searchwidget.h" -#include <AkonadiCore/SearchQuery> -#include <AkonadiCore/itemfetchjob.h> -#include <AkonadiCore/itemfetchscope.h> -#include <AkonadiCore/itemsearchjob.h> -#include <AkonadiWidgets/controlgui.h> +#include <Akonadi/ControlGui> +#include <Akonadi/ItemFetchJob> +#include <Akonadi/ItemFetchScope> +#include <Akonadi/ItemSearchJob> +#include <Akonadi/SearchQuery> #include <AkonadiSearch/Core/searchstore.h> #include <AkonadiSearch/Xapian/xapiansearchstore.h> @@ -101,7 +101,7 @@ connect(button, &QPushButton::clicked, this, &SearchWidget::search); connect(mDatabaseView, &QListView::activated, this, &SearchWidget::fetchItem); - connect(mStoreCombo, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &SearchWidget::openStore); + connect(mStoreCombo, &KComboBox::currentIndexChanged, this, &SearchWidget::openStore); openStore(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/searchwidget.h new/akonadiconsole-21.12.0/src/searchwidget.h --- old/akonadiconsole-21.08.3/src/searchwidget.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/searchwidget.h 2021-11-30 21:55:16.000000000 +0100 @@ -33,7 +33,7 @@ public: explicit SearchWidget(QWidget *parent = nullptr); - ~SearchWidget(); + ~SearchWidget() override; private Q_SLOTS: void search(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/tagpropertiesdialog.cpp new/akonadiconsole-21.12.0/src/tagpropertiesdialog.cpp --- old/akonadiconsole-21.08.3/src/tagpropertiesdialog.cpp 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/tagpropertiesdialog.cpp 2021-11-30 21:55:16.000000000 +0100 @@ -8,7 +8,7 @@ #include "tagpropertiesdialog.h" #include "dbaccess.h" -#include <AkonadiCore/AttributeFactory> +#include <Akonadi/AttributeFactory> #include <QDialogButtonBox> #include <QSqlError> #include <QSqlQuery> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.08.3/src/tagpropertiesdialog.h new/akonadiconsole-21.12.0/src/tagpropertiesdialog.h --- old/akonadiconsole-21.08.3/src/tagpropertiesdialog.h 2021-10-09 09:22:44.000000000 +0200 +++ new/akonadiconsole-21.12.0/src/tagpropertiesdialog.h 2021-11-30 21:55:16.000000000 +0100 @@ -7,7 +7,7 @@ #pragma once -#include <AkonadiCore/tag.h> +#include <Akonadi/Tag> #include <QDialog> #include <QStandardItemModel> @@ -21,7 +21,7 @@ public: explicit TagPropertiesDialog(QWidget *parent = nullptr); explicit TagPropertiesDialog(const Akonadi::Tag &tag, QWidget *parent = nullptr); - virtual ~TagPropertiesDialog(); + ~TagPropertiesDialog() override; Akonadi::Tag tag() const; bool changed() const;
