Merge lp:~renatofilho/address-book-service/fix-1489330 into lp:address-book-service

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 177
Proposed branch: lp:~renatofilho/address-book-service/fix-1489330
Merge into: lp:address-book-service
Diff against target: 28 lines (+7/-0)
2 files modified
common/fetch-hint.cpp (+1/-0)
lib/qindividual.cpp (+6/-0)
To merge this branch: bzr merge lp:~renatofilho/address-book-service/fix-1489330
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+276125@code.launchpad.net

Commit message

Implemented support for favorite in fetch hint.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/fetch-hint.cpp'
2--- common/fetch-hint.cpp 2014-04-28 17:45:00 +0000
3+++ common/fetch-hint.cpp 2015-10-29 13:37:56 +0000
4@@ -104,6 +104,7 @@
5 map.insert("TEL", QContactPhoneNumber::Type);
6 map.insert("URL", QContactUrl::Type);
7 map.insert("TAG", QContactTag::Type);
8+ map.insert("X-QTPROJECT-FAVORITE", QContactFavorite::Type);
9 }
10 return map;
11 }
12
13=== modified file 'lib/qindividual.cpp'
14--- lib/qindividual.cpp 2015-10-14 13:35:25 +0000
15+++ lib/qindividual.cpp 2015-10-29 13:37:56 +0000
16@@ -863,6 +863,12 @@
17 }
18 }
19
20+ if (fields.contains(QContactDetail::TypeFavorite)) {
21+ Q_FOREACH(QContactDetail det, c.details<QContactFavorite>()) {
22+ details << det;
23+ }
24+ }
25+
26 Q_FOREACH(QContactDetail det, details) {
27 result.appendDetail(det);
28 }

Subscribers

People subscribed via source and target branches