Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2017-08-28 15:04:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Mon Aug 28 15:04:45 2017 rev:10 rq:516274 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2017-07-29 08:54:54.703892595 +0200 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new/akonadiconsole.changes 2017-08-28 15:05:00.927238575 +0200 @@ -1,0 +2,19 @@ +Fri Aug 11 22:44:44 UTC 2017 - christo...@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Adapt AkonadiConsole to recent Protocol API changes + * Activate by default QT_NO_NARROWING_CONVERSIONS_IN_CONNECT + * don't use kpartgui + +------------------------------------------------------------------- +Sat Aug 5 18:16:22 UTC 2017 - christo...@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- akonadiconsole-17.04.3.tar.xz New: ---- akonadiconsole-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.cSZQ6O/_old 2017-08-28 15:05:02.419028744 +0200 +++ /var/tmp/diff_new_pack.cSZQ6O/_new 2017-08-28 15:05:02.483019743 +0200 @@ -17,10 +17,10 @@ Name: akonadiconsole -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.28.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Management and debugging console for akonadi License: GPL-2.0+ and LGPL-2.1+ @@ -59,15 +59,13 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif Obsoletes: akonadi_resources < %{version} +%if %{with lang} +Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # It can only build on the same platforms as Qt Webengine -ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 %description Akonadi Console is a useful utility that can be used to explore or @@ -94,12 +92,12 @@ %doc COPYING COPYING.LIB COPYING.DOC %config %{_kf5_configdir}/akonadiconsole.categories %config %{_kf5_configdir}/akonadiconsole.renamecategories -%{_bindir}/akonadiconsole -%{_kf5_applicationsdir}/org.kde.akonadiconsole.desktop %dir %{_kf5_iconsdir}/hicolor/256x256 %dir %{_kf5_iconsdir}/hicolor/256x256/apps +%{_kf5_applicationsdir}/org.kde.akonadiconsole.desktop +%{_kf5_bindir}/akonadiconsole %{_kf5_iconsdir}/hicolor/*/apps/akonadiconsole.png -%{_datadir}/kconf_update/ %{_kf5_libdir}/libakonadiconsole.so.* +%{_kf5_sharedir}/kconf_update/ %changelog ++++++ akonadiconsole-17.04.3.tar.xz -> akonadiconsole-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/.gitignore new/akonadiconsole-17.08.0/.gitignore --- old/akonadiconsole-17.04.3/.gitignore 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/.gitignore 2017-08-07 11:57:13.000000000 +0200 @@ -18,3 +18,4 @@ random_seed /build/ CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/CMakeLists.txt new/akonadiconsole-17.08.0/CMakeLists.txt --- old/akonadiconsole-17.04.3/CMakeLists.txt 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/CMakeLists.txt 2017-08-07 11:57:13.000000000 +0200 @@ -1,7 +1,7 @@ project(akonadiconsole) cmake_minimum_required(VERSION 3.1) -set(KF5_VERSION "5.32.0") +set(KF5_VERSION "5.35.0") find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMInstallIcons) @@ -33,7 +33,7 @@ endif() -set(KDEPIM_VERSION_NUMBER "5.5.3") +set(KDEPIM_VERSION_NUMBER "5.6.0") set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") @@ -41,25 +41,25 @@ -set(AKONADI_MIMELIB_VERSION "5.5.3") -set(AKONADI_CONTACT_VERSION "5.5.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.5.3") -set(KPIMTEXTEDIT_LIB_VERSION "5.5.3") -set(AKONADI_VERSION "5.5.3") +set(AKONADI_MIMELIB_VERSION "5.6.0") +set(AKONADI_CONTACT_VERSION "5.6.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.6.0") +set(KPIMTEXTEDIT_LIB_VERSION "5.6.0") +set(AKONADI_VERSION "5.6.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(QT_REQUIRED_VERSION "5.6.0") +set(QT_REQUIRED_VERSION "5.7.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.5.3") -set(LIBKLEO_LIB_VERSION_LIB "5.5.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.5.3") -set(KCALENDARCORE_LIB_VERSION "5.5.3") -set(KCONTACTS_LIB_VERSION "5.5.3") -set(KMIME_LIB_VERSION "5.5.3") -set(KIMAP_LIB_VERSION "5.5.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.6.0") +set(LIBKLEO_LIB_VERSION_LIB "5.6.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.6.0") +set(KCALENDARCORE_LIB_VERSION "5.6.0") +set(KCONTACTS_LIB_VERSION "5.6.0") +set(KMIME_LIB_VERSION "5.6.0") +set(KIMAP_LIB_VERSION "5.6.0") # Find KF5 package find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) @@ -93,6 +93,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) install( FILES akonadiconsole.renamecategories akonadiconsole.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/CMakeLists.txt new/akonadiconsole-17.08.0/src/CMakeLists.txt --- old/akonadiconsole-17.04.3/src/CMakeLists.txt 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/CMakeLists.txt 2017-08-07 11:57:13.000000000 +0200 @@ -1,8 +1,8 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) -add_definitions( -DQT_NO_CAST_FROM_ASCII ) -add_definitions( -DQT_NO_CAST_TO_ASCII ) +add_definitions(-DQT_NO_CAST_FROM_ASCII) +add_definitions(-DQT_NO_CAST_TO_ASCII) add_subdirectory(icons) add_subdirectory(kconf_update) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/agentconfigmodel.h new/akonadiconsole-17.08.0/src/agentconfigmodel.h --- old/akonadiconsole-17.04.3/src/agentconfigmodel.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/agentconfigmodel.h 2017-08-07 11:57:13.000000000 +0200 @@ -35,12 +35,12 @@ ~AgentConfigModel(); void setAgentInstance(const Akonadi::AgentInstance &instance); - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; public Q_SLOTS: void reload(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/agentwidget.cpp new/akonadiconsole-17.08.0/src/agentwidget.cpp --- old/akonadiconsole-17.04.3/src/agentwidget.cpp 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/agentwidget.cpp 2017-08-07 11:57:13.000000000 +0200 @@ -20,7 +20,7 @@ */ #include "agentwidget.h" -#include "helper_p.h" + #include "agentconfigdialog.h" #include "akonadiconsole_debug.h" #include "kpimtextedit/plaintexteditorwidget.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/agentwidget.h new/akonadiconsole-17.08.0/src/agentwidget.h --- old/akonadiconsole-17.04.3/src/agentwidget.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/agentwidget.h 2017-08-07 11:57:13.000000000 +0200 @@ -44,9 +44,9 @@ } protected: - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *event) override; - bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *event) override; private Q_SLOTS: void addAgent(); void removeAgent(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/akonadibrowsermodel.cpp new/akonadiconsole-17.08.0/src/akonadibrowsermodel.cpp --- old/akonadiconsole-17.04.3/src/akonadibrowsermodel.cpp 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/akonadibrowsermodel.cpp 2017-08-07 11:57:13.000000000 +0200 @@ -52,7 +52,7 @@ { } - QVariant entityData(const Item &item, int column, int role) const Q_DECL_OVERRIDE + QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { return QVariant(); @@ -81,7 +81,7 @@ } virtual ~MailState() {} - QVariant entityData(const Item &item, int column, int role) const Q_DECL_OVERRIDE + QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { return QVariant(); @@ -128,7 +128,7 @@ } virtual ~ContactsState() {} - QVariant entityData(const Item &item, int column, int role) const Q_DECL_OVERRIDE + QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { return QVariant(); @@ -174,7 +174,7 @@ } virtual ~CalendarState() {} - QVariant entityData(const Item &item, int column, int role) const Q_DECL_OVERRIDE + QVariant entityData(const Item &item, int column, int role) const override { if (Qt::DisplayRole != role) { return QVariant(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/akonadibrowsermodel.h new/akonadiconsole-17.08.0/src/akonadibrowsermodel.h --- old/akonadiconsole-17.04.3/src/akonadibrowsermodel.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/akonadibrowsermodel.h 2017-08-07 11:57:13.000000000 +0200 @@ -44,12 +44,12 @@ void setItemDisplayMode(ItemDisplayMode itemDisplayMode); ItemDisplayMode itemDisplayMode() const; - QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const Q_DECL_OVERRIDE; + QVariant entityHeaderData(int section, Qt::Orientation orientation, int role, HeaderGroup headerGroup) const override; - QVariant entityData(const Item &item, int column, int role) const Q_DECL_OVERRIDE; - QVariant entityData(const Collection &collection, int column, int role) const Q_DECL_OVERRIDE; + QVariant entityData(const Item &item, int column, int role) const override; + QVariant entityData(const Collection &collection, int column, int role) const override; - int entityColumnCount(HeaderGroup headerGroup) const Q_DECL_OVERRIDE; + int entityColumnCount(HeaderGroup headerGroup) const override; class State; @@ -74,7 +74,7 @@ ~AkonadiBrowserSortModel(); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: AkonadiBrowserModel *mBrowserModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/akonadiconsoleui.rc new/akonadiconsole-17.08.0/src/akonadiconsoleui.rc --- old/akonadiconsole-17.04.3/src/akonadiconsoleui.rc 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/akonadiconsoleui.rc 2017-08-07 11:57:13.000000000 +0200 @@ -1,5 +1,5 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui version="4" name="akonadiconsole" > +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui version="4" name="akonadiconsole" > <MenuBar> <Menu name="edit"> @@ -94,5 +94,5 @@ <Action name="akonadi_paste"/> <Action name="akonadi_item_delete"/> </Menu> -</kpartgui> +</gui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/collectionaclpage.h new/akonadiconsole-17.08.0/src/collectionaclpage.h --- old/akonadiconsole-17.04.3/src/collectionaclpage.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/collectionaclpage.h 2017-08-07 11:57:13.000000000 +0200 @@ -30,8 +30,8 @@ public: explicit CollectionAclPage(QWidget *parent = nullptr); - void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE; - void save(Akonadi::Collection &col) Q_DECL_OVERRIDE; + void load(const Akonadi::Collection &col) override; + void save(Akonadi::Collection &col) override; private: Ui::CollectionAclPage ui; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/collectionattributespage.cpp new/akonadiconsole-17.08.0/src/collectionattributespage.cpp --- old/akonadiconsole-17.04.3/src/collectionattributespage.cpp 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/collectionattributespage.cpp 2017-08-07 11:57:13.000000000 +0200 @@ -18,7 +18,7 @@ */ #include "collectionattributespage.h" -#include "helper_p.h" + #include <AkonadiCore/attributefactory.h> #include <AkonadiCore/collection.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/collectionattributespage.h new/akonadiconsole-17.08.0/src/collectionattributespage.h --- old/akonadiconsole-17.04.3/src/collectionattributespage.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/collectionattributespage.h 2017-08-07 11:57:13.000000000 +0200 @@ -33,8 +33,8 @@ public: explicit CollectionAttributePage(QWidget *parent = nullptr); - void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE; - void save(Akonadi::Collection &col) Q_DECL_OVERRIDE; + void load(const Akonadi::Collection &col) override; + void save(Akonadi::Collection &col) override; private Q_SLOTS: void addAttribute(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/collectioninternalspage.h new/akonadiconsole-17.08.0/src/collectioninternalspage.h --- old/akonadiconsole-17.04.3/src/collectioninternalspage.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/collectioninternalspage.h 2017-08-07 11:57:13.000000000 +0200 @@ -30,8 +30,8 @@ public: explicit CollectionInternalsPage(QWidget *parent = nullptr); - void load(const Akonadi::Collection &col) Q_DECL_OVERRIDE; - void save(Akonadi::Collection &col) Q_DECL_OVERRIDE; + void load(const Akonadi::Collection &col) override; + void save(Akonadi::Collection &col) override; private: Ui::CollectionInternalsPage ui; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/helper_p.h new/akonadiconsole-17.08.0/src/helper_p.h --- old/akonadiconsole-17.04.3/src/helper_p.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/helper_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -/* - Copyright (c) 2017 Laurent Montel <mon...@kde.org> - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#ifndef _HELPER_H -#define _HELPER_H -#include <qglobal.h> - -#if QT_VERSION < QT_VERSION_CHECK(5,7,0) -template <typename... Args> -struct QNonConstOverload -{ - template <typename R, typename T> - Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } - - template <typename R, typename T> - static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } -}; - -template <typename... Args> -struct QConstOverload -{ - template <typename R, typename T> - Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } - - template <typename R, typename T> - static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } -}; - -template <typename... Args> -struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...> -{ - using QConstOverload<Args...>::of; - using QConstOverload<Args...>::operator(); - using QNonConstOverload<Args...>::of; - using QNonConstOverload<Args...>::operator(); - - template <typename R> - Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } - - template <typename R> - static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr) - { return ptr; } -}; - -namespace QtPrivate -{ -template <typename T> struct QAddConst { - typedef const T Type; -}; -} - -// this adds const to non-const objects (like std::as_const) -template <typename T> -Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; } -// prevent rvalue arguments: -template <typename T> -void qAsConst(const T &&) Q_DECL_EQ_DELETE; -#endif - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-17.08.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-17.04.3/src/jobtrackerfilterproxymodel.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/jobtrackerfilterproxymodel.h 2017-08-07 11:57:13.000000000 +0200 @@ -32,7 +32,7 @@ void setShowOnlyFailed(bool showOnlyFailed); protected: - bool acceptRow(int source_row, const QModelIndex &source_parent) const Q_DECL_OVERRIDE; + bool acceptRow(int source_row, const QModelIndex &source_parent) const override; private: int mSearchColumn; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/jobtrackermodel.h new/akonadiconsole-17.08.0/src/jobtrackermodel.h --- old/akonadiconsole-17.04.3/src/jobtrackermodel.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/jobtrackermodel.h 2017-08-07 11:57:13.000000000 +0200 @@ -55,12 +55,12 @@ }; /* QAIM API */ - QModelIndex index(int, int, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QModelIndex index(int, int, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; bool isEnabled() const; public Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/mainwindow.h new/akonadiconsole-17.08.0/src/mainwindow.h --- old/akonadiconsole-17.04.3/src/mainwindow.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/mainwindow.h 2017-08-07 11:57:13.000000000 +0200 @@ -35,7 +35,7 @@ ~MainWindow(); protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private: MainWidget *mMain; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/monitorsmodel.h new/akonadiconsole-17.08.0/src/monitorsmodel.h --- old/akonadiconsole-17.04.3/src/monitorsmodel.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/monitorsmodel.h 2017-08-07 11:57:13.000000000 +0200 @@ -56,12 +56,12 @@ void setEnabled(bool enabled); - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + int columnCount(const QModelIndex &parent) const override; + int rowCount(const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; private Q_SLOTS: void init(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/notificationmodel.cpp new/akonadiconsole-17.08.0/src/notificationmodel.cpp --- old/akonadiconsole-17.04.3/src/notificationmodel.cpp 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/notificationmodel.cpp 2017-08-07 11:57:13.000000000 +0200 @@ -56,8 +56,7 @@ class NotificationModel::NotificationEntity: public NotificationModel::Item { public: - NotificationEntity(Protocol::ChangeNotification::Id id, - const QString &remoteId, const QString &remoteRevision, + NotificationEntity(qint64 id, const QString &remoteId, const QString &remoteRevision, const QString &mimeType, NotificationModel::Item *parent) : NotificationModel::Item(-1, parent) , id(id) @@ -71,7 +70,7 @@ , id(-1) {} - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: @@ -87,7 +86,7 @@ } } - Protocol::ChangeNotification::Id id; + qint64 id; QString remoteId; QString remoteRevision; QString mimeType; @@ -96,12 +95,12 @@ class NotificationModel::ItemNotificationNode: public NotificationModel::Item { public: - ItemNotificationNode(const Protocol::ItemChangeNotification &msg, + ItemNotificationNode(const Protocol::ItemChangeNotificationPtr &msg, NotificationModel::Item *parent) : NotificationModel::Item(Protocol::Command::ItemChangeNotification, parent) , msg(msg) { - Q_FOREACH (const auto &item, msg.items()) { + Q_FOREACH (const auto &item, msg->items()) { nodes << new NotificationEntity(item.id, item.remoteId, item.remoteRevision, item.mimeType, this); @@ -111,11 +110,11 @@ ~ItemNotificationNode() {} - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: { - switch (msg.operation()) { + switch (msg->operation()) { case Protocol::ItemChangeNotification::Add: return QStringLiteral("Add"); case Protocol::ItemChangeNotification::Modify: return QStringLiteral("Modify"); case Protocol::ItemChangeNotification::ModifyFlags: return QStringLiteral("ModifyFlags"); @@ -130,49 +129,49 @@ return QStringLiteral("Items"); } case 2: - return QString::fromUtf8(msg.sessionId()); + return QString::fromUtf8(msg->sessionId()); case 3: - return QString::fromUtf8(msg.resource()); + return QString::fromUtf8(msg->resource()); case 4: - return QString::fromUtf8(msg.destinationResource()); + return QString::fromUtf8(msg->destinationResource()); case 5: - return QString::number(msg.parentCollection()); + return QString::number(msg->parentCollection()); case 6: - return QString::number(msg.parentDestCollection()); + return QString::number(msg->parentDestCollection()); case 7: - return QString::fromUtf8(Akonadi::ImapParser::join(msg.itemParts(), ", ")); + return QString::fromUtf8(Akonadi::ImapParser::join(msg->itemParts(), ", ")); case 8: - return QString::fromUtf8(Akonadi::ImapParser::join(msg.addedFlags(), ", ")); + return QString::fromUtf8(Akonadi::ImapParser::join(msg->addedFlags(), ", ")); case 9: - return QString::fromUtf8(Akonadi::ImapParser::join(msg.removedFlags(), ", ")); + return QString::fromUtf8(Akonadi::ImapParser::join(msg->removedFlags(), ", ")); default: return QString(); } } - Protocol::ItemChangeNotification msg; + Protocol::ItemChangeNotificationPtr msg; }; class NotificationModel::CollectionNotificationNode : public NotificationModel::Item { public: - CollectionNotificationNode(const Protocol::CollectionChangeNotification &msg, + CollectionNotificationNode(const Protocol::CollectionChangeNotificationPtr &msg, NotificationModel::Item *parent) : NotificationModel::Item(Protocol::Command::CollectionChangeNotification, parent) , msg(msg) { - nodes << new NotificationEntity(msg.id(), msg.remoteId(), msg.remoteRevision(), + nodes << new NotificationEntity(msg->id(), msg->remoteId(), msg->remoteRevision(), QString(), this); } ~CollectionNotificationNode() {} - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: { - switch (msg.operation()) { + switch (msg->operation()) { case Protocol::CollectionChangeNotification::Add: return QStringLiteral("Add"); case Protocol::CollectionChangeNotification::Modify: return QStringLiteral("Modify"); case Protocol::CollectionChangeNotification::Move: return QStringLiteral("Move"); @@ -186,45 +185,45 @@ return QStringLiteral("Collections"); } case 2: - return QString::fromUtf8(msg.sessionId()); + return QString::fromUtf8(msg->sessionId()); case 3: - return QString::fromUtf8(msg.resource()); + return QString::fromUtf8(msg->resource()); case 4: - return QString::fromUtf8(msg.destinationResource()); + return QString::fromUtf8(msg->destinationResource()); case 5: - return QString::number(msg.parentCollection()); + return QString::number(msg->parentCollection()); case 6: - return QString::number(msg.parentDestCollection()); + return QString::number(msg->parentDestCollection()); case 7: - return QString::fromUtf8(Akonadi::ImapParser::join(msg.changedParts(), ", ")); + return QString::fromUtf8(Akonadi::ImapParser::join(msg->changedParts(), ", ")); default: return QString(); } } - Protocol::CollectionChangeNotification msg; + Protocol::CollectionChangeNotificationPtr msg; }; class NotificationModel::TagNotificationNode : public NotificationModel::Item { public: - TagNotificationNode(const Protocol::TagChangeNotification &msg, + TagNotificationNode(const Protocol::TagChangeNotificationPtr &msg, NotificationModel::Item *parent) : NotificationModel::Item(Protocol::Command::TagChangeNotification, parent) , msg(msg) { - nodes << new NotificationEntity(msg.id(), msg.remoteId(), QString(), + nodes << new NotificationEntity(msg->id(), msg->remoteId(), QString(), QString(), this); } ~TagNotificationNode() {} - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: { - switch (msg.operation()) { + switch (msg->operation()) { case Protocol::TagChangeNotification::Add: return QStringLiteral("Add"); case Protocol::TagChangeNotification::Modify: return QStringLiteral("Modify"); case Protocol::TagChangeNotification::Remove: return QStringLiteral("Delete"); @@ -235,21 +234,21 @@ return QStringLiteral("Tags"); } case 2: - return QString::fromUtf8(msg.sessionId()); + return QString::fromUtf8(msg->sessionId()); case 3: - return QString::fromUtf8(msg.resource()); + return QString::fromUtf8(msg->resource()); default: return QString(); } } - Protocol::TagChangeNotification msg; + Protocol::TagChangeNotificationPtr msg; }; class NotificationModel::RelationNotificationNode : public NotificationModel::Item { public: - RelationNotificationNode(const Protocol::RelationChangeNotification &msg, + RelationNotificationNode(const Protocol::RelationChangeNotificationPtr &msg, NotificationModel::Item *parent) : NotificationModel::Item(Protocol::Command::RelationChangeNotification, parent) , msg(msg) @@ -259,11 +258,11 @@ ~RelationNotificationNode() {} - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: { - switch (msg.operation()) { + switch (msg->operation()) { case Protocol::RelationChangeNotification::Add: return QStringLiteral("Add"); case Protocol::RelationChangeNotification::Remove: return QStringLiteral("Delete"); default: return QStringLiteral("Invalid"); @@ -273,25 +272,25 @@ return QStringLiteral("Relation"); } case 2: - return QString::fromUtf8(msg.sessionId()); + return QString::fromUtf8(msg->sessionId()); case 3: - return QString::number(msg.leftItem()); + return QString::number(msg->leftItem()); case 4: - return QString::number(msg.rightItem()); + return QString::number(msg->rightItem()); case 5: - return msg.remoteId(); + return msg->remoteId(); default: return QString(); } } - Protocol::RelationChangeNotification msg; + Protocol::RelationChangeNotificationPtr msg; }; class NotificationModel::SubscriptionNotificationNode : public NotificationModel::Item { public: - SubscriptionNotificationNode(const Protocol::SubscriptionChangeNotification &msg, + SubscriptionNotificationNode(const Protocol::SubscriptionChangeNotificationPtr &msg, NotificationModel::Item *parent) : NotificationModel::Item(Protocol::Command::SubscriptionChangeNotification, parent) , msg(msg) @@ -302,11 +301,11 @@ { } - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: { - switch (msg.operation()) { + switch (msg->operation()) { case Protocol::SubscriptionChangeNotification::Add: return QStringLiteral("Add"); case Protocol::SubscriptionChangeNotification::Modify: @@ -320,13 +319,13 @@ case 1: return QStringLiteral("Subscription"); case 2: - return msg.subscriber(); + return msg->subscriber(); default: return QString(); } } - Protocol::SubscriptionChangeNotification msg; + Protocol::SubscriptionChangeNotificationPtr msg; }; class NotificationModel::NotificationBlock: public NotificationModel::Item @@ -344,19 +343,19 @@ listeners = list.join(QStringLiteral(", ")); switch (msg.type()) { case Akonadi::ChangeNotification::Items: - nodes << new ItemNotificationNode(msg.notification(), this); + nodes << new ItemNotificationNode(msg.notification().staticCast<Protocol::ItemChangeNotification>(), this); break; case Akonadi::ChangeNotification::Collection: - nodes << new CollectionNotificationNode(msg.notification(), this); + nodes << new CollectionNotificationNode(msg.notification().staticCast<Protocol::CollectionChangeNotification>(), this); break; case Akonadi::ChangeNotification::Tag: - nodes << new TagNotificationNode(msg.notification(), this); + nodes << new TagNotificationNode(msg.notification().staticCast<Protocol::TagChangeNotification>(), this); break; case Akonadi::ChangeNotification::Relation: - nodes << new RelationNotificationNode(msg.notification(), this); + nodes << new RelationNotificationNode(msg.notification().staticCast<Protocol::RelationChangeNotification>(), this); break; case Akonadi::ChangeNotification::Subscription: - nodes << new SubscriptionNotificationNode(msg.notification(), this); + nodes << new SubscriptionNotificationNode(msg.notification().staticCast<Protocol::SubscriptionChangeNotification>(), this); break; default: qWarning() << "Unknown Notification type" << msg.type(); @@ -367,7 +366,7 @@ ~NotificationBlock() {} - QVariant data(int column) const Q_DECL_OVERRIDE + QVariant data(int column) const override { switch (column) { case 0: @@ -511,7 +510,7 @@ reset(); } -Protocol::ChangeNotification NotificationModel::notification(const QModelIndex &index) const +Protocol::ChangeNotificationPtr NotificationModel::notification(const QModelIndex &index) const { Item *item = static_cast<Item *>(index.internalPointer()); Q_ASSERT(item); @@ -527,7 +526,7 @@ case Protocol::Command::SubscriptionChangeNotification: return static_cast<SubscriptionNotificationNode *>(item)->msg; default: - return Protocol::ChangeNotification(); + return Protocol::ChangeNotificationPtr(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/notificationmodel.h new/akonadiconsole-17.08.0/src/notificationmodel.h --- old/akonadiconsole-17.04.3/src/notificationmodel.h 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/notificationmodel.h 2017-08-07 11:57:13.000000000 +0200 @@ -42,14 +42,14 @@ explicit NotificationModel(QObject *parent); ~NotificationModel(); - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - Akonadi::Protocol::ChangeNotification notification(const QModelIndex &index) const; + Akonadi::Protocol::ChangeNotificationPtr notification(const QModelIndex &index) const; bool isEnabled() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/querydebugger.cpp new/akonadiconsole-17.08.0/src/querydebugger.cpp --- old/akonadiconsole-17.04.3/src/querydebugger.cpp 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/querydebugger.cpp 2017-08-07 11:57:13.000000000 +0200 @@ -285,7 +285,7 @@ } } - int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE + int rowCount(const QModelIndex &parent) const override { if (!parent.isValid()) { return mConnections.count(); @@ -304,13 +304,13 @@ Q_UNREACHABLE(); } - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE + int columnCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent); return 5; } - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE + QModelIndex parent(const QModelIndex &child) const override { if (!child.isValid() || !child.internalPointer()) { return QModelIndex(); @@ -334,7 +334,7 @@ } } - QModelIndex index(int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE + QModelIndex index(int row, int column, const QModelIndex &parent) const override { if (!parent.isValid()) { if (row < mConnections.count()) { @@ -366,7 +366,7 @@ Q_UNREACHABLE(); } - QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE + QVariant headerData(int section, Qt::Orientation orientation, int role) const override { if (orientation != Qt::Horizontal || role != Qt::DisplayRole) { return QVariant(); @@ -383,7 +383,7 @@ return QVariant(); } - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE + QVariant data(const QModelIndex &index, int role) const override { if (!index.isValid()) { return QVariant(); @@ -546,7 +546,7 @@ NUM_COLUMNS }; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override { if (orientation == Qt::Vertical || section < 0 || section >= NUM_COLUMNS || (role != Qt::DisplayRole && role != Qt::ToolTipRole)) { return QVariant(); @@ -565,7 +565,7 @@ return QVariant(); } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { if (role != Qt::DisplayRole && role != Qt::ToolTipRole) { return QVariant(); @@ -601,7 +601,7 @@ return QVariant(); } - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE + int rowCount(const QModelIndex &parent = QModelIndex()) const override { if (!parent.isValid()) { return mQueries.size() + NUM_SPECIAL_ROWS; @@ -610,7 +610,7 @@ } } - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE + int columnCount(const QModelIndex &parent = QModelIndex()) const override { if (!parent.isValid()) { return NUM_COLUMNS; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.04.3/src/tagpropertiesdialog.cpp new/akonadiconsole-17.08.0/src/tagpropertiesdialog.cpp --- old/akonadiconsole-17.04.3/src/tagpropertiesdialog.cpp 2017-06-29 05:35:46.000000000 +0200 +++ new/akonadiconsole-17.08.0/src/tagpropertiesdialog.cpp 2017-08-07 11:57:13.000000000 +0200 @@ -19,7 +19,7 @@ #include "tagpropertiesdialog.h" #include "dbaccess.h" -#include "helper_p.h" + #include <AkonadiCore/AttributeFactory> #include <QSqlQuery>
