Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2019-01-21 10:20:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Mon Jan 21 10:20:52 2019 rev:61 rq:665820 version:5.54.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2018-12-19 13:42:02.739903410 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.28833/kitemmodels.changes 2019-01-21 10:20:54.574041627 +0100 @@ -1,0 +2,10 @@ +Mon Jan 14 06:08:48 UTC 2019 - [email protected] + +- Update to 5.54.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.54.0.php +- Changes since 5.53.0: + * Remove code for qt < 4.7.2 :) + +------------------------------------------------------------------- Old: ---- kitemmodels-5.53.0.tar.xz New: ---- kitemmodels-5.54.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.tQKRWF/_old 2019-01-21 10:20:55.146041053 +0100 +++ /var/tmp/diff_new_pack.tQKRWF/_new 2019-01-21 10:20:55.146041053 +0100 @@ -1,7 +1,7 @@ # # spec file for package kitemmodels # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,14 @@ %define clang_sonum 3.8 %define lname libKF5ItemModels5 -%define _tar_path 5.53 +%define _tar_path 5.54 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_with python Name: kitemmodels -Version: 5.53.0 +Version: 5.54.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later ++++++ kitemmodels-5.53.0.tar.xz -> kitemmodels-5.54.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.53.0/CMakeLists.txt new/kitemmodels-5.54.0/CMakeLists.txt --- old/kitemmodels-5.53.0/CMakeLists.txt 2018-12-01 15:40:33.000000000 +0100 +++ new/kitemmodels-5.54.0/CMakeLists.txt 2019-01-04 22:43:17.000000000 +0100 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.53.0") # handled by release scripts +set(KF5_VERSION "5.54.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.53.0 NO_MODULE) +find_package(ECM 5.54.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/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.53.0/src/kcheckableproxymodel.cpp new/kitemmodels-5.54.0/src/kcheckableproxymodel.cpp --- old/kitemmodels-5.53.0/src/kcheckableproxymodel.cpp 2018-12-01 15:40:33.000000000 +0100 +++ new/kitemmodels-5.54.0/src/kcheckableproxymodel.cpp 2019-01-04 22:43:17.000000000 +0100 @@ -27,13 +27,12 @@ KCheckableProxyModel *q_ptr; KCheckableProxyModelPrivate(KCheckableProxyModel *checkableModel) - : q_ptr(checkableModel), - m_itemSelectionModel(nullptr) + : q_ptr(checkableModel) { } - QItemSelectionModel *m_itemSelectionModel; + QItemSelectionModel *m_itemSelectionModel = nullptr; void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.53.0/src/kconcatenaterowsproxymodel.cpp new/kitemmodels-5.54.0/src/kconcatenaterowsproxymodel.cpp --- old/kitemmodels-5.53.0/src/kconcatenaterowsproxymodel.cpp 2018-12-01 15:40:33.000000000 +0100 +++ new/kitemmodels-5.54.0/src/kconcatenaterowsproxymodel.cpp 2019-01-04 22:43:17.000000000 +0100 @@ -24,8 +24,7 @@ { public: KConcatenateRowsProxyModelPrivate(KConcatenateRowsProxyModel* model) - : q(model), - m_rowCount(0) + : q(model) {} int computeRowsPrior(const QAbstractItemModel *sourceModel) const; @@ -47,7 +46,7 @@ KConcatenateRowsProxyModel *q; QList<QAbstractItemModel *> m_models; - int m_rowCount; // have to maintain it here since we can't compute during model destruction + int m_rowCount = 0; // have to maintain it here since we can't compute during model destruction // for layoutAboutToBeChanged/layoutChanged QVector<QPersistentModelIndex> layoutChangePersistentIndexes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.53.0/src/klinkitemselectionmodel.cpp new/kitemmodels-5.54.0/src/klinkitemselectionmodel.cpp --- old/kitemmodels-5.53.0/src/klinkitemselectionmodel.cpp 2018-12-01 15:40:33.000000000 +0100 +++ new/kitemmodels-5.54.0/src/klinkitemselectionmodel.cpp 2019-01-04 22:43:17.000000000 +0100 @@ -31,10 +31,7 @@ { public: KLinkItemSelectionModelPrivate(KLinkItemSelectionModel *proxySelectionModel) - : q_ptr(proxySelectionModel), - m_linkedItemSelectionModel(nullptr), - m_ignoreCurrentChanged(false), - m_indexMapper(nullptr) + : q_ptr(proxySelectionModel) { QObject::connect(q_ptr, &QItemSelectionModel::currentChanged, q_ptr, [this](const QModelIndex& idx) { slotCurrentChanged(idx); } ); @@ -79,9 +76,9 @@ void sourceCurrentChanged(const QModelIndex ¤t); void slotCurrentChanged(const QModelIndex ¤t); - QItemSelectionModel *m_linkedItemSelectionModel; - bool m_ignoreCurrentChanged; - KModelIndexProxyMapper * m_indexMapper; + QItemSelectionModel *m_linkedItemSelectionModel = nullptr; + bool m_ignoreCurrentChanged = false; + KModelIndexProxyMapper * m_indexMapper = nullptr; }; KLinkItemSelectionModel::KLinkItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *proxySelector, QObject *parent) @@ -162,37 +159,12 @@ } } -// QAbstractProxyModel::mapSelectionFromSource creates invalid ranges to we filter -// those out manually in a loop. Hopefully fixed in Qt 4.7.2, so we ifdef it out. -// http://qt.gitorious.org/qt/qt/merge_requests/2474 -// http://qt.gitorious.org/qt/qt/merge_requests/831 -#if QT_VERSION < 0x040702 -#define RANGE_FIX_HACK -#endif - -#ifdef RANGE_FIX_HACK -static QItemSelection klink_removeInvalidRanges(const QItemSelection &selection) -{ - QItemSelection result; - Q_FOREACH (const QItemSelectionRange &range, selection) { - if (!range.isValid()) { - continue; - } - result << range; - } - return result; -} -#endif void KLinkItemSelectionModel::select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) { Q_D(KLinkItemSelectionModel); d->m_ignoreCurrentChanged = true; -#ifdef RANGE_FIX_HACK - QItemSelection _selection = klink_removeInvalidRanges(selection); -#else QItemSelection _selection = selection; -#endif QItemSelectionModel::select(_selection, command); Q_ASSERT(d->assertSelectionValid(_selection)); QItemSelection mappedSelection = d->m_indexMapper->mapSelectionLeftToRight(_selection); @@ -213,13 +185,8 @@ void KLinkItemSelectionModelPrivate::sourceSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { Q_Q(KLinkItemSelectionModel); -#ifdef RANGE_FIX_HACK - QItemSelection _selected = klink_removeInvalidRanges(selected); - QItemSelection _deselected = klink_removeInvalidRanges(deselected); -#else QItemSelection _selected = selected; QItemSelection _deselected = deselected; -#endif Q_ASSERT(assertSelectionValid(_selected)); Q_ASSERT(assertSelectionValid(_deselected)); const QItemSelection mappedDeselection = m_indexMapper->mapSelectionRightToLeft(_deselected); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.53.0/src/kmodelindexproxymapper.cpp new/kitemmodels-5.54.0/src/kmodelindexproxymapper.cpp --- old/kitemmodels-5.53.0/src/kmodelindexproxymapper.cpp 2018-12-01 15:40:33.000000000 +0100 +++ new/kitemmodels-5.54.0/src/kmodelindexproxymapper.cpp 2019-01-04 22:43:17.000000000 +0100 @@ -197,28 +197,6 @@ return selection.indexes().first(); } -// QAbstractProxyModel::mapSelectionFromSource creates invalid ranges to we filter -// those out manually in a loop. Hopefully fixed in Qt 4.7.2, so we ifdef it out. -// http://qt.gitorious.org/qt/qt/merge_requests/2474 -// http://qt.gitorious.org/qt/qt/merge_requests/831 -#if QT_VERSION < 0x040702 -#define RANGE_FIX_HACK -#endif - -#ifdef RANGE_FIX_HACK -static QItemSelection removeInvalidRanges(const QItemSelection &selection) -{ - QItemSelection result; - Q_FOREACH (const QItemSelectionRange &range, selection) { - if (!range.isValid()) { - continue; - } - result << range; - } - return result; -} -#endif - QItemSelection KModelIndexProxyMapper::mapSelectionLeftToRight(const QItemSelection &selection) const { Q_D(const KModelIndexProxyMapper); @@ -246,9 +224,6 @@ seekSelection = proxy->mapSelectionToSource(seekSelection); Q_ASSERT(seekSelection.isEmpty() || seekSelection.first().model() == proxy->sourceModel()); -#ifdef RANGE_FIX_HACK - seekSelection = removeInvalidRanges(seekSelection); -#endif Q_ASSERT(d->assertSelectionValid(seekSelection)); } @@ -263,9 +238,6 @@ seekSelection = proxy->mapSelectionFromSource(seekSelection); Q_ASSERT(seekSelection.isEmpty() || seekSelection.first().model() == proxy); -#ifdef RANGE_FIX_HACK - seekSelection = removeInvalidRanges(seekSelection); -#endif Q_ASSERT(d->assertSelectionValid(seekSelection)); } @@ -298,9 +270,6 @@ } seekSelection = proxy->mapSelectionToSource(seekSelection); -#ifdef RANGE_FIX_HACK - seekSelection = removeInvalidRanges(seekSelection); -#endif Q_ASSERT(d->assertSelectionValid(seekSelection)); } @@ -314,9 +283,6 @@ } seekSelection = proxy->mapSelectionFromSource(seekSelection); -#ifdef RANGE_FIX_HACK - seekSelection = removeInvalidRanges(seekSelection); -#endif Q_ASSERT(d->assertSelectionValid(seekSelection)); }
