Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2019-09-23 12:24:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Mon Sep 23 12:24:18 2019 rev:70 rq:730939 version:5.62.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2019-08-19 21:09:17.496853847 +0200 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new.7948/kitemmodels.changes 2019-09-23 12:24:21.225738610 +0200 @@ -1,0 +2,14 @@ +Sat Sep 7 20:36:54 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.62.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.62.0.php +- Changes since 5.61.0: + * Add @since to properties + * Add Q_PROPERTIES interface to KDescendantsProxyModel + * Port away from deprecated methods in Qt + * Port away from deprecated method QModelIndex::child() + * Remove unused includes + +------------------------------------------------------------------- Old: ---- kitemmodels-5.61.0.tar.xz kitemmodels-5.61.0.tar.xz.sig New: ---- kitemmodels-5.62.0.tar.xz kitemmodels-5.62.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.DQWlwC/_old 2019-09-23 12:24:21.757738523 +0200 +++ /var/tmp/diff_new_pack.DQWlwC/_new 2019-09-23 12:24:21.757738523 +0200 @@ -18,7 +18,7 @@ %define clang_sonum 3.8 %define lname libKF5ItemModels5 -%define _tar_path 5.61 +%define _tar_path 5.62 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -27,7 +27,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kitemmodels -Version: 5.61.0 +Version: 5.62.0 Release: 0 Summary: Set of item models extending the Qt model-view framework License: LGPL-2.1-or-later ++++++ kitemmodels-5.61.0.tar.xz -> kitemmodels-5.62.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/CMakeLists.txt new/kitemmodels-5.62.0/CMakeLists.txt --- old/kitemmodels-5.61.0/CMakeLists.txt 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/CMakeLists.txt 2019-09-07 14:35:53.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.61.0") # handled by release scripts +set(KF5_VERSION "5.62.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.61.0 NO_MODULE) +find_package(ECM 5.62.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.61.0/autotests/kextracolumnsproxymodeltest.cpp new/kitemmodels-5.62.0/autotests/kextracolumnsproxymodeltest.cpp --- old/kitemmodels-5.61.0/autotests/kextracolumnsproxymodeltest.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/kextracolumnsproxymodeltest.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -22,7 +22,6 @@ #include <QSignalSpy> #include <QSortFilterProxyModel> #include <QTest> -#include <QDebug> #include <QStandardItemModel> #include <QTreeView> @@ -113,7 +112,7 @@ QCOMPARE(extractRowTexts(&mod, 0), QStringLiteral("ABCD")); QCOMPARE(extractRowTexts(&mod, 0, mod.index(0, 0)), QStringLiteral("mnop")); QCOMPARE(extractRowTexts(&mod, 1, mod.index(0, 0)), QStringLiteral("qrst")); - QCOMPARE(extractRowTexts(&mod, 0, mod.index(0, 0).child(1, 0)), QStringLiteral("uvww")); + QCOMPARE(extractRowTexts(&mod, 0, mod.index(1, 0, mod.index(0, 0))), QStringLiteral("uvww")); QCOMPARE(extractRowTexts(&mod, 1), QStringLiteral("EFGH")); QCOMPARE(extractRowTexts(&mod, 0, mod.index(1, 0)), QStringLiteral("xyz.")); QCOMPARE(extractHorizontalHeaderTexts(&mod), QStringLiteral("H1H2H3H4")); @@ -170,9 +169,9 @@ QVERIFY(!secondParent.parent().isValid()); QCOMPARE(indexToText(pm.index(0, 0, secondParent).parent()), indexToText(secondParent)); QCOMPARE(indexToText(pm.index(0, 3, secondParent).parent()), indexToText(secondParent)); - QVERIFY(indexToText(pm.index(0, 4)).startsWith(QStringLiteral("0,4,"))); + QVERIFY(indexToText(pm.index(0, 4)).startsWith(QLatin1String("0,4,"))); QCOMPARE(indexToText(pm.index(0, 4, secondParent).parent()), indexToText(secondParent)); - QVERIFY(indexToText(pm.index(0, 5)).startsWith(QStringLiteral("0,5,"))); + QVERIFY(indexToText(pm.index(0, 5)).startsWith(QLatin1String("0,5,"))); QCOMPARE(indexToText(pm.index(0, 5, secondParent).parent()), indexToText(secondParent)); QCOMPARE(pm.index(0, 0).sibling(0, 4).column(), 4); @@ -326,7 +325,7 @@ // And a selection QItemSelectionModel selection(&pm); selection.select(pm.index(0, 0), QItemSelectionModel::Select | QItemSelectionModel::Rows); - const QModelIndex grandChild = pm.index(0, 0).child(1, 0).child(0, 0); + const QModelIndex grandChild = pm.index(0, 0, pm.index(1, 0, pm.index(0, 0))); QCOMPARE(grandChild.data().toString(), QStringLiteral("u")); selection.select(grandChild, QItemSelectionModel::Select | QItemSelectionModel::Rows); const QModelIndexList lst = selection.selectedIndexes(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/krearrangecolumnsproxymodeltest.cpp new/kitemmodels-5.62.0/autotests/krearrangecolumnsproxymodeltest.cpp --- old/kitemmodels-5.61.0/autotests/krearrangecolumnsproxymodeltest.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/krearrangecolumnsproxymodeltest.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -19,7 +19,6 @@ */ #include <QSignalSpy> -#include <QSortFilterProxyModel> #include <QTest> #include <QDebug> #include <QStandardItemModel> @@ -203,7 +202,7 @@ // Then the change should be notified to the proxy QCOMPARE(dataChangedSpy.count(), 1); - QCOMPARE(indexToText(dataChangedSpy.at(0).at(0).toModelIndex()), indexToText(pm.index(1, 0).child(0, 1))); + QCOMPARE(indexToText(dataChangedSpy.at(0).at(0).toModelIndex()), indexToText(pm.index(0, 1, pm.index(1, 0)))); QCOMPARE(extractRowTexts(&pm, 0, pm.index(1, 0)), QStringLiteral("z,yx")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/kselectionproxymodel_smoketest.cpp new/kitemmodels-5.62.0/autotests/kselectionproxymodel_smoketest.cpp --- old/kitemmodels-5.61.0/autotests/kselectionproxymodel_smoketest.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/kselectionproxymodel_smoketest.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -19,9 +19,6 @@ #include "kselectionproxymodeltestsuite.h" -#include <QApplication> -#include <QTimer> -#include <QtTest> #include <kselectionproxymodel.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/dynamictreemodel.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -21,7 +21,6 @@ #include <QHash> #include <QList> -#include <QTimer> #include <QMimeData> #include <QDebug> @@ -434,10 +433,9 @@ { m_treeString = treeString; - QList<int> depths = getDepths(m_treeString); + const QList<int> depths = getDepths(m_treeString); - int size = 0; - qCount(depths, 0, size); + const int size = std::count(depths.begin(), depths.end(), 0); Q_ASSERT(size != 0); m_endRow = m_startRow + size - 1; @@ -481,10 +479,8 @@ QModelIndex parent = findIndex(m_rowNumbers); if (!m_treeString.isEmpty()) { - QList<int> depths = getDepths(m_treeString); - - int size = 0; - qCount(depths, 0, size); + const QList<int> depths = getDepths(m_treeString); + const int size = std::count(depths.begin(), depths.end(), 0); Q_ASSERT(size != 0); m_endRow = m_startRow + size - 1; } @@ -513,7 +509,7 @@ void ModelInsertCommand::doInsertTree(const QModelIndex &fragmentParent) { - QList<int> depths = getDepths(m_treeString); + const QList<int> depths = getDepths(m_treeString); qint64 fragmentParentIdentifier = fragmentParent.internalId(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/dynamictreemodel.h new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/dynamictreemodel.h --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2019-09-07 14:35:53.000000000 +0200 @@ -25,7 +25,6 @@ #include <QHash> #include <QList> -#include <QDebug> #include "indexfinder.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/dynamictreewidget.cpp new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/dynamictreewidget.cpp --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/dynamictreewidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/dynamictreewidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -26,6 +26,7 @@ #include <QHBoxLayout> #include <QPushButton> #include <QRadioButton> +#include <QDebug> #include "dynamictreemodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/eventloggerregister.cpp new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/eventloggerregister.cpp --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/eventloggerregister.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/eventloggerregister.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -23,7 +23,6 @@ #include "modeleventlogger.h" -#include <QDebug> EventLoggerRegister::~EventLoggerRegister() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/modelcommander.cpp new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/modelcommander.cpp --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/modelcommander.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/modelcommander.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -19,6 +19,7 @@ #include "modelcommander.h" #include "dynamictreemodel.h" +#include <QDebug> ModelCommander::ModelCommander(DynamicTreeModel *model, QObject *parent) : QObject(parent), m_model(model) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/modeleventlogger.h new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/modeleventlogger.h --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/modeleventlogger.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/modeleventlogger.h 2019-09-07 14:35:53.000000000 +0200 @@ -23,7 +23,6 @@ #define MODELEVENTLOGGER_H #include <QAbstractItemModel> -#include <QIODevice> #include "proxymodeltestsuite_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/modeltest.cpp new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/modeltest.cpp --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/modeltest.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/modeltest.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -18,7 +18,6 @@ #include "modeltest.h" -#include <QtCore> #include <QtTest> /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/proxymodeltest.cpp new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/proxymodeltest.cpp --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -21,7 +21,6 @@ #include "dynamictreemodel.h" -#include <QItemSelectionModel> #include <QSortFilterProxyModel> #include "modelspy.h" @@ -552,7 +551,7 @@ } static int numTests = 0; - if (qApp->arguments().contains(QStringLiteral("-count"))) { + if (qApp->arguments().contains(QLatin1String("-count"))) { qDebug() << "numTests" << ++numTests; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/proxymodeltest.h new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/proxymodeltest.h --- old/kitemmodels-5.61.0/autotests/proxymodeltestsuite/proxymodeltest.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/autotests/proxymodeltestsuite/proxymodeltest.h 2019-09-07 14:35:53.000000000 +0200 @@ -20,11 +20,8 @@ #ifndef PROXY_MODEL_TEST_H #define PROXY_MODEL_TEST_H -#include <QtTest> -#include <QtCore> -#include <QTestEvent> -#include <QItemSelectionRange> #include <QAbstractProxyModel> +#include <QtTest> #include "dynamictreemodel.h" #include "indexfinder.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/src/kbreadcrumbselectionmodel.h new/kitemmodels-5.62.0/src/kbreadcrumbselectionmodel.h --- old/kitemmodels-5.61.0/src/kbreadcrumbselectionmodel.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/src/kbreadcrumbselectionmodel.h 2019-09-07 14:35:53.000000000 +0200 @@ -23,7 +23,6 @@ #define KBREADCRUMBSELECTIONMODEL_H #include <QItemSelectionModel> -#include <QAbstractItemModel> #include "kitemmodels_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/src/kdescendantsproxymodel.cpp new/kitemmodels-5.62.0/src/kdescendantsproxymodel.cpp --- old/kitemmodels-5.61.0/src/kdescendantsproxymodel.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/src/kdescendantsproxymodel.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -23,8 +23,6 @@ #include "kdescendantsproxymodel.h" #include <QStringList> -#include <QTimer> -#include <QDebug> #include "kbihash_p.h" @@ -231,6 +229,7 @@ bool displayChanged = (display != d->m_displayAncestorData); d->m_displayAncestorData = display; if (displayChanged) { + emit displayAncestorDataChanged(); // send out big hammer. Everything needs to be updated. emit dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); } @@ -247,9 +246,12 @@ Q_D(KDescendantsProxyModel); bool separatorChanged = (separator != d->m_ancestorSeparator); d->m_ancestorSeparator = separator; - if (separatorChanged && d->m_displayAncestorData) { - // send out big hammer. Everything needs to be updated. - emit dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); + if (separatorChanged) { + emit ancestorSeparatorChanged(); + if (d->m_displayAncestorData) { + // send out big hammer. Everything needs to be updated. + emit dataChanged(index(0,0),index(rowCount()-1,columnCount()-1), changedRoles); + } } } @@ -314,6 +316,7 @@ } endResetModel(); + emit sourceModelChanged(); } QModelIndex KDescendantsProxyModel::parent(const QModelIndex &index) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/src/kdescendantsproxymodel.h new/kitemmodels-5.62.0/src/kdescendantsproxymodel.h --- old/kitemmodels-5.61.0/src/kdescendantsproxymodel.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/src/kdescendantsproxymodel.h 2019-09-07 14:35:53.000000000 +0200 @@ -72,6 +72,19 @@ { Q_OBJECT + /** + * @since 5.62 + */ + Q_PROPERTY(QAbstractItemModel *model READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged) + /** + * @since 5.62 + */ + Q_PROPERTY(bool displayAncestorData READ displayAncestorData WRITE setDisplayAncestorData NOTIFY displayAncestorDataChanged) + /** + * @since 5.62 + */ + Q_PROPERTY(QString ancestorSeparator READ ancestorSeparator WRITE setAncestorSeparator NOTIFY ancestorSeparatorChanged) + public: /** @@ -176,6 +189,11 @@ virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const override; +Q_SIGNALS: + void sourceModelChanged(); + void displayAncestorDataChanged(); + void ancestorSeparatorChanged(); + private: Q_DECLARE_PRIVATE(KDescendantsProxyModel) //@cond PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/src/klinkitemselectionmodel.h new/kitemmodels-5.62.0/src/klinkitemselectionmodel.h --- old/kitemmodels-5.61.0/src/klinkitemselectionmodel.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/src/klinkitemselectionmodel.h 2019-09-07 14:35:53.000000000 +0200 @@ -25,7 +25,6 @@ #define KLINKITEMSELECTIONMODEL_H #include <QItemSelectionModel> -#include <QAbstractProxyModel> #include "kitemmodels_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/src/kselectionproxymodel.cpp new/kitemmodels-5.62.0/src/kselectionproxymodel.cpp --- old/kitemmodels-5.61.0/src/kselectionproxymodel.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/src/kselectionproxymodel.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -21,7 +21,6 @@ #include "kselectionproxymodel.h" -#include <QStack> #include <QStringList> #include <QPointer> #include <QItemSelectionRange> @@ -30,7 +29,6 @@ #include "kbihash_p.h" #include "kvoidpointerfactory_p.h" -#include <QDebug> typedef KBiHash<QPersistentModelIndex, QModelIndex> SourceProxyIndexMapping; typedef KBiHash<void *, QModelIndex> ParentMapping; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -23,10 +23,10 @@ #include <dynamictreemodel.h> #include <kbreadcrumbselectionmodel.h> -#include <QBoxLayout> #include <QSplitter> #include <QTreeView> #include <QEvent> +#include <QHBoxLayout> BreadcrumbDirectionWidget::BreadcrumbDirectionWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -27,7 +27,7 @@ #include <QSplitter> #include <QListView> #include <QTreeView> -#include <QBoxLayout> +#include <QHBoxLayout> #include "kselectionproxymodel.h" #include "kbreadcrumbselectionmodel.h" @@ -89,7 +89,7 @@ dataList.prepend(sourceIndex.data().toString()); sourceIndex = sourceIndex.parent(); } - return dataList.join(QStringLiteral(" > ")); + return dataList.join(QLatin1String(" > ")); } return KSelectionProxyModel::data(index, role); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h 2019-09-07 14:35:53.000000000 +0200 @@ -25,7 +25,6 @@ #include <QWidget> #include <QItemSelection> #include <QLabel> -#include <QListView> #include <kselectionproxymodel.h> #include "klinkitemselectionmodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbswidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbswidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbswidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbswidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -27,7 +27,7 @@ #include <QSplitter> #include <QListView> #include <QTreeView> -#include <QBoxLayout> +#include <QHBoxLayout> #include "kselectionproxymodel.h" #include "kbreadcrumbselectionmodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbswidget.h new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbswidget.h --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/breadcrumbswidget.h 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/breadcrumbswidget.h 2019-09-07 14:35:53.000000000 +0200 @@ -24,8 +24,6 @@ #include <QWidget> #include <QItemSelection> -#include <QLabel> -#include <QListView> #include <kselectionproxymodel.h> #include "klinkitemselectionmodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/descendantpmwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/descendantpmwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/descendantpmwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/descendantpmwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -29,7 +29,6 @@ #include "kdescendantsproxymodel.h" #include <QHBoxLayout> #include <QLineEdit> -#include <QApplication> #include "modeleventlogger.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/kidentityproxymodelwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -23,11 +23,10 @@ #include <dynamictreemodel.h> #include <kbreadcrumbselectionmodel.h> -#include <QBoxLayout> #include <QSplitter> #include <QTreeView> -#include <QEvent> #include <QIdentityProxyModel> +#include <QHBoxLayout> #include "dynamictreewidget.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -19,7 +19,6 @@ #include "kreparentingproxymodel.h" #include <QDebug> -#include <QStack> #include <functional> #include <algorithm> @@ -221,7 +220,7 @@ QModelIndex proxyIndex = q->mapFromSource(index); while (q->hasChildren(proxyIndex)) { - proxyIndex = proxyIndex.child(q->rowCount(proxyIndex), proxyIndex.column()); + proxyIndex = q->index(q->rowCount(proxyIndex), proxyIndex.column(), proxyIndex); if (!proxyIndex.isValid()) { break; } @@ -309,7 +308,7 @@ break; } - const QVector<QModelIndex>::iterator ancestorIt = qLowerBound(ancestors.begin(), ancestors.end(), nextIndex, LessThan(q)); + const QVector<QModelIndex>::iterator ancestorIt = std::lower_bound(ancestors.begin(), ancestors.end(), nextIndex, LessThan(q)); ancestors.erase(ancestorIt, ancestors.end()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/mainwindow.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/mainwindow.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/mainwindow.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/mainwindow.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -21,7 +21,6 @@ #include "mainwindow.h" -#include <QSplitter> #include <QTabWidget> #include "dynamictreemodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/proxymodeltestwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/proxymodeltestwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/proxymodeltestwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/proxymodeltestwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -23,8 +23,8 @@ #include <QSplitter> #include <QTreeView> -#include <QHBoxLayout> #include <QPushButton> +#include <QVBoxLayout> #include "modelcommander.h" #include "dynamictreemodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/scriptablereparentingwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/scriptablereparentingwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/scriptablereparentingwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/scriptablereparentingwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -24,7 +24,6 @@ #include <QVBoxLayout> #include <QScriptEngine> -#include <QDebug> #include <QLabel> #include <QSplitter> #include <QComboBox> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.61.0/tests/proxymodeltestapp/statesaverwidget.cpp new/kitemmodels-5.62.0/tests/proxymodeltestapp/statesaverwidget.cpp --- old/kitemmodels-5.61.0/tests/proxymodeltestapp/statesaverwidget.cpp 2019-08-03 21:33:52.000000000 +0200 +++ new/kitemmodels-5.62.0/tests/proxymodeltestapp/statesaverwidget.cpp 2019-09-07 14:35:53.000000000 +0200 @@ -22,7 +22,6 @@ #include "statesaverwidget.h" #include <QSplitter> -#include <QBoxLayout> #include <QTreeView> #include <QApplication>
