equal
deleted
inserted
replaced
199 result = static_cast<QMailMessage::MessageType>(result | QMailMessage::Sms); |
199 result = static_cast<QMailMessage::MessageType>(result | QMailMessage::Sms); |
200 } |
200 } |
201 if (t & QMessage::Email) { |
201 if (t & QMessage::Email) { |
202 result = static_cast<QMailMessage::MessageType>(result | QMailMessage::Email); |
202 result = static_cast<QMailMessage::MessageType>(result | QMailMessage::Email); |
203 } |
203 } |
204 if (t & QMessage::Xmpp) { |
204 if (t & QMessage::InstantMessage) { |
205 result = static_cast<QMailMessage::MessageType>(result | QMailMessage::Instant); |
205 result = static_cast<QMailMessage::MessageType>(result | QMailMessage::Instant); |
206 } |
206 } |
207 |
207 |
208 return result; |
208 return result; |
209 } |
209 } |
221 } |
221 } |
222 if (t & QMailMessage::Email) { |
222 if (t & QMailMessage::Email) { |
223 result = static_cast<QMessage::Type>(static_cast<uint>(result | QMessage::Email)); |
223 result = static_cast<QMessage::Type>(static_cast<uint>(result | QMessage::Email)); |
224 } |
224 } |
225 if (t & QMailMessage::Instant) { |
225 if (t & QMailMessage::Instant) { |
226 result = static_cast<QMessage::Type>(static_cast<uint>(result | QMessage::Xmpp)); |
226 result = static_cast<QMessage::Type>(static_cast<uint>(result | QMessage::InstantMessage)); |
227 } |
227 } |
228 |
228 |
229 return result; |
229 return result; |
230 } |
230 } |
231 |
231 |
375 QString spec(suffix.cap(1)); |
375 QString spec(suffix.cap(1)); |
376 if (spec == "System") { |
376 if (spec == "System") { |
377 type = QMessageAddress::System; |
377 type = QMessageAddress::System; |
378 } else if (spec == "Phone") { |
378 } else if (spec == "Phone") { |
379 type = QMessageAddress::Phone; |
379 type = QMessageAddress::Phone; |
380 } else if (spec == "XMPP") { |
380 } else if (spec == "InstantMessage") { |
381 type = QMessageAddress::Xmpp; |
381 type = QMessageAddress::InstantMessage; |
382 } |
382 } |
383 } |
383 } |
384 |
384 |
385 return QMessageAddress(type, addr); |
385 return QMessageAddress(type, addr); |
386 } |
386 } |
393 QString suffix; |
393 QString suffix; |
394 if (address.type() == QMessageAddress::System) { |
394 if (address.type() == QMessageAddress::System) { |
395 suffix = " (TYPE=System)"; |
395 suffix = " (TYPE=System)"; |
396 } else if (address.type() == QMessageAddress::Phone) { |
396 } else if (address.type() == QMessageAddress::Phone) { |
397 suffix = " (TYPE=Phone)"; |
397 suffix = " (TYPE=Phone)"; |
398 } else if (address.type() == QMessageAddress::Xmpp) { |
398 } else if (address.type() == QMessageAddress::InstantMessage) { |
399 suffix = " (TYPE=XMPP)"; |
399 suffix = " (TYPE=InstantMessage)"; |
400 } |
400 } |
401 |
401 |
402 return QMailAddress(address.recipient() + suffix); |
402 return QMailAddress(address.addressee() + suffix); |
403 } |
403 } |
404 |
404 |
405 QMessageAddressList convert(const QList<QMailAddress> &list) |
405 QMessageAddressList convert(const QList<QMailAddress> &list) |
406 { |
406 { |
407 QList<QMessageAddress> result; |
407 QList<QMessageAddress> result; |