Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2017-03-03 16:58:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Fri Mar 3 16:58:56 2017 rev:38 rq:461435 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2017-02-03 17:45:19.875902239 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new/kitemmodels.changes 2017-03-03 16:58:57.679755920 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:30:45 UTC 2017 - hrvoje.sen...@gmail.com + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- kitemmodels-5.30.0.tar.xz New: ---- kitemmodels-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.o82WxU/_old 2017-03-03 16:58:58.751604347 +0100 +++ /var/tmp/diff_new_pack.o82WxU/_new 2017-03-03 16:58:58.751604347 +0100 @@ -19,15 +19,15 @@ %bcond_with python %define clang_sonum 3.8 %define lname libKF5ItemModels5 -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kitemmodels -Version: 5.30.0 +Version: 5.31.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: cmake(Qt5Core) >= 5.5.0 +BuildRequires: cmake(Qt5Core) >= 5.6.0 %if %{with python} BuildRequires: python-clang BuildRequires: python-devel @@ -59,7 +59,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Core) >= 5.5.0 +Requires: cmake(Qt5Core) >= 5.6.0 %description devel KItemModels provides a set of item models extending the Qt model-view framework. ++++++ kitemmodels-5.30.0.tar.xz -> kitemmodels-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/CMakeLists.txt new/kitemmodels-5.31.0/CMakeLists.txt --- old/kitemmodels-5.30.0/CMakeLists.txt 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/CMakeLists.txt 2017-02-04 19:21:46.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.30.0") # handled by release scripts +set(KF5_VERSION "5.31.0") # handled by release scripts project(KItemModels VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.30.0 NO_MODULE) +find_package(ECM 5.31.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) @@ -15,7 +15,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/kdescendantsproxymodel_smoketest.cpp new/kitemmodels-5.31.0/autotests/kdescendantsproxymodel_smoketest.cpp --- old/kitemmodels-5.30.0/autotests/kdescendantsproxymodel_smoketest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/kdescendantsproxymodel_smoketest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -29,7 +29,7 @@ { Q_OBJECT public: - TestData(ProxyModelTest *parent = 0) + TestData(ProxyModelTest *parent = nullptr) : ProxyModelTestData(parent) { @@ -216,7 +216,7 @@ { Q_OBJECT public: - DescendantsProxyModelTest(QObject *parent = 0) + DescendantsProxyModelTest(QObject *parent = nullptr) : ProxyModelTest(parent) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/kextracolumnsproxymodeltest.cpp new/kitemmodels-5.31.0/autotests/kextracolumnsproxymodeltest.cpp --- old/kitemmodels-5.30.0/autotests/kextracolumnsproxymodeltest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/kextracolumnsproxymodeltest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -395,7 +395,7 @@ QCOMPARE(QModelIndex(persistentIndex), proxy.mapFromSource(sourcePersistentIndex)); }); - ModelMoveLayoutChangeCommand layoutChangeCommand(&model, 0); + ModelMoveLayoutChangeCommand layoutChangeCommand(&model, nullptr); layoutChangeCommand.setAncestorRowNumbers({0, 0, 0}); layoutChangeCommand.setStartRow(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/klinkitemselectionmodeltest.cpp new/kitemmodels-5.31.0/autotests/klinkitemselectionmodeltest.cpp --- old/kitemmodels-5.30.0/autotests/klinkitemselectionmodeltest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/klinkitemselectionmodeltest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -48,13 +48,13 @@ void KLinkItemSelectionModelTest::cleanup() { delete m_mainSelectionModel; - m_mainSelectionModel = 0; + m_mainSelectionModel = nullptr; delete m_mainModel; - m_mainModel = 0; + m_mainModel = nullptr; delete m_subSelectionModel; - m_subSelectionModel = 0; + m_subSelectionModel = nullptr; delete m_subModel; - m_subModel = 0; + m_subModel = nullptr; } void KLinkItemSelectionModelTest::testToggle() @@ -170,7 +170,7 @@ QCOMPARE(m_mainSelectionModel->selection().indexes().first().row(), 6); QCOMPARE(m_subSelectionModel->selection().indexes().first().row(), 1); - QItemSelectionModel replacementSelectionModel(m_mainModel, 0); + QItemSelectionModel replacementSelectionModel(m_mainModel, nullptr); { auto idx = m_mainModel->index(7, 0); replacementSelectionModel.select(idx, QItemSelectionModel::Select); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/kmodelindexproxymappertest.cpp new/kitemmodels-5.31.0/autotests/kmodelindexproxymappertest.cpp --- old/kitemmodels-5.30.0/autotests/kmodelindexproxymappertest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/kmodelindexproxymappertest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -141,7 +141,7 @@ QVERIFY(mapper.isConnected()); - proxy_right2.setSourceModel(Q_NULLPTR); + proxy_right2.setSourceModel(nullptr); QVERIFY(!mapper.isConnected()); QCOMPARE(spy.count(), 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/krecursivefilterproxymodeltest.cpp new/kitemmodels-5.31.0/autotests/krecursivefilterproxymodeltest.cpp --- old/kitemmodels-5.30.0/autotests/krecursivefilterproxymodeltest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/krecursivefilterproxymodeltest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -131,7 +131,7 @@ static void fillModel(QStandardItemModel &model, const QString &str) { QCOMPARE(str.count('['), str.count(']')); - QStandardItem *item = 0; + QStandardItem *item = nullptr; QString data; for ( int i = 0 ; i < str.length() ; ++i ) { const QChar ch = str.at(i); @@ -623,7 +623,7 @@ private: QStandardItem *itemByText(const QStandardItemModel& model, const QString &text) const { QModelIndexList list = model.match(model.index(0, 0), Qt::DisplayRole, text, 1, Qt::MatchRecursive); - return list.isEmpty() ? 0 : model.itemFromIndex(list.first()); + return list.isEmpty() ? nullptr : model.itemFromIndex(list.first()); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/kselectionproxymodeltest.cpp new/kitemmodels-5.31.0/autotests/kselectionproxymodeltest.cpp --- old/kitemmodels-5.30.0/autotests/kselectionproxymodeltest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/kselectionproxymodeltest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -36,7 +36,7 @@ { Q_OBJECT public: - KSelectionProxyModelTest(QObject* parent = 0) + KSelectionProxyModelTest(QObject* parent = nullptr) : QObject(parent), days({ QStringLiteral("Monday"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/kselectionproxymodeltestsuite.h new/kitemmodels-5.31.0/autotests/kselectionproxymodeltestsuite.h --- old/kitemmodels-5.30.0/autotests/kselectionproxymodeltestsuite.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/kselectionproxymodeltestsuite.h 2017-02-04 19:21:46.000000000 +0100 @@ -29,10 +29,10 @@ { Q_OBJECT public: - SelectionProxyModelTest(QObject *parent = 0) + SelectionProxyModelTest(QObject *parent = nullptr) : ProxyModelTest(parent), - m_selectionModel(0), - m_modelSelector(0) + m_selectionModel(nullptr), + m_modelSelector(nullptr) { } @@ -66,7 +66,7 @@ { doCleanupTestCase(); delete m_modelSelector; - m_modelSelector = 0; + m_modelSelector = nullptr; } void cleanup() @@ -162,7 +162,7 @@ class ImmediateSelectionStrategy : public ModelSelector { public: - ImmediateSelectionStrategy(ProxyModelTest *parent = 0) + ImmediateSelectionStrategy(ProxyModelTest *parent = nullptr) : ModelSelector(parent) { if (num1 > 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/dynamictreemodel.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/dynamictreemodel.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -45,7 +45,7 @@ LastRole }; - explicit DynamicTreeModel(QObject *parent = 0); + explicit DynamicTreeModel(QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; @@ -110,7 +110,7 @@ Q_OBJECT public: - ModelChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelChangeCommand() {} @@ -226,7 +226,7 @@ public: - explicit ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelInsertCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelInsertCommand() {} void interpret(const QString &treeString); @@ -248,7 +248,7 @@ public: - explicit ModelInsertAndRemoveQueuedCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelInsertAndRemoveQueuedCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelInsertAndRemoveQueuedCommand() {} void doCommand() Q_DECL_OVERRIDE; @@ -273,7 +273,7 @@ { Q_OBJECT public: - explicit ModelRemoveCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelRemoveCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelRemoveCommand() {} void doCommand() Q_DECL_OVERRIDE; @@ -285,7 +285,7 @@ { Q_OBJECT public: - explicit ModelDataChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + explicit ModelDataChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelDataChangeCommand() {} @@ -364,7 +364,7 @@ { Q_OBJECT public: - ModelResetCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelResetCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelResetCommand(); void setInitialTree(const QString &treeString); @@ -378,7 +378,7 @@ { Q_OBJECT public: - ModelLayoutChangeCommand(DynamicTreeModel *model, QObject *parent = 0); + ModelLayoutChangeCommand(DynamicTreeModel *model, QObject *parent = nullptr); virtual ~ModelLayoutChangeCommand(); struct PersistentChange { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/dynamictreewidget.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/dynamictreewidget.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/dynamictreewidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/dynamictreewidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -37,7 +37,7 @@ { Q_OBJECT public: - DynamicTreeWidget(DynamicTreeModel *rootModel, QWidget *parent = 0, Qt::WindowFlags f = 0); + DynamicTreeWidget(DynamicTreeModel *rootModel, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); void setInitialTree(const QString &treeString); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/eventloggerregister.cpp new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/eventloggerregister.cpp --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/eventloggerregister.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/eventloggerregister.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -29,7 +29,7 @@ { } -EventLoggerRegister *EventLoggerRegister::s_instance = 0; +EventLoggerRegister *EventLoggerRegister::s_instance = nullptr; std::auto_ptr<EventLoggerRegister> EventLoggerRegister::s_destroyer; EventLoggerRegister *EventLoggerRegister::instance(Behaviour behaviour) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/indexfinder.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/indexfinder.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/indexfinder.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/indexfinder.h 2017-02-04 19:21:46.000000000 +0100 @@ -25,7 +25,7 @@ class IndexFinder { public: - IndexFinder(QList<int> rows = QList<int>()) : m_rows(rows), m_model(0) {} + IndexFinder(QList<int> rows = QList<int>()) : m_rows(rows), m_model(nullptr) {} IndexFinder(const QAbstractItemModel *model, QList<int> rows = QList<int>()) : m_rows(rows), m_model(model) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelcommander.cpp new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelcommander.cpp --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelcommander.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelcommander.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -250,7 +250,7 @@ m_currentCommand = command; command->doCommand(); delete command; - command = 0; + command = nullptr; } ModelChangeCommand *ModelCommander::currentCommand() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modeleventlogger.cpp new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modeleventlogger.cpp --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modeleventlogger.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modeleventlogger.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -68,7 +68,7 @@ class ModelWrapper : public QAbstractItemModel { public: - ModelWrapper(QAbstractItemModel */*model*/, QObject *parent = 0) + ModelWrapper(QAbstractItemModel */*model*/, QObject *parent = nullptr) : QAbstractItemModel(parent) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modeleventlogger.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modeleventlogger.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modeleventlogger.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modeleventlogger.h 2017-02-04 19:21:46.000000000 +0100 @@ -37,7 +37,7 @@ Q_PROPERTY(QString newPath READ getNewPath) public: - PersistentChange(QObject *parent = 0) + PersistentChange(QObject *parent = nullptr) : QObject(parent) { @@ -95,7 +95,7 @@ Q_PROPERTY(QVariantList changes READ changes) public: - ModelEvent(QObject *parent = 0); + ModelEvent(QObject *parent = nullptr); // Type type() const; QString type() const; @@ -150,7 +150,7 @@ { Q_OBJECT public: - ModelEventLogger(QAbstractItemModel *model, QObject *parent = 0); + ModelEventLogger(QAbstractItemModel *model, QObject *parent = nullptr); void writeLog(); virtual ~ModelEventLogger(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelselector.cpp new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelselector.cpp --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelselector.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelselector.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -21,9 +21,9 @@ ModelSelector::ModelSelector(ProxyModelTest *parent) : ProxyModelTestData(parent), - m_model(0), - m_selectionModel(0), - m_rootModel(0) + m_model(nullptr), + m_selectionModel(nullptr), + m_rootModel(nullptr) { Q_ASSERT(parent); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelselector.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelselector.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelselector.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelselector.h 2017-02-04 19:21:46.000000000 +0100 @@ -36,7 +36,7 @@ { Q_OBJECT public: - ModelSelector(ProxyModelTest *ProxyModelTest = 0); + ModelSelector(ProxyModelTest *ProxyModelTest = nullptr); void setWatchedModel(QAbstractItemModel *model); @@ -128,8 +128,8 @@ protected Q_SLOTS: void modelDestroyed() { - m_model = 0; - m_selectionModel = 0; + m_model = nullptr; + m_selectionModel = nullptr; } protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelspy.cpp new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelspy.cpp --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modelspy.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modelspy.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -22,7 +22,7 @@ #include <QDebug> ModelSpy::ModelSpy(QObject *parent) - : QObject(parent), QList<QVariantList>(), m_model(0), m_isSpying(false), m_lazyPersist(false) + : QObject(parent), QList<QVariantList>(), m_model(nullptr), m_isSpying(false), m_lazyPersist(false) { } @@ -169,7 +169,7 @@ void ModelSpy::modelDestroyed() { stopSpying(); - m_model = 0; + m_model = nullptr; } void ModelSpy::rowsAboutToBeMoved(const QModelIndex &srcParent, int start, int end, const QModelIndex &destParent, int destStart) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modeltest.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modeltest.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/modeltest.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/modeltest.h 2017-02-04 19:21:46.000000000 +0100 @@ -36,8 +36,8 @@ Pedantic }; - ModelTest( QAbstractItemModel *model, QObject *parent = 0 ); - ModelTest( QAbstractItemModel *model, Mode testType, QObject *parent = 0 ); + ModelTest( QAbstractItemModel *model, QObject *parent = nullptr ); + ModelTest( QAbstractItemModel *model, Mode testType, QObject *parent = nullptr ); private Q_SLOTS: void nonDestructiveBasicTest(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/proxymodeltest.cpp new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/proxymodeltest.cpp --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/proxymodeltest.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -30,8 +30,8 @@ : QObject(parent), m_rootModel(new DynamicTreeModel(this)), m_sourceModel(m_rootModel), - m_proxyModel(0), - m_intermediateProxyModel(0), + m_proxyModel(nullptr), + m_intermediateProxyModel(nullptr), m_modelSpy(new ModelSpy(this)), m_modelCommander(new ModelCommander(m_rootModel, this)) { @@ -108,7 +108,7 @@ const char *currentTest = QTest::currentTestFunction(); const char *currentTag = QTest::currentDataTag(); - QVERIFY(currentTest != 0); + QVERIFY(currentTest != nullptr); initRootModel(m_rootModel, currentTest, currentTag); Q_ASSERT(sourceModel()); @@ -143,10 +143,10 @@ { QVERIFY(m_modelSpy->isEmpty()); m_modelSpy->stopSpying(); - m_modelSpy->setModel(0); - m_proxyModel->setSourceModel(0); + m_modelSpy->setModel(nullptr); + m_proxyModel->setSourceModel(nullptr); delete m_proxyModel; - m_proxyModel = 0; + m_proxyModel = nullptr; QVERIFY(m_modelSpy->isEmpty()); } @@ -160,7 +160,7 @@ m_sourceModel = m_rootModel; delete m_intermediateProxyModel; - m_intermediateProxyModel = 0; + m_intermediateProxyModel = nullptr; m_modelSpy->clear(); } @@ -320,7 +320,7 @@ testMappings(); m_rootModel->clear(); // Resets the model. testMappings(); // Calls some rowCount() etc which should test internal structures in the proxy. - m_proxyModel->setSourceModel(0); + m_proxyModel->setSourceModel(nullptr); m_modelSpy->startSpying(); } @@ -352,7 +352,7 @@ if (proxyModel->hasChildren()) { m_modelSpy->startSpying(); delete m_sourceModel; - m_sourceModel = 0; + m_sourceModel = nullptr; m_modelSpy->stopSpying(); testMappings(); // QCOMPARE(m_modelSpy->size(), 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/proxymodeltest.h new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/proxymodeltest.h --- old/kitemmodels-5.30.0/autotests/proxymodeltestsuite/proxymodeltest.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/autotests/proxymodeltestsuite/proxymodeltest.h 2017-02-04 19:21:46.000000000 +0100 @@ -122,7 +122,7 @@ { Q_OBJECT public: - ProxyModelTest(QObject *parent = 0); + ProxyModelTest(QObject *parent = nullptr); virtual ~ProxyModelTest() {} void setLazyPersistence(Persistence persistence); @@ -359,7 +359,7 @@ { Q_OBJECT public: - ProxyModelTestData(ProxyModelTest *parent = 0) + ProxyModelTestData(ProxyModelTest *parent = nullptr) : QObject(parent), m_proxyModelTest(parent) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/CMakeLists.txt new/kitemmodels-5.31.0/src/CMakeLists.txt --- old/kitemmodels-5.30.0/src/CMakeLists.txt 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/CMakeLists.txt 2017-02-04 19:21:46.000000000 +0100 @@ -48,6 +48,7 @@ TARGET KF5::ItemModels PYTHONNAMESPACE PyKF5 MODULENAME KItemModels + INSTALL_DIR_SUFFIX ${KDE_INSTALL_PYTHONBINDINGSDIR} SIP_DEPENDS QtCore/QtCoremod.sip HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kbreadcrumbselectionmodel.h new/kitemmodels-5.31.0/src/kbreadcrumbselectionmodel.h --- old/kitemmodels-5.30.0/src/kbreadcrumbselectionmodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kbreadcrumbselectionmodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -115,8 +115,8 @@ MakeBreadcrumbSelectionInSelf }; - explicit KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, QObject *parent = 0); - KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, BreadcrumbTarget target, QObject *parent = 0); + explicit KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); + KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, BreadcrumbTarget target, QObject *parent = nullptr); virtual ~KBreadcrumbSelectionModel(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kcheckableproxymodel.cpp new/kitemmodels-5.31.0/src/kcheckableproxymodel.cpp --- old/kitemmodels-5.30.0/src/kcheckableproxymodel.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kcheckableproxymodel.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -28,7 +28,7 @@ KCheckableProxyModelPrivate(KCheckableProxyModel *checkableModel) : q_ptr(checkableModel), - m_itemSelectionModel(0) + m_itemSelectionModel(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kcheckableproxymodel.h new/kitemmodels-5.31.0/src/kcheckableproxymodel.h --- old/kitemmodels-5.30.0/src/kcheckableproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kcheckableproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -65,7 +65,7 @@ { Q_OBJECT public: - KCheckableProxyModel(QObject *parent = 0); + KCheckableProxyModel(QObject *parent = nullptr); ~KCheckableProxyModel(); void setSelectionModel(QItemSelectionModel *itemSelectionModel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kconcatenaterowsproxymodel.cpp new/kitemmodels-5.31.0/src/kconcatenaterowsproxymodel.cpp --- old/kitemmodels-5.30.0/src/kconcatenaterowsproxymodel.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kconcatenaterowsproxymodel.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -206,7 +206,7 @@ void KConcatenateRowsProxyModel::removeSourceModel(QAbstractItemModel *sourceModel) { Q_ASSERT(d->m_models.contains(sourceModel)); - disconnect(sourceModel, 0, this, 0); + disconnect(sourceModel, nullptr, this, nullptr); const int rowsRemoved = sourceModel->rowCount(); const int rowsPrior = d->computeRowsPrior(sourceModel); // location of removed section @@ -397,7 +397,7 @@ QAbstractItemModel *KConcatenateRowsProxyModelPrivate::sourceModelForRow(int row, int *sourceRow) const { int rowCount = 0; - QAbstractItemModel *selection = NULL; + QAbstractItemModel *selection = nullptr; foreach (QAbstractItemModel *model, m_models) { const int subRowCount = model->rowCount(); if (rowCount + subRowCount > row) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kconcatenaterowsproxymodel.h new/kitemmodels-5.31.0/src/kconcatenaterowsproxymodel.h --- old/kitemmodels-5.30.0/src/kconcatenaterowsproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kconcatenaterowsproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -64,7 +64,7 @@ * Creates a KConcatenateRowsProxyModel. * @param parent optional parent */ - KConcatenateRowsProxyModel(QObject *parent = 0); + KConcatenateRowsProxyModel(QObject *parent = nullptr); /** * Destructor. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kdescendantsproxymodel.h new/kitemmodels-5.31.0/src/kdescendantsproxymodel.h --- old/kitemmodels-5.30.0/src/kdescendantsproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kdescendantsproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -77,7 +77,7 @@ * * @param parent The parent object. */ - explicit KDescendantsProxyModel(QObject *parent = 0); + explicit KDescendantsProxyModel(QObject *parent = nullptr); /** * Destroys the descendant entities proxy model. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kextracolumnsproxymodel.h new/kitemmodels-5.31.0/src/kextracolumnsproxymodel.h --- old/kitemmodels-5.30.0/src/kextracolumnsproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kextracolumnsproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -54,7 +54,7 @@ * Base class constructor. * Remember to call setSourceModel afterwards, and appendColumn. */ - explicit KExtraColumnsProxyModel(QObject *parent = 0); + explicit KExtraColumnsProxyModel(QObject *parent = nullptr); /** * Destructor. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/klinkitemselectionmodel.cpp new/kitemmodels-5.31.0/src/klinkitemselectionmodel.cpp --- old/kitemmodels-5.30.0/src/klinkitemselectionmodel.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/klinkitemselectionmodel.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -33,9 +33,9 @@ public: KLinkItemSelectionModelPrivate(KLinkItemSelectionModel *proxySelectionModel) : q_ptr(proxySelectionModel), - m_linkedItemSelectionModel(Q_NULLPTR), + m_linkedItemSelectionModel(nullptr), m_ignoreCurrentChanged(false), - m_indexMapper(Q_NULLPTR) + m_indexMapper(nullptr) { QObject::connect(q_ptr, &QItemSelectionModel::currentChanged, q_ptr, [this](const QModelIndex& idx) { slotCurrentChanged(idx); } ); @@ -62,7 +62,7 @@ void reinitializeIndexMapper() { delete m_indexMapper; - m_indexMapper = Q_NULLPTR; + m_indexMapper = nullptr; if (!q_ptr->model() || !m_linkedItemSelectionModel || !m_linkedItemSelectionModel->model()) { @@ -93,7 +93,7 @@ } KLinkItemSelectionModel::KLinkItemSelectionModel(QObject *parent) - : QItemSelectionModel(Q_NULLPTR, parent), + : QItemSelectionModel(nullptr, parent), d_ptr(new KLinkItemSelectionModelPrivate(this)) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/klinkitemselectionmodel.h new/kitemmodels-5.31.0/src/klinkitemselectionmodel.h --- old/kitemmodels-5.30.0/src/klinkitemselectionmodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/klinkitemselectionmodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -34,7 +34,7 @@ /** @brief Makes it possible to share a selection in multiple views which do not have the same source model - Although <a href="http://doc.trolltech.com/4.6/model-view-view.html#sharing-selections-between-views";>multiple views can share the same QItemSelectionModel</a>, the views then need to have the same source model. + Although <a href="https://doc.qt.io/qt-5/model-view-programming.html#handling-selections-of-items";>multiple views can share the same QItemSelectionModel</a>, the views then need to have the same source model. If there is a proxy model between the model and one of the views, or different proxy models in each, this class makes it possible to share the selection between the views. @@ -103,9 +103,9 @@ /** Constructor. */ - KLinkItemSelectionModel(QAbstractItemModel *targetModel, QItemSelectionModel *linkedItemSelectionModel, QObject *parent = 0); + KLinkItemSelectionModel(QAbstractItemModel *targetModel, QItemSelectionModel *linkedItemSelectionModel, QObject *parent = nullptr); - explicit KLinkItemSelectionModel(QObject *parent = Q_NULLPTR); + explicit KLinkItemSelectionModel(QObject *parent = nullptr); ~KLinkItemSelectionModel(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kmodelindexproxymapper.h new/kitemmodels-5.31.0/src/kmodelindexproxymapper.h --- old/kitemmodels-5.30.0/src/kmodelindexproxymapper.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kmodelindexproxymapper.h 2017-02-04 19:21:46.000000000 +0100 @@ -95,7 +95,7 @@ /** * Constructor */ - KModelIndexProxyMapper(const QAbstractItemModel *leftModel, const QAbstractItemModel *rightModel, QObject *parent = 0); + KModelIndexProxyMapper(const QAbstractItemModel *leftModel, const QAbstractItemModel *rightModel, QObject *parent = nullptr); ~KModelIndexProxyMapper(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/krearrangecolumnsproxymodel.h new/kitemmodels-5.31.0/src/krearrangecolumnsproxymodel.h --- old/kitemmodels-5.30.0/src/krearrangecolumnsproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/krearrangecolumnsproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -47,7 +47,7 @@ * Creates a KRearrangeColumnsProxyModel proxy. * Remember to call setSourceModel afterwards. */ - explicit KRearrangeColumnsProxyModel(QObject *parent = 0); + explicit KRearrangeColumnsProxyModel(QObject *parent = nullptr); /** * Destructor. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/krecursivefilterproxymodel.cpp new/kitemmodels-5.31.0/src/krecursivefilterproxymodel.cpp --- old/kitemmodels-5.30.0/src/krecursivefilterproxymodel.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/krecursivefilterproxymodel.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -31,14 +31,7 @@ // to be cleared, even if only a part of it is dirty. // Stephen Kelly, 30 April 2010. -inline static bool passRolesToDataChanged() -{ - // runtime check to ensure a KF5 built against Qt < 5.5 keeps working when Qt is updated to 5.5 and above but KF5 is not rebuild - // TODO: remove once Qt 5.5 or above is required for frameworks - static const bool passRoles = QT_VERSION >= 0x050500 // no runtime check required when we built against Qt 5.5 or higher - || KRecursiveFilterProxyModel::staticMetaObject.indexOfMethod("_q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>)") != -1; - return passRoles; -} +// All this is temporary anyway, the long term solution is support in QSFPM: https://codereview.qt-project.org/151000 class KRecursiveFilterProxyModelPrivate { @@ -65,21 +58,12 @@ inline void invokeDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) { Q_Q(KRecursiveFilterProxyModel); - bool success = false; - if (passRolesToDataChanged()) { - // required for Qt 5.5 and upwards, see commit f96baeb75fc in qtbase - static const QMetaMethod m = findMethod("_q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>)"); - success = m.invoke(q, Qt::DirectConnection, - Q_ARG(QModelIndex, topLeft), - Q_ARG(QModelIndex, bottomRight), - Q_ARG(QVector<int>, roles)); - } else { - // backwards compatibility - static const QMetaMethod m = findMethod("_q_sourceDataChanged(QModelIndex,QModelIndex)"); - success = m.invoke(q, Qt::DirectConnection, - Q_ARG(QModelIndex, topLeft), - Q_ARG(QModelIndex, bottomRight)); - } + // required for Qt 5.5 and upwards, see commit f96baeb75fc in qtbase + static const QMetaMethod m = findMethod("_q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>)"); + bool success = m.invoke(q, Qt::DirectConnection, + Q_ARG(QModelIndex, topLeft), + Q_ARG(QModelIndex, bottomRight), + Q_ARG(QVector<int>, roles)); Q_UNUSED(success); Q_ASSERT(success); } @@ -320,13 +304,8 @@ { // Standard disconnect of the previous source model, if present if (sourceModel()) { - if (passRolesToDataChanged()) { - disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), - this, SLOT(sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))); - } else { - disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(sourceDataChanged(QModelIndex,QModelIndex))); - } + disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), + this, SLOT(sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))); disconnect(sourceModel(), SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(sourceRowsAboutToBeInserted(QModelIndex,int,int))); @@ -411,13 +390,8 @@ return; } - if (passRolesToDataChanged()) { - disconnect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), - this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))); - } else { - disconnect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex))); - } + disconnect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), + this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))); disconnect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_sourceRowsAboutToBeInserted(QModelIndex,int,int))); @@ -432,13 +406,8 @@ this, SLOT(_q_sourceRowsRemoved(QModelIndex,int,int))); // Slots for manual invoking of QSortFilterProxyModel methods. - if (passRolesToDataChanged()) { - connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), - this, SLOT(sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))); - } else { - connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(sourceDataChanged(QModelIndex,QModelIndex))); - } + connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), + this, SLOT(sourceDataChanged(QModelIndex,QModelIndex,QVector<int>))); connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(sourceRowsAboutToBeInserted(QModelIndex,int,int))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/krecursivefilterproxymodel.h new/kitemmodels-5.31.0/src/krecursivefilterproxymodel.h --- old/kitemmodels-5.30.0/src/krecursivefilterproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/krecursivefilterproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -90,7 +90,7 @@ /** Constructor */ - explicit KRecursiveFilterProxyModel(QObject *parent = 0); + explicit KRecursiveFilterProxyModel(QObject *parent = nullptr); /** Destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kselectionproxymodel.cpp new/kitemmodels-5.31.0/src/kselectionproxymodel.cpp --- old/kitemmodels-5.30.0/src/kselectionproxymodel.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kselectionproxymodel.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -408,7 +408,7 @@ public: KSelectionProxyModelPrivate(KSelectionProxyModel *model) : q_ptr(model), - m_indexMapper(0), + m_indexMapper(nullptr), m_startWithChildTrees(false), m_omitChildren(false), m_omitDescendants(false), @@ -423,7 +423,7 @@ m_layoutChanging(false), m_ignoreNextLayoutAboutToBeChanged(false), m_ignoreNextLayoutChanged(false), - m_selectionModel(0), + m_selectionModel(nullptr), m_filterBehavior(KSelectionProxyModel::InvalidBehavior) { } @@ -2013,7 +2013,7 @@ } KSelectionProxyModel::KSelectionProxyModel() - : QAbstractProxyModel(0), d_ptr(new KSelectionProxyModelPrivate(this)) + : QAbstractProxyModel(nullptr), d_ptr(new KSelectionProxyModelPrivate(this)) { } @@ -2169,7 +2169,7 @@ Q_ASSERT(proxyIndex.model() == this); - if (proxyIndex.internalPointer() == 0) { + if (proxyIndex.internalPointer() == nullptr) { return d->mapTopLevelToSource(proxyIndex.row(), proxyIndex.column()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kselectionproxymodel.h new/kitemmodels-5.31.0/src/kselectionproxymodel.h --- old/kitemmodels-5.30.0/src/kselectionproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kselectionproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -65,7 +65,7 @@ \image html selectionproxymodelmultipleselection-withdescendant.png "Selecting an item and its descendant." - See the test application in KDE/kdelibs/kdeui/tests/proxymodeltestapp to try out the valid configurations. + See the test application in tests/proxymodeltestapp to try out the valid configurations. \image html kselectionproxymodel-testapp.png "KSelectionProxyModel test application" @@ -76,7 +76,7 @@ Additionally, this class can be used to programmatically choose some items from the source model to display in the view. For example, this is how the Favourite Folder View in KMail works, and is also used in unit testing. - See also: http://doc.trolltech.com/4.5/model-view-proxy-models.html + See also: https://doc.qt.io/qt-5/model-view-programming.html#proxy-models @since 4.4 @author Stephen Kelly <steve...@gmail.com> @@ -96,7 +96,7 @@ @p selectionModel The selection model used to filter what is presented by the proxy. */ // KF6: Remove the selectionModel from the constructor here. - explicit KSelectionProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); + explicit KSelectionProxyModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); /** Default constructor. Allow the creation of a KSelectionProxyModel in QML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/src/kvoidpointerfactory_p.h new/kitemmodels-5.31.0/src/kvoidpointerfactory_p.h --- old/kitemmodels-5.30.0/src/kvoidpointerfactory_p.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/src/kvoidpointerfactory_p.h 2017-02-04 19:21:46.000000000 +0100 @@ -51,8 +51,8 @@ public: KVoidPointerFactory() - : m_previousPointer(0), - m_finalPointer(0) + : m_previousPointer(nullptr), + m_finalPointer(nullptr) { } @@ -82,8 +82,8 @@ free(*it); } m_blocks.clear(); - m_finalPointer = 0; - m_previousPointer = 0; + m_finalPointer = nullptr; + m_previousPointer = nullptr; } void *createPointer() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/breadcrumbdirectionwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -28,7 +28,7 @@ { Q_OBJECT public: - BreadcrumbDirectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + BreadcrumbDirectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); protected: bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/breadcrumbnavigationwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -34,7 +34,7 @@ { Q_OBJECT public: - CurrentItemLabel(QAbstractItemModel *model, QWidget *parent = 0, Qt::WindowFlags f = 0); + CurrentItemLabel(QAbstractItemModel *model, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void rowsInserted(const QModelIndex &parent, int start, int end); @@ -50,7 +50,7 @@ { Q_OBJECT public: - KBreadcrumbNavigationProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); + KBreadcrumbNavigationProxyModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); void setShowHiddenAscendantData(bool showHiddenAscendantData); bool showHiddenAscendantData() const; @@ -66,7 +66,7 @@ { Q_OBJECT public: - KNavigatingProxyModel(QItemSelectionModel *selectionModel, QObject *parent = 0); + KNavigatingProxyModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr); void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; @@ -94,8 +94,8 @@ Forward, Reverse }; - KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = 0); - KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = 0); + KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = nullptr); + KForwardingItemSelectionModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, Direction direction, QObject *parent = nullptr); void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE; void select(const QItemSelection &selection, SelectionFlags command) Q_DECL_OVERRIDE; @@ -112,7 +112,7 @@ { Q_OBJECT public: - BreadcrumbNavigationWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + BreadcrumbNavigationWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/breadcrumbswidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/breadcrumbswidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/breadcrumbswidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/breadcrumbswidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -34,7 +34,7 @@ { Q_OBJECT public: - MultiSelectionModel(QAbstractItemModel *model, QList<QItemSelectionModel *> selectionModels, QObject *parent = 0); + MultiSelectionModel(QAbstractItemModel *model, QList<QItemSelectionModel *> selectionModels, QObject *parent = nullptr); public: void select(const QModelIndex &index, SelectionFlags command) Q_DECL_OVERRIDE; @@ -48,7 +48,7 @@ { Q_OBJECT public: - BreadcrumbsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + BreadcrumbsWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/checkablewidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/checkablewidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/checkablewidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/checkablewidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -28,7 +28,7 @@ { Q_OBJECT public: - CheckableWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + CheckableWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/descendantpmwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/descendantpmwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/descendantpmwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/descendantpmwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -38,7 +38,7 @@ { Q_OBJECT public: - DescendantProxyModelWidget(QWidget *parent = 0); + DescendantProxyModelWidget(QWidget *parent = nullptr); virtual ~DescendantProxyModelWidget(); protected Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/kidentityproxymodelwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/kidentityproxymodelwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/kidentityproxymodelwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/kidentityproxymodelwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -28,7 +28,7 @@ { Q_OBJECT public: - KIdentityProxyModelWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + KIdentityProxyModelWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp new/kitemmodels-5.31.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/kreparentingproxymodel.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -68,7 +68,7 @@ If @p model is 0, the sourceModel is used Returns an invalid index if there is no index below @p index. */ - QModelIndex getIndexBelow(const QModelIndex &index, QAbstractItemModel *model = 0) const; + QModelIndex getIndexBelow(const QModelIndex &index, QAbstractItemModel *model = nullptr) const; /** Returns the last descendant of @p index or itself if it has no children diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/kreparentingproxymodel.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/kreparentingproxymodel.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/kreparentingproxymodel.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/kreparentingproxymodel.h 2017-02-04 19:21:46.000000000 +0100 @@ -100,7 +100,7 @@ { Q_OBJECT public: - KReparentingProxyModel(QObject *parent = 0); + KReparentingProxyModel(QObject *parent = nullptr); virtual ~KReparentingProxyModel(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/lessthanwidget.cpp new/kitemmodels-5.31.0/tests/proxymodeltestapp/lessthanwidget.cpp --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/lessthanwidget.cpp 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/lessthanwidget.cpp 2017-02-04 19:21:46.000000000 +0100 @@ -27,7 +27,7 @@ ColoredTreeModel::ColoredTreeModel(QObject *parent) : DynamicTreeModel(parent), - m_selectionModel(0), + m_selectionModel(nullptr), m_lessThanColour(Qt::yellow), m_greaterThanColour(Qt::red) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/lessthanwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/lessthanwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/lessthanwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/lessthanwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -31,7 +31,7 @@ { Q_OBJECT public: - ColoredTreeModel(QObject *parent = 0); + ColoredTreeModel(QObject *parent = nullptr); /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; @@ -50,7 +50,7 @@ { Q_OBJECT public: - LessThanWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + LessThanWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); void insertGrid(QList<int> address); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/matchcheckingwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/matchcheckingwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/matchcheckingwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/matchcheckingwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -32,7 +32,7 @@ { Q_OBJECT public: - MatchCheckingWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + MatchCheckingWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void matchChanged(const QString &matchData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/modelcommanderwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/modelcommanderwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/modelcommanderwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/modelcommanderwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -33,7 +33,7 @@ { Q_OBJECT public: - ModelCommanderWidget(DynamicTreeModel *dynamicTreeModel, QWidget *parent = 0, Qt::WindowFlags f = 0); + ModelCommanderWidget(DynamicTreeModel *dynamicTreeModel, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void initTest(QTreeWidgetItem *item); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/proxyitemselectionwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/proxyitemselectionwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/proxyitemselectionwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/proxyitemselectionwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -28,7 +28,7 @@ { Q_OBJECT public: - ProxyItemSelectionWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + ProxyItemSelectionWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/proxymodeltestwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/proxymodeltestwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/proxymodeltestwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/proxymodeltestwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -32,7 +32,7 @@ { Q_OBJECT public: - explicit ProxyModelTestWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit ProxyModelTestWidget(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private: DynamicTreeModel *m_rootModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/recursivefilterpmwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/recursivefilterpmwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/recursivefilterpmwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/recursivefilterpmwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -38,7 +38,7 @@ { Q_OBJECT public: - KRecursiveFilterProxyModelSubclass(QObject *parent = 0) + KRecursiveFilterProxyModelSubclass(QObject *parent = nullptr) : KRecursiveFilterProxyModel(parent) { @@ -67,7 +67,7 @@ { Q_OBJECT public: - RecursiveFilterProxyWidget(QWidget *parent = 0); + RecursiveFilterProxyWidget(QWidget *parent = nullptr); protected Q_SLOTS: void reset(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/reparentingpmwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/reparentingpmwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/reparentingpmwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/reparentingpmwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -32,7 +32,7 @@ { Q_OBJECT public: - ReparentingProxyModelWidget(QWidget *parent = 0); + ReparentingProxyModelWidget(QWidget *parent = nullptr); private: DynamicTreeModel *m_rootModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/scriptablereparentingwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/scriptablereparentingwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/scriptablereparentingwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/scriptablereparentingwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -34,7 +34,7 @@ { Q_OBJECT public: - ScriptableReparentingProxyModel(QObject *parent = 0); + ScriptableReparentingProxyModel(QObject *parent = nullptr); /* reimp */ bool isDescendantOf(const QModelIndex &ancestor, const QModelIndex &descendant) const Q_DECL_OVERRIDE; @@ -49,7 +49,7 @@ { Q_OBJECT public: - ScriptableReparentingWidget(QAbstractItemModel *rootModel, QWidget *parent = 0, Qt::WindowFlags f = 0); + ScriptableReparentingWidget(QAbstractItemModel *rootModel, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); private Q_SLOTS: void textChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/selectioninqmlwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/selectioninqmlwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/selectioninqmlwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/selectioninqmlwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -31,7 +31,7 @@ class SelectionInQmlWidget : public QWidget { public: - SelectionInQmlWidget(QWidget *parent = 0); + SelectionInQmlWidget(QWidget *parent = nullptr); private: DynamicTreeModel *m_rootModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.30.0/tests/proxymodeltestapp/selectionpmwidget.h new/kitemmodels-5.31.0/tests/proxymodeltestapp/selectionpmwidget.h --- old/kitemmodels-5.30.0/tests/proxymodeltestapp/selectionpmwidget.h 2017-01-08 16:33:09.000000000 +0100 +++ new/kitemmodels-5.31.0/tests/proxymodeltestapp/selectionpmwidget.h 2017-02-04 19:21:46.000000000 +0100 @@ -31,7 +31,7 @@ class SelectionProxyWidget : public QWidget { public: - SelectionProxyWidget(QWidget *parent = 0); + SelectionProxyWidget(QWidget *parent = nullptr); protected: QTreeView *createLabelledView(const QString &labelText, QWidget *parent);
