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
=== modified file 'common/fetch-hint.cpp'
--- common/fetch-hint.cpp 2014-04-28 17:45:00 +0000
+++ common/fetch-hint.cpp 2015-10-29 13:37:56 +0000
@@ -104,6 +104,7 @@
104 map.insert("TEL", QContactPhoneNumber::Type);104 map.insert("TEL", QContactPhoneNumber::Type);
105 map.insert("URL", QContactUrl::Type);105 map.insert("URL", QContactUrl::Type);
106 map.insert("TAG", QContactTag::Type);106 map.insert("TAG", QContactTag::Type);
107 map.insert("X-QTPROJECT-FAVORITE", QContactFavorite::Type);
107 }108 }
108 return map;109 return map;
109}110}
110111
=== modified file 'lib/qindividual.cpp'
--- lib/qindividual.cpp 2015-10-14 13:35:25 +0000
+++ lib/qindividual.cpp 2015-10-29 13:37:56 +0000
@@ -863,6 +863,12 @@
863 }863 }
864 }864 }
865865
866 if (fields.contains(QContactDetail::TypeFavorite)) {
867 Q_FOREACH(QContactDetail det, c.details<QContactFavorite>()) {
868 details << det;
869 }
870 }
871
866 Q_FOREACH(QContactDetail det, details) {872 Q_FOREACH(QContactDetail det, details) {
867 result.appendDetail(det);873 result.appendDetail(det);
868 }874 }

Subscribers

People subscribed via source and target branches