Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2021-06-16 20:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Wed Jun 16 20:34:01 2021 rev:92 rq:899745 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2021-05-10 15:37:17.494060702 +0200 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.32437/kitemmodels.changes 2021-06-16 20:35:38.007201327 +0200 @@ -1,0 +2,11 @@ +Sat Jun 5 11:58:58 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * Bump required CMake version to 3.16 + * KBreadcrumbSelectionModel: use PMF connect() signal/slot syntax + +------------------------------------------------------------------- Old: ---- kitemmodels-5.82.0.tar.xz kitemmodels-5.82.0.tar.xz.sig New: ---- kitemmodels-5.83.0.tar.xz kitemmodels-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.GOvUBO/_old 2021-06-16 20:35:38.599202336 +0200 +++ /var/tmp/diff_new_pack.GOvUBO/_new 2021-06-16 20:35:38.599202336 +0200 @@ -17,7 +17,7 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.82 +%define _tar_path 5.83 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -26,7 +26,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kitemmodels -Version: 5.82.0 +Version: 5.83.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later ++++++ kitemmodels-5.82.0.tar.xz -> kitemmodels-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/.gitignore new/kitemmodels-5.83.0/.gitignore --- old/kitemmodels-5.82.0/.gitignore 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/.gitignore 2021-06-05 10:56:08.000000000 +0200 @@ -25,3 +25,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/CMakeLists.txt new/kitemmodels-5.83.0/CMakeLists.txt --- old/kitemmodels-5.82.0/CMakeLists.txt 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/CMakeLists.txt 2021-06-05 10:56:08.000000000 +0200 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts project(KItemModels VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -40,8 +40,7 @@ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemModelsConfigVersion.cmake" SOVERSION 5) -add_definitions(-DQT_NO_KEYWORDS) -add_definitions(-DQT_NO_FOREACH) + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_subdirectory(src) if (BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/autotests/bihash/CMakeLists.txt new/kitemmodels-5.83.0/autotests/bihash/CMakeLists.txt --- old/kitemmodels-5.82.0/autotests/bihash/CMakeLists.txt 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/autotests/bihash/CMakeLists.txt 2021-06-05 10:56:08.000000000 +0200 @@ -1,7 +1,5 @@ project(bihash_test) -cmake_minimum_required(VERSION 2.8.12) - include_directories("../../src/core") # for kbihash_p.h set(functionalitytest_srcs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/autotests/proxymodeltestsuite/CMakeLists.txt new/kitemmodels-5.83.0/autotests/proxymodeltestsuite/CMakeLists.txt --- old/kitemmodels-5.82.0/autotests/proxymodeltestsuite/CMakeLists.txt 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/autotests/proxymodeltestsuite/CMakeLists.txt 2021-06-05 10:56:08.000000000 +0200 @@ -15,7 +15,7 @@ eventlogger.qrc ) -qt5_add_resources( +qt_add_resources( eventlogger_RCS_SRCS ${eventlogger_RCSS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/CMakeLists.txt new/kitemmodels-5.83.0/src/core/CMakeLists.txt --- old/kitemmodels-5.82.0/src/core/CMakeLists.txt 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/CMakeLists.txt 2021-06-05 10:56:08.000000000 +0200 @@ -38,7 +38,7 @@ target_link_libraries(KF5ItemModels PUBLIC Qt5::Core) -set_target_properties(KF5ItemModels PROPERTIES VERSION ${KITEMMODELS_VERSION_STRING} +set_target_properties(KF5ItemModels PROPERTIES VERSION ${KITEMMODELS_VERSION} SOVERSION ${KITEMMODELS_SOVERSION} EXPORT_NAME ItemModels ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/kbreadcrumbselectionmodel.cpp new/kitemmodels-5.83.0/src/core/kbreadcrumbselectionmodel.cpp --- old/kitemmodels-5.82.0/src/core/kbreadcrumbselectionmodel.cpp 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/kbreadcrumbselectionmodel.cpp 2021-06-05 10:56:08.000000000 +0200 @@ -15,16 +15,7 @@ public: KBreadcrumbSelectionModelPrivate(KBreadcrumbSelectionModel *breadcrumbSelector, QItemSelectionModel *selectionModel, - KBreadcrumbSelectionModel::BreadcrumbTarget direction) - : q_ptr(breadcrumbSelector) - , m_includeActualSelection(true) - , m_selectionDepth(-1) - , m_showHiddenAscendantData(false) - , m_selectionModel(selectionModel) - , m_direction(direction) - , m_ignoreCurrentChanged(false) - { - } + KBreadcrumbSelectionModel::BreadcrumbTarget direction); /** Returns a selection containing the breadcrumbs for @p index @@ -38,32 +29,54 @@ void sourceSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected); - void init(); void syncBreadcrumbs(); - bool m_includeActualSelection; - int m_selectionDepth; - bool m_showHiddenAscendantData; - QItemSelectionModel *m_selectionModel; - KBreadcrumbSelectionModel::BreadcrumbTarget m_direction; - bool m_ignoreCurrentChanged; + bool m_includeActualSelection = true; + bool m_showHiddenAscendantData = false; + bool m_ignoreCurrentChanged = false; + int m_selectionDepth = -1; + KBreadcrumbSelectionModel::BreadcrumbTarget m_direction = KBreadcrumbSelectionModel::MakeBreadcrumbSelectionInSelf; + QItemSelectionModel *m_selectionModel = nullptr; }; +KBreadcrumbSelectionModelPrivate::KBreadcrumbSelectionModelPrivate(KBreadcrumbSelectionModel *breadcrumbSelector, + QItemSelectionModel *selectionModel, + KBreadcrumbSelectionModel::BreadcrumbTarget direction) + : q_ptr(breadcrumbSelector) + , m_direction(direction) + , m_selectionModel(selectionModel) +{ + Q_Q(KBreadcrumbSelectionModel); + + if (direction != KBreadcrumbSelectionModel::MakeBreadcrumbSelectionInSelf) { + q->connect(selectionModel, &QItemSelectionModel::selectionChanged, q, [this](const QItemSelection &selected, const QItemSelection &deselected) { + sourceSelectionChanged(selected, deselected); + }); + } + + q->connect(m_selectionModel->model(), &QAbstractItemModel::layoutChanged, q, [this]() { + syncBreadcrumbs(); + }); + q->connect(m_selectionModel->model(), &QAbstractItemModel::modelReset, q, [this]() { + syncBreadcrumbs(); + }); + q->connect(m_selectionModel->model(), &QAbstractItemModel::rowsMoved, q, [this]() { + syncBreadcrumbs(); + }); + + // Don't need to handle insert & remove because they can't change the breadcrumbs on their own. +} + KBreadcrumbSelectionModel::KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, QObject *parent) : QItemSelectionModel(const_cast<QAbstractItemModel *>(selectionModel->model()), parent) , d_ptr(new KBreadcrumbSelectionModelPrivate(this, selectionModel, MakeBreadcrumbSelectionInSelf)) { - d_ptr->init(); } KBreadcrumbSelectionModel::KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, BreadcrumbTarget direction, QObject *parent) : QItemSelectionModel(const_cast<QAbstractItemModel *>(selectionModel->model()), parent) , d_ptr(new KBreadcrumbSelectionModelPrivate(this, selectionModel, direction)) { - if (direction != MakeBreadcrumbSelectionInSelf) - connect(selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(sourceSelectionChanged(QItemSelection, QItemSelection))); - - d_ptr->init(); } KBreadcrumbSelectionModel::~KBreadcrumbSelectionModel() = default; @@ -200,15 +213,6 @@ } } -void KBreadcrumbSelectionModelPrivate::init() -{ - Q_Q(KBreadcrumbSelectionModel); - q->connect(m_selectionModel->model(), SIGNAL(layoutChanged()), SLOT(syncBreadcrumbs())); - q->connect(m_selectionModel->model(), SIGNAL(modelReset()), SLOT(syncBreadcrumbs())); - q->connect(m_selectionModel->model(), SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), SLOT(syncBreadcrumbs())); - // Don't need to handle insert & remove because they can't change the breadcrumbs on their own. -} - void KBreadcrumbSelectionModelPrivate::syncBreadcrumbs() { Q_Q(KBreadcrumbSelectionModel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/kbreadcrumbselectionmodel.h new/kitemmodels-5.83.0/src/core/kbreadcrumbselectionmodel.h --- old/kitemmodels-5.82.0/src/core/kbreadcrumbselectionmodel.h 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/kbreadcrumbselectionmodel.h 2021-06-05 10:56:08.000000000 +0200 @@ -141,8 +141,6 @@ private: //@cond PRIVATE Q_DECLARE_PRIVATE(KBreadcrumbSelectionModel) - Q_PRIVATE_SLOT(d_func(), void sourceSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)) - Q_PRIVATE_SLOT(d_func(), void syncBreadcrumbs()) //@cond PRIVATE }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/kcheckableproxymodel.cpp new/kitemmodels-5.83.0/src/core/kcheckableproxymodel.cpp --- old/kitemmodels-5.82.0/src/core/kcheckableproxymodel.cpp 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/kcheckableproxymodel.cpp 2021-06-05 10:56:08.000000000 +0200 @@ -36,7 +36,9 @@ Q_D(KCheckableProxyModel); d->m_itemSelectionModel = itemSelectionModel; Q_ASSERT(sourceModel() ? d->m_itemSelectionModel->model() == sourceModel() : true); - connect(itemSelectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(selectionChanged(QItemSelection, QItemSelection))); + connect(itemSelectionModel, &QItemSelectionModel::selectionChanged, this, [d](const QItemSelection &selected, const QItemSelection &deselected) { + d->selectionChanged(selected, deselected); + }); } QItemSelectionModel *KCheckableProxyModel::selectionModel() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/kdescendantsproxymodel.cpp new/kitemmodels-5.83.0/src/core/kdescendantsproxymodel.cpp --- old/kitemmodels-5.82.0/src/core/kdescendantsproxymodel.cpp 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/kdescendantsproxymodel.cpp 2021-06-05 10:56:08.000000000 +0200 @@ -407,44 +407,67 @@ beginResetModel(); - static const char *const modelSignals[] = {SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), - SIGNAL(rowsInserted(QModelIndex, int, int)), - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), - SIGNAL(rowsRemoved(QModelIndex, int, int)), - SIGNAL(rowsAboutToBeMoved(QModelIndex, int, int, QModelIndex, int)), - SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), - SIGNAL(modelAboutToBeReset()), - SIGNAL(modelReset()), - SIGNAL(dataChanged(QModelIndex, QModelIndex)), - SIGNAL(layoutAboutToBeChanged()), - SIGNAL(layoutChanged()), - SIGNAL(destroyed())}; - static const char *const proxySlots[] = {SLOT(sourceRowsAboutToBeInserted(QModelIndex, int, int)), - SLOT(sourceRowsInserted(QModelIndex, int, int)), - SLOT(sourceRowsAboutToBeRemoved(QModelIndex, int, int)), - SLOT(sourceRowsRemoved(QModelIndex, int, int)), - SLOT(sourceRowsAboutToBeMoved(QModelIndex, int, int, QModelIndex, int)), - SLOT(sourceRowsMoved(QModelIndex, int, int, QModelIndex, int)), - SLOT(sourceModelAboutToBeReset()), - SLOT(sourceModelReset()), - SLOT(sourceDataChanged(QModelIndex, QModelIndex)), - SLOT(sourceLayoutAboutToBeChanged()), - SLOT(sourceLayoutChanged()), - SLOT(sourceModelDestroyed())}; - if (sourceModel()) { - for (int i = 0; i < int(sizeof modelSignals / sizeof *modelSignals); ++i) { - disconnect(sourceModel(), modelSignals[i], this, proxySlots[i]); - } + disconnect(sourceModel(), nullptr, this, nullptr); } QAbstractProxyModel::setSourceModel(_sourceModel); d_ptr->m_expandedSourceIndexes.clear(); if (_sourceModel) { - for (int i = 0; i < int(sizeof modelSignals / sizeof *modelSignals); ++i) { - connect(_sourceModel, modelSignals[i], this, proxySlots[i]); - } + connect(_sourceModel, &QAbstractItemModel::rowsAboutToBeInserted, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsAboutToBeInserted(parent, start, end); + }); + + connect(_sourceModel, &QAbstractItemModel::rowsInserted, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsInserted(parent, start, end); + }); + + connect(_sourceModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsAboutToBeRemoved(parent, start, end); + }); + + connect(_sourceModel, &QAbstractItemModel::rowsRemoved, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsRemoved(parent, start, end); + }); + + connect(_sourceModel, + &QAbstractItemModel::rowsAboutToBeMoved, + this, + [d](const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destStart) { + d->sourceRowsAboutToBeMoved(srcParent, srcStart, srcEnd, destParent, destStart); + }); + + connect(_sourceModel, + &QAbstractItemModel::rowsMoved, + this, + [d](const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destStart) { + d->sourceRowsMoved(srcParent, srcStart, srcEnd, destParent, destStart); + }); + + connect(_sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, [d]() { + d->sourceModelAboutToBeReset(); + }); + + connect(_sourceModel, &QAbstractItemModel::modelReset, this, [d]() { + d->sourceModelReset(); + }); + + connect(_sourceModel, &QAbstractItemModel::dataChanged, this, [d](const QModelIndex &topLeft, const QModelIndex &bottomRight) { + d->sourceDataChanged(topLeft, bottomRight); + }); + + connect(_sourceModel, &QAbstractItemModel::layoutAboutToBeChanged, this, [d]() { + d->sourceLayoutAboutToBeChanged(); + }); + + connect(_sourceModel, &QAbstractItemModel::layoutChanged, this, [d]() { + d->sourceLayoutChanged(); + }); + + connect(_sourceModel, &QObject::destroyed, this, [d]() { + d->sourceModelDestroyed(); + }); } resetInternalData(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/klinkitemselectionmodel.cpp new/kitemmodels-5.83.0/src/core/klinkitemselectionmodel.cpp --- old/kitemmodels-5.82.0/src/core/klinkitemselectionmodel.cpp 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/klinkitemselectionmodel.cpp 2021-06-05 10:56:08.000000000 +0200 @@ -96,9 +96,14 @@ if (d->m_linkedItemSelectionModel) { connect(d->m_linkedItemSelectionModel, - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - SLOT(sourceSelectionChanged(QItemSelection, QItemSelection))); - connect(d->m_linkedItemSelectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(sourceCurrentChanged(QModelIndex))); + &QItemSelectionModel::selectionChanged, + this, + [d](const QItemSelection &selected, const QItemSelection &deselected) { + d->sourceSelectionChanged(selected, deselected); + }); + connect(d->m_linkedItemSelectionModel, &QItemSelectionModel::currentChanged, this, [d](const QModelIndex ¤t) { + d->sourceCurrentChanged(current); + }); connect(d->m_linkedItemSelectionModel, &QItemSelectionModel::modelChanged, this, [this] { d_ptr->reinitializeIndexMapper(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/core/kselectionproxymodel.cpp new/kitemmodels-5.83.0/src/core/kselectionproxymodel.cpp --- old/kitemmodels-5.82.0/src/core/kselectionproxymodel.cpp 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/core/kselectionproxymodel.cpp 2021-06-05 10:56:08.000000000 +0200 @@ -2087,35 +2087,8 @@ beginResetModel(); d->m_resetting = true; - static const char *const modelSignals[] = {SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), - SIGNAL(rowsInserted(QModelIndex, int, int)), - SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), - SIGNAL(rowsRemoved(QModelIndex, int, int)), - SIGNAL(rowsAboutToBeMoved(QModelIndex, int, int, QModelIndex, int)), - SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), - SIGNAL(modelAboutToBeReset()), - SIGNAL(modelReset()), - SIGNAL(dataChanged(QModelIndex, QModelIndex)), - SIGNAL(layoutAboutToBeChanged()), - SIGNAL(layoutChanged()), - SIGNAL(destroyed())}; - static const char *const proxySlots[] = {SLOT(sourceRowsAboutToBeInserted(QModelIndex, int, int)), - SLOT(sourceRowsInserted(QModelIndex, int, int)), - SLOT(sourceRowsAboutToBeRemoved(QModelIndex, int, int)), - SLOT(sourceRowsRemoved(QModelIndex, int, int)), - SLOT(sourceRowsAboutToBeMoved(QModelIndex, int, int, QModelIndex, int)), - SLOT(sourceRowsMoved(QModelIndex, int, int, QModelIndex, int)), - SLOT(sourceModelAboutToBeReset()), - SLOT(sourceModelReset()), - SLOT(sourceDataChanged(QModelIndex, QModelIndex)), - SLOT(sourceLayoutAboutToBeChanged()), - SLOT(sourceLayoutChanged()), - SLOT(sourceModelDestroyed())}; - - if (sourceModel()) { - for (int i = 0; i < int(sizeof modelSignals / sizeof *modelSignals); ++i) { - disconnect(sourceModel(), modelSignals[i], this, proxySlots[i]); - } + if (auto *oldSourceModel = sourceModel()) { + disconnect(oldSourceModel, nullptr, this, nullptr); } // Must be called before QAbstractProxyModel::setSourceModel because it emit some signals. @@ -2130,9 +2103,59 @@ } } - for (int i = 0; i < int(sizeof modelSignals / sizeof *modelSignals); ++i) { - connect(_sourceModel, modelSignals[i], this, proxySlots[i]); - } + connect(_sourceModel, &QAbstractItemModel::rowsAboutToBeInserted, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsAboutToBeInserted(parent, start, end); + }); + + connect(_sourceModel, &QAbstractItemModel::rowsInserted, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsInserted(parent, start, end); + }); + + connect(_sourceModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsAboutToBeRemoved(parent, start, end); + }); + + connect(_sourceModel, &QAbstractItemModel::rowsRemoved, this, [d](const QModelIndex &parent, int start, int end) { + d->sourceRowsRemoved(parent, start, end); + }); + + connect(_sourceModel, + &QAbstractItemModel::rowsAboutToBeMoved, + this, + [d](const QModelIndex &parent, int start, int end, const QModelIndex &destParent, int destRow) { + d->sourceRowsAboutToBeMoved(parent, start, end, destParent, destRow); + }); + + connect(_sourceModel, + &QAbstractItemModel::rowsMoved, + this, + [d](const QModelIndex &parent, int start, int end, const QModelIndex &destParent, int destRow) { + d->sourceRowsMoved(parent, start, end, destParent, destRow); + }); + + connect(_sourceModel, &QAbstractItemModel::modelAboutToBeReset, this, [d]() { + d->sourceModelAboutToBeReset(); + }); + + connect(_sourceModel, &QAbstractItemModel::modelReset, this, [d]() { + d->sourceModelReset(); + }); + + connect(_sourceModel, &QAbstractItemModel::dataChanged, this, [d](const QModelIndex &topLeft, const QModelIndex &bottomRight) { + d->sourceDataChanged(topLeft, bottomRight); + }); + + connect(_sourceModel, &QAbstractItemModel::layoutAboutToBeChanged, this, [d]() { + d->sourceLayoutAboutToBeChanged(); + }); + + connect(_sourceModel, &QAbstractItemModel::layoutChanged, this, [d]() { + d->sourceLayoutChanged(); + }); + + connect(_sourceModel, &QObject::destroyed, this, [d]() { + d->sourceModelDestroyed(); + }); } d->m_resetting = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/src/qml/ksortfilterproxymodel.h new/kitemmodels-5.83.0/src/qml/ksortfilterproxymodel.h --- old/kitemmodels-5.82.0/src/qml/ksortfilterproxymodel.h 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/src/qml/ksortfilterproxymodel.h 2021-06-05 10:56:08.000000000 +0200 @@ -88,7 +88,7 @@ Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder NOTIFY sortOrderChanged) /** - * Specify which column shoud be used for sorting + * Specify which column should be used for sorting * The default value is -1. * If \a sortRole is set, the default value is 0. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.82.0/tests/proxymodeltestapp/modelcommanderwidget.cpp new/kitemmodels-5.83.0/tests/proxymodeltestapp/modelcommanderwidget.cpp --- old/kitemmodels-5.82.0/tests/proxymodeltestapp/modelcommanderwidget.cpp 2021-05-01 11:42:51.000000000 +0200 +++ new/kitemmodels-5.83.0/tests/proxymodeltestapp/modelcommanderwidget.cpp 2021-06-05 10:56:08.000000000 +0200 @@ -27,9 +27,9 @@ init(); - connect(m_treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + connect(m_treeWidget, &QTreeWidget::currentItemChanged, this, &ModelCommanderWidget::currentItemChanged); - connect(m_executeButton, SIGNAL(clicked(bool)), SLOT(executeCurrentTest())); + connect(m_executeButton, &QPushButton::clicked, this, &ModelCommanderWidget::executeCurrentTest); } void ModelCommanderWidget::init() @@ -66,18 +66,18 @@ { executeTest(m_treeWidget->currentItem()); - disconnect(m_executeButton, SIGNAL(clicked(bool)), this, SLOT(executeCurrentTest())); + disconnect(m_executeButton, &QPushButton::clicked, this, &ModelCommanderWidget::executeCurrentTest); m_executeButton->setText(QStringLiteral("Reset")); - connect(m_executeButton, SIGNAL(clicked(bool)), SLOT(resetCurrentTest())); + connect(m_executeButton, &QPushButton::clicked, this, &ModelCommanderWidget::resetCurrentTest); } void ModelCommanderWidget::resetCurrentTest() { initTest(m_treeWidget->currentItem()); - disconnect(m_executeButton, SIGNAL(clicked(bool)), this, SLOT(resetCurrentTest())); + disconnect(m_executeButton, &QPushButton::clicked, this, &ModelCommanderWidget::resetCurrentTest); m_executeButton->setText(QStringLiteral("Execute")); - connect(m_executeButton, SIGNAL(clicked(bool)), SLOT(executeCurrentTest())); + connect(m_executeButton, &QPushButton::clicked, this, &ModelCommanderWidget::executeCurrentTest); } void ModelCommanderWidget::initTest(QTreeWidgetItem *item)
