Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Mail-related libraries
Commits
06d0d8a3
Commit
06d0d8a3
authored
Dec 29, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some Q_FOREACH
parent
dea936fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
...kgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+2
-1
kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
...sbookgrantlee/src/printing/contactgrantleeprintobject.cpp
+5
-2
kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp
...okimportexport/src/kaddressbookcontactselectionwidget.cpp
+6
-5
No files found.
kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
View file @
06d0d8a3
...
...
@@ -146,7 +146,8 @@ QString GrantleeContactGroupFormatter::toHtml(HtmlForm form) const
Akonadi
::
ContactGroupExpandJob
*
job
=
new
Akonadi
::
ContactGroupExpandJob
(
group
);
if
(
job
->
exec
())
{
group
.
removeAllContactData
();
foreach
(
const
KContacts
::
Addressee
&
contact
,
job
->
contacts
())
{
const
KContacts
::
Addressee
::
List
lstContacts
=
job
->
contacts
();
for
(
const
KContacts
::
Addressee
&
contact
:
lstContacts
)
{
group
.
append
(
KContacts
::
ContactGroup
::
Data
(
contact
.
realName
(),
contact
.
preferredEmail
()));
}
}
...
...
kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
View file @
06d0d8a3
...
...
@@ -137,7 +137,9 @@ QString ContactGrantleePrintObject::languages() const
{
QString
result
;
QStringList
langList
;
Q_FOREACH
(
const
KContacts
::
Lang
&
lang
,
mAddress
.
langs
())
{
const
KContacts
::
Lang
::
List
lstLangs
=
mAddress
.
langs
();
langList
.
reserve
(
lstLangs
.
count
());
for
(
const
KContacts
::
Lang
&
lang
:
lstLangs
)
{
langList
.
append
(
lang
.
language
());
}
if
(
!
langList
.
isEmpty
())
{
...
...
@@ -149,7 +151,8 @@ QString ContactGrantleePrintObject::languages() const
QStringList
ContactGrantleePrintObject
::
emails
()
const
{
QStringList
emails
;
Q_FOREACH
(
const
QString
&
email
,
mAddress
.
emails
())
{
const
QStringList
lstEmails
(
mAddress
.
emails
());
for
(
const
QString
&
email
:
lstEmails
)
{
const
QString
fullEmail
=
QString
::
fromLatin1
(
QUrl
::
toPercentEncoding
(
mAddress
.
fullEmail
(
email
)));
const
QString
url
=
QStringLiteral
(
"<a href=
\"
mailto:%1
\"
>%2</a>"
)
...
...
kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp
View file @
06d0d8a3
...
...
@@ -202,8 +202,8 @@ KAddressBookImportExport::KAddressBookImportExportContactList KAddressBookContac
if
(
!
job
->
exec
())
{
return
contacts
;
}
for
each
(
const
Akonadi
::
Item
&
item
,
job
->
i
tems
()
)
{
const
Akonadi
::
Item
::
List
lstItems
=
job
->
items
();
for
(
const
Akonadi
::
Item
&
item
:
lstI
tems
)
{
if
(
item
.
isValid
())
{
if
(
item
.
hasPayload
<
KContacts
::
Addressee
>
())
{
contacts
.
append
(
item
.
payload
<
KContacts
::
Addressee
>
());
...
...
@@ -307,7 +307,8 @@ KAddressBookImportExport::KAddressBookImportExportContactList KAddressBookContac
return
contacts
;
}
foreach
(
const
Akonadi
::
Item
&
item
,
job
->
items
())
{
const
Akonadi
::
Item
::
List
lstItems
=
job
->
items
();
for
(
const
Akonadi
::
Item
&
item
:
lstItems
)
{
if
(
item
.
hasPayload
<
KContacts
::
Addressee
>
())
{
contacts
.
append
(
item
.
payload
<
KContacts
::
Addressee
>
());
}
...
...
@@ -319,8 +320,8 @@ KAddressBookImportExport::KAddressBookImportExportContactList KAddressBookContac
if
(
!
job
->
exec
())
{
return
contacts
;
}
for
each
(
const
Akonadi
::
Item
&
item
,
job
->
i
tems
()
)
{
const
Akonadi
::
Item
::
List
lstItems
=
job
->
items
();
for
(
const
Akonadi
::
Item
&
item
:
lstI
tems
)
{
if
(
item
.
hasPayload
<
KContacts
::
Addressee
>
())
{
contacts
.
append
(
item
.
payload
<
KContacts
::
Addressee
>
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment