FCL/sf/mw/qtextensions: comparison qtmobility/plugins/contacts/maemo5/qcontactabook.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 }
 g_list_free(contactList);
 }
+//TODO Use native filters
 QList<QContactLocalId> QContactABook::contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error* error) const
 {
-QList<QContactLocalId> rtn;
+Q_UNUSED(sortOrders)
+Q_UNUSED(filter);
-// do this naively for now...
 *error = QContactManager::NoError;
-QContactManager::Error tempError = QContactManager::NoError;
+return m_localIds.keys();
-QList<QContactLocalId> allIds = m_localIds.keys();
-QList<QContact> sortedAndFiltered;
-QContact *curr = 0;
-foreach (const QContactLocalId& currId, allIds) {
-curr = getQContact(currId, &tempError);
-if (tempError != QContactManager::NoError)
-*error = tempError;
-if (QContactManagerEngine::testFilter(filter, *curr)) {
-QContactManagerEngine::addSorted(&sortedAndFiltered, *curr, sortOrders);
-}
-delete curr;
-}
-foreach (const QContact& contact, sortedAndFiltered) {
-rtn.append(contact.localId());
-}
-return rtn;
 /*
 // Sorting
 //NOTE Native sorting is possible thanks to g_list_sort.
 //     It's limited just to one filter.
 // Non native sorting
 return QContactManagerEngine::sortContacts(contacts, sortOrders);
 }
-EBookQuery* query = convert(filter);
+switch(filter.type()){
+case QContactFilter::DefaultFilter: {
-GList* l = osso_abook_aggregator_find_contacts(m_abookAgregator, query);
+rtn = m_localIds.keys();
-if (query)
+} break;
-e_book_query_unref(query);
+default: {
+EBookQuery* query = convert(filter);
-while (l){
+GList* l = osso_abook_aggregator_find_contacts(m_abookAgregator, query);
-EContact *contact = E_CONTACT(l->data);
+if (query)
-const char* data = CONST_CHAR(e_contact_get_const(contact, E_CONTACT_UID));
+e_book_query_unref(query);
-QByteArray localId(data);
-m_localIds << localId;
+while (l){
-rtn.append(m_localIds[localId]);
+EContact *contact = E_CONTACT(l->data);
-QCM5_DEBUG << "eContactID " << localId << "has been stored in m_localIDs with key" << m_localIds[localId];
+const char* data = CONST_CHAR(e_contact_get_const(contact, E_CONTACT_UID));
-l = g_list_delete_link(l, l);
+QByteArray localId(data);
-}
+m_localIds << localId;
+rtn.append(m_localIds[localId]);
+QCM5_DEBUG << "eContactID " << localId << "has been stored in m_localIDs with key" << m_localIds[localId];
+l = g_list_delete_link(l, l);
+}
+}
+}
 *error = QContactManager::NoError;
 return rtn;
 */
 }
+#include "qcontactdetail_p.h"
 QContact* QContactABook::getQContact(const QContactLocalId& contactId, QContactManager::Error* error) const
 {
 QContact *rtn;
 OssoABookContact* aContact = getAContact(contactId, error);
 return new QContact;
 }
 //Convert aContact => qContact
 rtn = convert(E_CONTACT(aContact));
 QContactId cId;
 cId.setLocalId(contactId);
 rtn->setId(cId);
+//TEST BEGIN
+/*
+QContactDisplayLabel dl;
+dl.setValue(QContactDisplayLabel::FieldLabel, "LABEL");
+QContactDetailPrivate::setAccessConstraints(&dl, QContactDetail::Irremovable | QContactDetail::ReadOnly);
+rtn->d->m_details.replace(0, dl);
+*/
+//TEST END
 return rtn;
 }
 static QContactManager::Error getErrorFromStatus(const EBookStatus status){
 switch (status) {
 contact->setId(cId);
 if (m_saveJobSD->uid)
 free(m_saveJobSD->uid);
 return ok;
+}
+const QString QContactABook::getDisplayName(const QContact& contact) const{
+//Get Osso ABook ID for the contact (stored as GUID detail)
+const char* acontactID = NULL;
+{
+QContactGuid g = contact.detail(QContactGuid::DefinitionName);
+acontactID = qPrintable(g.guid());
+}
+if (!acontactID){
+QCM5_DEBUG << "The contact has not been saved yet and it doesn't have any GUID";
+return QString();
+}
+//Get OssoABookContact
+OssoABookContact *acontact= NULL;
+{
+GList* l= NULL;
+l = osso_abook_aggregator_lookup(m_abookAgregator, acontactID);
+if (g_list_length(l) == 1) {
+acontact = A_CONTACT(l->data);
+}
+g_list_free(l);
+}
+if (!acontact){
+QCM5_DEBUG << "AContact with ID:" << acontactID << "is null";
+return QString();
+}
+//Get Display name;
+const char* displayName = osso_abook_contact_get_display_name(acontact);
+return QString::fromUtf8(displayName);
 }
 QContactLocalId QContactABook::selfContactId(QContactManager::Error* errors) const
 {
 QContactLocalId id;
 hash[QContactDisplayLabel::DefinitionName] = "full-name"; //hack
 hash[QContactEmailAddress::DefinitionName] = "email";
 hash[QContactName::DefinitionName] = "full-name";
 hash[QContactNickname::DefinitionName] = "nickname";
 hash[QContactNote::DefinitionName] = "note";
-hash[QContactOrganization::DefinitionName] = "title";
+hash[QContactOrganization::DefinitionName] = "org";
 hash[QContactPhoneNumber::DefinitionName] = "phone";
 hash[QContactUrl::DefinitionName] = "homepage-url";
 }
 QString eDetail = hash[f.detailDefinitionName()];
 QCM5_DEBUG << "Filter not supported";
 query = convert(QContactInvalidFilter());
 }
 //Debugging
-const char *queryString = e_book_query_to_string(query);
+if (QCM5_DEBUG_ENABLED){
-QCM5_DEBUG << "QUERY" << queryString;
+const char *queryString = e_book_query_to_string(query);
-FREE(queryString);
+QCM5_DEBUG << "QUERY" << queryString;
+FREE(queryString);
+}
 return query;
 }
 QContact* QContactABook::convert(EContact *eContact) const
 {
 g_list_free(v);
 qCritical() << "ADR attribute data is corrupted";
 }
 int i = 0;
 while (v){
-map[addressFields[i]] = QString::fromLatin1(CONST_CHAR(v->data));
+map[addressFields[i]] = QString::fromUtf8(CONST_CHAR(v->data));
 i++;
 v = v->next;
 }
 g_list_free(v);
 map[QContactDetail::FieldDetailUri] = QString::number(g_list_position(attrList, node));
 map[QContactName::FieldPrefix] = eContactName->prefixes;
 map[QContactName::FieldSuffix] = eContactName->suffixes;
 e_contact_name_free (eContactName);
 } else {
 //Looks that Maemo use just these two fields
-map[QContactName::FieldFirstName] = CONST_CHAR(e_contact_get_const(eContact, E_CONTACT_GIVEN_NAME));
+map[QContactName::FieldFirstName] = QString::fromUtf8(CONST_CHAR(e_contact_get_const(eContact, E_CONTACT_GIVEN_NAME)));
-map[QContactName::FieldLastName] = CONST_CHAR(e_contact_get_const(eContact, E_CONTACT_FAMILY_NAME));
+map[QContactName::FieldLastName] = QString::fromUtf8(CONST_CHAR(e_contact_get_const(eContact, E_CONTACT_FAMILY_NAME)));
 }
 setDetailValues(map, rtn);
 return rtn;
 }
 QContactNickname* QContactABook::getNicknameDetail(EContact *eContact) const
 {
 QContactNickname* rtn = new QContactNickname;
 QVariantMap map;
-map[QContactNickname::FieldNickname] = CONST_CHAR (e_contact_get_const(eContact, E_CONTACT_NICKNAME));
+map[QContactNickname::FieldNickname] = QString::fromUtf8(CONST_CHAR(e_contact_get_const(eContact, E_CONTACT_NICKNAME)));
 setDetailValues(map, rtn);
 return rtn;
 }
 QList<QContactEmailAddress*> QContactABook::getEmailDetail(EContact *eContact) const
 // Set Address Values
 GList *v = e_vcard_attribute_get_values(attr);
 int i = 0;
 while (v){
-map[QContactEmailAddress::FieldEmailAddress] = QString::fromLatin1(CONST_CHAR(v->data));
+map[QContactEmailAddress::FieldEmailAddress] = QString::fromUtf8(CONST_CHAR(v->data));
 i++;
 v = v->next;
 }
 g_list_free(v);
 QContactGender* QContactABook::getGenderDetail(EContact *eContact) const
 {
 QContactGender* rtn = new QContactGender;
 QVariantMap map;
 const char* g = CONST_CHAR(osso_abook_contact_get_value(eContact, "X-GENDER"));
-QString gender = QString::fromLatin1(g);
+QString gender = g;
 if (gender == "male")
 gender = "Male";
 else if (gender == "female")
 gender = "Female";
 else if (gender == "unspecified")
 QContactNote* QContactABook::getNoteDetail(EContact *eContact) const
 {
 QContactNote* rtn = new QContactNote;
 QVariantMap map;
 const char* note = CONST_CHAR(e_contact_get(eContact, E_CONTACT_NOTE));
-map[QContactNote::FieldNote] = QString::fromLatin1(note);
+map[QContactNote::FieldNote] = QString::fromUtf8(note);
 FREE(note);
 setDetailValues(map, rtn);
 return rtn;
 }
 McProfile* id = osso_abook_contact_get_profile(rosterContact);
 McAccount* account = osso_abook_contact_get_account(rosterContact);
 // Avoid to look for Roster contacts into the VCard
-QString accountVCard = QString::fromLatin1(mc_profile_get_vcard_field(id));
+QString accountVCard = mc_profile_get_vcard_field(id);
 evcardToSkip.removeOne(accountVCard);
 // Presence
 OssoABookPresence *presence = OSSO_ABOOK_PRESENCE (rosterContact);
 TpConnectionPresenceType presenceType = osso_abook_presence_get_presence_type (presence);
 if (attributeList) {
 for (node = attributeList; node != NULL; node = g_list_next (node)) {
 EVCardAttribute* attr = (EVCardAttribute*)node->data;
 if (!attr)
 continue;
-QString attributeName = QString::fromLatin1(e_vcard_attribute_get_name(attr));
+QString attributeName = e_vcard_attribute_get_name(attr);
 // Skip attributes processed scanning roster contacts.
 if (!evcardToSkip.contains(attributeName))
 continue;
 // If the parameter list lenght is 1, X-OSSO-VALID is not specified
 bool ossoValidIsOk = (g_list_length(params) == 1) ? true : false;
 for (nodeP = params; nodeP != NULL; nodeP = g_list_next (nodeP)) {
 EVCardAttributeParam* p = (EVCardAttributeParam*) nodeP->data;
-QString paramName = QString::fromLatin1(e_vcard_attribute_param_get_name(p));
+QString paramName = e_vcard_attribute_param_get_name(p);
 bool attrIsType = false;
 bool attrIsOssoValid = false;
 //If type is empty check if the attribute is "TYPE"
 if (type.isEmpty())
 }
 GList *values = e_vcard_attribute_param_get_values(p);
 GList *node;
 for (node = values; node != NULL; node = g_list_next (node)) {
-QString attributeParameterValue = QString::fromLatin1(CONST_CHAR(node->data));
+QString attributeParameterValue = CONST_CHAR(node->data);
 if (attrIsOssoValid) {
 ossoValidIsOk = (attributeParameterValue == "yes")? true : false;
 if (!ossoValidIsOk) {
 //qWarning() << "X-OSSO-VALID is false.";
 break;
 QContactOrganization* QContactABook::getOrganizationDetail(EContact *eContact) const
 {
 QContactOrganization* rtn = new QContactOrganization;
 QVariantMap map;
-const char* title = CONST_CHAR(e_contact_get(eContact, E_CONTACT_ORG));
+const char* org = CONST_CHAR(e_contact_get(eContact, E_CONTACT_ORG));
-map[QContactOrganization::FieldTitle] = title;
+map[QContactOrganization::FieldName] = QString::fromUtf8(org);
-FREE(title);
+FREE(org);
 setDetailValues(map, rtn);
 return rtn;
 }
 QList<QContactPhoneNumber*> QContactABook::getPhoneDetail(EContact *eContact) const
 EVCardAttribute *attr = static_cast<EVCardAttribute*>(node->data);
 GList* p = e_vcard_attribute_get_param(attr, EVC_TYPE);
 //Set Contexts and SubTypes
 while (p) {
-QString value = QString::fromLatin1(CONST_CHAR(p->data));
+QString value = CONST_CHAR(p->data);
 if (value == "HOME")
 phoneNumber->setContexts(QContactDetail::ContextHome);
 else if (value == "WORK")
 phoneNumber->setContexts(QContactDetail::ContextWork);
 McProfile* id = osso_abook_contact_get_profile(rosterContact);
 McAccount* account = osso_abook_contact_get_account(rosterContact);
 // Avoid to look for Roster contacts into the VCard
-QString accountVCard = QString::fromLatin1(mc_profile_get_vcard_field(id));
+QString accountVCard = mc_profile_get_vcard_field(id);
 evcardToSkip.removeOne(accountVCard);
 // Presence
 OssoABookPresence *presence = OSSO_ABOOK_PRESENCE (rosterContact);
 TpConnectionPresenceType presenceType = osso_abook_presence_get_presence_type (presence);
 }
 QVariantMap map; // XXX FIXME
 map[QContactPresence::FieldNickname] = osso_abook_contact_get_display_name(rosterContact);
 map[QContactPresence::FieldPresenceState] = presenceTypeEnum;
-map[QContactPresence::FieldPresenceStateText] = QString::fromLatin1(osso_abook_presence_get_presence_status_message(presence));
+map[QContactPresence::FieldPresenceStateText] = QString::fromUtf8(osso_abook_presence_get_presence_status_message(presence));
 map[QContactPresence::FieldLinkedDetailUris] = mc_profile_get_unique_name(id); //use the unique name as a detail uri of the online account.
 map["AccountPath"] = account->name; //MCAccount name: variable part of the D-Bus object path.
 setDetailValues(map, rtn);
 }
 if (attributeList) {
 for (node = attributeList; node != NULL; node = g_list_next (node)) {
 EVCardAttribute* attr = (EVCardAttribute*)node->data;
 if (!attr)
 continue;
-QString attributeName = QString::fromLatin1(e_vcard_attribute_get_name(attr));
+QString attributeName = e_vcard_attribute_get_name(attr);
 // Skip attributes processed scanning roster contacts.
 if (!evcardToSkip.contains(attributeName))
 continue;
 // If the parameter list lenght is 1, X-OSSO-VALID is not specified
 bool ossoValidIsOk = (g_list_length(params) == 1) ? true : false;
 for (nodeP = params; nodeP != NULL; nodeP = g_list_next (nodeP)) {
 EVCardAttributeParam* p = (EVCardAttributeParam*) nodeP->data;
-QString paramName = QString::fromLatin1(e_vcard_attribute_param_get_name(p));
+QString paramName = e_vcard_attribute_param_get_name(p);
 bool attrIsType = false;
 bool attrIsOssoValid = false;
 //If type is empty check if the attribute is "TYPE"
 if (type.isEmpty())
 }
 GList *values = e_vcard_attribute_param_get_values(p);
 GList *node;
 for (node = values; node != NULL; node = g_list_next (node)) {
-QString attributeParameterValue = QString::fromLatin1(CONST_CHAR(node->data));
+QString attributeParameterValue = CONST_CHAR(node->data);
 if (attrIsOssoValid) {
 ossoValidIsOk = (attributeParameterValue == "yes")? true : false;
 if (!ossoValidIsOk) {
 //qWarning() << "X-OSSO-VALID is false.";
 break;
 }
 if (ossoValidIsOk && !type.isEmpty()) {
 QContactPresence* rtn = new QContactPresence;
 QVariantMap map;
-map[QContactPresence::FieldNickname] = QString::fromLatin1(e_vcard_attribute_get_value(attr));
+map[QContactPresence::FieldNickname] = QString::fromUtf8(e_vcard_attribute_get_value(attr));
 map[QContactPresence::FieldLinkedDetailUris] = type; // XXX FIXME
 setDetailValues(map, rtn);
 rtnList << rtn;
 }
 }
 image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data(image.bits(), GDK_COLORSPACE_RGB,
 image.hasAlphaChannel(), 8,
 image.width(), image.height(),
 image.bytesPerLine(), 0, 0);
-osso_abook_contact_set_pixbuf((OssoABookContact*)aContact, pixbuf, book, 0);
+osso_abook_contact_set_pixbuf((OssoABookContact*)aContact, pixbuf, 0, 0);
 g_object_unref(pixbuf);
 }
 void QContactABook::setAvatarDetail(const OssoABookContact* aContact, const QContactAvatar& detail) const
 {
 //      image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 //  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data(image.bits(), GDK_COLORSPACE_RGB,
 //                                               image.hasAlphaChannel(), 8,
 //                                               image.width(), image.height(),
 //                                               image.bytesPerLine(), 0, 0);
-//  osso_abook_contact_set_pixbuf((OssoABookContact*)aContact, pixbuf, book, 0);
+//  osso_abook_contact_set_pixbuf((OssoABookContact*)aContact, pixbuf, 0, 0);
 //  g_object_unref(pixbuf);
 }
 void QContactABook::setBirthdayDetail(const OssoABookContact* aContact, const QContactBirthday& detail) const
 {
 void QContactABook::setOrganizationDetail(const OssoABookContact* aContact, const QContactOrganization& detail) const
 {
 if (!aContact) return;
 QStringList attrValues;
-attrValues << detail.value(QContactOrganization::FieldTitle);
+attrValues << detail.value(QContactOrganization::FieldName);
 addAttributeToAContact(aContact, EVC_ORG, attrValues);
 }
 void QContactABook::setPhoneDetail(const OssoABookContact* aContact, const QContactPhoneNumber& detail) const

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411
child 15	1f895d8a5b2b