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-08-16 10:09:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Mon Aug 16 10:09:23 2021 rev:60 rq:911585 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2021-07-10 00:00:08.872147253 +0200 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.1899/akonadiconsole.changes 2021-08-16 10:14:27.374889645 +0200 @@ -1,0 +2,27 @@ +Fri Aug 6 09:33:29 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:04:15 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:04:43 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Reactivate it it seems that it builds without problem + * We don't use additional source + * Modernize code + * In kf6 kde4 migration code will be removed + +------------------------------------------------------------------- Old: ---- akonadiconsole-21.04.3.tar.xz akonadiconsole-21.04.3.tar.xz.sig New: ---- akonadiconsole-21.08.0.tar.xz akonadiconsole-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.4GIu1j/_old 2021-08-16 10:14:27.790889114 +0200 +++ /var/tmp/diff_new_pack.4GIu1j/_new 2021-08-16 10:14:27.794889109 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadiconsole -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -57,10 +57,10 @@ BuildRequires: cmake(KF5TextWidgets) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5DBus) >= 5.14.0 -BuildRequires: cmake(Qt5Sql) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 -BuildRequires: cmake(Qt5Widgets) >= 5.14.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Sql) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 +BuildRequires: cmake(Qt5Widgets) >= 5.15.0 Obsoletes: akonadi_resources < %{version} # It can only build on the same platforms as Qt Webengine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 ++++++ akonadiconsole-21.04.3.tar.xz -> akonadiconsole-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/.clang-format new/akonadiconsole-21.08.0/.clang-format --- old/akonadiconsole-21.04.3/.clang-format 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/.clang-format 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ ---- -# SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullm...@kde.org> -# SPDX-FileCopyrightText: 2019 Gernot Gebhard <gebh...@absint.com> -# -# SPDX-License-Identifier: MIT - -# Style for C++ -Language: Cpp - -# base is WebKit coding style: https://webkit.org/code-style-guidelines/ -# below are only things set that diverge from this style! -BasedOnStyle: WebKit - -# enforce C++11 (e.g. for std::vector<std::vector<lala>> -Standard: Cpp11 - -# 4 spaces indent -TabWidth: 4 - -# 2 * 80 wide lines -ColumnLimit: 160 - -# sort includes inside line separated groups -SortIncludes: true - -# break before braces on function, namespace and class definitions. -BreakBeforeBraces: Linux - -# CrlInstruction *a; -PointerAlignment: Right - -# horizontally aligns arguments after an open bracket. -AlignAfterOpenBracket: Align - -# don't move all parameters to new line -AllowAllParametersOfDeclarationOnNextLine: false - -# no single line functions -AllowShortFunctionsOnASingleLine: None - -# always break before you encounter multi line strings -AlwaysBreakBeforeMultilineStrings: true - -# don't move arguments to own lines if they are not all on the same -BinPackArguments: false - -# don't move parameters to own lines if they are not all on the same -BinPackParameters: false - -# In case we have an if statement whith multiple lines the operator should be at the beginning of the line -# but we do not want to break assignments -BreakBeforeBinaryOperators: NonAssignment - -# format C++11 braced lists like function calls -Cpp11BracedListStyle: true - -# do not put a space before C++11 braced lists -SpaceBeforeCpp11BracedList: false - -# remove empty lines -KeepEmptyLinesAtTheStartOfBlocks: false - -# no namespace indentation to keep indent level low -NamespaceIndentation: None - -# we use template< without space. -SpaceAfterTemplateKeyword: false - -# macros for which the opening brace stays attached. -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] - -# keep lambda formatting multi-line if not empty -AllowShortLambdasOnASingleLine: Empty - -# We do not want clang-format to put all arguments on a new line -AllowAllArgumentsOnNextLine: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/.gitignore new/akonadiconsole-21.08.0/.gitignore --- old/akonadiconsole-21.04.3/.gitignore 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/.gitignore 2021-07-31 12:07:20.000000000 +0200 @@ -19,3 +19,8 @@ CMakeLists.txt.user* *.unc-backup* compile_commands.json +.clang-format +.clangd +.idea +/cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/CMakeLists.txt new/akonadiconsole-21.08.0/CMakeLists.txt --- old/akonadiconsole-21.04.3/CMakeLists.txt 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/CMakeLists.txt 2021-07-31 12:07:20.000000000 +0200 @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -set(PIM_VERSION "5.17.3") +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +set(PIM_VERSION "5.18.0") project(akonadiconsole VERSION ${PIM_VERSION}) # Needs C++17 because Akonadi uses it and we link @@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(KF5_MIN_VERSION "5.79.0") +set(KF5_MIN_VERSION "5.83.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -39,24 +39,24 @@ if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() -set(RELEASE_SERVICE_VERSION "21.04.3") +set(RELEASE_SERVICE_VERSION "21.08.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.17.3") -set(CALENDARSUPPORT_LIB_VERSION "5.17.3") +set(AKONADI_CONTACT_VERSION "5.18.0") +set(CALENDARSUPPORT_LIB_VERSION "5.18.0") set(AKONADI_VERSION "5.15.91") -set(AKONADI_SEARCH_VERSION "5.17.3") +set(AKONADI_SEARCH_VERSION "5.18.0") -set(QT_REQUIRED_VERSION "5.14.0") +set(QT_REQUIRED_VERSION "5.15.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION "5.17.3") -set(LIBKDEPIM_LIB_VERSION "5.17.3") -set(KMIME_LIB_VERSION "5.17.3") -set(GRANTLEETHEME_LIB_VERSION "5.17.3") +set(MESSAGELIB_LIB_VERSION "5.18.0") +set(LIBKDEPIM_LIB_VERSION "5.18.0") +set(KMIME_LIB_VERSION "5.18.0") +set(GRANTLEETHEME_LIB_VERSION "5.18.0") # Find KF5 package @@ -88,7 +88,7 @@ find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) - + set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://invent.kde.org/pim/akonadi-search"; TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") find_package(Xapian CONFIG) set_package_properties(Xapian PROPERTIES DESCRIPTION "The Xapian search engine library" @@ -112,22 +112,17 @@ endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) 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) configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) -#Laurent disable for the moment -#option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE) +option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) -set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false) +set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) - if(${CMAKE_VERSION} VERSION_LESS "3.16.0") - message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support") - else() - set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true) - add_definitions(-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT) - endif() + set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) + add_definitions(-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT) endif() add_subdirectory(src) if(BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/CMakePresets.json new/akonadiconsole-21.08.0/CMakePresets.json --- old/akonadiconsole-21.04.3/CMakePresets.json 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/CMakePresets.json 2021-07-31 12:07:20.000000000 +0200 @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "configurePresets": [ { "name": "dev", @@ -23,6 +23,20 @@ } }, { + "name": "dev-clang", + "displayName": "dev-clang", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clang", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "environment": { + "CXX": "clang++", + "CCACHE_DISABLE": "ON" + } + }, + { "name": "unity", "displayName": "Build with CMake unity support.", "generator": "Ninja", @@ -51,6 +65,64 @@ "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" } + }, + { + "name": "clazy", + "displayName": "clazy", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + } + } + + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "release", + "configurePreset": "release" + }, + { + "name": "dev-clang", + "configurePreset": "dev-clang" + }, + { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "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,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } } + ], + "testPresets": [ + { + "name": "dev", + "configurePreset": "dev", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": false} + }, + { + "name": "asan", + "configurePreset": "asan", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/autotests/CMakeLists.txt new/akonadiconsole-21.08.0/autotests/CMakeLists.txt --- old/akonadiconsole-21.04.3/autotests/CMakeLists.txt 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/autotests/CMakeLists.txt 2021-07-31 12:07:20.000000000 +0200 @@ -1,15 +1,15 @@ # convenience macro to add qtest unit tests -macro(add_unittest _source _additionalsource) - set(_test ${_source} ${_additionalsource}) +macro(add_unittest _source) + set(_test ${_source}) get_filename_component(_name ${_source} NAME_WE) add_executable( ${_name} ${_test} ) add_test(NAME ${_name} COMMAND ${_name} ) ecm_mark_as_test(akonadiconsole-${_name}) set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1") target_link_libraries( ${_name} - Qt5::Test + Qt::Test KF5::I18n - Qt5::Widgets + Qt::Widgets KF5::ConfigCore KF5::WidgetsAddons KF5::ItemViews @@ -18,6 +18,6 @@ ) endmacro () -add_unittest(jobtrackertest.cpp "") -add_unittest(jobtrackermodeltest.cpp "") -add_unittest(jobtrackersearchwidgettest.cpp "") +add_unittest(jobtrackertest.cpp) +add_unittest(jobtrackermodeltest.cpp ) +add_unittest(jobtrackersearchwidgettest.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/autotests/jobtrackermodeltest.h new/akonadiconsole-21.08.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-21.04.3/autotests/jobtrackermodeltest.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/autotests/jobtrackermodeltest.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef JOBTRACKERMODELTEST_H -#define JOBTRACKERMODELTEST_H +#pragma once #include <QObject> @@ -26,4 +25,3 @@ void shouldHandleDuplicateJob(); }; -#endif // JOBTRACKERTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/autotests/jobtrackersearchwidgettest.cpp new/akonadiconsole-21.08.0/autotests/jobtrackersearchwidgettest.cpp --- old/akonadiconsole-21.04.3/autotests/jobtrackersearchwidgettest.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/autotests/jobtrackersearchwidgettest.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -25,7 +25,7 @@ void JobTrackerSearchWidgetTest::shouldHaveDefaultValue() { JobTrackerSearchWidget w; - auto *mainLayout = w.findChild<QHBoxLayout *>(QStringLiteral("mainlayout")); + auto mainLayout = w.findChild<QHBoxLayout *>(QStringLiteral("mainlayout")); QVERIFY(mainLayout); int top = -1; int bottom = -1; @@ -37,17 +37,17 @@ QCOMPARE(left, 0); QCOMPARE(right, 0); - auto *mSearchLineEdit = w.findChild<QLineEdit *>(QStringLiteral("searchline")); + auto mSearchLineEdit = w.findChild<QLineEdit *>(QStringLiteral("searchline")); QVERIFY(mSearchLineEdit); QVERIFY(mSearchLineEdit->isClearButtonEnabled()); QVERIFY(mSearchLineEdit->text().isEmpty()); - auto *mSelectColumn = w.findChild<QComboBox *>(QStringLiteral("selectcolumn")); + auto mSelectColumn = w.findChild<QComboBox *>(QStringLiteral("selectcolumn")); QVERIFY(mSelectColumn); QCOMPARE(mSelectColumn->count(), 8); QCOMPARE(mSelectColumn->currentIndex(), 0); - auto *mSelectOnlyError = w.findChild<QCheckBox *>(QStringLiteral("selectonlyerror")); + auto mSelectOnlyError = w.findChild<QCheckBox *>(QStringLiteral("selectonlyerror")); QVERIFY(mSelectOnlyError); QVERIFY(!mSelectOnlyError->text().isEmpty()); QCOMPARE(mSelectOnlyError->checkState(), Qt::Unchecked); @@ -57,7 +57,7 @@ { JobTrackerSearchWidget w; QSignalSpy searchWidgetSignal(&w, &JobTrackerSearchWidget::searchTextChanged); - auto *mSearchLineEdit = w.findChild<QLineEdit *>(QStringLiteral("searchline")); + auto mSearchLineEdit = w.findChild<QLineEdit *>(QStringLiteral("searchline")); const QString foo = QStringLiteral("foo"); mSearchLineEdit->setText(foo); QCOMPARE(searchWidgetSignal.count(), 1); @@ -71,7 +71,7 @@ { JobTrackerSearchWidget w; QSignalSpy columnChangedSignal(&w, &JobTrackerSearchWidget::columnChanged); - auto *mSelectColumn = w.findChild<QComboBox *>(QStringLiteral("selectcolumn")); + auto mSelectColumn = w.findChild<QComboBox *>(QStringLiteral("selectcolumn")); mSelectColumn->setCurrentIndex(2); QCOMPARE(columnChangedSignal.count(), 1); } @@ -80,7 +80,7 @@ { JobTrackerSearchWidget w; QSignalSpy selectOnlyErrorChangedSignal(&w, &JobTrackerSearchWidget::selectOnlyErrorChanged); - auto *mSelectOnlyError = w.findChild<QCheckBox *>(QStringLiteral("selectonlyerror")); + auto mSelectOnlyError = w.findChild<QCheckBox *>(QStringLiteral("selectonlyerror")); mSelectOnlyError->setChecked(true); QCOMPARE(selectOnlyErrorChangedSignal.count(), 1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-21.08.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-21.04.3/autotests/jobtrackersearchwidgettest.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/autotests/jobtrackersearchwidgettest.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef JOBTRACKERSEARCHWIDGETTEST_H -#define JOBTRACKERSEARCHWIDGETTEST_H +#pragma once #include <QObject> @@ -22,4 +21,3 @@ void shouldEmitSelectOnlyErrorChanged(); }; -#endif // JOBTRACKERSEARCHWIDGETTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/autotests/jobtrackertest.h new/akonadiconsole-21.08.0/autotests/jobtrackertest.h --- old/akonadiconsole-21.04.3/autotests/jobtrackertest.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/autotests/jobtrackertest.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef JOBTRACKERTEST_H -#define JOBTRACKERTEST_H +#pragma once #include <QObject> @@ -25,4 +24,3 @@ void shouldHandleJobEnd(); }; -#endif // JOBTRACKERTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/sanitizers.supp new/akonadiconsole-21.08.0/sanitizers.supp --- old/akonadiconsole-21.04.3/sanitizers.supp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/sanitizers.supp 2021-07-31 12:07:20.000000000 +0200 @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Laurent Montel <mon...@kde.org> +# SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN leak:libspeechd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/CMakeLists.txt new/akonadiconsole-21.08.0/src/CMakeLists.txt --- old/akonadiconsole-21.04.3/src/CMakeLists.txt 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/CMakeLists.txt 2021-07-31 12:07:20.000000000 +0200 @@ -52,16 +52,16 @@ ) endif() -qt5_generate_dbus_interface(jobtracker.h org.freedesktop.Akonadi.JobTracker.xml) -qt5_add_dbus_adaptor(libakonadiconsole_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.JobTracker.xml jobtracker.h JobTracker) -qt5_add_dbus_adaptor(libakonadiconsole_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.akonadiconsole.logger.xml logging.h Logging) +qt_generate_dbus_interface(jobtracker.h org.freedesktop.Akonadi.JobTracker.xml) +qt_add_dbus_adaptor(libakonadiconsole_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.JobTracker.xml jobtracker.h JobTracker) +qt_add_dbus_adaptor(libakonadiconsole_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.akonadiconsole.logger.xml logging.h Logging) -qt5_add_dbus_interfaces(libakonadiconsole_SRCS +qt_add_dbus_interfaces(libakonadiconsole_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.TracerNotification.xml ) # Use intalled interface once we can depend on Akoandi 1.1 set_source_files_properties(org.freedesktop.Akonadi.DebugInterface.xml PROPERTIES CLASSNAME DebugInterface) -qt5_add_dbus_interface(libakonadiconsole_SRCS +qt_add_dbus_interface(libakonadiconsole_SRCS org.freedesktop.Akonadi.DebugInterface.xml debuginterface ) @@ -69,12 +69,12 @@ set_source_files_properties(${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.StorageDebugger.xml PROPERTIES INCLUDE querydebugger.h ) -qt5_add_dbus_interface(libakonadiconsole_SRCS +qt_add_dbus_interface(libakonadiconsole_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.StorageDebugger.xml storagedebuggerinterface ) -qt5_wrap_ui(libakonadiconsole_SRCS +qt_wrap_ui(libakonadiconsole_SRCS agentwidget.ui agentconfigdialog.ui browserwidget_itemview.ui @@ -112,7 +112,7 @@ KF5::Mime KF5::Contacts KF5::CalendarCore - Qt5::Sql + Qt::Sql KF5::Completion KF5::ItemViews KF5::TextWidgets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/agentconfigdialog.h new/akonadiconsole-21.08.0/src/agentconfigdialog.h --- old/akonadiconsole-21.04.3/src/agentconfigdialog.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/agentconfigdialog.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_AGENTCONFIGDIALOG_H -#define AKONADICONSOLE_AGENTCONFIGDIALOG_H +#pragma once #include "ui_agentconfigdialog.h" #include <AkonadiCore/AgentInstance> @@ -29,4 +28,3 @@ Akonadi::AgentInstance m_instance; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/agentconfigmodel.h new/akonadiconsole-21.08.0/src/agentconfigmodel.h --- old/akonadiconsole-21.04.3/src/agentconfigmodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/agentconfigmodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_AGENTCONFIGMODEL_H -#define AKONADICONSOLE_AGENTCONFIGMODEL_H +#pragma once #include <AkonadiCore/AgentInstance> @@ -38,4 +37,3 @@ QDBusInterface *m_interface = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/agentwidget.cpp new/akonadiconsole-21.08.0/src/agentwidget.cpp --- old/akonadiconsole-21.04.3/src/agentwidget.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/agentwidget.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -179,7 +179,7 @@ selectedRows.append(ui.instanceWidget->view()->selectionModel()->currentIndex()); } QList<int> rows; - for (const QModelIndex &index : qAsConst(selectedRows)) { + for (const QModelIndex &index : std::as_const(selectedRows)) { rows.append(index.row()); } std::sort(rows.begin(), rows.end()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/agentwidget.h new/akonadiconsole-21.08.0/src/agentwidget.h --- old/akonadiconsole-21.04.3/src/agentwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/agentwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_AGENTWIDGET_H -#define AKONADICONSOLE_AGENTWIDGET_H +#pragma once #include "ui_agentwidget.h" @@ -62,4 +61,3 @@ Akonadi::AgentInstance mCloneSource; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/akonadibrowsermodel.cpp new/akonadiconsole-21.08.0/src/akonadibrowsermodel.cpp --- old/akonadiconsole-21.04.3/src/akonadibrowsermodel.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/akonadibrowsermodel.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -86,7 +86,7 @@ if (!item.hasPayload<KMime::Message::Ptr>()) { return QVariant(); } - const KMime::Message::Ptr mail = item.payload<KMime::Message::Ptr>(); + const auto mail = item.payload<KMime::Message::Ptr>(); // NOTE: remember to update AkonadiBrowserSortModel::lessThan if you insert/move columns switch (column) { @@ -138,7 +138,7 @@ } if (item.hasPayload<KContacts::Addressee>()) { - const KContacts::Addressee addr = item.payload<KContacts::Addressee>(); + const auto addr = item.payload<KContacts::Addressee>(); switch (column) { case 0: @@ -153,7 +153,7 @@ if (item.hasPayload<KContacts::ContactGroup>()) { switch (column) { case 0: - const KContacts::ContactGroup group = item.payload<KContacts::ContactGroup>(); + const auto group = item.payload<KContacts::ContactGroup>(); return group.name(); } return QVariant(); @@ -185,7 +185,7 @@ if (!item.hasPayload<IncidencePtr>()) { return QVariant(); } - const IncidencePtr incidence = item.payload<IncidencePtr>(); + const auto incidence = item.payload<IncidencePtr>(); // NOTE: remember to update AkonadiBrowserSortModel::lessThan if you insert/move columns switch (column) { case 0: @@ -348,8 +348,8 @@ if (!leftItem.hasPayload<IncidencePtr>() || !rightItem.hasPayload<IncidencePtr>()) { return false; } - const IncidencePtr leftInc = leftItem.payload<IncidencePtr>(); - const IncidencePtr rightInc = rightItem.payload<IncidencePtr>(); + const auto leftInc = leftItem.payload<IncidencePtr>(); + const auto rightInc = rightItem.payload<IncidencePtr>(); if (left.column() == 1) { return leftInc->dtStart() < rightInc->dtStart(); @@ -364,8 +364,8 @@ if (!leftItem.hasPayload<KMime::Message::Ptr>() || !rightItem.hasPayload<KMime::Message::Ptr>()) { return false; } - const KMime::Message::Ptr leftMail = leftItem.payload<KMime::Message::Ptr>(); - const KMime::Message::Ptr rightMail = rightItem.payload<KMime::Message::Ptr>(); + const auto leftMail = leftItem.payload<KMime::Message::Ptr>(); + const auto rightMail = rightItem.payload<KMime::Message::Ptr>(); const KMime::Headers::Date *ldate = leftMail->date(false); const KMime::Headers::Date *rdate = rightMail->date(false); if (ldate && rdate) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/akonadibrowsermodel.h new/akonadiconsole-21.08.0/src/akonadibrowsermodel.h --- old/akonadiconsole-21.04.3/src/akonadibrowsermodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/akonadibrowsermodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADIBROWSERMODEL_H -#define AKONADIBROWSERMODEL_H +#pragma once #include <AkonadiCore/changerecorder.h> #include <AkonadiCore/entitytreemodel.h> @@ -62,4 +61,3 @@ AkonadiBrowserModel *mBrowserModel; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/browserwidget.cpp new/akonadiconsole-21.08.0/src/browserwidget.cpp --- old/akonadiconsole-21.04.3/src/browserwidget.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/browserwidget.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -116,7 +116,7 @@ connect(mTagView, &QTreeView::customContextMenuRequested, this, &BrowserWidget::tagViewContextMenuRequested); connect(mTagView, &QTreeView::doubleClicked, this, &BrowserWidget::tagViewDoubleClicked); - Session *session = new Session(("AkonadiConsole Browser Widget"), this); + auto session = new Session(("AkonadiConsole Browser Widget"), this); // monitor collection changes mBrowserMonitor = new ChangeRecorder(this); @@ -384,7 +384,7 @@ mAttrModel = new QStandardItemModel(); QStringList labels{QStringLiteral("Attribute"), QStringLiteral("Value")}; mAttrModel->setHorizontalHeaderLabels(labels); - for (const auto *attr : list) { + for (const auto attr : list) { auto type = new QStandardItem(QString::fromLatin1(attr->type())); type->setEditable(false); mAttrModel->appendRow({type, new QStandardItem(QString::fromLatin1(attr->serialized()))}); @@ -619,7 +619,7 @@ void BrowserWidget::addSubTagRequested() { auto action = qobject_cast<QAction *>(sender()); - const Akonadi::Tag parentTag = action->parent()->property("Tag").value<Akonadi::Tag>(); + const auto parentTag = action->parent()->property("Tag").value<Akonadi::Tag>(); Akonadi::Tag tag; tag.setParent(parentTag); @@ -633,7 +633,7 @@ void BrowserWidget::editTagRequested() { auto action = qobject_cast<QAction *>(sender()); - const Akonadi::Tag tag = action->parent()->property("Tag").value<Akonadi::Tag>(); + const auto tag = action->parent()->property("Tag").value<Akonadi::Tag>(); auto dlg = new TagPropertiesDialog(tag, this); connect(dlg, &TagPropertiesDialog::accepted, this, &BrowserWidget::modifyTag); connect(dlg, &TagPropertiesDialog::rejected, dlg, &TagPropertiesDialog::deleteLater); @@ -647,7 +647,7 @@ return; } - const Akonadi::Tag tag = mTagModel->data(index, TagModel::TagRole).value<Akonadi::Tag>(); + const auto tag = mTagModel->data(index, TagModel::TagRole).value<Akonadi::Tag>(); Q_ASSERT(tag.isValid()); auto dlg = new TagPropertiesDialog(tag, this); @@ -670,7 +670,7 @@ } auto action = qobject_cast<QAction *>(sender()); - const Akonadi::Tag tag = action->parent()->property("Tag").value<Akonadi::Tag>(); + const auto tag = action->parent()->property("Tag").value<Akonadi::Tag>(); new Akonadi::TagDeleteJob(tag, this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/browserwidget.h new/akonadiconsole-21.08.0/src/browserwidget.h --- old/akonadiconsole-21.04.3/src/browserwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/browserwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_BROWSERWIDGET_H -#define AKONADICONSOLE_BROWSERWIDGET_H +#pragma once #include <ui_browserwidget_contentview.h> #include <ui_browserwidget_itemview.h> @@ -110,4 +109,3 @@ MessageViewer::Viewer *mMailView = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/collectionaclpage.h new/akonadiconsole-21.08.0/src/collectionaclpage.h --- old/akonadiconsole-21.04.3/src/collectionaclpage.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/collectionaclpage.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_COLLECTIONACLPAGE_H -#define AKONADICONSOLE_COLLECTIONACLPAGE_H +#pragma once #include "ui_collectionaclpage.h" @@ -24,4 +23,3 @@ Ui::CollectionAclPage ui; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/collectionattributespage.cpp new/akonadiconsole-21.08.0/src/collectionattributespage.cpp --- old/akonadiconsole-21.04.3/src/collectionattributespage.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/collectionattributespage.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -47,7 +47,7 @@ void CollectionAttributePage::save(Collection &col) { - for (const QString &del : qAsConst(mDeleted)) { + for (const QString &del : std::as_const(mDeleted)) { col.removeAttribute(del.toLatin1()); } for (int i = 0; i < mModel->rowCount(); ++i) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/collectionattributespage.h new/akonadiconsole-21.08.0/src/collectionattributespage.h --- old/akonadiconsole-21.04.3/src/collectionattributespage.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/collectionattributespage.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADI_COLLECTIONATTRIBUTESPAGE_H -#define AKONADI_COLLECTIONATTRIBUTESPAGE_H +#pragma once #include "ui_collectionattributespage.h" @@ -35,4 +34,3 @@ QSet<QString> mChanged; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/collectioninternalspage.h new/akonadiconsole-21.08.0/src/collectioninternalspage.h --- old/akonadiconsole-21.04.3/src/collectioninternalspage.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/collectioninternalspage.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_COLLECTIONINTERNALSPAGE_H -#define AKONADICONSOLE_COLLECTIONINTERNALSPAGE_H +#pragma once #include "ui_collectioninternalspage.h" @@ -24,4 +23,3 @@ Ui::CollectionInternalsPage ui; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/connectionpage.cpp new/akonadiconsole-21.08.0/src/connectionpage.cpp --- old/akonadiconsole-21.04.3/src/connectionpage.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/connectionpage.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -53,8 +53,7 @@ layout->addWidget(mDataView); - org::freedesktop::Akonadi::TracerNotification *iface = - new org::freedesktop::Akonadi::TracerNotification(QString(), QStringLiteral("/tracing/notifications"), QDBusConnection::sessionBus(), this); + auto iface = new org::freedesktop::Akonadi::TracerNotification(QString(), QStringLiteral("/tracing/notifications"), QDBusConnection::sessionBus(), this); connect(iface, &OrgFreedesktopAkonadiTracerNotificationInterface::connectionDataInput, this, &ConnectionPage::connectionDataInput); connect(iface, &OrgFreedesktopAkonadiTracerNotificationInterface::connectionDataOutput, this, &ConnectionPage::connectionDataOutput); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/connectionpage.h new/akonadiconsole-21.08.0/src/connectionpage.h --- old/akonadiconsole-21.04.3/src/connectionpage.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/connectionpage.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_CONNECTIONPAGE_H -#define AKONADICONSOLE_CONNECTIONPAGE_H +#pragma once #include <QWidget> @@ -52,4 +51,3 @@ bool mShowAllConnections; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/dbaccess.h new/akonadiconsole-21.08.0/src/dbaccess.h --- old/akonadiconsole-21.04.3/src/dbaccess.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/dbaccess.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_DBACCESS_H -#define AKONADICONSOLE_DBACCESS_H +#pragma once class QSqlDatabase; @@ -14,4 +13,3 @@ QSqlDatabase database(); } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/dbbrowser.h new/akonadiconsole-21.08.0/src/dbbrowser.h --- old/akonadiconsole-21.04.3/src/dbbrowser.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/dbbrowser.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_DBBROWSER_H -#define AKONADICONSOLE_DBBROWSER_H +#pragma once #include "ui_dbbrowser.h" @@ -26,4 +25,3 @@ QSqlTableModel *mTableModel = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/dbconsole.cpp new/akonadiconsole-21.08.0/src/dbconsole.cpp --- old/akonadiconsole-21.04.3/src/dbconsole.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/dbconsole.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -50,7 +50,7 @@ queries = group.readEntry("queryTexts", QStringList()); } - for (const auto &query : qAsConst(queries)) { + for (const auto &query : std::as_const(queries)) { auto tab = addTab(); tab->setQuery(query); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/dbconsole.h new/akonadiconsole-21.08.0/src/dbconsole.h --- old/akonadiconsole-21.04.3/src/dbconsole.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/dbconsole.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_DBCONSOLE_H -#define AKONADICONSOLE_DBCONSOLE_H +#pragma once #include "ui_dbconsoletab.h" #include <QWidget> @@ -52,4 +51,3 @@ int mIndex; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/debugfiltermodel.h new/akonadiconsole-21.08.0/src/debugfiltermodel.h --- old/akonadiconsole-21.04.3/src/debugfiltermodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/debugfiltermodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef DEBUGFILTERMODEL_H_ -#define DEBUGFILTERMODEL_H_ +#pragma once #include <QSet> #include <QSortFilterProxyModel> @@ -34,4 +33,3 @@ QTimer mInvalidateTimer; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/debugmodel.cpp new/akonadiconsole-21.08.0/src/debugmodel.cpp --- old/akonadiconsole-21.04.3/src/debugmodel.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/debugmodel.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -81,7 +81,7 @@ // find elements that needs to be deleted. for (const auto &identifer : mSenderCache.keys()) { bool found = false; - for (const auto &msg : qAsConst(mMessages)) { + for (const auto &msg : std::as_const(mMessages)) { if (msg.sender == identifer) { found = true; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/debugmodel.h new/akonadiconsole-21.08.0/src/debugmodel.h --- old/akonadiconsole-21.04.3/src/debugmodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/debugmodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_DEBUGMODEL_H_ -#define AKONADICONSOLE_DEBUGMODEL_H_ +#pragma once #include <QAbstractItemModel> #include <QMap> @@ -61,4 +60,3 @@ QMap<QString, QString> mSenderCache; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/debugwidget.cpp new/akonadiconsole-21.08.0/src/debugwidget.cpp --- old/akonadiconsole-21.04.3/src/debugwidget.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/debugwidget.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -35,7 +35,7 @@ service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier(); } mDebugInterface = new DebugInterface(service, QStringLiteral("/debug"), QDBusConnection::sessionBus(), this); - QCheckBox *cb = new QCheckBox(QStringLiteral("Enable debugger"), this); + auto cb = new QCheckBox(QStringLiteral("Enable debugger"), this); cb->setChecked(mDebugInterface->isValid() && mDebugInterface->tracer().value() == QLatin1String("dbus")); connect(cb, &QCheckBox::toggled, this, &DebugWidget::enableDebugger); layout->addWidget(cb); @@ -50,8 +50,7 @@ mGeneralView = new KTextEdit(splitter); mGeneralView->setReadOnly(true); - org::freedesktop::Akonadi::TracerNotification *iface = - new org::freedesktop::Akonadi::TracerNotification(QString(), QStringLiteral("/tracing/notifications"), QDBusConnection::sessionBus(), this); + auto iface = new org::freedesktop::Akonadi::TracerNotification(QString(), QStringLiteral("/tracing/notifications"), QDBusConnection::sessionBus(), this); connect(iface, &org::freedesktop::Akonadi::TracerNotification::signalEmitted, this, &DebugWidget::signalEmitted); connect(iface, &org::freedesktop::Akonadi::TracerNotification::warningEmitted, this, &DebugWidget::warningEmitted); @@ -60,11 +59,11 @@ auto buttonLayout = new QHBoxLayout; layout->addLayout(buttonLayout); - QPushButton *clearGeneralButton = new QPushButton(QStringLiteral("Clear Information View"), this); - QPushButton *clearFilteredButton = new QPushButton(QStringLiteral("Clear Filtered Messages"), this); - QPushButton *clearAllButton = new QPushButton(QStringLiteral("Clear All Messages"), this); - QPushButton *saveRichtextButton = new QPushButton(QStringLiteral("Save Filtered Messages ..."), this); - QPushButton *saveRichtextEverythingButton = new QPushButton(QStringLiteral("Save All Messages ..."), this); + auto clearGeneralButton = new QPushButton(QStringLiteral("Clear Information View"), this); + auto clearFilteredButton = new QPushButton(QStringLiteral("Clear Filtered Messages"), this); + auto clearAllButton = new QPushButton(QStringLiteral("Clear All Messages"), this); + auto saveRichtextButton = new QPushButton(QStringLiteral("Save Filtered Messages ..."), this); + auto saveRichtextEverythingButton = new QPushButton(QStringLiteral("Save All Messages ..."), this); buttonLayout->addWidget(clearFilteredButton); buttonLayout->addWidget(clearAllButton); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/debugwidget.h new/akonadiconsole-21.08.0/src/debugwidget.h --- old/akonadiconsole-21.04.3/src/debugwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/debugwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_DEBUGWIDGET_H -#define AKONADICONSOLE_DEBUGWIDGET_H +#pragma once #include "debuginterface.h" @@ -41,4 +40,3 @@ org::freedesktop::Akonadi::DebugInterface *mDebugInterface = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/instanceselector.h new/akonadiconsole-21.08.0/src/instanceselector.h --- old/akonadiconsole-21.04.3/src/instanceselector.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/instanceselector.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef INSTANCESELECTOR_H -#define INSTANCESELECTOR_H +#pragma once #include "libakonadiconsole_export.h" #include "mainwindow.h" @@ -43,4 +42,3 @@ MainWindow *mWindow = nullptr; }; -#endif // INSTANCESELECTOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/jobtracker.h new/akonadiconsole-21.08.0/src/jobtracker.h --- old/akonadiconsole-21.04.3/src/jobtracker.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/jobtracker.h 2021-07-31 12:07:20.000000000 +0200 @@ -7,8 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_JOBTRACKER_H -#define AKONADICONSOLE_JOBTRACKER_H +#pragma once #include "libakonadiconsole_export.h" #include <QDateTime> @@ -111,4 +110,3 @@ Private *const d; }; -#endif /* JOBTRACKER_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-21.08.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-21.04.3/src/jobtrackerfilterproxymodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/jobtrackerfilterproxymodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef JOBTRACKERFILTERPROXYMODEL_H -#define JOBTRACKERFILTERPROXYMODEL_H +#pragma once #include <QSortFilterProxyModel> @@ -28,4 +27,3 @@ bool mShowOnlyFailed = false; }; -#endif // JOBTRACKERFILTERPROXYMODEL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/jobtrackermodel.h new/akonadiconsole-21.08.0/src/jobtrackermodel.h --- old/akonadiconsole-21.04.3/src/jobtrackermodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/jobtrackermodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_JOBTRACKERMODEL_H -#define AKONADICONSOLE_JOBTRACKERMODEL_H +#pragma once #include "libakonadiconsole_export.h" #include <QAbstractItemModel> @@ -60,4 +59,3 @@ Private *const d; }; -#endif /* JOBTRACKERMODEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/jobtrackersearchwidget.h new/akonadiconsole-21.08.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-21.04.3/src/jobtrackersearchwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/jobtrackersearchwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef JOBTRACKERSEARCHWIDGET_H -#define JOBTRACKERSEARCHWIDGET_H +#pragma once #include <QWidget> @@ -35,4 +34,3 @@ QCheckBox *mSelectOnlyError = nullptr; }; -#endif // JOBTRACKERSEARCHWIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/jobtrackerwidget.cpp new/akonadiconsole-21.08.0/src/jobtrackerwidget.cpp --- old/akonadiconsole-21.04.3/src/jobtrackerwidget.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/jobtrackerwidget.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -68,7 +68,7 @@ d->model->setEnabled(false); // since it can be slow, default to off auto layout2 = new QHBoxLayout; - QPushButton *button = new QPushButton(QStringLiteral("Save to file..."), this); + auto button = new QPushButton(QStringLiteral("Save to file..."), this); connect(button, &QAbstractButton::clicked, this, &JobTrackerWidget::slotSaveToFile); layout2->addWidget(button); layout2->addStretch(1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/jobtrackerwidget.h new/akonadiconsole-21.08.0/src/jobtrackerwidget.h --- old/akonadiconsole-21.04.3/src/jobtrackerwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/jobtrackerwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_JOBTRACKERWIDGET_H -#define AKONADICONSOLE_JOBTRACKERWIDGET_H +#pragma once #include <QWidget> @@ -37,4 +36,3 @@ Private *const d; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/logging.h new/akonadiconsole-21.08.0/src/logging.h --- old/akonadiconsole-21.04.3/src/logging.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/logging.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_LOGGING_H_ -#define AKONADICONSOLE_LOGGING_H_ +#pragma once #include <QWidget> @@ -55,4 +54,3 @@ LoggingModel *mModel = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/loggingfiltermodel.h new/akonadiconsole-21.08.0/src/loggingfiltermodel.h --- old/akonadiconsole-21.04.3/src/loggingfiltermodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/loggingfiltermodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef LOGGINGFILTERMODEL_H_ -#define LOGGINGFILTERMODEL_H_ +#pragma once #include <QSet> #include <QSortFilterProxyModel> @@ -40,4 +39,3 @@ QTimer mInvalidateTimer; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/loggingmodel.h new/akonadiconsole-21.08.0/src/loggingmodel.h --- old/akonadiconsole-21.04.3/src/loggingmodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/loggingmodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_LOGGINGMODEL_H_ -#define AKONADICONSOLE_LOGGINGMODEL_H_ +#pragma once #include <QAbstractItemModel> #include <QSet> @@ -79,4 +78,3 @@ QSet<QString> mFunctionCache; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/main.cpp new/akonadiconsole-21.08.0/src/main.cpp --- old/akonadiconsole-21.04.3/src/main.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/main.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -8,7 +8,10 @@ #include "akonadiconsole-version.h" #include "instanceselector.h" +#include <kcoreaddons_version.h> +#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <Kdelibs4ConfigMigrator> +#endif #include <KAboutData> #include <KCrash> @@ -24,17 +27,18 @@ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); QApplication app(argc, argv); +#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0) Kdelibs4ConfigMigrator migrate(QStringLiteral("akonadiconsole")); migrate.setConfigFiles(QStringList() << QStringLiteral("akonadiconsolerc")); migrate.setUiFiles(QStringList() << QStringLiteral("akonadiconsoleui.rc")); migrate.migrate(); - +#endif KAboutData aboutData(QStringLiteral("akonadiconsole"), QStringLiteral("Akonadi Console"), QStringLiteral(KDEPIM_VERSION), QStringLiteral("The Management and Debugging Console for Akonadi"), KAboutLicense::GPL, - QStringLiteral("(c) 2006-2020 the Akonadi developer"), + QStringLiteral("(c) 2006-2021 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.04.3/src/mainwidget.h new/akonadiconsole-21.08.0/src/mainwidget.h --- old/akonadiconsole-21.04.3/src/mainwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/mainwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_MAINWIDGET_H -#define AKONADICONSOLE_MAINWIDGET_H +#pragma once #include "browserwidget.h" @@ -32,4 +31,3 @@ BrowserWidget *mBrowser = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/mainwindow.h new/akonadiconsole-21.08.0/src/mainwindow.h --- old/akonadiconsole-21.04.3/src/mainwindow.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/mainwindow.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_MAINWINDOW_H -#define AKONADICONSOLE_MAINWINDOW_H +#pragma once #include "mainwidget.h" @@ -28,4 +27,3 @@ MainWidget *mMain; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/metatypes.h new/akonadiconsole-21.08.0/src/metatypes.h --- old/akonadiconsole-21.04.3/src/metatypes.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/metatypes.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef AKONADICONSOLE_METATYPES_H -#define AKONADICONSOLE_METATYPES_H +#pragma once #include <akonadi/private/notificationmessagev2_p.h> @@ -14,4 +13,3 @@ Q_DECLARE_METATYPE(QList<QByteArray>) Q_DECLARE_METATYPE(QList<long long>) -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/monitorsmodel.h new/akonadiconsole-21.08.0/src/monitorsmodel.h --- old/akonadiconsole-21.04.3/src/monitorsmodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/monitorsmodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef MONITORSMODEL_H -#define MONITORSMODEL_H +#pragma once #include "libakonadiconsole_export.h" #include <AkonadiCore/NotificationSubscriber> @@ -51,4 +50,3 @@ Akonadi::Monitor *mMonitor; }; -#endif // MONITORSMODEL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/monitorswidget.h new/akonadiconsole-21.08.0/src/monitorswidget.h --- old/akonadiconsole-21.04.3/src/monitorswidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/monitorswidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef MONITORSWIDGET_H -#define MONITORSWIDGET_H +#pragma once #include <QTreeView> #include <QWidget> @@ -40,4 +39,3 @@ MonitorsModel *mModel = nullptr; }; -#endif // MONITORSWIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/notificationfiltermodel.h new/akonadiconsole-21.08.0/src/notificationfiltermodel.h --- old/akonadiconsole-21.04.3/src/notificationfiltermodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/notificationfiltermodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -#ifndef NOTIFICATIONFILTERMODEL_H -#define NOTIFICATIONFILTERMODEL_H +#pragma once #include <QSortFilterProxyModel> @@ -47,4 +46,3 @@ QTimer mInvalidateTimer; }; -#endif // NOTIFICATIONFILTERMODEL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/notificationmodel.h new/akonadiconsole-21.08.0/src/notificationmodel.h --- old/akonadiconsole-21.04.3/src/notificationmodel.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/notificationmodel.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_NOTIFICATIONMODEL_H -#define AKONADICONSOLE_NOTIFICATIONMODEL_H +#pragma once #include <QAbstractItemModel> @@ -66,4 +65,3 @@ Akonadi::Monitor *m_monitor = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/notificationmonitor.h new/akonadiconsole-21.08.0/src/notificationmonitor.h --- old/akonadiconsole-21.04.3/src/notificationmonitor.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/notificationmonitor.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_NOTIFICATIONMONITOR_H -#define AKONADICONSOLE_NOTIFICATIONMONITOR_H +#pragma once #include <QWidget> #include <akonadi/private/protocol_p.h> @@ -58,4 +57,3 @@ NotificationFilterModel *m_filterModel = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/querydebugger.h new/akonadiconsole-21.08.0/src/querydebugger.h --- old/akonadiconsole-21.04.3/src/querydebugger.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/querydebugger.h 2021-07-31 12:07:20.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef QUERYDEBUGGER_H -#define QUERYDEBUGGER_H +#pragma once #include <QMap> #include <QScopedPointer> @@ -71,4 +70,3 @@ QueryTreeModel *mQueryTree = nullptr; }; -#endif // QUERYDEBUGGER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/searchwidget.cpp new/akonadiconsole-21.08.0/src/searchwidget.cpp --- old/akonadiconsole-21.04.3/src/searchwidget.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/searchwidget.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -201,7 +201,7 @@ return; } - Akonadi::ItemFetchJob *fetchJob = new Akonadi::ItemFetchJob(Akonadi::Item(docId)); + auto fetchJob = new Akonadi::ItemFetchJob(Akonadi::Item(docId)); fetchJob->fetchScope().fetchFullPayload(); connect(fetchJob, &Akonadi::ItemFetchJob::result, this, &SearchWidget::itemFetched); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/searchwidget.h new/akonadiconsole-21.08.0/src/searchwidget.h --- old/akonadiconsole-21.04.3/src/searchwidget.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/searchwidget.h 2021-07-31 12:07:20.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_SEARCHWIDGET_H -#define AKONADICONSOLE_SEARCHWIDGET_H +#pragma once #include <QWidget> @@ -58,4 +57,3 @@ Xapian::Database *mDatabase = nullptr; }; -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/tagpropertiesdialog.cpp new/akonadiconsole-21.08.0/src/tagpropertiesdialog.cpp --- old/akonadiconsole-21.04.3/src/tagpropertiesdialog.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/tagpropertiesdialog.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -110,7 +110,7 @@ if (query.exec()) { while (query.next()) { QList<QStandardItem *> items; - QStandardItem *item = new QStandardItem(query.value(0).toString()); + auto item = new QStandardItem(query.value(0).toString()); item->setEditable(false); items << item; item = new QStandardItem(query.value(1).toString()); @@ -240,7 +240,7 @@ mTag.setType(ui.typeEdit->text().toLatin1()); mTag.setGid(ui.gidEdit->text().toLatin1()); - for (const QString &removedAttr : qAsConst(mRemovedAttrs)) { + for (const QString &removedAttr : std::as_const(mRemovedAttrs)) { mTag.removeAttribute(removedAttr.toLatin1()); } for (int i = 0; i < mAttributesModel->rowCount(); ++i) { @@ -278,7 +278,7 @@ queryStr += conds.join(QLatin1String(" OR ")) + QLatin1Char(')'); query.prepare(queryStr); query.addBindValue(mTag.id()); - for (const QString &removedRid : qAsConst(mRemovedRIDs)) { + for (const QString &removedRid : std::as_const(mRemovedRIDs)) { query.addBindValue(removedRid); } if (!query.exec()) { @@ -299,7 +299,7 @@ } queryStr += conds.join(QLatin1String(" OR ")); query.prepare(queryStr); - for (const QString &res : qAsConst(mChangedRIDs)) { + for (const QString &res : std::as_const(mChangedRIDs)) { query.addBindValue(res); } if (!query.exec()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/tagpropertiesdialog.h new/akonadiconsole-21.08.0/src/tagpropertiesdialog.h --- old/akonadiconsole-21.04.3/src/tagpropertiesdialog.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/tagpropertiesdialog.h 2021-07-31 12:07:20.000000000 +0200 @@ -5,8 +5,7 @@ * */ -#ifndef TAGPROPERTIESDIALOG_H -#define TAGPROPERTIESDIALOG_H +#pragma once #include <AkonadiCore/tag.h> #include <QDialog> @@ -55,4 +54,3 @@ QSet<QString> mRemovedRIDs; }; -#endif // TAGPROPERTIESDIALOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/uistatesaver.cpp new/akonadiconsole-21.08.0/src/uistatesaver.cpp --- old/akonadiconsole-21.04.3/src/uistatesaver.cpp 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/uistatesaver.cpp 2021-07-31 12:07:20.000000000 +0200 @@ -88,7 +88,7 @@ { QList<QWidget *> widgets = widget->findChildren<QWidget *>(); widgets << widget; - for (QWidget *w : qAsConst(widgets)) { + for (QWidget *w : std::as_const(widgets)) { if (w->objectName().isEmpty()) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/uistatesaver.h new/akonadiconsole-21.08.0/src/uistatesaver.h --- old/akonadiconsole-21.04.3/src/uistatesaver.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/uistatesaver.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef UISTATESAVER_H -#define UISTATESAVER_H +#pragma once class QWidget; class KConfigGroup; @@ -48,4 +47,3 @@ } } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-21.04.3/src/utils.h new/akonadiconsole-21.08.0/src/utils.h --- old/akonadiconsole-21.04.3/src/utils.h 2021-06-19 17:57:43.000000000 +0200 +++ new/akonadiconsole-21.08.0/src/utils.h 2021-07-31 12:07:20.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef AKONADICONSOLE_UTILS_H_ -#define AKONADICONSOLE_UTILS_H_ +#pragma once #include <QDateTime> #include <QStandardItem> @@ -74,4 +73,3 @@ parent->appendRow({new QStandardItem(name), item}); } -#endif
