Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2020-08-12 12:24:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Wed Aug 12 12:24:26 2020 rev:82 rq:825088 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2020-07-14 07:54:27.520851107 +0200 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.3399/kitemmodels.changes 2020-08-12 12:28:57.136176838 +0200 @@ -1,0 +2,13 @@ +Sun Aug 2 07:13:32 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.73.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.73.0 +- Changes since 5.72.0: + * Use KF-standardized Qt logging categories + * KSelectionProxyModel: allow using the model with new-style connect + * KRearrangeColumnsProxyModel: fix hasChildren() when no columns are set up yet + * Use camelcase include. (scripted) + +------------------------------------------------------------------- Old: ---- kitemmodels-5.72.0.tar.xz kitemmodels-5.72.0.tar.xz.sig New: ---- kitemmodels-5.73.0.tar.xz kitemmodels-5.73.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.buArXn/_old 2020-08-12 12:28:57.604176824 +0200 +++ /var/tmp/diff_new_pack.buArXn/_new 2020-08-12 12:28:57.608176824 +0200 @@ -17,7 +17,7 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.72 +%define _tar_path 5.73 # 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.72.0 +Version: 5.73.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later @@ -111,6 +111,7 @@ %files -n %{lname} %license LICENSES/* %{_kf5_debugdir}/*.categories +%{_kf5_debugdir}/*.renamecategories %{_kf5_libdir}/libKF5ItemModels.so.* %files devel ++++++ kitemmodels-5.72.0.tar.xz -> kitemmodels-5.73.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/CMakeLists.txt new/kitemmodels-5.73.0/CMakeLists.txt --- old/kitemmodels-5.72.0/CMakeLists.txt 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/CMakeLists.txt 2020-08-01 19:07:47.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.72.0") # handled by release scripts +set(KF5_VERSION "5.73.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.72.0 NO_MODULE) +find_package(ECM 5.73.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/autotests/kdescendantsproxymodel_smoketest.cpp new/kitemmodels-5.73.0/autotests/kdescendantsproxymodel_smoketest.cpp --- old/kitemmodels-5.72.0/autotests/kdescendantsproxymodel_smoketest.cpp 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/autotests/kdescendantsproxymodel_smoketest.cpp 2020-08-01 19:07:47.000000000 +0200 @@ -8,8 +8,8 @@ #include "proxymodeltestsuite/proxymodeltest.h" #include <kdescendantsproxymodel.h> -#include <qapplication.h> -#include <qdebug.h> +#include <QApplication> +#include <QDebug> class TestData : public ProxyModelTestData { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/autotests/krearrangecolumnsproxymodeltest.cpp new/kitemmodels-5.73.0/autotests/krearrangecolumnsproxymodeltest.cpp --- old/kitemmodels-5.72.0/autotests/krearrangecolumnsproxymodeltest.cpp 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/autotests/krearrangecolumnsproxymodeltest.cpp 2020-08-01 19:07:47.000000000 +0200 @@ -72,6 +72,7 @@ // Then the proxy should show nothing (no columns selected) QCOMPARE(pm.rowCount(), mod.rowCount()); QCOMPARE(pm.columnCount(), 0); + QVERIFY(!pm.hasChildren()); } void shouldMapColumns() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/src/core/CMakeLists.txt new/kitemmodels-5.73.0/src/core/CMakeLists.txt --- old/kitemmodels-5.72.0/src/core/CMakeLists.txt 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/src/core/CMakeLists.txt 2020-08-01 19:07:47.000000000 +0200 @@ -17,8 +17,9 @@ ecm_qt_declare_logging_category(kitemmodels_SRCS HEADER kitemmodels_debug.h IDENTIFIER KITEMMODELS_LOG - CATEGORY_NAME kf5.kitemmodels - DESCRIPTION "KItemModels" + CATEGORY_NAME kf.itemmodels.core + OLD_CATEGORY_NAMES kf5.kitemmodels + DESCRIPTION "KItemModels (Core)" EXPORT KITEMMODELS ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/src/core/krearrangecolumnsproxymodel.cpp new/kitemmodels-5.73.0/src/core/krearrangecolumnsproxymodel.cpp --- old/kitemmodels-5.72.0/src/core/krearrangecolumnsproxymodel.cpp 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/src/core/krearrangecolumnsproxymodel.cpp 2020-08-01 19:07:47.000000000 +0200 @@ -52,6 +52,17 @@ return sourceModel()->rowCount(sourceParent); } +bool KRearrangeColumnsProxyModel::hasChildren(const QModelIndex &parent) const +{ + Q_ASSERT(parent.isValid() ? parent.model() == this : true); + if (!sourceModel()) + return false; + if (d_ptr->m_sourceColumns.isEmpty()) // no columns configured yet + return false; + const QModelIndex sourceParent = mapToSource(parent).sibling(parent.row(), 0); + return sourceModel()->rowCount(sourceParent) > 0; +} + // We derive from QIdentityProxyModel simply to be able to use // its mapFromSource method which has friend access to createIndex() in the source model. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/src/core/krearrangecolumnsproxymodel.h new/kitemmodels-5.73.0/src/core/krearrangecolumnsproxymodel.h --- old/kitemmodels-5.72.0/src/core/krearrangecolumnsproxymodel.h 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/src/core/krearrangecolumnsproxymodel.h 2020-08-01 19:07:47.000000000 +0200 @@ -75,6 +75,9 @@ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; /// @reimp + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + + /// @reimp QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/src/core/kselectionproxymodel.cpp new/kitemmodels-5.73.0/src/core/kselectionproxymodel.cpp --- old/kitemmodels-5.72.0/src/core/kselectionproxymodel.cpp 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/src/core/kselectionproxymodel.cpp 2020-08-01 19:07:47.000000000 +0200 @@ -755,12 +755,12 @@ QItemSelection selection; for (const QModelIndex &rootIndex : qAsConst(m_rootIndexList)) { // This will be optimized later. - Q_EMIT q->rootIndexAboutToBeRemoved(rootIndex); + Q_EMIT q->rootIndexAboutToBeRemoved(rootIndex, {}); selection.append(QItemSelectionRange(rootIndex, rootIndex)); } selection = kNormalizeSelection(selection); - Q_EMIT q->rootSelectionAboutToBeRemoved(selection); + Q_EMIT q->rootSelectionAboutToBeRemoved(selection, {}); QPersistentModelIndex srcPersistentIndex; const auto lst = q->persistentIndexList(); @@ -1726,7 +1726,7 @@ if (!rootWillBeRemoved(selection, *rootIt)) { break; } - q->rootIndexAboutToBeRemoved(*rootIt); + q->rootIndexAboutToBeRemoved(*rootIt, {}); if (m_startWithChildTrees) { auto rc = q->sourceModel()->rowCount(*rootIt); proxyEndRemove += rc; @@ -1943,7 +1943,7 @@ // We still need to make sure its future children are inserted into the model. m_rootIndexList.insert(rootListRow, newIndex); if (!m_resetting || m_layoutChanging) { - Q_EMIT q->rootIndexAdded(newIndex); + Q_EMIT q->rootIndexAdded(newIndex, {}); } continue; } @@ -1953,7 +1953,7 @@ Q_ASSERT(newIndex.isValid()); m_rootIndexList.insert(rootListRow, newIndex); if (!m_resetting || m_layoutChanging) { - Q_EMIT q->rootIndexAdded(newIndex); + Q_EMIT q->rootIndexAdded(newIndex, {}); } int _start = 0; @@ -1979,7 +1979,7 @@ m_rootIndexList.insert(row, newIndex); if (!m_resetting || m_layoutChanging) { - Q_EMIT q->rootIndexAdded(newIndex); + Q_EMIT q->rootIndexAdded(newIndex, {}); } Q_ASSERT(m_rootIndexList.size() > row); updateInternalIndexes(QModelIndex(), row, 1); @@ -1990,7 +1990,7 @@ } } } - q->rootSelectionAdded(selection); + q->rootSelectionAdded(selection, {}); } KSelectionProxyModel::KSelectionProxyModel(QItemSelectionModel *selectionModel, QObject *parent) @@ -2061,7 +2061,7 @@ break; } } - Q_EMIT filterBehaviorChanged(); + Q_EMIT filterBehaviorChanged({}); d->resetInternalData(); if (d->m_selectionModel) { d->selectionChanged(d->m_selectionModel->selection(), QItemSelection()); @@ -2364,7 +2364,7 @@ } d->m_selectionModel = itemSelectionModel; - Q_EMIT selectionModelChanged(); + Q_EMIT selectionModelChanged({}); if (d->m_selectionModel) { connect(d->m_selectionModel, SIGNAL(selectionChanged(QItemSelection,QItemSelection)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/src/core/kselectionproxymodel.h new/kitemmodels-5.73.0/src/core/kselectionproxymodel.h --- old/kitemmodels-5.72.0/src/core/kselectionproxymodel.h 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/src/core/kselectionproxymodel.h 2020-08-01 19:07:47.000000000 +0200 @@ -259,17 +259,13 @@ Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const override; Q_SIGNALS: -#if !defined(Q_MOC_RUN) && !defined(K_DOXYGEN) && !defined(IN_IDE_PARSER) -private: // Don't allow subclasses to emit these Q_SIGNALS. -#endif - /** @internal Emitted before @p removeRootIndex, an index in the sourceModel is removed from the root selected indexes. This may be unrelated to rows removed from the model, depending on configuration. */ - void rootIndexAboutToBeRemoved(const QModelIndex &removeRootIndex); + void rootIndexAboutToBeRemoved(const QModelIndex &removeRootIndex, QPrivateSignal); /** @internal @@ -277,24 +273,24 @@ indexes. This may be unrelated to rows inserted to the model, depending on configuration. */ - void rootIndexAdded(const QModelIndex &newIndex); + void rootIndexAdded(const QModelIndex &newIndex, QPrivateSignal); /** @internal Emitted before @p selection, a selection in the sourceModel, is removed from the root selection. */ - void rootSelectionAboutToBeRemoved(const QItemSelection &selection); + void rootSelectionAboutToBeRemoved(const QItemSelection &selection, QPrivateSignal); /** @internal Emitted after @p selection, a selection in the sourceModel, is added to the root selection. */ - void rootSelectionAdded(const QItemSelection &selection); + void rootSelectionAdded(const QItemSelection &selection, QPrivateSignal); - void selectionModelChanged(); - void filterBehaviorChanged(); + void selectionModelChanged(QPrivateSignal); + void filterBehaviorChanged(QPrivateSignal); protected: QList<QPersistentModelIndex> sourceRootIndexes() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/src/qml/CMakeLists.txt new/kitemmodels-5.73.0/src/qml/CMakeLists.txt --- old/kitemmodels-5.72.0/src/qml/CMakeLists.txt 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/src/qml/CMakeLists.txt 2020-08-01 19:07:47.000000000 +0200 @@ -4,7 +4,13 @@ ksortfilterproxymodel.cpp ) -ecm_qt_declare_logging_category(corebindings_SRCS HEADER kitemmodels_debug.h IDENTIFIER KITEMMODELS_LOG CATEGORY_NAME kf5.kitemmodels) +ecm_qt_declare_logging_category(corebindings_SRCS + HEADER kitemmodels_debug.h + IDENTIFIER KITEMMODELS_LOG + CATEGORY_NAME kf.itemmodels.quick + DESCRIPTION "KItemModels (QtQuick)" + EXPORT KITEMMODELS +) add_library(itemmodelsplugin SHARED ${corebindings_SRCS}) target_link_libraries(itemmodelsplugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/tests/proxymodeltestapp/main.cpp new/kitemmodels-5.73.0/tests/proxymodeltestapp/main.cpp --- old/kitemmodels-5.72.0/tests/proxymodeltestapp/main.cpp 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/tests/proxymodeltestapp/main.cpp 2020-08-01 19:07:47.000000000 +0200 @@ -6,7 +6,7 @@ #include "mainwindow.h" -#include <qapplication.h> +#include <QApplication> int main(int argc, char **argv) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/tests/proxymodeltestapp/statesaverwidget.cpp new/kitemmodels-5.73.0/tests/proxymodeltestapp/statesaverwidget.cpp --- old/kitemmodels-5.72.0/tests/proxymodeltestapp/statesaverwidget.cpp 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/tests/proxymodeltestapp/statesaverwidget.cpp 2020-08-01 19:07:47.000000000 +0200 @@ -11,8 +11,8 @@ #include <QTreeView> #include <QApplication> -#include <kconfig.h> -#include <kconfiggroup.h> +#include <KConfig> +#include <KConfigGroup> #include <ksharedconfig.h> #include "dynamictreewidget.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.72.0/tests/proxymodeltestapp/statesaverwidget.h new/kitemmodels-5.73.0/tests/proxymodeltestapp/statesaverwidget.h --- old/kitemmodels-5.72.0/tests/proxymodeltestapp/statesaverwidget.h 2020-07-04 11:52:49.000000000 +0200 +++ new/kitemmodels-5.73.0/tests/proxymodeltestapp/statesaverwidget.h 2020-08-01 19:07:47.000000000 +0200 @@ -10,7 +10,7 @@ #include <QWidget> -#include "kviewstatesaver.h" +#include <KViewStateSaver> class QTreeView;
