Hello community, here is the log from the commit of package kitemviews for openSUSE:Factory checked in at 2017-03-03 16:59:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemviews (Old) and /work/SRC/openSUSE:Factory/.kitemviews.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemviews" Fri Mar 3 16:59:16 2017 rev:38 rq:461436 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitemviews/kitemviews.changes 2017-02-03 17:45:30.830351705 +0100 +++ /work/SRC/openSUSE:Factory/.kitemviews.new/kitemviews.changes 2017-03-03 16:59:17.496953497 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:30:56 UTC 2017 - [email protected] + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- kitemviews-5.30.0.tar.xz New: ---- kitemviews-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemviews.spec ++++++ --- /var/tmp/diff_new_pack.wTQTx7/_old 2017-03-03 16:59:18.048875448 +0100 +++ /var/tmp/diff_new_pack.wTQTx7/_new 2017-03-03 16:59:18.048875448 +0100 @@ -18,19 +18,19 @@ %bcond_without lang %define lname libKF5ItemViews5 -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kitemviews -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 %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.5.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 Summary: Set of item views extending the Qt model-view framework License: LGPL-2.1+ and GPL-2.0+ Group: System/GUI/KDE @@ -62,7 +62,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Widgets) >= 5.5.0 +Requires: cmake(Qt5Widgets) >= 5.6.0 %description devel KItemViews includes a set of views, which can be used with item models. It ++++++ kitemviews-5.30.0.tar.xz -> kitemviews-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/CMakeLists.txt new/kitemviews-5.31.0/CMakeLists.txt --- old/kitemviews-5.30.0/CMakeLists.txt 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/CMakeLists.txt 2017-02-05 12:03:11.000000000 +0100 @@ -1,16 +1,16 @@ 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(KItemViews 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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/autotests/klistwidgetsearchlinetest.cpp new/kitemviews-5.31.0/autotests/klistwidgetsearchlinetest.cpp --- old/kitemviews-5.30.0/autotests/klistwidgetsearchlinetest.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/autotests/klistwidgetsearchlinetest.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -46,7 +46,7 @@ listWidget.addItem(QStringLiteral("Matching test item")); listWidget.addItem(QStringLiteral("Another test item")); - KListWidgetSearchLine searchLine(0, &listWidget); + KListWidgetSearchLine searchLine(nullptr, &listWidget); searchLine.setText(QStringLiteral("match")); // The initial filtering is delayed; we have to wait diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/autotests/pythontest.py new/kitemviews-5.31.0/autotests/pythontest.py --- old/kitemviews-5.30.0/autotests/pythontest.py 1970-01-01 01:00:00.000000000 +0100 +++ new/kitemviews-5.31.0/autotests/pythontest.py 2017-02-05 12:03:11.000000000 +0100 @@ -0,0 +1,35 @@ +#!/usr/bin/env python +#-*- coding: utf-8 -*- + +from __future__ import print_function + +import sys + +sys.path.append(sys.argv[1]) + +from PyQt5 import QtCore +from PyQt5 import QtWidgets + +from PyKF5 import KItemViews + +def main(): + app = QtWidgets.QApplication(sys.argv) + + model = QtCore.QStringListModel(("1", "2", "3")) + + proxy = QtCore.QSortFilterProxyModel() + proxy.setSourceModel(model) + + assert(proxy.rowCount() == 3) + + filterLine = KItemViews.KFilterProxySearchLine() + filterLine.setProxy(proxy) + + filterLine.setText("1"); + + print(proxy.rowCount(), proxy.filterRegExp()) + + assert(proxy.rowCount() == 1) + +if __name__ == '__main__': + sys.exit(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/CMakeLists.txt new/kitemviews-5.31.0/src/CMakeLists.txt --- old/kitemviews-5.30.0/src/CMakeLists.txt 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/CMakeLists.txt 2017-02-05 12:03:11.000000000 +0100 @@ -44,6 +44,29 @@ REQUIRED_HEADERS KItemViews_HEADERS ) +find_package(PythonModuleGeneration) + +if (PythonModuleGeneration_FOUND) + ecm_generate_python_binding( + TARGET KF5::ItemViews + PYTHONNAMESPACE PyKF5 + MODULENAME KItemViews + INSTALL_DIR_SUFFIX ${KDE_INSTALL_PYTHONBINDINGSDIR} + SIP_DEPENDS + QtWidgets/QtWidgetsmod.sip + HEADERS + kcategorizedsortfilterproxymodel.h + kcategorizedview.h + kcategorydrawer.h + kextendableitemdelegate.h + kfilterproxysearchline.h + klistwidgetsearchline.h + ktreewidgetsearchline.h + ktreewidgetsearchlinewidget.h + kwidgetitemdelegate.h + ) +endif() + install(TARGETS KF5ItemViews EXPORT KF5ItemViewsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kcategorizedsortfilterproxymodel.h new/kitemviews-5.31.0/src/kcategorizedsortfilterproxymodel.h --- old/kitemviews-5.30.0/src/kcategorizedsortfilterproxymodel.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kcategorizedsortfilterproxymodel.h 2017-02-05 12:03:11.000000000 +0100 @@ -59,7 +59,7 @@ ///< CategoryDisplayRole. }; - KCategorizedSortFilterProxyModel(QObject *parent = 0); + KCategorizedSortFilterProxyModel(QObject *parent = nullptr); virtual ~KCategorizedSortFilterProxyModel(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kcategorizedview.cpp new/kitemviews-5.31.0/src/kcategorizedview.cpp --- old/kitemviews-5.30.0/src/kcategorizedview.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kcategorizedview.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -101,8 +101,8 @@ KCategorizedView::Private::Private(KCategorizedView *q) : q(q) - , proxyModel(0) - , categoryDrawer(0) + , proxyModel(nullptr) + , categoryDrawer(nullptr) , categorySpacing(5) , alternatingBlockColors(false) , collapsibleBlocks(false) @@ -825,7 +825,7 @@ int indexToCheckIfBlockCollapsed = i; QModelIndex categoryIndex; QString category; - Private::Block *block = 0; + Private::Block *block = nullptr; while (i <= intersecting.second.row()) { //BEGIN: first check if the block is collapsed. if so, we have to skip the item painting if (i == indexToCheckIfBlockCollapsed) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kcategorizedview.h new/kitemviews-5.31.0/src/kcategorizedview.h --- old/kitemviews-5.30.0/src/kcategorizedview.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kcategorizedview.h 2017-02-05 12:03:11.000000000 +0100 @@ -84,7 +84,7 @@ Q_PROPERTY(bool collapsibleBlocks READ collapsibleBlocks WRITE setCollapsibleBlocks) public: - KCategorizedView(QWidget *parent = 0); + KCategorizedView(QWidget *parent = nullptr); ~KCategorizedView(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kextendableitemdelegate.cpp new/kitemviews-5.31.0/src/kextendableitemdelegate.cpp --- old/kitemviews-5.30.0/src/kextendableitemdelegate.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kextendableitemdelegate.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -34,7 +34,7 @@ stateTick(0), cachedStateTick(-1), cachedRow(-20), //Qt uses -1 for invalid indices - extender(0), + extender(nullptr), extenderHeight(0) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kfilterproxysearchline.cpp new/kitemviews-5.31.0/src/kfilterproxysearchline.cpp --- old/kitemviews-5.30.0/src/kfilterproxysearchline.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kfilterproxysearchline.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -33,7 +33,7 @@ { public: KFilterProxySearchLinePrivate(KFilterProxySearchLine *parent) : - q(parent), proxy(0), searchLine(0) + q(parent), proxy(nullptr), searchLine(nullptr) { timer = new QTimer(q); timer->setSingleShot(true); @@ -88,6 +88,7 @@ void KFilterProxySearchLine::setText(const QString &text) { d->searchLine->setText(text); + d->slotSearchLineActivate(); } void KFilterProxySearchLine::setProxy(QSortFilterProxyModel *proxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kfilterproxysearchline.h new/kitemviews-5.31.0/src/kfilterproxysearchline.h --- old/kitemviews-5.30.0/src/kfilterproxysearchline.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kfilterproxysearchline.h 2017-02-05 12:03:11.000000000 +0100 @@ -49,7 +49,7 @@ /** * Constructor */ - explicit KFilterProxySearchLine(QWidget *parent = 0); + explicit KFilterProxySearchLine(QWidget *parent = nullptr); /** * Destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/klistwidgetsearchline.cpp new/kitemviews-5.31.0/src/klistwidgetsearchline.cpp --- old/kitemviews-5.30.0/src/klistwidgetsearchline.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/klistwidgetsearchline.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -31,7 +31,7 @@ public: KListWidgetSearchLinePrivate(KListWidgetSearchLine *parent) : q(parent), - listWidget(0), + listWidget(nullptr), caseSensitivity(Qt::CaseInsensitive), activeSearch(false), queuedSearches(0) @@ -43,7 +43,7 @@ void _k_rowsInserted(const QModelIndex &, int, int); void _k_dataChanged(const QModelIndex &, const QModelIndex &); - void init(QListWidget *listWidget = 0); + void init(QListWidget *listWidget = nullptr); void updateHiddenState(int start, int end); KListWidgetSearchLine *q; @@ -95,7 +95,7 @@ void KListWidgetSearchLine::clear() { // Show items back to QListWidget - if (d->listWidget != 0) { + if (d->listWidget != nullptr) { for (int i = 0; i < d->listWidget->count(); ++i) { d->listWidget->item(i)->setHidden(false); } @@ -113,7 +113,7 @@ void KListWidgetSearchLine::setListWidget(QListWidget *lw) { - if (d->listWidget != 0) { + if (d->listWidget != nullptr) { disconnect(d->listWidget, SIGNAL(destroyed()), this, SLOT(_k_listWidgetDeleted())); d->listWidget->model()->disconnect(this); @@ -121,7 +121,7 @@ d->listWidget = lw; - if (lw != 0) { + if (lw != nullptr) { connect(d->listWidget, SIGNAL(destroyed()), this, SLOT(_k_listWidgetDeleted())); connect(d->listWidget->model(), SIGNAL(rowsInserted(QModelIndex,int,int)), @@ -144,7 +144,7 @@ return true; } - if (item == 0) { + if (item == nullptr) { return false; } @@ -159,7 +159,7 @@ connect(q, SIGNAL(textChanged(QString)), q, SLOT(_k_queueSearch(QString))); - if (listWidget != 0) { + if (listWidget != nullptr) { connect(listWidget, SIGNAL(destroyed()), q, SLOT(_k_listWidgetDeleted())); connect(listWidget->model(), SIGNAL(rowsInserted(QModelIndex,int,int)), @@ -188,7 +188,7 @@ item->setHidden(true); if (item == currentItem) { - currentItem = 0; // It's not in listWidget anymore. + currentItem = nullptr; // It's not in listWidget anymore. } } else if (item->isHidden()) { item->setHidden(false); @@ -199,7 +199,7 @@ listWidget->sortItems(); } - if (currentItem != 0) { + if (currentItem != nullptr) { listWidget->scrollToItem(currentItem); } } @@ -253,7 +253,7 @@ *****************************************************************************/ void KListWidgetSearchLine::KListWidgetSearchLinePrivate::_k_listWidgetDeleted() { - listWidget = 0; + listWidget = nullptr; q->setEnabled(false); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/klistwidgetsearchline.h new/kitemviews-5.31.0/src/klistwidgetsearchline.h --- old/kitemviews-5.30.0/src/klistwidgetsearchline.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/klistwidgetsearchline.h 2017-02-05 12:03:11.000000000 +0100 @@ -52,8 +52,8 @@ * If \a listWidget is null then the widget will be disabled until a listWidget * is set with setListWidget(). */ - explicit KListWidgetSearchLine(QWidget *parent = 0, - QListWidget *listWidget = 0); + explicit KListWidgetSearchLine(QWidget *parent = nullptr, + QListWidget *listWidget = nullptr); /** * Destroys the KListWidgetSearchLine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/ktreewidgetsearchline.cpp new/kitemviews-5.31.0/src/ktreewidgetsearchline.cpp --- old/kitemviews-5.30.0/src/ktreewidgetsearchline.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/ktreewidgetsearchline.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -83,7 +83,7 @@ return; } - QTreeWidget *widget = 0L; + QTreeWidget *widget = nullptr; foreach (QTreeWidget *tree, treeWidgets) if (tree->model() == model) { widget = tree; @@ -270,7 +270,7 @@ if (d->treeWidgets.count() == 1) { return d->treeWidgets.first(); } else { - return 0; + return nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/ktreewidgetsearchline.h new/kitemviews-5.31.0/src/ktreewidgetsearchline.h --- old/kitemviews-5.30.0/src/ktreewidgetsearchline.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/ktreewidgetsearchline.h 2017-02-05 12:03:11.000000000 +0100 @@ -54,7 +54,7 @@ * If \a treeWidget is null then the widget will be disabled until listviews * are set with setTreeWidget(), setTreeWidgets() or added with addTreeWidget(). */ - explicit KTreeWidgetSearchLine(QWidget *parent = 0, QTreeWidget *treeWidget = 0); + explicit KTreeWidgetSearchLine(QWidget *parent = nullptr, QTreeWidget *treeWidget = nullptr); /** * Constructs a KTreeWidgetSearchLine with \a treeWidgets being the list of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/ktreewidgetsearchlinewidget.cpp new/kitemviews-5.31.0/src/ktreewidgetsearchlinewidget.cpp --- old/kitemviews-5.30.0/src/ktreewidgetsearchlinewidget.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/ktreewidgetsearchlinewidget.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -29,8 +29,8 @@ { public: Private() - : treeWidget(0), - searchLine(0) + : treeWidget(nullptr), + searchLine(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/ktreewidgetsearchlinewidget.h new/kitemviews-5.31.0/src/ktreewidgetsearchlinewidget.h --- old/kitemviews-5.30.0/src/ktreewidgetsearchlinewidget.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/ktreewidgetsearchlinewidget.h 2017-02-05 12:03:11.000000000 +0100 @@ -41,7 +41,7 @@ * Creates a KTreeWidgetSearchLineWidget for \a treeWidget with \a parent as the * parent. */ - explicit KTreeWidgetSearchLineWidget(QWidget *parent = 0, QTreeWidget *treeWidget = 0); + explicit KTreeWidgetSearchLineWidget(QWidget *parent = nullptr, QTreeWidget *treeWidget = nullptr); /** * Destroys the KTreeWidgetSearchLineWidget diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kwidgetitemdelegate.cpp new/kitemviews-5.31.0/src/kwidgetitemdelegate.cpp --- old/kitemviews-5.30.0/src/kwidgetitemdelegate.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kwidgetitemdelegate.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -43,10 +43,10 @@ //@cond PRIVATE KWidgetItemDelegatePrivate::KWidgetItemDelegatePrivate(KWidgetItemDelegate *q, QObject *parent) : QObject(parent) - , itemView(0) + , itemView(nullptr) , widgetPool(new KWidgetItemDelegatePool(q)) - , model(0) - , selectionModel(0) + , model(nullptr) + , selectionModel(nullptr) , viewDestroyed(false) , q(q) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kwidgetitemdelegate.h new/kitemviews-5.31.0/src/kwidgetitemdelegate.h --- old/kitemviews-5.30.0/src/kwidgetitemdelegate.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kwidgetitemdelegate.h 2017-02-05 12:03:11.000000000 +0100 @@ -57,7 +57,7 @@ * @param itemView the item view the new delegate will monitor * @param parent the parent of this delegate */ - explicit KWidgetItemDelegate(QAbstractItemView *itemView, QObject *parent = 0); + explicit KWidgetItemDelegate(QAbstractItemView *itemView, QObject *parent = nullptr); /** * Destroys an ItemDelegate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kwidgetitemdelegate_p.h new/kitemviews-5.31.0/src/kwidgetitemdelegate_p.h --- old/kitemviews-5.30.0/src/kwidgetitemdelegate_p.h 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kwidgetitemdelegate_p.h 2017-02-05 12:03:11.000000000 +0100 @@ -38,7 +38,7 @@ Q_OBJECT public: - explicit KWidgetItemDelegatePrivate(KWidgetItemDelegate *q, QObject *parent = 0); + explicit KWidgetItemDelegatePrivate(KWidgetItemDelegate *q, QObject *parent = nullptr); ~KWidgetItemDelegatePrivate(); void _k_slotRowsInserted(const QModelIndex &parent, int start, int end); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/src/kwidgetitemdelegatepool.cpp new/kitemviews-5.31.0/src/kwidgetitemdelegatepool.cpp --- old/kitemviews-5.30.0/src/kwidgetitemdelegatepool.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/src/kwidgetitemdelegatepool.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -49,7 +49,7 @@ : public QObject { public: - KWidgetItemDelegateEventListener(KWidgetItemDelegatePoolPrivate *poolPrivate, QObject *parent = 0) + KWidgetItemDelegateEventListener(KWidgetItemDelegatePoolPrivate *poolPrivate, QObject *parent = nullptr) : QObject(parent) , poolPrivate(poolPrivate) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.30.0/tests/kwidgetitemdelegatetest.cpp new/kitemviews-5.31.0/tests/kwidgetitemdelegatetest.cpp --- old/kitemviews-5.30.0/tests/kwidgetitemdelegatetest.cpp 2017-01-08 21:56:01.000000000 +0100 +++ new/kitemviews-5.31.0/tests/kwidgetitemdelegatetest.cpp 2017-02-05 12:03:11.000000000 +0100 @@ -49,7 +49,7 @@ Q_OBJECT public: - TestWidget(QWidget *parent = 0) + TestWidget(QWidget *parent = nullptr) : QWidget(parent) { setMouseTracking(true); @@ -121,7 +121,7 @@ Q_OBJECT public: - MyDelegate(QAbstractItemView *itemView, QObject *parent = 0) + MyDelegate(QAbstractItemView *itemView, QObject *parent = nullptr) : KWidgetItemDelegate(itemView, parent) { for (int i = 0; i < 100; i++) { @@ -153,7 +153,7 @@ Q_UNUSED(index); painter->save(); - itemView()->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter, 0); + itemView()->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter, nullptr); if (option.state & QStyle::State_Selected) { painter->setPen(option.palette.highlightedText().color()); @@ -265,12 +265,12 @@ private Q_SLOTS: void mySlot() { - QMessageBox::information(0, QStringLiteral("Button clicked"), QStringLiteral("The button in row %1 was clicked").arg(focusedIndex().row())); + QMessageBox::information(nullptr, QStringLiteral("Button clicked"), QStringLiteral("The button in row %1 was clicked").arg(focusedIndex().row())); } void mySlot2() { - QMessageBox::information(0, QStringLiteral("Toolbutton menu item clicked"), QStringLiteral("A menu item was triggered in row %1").arg(focusedIndex().row())); + QMessageBox::information(nullptr, QStringLiteral("Toolbutton menu item clicked"), QStringLiteral("A menu item was triggered in row %1").arg(focusedIndex().row())); } void mySlot3()
