Changeset View
Changeset View
Standalone View
Standalone View
src/persondata.cpp
Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Line(s) | 48 | { | |||
---|---|---|---|---|---|
62 | 62 | | |||
63 | if (personUri.isEmpty()) { | 63 | if (personUri.isEmpty()) { | ||
64 | d->contactUris = QStringList() << id; | 64 | d->contactUris = QStringList() << id; | ||
65 | } else { | 65 | } else { | ||
66 | d->contactUris = PersonManager::instance()->contactsForPersonUri(personUri); | 66 | d->contactUris = PersonManager::instance()->contactsForPersonUri(personUri); | ||
67 | } | 67 | } | ||
68 | 68 | | |||
69 | QMap<QString, AbstractContact::Ptr> contacts; | 69 | QMap<QString, AbstractContact::Ptr> contacts; | ||
70 | Q_FOREACH (const QString &contactUri, d->contactUris) { | 70 | for (const QString &contactUri : qAsConst(d->contactUris)) { | ||
71 | //load the correct data source for this contact ID | 71 | //load the correct data source for this contact ID | ||
72 | const QString sourceId = contactUri.left(contactUri.indexOf(QStringLiteral("://"))); | 72 | const QString sourceId = contactUri.left(contactUri.indexOf(QStringLiteral("://"))); | ||
73 | Q_ASSERT(!sourceId.isEmpty()); | 73 | Q_ASSERT(!sourceId.isEmpty()); | ||
74 | BasePersonsDataSource *dataSource = PersonPluginManager::dataSource(sourceId); | 74 | BasePersonsDataSource *dataSource = PersonPluginManager::dataSource(sourceId); | ||
75 | if (dataSource) { | 75 | if (dataSource) { | ||
76 | ContactMonitorPtr cw = dataSource->contactMonitor(contactUri); | 76 | ContactMonitorPtr cw = dataSource->contactMonitor(contactUri); | ||
77 | d->watchers << cw; | 77 | d->watchers << cw; | ||
78 | 78 | | |||
▲ Show 20 Lines • Show All 101 Lines • ▼ Show 20 Line(s) | |||||
180 | { | 180 | { | ||
181 | return contactCustomProperty(AbstractContact::EmailProperty).toString(); | 181 | return contactCustomProperty(AbstractContact::EmailProperty).toString(); | ||
182 | } | 182 | } | ||
183 | 183 | | |||
184 | QStringList PersonData::groups() const | 184 | QStringList PersonData::groups() const | ||
185 | { | 185 | { | ||
186 | // We might want to cache it eventually? | 186 | // We might want to cache it eventually? | ||
187 | 187 | | |||
188 | QVariantList groups = contactCustomProperty(AbstractContact::GroupsProperty).toList(); | 188 | const QVariantList groups = contactCustomProperty(AbstractContact::GroupsProperty).toList(); | ||
189 | QStringList ret; | 189 | QStringList ret; | ||
190 | Q_FOREACH (const QVariant &g, groups) { | 190 | for (const QVariant &g : groups) { | ||
191 | Q_ASSERT(g.canConvert<QString>()); | 191 | Q_ASSERT(g.canConvert<QString>()); | ||
192 | ret += g.toString(); | 192 | ret += g.toString(); | ||
193 | } | 193 | } | ||
194 | ret.removeDuplicates(); | 194 | ret.removeDuplicates(); | ||
195 | return ret; | 195 | return ret; | ||
196 | } | 196 | } | ||
197 | 197 | | |||
198 | QStringList PersonData::allEmails() const | 198 | QStringList PersonData::allEmails() const | ||
199 | { | 199 | { | ||
200 | QVariantList emails = contactCustomProperty(AbstractContact::AllEmailsProperty).toList(); | 200 | const QVariantList emails = contactCustomProperty(AbstractContact::AllEmailsProperty).toList(); | ||
201 | QStringList ret; | 201 | QStringList ret; | ||
202 | Q_FOREACH (const QVariant &e, emails) { | 202 | for (const QVariant &e : emails) { | ||
203 | Q_ASSERT(e.canConvert<QString>()); | 203 | Q_ASSERT(e.canConvert<QString>()); | ||
204 | ret += e.toString(); | 204 | ret += e.toString(); | ||
205 | } | 205 | } | ||
206 | ret.removeDuplicates(); | 206 | ret.removeDuplicates(); | ||
207 | return ret; | 207 | return ret; | ||
208 | } | 208 | } | ||
209 | 209 | |