Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2017-03-03 17:16:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Fri Mar 3 17:16:44 2017 rev:24 rq:461452 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2017-02-03 17:45:58.602420738 +0100 +++ /work/SRC/openSUSE:Factory/.kpeople5.new/kpeople5.changes 2017-03-03 17:16:45.736702359 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:32:12 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: ---- kpeople-5.30.0.tar.xz New: ---- kpeople-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.jPlLRr/_old 2017-03-03 17:16:46.224633345 +0100 +++ /var/tmp/diff_new_pack.jPlLRr/_new 2017-03-03 17:16:46.224633345 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define rname kpeople -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kpeople5 -Version: 5.30.0 +Version: 5.31.0 Release: 0 %define kf5_version %{version} BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -30,12 +30,12 @@ BuildRequires: kitemviews-devel >= %{_tar_path} BuildRequires: kservice-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: cmake(Qt5DBus) >= 5.5.0 -BuildRequires: cmake(Qt5Gui) >= 5.5.0 -BuildRequires: cmake(Qt5Qml) >= 5.5.0 -BuildRequires: cmake(Qt5Sql) >= 5.5.0 -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5DBus) >= 5.6.0 +BuildRequires: cmake(Qt5Gui) >= 5.6.0 +BuildRequires: cmake(Qt5Qml) >= 5.6.0 +BuildRequires: cmake(Qt5Sql) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 %if %{with lang} Recommends: %{name}-lang %endif @@ -54,7 +54,7 @@ Summary: Provides access to all contacts and the people who hold them Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: cmake(Qt5Core) >= 5.5.0 +Requires: cmake(Qt5Core) >= 5.6.0 %description devel A library that provides access to all contacts and the people who hold them. ++++++ kpeople-5.30.0.tar.xz -> kpeople-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/CMakeLists.txt new/kpeople-5.31.0/CMakeLists.txt --- old/kpeople-5.30.0/CMakeLists.txt 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/CMakeLists.txt 2017-02-05 12:08:56.000000000 +0100 @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.30.0") # handled by release scripts -set(KF5_DEP_VERSION "5.30.0") # handled by release scripts +set(KF5_VERSION "5.31.0") # handled by release scripts +set(KF5_DEP_VERSION "5.31.0") # handled by release scripts project (KPeople 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 Gui Sql DBus Widgets Qml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/autotests/persondatatests.cpp new/kpeople-5.31.0/autotests/persondatatests.cpp --- old/kpeople-5.30.0/autotests/persondatatests.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/autotests/persondatatests.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -49,7 +49,7 @@ PersonManager::instance(m_database.fileName()); PersonManager::instance()->mergeContacts(QStringList() << QStringLiteral("fakesource://contact2") << QStringLiteral("fakesource://contact3")); - m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction + m_source = new FakeContactSource(nullptr); //don't own. PersonPluginManager removes it on destruction QHash<QString, BasePersonsDataSource *> sources; sources[QStringLiteral("fakesource")] = m_source; PersonPluginManager::setDataSourcePlugins(sources); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/autotests/personsmodeltest.cpp new/kpeople-5.31.0/autotests/personsmodeltest.cpp --- old/kpeople-5.30.0/autotests/personsmodeltest.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/autotests/personsmodeltest.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -43,7 +43,7 @@ // Called before the first testfunction is executed PersonManager::instance(m_database.fileName()); - m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction + m_source = new FakeContactSource(nullptr); //don't own. PersonPluginManager removes it on destruction QHash<QString, BasePersonsDataSource *> sources; sources[QStringLiteral("fakesource")] = m_source; PersonPluginManager::setDataSourcePlugins(sources); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/autotests/personsproxymodeltest.cpp new/kpeople-5.31.0/autotests/personsproxymodeltest.cpp --- old/kpeople-5.30.0/autotests/personsproxymodeltest.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/autotests/personsproxymodeltest.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -44,7 +44,7 @@ // Called before the first testfunction is executed PersonManager::instance(m_database.fileName()); - m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction + m_source = new FakeContactSource(nullptr); //don't own. PersonPluginManager removes it on destruction QHash<QString, BasePersonsDataSource *> sources; sources[QStringLiteral("fakesource")] = m_source; PersonPluginManager::setDataSourcePlugins(sources); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/examples/contactlistwidgets.cpp new/kpeople-5.31.0/examples/contactlistwidgets.cpp --- old/kpeople-5.30.0/examples/contactlistwidgets.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/examples/contactlistwidgets.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -37,7 +37,7 @@ class PersonsDelegate : public QStyledItemDelegate { public: - PersonsDelegate(QObject *parent = 0); + PersonsDelegate(QObject *parent = nullptr); ~PersonsDelegate(); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/backends/contactmonitor.cpp new/kpeople-5.31.0/src/backends/contactmonitor.cpp --- old/kpeople-5.30.0/src/backends/contactmonitor.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/backends/contactmonitor.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -29,7 +29,7 @@ }; ContactMonitor::ContactMonitor(const QString &contactUri) - : QObject(0), + : QObject(nullptr), d_ptr(new ContactMonitorPrivate) { Q_D(ContactMonitor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/declarative/declarativepersondata.cpp new/kpeople-5.31.0/src/declarative/declarativepersondata.cpp --- old/kpeople-5.30.0/src/declarative/declarativepersondata.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/declarative/declarativepersondata.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -36,7 +36,7 @@ m_id = id; delete m_person; if (m_id.isEmpty()) { - m_person = 0; + m_person = nullptr; } else { m_person = new KPeople::PersonData(id, this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/declarative/declarativepersondata.h new/kpeople-5.31.0/src/declarative/declarativepersondata.h --- old/kpeople-5.30.0/src/declarative/declarativepersondata.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/declarative/declarativepersondata.h 2017-02-05 12:08:56.000000000 +0100 @@ -31,7 +31,7 @@ Q_PROPERTY(KPeople::PersonData *person READ person NOTIFY personChanged) public: - DeclarativePersonData(QObject *parent = 0); + DeclarativePersonData(QObject *parent = nullptr); void setPersonUri(const QString &id); QString personUri() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/declarative/peopleqmlplugin.cpp new/kpeople-5.31.0/src/declarative/peopleqmlplugin.cpp --- old/kpeople-5.30.0/src/declarative/peopleqmlplugin.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/declarative/peopleqmlplugin.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -40,7 +40,7 @@ SendFileAction = KPeople::SendFileAction, OtherAction = KPeople::OtherAction }; - Q_ENUMS(ActionType) + Q_ENUM(ActionType) }; void PeopleQMLPlugin::registerTypes(const char *uri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/declarative/personactionsmodel.cpp new/kpeople-5.31.0/src/declarative/personactionsmodel.cpp --- old/kpeople-5.30.0/src/declarative/personactionsmodel.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/declarative/personactionsmodel.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -27,7 +27,7 @@ { struct PersonActionsPrivate { PersonActionsPrivate() - : person(0) + : person(nullptr) {} QList<QAction *> actions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/declarative/personactionsmodel_p.h new/kpeople-5.31.0/src/declarative/personactionsmodel_p.h --- old/kpeople-5.30.0/src/declarative/personactionsmodel_p.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/declarative/personactionsmodel_p.h 2017-02-05 12:08:56.000000000 +0100 @@ -42,7 +42,7 @@ ActionTypeRole }; - PersonActionsModel(QObject *parent = 0); + PersonActionsModel(QObject *parent = nullptr); virtual ~PersonActionsModel(); QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/duplicatesfinder_p.h new/kpeople-5.31.0/src/duplicatesfinder_p.h --- old/kpeople-5.30.0/src/duplicatesfinder_p.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/duplicatesfinder_p.h 2017-02-05 12:08:56.000000000 +0100 @@ -39,7 +39,7 @@ { Q_OBJECT public: - explicit DuplicatesFinder(PersonsModel *model, QObject *parent = 0); + explicit DuplicatesFinder(PersonsModel *model, QObject *parent = nullptr); /** Specifies a @p personUri id to look contacts for, in contrast to the whole contact list. */ void setSpecificPerson(const QString &personUri); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/match_p.h new/kpeople-5.31.0/src/match_p.h --- old/kpeople-5.30.0/src/match_p.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/match_p.h 2017-02-05 12:08:56.000000000 +0100 @@ -43,7 +43,7 @@ NameMatch, EmailMatch }; - Q_ENUMS(MatchReason) + Q_ENUM(MatchReason) Match() {} Match(const QList<MatchReason> &roles, const QPersistentModelIndex &a, const QPersistentModelIndex &b); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/matchessolver_p.h new/kpeople-5.31.0/src/matchessolver_p.h --- old/kpeople-5.30.0/src/matchessolver_p.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/matchessolver_p.h 2017-02-05 12:08:56.000000000 +0100 @@ -51,7 +51,7 @@ * * Note: Obviously, the @p model should be the same @p matches refers to. */ - explicit MatchesSolver(const QList<Match> &matches, PersonsModel *model, QObject *parent = 0); + explicit MatchesSolver(const QList<Match> &matches, PersonsModel *model, QObject *parent = nullptr); /** * Start doing some crazy matching! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/persondata.h new/kpeople-5.31.0/src/persondata.h --- old/kpeople-5.30.0/src/persondata.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/persondata.h 2017-02-05 12:08:56.000000000 +0100 @@ -53,7 +53,7 @@ * The ID can be either a local application specific ID (such as akonadi://?item=15) * or a kpeople ID in the form kpeople://15 */ - PersonData(const QString &id, QObject *parent = 0); + PersonData(const QString &id, QObject *parent = nullptr); virtual ~PersonData(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/personmanager.cpp new/kpeople-5.31.0/src/personmanager.cpp --- old/kpeople-5.30.0/src/personmanager.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/personmanager.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -276,7 +276,7 @@ PersonManager *PersonManager::instance(const QString &databasePath) { - static PersonManager *s_instance = 0; + static PersonManager *s_instance = nullptr; if (!s_instance) { QString path = databasePath; if (path.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/personmanager_p.h new/kpeople-5.31.0/src/personmanager_p.h --- old/kpeople-5.30.0/src/personmanager_p.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/personmanager_p.h 2017-02-05 12:08:56.000000000 +0100 @@ -82,7 +82,7 @@ void contactAddedToPerson(const QString &contactUri, const QString &newPersonUri); protected: - explicit PersonManager(const QString &databasePath, QObject *parent = 0); + explicit PersonManager(const QString &databasePath, QObject *parent = nullptr); virtual ~PersonManager(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/personpluginmanager.cpp new/kpeople-5.31.0/src/personpluginmanager.cpp --- old/kpeople-5.30.0/src/personpluginmanager.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/personpluginmanager.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -73,7 +73,7 @@ //TODO: Remove as soon as KTp sources are released with the new plugin system KService::List servicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/DataSource")); Q_FOREACH (const KService::Ptr &service, servicesList) { - BasePersonsDataSource *dataSource = service->createInstance<BasePersonsDataSource>(0); + BasePersonsDataSource *dataSource = service->createInstance<BasePersonsDataSource>(nullptr); if (dataSource) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/personsmodel.h new/kpeople-5.31.0/src/personsmodel.h --- old/kpeople-5.30.0/src/personsmodel.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/personsmodel.h 2017-02-05 12:08:56.000000000 +0100 @@ -56,9 +56,9 @@ UserRole = Qt::UserRole + 0x1000 ///< in case it's needed to extend, use this one to start from }; - Q_ENUMS(Role) + Q_ENUM(Role) - PersonsModel(QObject *parent = 0); + PersonsModel(QObject *parent = nullptr); virtual ~PersonsModel(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/personssortfilterproxymodel.h new/kpeople-5.31.0/src/personssortfilterproxymodel.h --- old/kpeople-5.30.0/src/personssortfilterproxymodel.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/personssortfilterproxymodel.h 2017-02-05 12:08:56.000000000 +0100 @@ -42,7 +42,7 @@ /** Specifies the properties that should be provided by the contact for the contact to be shown. */ Q_PROPERTY(QStringList requiredProperties READ requiredProperties WRITE setRequiredProperties) public: - PersonsSortFilterProxyModel(QObject *parent = Q_NULLPTR); + PersonsSortFilterProxyModel(QObject *parent = nullptr); ~PersonsSortFilterProxyModel(); QStringList requiredProperties() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/abstractfieldwidgetfactory.h new/kpeople-5.31.0/src/widgets/abstractfieldwidgetfactory.h --- old/kpeople-5.30.0/src/widgets/abstractfieldwidgetfactory.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/abstractfieldwidgetfactory.h 2017-02-05 12:08:56.000000000 +0100 @@ -33,7 +33,7 @@ { Q_OBJECT public: - explicit AbstractFieldWidgetFactory(QObject *parent = 0); + explicit AbstractFieldWidgetFactory(QObject *parent = nullptr); virtual ~AbstractFieldWidgetFactory(); virtual QString label() const = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/actions.cpp new/kpeople-5.31.0/src/widgets/actions.cpp --- old/kpeople-5.30.0/src/widgets/actions.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/actions.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -50,7 +50,7 @@ //TODO: Remove as soon as KTp sources are released with the new plugin system KService::List personServicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/Plugin")); Q_FOREACH (const KService::Ptr &service, personServicesList) { - AbstractPersonAction *plugin = service->createInstance<AbstractPersonAction>(0); + AbstractPersonAction *plugin = service->createInstance<AbstractPersonAction>(nullptr); if (plugin) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/mergedialog.cpp new/kpeople-5.31.0/src/widgets/mergedialog.cpp --- old/kpeople-5.30.0/src/widgets/mergedialog.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/mergedialog.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -57,9 +57,9 @@ { Q_D(MergeDialog); - d_ptr->personsModel = 0; - d_ptr->delegate = 0; - d_ptr->duplicatesFinder = 0; + d_ptr->personsModel = nullptr; + d_ptr->delegate = nullptr; + d_ptr->duplicatesFinder = nullptr; setWindowTitle(i18n("Duplicates Manager")); setLayout(new QVBoxLayout()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/mergedialog.h new/kpeople-5.31.0/src/widgets/mergedialog.h --- old/kpeople-5.30.0/src/widgets/mergedialog.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/mergedialog.h 2017-02-05 12:08:56.000000000 +0100 @@ -53,7 +53,7 @@ MergeReasonRole }; - explicit MergeDialog(QWidget *parent = 0); + explicit MergeDialog(QWidget *parent = nullptr); ~MergeDialog(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/persondetailsdialog.h new/kpeople-5.31.0/src/widgets/persondetailsdialog.h --- old/kpeople-5.30.0/src/widgets/persondetailsdialog.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/persondetailsdialog.h 2017-02-05 12:08:56.000000000 +0100 @@ -34,7 +34,7 @@ Q_OBJECT public: - explicit PersonDetailsDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit PersonDetailsDialog(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); virtual ~PersonDetailsDialog(); void setPerson(PersonData *person); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/persondetailsview.cpp new/kpeople-5.31.0/src/widgets/persondetailsview.cpp --- old/kpeople-5.30.0/src/widgets/persondetailsview.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/persondetailsview.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -90,12 +90,12 @@ { // we have a plugin specific for e-mails. if (m_field == QLatin1String("email")) { - return 0; + return nullptr; } QString text = person.contactCustomProperty(m_field).toString(); if (text.isEmpty()) { - return 0; + return nullptr; } return new QLabel(text, parent); } @@ -107,7 +107,7 @@ Q_D(PersonDetailsView); setLayout(new QVBoxLayout(this)); d->m_mainWidget = new QWidget(this); - d->m_person = 0; + d->m_person = nullptr; QWidget *details = new QWidget(); d->m_personDetailsPresentation = new Ui::PersonDetailsPresentation(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/persondetailsview.h new/kpeople-5.31.0/src/widgets/persondetailsview.h --- old/kpeople-5.30.0/src/widgets/persondetailsview.h 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/persondetailsview.h 2017-02-05 12:08:56.000000000 +0100 @@ -41,7 +41,7 @@ { Q_OBJECT public: - PersonDetailsView(QWidget *parent = 0); + PersonDetailsView(QWidget *parent = nullptr); virtual ~PersonDetailsView(); public Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.30.0/src/widgets/plugins/emaildetailswidget.cpp new/kpeople-5.31.0/src/widgets/plugins/emaildetailswidget.cpp --- old/kpeople-5.30.0/src/widgets/plugins/emaildetailswidget.cpp 2017-01-08 21:59:37.000000000 +0100 +++ new/kpeople-5.31.0/src/widgets/plugins/emaildetailswidget.cpp 2017-02-05 12:08:56.000000000 +0100 @@ -33,7 +33,7 @@ QWidget *EmailFieldsPlugin::createDetailsWidget(const PersonData &person, QWidget *parent) const { if (person.allEmails().isEmpty()) { - return 0; + return nullptr; } QWidget *widget = new QWidget(parent); QVBoxLayout *layout = new QVBoxLayout(widget);
