Hello community,
here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2016-02-24 18:56:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old)
and /work/SRC/openSUSE:Factory/.kpeople5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2016-01-20 09:47:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kpeople5.new/kpeople5.changes 2016-02-24 18:56:46.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Feb 6 18:05:54 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.19.0 (boo#967668)
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.19.0.php
+
+-------------------------------------------------------------------
Old:
----
kpeople-5.18.0.tar.xz
New:
----
kpeople-5.19.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpeople5.spec ++++++
--- /var/tmp/diff_new_pack.I6UZD2/_old 2016-02-24 18:56:47.000000000 +0100
+++ /var/tmp/diff_new_pack.I6UZD2/_new 2016-02-24 18:56:47.000000000 +0100
@@ -18,9 +18,9 @@
%bcond_without lang
%define rname kpeople
-%define _tar_path 5.18
+%define _tar_path 5.19
Name: kpeople5
-Version: 5.18.0
+Version: 5.19.0
Release: 0
%define kf5_version %{version}
BuildRequires: extra-cmake-modules >= %{_tar_path}
++++++ kpeople-5.18.0.tar.xz -> kpeople-5.19.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/CMakeLists.txt new/kpeople-5.19.0/CMakeLists.txt
--- old/kpeople-5.18.0/CMakeLists.txt 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/CMakeLists.txt 2016-02-06 14:54:15.000000000 +0100
@@ -3,14 +3,14 @@
project (KPeople)
include(FeatureSummary)
-find_package(ECM 5.18.0 NO_MODULE)
+find_package(ECM 5.19.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(KF5_VERSION "5.18.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.18.0") # handled by release scripts
+set(KF5_VERSION "5.19.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.19.0") # handled by release scripts
set(REQUIRED_QT_VERSION 5.3.0)
@@ -31,7 +31,7 @@
include(GenerateExportHeader)
include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
add_definitions(-DTRANSLATION_DOMAIN=\"kpeople5\")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/autotests/persondatatests.cpp new/kpeople-5.19.0/autotests/persondatatests.cpp
--- old/kpeople-5.18.0/autotests/persondatatests.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/autotests/persondatatests.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -32,7 +32,7 @@
#include "fakecontactsource.h"
-QTEST_GUILESS_MAIN(PersonDataTests);
+QTEST_GUILESS_MAIN(PersonDataTests)
using namespace KPeople;
@@ -99,13 +99,13 @@
{
PersonData person(QStringLiteral("fakesource://contact1"));
- QCOMPARE(person.allEmails().first(), QStringLiteral("contact1@example.com"));
+ QCOMPARE(person.allEmails().at(0), QStringLiteral("contact1@example.com"));
QSignalSpy spy(&person, SIGNAL(dataChanged()));
m_source->changeProperty(AbstractContact::EmailProperty, QStringLiteral("newaddress@yahoo.com"));
QCOMPARE(spy.count(), 1);
- QCOMPARE(person.allEmails().first(), QStringLiteral("newaddress@yahoo.com"));
+ QCOMPARE(person.allEmails().at(0), QStringLiteral("newaddress@yahoo.com"));
}
void PersonDataTests::nullPerson()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/autotests/personsmodeltest.cpp new/kpeople-5.19.0/autotests/personsmodeltest.cpp
--- old/kpeople-5.18.0/autotests/personsmodeltest.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/autotests/personsmodeltest.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -33,7 +33,7 @@
#include "fakecontactsource.h"
-QTEST_GUILESS_MAIN(PersonsModelTest);
+QTEST_GUILESS_MAIN(PersonsModelTest)
using namespace KPeople;
@@ -98,9 +98,9 @@
// contacts from one person and adds them to the other)
QCOMPARE(modelRowsInsert.count(), 2);
// The first inserted Person must have invalid parent index
- QCOMPARE(modelRowsInsert.first().at(0).value<QModelIndex>(), QModelIndex());
+ QCOMPARE(modelRowsInsert.first().at(0).toModelIndex(), QModelIndex());
// Second inserted row, the Contact, must have the Person index as parent
- QCOMPARE(modelRowsInsert.at(1).at(0).value<QModelIndex>(), m_model->indexForPersonUri(newUri));
+ QCOMPARE(modelRowsInsert.at(1).at(0).toModelIndex(), m_model->indexForPersonUri(newUri));
modelRowsInsert.clear();
@@ -113,7 +113,7 @@
QCOMPARE(m_model->rowCount(), 2);
QCOMPARE(m_model->rowCount(m_model->indexForPersonUri(newUri2)), 3);
QCOMPARE(modelRowsInsert.count(), 1);
- QCOMPARE(modelRowsInsert.first().at(0).value<QModelIndex>(), m_model->indexForPersonUri(newUri));
+ QCOMPARE(modelRowsInsert.first().at(0).toModelIndex(), m_model->indexForPersonUri(newUri));
}
void PersonsModelTest::gettersTests()
@@ -149,12 +149,12 @@
// The unmerged Contact is turned into new Person (the fake Person where Person == Contact)
// There must be 1 insertion and the parent must be invalid index
QCOMPARE(modelRowsInsert.count(), 1);
- QCOMPARE(modelRowsInsert.first().at(0).value<QModelIndex>(), QModelIndex());
+ QCOMPARE(modelRowsInsert.first().at(0).toModelIndex(), QModelIndex());
// Similarily, there must be one row removed and the parent must be
// the old Person index
QCOMPARE(modelRowsRemove.count(), 1);
- QCOMPARE(modelRowsRemove.first().at(0).value<QModelIndex>(), personIndex);
+ QCOMPARE(modelRowsRemove.first().at(0).toModelIndex(), personIndex);
modelRowsInsert.clear();
modelRowsRemove.clear();
@@ -166,8 +166,8 @@
QCOMPARE(m_model->indexForPersonUri(QStringLiteral("kpeople://1")), QModelIndex());
QCOMPARE(modelRowsInsert.count(), 2);
- QCOMPARE(modelRowsInsert.first().at(0).value<QModelIndex>(), QModelIndex());
- QCOMPARE(modelRowsInsert.at(1).at(0).value<QModelIndex>(), QModelIndex());
+ QCOMPARE(modelRowsInsert.first().at(0).toModelIndex(), QModelIndex());
+ QCOMPARE(modelRowsInsert.at(1).at(0).toModelIndex(), QModelIndex());
// There must be exactly 3 rows removed when unmerging a Person
// with 2 contacts - first the subcontacts are removed and then
@@ -175,15 +175,15 @@
QCOMPARE(modelRowsRemove.count(), 3);
// The first two Contacts must have parent the Person index
// and both should have 0 0 as the "first last" args of removeRows
- QCOMPARE(modelRowsRemove.first().at(0).value<QModelIndex>(), personIndex);
+ QCOMPARE(modelRowsRemove.first().at(0).toModelIndex(), personIndex);
QCOMPARE(modelRowsRemove.first().at(1).toInt(), 0);
QCOMPARE(modelRowsRemove.first().at(2).toInt(), 0);
- QCOMPARE(modelRowsRemove.at(1).at(0).value<QModelIndex>(), personIndex);
+ QCOMPARE(modelRowsRemove.at(1).at(0).toModelIndex(), personIndex);
QCOMPARE(modelRowsRemove.at(1).at(1).toInt(), 0);
QCOMPARE(modelRowsRemove.at(1).at(2).toInt(), 0);
// The parent Person should have just invalid index as parent
// (and we don't care about the position)
- QCOMPARE(modelRowsRemove.at(2).at(0).value<QModelIndex>(), QModelIndex());
+ QCOMPARE(modelRowsRemove.at(2).at(0).toModelIndex(), QModelIndex());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/autotests/personsproxymodeltest.cpp new/kpeople-5.19.0/autotests/personsproxymodeltest.cpp
--- old/kpeople-5.18.0/autotests/personsproxymodeltest.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/autotests/personsproxymodeltest.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -34,7 +34,7 @@
#include "fakecontactsource.h"
-QTEST_GUILESS_MAIN(PersonsProxyModelTest);
+QTEST_GUILESS_MAIN(PersonsProxyModelTest)
using namespace KPeople;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/examples/contactlistwidgets.cpp new/kpeople-5.19.0/examples/contactlistwidgets.cpp
--- old/kpeople-5.18.0/examples/contactlistwidgets.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/examples/contactlistwidgets.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -149,7 +149,7 @@
void ContactListApp::onUnmergeClicked()
{
QModelIndexList indexes = m_view->selectionModel()->selectedIndexes();
- if (indexes.size()) {
+ if (!indexes.isEmpty()) {
QString id = indexes.first().data(PersonsModel::PersonUriRole).toString();
KPeople::unmergeContact(id);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/examples/personwidget.cpp new/kpeople-5.19.0/examples/personwidget.cpp
--- old/kpeople-5.18.0/examples/personwidget.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/examples/personwidget.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -27,7 +27,7 @@
{
QApplication app(argc, argv);
if (app.arguments().count() < 2) {
- qWarning() << "Missing argument: \"" << qPrintable(app.arguments().first()) << " <contact id>\"";
+ qWarning() << "Missing argument: \"" << qPrintable(app.arguments().at(0)) << " <contact id>\"";
return 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/po/ia/kpeople5.po new/kpeople-5.19.0/po/ia/kpeople5.po
--- old/kpeople-5.18.0/po/ia/kpeople5.po 1970-01-01 01:00:00.000000000 +0100
+++ new/kpeople-5.19.0/po/ia/kpeople5.po 2016-02-06 14:54:15.000000000 +0100
@@ -0,0 +1,70 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Giovanni Sora , 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2015-02-27 09:45+0000\n"
+"PO-Revision-Date: 2016-02-01 12:01+0100\n"
+"Last-Translator: Giovanni Sora \n"
+"Language-Team: Interlingua \n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: match.cpp:52
+msgctxt "@title:column"
+msgid "Name"
+msgstr "Nomine"
+
+#: match.cpp:55
+msgctxt "@title:column"
+msgid "E-mail"
+msgstr "E-posta:"
+
+#: widgets/mergedelegate.cpp:99
+msgctxt "reasons join"
+msgid ", "
+msgstr ", "
+
+#: widgets/mergedelegate.cpp:99
+#, kde-format
+msgctxt "name: merge reasons"
+msgid "%1: %2"
+msgstr "%1: %2"
+
+#: widgets/mergedialog.cpp:64
+msgid "Duplicates Manager"
+msgstr ""
+
+#: widgets/mergedialog.cpp:73
+msgid "Select contacts to be merged"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel)
+#: widgets/person-details-presentation.ui:43
+msgid "Avatar"
+msgstr "Avatar"
+
+#: widgets/plugins/emaildetailswidget.cpp:50
+msgctxt "E-mail field label"
+msgid "E-mail"
+msgstr "E-posta:"
+
+#: widgets/plugins/mergecontactswidget.cpp:50
+msgid "Show Merge Suggestions..."
+msgstr ""
+
+#: widgets/plugins/mergecontactswidget.cpp:88
+msgid "Merge with Selected Contacts"
+msgstr ""
+
+#: widgets/plugins/phonedetailswidget.cpp:38
+msgctxt "Phone details title"
+msgid "Phone"
+msgstr "Telephono"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/declarative/declarativepersondata.h new/kpeople-5.19.0/src/declarative/declarativepersondata.h
--- old/kpeople-5.18.0/src/declarative/declarativepersondata.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/declarative/declarativepersondata.h 2016-02-06 14:54:15.000000000 +0100
@@ -27,8 +27,8 @@
{
Q_OBJECT
- Q_PROPERTY(QString personUri READ personUri WRITE setPersonUri NOTIFY personChanged);
- Q_PROPERTY(KPeople::PersonData *person READ person NOTIFY personChanged);
+ Q_PROPERTY(QString personUri READ personUri WRITE setPersonUri NOTIFY personChanged)
+ Q_PROPERTY(KPeople::PersonData *person READ person NOTIFY personChanged)
public:
DeclarativePersonData(QObject *parent = 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/declarative/personactionsmodel_p.h new/kpeople-5.19.0/src/declarative/personactionsmodel_p.h
--- old/kpeople-5.18.0/src/declarative/personactionsmodel_p.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/declarative/personactionsmodel_p.h 2016-02-06 14:54:15.000000000 +0100
@@ -62,7 +62,7 @@
private:
void resetActions();
- Q_DECLARE_PRIVATE(PersonActions);
+ Q_DECLARE_PRIVATE(PersonActions)
PersonActionsPrivate *const d_ptr;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/global.h new/kpeople-5.19.0/src/global.h
--- old/kpeople-5.18.0/src/global.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/global.h 2016-02-06 14:54:15.000000000 +0100
@@ -60,6 +60,6 @@
*/
KPEOPLE_EXPORT int presenceSortPriority(const QString &presenceName);
-};
+}
#endif // GLOBAL_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/match_p.h new/kpeople-5.19.0/src/match_p.h
--- old/kpeople-5.18.0/src/match_p.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/match_p.h 2016-02-06 14:54:15.000000000 +0100
@@ -43,7 +43,7 @@
NameMatch,
EmailMatch
};
- Q_ENUMS(MatchReason);
+ Q_ENUMS(MatchReason)
Match() {}
Match(const QList<MatchReason> &roles, const QPersistentModelIndex &a, const QPersistentModelIndex &b);
@@ -59,6 +59,6 @@
}
-Q_DECLARE_METATYPE(KPeople::Match);
+Q_DECLARE_METATYPE(KPeople::Match)
#endif // MATCH_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/personmanager.cpp new/kpeople-5.19.0/src/personmanager.cpp
--- old/kpeople-5.18.0/src/personmanager.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/personmanager.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -190,16 +190,16 @@
rc = false;
}
- QDBusMessage message = QDBusMessage::createSignal(QLatin1String("/KPeople"),
- QLatin1String("org.kde.KPeople"),
- QLatin1String("ContactRemovedFromPerson"));
+ QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KPeople"),
+ QStringLiteral("org.kde.KPeople"),
+ QStringLiteral("ContactRemovedFromPerson"));
message.setArguments(QVariantList() << id);
pendingMessages << message;
- message = QDBusMessage::createSignal(QLatin1String("/KPeople"),
- QLatin1String("org.kde.KPeople"),
- QLatin1String("ContactAddedToPerson"));
+ message = QDBusMessage::createSignal(QStringLiteral("/KPeople"),
+ QStringLiteral("org.kde.KPeople"),
+ QStringLiteral("ContactAddedToPerson"));
message.setArguments(QVariantList() << id << personUriString);
@@ -219,9 +219,9 @@
}
//FUTURE OPTIMIZATION - this would be best as one signal, but arguments become complex
- QDBusMessage message = QDBusMessage::createSignal(QLatin1String("/KPeople"),
- QLatin1String("org.kde.KPeople"),
- QLatin1String("ContactAddedToPerson"));
+ QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KPeople"),
+ QStringLiteral("org.kde.KPeople"),
+ QStringLiteral("ContactAddedToPerson"));
message.setArguments(QVariantList() << id << personUriString);
pendingMessages << message;
@@ -255,9 +255,9 @@
Q_FOREACH (const QString &contactUri, contactUris) {
//FUTURE OPTIMIZATION - this would be best as one signal, but arguments become complex
- QDBusMessage message = QDBusMessage::createSignal(QLatin1String("/KPeople"),
- QLatin1String("org.kde.KPeople"),
- QLatin1String("ContactRemovedFromPerson"));
+ QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KPeople"),
+ QStringLiteral("org.kde.KPeople"),
+ QStringLiteral("ContactRemovedFromPerson"));
message.setArguments(QVariantList() << contactUri);
QDBusConnection::sessionBus().send(message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/personpluginmanager.cpp new/kpeople-5.19.0/src/personpluginmanager.cpp
--- old/kpeople-5.18.0/src/personpluginmanager.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/personpluginmanager.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -44,7 +44,7 @@
};
-Q_GLOBAL_STATIC(PersonPluginManagerPrivate, s_instance);
+Q_GLOBAL_STATIC(PersonPluginManagerPrivate, s_instance)
PersonPluginManagerPrivate::PersonPluginManagerPrivate():
m_loadedDataSourcePlugins(false)
@@ -71,7 +71,7 @@
}
//TODO: Remove as soon as KTp sources are released with the new plugin system
- KService::List servicesList = KServiceTypeTrader::self()->query(QLatin1String("KPeople/DataSource"));
+ KService::List servicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/DataSource"));
Q_FOREACH (const KService::Ptr &service, servicesList) {
BasePersonsDataSource *dataSource = service->createInstance<BasePersonsDataSource>(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/personsmodel.h new/kpeople-5.19.0/src/personsmodel.h
--- old/kpeople-5.18.0/src/personsmodel.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/personsmodel.h 2016-02-06 14:54:15.000000000 +0100
@@ -93,7 +93,7 @@
Q_DISABLE_COPY(PersonsModel)
QScopedPointer<PersonsModelPrivate> const d_ptr;
- Q_DECLARE_PRIVATE(PersonsModel);
+ Q_DECLARE_PRIVATE(PersonsModel)
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/personssortfilterproxymodel.h new/kpeople-5.19.0/src/personssortfilterproxymodel.h
--- old/kpeople-5.18.0/src/personssortfilterproxymodel.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/personssortfilterproxymodel.h 2016-02-06 14:54:15.000000000 +0100
@@ -54,7 +54,7 @@
Q_DISABLE_COPY(PersonsSortFilterProxyModel)
QScopedPointer<PersonsSortFilterProxyModelPrivate> const d_ptr;
- Q_DECLARE_PRIVATE(PersonsSortFilterProxyModel);
+ Q_DECLARE_PRIVATE(PersonsSortFilterProxyModel)
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/widgets/actions.cpp new/kpeople-5.19.0/src/widgets/actions.cpp
--- old/kpeople-5.18.0/src/widgets/actions.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/widgets/actions.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -43,7 +43,7 @@
}
//TODO: Remove as soon as KTp sources are released with the new plugin system
- KService::List personServicesList = KServiceTypeTrader::self()->query(QLatin1String("KPeople/Plugin"));
+ KService::List personServicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/Plugin"));
Q_FOREACH (const KService::Ptr &service, personServicesList) {
AbstractPersonAction *plugin = service->createInstance<AbstractPersonAction>(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/widgets/actions.h new/kpeople-5.19.0/src/widgets/actions.h
--- old/kpeople-5.18.0/src/widgets/actions.h 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/widgets/actions.h 2016-02-06 14:54:15.000000000 +0100
@@ -49,6 +49,6 @@
* each QAction will have @p parent passed as its parent QObject
*/
KPEOPLE_EXPORT QList actionsForPerson(const QString &contactUri, QObject *parent);
-};
+}
#endif // KPEOPLEWIDGETS_GLOBAL_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/widgets/mergedelegate.cpp new/kpeople-5.19.0/src/widgets/mergedelegate.cpp
--- old/kpeople-5.18.0/src/widgets/mergedelegate.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/widgets/mergedelegate.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -74,14 +74,14 @@
void MergeDelegate::onSelectedContactsChanged(const QItemSelection &now , const QItemSelection &old)
{
- if (old.indexes().size()) {
+ if (!old.indexes().isEmpty()) {
QModelIndex oldIdx = old.indexes().first();
if (isExtended(oldIdx)) {
contractItem(oldIdx);
}
}
- if (now.indexes().size()) {
+ if (!now.indexes().isEmpty()) {
QModelIndex idx = now.indexes().first();
extendItem(buildMultipleLineLabel(idx), idx);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.18.0/src/widgets/persondetailsview.cpp new/kpeople-5.19.0/src/widgets/persondetailsview.cpp
--- old/kpeople-5.18.0/src/widgets/persondetailsview.cpp 2016-01-02 17:46:35.000000000 +0100
+++ new/kpeople-5.19.0/src/widgets/persondetailsview.cpp 2016-02-06 14:54:15.000000000 +0100
@@ -140,7 +140,7 @@
}
//TODO: Remove as soon as KTp sources are released with the new plugin system
- KService::List pluginList = KServiceTypeTrader::self()->query(QLatin1String("KPeopleWidgets/Plugin"));
+ KService::List pluginList = KServiceTypeTrader::self()->query(QStringLiteral("KPeopleWidgets/Plugin"));
QList<KPluginInfo> plugins = KPluginInfo::fromServices(pluginList);
Q_FOREACH (const KPluginInfo &p, plugins) {