Hello community,
here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2018-06-22 13:21:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old)
and /work/SRC/openSUSE:Factory/.kitemmodels.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels"
Fri Jun 22 13:21:05 2018 rev:54 rq:616770 version:5.47.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2018-05-18 14:22:08.299065170 +0200
+++ /work/SRC/openSUSE:Factory/.kitemmodels.new/kitemmodels.changes 2018-06-22 13:21:07.510267914 +0200
@@ -1,0 +2,12 @@
+Tue Jun 12 21:26:05 UTC 2018 - lbeltrame@kde.org
+
+- Update to 5.47.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.47.0.php
+- Changes since 5.46.0:
+ * Properly sanitize input
+ * Warning--
+ * Use override
+
+-------------------------------------------------------------------
Old:
----
kitemmodels-5.46.0.tar.xz
New:
----
kitemmodels-5.47.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kitemmodels.spec ++++++
--- /var/tmp/diff_new_pack.Uuy6wu/_old 2018-06-22 13:21:08.046248110 +0200
+++ /var/tmp/diff_new_pack.Uuy6wu/_new 2018-06-22 13:21:08.050247962 +0200
@@ -19,13 +19,13 @@
%bcond_with python
%define clang_sonum 3.8
%define lname libKF5ItemModels5
-%define _tar_path 5.46
+%define _tar_path 5.47
# 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
Name: kitemmodels
-Version: 5.46.0
+Version: 5.47.0
Release: 0
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
@@ -98,7 +98,7 @@
%files -n %lname
%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
%{_kf5_libdir}/libKF5ItemModels.so.*
%{_kf5_debugdir}/*.categories
++++++ kitemmodels-5.46.0.tar.xz -> kitemmodels-5.47.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/CMakeLists.txt new/kitemmodels-5.47.0/CMakeLists.txt
--- old/kitemmodels-5.46.0/CMakeLists.txt 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/CMakeLists.txt 2018-06-02 18:28:36.000000000 +0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.46.0") # handled by release scripts
+set(KF5_VERSION "5.47.0") # handled by release scripts
project(KItemModels VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.46.0 NO_MODULE)
+find_package(ECM 5.47.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.46.0/autotests/kdescendantsproxymodel_smoketest.cpp new/kitemmodels-5.47.0/autotests/kdescendantsproxymodel_smoketest.cpp
--- old/kitemmodels-5.46.0/autotests/kdescendantsproxymodel_smoketest.cpp 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/kdescendantsproxymodel_smoketest.cpp 2018-06-02 18:28:36.000000000 +0200
@@ -36,7 +36,7 @@
}
public Q_SLOTS:
- void testInsertWhenEmptyData() Q_DECL_OVERRIDE
+ void testInsertWhenEmptyData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -63,7 +63,7 @@
// QTest::newRow("insert03") << signalList << persistentList;
}
- void testInsertInRootData() Q_DECL_OVERRIDE
+ void testInsertInRootData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -90,7 +90,7 @@
skipTestData(QStringLiteral("insert18"));
}
- void testInsertInTopLevelData() Q_DECL_OVERRIDE
+ void testInsertInTopLevelData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -117,7 +117,7 @@
skipTestData(QStringLiteral("insert18"));
}
- void testInsertInSecondLevelData() Q_DECL_OVERRIDE
+ void testInsertInSecondLevelData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -144,7 +144,7 @@
skipTestData(QStringLiteral("insert18"));
}
- void testRemoveFromRootData() Q_DECL_OVERRIDE
+ void testRemoveFromRootData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -156,7 +156,7 @@
newRemoveTest(QStringLiteral("remove03"), indexFinder, 42, 42, 43);
}
- void testRemoveFromTopLevelData() Q_DECL_OVERRIDE
+ void testRemoveFromTopLevelData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -168,7 +168,7 @@
newRemoveTest(QStringLiteral("remove03"), indexFinder, 36, 36, 43);
}
- void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE
+ void testRemoveFromSecondLevelData() override
{
QTest::addColumn<SignalList>("signalList");
QTest::addColumn<PersistentChangeList>("changeList");
@@ -180,32 +180,32 @@
newRemoveTest(QStringLiteral("remove03"), indexFinder, 31, 31, 43);
}
- void testMoveFromRootData() Q_DECL_OVERRIDE
+ void testMoveFromRootData() override
{
dummyTestData();
}
- void testMoveFromTopLevelData() Q_DECL_OVERRIDE
+ void testMoveFromTopLevelData() override
{
dummyTestData();
}
- void testMoveFromSecondLevelData() Q_DECL_OVERRIDE
+ void testMoveFromSecondLevelData() override
{
dummyTestData();
}
- void testModifyInRootData() Q_DECL_OVERRIDE
+ void testModifyInRootData() override
{
dummyTestData();
}
- void testModifyInTopLevelData() Q_DECL_OVERRIDE
+ void testModifyInTopLevelData() override
{
dummyTestData();
}
- void testModifyInSecondLevelData() Q_DECL_OVERRIDE
+ void testModifyInSecondLevelData() override
{
dummyTestData();
}
@@ -228,7 +228,7 @@
}
protected:
- QAbstractProxyModel *getProxy() Q_DECL_OVERRIDE
+ QAbstractProxyModel *getProxy() override
{
return new KDescendantsProxyModel(this);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/kextracolumnsproxymodeltest.cpp new/kitemmodels-5.47.0/autotests/kextracolumnsproxymodeltest.cpp
--- old/kitemmodels-5.46.0/autotests/kextracolumnsproxymodeltest.cpp 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/kextracolumnsproxymodeltest.cpp 2018-06-02 18:28:36.000000000 +0200
@@ -41,7 +41,7 @@
private:
class NoExtraColumns : public KExtraColumnsProxyModel
{
- QVariant extraColumnData(const QModelIndex &, int, int, int) const Q_DECL_OVERRIDE
+ QVariant extraColumnData(const QModelIndex &, int, int, int) const override
{
Q_ASSERT(0);
return QVariant();
@@ -58,7 +58,7 @@
appendColumn(QStringLiteral("H6"));
removeExtraColumn(1);
}
- QVariant extraColumnData(const QModelIndex &, int row, int extraColumn, int role) const Q_DECL_OVERRIDE
+ QVariant extraColumnData(const QModelIndex &, int row, int extraColumn, int role) const override
{
if (role != Qt::DisplayRole) {
return QVariant();
@@ -73,7 +73,7 @@
return QVariant();
}
}
- bool setExtraColumnData(const QModelIndex &parent, int row, int extraColumn, const QVariant &data, int role) Q_DECL_OVERRIDE {
+ bool setExtraColumnData(const QModelIndex &parent, int row, int extraColumn, const QVariant &data, int role) override {
if (extraColumn == 0 && role == Qt::EditRole)
{
m_extraColumnData = data.toString().at(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/krecursivefilterproxymodeltest.cpp new/kitemmodels-5.47.0/autotests/krecursivefilterproxymodeltest.cpp
--- old/kitemmodels-5.46.0/autotests/krecursivefilterproxymodeltest.cpp 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/krecursivefilterproxymodeltest.cpp 2018-06-02 18:28:36.000000000 +0200
@@ -90,7 +90,7 @@
setSourceModel(sourceModel);
}
- bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE
+ bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const override
{
// qDebug() << sourceModel()->index(sourceRow, 0, sourceParent).data().toString() << sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool();
return sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/kselectionproxymodel_smoketest.cpp new/kitemmodels-5.47.0/autotests/kselectionproxymodel_smoketest.cpp
--- old/kitemmodels-5.46.0/autotests/kselectionproxymodel_smoketest.cpp 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/kselectionproxymodel_smoketest.cpp 2018-06-02 18:28:36.000000000 +0200
@@ -57,58 +57,58 @@
return _filterBehaviour;
}
- void testInsertWhenEmptyData() Q_DECL_OVERRIDE
+ void testInsertWhenEmptyData() override
{
noop_testInsertWhenEmptyData();
}
- void testInsertInRootData() Q_DECL_OVERRIDE
+ void testInsertInRootData() override
{
noop_testInsertInRootData();
}
- void testInsertInTopLevelData() Q_DECL_OVERRIDE
+ void testInsertInTopLevelData() override
{
noop_testInsertInTopLevelData();
}
- void testInsertInSecondLevelData() Q_DECL_OVERRIDE
+ void testInsertInSecondLevelData() override
{
noop_testInsertInSecondLevelData();
}
- void testRemoveFromRootData() Q_DECL_OVERRIDE
+ void testRemoveFromRootData() override
{
noop_testRemoveFromRootData();
}
- void testRemoveFromTopLevelData() Q_DECL_OVERRIDE
+ void testRemoveFromTopLevelData() override
{
noop_testRemoveFromTopLevelData();
}
- void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE
+ void testRemoveFromSecondLevelData() override
{
noop_testRemoveFromSecondLevelData();
}
- void testMoveFromRootData() Q_DECL_OVERRIDE
+ void testMoveFromRootData() override
{
noselection_testMoveData();
}
- void testMoveFromTopLevelData() Q_DECL_OVERRIDE
+ void testMoveFromTopLevelData() override
{
noselection_testMoveData();
}
- void testMoveFromSecondLevelData() Q_DECL_OVERRIDE
+ void testMoveFromSecondLevelData() override
{
noselection_testMoveData();
}
- void testModifyInRootData() Q_DECL_OVERRIDE
+ void testModifyInRootData() override
{
noop_testModifyInRootData();
}
- void testModifyInTopLevelData() Q_DECL_OVERRIDE
+ void testModifyInTopLevelData() override
{
noop_testModifyInTopLevelData();
}
- void testModifyInSecondLevelData() Q_DECL_OVERRIDE
+ void testModifyInSecondLevelData() override
{
noop_testModifyInSecondLevelData();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/kselectionproxymodeltestsuite.h new/kitemmodels-5.47.0/autotests/kselectionproxymodeltestsuite.h
--- old/kitemmodels-5.46.0/autotests/kselectionproxymodeltestsuite.h 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/kselectionproxymodeltestsuite.h 2018-06-02 18:28:36.000000000 +0200
@@ -44,7 +44,7 @@
}
protected:
- /* reimp */ QAbstractProxyModel *getProxy() Q_DECL_OVERRIDE
+ /* reimp */ QAbstractProxyModel *getProxy() override
{
Q_ASSERT(sourceModel());
m_selectionModel = new QItemSelectionModel(sourceModel());
@@ -94,58 +94,58 @@
SelectorStrategy::setProperty("filterBehaviour", QVariant(int(_filterBehaviour)));
}
- /* reimp */ void testInsertWhenEmptyData() Q_DECL_OVERRIDE
+ /* reimp */ void testInsertWhenEmptyData() override
{
SelectorStrategy::testInsertWhenEmptyData();
}
- /* reimp */ void testInsertInRootData() Q_DECL_OVERRIDE
+ /* reimp */ void testInsertInRootData() override
{
SelectorStrategy::testInsertInRootData();
}
- /* reimp */ void testInsertInTopLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testInsertInTopLevelData() override
{
SelectorStrategy::testInsertInTopLevelData();
}
- /* reimp */ void testInsertInSecondLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testInsertInSecondLevelData() override
{
SelectorStrategy::testInsertInSecondLevelData();
}
- /* reimp */ void testRemoveFromRootData() Q_DECL_OVERRIDE
+ /* reimp */ void testRemoveFromRootData() override
{
SelectorStrategy::testRemoveFromRootData();
}
- /* reimp */ void testRemoveFromTopLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testRemoveFromTopLevelData() override
{
SelectorStrategy::testRemoveFromTopLevelData();
}
- /* reimp */ void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testRemoveFromSecondLevelData() override
{
SelectorStrategy::testRemoveFromSecondLevelData();
}
- /* reimp */ void testMoveFromRootData() Q_DECL_OVERRIDE
+ /* reimp */ void testMoveFromRootData() override
{
SelectorStrategy::testMoveFromRootData();
}
- /* reimp */ void testMoveFromTopLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testMoveFromTopLevelData() override
{
SelectorStrategy::testMoveFromTopLevelData();
}
- /* reimp */ void testMoveFromSecondLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testMoveFromSecondLevelData() override
{
SelectorStrategy::testMoveFromSecondLevelData();
}
- /* reimp */ void testModifyInRootData() Q_DECL_OVERRIDE
+ /* reimp */ void testModifyInRootData() override
{
SelectorStrategy::testModifyInRootData();
}
- /* reimp */ void testModifyInTopLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testModifyInTopLevelData() override
{
SelectorStrategy::testModifyInTopLevelData();
}
- /* reimp */ void testModifyInSecondLevelData() Q_DECL_OVERRIDE
+ /* reimp */ void testModifyInSecondLevelData() override
{
SelectorStrategy::testModifyInSecondLevelData();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/dynamictreemodel.h new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/dynamictreemodel.h
--- old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2018-06-02 18:28:36.000000000 +0200
@@ -47,21 +47,21 @@
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;
- int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE;
- int columnCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE;
-
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
-
- bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
- Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
- Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
- QStringList mimeTypes() const Q_DECL_OVERRIDE;
- QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex &index) const override;
+ int rowCount(const QModelIndex &index = QModelIndex()) const override;
+ int columnCount(const QModelIndex &index = QModelIndex()) const override;
+
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+
+ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+ Qt::ItemFlags flags(const QModelIndex &index) const override;
+ Qt::DropActions supportedDropActions() const override;
+ QStringList mimeTypes() const override;
+ QMimeData *mimeData(const QModelIndexList &indexes) const override;
QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1,
- Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE;
+ Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const override;
void clear();
QList<int> indexToPath(const QModelIndex &idx) const;
@@ -231,7 +231,7 @@
void interpret(const QString &treeString);
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
void doInsertTree(const QModelIndex &parent);
protected:
@@ -251,7 +251,7 @@
explicit ModelInsertAndRemoveQueuedCommand(DynamicTreeModel *model, QObject *parent = nullptr);
virtual ~ModelInsertAndRemoveQueuedCommand() {}
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
Q_SIGNALS:
void beginInsertRows(const QModelIndex &parent, int start, int end);
@@ -276,7 +276,7 @@
explicit ModelRemoveCommand(DynamicTreeModel *model, QObject *parent = nullptr);
virtual ~ModelRemoveCommand() {}
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
void purgeItem(qint64 parent);
};
@@ -289,7 +289,7 @@
virtual ~ModelDataChangeCommand() {}
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
void setStartColumn(int column)
{
@@ -310,7 +310,7 @@
virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
virtual void emitPostSignal();
@@ -340,9 +340,9 @@
explicit ModelMoveLayoutChangeCommand(DynamicTreeModel *model, QObject *parent);
virtual ~ModelMoveLayoutChangeCommand();
- bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow) Q_DECL_OVERRIDE;
+ bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow) override;
- void emitPostSignal() Q_DECL_OVERRIDE;
+ void emitPostSignal() override;
void setEndOfMoveSourceAncestors(const QList<int> &rows)
{
@@ -369,7 +369,7 @@
void setInitialTree(const QString &treeString);
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
private:
QString m_treeString;
};
@@ -390,7 +390,7 @@
void setInitialTree(const QString &treeString);
- void doCommand() Q_DECL_OVERRIDE;
+ void doCommand() override;
private:
QString m_treeString;
QList<PersistentChange> m_changes;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/modeleventlogger.cpp new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/modeleventlogger.cpp
--- old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/modeleventlogger.cpp 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/modeleventlogger.cpp 2018-06-02 18:28:36.000000000 +0200
@@ -79,23 +79,23 @@
return persistentIndexList();
}
- QModelIndex index(int /*row*/, int /*column*/, const QModelIndex & /*parent*/ = QModelIndex()) const Q_DECL_OVERRIDE
+ QModelIndex index(int /*row*/, int /*column*/, const QModelIndex & /*parent*/ = QModelIndex()) const override
{
return QModelIndex();
}
- int rowCount(const QModelIndex & /*parent*/ = QModelIndex()) const Q_DECL_OVERRIDE
+ int rowCount(const QModelIndex & /*parent*/ = QModelIndex()) const override
{
return 0;
}
- QModelIndex parent(const QModelIndex & /*child*/) const Q_DECL_OVERRIDE
+ QModelIndex parent(const QModelIndex & /*child*/) const override
{
return QModelIndex();
}
- int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const Q_DECL_OVERRIDE
+ int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override
{
return 0;
}
- QVariant data(const QModelIndex & /*index*/, int /*role*/ = Qt::DisplayRole) const Q_DECL_OVERRIDE
+ QVariant data(const QModelIndex & /*index*/, int /*role*/ = Qt::DisplayRole) const override
{
return QVariant();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/modelselector.h new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/modelselector.h
--- old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/modelselector.h 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/modelselector.h 2018-06-02 18:28:36.000000000 +0200
@@ -60,67 +60,67 @@
public Q_SLOTS:
void rowsInserted(const QModelIndex &parent, int start, int end);
- void testInsertWhenEmptyData() Q_DECL_OVERRIDE
+ void testInsertWhenEmptyData() override
{
dummyTestData();
}
- void testInsertInRootData() Q_DECL_OVERRIDE
+ void testInsertInRootData() override
{
dummyTestData();
}
- void testInsertInTopLevelData() Q_DECL_OVERRIDE
+ void testInsertInTopLevelData() override
{
dummyTestData();
}
- void testInsertInSecondLevelData() Q_DECL_OVERRIDE
+ void testInsertInSecondLevelData() override
{
dummyTestData();
}
- void testRemoveFromRootData() Q_DECL_OVERRIDE
+ void testRemoveFromRootData() override
{
dummyTestData();
}
- void testRemoveFromTopLevelData() Q_DECL_OVERRIDE
+ void testRemoveFromTopLevelData() override
{
dummyTestData();
}
- void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE
+ void testRemoveFromSecondLevelData() override
{
dummyTestData();
}
- void testMoveFromRootData() Q_DECL_OVERRIDE
+ void testMoveFromRootData() override
{
dummyTestData();
}
- void testMoveFromTopLevelData() Q_DECL_OVERRIDE
+ void testMoveFromTopLevelData() override
{
dummyTestData();
}
- void testMoveFromSecondLevelData() Q_DECL_OVERRIDE
+ void testMoveFromSecondLevelData() override
{
dummyTestData();
}
- void testModifyInRootData() Q_DECL_OVERRIDE
+ void testModifyInRootData() override
{
dummyTestData();
}
- void testModifyInTopLevelData() Q_DECL_OVERRIDE
+ void testModifyInTopLevelData() override
{
dummyTestData();
}
- void testModifyInSecondLevelData() Q_DECL_OVERRIDE
+ void testModifyInSecondLevelData() override
{
dummyTestData();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/proxymodeltest.h new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/proxymodeltest.h
--- old/kitemmodels-5.46.0/autotests/proxymodeltestsuite/proxymodeltest.h 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/autotests/proxymodeltestsuite/proxymodeltest.h 2018-06-02 18:28:36.000000000 +0200
@@ -176,22 +176,22 @@
}
Q_SIGNALS:
- void testInsertWhenEmptyData() Q_DECL_OVERRIDE;
- void testInsertInRootData() Q_DECL_OVERRIDE;
- void testInsertInTopLevelData() Q_DECL_OVERRIDE;
- void testInsertInSecondLevelData() Q_DECL_OVERRIDE;
-
- void testRemoveFromRootData() Q_DECL_OVERRIDE;
- void testRemoveFromTopLevelData() Q_DECL_OVERRIDE;
- void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE;
-
- void testMoveFromRootData() Q_DECL_OVERRIDE;
- void testMoveFromTopLevelData() Q_DECL_OVERRIDE;
- void testMoveFromSecondLevelData() Q_DECL_OVERRIDE;
-
- void testModifyInRootData() Q_DECL_OVERRIDE;
- void testModifyInTopLevelData() Q_DECL_OVERRIDE;
- void testModifyInSecondLevelData() Q_DECL_OVERRIDE;
+ void testInsertWhenEmptyData() override;
+ void testInsertInRootData() override;
+ void testInsertInTopLevelData() override;
+ void testInsertInSecondLevelData() override;
+
+ void testRemoveFromRootData() override;
+ void testRemoveFromTopLevelData() override;
+ void testRemoveFromSecondLevelData() override;
+
+ void testMoveFromRootData() override;
+ void testMoveFromTopLevelData() override;
+ void testMoveFromSecondLevelData() override;
+
+ void testModifyInRootData() override;
+ void testModifyInTopLevelData() override;
+ void testModifyInSecondLevelData() override;
protected Q_SLOTS:
void testMappings();
@@ -208,119 +208,119 @@
void testSourceReset();
void testDestroyModel();
- void testInsertWhenEmpty_data() Q_DECL_OVERRIDE
+ void testInsertWhenEmpty_data() override
{
testInsertWhenEmptyData();
}
- void testInsertWhenEmpty() Q_DECL_OVERRIDE
+ void testInsertWhenEmpty() override
{
doTest();
}
- void testInsertInRoot_data() Q_DECL_OVERRIDE
+ void testInsertInRoot_data() override
{
testInsertInRootData();
}
- void testInsertInRoot() Q_DECL_OVERRIDE
+ void testInsertInRoot() override
{
doTest();
}
- void testInsertInTopLevel_data() Q_DECL_OVERRIDE
+ void testInsertInTopLevel_data() override
{
testInsertInTopLevelData();
}
- void testInsertInTopLevel() Q_DECL_OVERRIDE
+ void testInsertInTopLevel() override
{
doTest();
}
- void testInsertInSecondLevel_data() Q_DECL_OVERRIDE
+ void testInsertInSecondLevel_data() override
{
testInsertInSecondLevelData();
}
- void testInsertInSecondLevel() Q_DECL_OVERRIDE
+ void testInsertInSecondLevel() override
{
doTest();
}
- void testRemoveFromRoot_data() Q_DECL_OVERRIDE
+ void testRemoveFromRoot_data() override
{
testRemoveFromRootData();
}
- void testRemoveFromRoot() Q_DECL_OVERRIDE
+ void testRemoveFromRoot() override
{
doTest();
}
- void testRemoveFromTopLevel_data() Q_DECL_OVERRIDE
+ void testRemoveFromTopLevel_data() override
{
testRemoveFromTopLevelData();
}
- void testRemoveFromTopLevel() Q_DECL_OVERRIDE
+ void testRemoveFromTopLevel() override
{
doTest();
}
- void testRemoveFromSecondLevel_data() Q_DECL_OVERRIDE
+ void testRemoveFromSecondLevel_data() override
{
testRemoveFromSecondLevelData();
}
- void testRemoveFromSecondLevel() Q_DECL_OVERRIDE
+ void testRemoveFromSecondLevel() override
{
doTest();
}
- void testMoveFromRoot_data() Q_DECL_OVERRIDE
+ void testMoveFromRoot_data() override
{
testMoveFromRootData();
}
- void testMoveFromRoot() Q_DECL_OVERRIDE
+ void testMoveFromRoot() override
{
doTest();
}
- void testMoveFromTopLevel_data() Q_DECL_OVERRIDE
+ void testMoveFromTopLevel_data() override
{
testMoveFromTopLevelData();
}
- void testMoveFromTopLevel() Q_DECL_OVERRIDE
+ void testMoveFromTopLevel() override
{
doTest();
}
- void testMoveFromSecondLevel_data() Q_DECL_OVERRIDE
+ void testMoveFromSecondLevel_data() override
{
testMoveFromSecondLevelData();
}
- void testMoveFromSecondLevel() Q_DECL_OVERRIDE
+ void testMoveFromSecondLevel() override
{
doTest();
}
- void testModifyInRoot_data() Q_DECL_OVERRIDE
+ void testModifyInRoot_data() override
{
testModifyInRootData();
}
- void testModifyInRoot() Q_DECL_OVERRIDE
+ void testModifyInRoot() override
{
doTest();
}
- void testModifyInTopLevel_data() Q_DECL_OVERRIDE
+ void testModifyInTopLevel_data() override
{
testModifyInTopLevelData();
}
- void testModifyInTopLevel() Q_DECL_OVERRIDE
+ void testModifyInTopLevel() override
{
doTest();
}
- void testModifyInSecondLevel_data() Q_DECL_OVERRIDE
+ void testModifyInSecondLevel_data() override
{
testModifyInSecondLevelData();
}
- void testModifyInSecondLevel() Q_DECL_OVERRIDE
+ void testModifyInSecondLevel() override
{
doTest();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/src/kbreadcrumbselectionmodel.h new/kitemmodels-5.47.0/src/kbreadcrumbselectionmodel.h
--- old/kitemmodels-5.46.0/src/kbreadcrumbselectionmodel.h 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/src/kbreadcrumbselectionmodel.h 2018-06-02 18:28:36.000000000 +0200
@@ -117,7 +117,7 @@
explicit KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, QObject *parent = nullptr);
KBreadcrumbSelectionModel(QItemSelectionModel *selectionModel, BreadcrumbTarget target, QObject *parent = nullptr);
- virtual ~KBreadcrumbSelectionModel();
+ ~KBreadcrumbSelectionModel() override;
/**
Returns whether the actual selection in included in the proxy.
@@ -144,9 +144,9 @@
*/
void setBreadcrumbLength(int breadcrumbLength);
- /* reimp */ void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE;
+ /* reimp */ void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) override;
- /* reimp */ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE;
+ /* reimp */ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) override;
protected:
KBreadcrumbSelectionModelPrivate *const d_ptr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/src/kcheckableproxymodel.h new/kitemmodels-5.47.0/src/kcheckableproxymodel.h
--- old/kitemmodels-5.46.0/src/kcheckableproxymodel.h 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/src/kcheckableproxymodel.h 2018-06-02 18:28:36.000000000 +0200
@@ -67,19 +67,19 @@
{
Q_OBJECT
public:
- KCheckableProxyModel(QObject *parent = nullptr);
- ~KCheckableProxyModel();
+ explicit KCheckableProxyModel(QObject *parent = nullptr);
+ ~KCheckableProxyModel() override;
void setSelectionModel(QItemSelectionModel *itemSelectionModel);
QItemSelectionModel *selectionModel() const;
- /* reimp */ Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
+ /* reimp */ Qt::ItemFlags flags(const QModelIndex &index) const override;
- /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ /* reimp */ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
- /* reimp */ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
+ /* reimp */ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
- /* reimp */ void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE;
+ /* reimp */ void setSourceModel(QAbstractItemModel *sourceModel) override;
protected:
virtual bool select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.46.0/src/kconcatenaterowsproxymodel.cpp new/kitemmodels-5.47.0/src/kconcatenaterowsproxymodel.cpp
--- old/kitemmodels-5.46.0/src/kconcatenaterowsproxymodel.cpp 2018-05-05 14:39:16.000000000 +0200
+++ new/kitemmodels-5.47.0/src/kconcatenaterowsproxymodel.cpp 2018-06-02 18:28:36.000000000 +0200
@@ -67,6 +67,9 @@
QModelIndex KConcatenateRowsProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
{
const QAbstractItemModel *sourceModel = sourceIndex.model();
+ if (!sourceModel) {
+ return {};
+ }
int rowsPrior = d->computeRowsPrior(sourceModel);
return createIndex(rowsPrior + sourceIndex.row(), sourceIndex.column());
}
@@ -107,13 +110,16 @@
QMap