Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2022-12-09 16:58:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Fri Dec 9 16:58:19 2022 rev:76 rq:1041401 version:22.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2022-11-04 17:37:01.169454450 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.1835/akonadiconsole.changes 2022-12-09 16:58:20.083974822 +0100 @@ -1,0 +2,20 @@ +Fri Dec 2 12:24:25 UTC 2022 - Christophe Marin <[email protected]> + +- Update to 22.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.12.0/ + +------------------------------------------------------------------- +Sat Nov 26 16:44:02 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.11.90 + * New feature release + +------------------------------------------------------------------- +Sat Nov 12 08:53:15 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.11.80 + * New feature release + +------------------------------------------------------------------- Old: ---- akonadiconsole-22.08.3.tar.xz akonadiconsole-22.08.3.tar.xz.sig New: ---- akonadiconsole-22.12.0.tar.xz akonadiconsole-22.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.R3QX68/_old 2022-12-09 16:58:20.771978228 +0100 +++ /var/tmp/diff_new_pack.R3QX68/_new 2022-12-09 16:58:20.775978248 +0100 @@ -1,7 +1,7 @@ # # spec file for package akonadiconsole # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,15 @@ # -%define kf5_version 5.79.0 +%define kf5_version 5.99.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: akonadiconsole -Version: 22.08.3 +Version: 22.12.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later -Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} ++++++ akonadiconsole-22.08.3.tar.xz -> akonadiconsole-22.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/CMakeLists.txt new/akonadiconsole-22.12.0/CMakeLists.txt --- old/akonadiconsole-22.08.3/CMakeLists.txt 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/CMakeLists.txt 2022-11-27 09:30:07.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.21.3") +set(PIM_VERSION "5.22.0") project(akonadiconsole VERSION ${PIM_VERSION}) # Needs C++17 because Akonadi uses it and we link # against its private API -set(KF5_MIN_VERSION "5.95.0") +set(KF5_MIN_VERSION "5.99.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -40,23 +40,26 @@ if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() -set(RELEASE_SERVICE_VERSION "22.08.3") +set(RELEASE_SERVICE_VERSION "22.12.0") set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.21.3") -set(CALENDARSUPPORT_LIB_VERSION "5.21.3") -set(AKONADI_VERSION "5.21.3") -set(AKONADI_SEARCH_VERSION "5.21.3") +set(AKONADI_CONTACT_VERSION "5.22.0") +set(CALENDARSUPPORT_LIB_VERSION "5.22.0") +set(AKONADI_VERSION "5.22.0") +set(AKONADI_SEARCH_VERSION "5.22.0") set(QT_REQUIRED_VERSION "5.15.2") +if (QT_MAJOR_VERSION STREQUAL "6") + set(QT_REQUIRED_VERSION "6.4.0") +endif() find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION "5.21.3") -set(LIBKDEPIM_LIB_VERSION "5.21.3") -set(KMIME_LIB_VERSION "5.21.3") +set(MESSAGELIB_LIB_VERSION "5.22.0") +set(LIBKDEPIM_LIB_VERSION "5.22.0") +set(KMIME_LIB_VERSION "5.22.0") # Find KF5 package @@ -110,7 +113,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") endif() -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.96.0) +ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.99.0) include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/autotests/CMakeLists.txt new/akonadiconsole-22.12.0/autotests/CMakeLists.txt --- old/akonadiconsole-22.08.3/autotests/CMakeLists.txt 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/autotests/CMakeLists.txt 2022-11-27 09:30:07.000000000 +0100 @@ -2,14 +2,14 @@ macro(add_unittest _source) set(_test ${_source}) get_filename_component(_name ${_source} NAME_WE) - add_executable( ${_name} ${_test} ) - add_test(NAME ${_name} COMMAND ${_name} ) + add_executable( ${_name} ${_test} ${_name}.h) + 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} - Qt${QT_MAJOR_VERSION}::Test + Qt::Test KF5::I18n - Qt${QT_MAJOR_VERSION}::Widgets + Qt::Widgets KF5::ConfigCore KF5::WidgetsAddons KF5::ItemViews diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/autotests/jobtrackermodeltest.h new/akonadiconsole-22.12.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-22.08.3/autotests/jobtrackermodeltest.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/autotests/jobtrackermodeltest.h 2022-11-27 09:30:07.000000000 +0100 @@ -24,4 +24,3 @@ void shouldHandleReset(); void shouldHandleDuplicateJob(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-22.12.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-22.08.3/autotests/jobtrackersearchwidgettest.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/autotests/jobtrackersearchwidgettest.h 2022-11-27 09:30:07.000000000 +0100 @@ -20,4 +20,3 @@ void shouldEmitColumnChanged(); void shouldEmitSelectOnlyErrorChanged(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/autotests/jobtrackertest.h new/akonadiconsole-22.12.0/autotests/jobtrackertest.h --- old/akonadiconsole-22.08.3/autotests/jobtrackertest.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/autotests/jobtrackertest.h 2022-11-27 09:30:07.000000000 +0100 @@ -23,4 +23,3 @@ void shouldHandleJobStart(); void shouldHandleJobEnd(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/CMakeLists.txt new/akonadiconsole-22.12.0/src/CMakeLists.txt --- old/akonadiconsole-22.08.3/src/CMakeLists.txt 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/CMakeLists.txt 2022-11-27 09:30:07.000000000 +0100 @@ -146,7 +146,7 @@ KF5::Mime KF5::Contacts KF5::CalendarCore - Qt${QT_MAJOR_VERSION}::Sql + Qt::Sql KF5::Completion KF5::ItemViews KF5::TextWidgets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/agentconfigdialog.h new/akonadiconsole-22.12.0/src/agentconfigdialog.h --- old/akonadiconsole-22.08.3/src/agentconfigdialog.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/agentconfigdialog.h 2022-11-27 09:30:07.000000000 +0100 @@ -27,4 +27,3 @@ AgentConfigModel *const m_model; Akonadi::AgentInstance m_instance; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/agentconfigmodel.cpp new/akonadiconsole-22.12.0/src/agentconfigmodel.cpp --- old/akonadiconsole-22.08.3/src/agentconfigmodel.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/agentconfigmodel.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -12,7 +12,6 @@ AgentConfigModel::AgentConfigModel(QObject *parent) : QAbstractTableModel(parent) - , m_interface(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/agentconfigmodel.h new/akonadiconsole-22.12.0/src/agentconfigmodel.h --- old/akonadiconsole-22.08.3/src/agentconfigmodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/agentconfigmodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -36,4 +36,3 @@ QVector<QPair<QString, QVariant>> m_settings; QDBusInterface *m_interface = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/agentwidget.cpp new/akonadiconsole-22.12.0/src/agentwidget.cpp --- old/akonadiconsole-22.08.3/src/agentwidget.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/agentwidget.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -35,15 +35,16 @@ #include <QPushButton> #include <QResizeEvent> #include <QVBoxLayout> +#include <kwidgetsaddons_version.h> class TextDialog : public QDialog { public: explicit TextDialog(QWidget *parent = nullptr) : QDialog(parent) + , mText(new QPlainTextEdit(this)) { auto mainLayout = new QVBoxLayout(this); - mText = new QPlainTextEdit(this); mText->setReadOnly(true); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok, this); @@ -64,7 +65,7 @@ } private: - QPlainTextEdit *mText = nullptr; + QPlainTextEdit *const mText; }; using namespace Akonadi; @@ -194,7 +195,12 @@ { const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); if (!list.isEmpty()) { +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + if (KMessageBox::questionTwoActions( +#else if (KMessageBox::questionYesNo( + +#endif this, i18np("Do you really want to delete the selected agent instance?", "Do you really want to delete these %1 agent instances?", list.size()), list.size() == 1 ? QStringLiteral("Agent Deletion") : QStringLiteral("Multiple Agent Deletion"), @@ -202,7 +208,11 @@ KStandardGuiItem::cancel(), QString(), KMessageBox::Dangerous) +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + == KMessageBox::ButtonCode::PrimaryAction) { +#else == KMessageBox::Yes) { +#endif for (const AgentInstance &agent : list) { AgentManager::self()->removeInstance(agent); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/agentwidget.h new/akonadiconsole-22.12.0/src/agentwidget.h --- old/akonadiconsole-22.08.3/src/agentwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/agentwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -60,4 +60,3 @@ QMenu *mSyncMenu, *mConfigMenu; Akonadi::AgentInstance mCloneSource; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/akonadibrowsermodel.h new/akonadiconsole-22.12.0/src/akonadibrowsermodel.h --- old/akonadiconsole-22.08.3/src/akonadibrowsermodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/akonadibrowsermodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -58,6 +58,5 @@ bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: - AkonadiBrowserModel *mBrowserModel; + AkonadiBrowserModel *const mBrowserModel; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/browserwidget.cpp new/akonadiconsole-22.12.0/src/browserwidget.cpp --- old/akonadiconsole-22.08.3/src/browserwidget.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/browserwidget.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -59,8 +59,6 @@ #include <QFileDialog> #include <QMenu> #include <QSplitter> -#include <QSqlError> -#include <QSqlQuery> #include <QStandardItemModel> #include <QTimer> #include <QVBoxLayout> @@ -70,6 +68,7 @@ #include <Akonadi/ContactViewer> #include <CalendarSupport/IncidenceViewer> #include <MessageViewer/Viewer> +#include <kwidgetsaddons_version.h> #endif using namespace Akonadi; @@ -617,14 +616,23 @@ void BrowserWidget::removeTagRequested() { +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + if (KMessageBox::questionTwoActions(this, +#else if (KMessageBox::questionYesNo(this, - QStringLiteral("Do you really want to remove selected tag?"), - QStringLiteral("Delete tag?"), - KStandardGuiItem::del(), - KStandardGuiItem::cancel(), - QString(), - KMessageBox::Dangerous) + +#endif + QStringLiteral("Do you really want to remove selected tag?"), + QStringLiteral("Delete tag?"), + KStandardGuiItem::del(), + KStandardGuiItem::cancel(), + QString(), + KMessageBox::Dangerous) +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + == KMessageBox::ButtonCode::SecondaryAction) { +#else == KMessageBox::No) { +#endif return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/browserwidget.h new/akonadiconsole-22.12.0/src/browserwidget.h --- old/akonadiconsole-22.08.3/src/browserwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/browserwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -24,7 +24,8 @@ class AkonadiBrowserModel; -template<typename T> class KViewStateMaintainer; +template<typename T> +class KViewStateMaintainer; namespace Akonadi { @@ -108,4 +109,3 @@ CalendarSupport::IncidenceViewer *mIncidenceView = nullptr; MessageViewer::Viewer *mMailView = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/collectionaclpage.h new/akonadiconsole-22.12.0/src/collectionaclpage.h --- old/akonadiconsole-22.08.3/src/collectionaclpage.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/collectionaclpage.h 2022-11-27 09:30:07.000000000 +0100 @@ -22,4 +22,3 @@ private: Ui::CollectionAclPage ui; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/collectionattributespage.h new/akonadiconsole-22.12.0/src/collectionattributespage.h --- old/akonadiconsole-22.08.3/src/collectionattributespage.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/collectionattributespage.h 2022-11-27 09:30:07.000000000 +0100 @@ -33,4 +33,3 @@ QSet<QString> mDeleted; QSet<QString> mChanged; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/collectioninternalspage.h new/akonadiconsole-22.12.0/src/collectioninternalspage.h --- old/akonadiconsole-22.08.3/src/collectioninternalspage.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/collectioninternalspage.h 2022-11-27 09:30:07.000000000 +0100 @@ -22,4 +22,3 @@ private: Ui::CollectionInternalsPage ui; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/connectionpage.cpp new/akonadiconsole-22.12.0/src/connectionpage.cpp --- old/akonadiconsole-22.08.3/src/connectionpage.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/connectionpage.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -28,7 +28,6 @@ ConnectionPage::ConnectionPage(const QString &identifier, QWidget *parent) : QWidget(parent) , mIdentifier(identifier) - , mShowAllConnections(false) { auto layout = new QVBoxLayout(this); auto h = new QHBoxLayout; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/connectionpage.h new/akonadiconsole-22.12.0/src/connectionpage.h --- old/akonadiconsole-22.08.3/src/connectionpage.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/connectionpage.h 2022-11-27 09:30:07.000000000 +0100 @@ -47,7 +47,6 @@ DebugFilterModel *mFilterModel = nullptr; QTableView *mDataView = nullptr; KPIM::KCheckComboBox *mSenderFilter = nullptr; - QString mIdentifier; - bool mShowAllConnections; + const QString mIdentifier; + bool mShowAllConnections = false; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/dbbrowser.h new/akonadiconsole-22.12.0/src/dbbrowser.h --- old/akonadiconsole-22.08.3/src/dbbrowser.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/dbbrowser.h 2022-11-27 09:30:07.000000000 +0100 @@ -24,4 +24,3 @@ Ui::DbBrowser ui; QSqlTableModel *mTableModel = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/dbconsole.cpp new/akonadiconsole-22.12.0/src/dbconsole.cpp --- old/akonadiconsole-22.08.3/src/dbconsole.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/dbconsole.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -81,7 +81,6 @@ DbConsoleTab::DbConsoleTab(int index, QWidget *parent) : QWidget(parent) - , mQueryModel(nullptr) , mIndex(index) { ui.setupUi(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/dbconsole.h new/akonadiconsole-22.12.0/src/dbconsole.h --- old/akonadiconsole-22.08.3/src/dbconsole.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/dbconsole.h 2022-11-27 09:30:07.000000000 +0100 @@ -50,4 +50,3 @@ QSqlQueryModel *mQueryModel = nullptr; int mIndex; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/debugfiltermodel.h new/akonadiconsole-22.12.0/src/debugfiltermodel.h --- old/akonadiconsole-22.08.3/src/debugfiltermodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/debugfiltermodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -32,4 +32,3 @@ QSet<QString> mCheckedSenders; QTimer mInvalidateTimer; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/debugmodel.h new/akonadiconsole-22.12.0/src/debugmodel.h --- old/akonadiconsole-22.08.3/src/debugmodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/debugmodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -59,4 +59,3 @@ QStandardItemModel *mSenderFilterModel = nullptr; QMap<QString, QString> mSenderCache; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/debugwidget.cpp new/akonadiconsole-22.12.0/src/debugwidget.cpp --- old/akonadiconsole-22.08.3/src/debugwidget.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/debugwidget.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -28,6 +28,7 @@ : QWidget(parent) { auto layout = new QVBoxLayout(this); + layout->setContentsMargins({}); QString service = QStringLiteral("org.freedesktop.Akonadi"); if (Akonadi::ServerManager::hasInstanceIdentifier()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/debugwidget.h new/akonadiconsole-22.12.0/src/debugwidget.h --- old/akonadiconsole-22.08.3/src/debugwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/debugwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -10,7 +10,6 @@ #include "debuginterface.h" -#include <QHash> #include <QWidget> class KTextEdit; @@ -39,4 +38,3 @@ ConnectionPage *mConnectionPage = nullptr; org::freedesktop::Akonadi::DebugInterface *mDebugInterface = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/instanceselector.h new/akonadiconsole-22.12.0/src/instanceselector.h --- old/akonadiconsole-22.08.3/src/instanceselector.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/instanceselector.h 2022-11-27 09:30:07.000000000 +0100 @@ -37,8 +37,7 @@ private: QScopedPointer<Ui::InstanceSelector> ui; - QString m_remoteHost; + const QString m_remoteHost; QString m_instance; MainWindow *mWindow = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/jobtracker.h new/akonadiconsole-22.12.0/src/jobtracker.h --- old/akonadiconsole-22.08.3/src/jobtracker.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/jobtracker.h 2022-11-27 09:30:07.000000000 +0100 @@ -114,4 +114,3 @@ private: std::unique_ptr<JobTrackerPrivate> const d; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-22.12.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-22.08.3/src/jobtrackerfilterproxymodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/jobtrackerfilterproxymodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -26,4 +26,3 @@ int mSearchColumn = -1; bool mShowOnlyFailed = false; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/jobtrackermodel.h new/akonadiconsole-22.12.0/src/jobtrackermodel.h --- old/akonadiconsole-22.08.3/src/jobtrackermodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/jobtrackermodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -60,4 +60,3 @@ private: std::unique_ptr<JobTrackerModelPrivate> const d; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/jobtrackersearchwidget.cpp new/akonadiconsole-22.12.0/src/jobtrackersearchwidget.cpp --- old/akonadiconsole-22.08.3/src/jobtrackersearchwidget.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/jobtrackersearchwidget.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -13,24 +13,24 @@ JobTrackerSearchWidget::JobTrackerSearchWidget(QWidget *parent) : QWidget(parent) + , mSearchLineEdit(new QLineEdit(this)) + , mSelectColumn(new QComboBox(this)) + , mSelectOnlyError(new QCheckBox(QStringLiteral("Show Only Errors"), this)) { auto mainLayout = new QHBoxLayout(this); mainLayout->setObjectName(QStringLiteral("mainlayout")); mainLayout->setContentsMargins(0, 0, 0, 0); - mSearchLineEdit = new QLineEdit(this); mSearchLineEdit->setObjectName(QStringLiteral("searchline")); mSearchLineEdit->setClearButtonEnabled(true); mSearchLineEdit->setPlaceholderText(QStringLiteral("Search...")); mainLayout->addWidget(mSearchLineEdit); connect(mSearchLineEdit, &QLineEdit::textChanged, this, &JobTrackerSearchWidget::searchTextChanged); - mSelectOnlyError = new QCheckBox(QStringLiteral("Show Only Errors"), this); mSelectOnlyError->setObjectName(QStringLiteral("selectonlyerror")); mainLayout->addWidget(mSelectOnlyError); connect(mSelectOnlyError, &QCheckBox::toggled, this, &JobTrackerSearchWidget::selectOnlyErrorChanged); - mSelectColumn = new QComboBox(this); mSelectColumn->setObjectName(QStringLiteral("selectcolumn")); mainLayout->addWidget(mSelectColumn); mSelectColumn->addItem(QStringLiteral("All Columns"), -1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/jobtrackersearchwidget.h new/akonadiconsole-22.12.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-22.08.3/src/jobtrackersearchwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/jobtrackersearchwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -29,8 +29,7 @@ void slotColumnChanged(int index); private: - QLineEdit *mSearchLineEdit = nullptr; - QComboBox *mSelectColumn = nullptr; - QCheckBox *mSelectOnlyError = nullptr; + QLineEdit *const mSearchLineEdit; + QComboBox *const mSelectColumn; + QCheckBox *const mSelectOnlyError; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/jobtrackerwidget.h new/akonadiconsole-22.12.0/src/jobtrackerwidget.h --- old/akonadiconsole-22.08.3/src/jobtrackerwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/jobtrackerwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -39,4 +39,3 @@ private: std::unique_ptr<JobTrackerWidgetPrivate> const d; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/logging.cpp new/akonadiconsole-22.12.0/src/logging.cpp --- old/akonadiconsole-22.08.3/src/logging.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/logging.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -39,7 +39,7 @@ auto l = new QVBoxLayout(this); setLayout(l); - mEnabledCheckbox = new QCheckBox(QStringLiteral("Enable")); + mEnabledCheckbox = new QCheckBox(QStringLiteral("Enable"), this); connect(mEnabledCheckbox, &QCheckBox::toggled, this, [this](bool toggled) { Q_EMIT enabledChanged(toggled); }); @@ -48,10 +48,10 @@ auto h = new QHBoxLayout; l->addLayout(h); - h->addWidget(new QLabel(QStringLiteral("Programs:"))); + h->addWidget(new QLabel(QStringLiteral("Programs:"), this)); h->addWidget(mAppFilter = new KCheckComboBox()); h->setStretchFactor(mAppFilter, 2); - h->addWidget(new QLabel(QStringLiteral("Types:"))); + h->addWidget(new QLabel(QStringLiteral("Types:"), this)); h->addWidget(mTypeFilter = new KCheckComboBox()); h->setStretchFactor(mTypeFilter, 2); mTypeFilter->addItem(QStringLiteral("Debug"), QtDebugMsg); @@ -85,7 +85,7 @@ h = new QHBoxLayout; l->addLayout(h); - auto btn = new QPushButton(QStringLiteral("Save to File...")); + auto btn = new QPushButton(QStringLiteral("Save to File..."), this); connect(btn, &QPushButton::clicked, this, &Logging::saveToFile); h->addWidget(btn); h->addStretch(1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/logging.h new/akonadiconsole-22.12.0/src/logging.h --- old/akonadiconsole-22.08.3/src/logging.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/logging.h 2022-11-27 09:30:07.000000000 +0100 @@ -53,4 +53,3 @@ QTreeView *mView = nullptr; LoggingModel *mModel = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/loggingfiltermodel.h new/akonadiconsole-22.12.0/src/loggingfiltermodel.h --- old/akonadiconsole-22.08.3/src/loggingfiltermodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/loggingfiltermodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -38,4 +38,3 @@ QSet<QtMsgType> mCheckedTypes; QTimer mInvalidateTimer; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/loggingmodel.h new/akonadiconsole-22.12.0/src/loggingmodel.h --- old/akonadiconsole-22.08.3/src/loggingmodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/loggingmodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -77,4 +77,3 @@ QSet<QString> mFileCache; QSet<QString> mFunctionCache; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/main.cpp new/akonadiconsole-22.12.0/src/main.cpp --- old/akonadiconsole-22.08.3/src/main.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/main.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -52,9 +52,10 @@ KCrash::initialize(); QCommandLineParser parser; aboutData.setupCommandLine(&parser); - parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("remote"), - QStringLiteral("Connect to an Akonadi remote debugging server"), - QStringLiteral("server"))); + const QCommandLineOption remoteOption = QCommandLineOption(QStringList() << QStringLiteral("remote"), + QStringLiteral("Connect to an Akonadi remote debugging server"), + QStringLiteral("server")); + parser.addOption(remoteOption); parser.process(app); aboutData.processCommandLine(&parser); @@ -65,14 +66,14 @@ qDBusRegisterMetaType<QVector<qint64>>(); qDBusRegisterMetaType<QVector<QByteArray>>(); - if (parser.isSet(QStringLiteral("remote"))) { + if (parser.isSet(remoteOption)) { const QString akonadiAddr = QStringLiteral("tcp:host=%1,port=31415").arg(parser.value(QStringLiteral("remote"))); const QString dbusAddr = QStringLiteral("tcp:host=%1,port=31416").arg(parser.value(QStringLiteral("remote"))); qputenv("AKONADI_SERVER_ADDRESS", akonadiAddr.toLatin1()); qputenv("DBUS_SESSION_BUS_ADDRESS", dbusAddr.toLatin1()); } - InstanceSelector instanceSelector(parser.isSet(QStringLiteral("remote")) ? parser.value(QStringLiteral("remote")) : QString()); + InstanceSelector instanceSelector(parser.isSet(remoteOption) ? parser.value(remoteOption) : QString()); return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/mainwidget.h new/akonadiconsole-22.12.0/src/mainwidget.h --- old/akonadiconsole-22.08.3/src/mainwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/mainwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -30,4 +30,3 @@ private: BrowserWidget *mBrowser = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/mainwindow.cpp new/akonadiconsole-22.12.0/src/mainwindow.cpp --- old/akonadiconsole-22.08.3/src/mainwindow.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/mainwindow.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -20,8 +20,8 @@ MainWindow::MainWindow(QWidget *parent) : KXmlGuiWindow(parent) + , mMain(new MainWidget(this)) { - mMain = new MainWidget(this); setCentralWidget(mMain); KStandardAction::quit(qApp, &QApplication::quit, actionCollection()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/mainwindow.h new/akonadiconsole-22.12.0/src/mainwindow.h --- old/akonadiconsole-22.08.3/src/mainwindow.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/mainwindow.h 2022-11-27 09:30:07.000000000 +0100 @@ -24,6 +24,5 @@ void closeEvent(QCloseEvent *event) override; private: - MainWidget *mMain; + MainWidget *const mMain; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/metatypes.h new/akonadiconsole-22.12.0/src/metatypes.h --- old/akonadiconsole-22.08.3/src/metatypes.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/metatypes.h 2022-11-27 09:30:07.000000000 +0100 @@ -12,4 +12,3 @@ Q_DECLARE_METATYPE(QList<QByteArray>) Q_DECLARE_METATYPE(QList<long long>) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/monitorsmodel.h new/akonadiconsole-22.12.0/src/monitorsmodel.h --- old/akonadiconsole-22.08.3/src/monitorsmodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/monitorsmodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -49,4 +49,3 @@ QHash<QByteArray /* session */, QVector<Akonadi::NotificationSubscriber>> mData; Akonadi::Monitor *mMonitor; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/monitorswidget.cpp new/akonadiconsole-22.12.0/src/monitorswidget.cpp --- old/akonadiconsole-22.08.3/src/monitorswidget.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/monitorswidget.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -27,9 +27,8 @@ MonitorsWidget::MonitorsWidget(QWidget *parent) : QWidget(parent) + , mModel(new MonitorsModel(this)) { - mModel = new MonitorsModel(this); - auto layout = new QHBoxLayout(this); mTreeView = new QTreeView(this); @@ -67,7 +66,8 @@ } // Specialization of function template from utils.h -template<> QString toString(const QSet<Akonadi::Monitor::Type> &set) +template<> +QString toString(const QSet<Akonadi::Monitor::Type> &set) { QStringList rv; for (const auto &v : set) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/monitorswidget.h new/akonadiconsole-22.12.0/src/monitorswidget.h --- old/akonadiconsole-22.08.3/src/monitorswidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/monitorswidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -36,6 +36,5 @@ private: QTreeView *mTreeView = nullptr; QTreeView *mSubscriberView = nullptr; - MonitorsModel *mModel = nullptr; + MonitorsModel *const mModel; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/notificationfiltermodel.h new/akonadiconsole-22.12.0/src/notificationfiltermodel.h --- old/akonadiconsole-22.08.3/src/notificationfiltermodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/notificationfiltermodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -45,4 +45,3 @@ QSet<QString> mTypes; QTimer mInvalidateTimer; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/notificationmodel.cpp new/akonadiconsole-22.12.0/src/notificationmodel.cpp --- old/akonadiconsole-22.08.3/src/notificationmodel.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/notificationmodel.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -6,7 +6,6 @@ #include "notificationmodel.h" - #include "akonadiconsole_debug.h" #include <Akonadi/ServerManager> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/notificationmodel.h new/akonadiconsole-22.12.0/src/notificationmodel.h --- old/akonadiconsole-22.08.3/src/notificationmodel.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/notificationmodel.h 2022-11-27 09:30:07.000000000 +0100 @@ -64,4 +64,3 @@ Akonadi::Monitor *m_monitor = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/notificationmonitor.h new/akonadiconsole-22.12.0/src/notificationmonitor.h --- old/akonadiconsole-22.08.3/src/notificationmonitor.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/notificationmonitor.h 2022-11-27 09:30:07.000000000 +0100 @@ -56,4 +56,3 @@ KPIM::KCheckComboBox *mTypeFilterCombo = nullptr; NotificationFilterModel *m_filterModel = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-22.12.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-22.08.3/src/org.kde.akonadiconsole.desktop 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/org.kde.akonadiconsole.desktop 2022-11-27 09:30:07.000000000 +0100 @@ -1,7 +1,6 @@ [Desktop Entry] Name=Akonadi Console Name[ar]=٠عراض Ø£ÙÙÙاد٠-Name[ast]=Consola d'Akonadi Name[az]=Akonadi Konsolu Name[bg]=Ðконади конзола Name[ca]=Consola de l'Akonadi @@ -48,7 +47,6 @@ Type=Application Comment=Akonadi Management and Debugging Console Comment[ar]=٠عراض Ùإدارة ÙتÙÙÙØ Â«Ø£ÙÙÙادÙ» -Comment[ast]=Consola de xestión y depuración d'Akonadi Comment[az]=Akonadi Ä°darÉetmÉ vÉ XÉta Sazlama Konsolu Comment[bg]=Ðонзола за ÑпÑавление и оÑÑÑÑанÑване на гÑеÑки на Akonadi Comment[ca]=Consola de gestió i depuració per a l'Akonadi @@ -90,7 +88,6 @@ Comment[x-test]=xxAkonadi Management and Debugging Consolexx Comment[zh_CN]=ç¨äºç®¡çåè°è¯ Akonadi çæ§å¶å° Comment[zh_TW]=Akonadi 管çèåµé¯æ§å¶å° -Terminal=false Categories=Qt;KDE;Development; X-DBUS-ServiceName=org.kde.akonadiconsole X-AppStream-Ignore=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/querydebugger.h new/akonadiconsole-22.12.0/src/querydebugger.h --- old/akonadiconsole-22.08.3/src/querydebugger.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/querydebugger.h 2022-11-27 09:30:07.000000000 +0100 @@ -69,4 +69,3 @@ QueryDebuggerModel *mQueryList = nullptr; QueryTreeModel *mQueryTree = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/searchwidget.cpp new/akonadiconsole-22.12.0/src/searchwidget.cpp --- old/akonadiconsole-22.08.3/src/searchwidget.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/searchwidget.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -41,14 +41,16 @@ Akonadi::ControlGui::widgetNeedsAkonadi(this); auto layout = new QVBoxLayout(this); + layout->setContentsMargins({}); auto hbox = new QHBoxLayout; - hbox->addWidget(new QLabel(QStringLiteral("Search store:")), 0, {}); - mStoreCombo = new KComboBox; + + hbox->addWidget(new QLabel(QStringLiteral("Search store:"), this)); + mStoreCombo = new KComboBox(this); mStoreCombo->setObjectName(QStringLiteral("SearchStoreCombo")); hbox->addWidget(mStoreCombo); hbox->addStretch(); - auto button = new QPushButton(QStringLiteral("Search")); + auto button = new QPushButton(QStringLiteral("Search"), this); hbox->addWidget(button); layout->addLayout(hbox); @@ -56,7 +58,7 @@ mVSplitter->setObjectName(QStringLiteral("SearchVSplitter")); auto w = new QWidget; auto vbox = new QVBoxLayout(w); - vbox->addWidget(new QLabel(QStringLiteral("Search query:"))); + vbox->addWidget(new QLabel(QStringLiteral("Search query:"), this)); mQueryWidget = new QPlainTextEdit; vbox->addWidget(mQueryWidget); mVSplitter->addWidget(w); @@ -65,8 +67,8 @@ mHSplitter->setObjectName(QStringLiteral("SearchHSplitter")); w = new QWidget; vbox = new QVBoxLayout(w); - vbox->addWidget(new QLabel(QStringLiteral("Results (Documents):"))); - mDatabaseView = new QListView; + vbox->addWidget(new QLabel(QStringLiteral("Results (Documents):"), this)); + mDatabaseView = new QListView(this); mDatabaseView->setEditTriggers(QListView::NoEditTriggers); mDocumentModel = new QStandardItemModel(this); mDatabaseView->setModel(mDocumentModel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/searchwidget.h new/akonadiconsole-22.12.0/src/searchwidget.h --- old/akonadiconsole-22.08.3/src/searchwidget.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/searchwidget.h 2022-11-27 09:30:07.000000000 +0100 @@ -56,4 +56,3 @@ Xapian::Database *mDatabase = nullptr; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/tagpropertiesdialog.h new/akonadiconsole-22.12.0/src/tagpropertiesdialog.h --- old/akonadiconsole-22.08.3/src/tagpropertiesdialog.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/tagpropertiesdialog.h 2022-11-27 09:30:07.000000000 +0100 @@ -53,4 +53,3 @@ QSet<QString> mChangedRIDs; QSet<QString> mRemovedRIDs; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/uistatesaver.cpp new/akonadiconsole-22.12.0/src/uistatesaver.cpp --- old/akonadiconsole-22.08.3/src/uistatesaver.cpp 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/uistatesaver.cpp 2022-11-27 09:30:07.000000000 +0100 @@ -84,7 +84,8 @@ } \ } -template<typename Op, typename Config> static void processWidgets(QWidget *widget, Config config) +template<typename Op, typename Config> +static void processWidgets(QWidget *widget, Config config) { QList<QWidget *> widgets = widget->findChildren<QWidget *>(); widgets << widget; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/uistatesaver.h new/akonadiconsole-22.12.0/src/uistatesaver.h --- old/akonadiconsole-22.08.3/src/uistatesaver.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/uistatesaver.h 2022-11-27 09:30:07.000000000 +0100 @@ -46,4 +46,3 @@ void restoreState(QWidget *widget, const KConfigGroup &config); } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-22.08.3/src/utils.h new/akonadiconsole-22.12.0/src/utils.h --- old/akonadiconsole-22.08.3/src/utils.h 2022-10-14 06:50:26.000000000 +0200 +++ new/akonadiconsole-22.12.0/src/utils.h 2022-11-27 09:30:07.000000000 +0100 @@ -12,7 +12,8 @@ #include <akonadi/private/protocol_p.h> -template<typename T> typename std::enable_if<std::is_integral<T>::value, QString>::type toString(T num) +template<typename T> +typename std::enable_if<std::is_integral<T>::value, QString>::type toString(T num) { return QString::number(num); } @@ -50,7 +51,8 @@ return {}; } -template<typename T, template<typename> class Container> QString toString(const Container<T> &set) +template<typename T, template<typename> class Container> +QString toString(const Container<T> &set) { QStringList rv; for (const auto &v : set) { @@ -72,4 +74,3 @@ item->setToolTip(value); parent->appendRow({new QStandardItem(name), item}); } -
