Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2018-05-18 14:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Fri May 18 14:23:04 2018 rev:39 rq:607581 version:5.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2018-04-19 15:18:07.038656325 +0200 +++ /work/SRC/openSUSE:Factory/.kpeople5.new/kpeople5.changes 2018-05-18 14:23:06.908914191 +0200 @@ -1,0 +2,13 @@ +Sun May 13 21:03:06 UTC 2018 - lbeltr...@kde.org + +- Update to 5.46.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.46.0.php +- Changes since 5.45.0: + * Use override + * Fix PersonSortFilterProxyModel filtering + * Use QVector for internal data types + * Warning-- + +------------------------------------------------------------------- Old: ---- kpeople-5.45.0.tar.xz New: ---- kpeople-5.46.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.6LJLhi/_old 2018-05-18 14:23:07.496892608 +0200 +++ /var/tmp/diff_new_pack.6LJLhi/_new 2018-05-18 14:23:07.500892462 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define rname kpeople -%define _tar_path 5.45 +%define _tar_path 5.46 # 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: kpeople5 -Version: 5.45.0 +Version: 5.46.0 Release: 0 %define kf5_version %{version} BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kpeople-5.45.0.tar.xz -> kpeople-5.46.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/CMakeLists.txt new/kpeople-5.46.0/CMakeLists.txt --- old/kpeople-5.45.0/CMakeLists.txt 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/CMakeLists.txt 2018-05-05 14:59:41.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.45.0") # handled by release scripts -set(KF5_DEP_VERSION "5.45.0") # handled by release scripts +set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_DEP_VERSION "5.46.0") # handled by release scripts project (KPeople VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.45.0 NO_MODULE) +find_package(ECM 5.46.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/kpeople-5.45.0/autotests/fakecontactsource.cpp new/kpeople-5.46.0/autotests/fakecontactsource.cpp --- old/kpeople-5.45.0/autotests/fakecontactsource.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/autotests/fakecontactsource.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -48,7 +48,7 @@ : m_properties(props) {} - QVariant customProperty(const QString &key) const Q_DECL_OVERRIDE + QVariant customProperty(const QString &key) const override { if (key.startsWith(QLatin1Literal("all-"))) { return QStringList(m_properties[key.mid(4)].toString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/autotests/fakecontactsource.h new/kpeople-5.46.0/autotests/fakecontactsource.h --- old/kpeople-5.45.0/autotests/fakecontactsource.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/autotests/fakecontactsource.h 2018-05-05 14:59:41.000000000 +0200 @@ -37,11 +37,11 @@ { public: FakeContactSource(QObject *parent, const QVariantList &args = QVariantList()); - QString sourcePluginId() const Q_DECL_OVERRIDE; + QString sourcePluginId() const override; void changeProperty(const QString& key, const QVariant& value); protected: - KPeople::AllContactsMonitor *createAllContactsMonitor() Q_DECL_OVERRIDE; + KPeople::AllContactsMonitor *createAllContactsMonitor() override; }; //---------------------------------------------------------------------------- @@ -52,7 +52,7 @@ public: explicit FakeAllContactsMonitor(); void changeProperty(const QString& key, const QVariant& value); - QMap<QString, KPeople::AbstractContact::Ptr> contacts() Q_DECL_OVERRIDE; + QMap<QString, KPeople::AbstractContact::Ptr> contacts() override; }; #endif // FAKECONTACTSOURCE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/examples/contactlistwidgets.cpp new/kpeople-5.46.0/examples/contactlistwidgets.cpp --- old/kpeople-5.45.0/examples/contactlistwidgets.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/examples/contactlistwidgets.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -40,8 +40,8 @@ PersonsDelegate(QObject *parent = nullptr); ~PersonsDelegate(); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; PersonsDelegate::PersonsDelegate(QObject *parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/po/zh_CN/kpeople5.po new/kpeople-5.46.0/po/zh_CN/kpeople5.po --- old/kpeople-5.45.0/po/zh_CN/kpeople5.po 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/po/zh_CN/kpeople5.po 2018-05-05 14:59:41.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2018-04-05 09:22-0400\n" +"PO-Revision-Date: 2018-04-26 05:22-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/backends/abstractpersonaction.h new/kpeople-5.46.0/src/backends/abstractpersonaction.h --- old/kpeople-5.45.0/src/backends/abstractpersonaction.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/backends/abstractpersonaction.h 2018-05-05 14:59:41.000000000 +0200 @@ -33,7 +33,7 @@ { Q_OBJECT public: - AbstractPersonAction(QObject *parent); + explicit AbstractPersonAction(QObject *parent); /** A list of actions that can be executed for a contact * Disabled actions should not be added * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/backends/allcontactsmonitor.cpp new/kpeople-5.46.0/src/backends/allcontactsmonitor.cpp --- old/kpeople-5.45.0/src/backends/allcontactsmonitor.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/backends/allcontactsmonitor.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -24,14 +24,12 @@ class KPeople::AllContactsMonitorPrivate { public: - AllContactsMonitorPrivate(): - m_initialFetchDone(false), - m_initialFetchSucccess(false) + AllContactsMonitorPrivate() { } - bool m_initialFetchDone; - bool m_initialFetchSucccess; + bool m_initialFetchDone = false; + bool m_initialFetchSucccess = false; }; AllContactsMonitor::AllContactsMonitor(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/declarative/declarativepersondata.h new/kpeople-5.46.0/src/declarative/declarativepersondata.h --- old/kpeople-5.45.0/src/declarative/declarativepersondata.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/declarative/declarativepersondata.h 2018-05-05 14:59:41.000000000 +0200 @@ -31,7 +31,7 @@ Q_PROPERTY(KPeople::PersonData *person READ person NOTIFY personChanged) public: - DeclarativePersonData(QObject *parent = nullptr); + explicit DeclarativePersonData(QObject *parent = nullptr); void setPersonUri(const QString &id); QString personUri() const; @@ -43,7 +43,7 @@ private: QString m_id; - KPeople::PersonData *m_person; + KPeople::PersonData *m_person = nullptr; }; #endif // DECLARATIVEPERSONDATA_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/declarative/peopleqmlplugin.h new/kpeople-5.46.0/src/declarative/peopleqmlplugin.h --- old/kpeople-5.45.0/src/declarative/peopleqmlplugin.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/declarative/peopleqmlplugin.h 2018-05-05 14:59:41.000000000 +0200 @@ -27,7 +27,7 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void registerTypes(const char *uri) override; }; #endif // PEOPLEQMLPLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/declarative/personactionsmodel_p.h new/kpeople-5.46.0/src/declarative/personactionsmodel_p.h --- old/kpeople-5.45.0/src/declarative/personactionsmodel_p.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/declarative/personactionsmodel_p.h 2018-05-05 14:59:41.000000000 +0200 @@ -40,18 +40,18 @@ ActionTypeRole }; - PersonActionsModel(QObject *parent = nullptr); - virtual ~PersonActionsModel(); + explicit PersonActionsModel(QObject *parent = nullptr); + ~PersonActionsModel() override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; QString personUri() const; void setPersonUri(const QString &personUri); QList<QAction *> actions() const; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const override; Q_INVOKABLE void triggerAction(int row) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/duplicatesfinder_p.h new/kpeople-5.46.0/src/duplicatesfinder_p.h --- old/kpeople-5.45.0/src/duplicatesfinder_p.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/duplicatesfinder_p.h 2018-05-05 14:59:41.000000000 +0200 @@ -48,7 +48,7 @@ QList<Match> results() const; public Q_SLOTS: - void start() Q_DECL_OVERRIDE; + void start() override; private Q_SLOTS: void doSearch(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/matchessolver_p.h new/kpeople-5.46.0/src/matchessolver_p.h --- old/kpeople-5.45.0/src/matchessolver_p.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/matchessolver_p.h 2018-05-05 14:59:41.000000000 +0200 @@ -58,7 +58,7 @@ * * @see KJob::finished() */ - void start() Q_DECL_OVERRIDE; + void start() override; private Q_SLOTS: void startMatching(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/metacontact.cpp new/kpeople-5.46.0/src/metacontact.cpp --- old/kpeople-5.45.0/src/metacontact.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/metacontact.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -44,7 +44,7 @@ : m_contacts(contacts) {} - QVariant customProperty(const QString &key) const Q_DECL_OVERRIDE + QVariant customProperty(const QString &key) const override { if (key.startsWith(QLatin1String("all-"))) { QVariantList ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/personmanager.cpp new/kpeople-5.46.0/src/personmanager.cpp --- old/kpeople-5.45.0/src/personmanager.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/personmanager.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -35,7 +35,7 @@ ~Transaction(); private: QSqlDatabase m_db; - bool m_cancelled; + bool m_cancelled = false; }; Transaction::Transaction(const QSqlDatabase &db) : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/personsmodel.cpp new/kpeople-5.46.0/src/personsmodel.cpp --- old/kpeople-5.45.0/src/personsmodel.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/personsmodel.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -56,10 +56,10 @@ QHash<QString /*Person ID*/, QPersistentModelIndex /*Row*/> personIndex; //a list so we have an order in the model - QList<MetaContact> metacontacts; //TODO: Make QVector + QVector<MetaContact> metacontacts; QString genericAvatarImagePath; - QList<AllContactsMonitorPtr> m_sourceMonitors; + QVector<AllContactsMonitorPtr> m_sourceMonitors; int initialFetchesDoneCount; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/personsmodel.h new/kpeople-5.46.0/src/personsmodel.h --- old/kpeople-5.45.0/src/personsmodel.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/personsmodel.h 2018-05-05 14:59:41.000000000 +0200 @@ -60,16 +60,16 @@ }; Q_ENUM(Role) - PersonsModel(QObject *parent = nullptr); + explicit PersonsModel(QObject *parent = nullptr); - virtual ~PersonsModel(); + ~PersonsModel() override; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QHash<int, QByteArray> roleNames() const override; /** @returns the index for a given @p personUri */ QModelIndex indexForPersonUri(const QString &personUri) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/personssortfilterproxymodel.cpp new/kpeople-5.46.0/src/personssortfilterproxymodel.cpp --- old/kpeople-5.45.0/src/personssortfilterproxymodel.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/personssortfilterproxymodel.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -56,6 +56,9 @@ const QModelIndex idx = sourceModel()->index(source_row, 0, source_parent); Q_ASSERT(idx.isValid()); + if (!QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent)) + return false; + const AbstractContact::Ptr contact = idx.data(KPeople::PersonsModel::PersonVCardRole).value<AbstractContact::Ptr>(); Q_ASSERT(contact); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/personssortfilterproxymodel.h new/kpeople-5.46.0/src/personssortfilterproxymodel.h --- old/kpeople-5.45.0/src/personssortfilterproxymodel.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/personssortfilterproxymodel.h 2018-05-05 14:59:41.000000000 +0200 @@ -43,13 +43,13 @@ /** 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 = nullptr); - ~PersonsSortFilterProxyModel(); + explicit PersonsSortFilterProxyModel(QObject *parent = nullptr); + ~PersonsSortFilterProxyModel() override; QStringList requiredProperties() const; void setRequiredProperties(const QStringList &props); - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const Q_DECL_OVERRIDE; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; private: Q_DISABLE_COPY(PersonsSortFilterProxyModel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/widgets/mergedelegate.h new/kpeople-5.46.0/src/widgets/mergedelegate.h --- old/kpeople-5.45.0/src/widgets/mergedelegate.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/widgets/mergedelegate.h 2018-05-05 14:59:41.000000000 +0200 @@ -35,7 +35,7 @@ public: explicit MergeDelegate(QAbstractItemView *parent); - ~MergeDelegate(); + ~MergeDelegate() override; static QSize pictureSize(); @@ -45,7 +45,7 @@ private: - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)const override; QWidget *buildExtensionWidget(const QModelIndex &idx); QWidget *buildMultipleLineLabel(const QModelIndex &idx); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/widgets/persondetailsview.cpp new/kpeople-5.46.0/src/widgets/persondetailsview.cpp --- old/kpeople-5.45.0/src/widgets/persondetailsview.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/widgets/persondetailsview.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -57,10 +57,10 @@ { public: CoreFieldsPlugin(const QString &field); - virtual ~CoreFieldsPlugin(); - QString label() const Q_DECL_OVERRIDE; - int sortWeight() const Q_DECL_OVERRIDE; - QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const Q_DECL_OVERRIDE; + ~CoreFieldsPlugin() override; + QString label() const override; + int sortWeight() const override; + QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const override; private: QString m_field; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/widgets/plugins/emaildetailswidget.h new/kpeople-5.46.0/src/widgets/plugins/emaildetailswidget.h --- old/kpeople-5.45.0/src/widgets/plugins/emaildetailswidget.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/widgets/plugins/emaildetailswidget.h 2018-05-05 14:59:41.000000000 +0200 @@ -26,9 +26,9 @@ class EmailFieldsPlugin : public AbstractFieldWidgetFactory { public: - QString label() const Q_DECL_OVERRIDE; - int sortWeight() const Q_DECL_OVERRIDE; - QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const Q_DECL_OVERRIDE; + QString label() const override; + int sortWeight() const override; + QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const override; }; #endif // EMAIL_DETAILS_WIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/widgets/plugins/mergecontactswidget.cpp new/kpeople-5.46.0/src/widgets/plugins/mergecontactswidget.cpp --- old/kpeople-5.45.0/src/widgets/plugins/mergecontactswidget.cpp 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/widgets/plugins/mergecontactswidget.cpp 2018-05-05 14:59:41.000000000 +0200 @@ -39,10 +39,10 @@ MergeContactsWidget::MergeContactsWidget(QWidget *parent, const QVariantList &args) : AbstractPersonDetailsWidget(parent) - , m_person(0) - , m_model(0) - , m_containerListDetails(0) - , m_duplicatesBuster(0) + , m_person(nullptr) + , m_model(nullptr) + , m_containerListDetails(nullptr) + , m_duplicatesBuster(nullptr) { Q_UNUSED(args); setLayout(new QVBoxLayout()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.45.0/src/widgets/plugins/personpresentationwidget.h new/kpeople-5.46.0/src/widgets/plugins/personpresentationwidget.h --- old/kpeople-5.45.0/src/widgets/plugins/personpresentationwidget.h 2018-04-07 21:38:08.000000000 +0200 +++ new/kpeople-5.46.0/src/widgets/plugins/personpresentationwidget.h 2018-05-05 14:59:41.000000000 +0200 @@ -28,7 +28,7 @@ { Q_OBJECT public: - PersonPresentationWidget(const QString &name, const QIcon &avatar, QWidget *parent = 0); + PersonPresentationWidget(const QString &name, const QIcon &avatar, QWidget *parent = nullptr); ~PersonPresentationWidget(); bool isContactSelected() const
