Hello community,
here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2019-04-19 21:23:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old)
and /work/SRC/openSUSE:Factory/.kpeople5.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5"
Fri Apr 19 21:23:54 2019 rev:51 rq:695244 version:5.57.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2019-03-21 09:47:50.442876246 +0100
+++ /work/SRC/openSUSE:Factory/.kpeople5.new.5536/kpeople5.changes 2019-04-19 21:23:55.775839491 +0200
@@ -1,0 +2,11 @@
+Sun Apr 14 20:21:44 UTC 2019 - lbeltrame@kde.org
+
+- Update to 5.57.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.57.0.php
+- Changes since 5.56.0:
+ * Don't use deprecated class
+ * [kpeople] make it compile without foreach
+
+-------------------------------------------------------------------
Old:
----
kpeople-5.56.0.tar.xz
New:
----
kpeople-5.57.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpeople5.spec ++++++
--- /var/tmp/diff_new_pack.0nVSaD/_old 2019-04-19 21:23:57.191841294 +0200
+++ /var/tmp/diff_new_pack.0nVSaD/_new 2019-04-19 21:23:57.231841345 +0200
@@ -17,14 +17,14 @@
%define rname kpeople
-%define _tar_path 5.56
+%define _tar_path 5.57
# 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kpeople5
-Version: 5.56.0
+Version: 5.57.0
Release: 0
Summary: Library for access to contacts and identity holders
License: LGPL-2.1-or-later
++++++ kpeople-5.56.0.tar.xz -> kpeople-5.57.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/.gitignore new/kpeople-5.57.0/.gitignore
--- old/kpeople-5.56.0/.gitignore 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/.gitignore 2019-04-07 09:31:21.000000000 +0200
@@ -1,3 +1,21 @@
+# Ignore the following files
*~
-*.kdev*
-
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+avail
+random_seed
+/build*/
+CMakeLists.txt.user*
+*.unc-backup*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/CMakeLists.txt new/kpeople-5.57.0/CMakeLists.txt
--- old/kpeople-5.56.0/CMakeLists.txt 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/CMakeLists.txt 2019-04-07 09:31:21.000000000 +0200
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.56.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.56.0") # handled by release scripts
+set(KF5_VERSION "5.57.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.57.0") # handled by release scripts
project (KPeople VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.56.0 NO_MODULE)
+find_package(ECM 5.57.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)
@@ -52,6 +52,7 @@
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ki18n_install(po)
endif ()
+add_definitions(-DQT_NO_FOREACH)
add_subdirectory (src)
add_subdirectory (pixmaps)
if (ENABLE_EXAMPLES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/examples/contactlistwidgets.cpp new/kpeople-5.57.0/examples/contactlistwidgets.cpp
--- old/kpeople-5.56.0/examples/contactlistwidgets.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/examples/contactlistwidgets.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -55,7 +55,7 @@
void PersonsDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
- QStyleOptionViewItemV4 optV4 = option;
+ QStyleOptionViewItem optV4 = option;
initStyleOption(&optV4, index);
painter->save();
@@ -135,9 +135,9 @@
void ContactListApp::onMergeClicked()
{
- QModelIndexList indexes = m_view->selectionModel()->selectedIndexes();
+ const QModelIndexList indexes = m_view->selectionModel()->selectedIndexes();
QStringList ids;
- Q_FOREACH (const QModelIndex &index, indexes) {
+ for (const QModelIndex &index : indexes) {
ids << index.data(PersonsModel::PersonUriRole).toString();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/examples/duplicates.cpp new/kpeople-5.57.0/examples/duplicates.cpp
--- old/kpeople-5.56.0/examples/duplicates.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/examples/duplicates.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -47,7 +47,7 @@
AbstractContact::Ptr aB = it->indexB.data(PersonsModel::PersonVCardRole).valueAbstractContact::Ptr();
Q_ASSERT(!it->reasons.isEmpty());
- Q_FOREACH (Match::MatchReason i, it->reasons) {
+ for (Match::MatchReason i : qAsConst(it->reasons)) {
rA += it->matchValue(i, aA);
rB += it->matchValue(i, aB);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ar/kpeople5.po new/kpeople-5.57.0/po/ar/kpeople5.po
--- old/kpeople-5.56.0/po/ar/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ar/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2018-06-09 22:21+0300\n"
"Last-Translator: Safa Alfulaij \n"
"Language-Team: Arabic \n"
@@ -58,7 +58,7 @@
msgid "Avatar"
msgstr "الشعار"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/bs/kpeople5.po new/kpeople-5.57.0/po/bs/kpeople5.po
--- old/kpeople-5.56.0/po/bs/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/bs/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: bosnianuniversetranslation\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-16 11:52+0000\n"
"Last-Translator: Samir Ribić <Unknown>\n"
"Language-Team: Bosnian \n"
@@ -60,7 +60,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, fuzzy, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ca/kpeople5.po new/kpeople-5.57.0/po/ca/kpeople5.po
--- old/kpeople-5.56.0/po/ca/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ca/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kpeople5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 22:43+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -60,7 +60,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ca@valencia/kpeople5.po new/kpeople-5.57.0/po/ca@valencia/kpeople5.po
--- old/kpeople-5.56.0/po/ca@valencia/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ca@valencia/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kpeople5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 22:43+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
@@ -60,7 +60,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/cs/kpeople5.po new/kpeople-5.57.0/po/cs/kpeople5.po
--- old/kpeople-5.56.0/po/cs/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/cs/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-04 16:08+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
@@ -59,7 +59,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/da/kpeople5.po new/kpeople-5.57.0/po/da/kpeople5.po
--- old/kpeople-5.56.0/po/da/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/da/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-04-25 15:19+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/de/kpeople5.po new/kpeople-5.57.0/po/de/kpeople5.po
--- old/kpeople-5.56.0/po/de/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/de/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-09 21:35+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
@@ -54,7 +54,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/el/kpeople5.po new/kpeople-5.57.0/po/el/kpeople5.po
--- old/kpeople-5.56.0/po/el/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/el/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-02 16:14+0200\n"
"Last-Translator: Dimitris Kardarakos \n"
"Language-Team: Greek \n"
@@ -58,7 +58,7 @@
msgid "Avatar"
msgstr "Εικόνα"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/en_GB/kpeople5.po new/kpeople-5.57.0/po/en_GB/kpeople5.po
--- old/kpeople-5.56.0/po/en_GB/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/en_GB/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-14 14:49+0000\n"
"Last-Translator: \n"
"Language-Team: British English \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/es/kpeople5.po new/kpeople-5.57.0/po/es/kpeople5.po
--- old/kpeople-5.56.0/po/es/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/es/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-05 22:46+0100\n"
"Last-Translator: Eloy Cuadra \n"
"Language-Team: Spanish \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/et/kpeople5.po new/kpeople-5.57.0/po/et/kpeople5.po
--- old/kpeople-5.56.0/po/et/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/et/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2016-09-09 01:34+0300\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/eu/kpeople5.po new/kpeople-5.57.0/po/eu/kpeople5.po
--- old/kpeople-5.56.0/po/eu/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/eu/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kpeople5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2017-08-16 13:12+0100\n"
"Last-Translator: Iñigo Salvador Azurmendi \n"
"Language-Team: Basque \n"
@@ -60,7 +60,7 @@
msgid "Avatar"
msgstr "Avatara"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/fi/kpeople5.po new/kpeople-5.57.0/po/fi/kpeople5.po
--- old/kpeople-5.56.0/po/fi/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/fi/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-26 16:53+0200\n"
"Last-Translator: Lasse Liehu \n"
"Language-Team: Finnish \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/fr/kpeople5.po new/kpeople-5.57.0/po/fr/kpeople5.po
--- old/kpeople-5.56.0/po/fr/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/fr/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-10-31 12:10+0100\n"
"Last-Translator: Thomas Vergnaud \n"
"Language-Team: French \n"
@@ -61,7 +61,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/gd/kpeople5.po new/kpeople-5.57.0/po/gd/kpeople5.po
--- old/kpeople-5.56.0/po/gd/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/gd/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-11-04 15:15+0000\n"
"Last-Translator: Michael Bauer \n"
"Language-Team: Fòram na Gàidhlig\n"
@@ -59,7 +59,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/gl/kpeople5.po new/kpeople-5.57.0/po/gl/kpeople5.po
--- old/kpeople-5.56.0/po/gl/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/gl/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-14 07:28+0100\n"
"Last-Translator: Adrián Chaves Fernández \n"
"Language-Team: Galician \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/he/kpeople5.po new/kpeople-5.57.0/po/he/kpeople5.po
--- old/kpeople-5.56.0/po/he/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/he/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kpeople5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2017-05-16 06:50-0400\n"
"Last-Translator: Copied by Zanata \n"
"Language-Team: Hebrew \n"
@@ -58,7 +58,7 @@
msgid "Avatar"
msgstr "תמונה"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/hu/kpeople5.po new/kpeople-5.57.0/po/hu/kpeople5.po
--- old/kpeople-5.56.0/po/hu/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/hu/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-09-04 15:10+0200\n"
"Last-Translator: Kristóf Kiszel \n"
"Language-Team: Hungarian \n"
@@ -58,7 +58,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ia/kpeople5.po new/kpeople-5.57.0/po/ia/kpeople5.po
--- old/kpeople-5.56.0/po/ia/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ia/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2016-11-29 13:44+0100\n"
"Last-Translator: Giovanni Sora \n"
"Language-Team: Interlingua \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/id/kpeople5.po new/kpeople-5.57.0/po/id/kpeople5.po
--- old/kpeople-5.56.0/po/id/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/id/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2018-01-28 17:36+0700\n"
"Last-Translator: Wantoyo \n"
"Language-Team: Indonesian \n"
@@ -14,7 +14,7 @@
"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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: match.cpp:52
#, kde-format
@@ -56,7 +56,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/it/kpeople5.po new/kpeople-5.57.0/po/it/kpeople5.po
--- old/kpeople-5.56.0/po/it/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/it/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: libkpeople\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-15 13:53+0100\n"
"Last-Translator: Vincenzo Reale \n"
"Language-Team: Italian \n"
@@ -56,7 +56,7 @@
msgid "Avatar"
msgstr "Immagine"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ja/kpeople5.po new/kpeople-5.57.0/po/ja/kpeople5.po
--- old/kpeople-5.56.0/po/ja/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ja/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: libkpeople\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2013-09-25 00:43-0700\n"
"Last-Translator: Japanese KDE translation team \n"
"Language-Team: Japanese \n"
@@ -54,7 +54,7 @@
msgid "Avatar"
msgstr ""
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ko/kpeople5.po new/kpeople-5.57.0/po/ko/kpeople5.po
--- old/kpeople-5.56.0/po/ko/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ko/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-04-26 17:41+0200\n"
"Last-Translator: Shinjo Park \n"
"Language-Team: Korean \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "아바타"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/lt/kpeople5.po new/kpeople-5.57.0/po/lt/kpeople5.po
--- old/kpeople-5.56.0/po/lt/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/lt/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: l 10n\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-01-28 09:52+0200\n"
"Last-Translator: Liudas Ališauskas \n"
"Language-Team: Lithuanian \n"
@@ -62,7 +62,7 @@
msgid "Avatar"
msgstr "Avataras"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, fuzzy, kde-format
#| msgid "E-mail"
msgctxt "E-mail field label"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/nl/kpeople5.po new/kpeople-5.57.0/po/nl/kpeople5.po
--- old/kpeople-5.56.0/po/nl/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/nl/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 18:02+0100\n"
"Last-Translator: Freek de Kruijf \n"
"Language-Team: Dutch \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/nn/kpeople5.po new/kpeople-5.57.0/po/nn/kpeople5.po
--- old/kpeople-5.56.0/po/nn/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/nn/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-06-01 20:32+0100\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \n"
@@ -59,7 +59,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/pl/kpeople5.po new/kpeople-5.57.0/po/pl/kpeople5.po
--- old/kpeople-5.56.0/po/pl/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/pl/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-28 08:39+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
@@ -58,7 +58,7 @@
msgid "Avatar"
msgstr "Awatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/pt/kpeople5.po new/kpeople-5.57.0/po/pt/kpeople5.po
--- old/kpeople-5.56.0/po/pt/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/pt/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: libkpeople\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-25 00:29+0000\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
@@ -54,7 +54,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/pt_BR/kpeople5.po new/kpeople-5.57.0/po/pt_BR/kpeople5.po
--- old/kpeople-5.56.0/po/pt_BR/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/pt_BR/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: libkpeople\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 21:59-0300\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
@@ -59,7 +59,7 @@
msgid "Avatar"
msgstr "Imagem"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ro/kpeople5.po new/kpeople-5.57.0/po/ro/kpeople5.po
--- old/kpeople-5.56.0/po/ro/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ro/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2014-03-25 16:18+0200\n"
"Last-Translator: Sergiu Bivol \n"
"Language-Team: Romanian \n"
@@ -59,7 +59,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, fuzzy, kde-format
#| msgid "Email"
msgctxt "E-mail field label"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/ru/kpeople5.po new/kpeople-5.57.0/po/ru/kpeople5.po
--- old/kpeople-5.56.0/po/ru/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/ru/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-03-02 05:38+0300\n"
"Last-Translator: Alexander Potashev \n"
"Language-Team: Russian \n"
@@ -58,7 +58,7 @@
msgid "Avatar"
msgstr "Аватар"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/sk/kpeople5.po new/kpeople-5.57.0/po/sk/kpeople5.po
--- old/kpeople-5.56.0/po/sk/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/sk/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: libkpeople\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-28 12:12+0100\n"
"Last-Translator: Roman Paholik \n"
"Language-Team: Slovak \n"
@@ -55,7 +55,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/sl/kpeople5.po new/kpeople-5.57.0/po/sl/kpeople5.po
--- old/kpeople-5.56.0/po/sl/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/sl/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-04-03 10:06+0200\n"
"Last-Translator: Andrej Mernik \n"
"Language-Team: Slovenian \n"
@@ -59,7 +59,7 @@
msgid "Avatar"
msgstr "Podoba"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/sv/kpeople5.po new/kpeople-5.57.0/po/sv/kpeople5.po
--- old/kpeople-5.56.0/po/sv/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/sv/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 19:01+0100\n"
"Last-Translator: Stefan Asserhäll \n"
"Language-Team: Swedish \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/tr/kpeople5.po new/kpeople-5.57.0/po/tr/kpeople5.po
--- old/kpeople-5.56.0/po/tr/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/tr/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kpeople5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2017-10-04 11:32+0000\n"
"Last-Translator: Kaan \n"
"Language-Team: Turkish \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "Avatar"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/uk/kpeople5.po new/kpeople-5.57.0/po/uk/kpeople5.po
--- old/kpeople-5.56.0/po/uk/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/uk/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kpeople5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 19:51+0200\n"
"Last-Translator: Yuri Chornoivan \n"
"Language-Team: Ukrainian \n"
@@ -60,7 +60,7 @@
msgid "Avatar"
msgstr "Аватар"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/zh_CN/kpeople5.po new/kpeople-5.57.0/po/zh_CN/kpeople5.po
--- old/kpeople-5.56.0/po/zh_CN/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/zh_CN/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
-"PO-Revision-Date: 2019-02-20 23:16\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
+"PO-Revision-Date: 2019-03-07 09:22\n"
"Last-Translator: guoyunhe \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -60,7 +60,7 @@
msgid "Avatar"
msgstr "头像"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/po/zh_TW/kpeople5.po new/kpeople-5.57.0/po/zh_TW/kpeople5.po
--- old/kpeople-5.56.0/po/zh_TW/kpeople5.po 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/po/zh_TW/kpeople5.po 2019-04-07 09:31:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:05+0200\n"
+"POT-Creation-Date: 2019-03-26 03:17+0100\n"
"PO-Revision-Date: 2015-05-13 16:50+0800\n"
"Last-Translator: Franklin\n"
"Language-Team: Chinese Traditional \n"
@@ -57,7 +57,7 @@
msgid "Avatar"
msgstr "頭像"
-#: widgets/plugins/emaildetailswidget.cpp:50
+#: widgets/plugins/emaildetailswidget.cpp:51
#, kde-format
msgctxt "E-mail field label"
msgid "E-mail"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/duplicatesfinder.cpp new/kpeople-5.57.0/src/duplicatesfinder.cpp
--- old/kpeople-5.56.0/src/duplicatesfinder.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/duplicatesfinder.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -65,7 +65,7 @@
//we check if it matches
int j = 0;
- Q_FOREACH (const AbstractContact::Ptr &valueToCompare, collectedValues) {
+ for (const AbstractContact::Ptr &valueToCompare : qAsConst(collectedValues)) {
QListMatch::MatchReason matchedRoles = Match::matchAt(values, valueToCompare);
if (!matchedRoles.isEmpty()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/matchessolver.cpp new/kpeople-5.57.0/src/matchessolver.cpp
--- old/kpeople-5.56.0/src/matchessolver.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/matchessolver.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -44,7 +44,7 @@
QHash jobsData;
// has a relation of each person, to know where it is
QHash destinationResolver;
- Q_FOREACH (const Match &m, m_matches) {
+ for (const Match &m : qAsConst(m_matches)) {
QString urlA = m.indexA.data(PersonsModel::PersonUriRole).toString();
QString urlB = m.indexB.data(PersonsModel::PersonUriRole).toString();
Q_ASSERT(urlA != urlB);
@@ -59,9 +59,11 @@
//we've put all items pointed to by urlA, to the B set
//now we re-assign anything pointing to B as pointing to A
//because they are the same
- QList<QString> keys = destinationResolver.keys(urlB);
- foreach (const QString &key, keys) {
- destinationResolver[key] = urlA;
+ const auto keys = destinationResolver.keys(urlB);
+ auto it = keys.constBegin();
+ const auto end = keys.constEnd();
+ for (; it != end; ++it) {
+ destinationResolver[*it] = urlA;
}
} else {
//if A is in but not B, we want B wherever A is
@@ -84,7 +86,7 @@
}
}
- Q_FOREACH (const QSet<QString> &uris, jobsData) {
+ for (const QSet<QString> &uris : qAsConst(jobsData)) {
if (PersonManager::instance()->mergeContacts(uris.toList()).isEmpty()) {
qCWarning(KPEOPLE_LOG) << "error: failing to merge contacts: " << uris;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/metacontact.cpp new/kpeople-5.57.0/src/metacontact.cpp
--- old/kpeople-5.56.0/src/metacontact.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/metacontact.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -48,7 +48,7 @@
{
if (key.startsWith(QLatin1String("all-"))) {
QVariantList ret;
- Q_FOREACH (const AbstractContact::Ptr &contact, m_contacts) {
+ for (const AbstractContact::Ptr &contact : qAsConst(m_contacts)) {
QVariant val = contact->customProperty(key);
Q_ASSERT(val.canConvert<QVariantList>() || val.isNull());
@@ -58,7 +58,7 @@
}
return ret;
} else {
- Q_FOREACH (const AbstractContact::Ptr &contact, m_contacts) {
+ for (const AbstractContact::Ptr &contact : qAsConst(m_contacts)) {
QVariant val = contact->customProperty(key);
if (val.isValid()) {
return val;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/persondata.cpp new/kpeople-5.57.0/src/persondata.cpp
--- old/kpeople-5.56.0/src/persondata.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/persondata.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -67,7 +67,7 @@
}
QMap contacts;
- Q_FOREACH (const QString &contactUri, d->contactUris) {
+ for (const QString &contactUri : qAsConst(d->contactUris)) {
//load the correct data source for this contact ID
const QString sourceId = contactUri.left(contactUri.indexOf(QStringLiteral("://")));
Q_ASSERT(!sourceId.isEmpty());
@@ -185,9 +185,9 @@
{
// We might want to cache it eventually?
- QVariantList groups = contactCustomProperty(AbstractContact::GroupsProperty).toList();
+ const QVariantList groups = contactCustomProperty(AbstractContact::GroupsProperty).toList();
QStringList ret;
- Q_FOREACH (const QVariant &g, groups) {
+ for (const QVariant &g : groups) {
Q_ASSERT(g.canConvert<QString>());
ret += g.toString();
}
@@ -197,9 +197,9 @@
QStringList PersonData::allEmails() const
{
- QVariantList emails = contactCustomProperty(AbstractContact::AllEmailsProperty).toList();
+ const QVariantList emails = contactCustomProperty(AbstractContact::AllEmailsProperty).toList();
QStringList ret;
- Q_FOREACH (const QVariant &e, emails) {
+ for (const QVariant &e : emails) {
Q_ASSERT(e.canConvert<QString>());
ret += e.toString();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/personmanager.cpp new/kpeople-5.57.0/src/personmanager.cpp
--- old/kpeople-5.56.0/src/personmanager.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/personmanager.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -142,7 +142,7 @@
QList<QDBusMessage> pendingMessages;
// separate the passed ids to metacontacts and simple contacts
- Q_FOREACH (const QString &id, ids) {
+ for (const QString &id : ids) {
if (id.startsWith(QLatin1String("kpeople://"))) {
metacontacts << id;
} else {
@@ -175,14 +175,14 @@
if (metacontacts.count() > 1) {
// collect all the contacts from other persons
QStringList personContacts;
- Q_FOREACH (const QString &id, metacontacts) {
+ for (const QString &id : qAsConst(metacontacts)) {
if (id != personUriString) {
personContacts << contactsForPersonUri(id);
}
}
// iterate over all of the contacts and change their personID to the new personUriString
- Q_FOREACH (const QString &id, personContacts) {
+ for (const QString &id : qAsConst(personContacts)) {
QSqlQuery updateQuery(m_db);
updateQuery.prepare(QStringLiteral("UPDATE persons SET personID = ? WHERE contactID = ?"));
updateQuery.bindValue(0, personUriString.mid(strlen("kpeople://")));
@@ -210,7 +210,7 @@
// process passed contacts
if (!contacts.isEmpty()) {
- Q_FOREACH (const QString &id, contacts) {
+ for (const QString &id : qAsConst(contacts)) {
QSqlQuery insertQuery(m_db);
insertQuery.prepare(QStringLiteral("INSERT INTO persons VALUES (?, ?)"));
insertQuery.bindValue(0, id);
@@ -232,7 +232,7 @@
//if success send all messages to other clients
//otherwise roll back our database changes and return an empty string
if (rc) {
- Q_FOREACH (const QDBusMessage &message, pendingMessages) {
+ for (const QDBusMessage &message : qAsConst(pendingMessages)) {
QDBusConnection::sessionBus().send(message);
}
} else {
@@ -254,7 +254,7 @@
query.bindValue(0, id.mid(strlen("kpeople://")));
query.exec();
- Q_FOREACH (const QString &contactUri, contactUris) {
+ for (const QString &contactUri : contactUris) {
//FUTURE OPTIMIZATION - this would be best as one signal, but arguments become complex
QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KPeople"),
QStringLiteral("org.kde.KPeople"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/personpluginmanager.cpp new/kpeople-5.57.0/src/personpluginmanager.cpp
--- old/kpeople-5.56.0/src/personpluginmanager.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/personpluginmanager.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -61,8 +61,8 @@
void PersonPluginManagerPrivate::loadDataSourcePlugins()
{
- QVector<KPluginMetaData> pluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/datasource"));
- Q_FOREACH (const KPluginMetaData &service, pluginList) {
+ const QVector<KPluginMetaData> pluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/datasource"));
+ for (const KPluginMetaData &service : pluginList) {
KPluginLoader loader(service.fileName());
KPluginFactory *factory = loader.factory();
BasePersonsDataSource *dataSource = factory->create<BasePersonsDataSource>();
@@ -80,8 +80,8 @@
}
//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) {
+ const KService::List servicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/DataSource"));
+ for (const KService::Ptr &service : servicesList) {
BasePersonsDataSource *dataSource = service->createInstance<BasePersonsDataSource>(nullptr);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/personsmodel.cpp new/kpeople-5.57.0/src/personsmodel.cpp
--- old/kpeople-5.56.0/src/personsmodel.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/personsmodel.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -96,8 +96,8 @@
d_ptr(new PersonsModelPrivate(this))
{
Q_D(PersonsModel);
-
- Q_FOREACH (BasePersonsDataSource *dataSource, PersonPluginManager::dataSourcePlugins()) {
+ const auto listPlugins = PersonPluginManager::dataSourcePlugins();
+ for (BasePersonsDataSource *dataSource : listPlugins) {
const AllContactsMonitorPtr monitor = dataSource->allContactsMonitor();
if (monitor->isInitialFetchComplete()) {
QMetaObject::invokeMethod(d, "onMonitorInitialFetchComplete", Qt::QueuedConnection, Q_ARG(bool, monitor->initialFetchSuccess()));
@@ -261,16 +261,16 @@
QMap addresseeMap;
//fetch all already loaded contacts from plugins
- Q_FOREACH (const AllContactsMonitorPtr &contactWatcher, m_sourceMonitors) {
+ for (const AllContactsMonitorPtr &contactWatcher : qAsConst(m_sourceMonitors)) {
addresseeMap.unite(contactWatcher->contacts());
}
//add metacontacts
const QMultiHash contactMapping = PersonManager::instance()->allPersons();
- Q_FOREACH (const QString &key, contactMapping.uniqueKeys()) {
+ for (const QString &key : contactMapping.uniqueKeys()) {
QMap contacts;
- Q_FOREACH (const QString &contact, contactMapping.values(key)) {
+ for (const QString &contact : contactMapping.values(key)) {
contactToPersons[contact] = key;
AbstractContact::Ptr ptr = addresseeMap.take(contact);
if (ptr) {
@@ -288,7 +288,7 @@
addPerson(MetaContact(i.key(), i.value()));
}
- Q_FOREACH (const AllContactsMonitorPtr monitor, m_sourceMonitors) {
+ for (const AllContactsMonitorPtr monitor : qAsConst(m_sourceMonitors)) {
connect(monitor.data(), &AllContactsMonitor::contactAdded, this, &PersonsModelPrivate::onContactAdded);
connect(monitor.data(), &AllContactsMonitor::contactChanged, this, &PersonsModelPrivate::onContactChanged);
connect(monitor.data(), &AllContactsMonitor::contactRemoved, this, &PersonsModelPrivate::onContactRemoved);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/personssortfilterproxymodel.cpp new/kpeople-5.57.0/src/personssortfilterproxymodel.cpp
--- old/kpeople-5.56.0/src/personssortfilterproxymodel.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/personssortfilterproxymodel.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -67,7 +67,7 @@
return true;
}
- foreach(const QString &key, d->m_keys) {
+ for(const QString &key : qAsConst(d->m_keys)) {
if (!contact->customProperty(key).isNull()) {
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/actions.cpp new/kpeople-5.57.0/src/widgets/actions.cpp
--- old/kpeople-5.56.0/src/widgets/actions.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/actions.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -32,8 +32,8 @@
static QList actionsPlugins()
{
QList actionPlugins;
- QVector<KPluginMetaData> personPluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/actions"));
- Q_FOREACH (const KPluginMetaData &service, personPluginList) {
+ const QVector<KPluginMetaData> personPluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/actions"));
+ for (const KPluginMetaData &service : personPluginList) {
KPluginLoader loader(service.fileName());
KPluginFactory *factory = loader.factory();
if (!factory) {
@@ -48,8 +48,8 @@
}
//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) {
+ const KService::List personServicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/Plugin"));
+ for (const KService::Ptr &service : personServicesList) {
AbstractPersonAction *plugin = service->createInstance<AbstractPersonAction>(nullptr);
@@ -67,7 +67,8 @@
PersonData person(contactUri);
QList actions;
- Q_FOREACH (KPeople::AbstractPersonAction *plugin, actionsPlugins()) {
+ const auto lst = actionsPlugins();
+ for (KPeople::AbstractPersonAction *plugin : lst) {
actions << plugin->actionsForPerson(person, parent);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/mergedelegate.cpp new/kpeople-5.57.0/src/widgets/mergedelegate.cpp
--- old/kpeople-5.56.0/src/widgets/mergedelegate.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/mergedelegate.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -108,7 +108,7 @@
void MergeDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optionOld, const QModelIndex &index) const
{
QStyleOptionViewItem option(optionOld);
- QStyleOptionViewItemV4 opt(option);
+ QStyleOptionViewItem opt(option);
KExtendableItemDelegate::paint(painter, option, index);
const int separation = 5;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/mergedialog.cpp new/kpeople-5.57.0/src/widgets/mergedialog.cpp
--- old/kpeople-5.56.0/src/widgets/mergedialog.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/mergedialog.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -159,7 +159,7 @@
QHash compareTable;
QHash doneIndexes;
- Q_FOREACH (const Match &match, matches) {
+ for (const Match &match : matches) {
QPersistentModelIndex destination = doneIndexes.value(match.indexA, match.indexA);
QHash >::iterator currentValue = compareTable.find(destination);
@@ -179,7 +179,7 @@
QStandardItem *parent = itemMergeContactFromMatch(true, i->first());
rootItem->appendRow(parent);
- Q_FOREACH (const Match &matchChild, *i) {
+ for (const Match &matchChild : qAsConst(*i)) {
parent->appendRow(itemMergeContactFromMatch(false, matchChild));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/persondetailsview.cpp new/kpeople-5.57.0/src/widgets/persondetailsview.cpp
--- old/kpeople-5.56.0/src/widgets/persondetailsview.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/persondetailsview.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -122,17 +122,17 @@
#ifdef __GNUC__
#warning figure out a way to list properties
#endif
- QStringList fields { QStringLiteral("name"), QStringLiteral("all-email") };
- Q_FOREACH (const QString &field, fields) {
+ const QStringList fields { QStringLiteral("name"), QStringLiteral("all-email") };
+ for (const QString &field : fields) {
d->m_plugins << new CoreFieldsPlugin(field);
}
d->m_plugins << new EmailFieldsPlugin();
// load every KPeopleWidgets Plugin
- QVector<KPluginMetaData> personPluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/widgets"));
+ const QVector<KPluginMetaData> personPluginList = KPluginLoader::findPlugins(QStringLiteral("kpeople/widgets"));
- Q_FOREACH (const KPluginMetaData &service, personPluginList) {
+ for (const KPluginMetaData &service : personPluginList) {
KPluginLoader loader(service.fileName());
KPluginFactory *factory = loader.factory();
AbstractFieldWidgetFactory *f = qobject_cast(factory->create());
@@ -145,9 +145,9 @@
//TODO: Remove as soon as KTp sources are released with the new plugin system
KService::List pluginList = KServiceTypeTrader::self()->query(QStringLiteral("KPeopleWidgets/Plugin"));
- QList<KPluginInfo> plugins = KPluginInfo::fromServices(pluginList);
+ const QList<KPluginInfo> plugins = KPluginInfo::fromServices(pluginList);
- Q_FOREACH (const KPluginInfo &p, plugins) {
+ for (const KPluginInfo &p : plugins) {
QString error;
AbstractFieldWidgetFactory *f = p.service()->createInstance<AbstractFieldWidgetFactory>(this, QVariantList(), &error);
if (f) {
@@ -206,7 +206,7 @@
d->m_personDetailsPresentation->presencePixmapLabel->setPixmap(QIcon::fromTheme(d->m_person->presenceIconName()).pixmap(32, 32)); //FIXME
d->m_personDetailsPresentation->nameLabel->setText(d->m_person->name());
- Q_FOREACH (AbstractFieldWidgetFactory *widgetFactory, d->m_plugins) {
+ for (AbstractFieldWidgetFactory *widgetFactory : qAsConst(d->m_plugins)) {
const QString label = widgetFactory->label() + QLatin1Char(':');
QWidget *widget = widgetFactory->createDetailsWidget(d->m_person->personUri(), this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/plugins/emaildetailswidget.cpp new/kpeople-5.57.0/src/widgets/plugins/emaildetailswidget.cpp
--- old/kpeople-5.56.0/src/widgets/plugins/emaildetailswidget.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/plugins/emaildetailswidget.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -38,7 +38,8 @@
QWidget *widget = new QWidget(parent);
QVBoxLayout *layout = new QVBoxLayout(widget);
layout->setContentsMargins(0, 0, 0, 0);
- Q_FOREACH (const QString &email, person.allEmails()) {
+ const auto lstEmails = person.allEmails();
+ for (const QString &email : lstEmails) {
layout->addWidget(new QLabel(email));
}
widget->setLayout(layout);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/plugins/mergecontactswidget.cpp new/kpeople-5.57.0/src/widgets/plugins/mergecontactswidget.cpp
--- old/kpeople-5.56.0/src/widgets/plugins/mergecontactswidget.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/plugins/mergecontactswidget.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -115,10 +115,10 @@
QList<QPersistentModelIndex> MergeContactsWidget::duplicateBusterFromPerson(const QUrl &uri) const
{
Q_ASSERT(m_duplicatesBuster);
- QList<Match> wrongFormatResults = m_duplicatesBuster->results();
+ const QList<Match> wrongFormatResults = m_duplicatesBuster->results();
QList<QPersistentModelIndex> duplicateMatching;
- Q_FOREACH (const Match &match, wrongFormatResults) {
+ for (const Match &match : wrongFormatResults) {
// pick up only the couple with match with our parameter index
QUrl uriA = match.indexA.data(PersonsModel::UriRole).toUrl();
@@ -169,7 +169,8 @@
urisToMerge << m_person->uri();
// do the merge
- Q_FOREACH (const QPersistentModelIndex &pIndex, getContactsCheckedToMerge()) {
+ const auto lst = getContactsCheckedToMerge();
+ for (const QPersistentModelIndex &pIndex : lst) {
urisToMerge << pIndex.data(PersonsModel::UriRole).toUrl();
}
m_model->createPersonFromUris(urisToMerge);
@@ -181,8 +182,7 @@
QList<QPersistentModelIndex> indexesToMerge;
// retrieve all the widget where the box is checked
- QPair mergeContact ;
- Q_FOREACH (mergeContact, m_listMergeContacts) {
+ for (const QPair &mergeContact : qAsConst(m_listMergeContacts)) {
if (mergeContact.second->isContactSelected()) {
indexesToMerge.append(mergeContact.first);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.56.0/src/widgets/plugins/phonedetailswidget.cpp new/kpeople-5.57.0/src/widgets/plugins/phonedetailswidget.cpp
--- old/kpeople-5.56.0/src/widgets/plugins/phonedetailswidget.cpp 2019-03-02 14:46:26.000000000 +0100
+++ new/kpeople-5.57.0/src/widgets/plugins/phonedetailswidget.cpp 2019-04-07 09:31:21.000000000 +0200
@@ -55,7 +55,8 @@
delete child;
}
- Q_FOREACH (const QString &phone, person->phones()) {
+ const auto lst = person->phones();
+ for (const QString &phone : lst) {
QLabel *phoneLabel = new QLabel(phone, this);
phoneLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
layout()->addWidget(phoneLabel);