FCL/sf/mw/qtextensions: comparison qtmobility/plugins/contacts/wince/contactconversions.cpp

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 LPWSTR newStr = wcsdup(str);
 m_list.push_back(newStr);
 return newStr;
 }
 void clear() {
-foreach (LPWSTR str, m_list) {
+foreach (const LPWSTR& str, m_list) {
 free(str);
 }
 m_list.clear();
 }
 private:
 static void processName(const QContactWinCEEngine* /*engine*/, IItem* /*contact*/, const QVariantList& values, QContact& ret)
 {
 QContactName name;
 setIfNotEmpty(name, QContactName::FieldPrefix, values[0].toString());
-setIfNotEmpty(name, QContactName::FieldFirst, values[1].toString());
+setIfNotEmpty(name, QContactName::FieldFirstName, values[1].toString());
-setIfNotEmpty(name, QContactName::FieldMiddle, values[2].toString());
+setIfNotEmpty(name, QContactName::FieldMiddleName, values[2].toString());
-setIfNotEmpty(name, QContactName::FieldLast, values[3].toString());
+setIfNotEmpty(name, QContactName::FieldLastName, values[3].toString());
 setIfNotEmpty(name, QContactName::FieldSuffix, values[4].toString());
 setIfNotEmpty(name, QContactName::FieldCustomLabel, values[5].toString());
 if (!name.isEmpty())
 ret.saveDetail(&name);
 }
 QByteArray data;
 if (loadAvatarData(contact, &data)) {
 if (!data.isEmpty()) {
 QPixmap pixmap;
 pixmap.loadFromData(data, "PNG");
-avatar.setPixmap(pixmap);
+//avatar.setPixmap(pixmap);
 }
 }
 if (values[0].toString().isEmpty()) {
 if (!data.isEmpty()) {
 QUrl url(QUrl::fromEncoded(data.toPercentEncoding()));
 url.setScheme("data");
-avatar.setAvatar(url.toString());
+avatar.setImageUrl(url.toString());
 }
 } else {
-avatar.setAvatar(values[0].toString());
+avatar.setImageUrl(values[0].toString());
 }
-setIfNotEmpty(avatar, QContactAvatar::FieldSubType, values[1].toString());
 if (!avatar.isEmpty())
 ret.saveDetail(&avatar);
 }
 break;
 case 9: // Home fax
 m = meta.at(i);
 if (m ==  ' ')
 m = 'H';
-number.setSubTypes(QContactPhoneNumber::SubTypeFacsimile);
+number.setSubTypes(QContactPhoneNumber::SubTypeFax);
 break;
 case 10: // Business fax
 m = meta.at(i);
 if (m ==  ' ')
 m = 'W';
-number.setSubTypes(QContactPhoneNumber::SubTypeFacsimile);
+number.setSubTypes(QContactPhoneNumber::SubTypeFax);
 break;
 }
 if (m == 'H')
 number.setContexts(QContactDetail::ContextHome);
 family.func = processFamily;
 list.append(family);
 // Avatar
 PoomContactElement avatar;
-avatar.poom << avatarMeta << avatarTypeMeta; //PIMPR_PICTURE need to be handled inside the processAvatar() function seperately.
+avatar.poom << avatarMeta << avatarTypeMeta; //PIMPR_PICTURE need to be handled inside the processAvatar() function separately.
 avatar.func = processAvatar;
 list.append(avatar);
 // XXX Unhandled:
 //  PIMPR_YOMI_FIRSTNAME
 //  PIMPR_YOMI_LASTNAME
 // Now, build the hash
 foreach(const PoomContactElement& e, list) {
-foreach(CEPROPID id, e.poom) {
+foreach(const CEPROPID& id, e.poom) {
 ids.append(id);
 hash.insert(id, e);
 }
 }
 }
 }
 static bool processQName(const QContactWinCEEngine*, IItem* /*contact*/, const QContactDetail& detail, QVector<CEPROPVAL>& props)
 {
 addIfNotEmpty(PIMPR_TITLE, detail.value(QContactName::FieldPrefix), props);
-addIfNotEmpty(PIMPR_FIRST_NAME, detail.value(QContactName::FieldFirst), props);
+addIfNotEmpty(PIMPR_FIRST_NAME, detail.value(QContactName::FieldFirstName), props);
-addIfNotEmpty(PIMPR_MIDDLE_NAME, detail.value(QContactName::FieldMiddle), props);
+addIfNotEmpty(PIMPR_MIDDLE_NAME, detail.value(QContactName::FieldMiddleName), props);
-addIfNotEmpty(PIMPR_LAST_NAME, detail.value(QContactName::FieldLast), props);
+addIfNotEmpty(PIMPR_LAST_NAME, detail.value(QContactName::FieldLastName), props);
 addIfNotEmpty(PIMPR_SUFFIX, detail.value(QContactName::FieldSuffix), props);
 addIfNotEmpty(PIMPR_FILEAS, detail.value(QContactName::FieldCustomLabel), props);
 return true;
 }
 static bool processQAvatar(const QContactWinCEEngine* engine, IItem* contact, const QContactDetail& detail, QVector<CEPROPVAL>& props)
 {
-QString avatarData = detail.value(QContactAvatar::FieldAvatar);
+Q_UNUSED(engine);
-QPixmap avatarPixmap = detail.value<QPixmap>(QContactAvatar::FieldAvatarPixmap);
+Q_UNUSED(contact);
+Q_UNUSED(detail);
-addIfNotEmpty(engine->metaAvatarType(), detail.value(QContactAvatar::FieldSubType), props);
+Q_UNUSED(props);
-addIfNotEmpty(engine->metaAvatar(), avatarData, props);
+//QString avatarData = detail.value(QContactAvatar::FieldImageUrl);
+//QPixmap avatarPixmap = detail.value<QPixmap>(QContactAvatar::FieldAvatarPixmap);
-if (!avatarPixmap.isNull()) {
-QByteArray data;
+//FIXME:wince avatar should be processed as thumbnail
-QBuffer buffer(&data);
+//addIfNotEmpty(engine->metaAvatar(), avatarData, props);
-buffer.open(QIODevice::WriteOnly);
-if (!avatarPixmap.save(&buffer, "PNG") || !saveAvatarData(contact, data))
+//if (!avatarPixmap.isNull()) {
-return false;
+//    QByteArray data;
-}
+//    QBuffer buffer(&data);
+//    buffer.open(QIODevice::WriteOnly);
+//    if (!avatarPixmap.save(&buffer, "PNG") || !saveAvatarData(contact, data))
+//        return false;
+//}
 return true;
 }
 static bool processQFamily(const QContactWinCEEngine*, IItem* /*contact*/, const QContactDetail& detail, QVector<CEPROPVAL>& props)
 {
 // Map from our attributes to ids
 if (number.subTypes().contains(QContactPhoneNumber::SubTypeCar))
 id = PIMPR_CAR_TELEPHONE_NUMBER;
 else if (number.subTypes().contains(QContactPhoneNumber::SubTypeMobile))
 id = PIMPR_MOBILE_TELEPHONE_NUMBER;
-else if (number.subTypes().contains(QContactPhoneNumber::SubTypeFacsimile)) {
+else if (number.subTypes().contains(QContactPhoneNumber::SubTypeFax)) {
 if (number.contexts().contains(QContactDetail::ContextHome))
 id = PIMPR_HOME_FAX_NUMBER;
 else if (number.contexts().contains(QContactDetail::ContextWork))
 id = PIMPR_BUSINESS_FAX_NUMBER;
 } else if (number.subTypes().contains(QContactPhoneNumber::SubTypeVoice)) {
 foreach(const QContactEmailAddress& email, emails) {
 CEPROPID id = availableIds.takeFirst();
 if (id != 0) {
 if (email.contexts().contains(QContactDetail::ContextHome))
-meta += "H";
+meta += 'H';
 else if (email.contexts().contains(QContactDetail::ContextWork))
-meta += "W";
+meta += 'W';
 else
-meta += " ";
+meta += ' ';
 props.append(convertToCEPropVal(id, email.emailAddress()));
 } else {
 qDebug() << "Too many email addresses";
 break;
 }
 HeapFree(GetProcessHeap(), 0, propvals);
 }
 // Synthesize the display label.
 QContactManager::Error error;
-QString synth = synthesizedDisplayLabel(ret, error);
+QString synth = synthesizedDisplayLabel(ret, &error);
-ret = setContactDisplayLabel(synth, ret);
+setContactDisplayLabel(&ret, synth);
 return ret;
 }
 bool QContactWinCEEngine::convertFromQContact(const QContact& contact, IItem* item, QContactManager::Error &error) const
 void QContactWinCEEngine::buildHashForContactDetailToPoomPropId() const
 {
 if (hashForContactDetailToPoomPropId.isEmpty()) {
 //QContactName
 Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldPrefix, PIMPR_TITLE);
-Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldFirst, PIMPR_FIRST_NAME);
+Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldFirstName, PIMPR_FIRST_NAME);
-Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldMiddle, PIMPR_MIDDLE_NAME);
+Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldMiddleName, PIMPR_MIDDLE_NAME);
-Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldLast, PIMPR_LAST_NAME);
+Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldLastName, PIMPR_LAST_NAME);
 Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactName, FieldSuffix, PIMPR_SUFFIX);
 // Display label
 Q_HASH_CONTACT_DETAIL_TO_POOM_ID(QContactDisplayLabel, FieldLabel, PIMPR_FILEAS);
 }
 /*!
 * Convert from the supplied QContactFilter \a filter into a POOM query string.
-* Return empty string if any error occured.
+* Return empty string if any error occurred.
 */
 QString QContactWinCEEngine::convertFilterToQueryString(const QContactFilter& filter) const
 {
 QString ret;
 switch(filter.type()) {
 //XXX Only exact match can be supported?
 if (cdf.matchFlags() == QContactFilter::MatchExactly && cdf.value().isValid()) {
 QList<CEPROPID> ids = convertToCEPropIds(cdf.detailDefinitionName(), cdf.detailFieldName());
 if (!ids.isEmpty()) {
 QStringList strList;
-foreach (CEPROPID id, ids) {
+foreach (const CEPROPID& id, ids) {
 strList << QString("%1 = %2").arg(getPropertyName(id))
 .arg(convertToCEPropValString(id, cdf.value()));
 }
 ret = QString("(%1)").arg(strList.join(" OR "));
 }
 const QString maxComp = cdf.rangeFlags() & QContactDetailRangeFilter::IncludeUpper ? "<=" : "<";
 QString minCompString, maxCompString;
 QStringList strList;
-foreach (CEPROPID id, ids) {
+foreach (const CEPROPID& id, ids) {
 if (cdf.minValue().isValid()) {
 minCompString = QString("%1 %2 %3").arg(getPropertyName(id))
 .arg(minComp)
 .arg(convertToCEPropValString(id, cdf.minValue()));
 }
 }
 return SUCCEEDED(hr);
 }
-QList<QContactLocalId> QContactWinCEEngine::contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error& error) const
+QList<QContactLocalId> QContactWinCEEngine::contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error* error) const
 {
 QString query = convertFilterToQueryString(filter);
 if (!query.isEmpty()) {
-error = QContactManager::NoError;
+*error = QContactManager::NoError;
 //Filtering contacts with POOM API
 SimpleComPointer<IPOutlookItemCollection> collection;
 HRESULT hr = d->m_collection->Restrict((BSTR)(query.constData()), &collection);
 if (SUCCEEDED(hr)) {
 //Multi sort orders or native sorting failed, fall back to the generic sorting
 QList<QContact> filteredContacts;
 if (convertP2QContacts(collection, &filteredContacts)) {
 ids = sortContacts(filteredContacts, sortOrders);
 } else {
-error = QContactManager::UnspecifiedError;
+*error = QContactManager::UnspecifiedError;
 qDebug() << "Wince contact manager internal error";
 }
 }
 return ids;
 } else {
 }
 //Fail back to generic filtering
 return QContactManagerEngine::contactIds(filter, sortOrders, error);
 }
-QList<QContactLocalId> QContactWinCEEngine::contactIds(const QList<QContactSortOrder>& sortOrders, QContactManager::Error& error) const
-{
-QList<QContactLocalId> ids;
-error = QContactManager::NoError;
-if (sortOrders.isEmpty()) {
-ids = d->m_ids;
-} else {
-SimpleComPointer<IPOutlookItemCollection> newCollection;
-HRESULT hr = d->m_collection->Restrict(TEXT("[Oid] <> 0"), &newCollection);
-if (SUCCEEDED(hr)) {
-//Try native sorting first...
-if (sortOrders.size() == 1 && sortPOOMContacts(newCollection, sortOrders.at(0))) {
-ids = convertP2QIdList(newCollection);
-return ids;
-}
-}
-//Multi sort orders or native sorting failed, fall back to the generic sorting
-QList<QContact> contacts;
-if (convertP2QContacts(d->m_collection, &contacts)) {
-ids = sortContacts(contacts, sortOrders);
-} else {
-error = QContactManager::UnspecifiedError;
-qDebug() << "Wince contact manager internal error";
-}
-}
-return ids;
-}

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 5	453da2cfceef