equal
deleted
inserted
replaced
47 #include <qversitdocument.h> |
47 #include <qversitdocument.h> |
48 #include <qcontact.h> |
48 #include <qcontact.h> |
49 #include <qcontactmanager.h> |
49 #include <qcontactmanager.h> |
50 #include <qversitcontactexporter.h> |
50 #include <qversitcontactexporter.h> |
51 #include <cntservicescontact.h> |
51 #include <cntservicescontact.h> |
52 |
52 #include <commonphoneparser.h> // Common phone number validity checker |
53 |
53 |
54 // USER INCLUDES |
54 // USER INCLUDES |
55 #include "debugtraces.h" |
55 #include "debugtraces.h" |
56 #include "msgunieditorview.h" |
56 #include "msgunieditorview.h" |
57 #include "msgunieditoraddress.h" |
57 #include "msgunieditoraddress.h" |
941 bool removeDuplicates = !isSave; |
941 bool removeDuplicates = !isSave; |
942 ConvergedMessageAddressList addresses = |
942 ConvergedMessageAddressList addresses = |
943 mToField->addresses(removeDuplicates); |
943 mToField->addresses(removeDuplicates); |
944 ConvergedMessageAddressList ccAddresses; |
944 ConvergedMessageAddressList ccAddresses; |
945 ConvergedMessageAddressList bccAddresses; |
945 ConvergedMessageAddressList bccAddresses; |
946 |
946 |
|
947 //Don't format the addresses for save to drfats case |
|
948 if(!isSave) |
|
949 { |
|
950 formatAddresses(addresses); |
|
951 } |
|
952 |
947 msg.addToRecipients(addresses); |
953 msg.addToRecipients(addresses); |
948 msg.setBodyText(mBody->text()); |
954 msg.setBodyText(mBody->text()); |
949 msg.setDirection(ConvergedMessage::Outgoing); |
955 msg.setDirection(ConvergedMessage::Outgoing); |
950 QDateTime time = QDateTime::currentDateTime(); |
956 QDateTime time = QDateTime::currentDateTime(); |
951 msg.setTimeStamp(time.toTime_t()); |
957 msg.setTimeStamp(time.toTime_t()); |
1000 } |
1006 } |
1001 } |
1007 } |
1002 |
1008 |
1003 if(ccAddresses.count()>0) |
1009 if(ccAddresses.count()>0) |
1004 { |
1010 { |
|
1011 //Don't format the addresses for save to drfats case |
|
1012 if(!isSave) |
|
1013 { |
|
1014 formatAddresses(ccAddresses); |
|
1015 } |
1005 msg.addCcRecipients(ccAddresses); |
1016 msg.addCcRecipients(ccAddresses); |
1006 } |
1017 } |
1007 if(bccAddresses.count()>0) |
1018 if(bccAddresses.count()>0) |
1008 { |
1019 { |
|
1020 //Don't format the addresses for save to drfats case |
|
1021 if(!isSave) |
|
1022 { |
|
1023 formatAddresses(bccAddresses); |
|
1024 } |
1009 msg.addBccRecipients(bccAddresses); |
1025 msg.addBccRecipients(bccAddresses); |
1010 } |
1026 } |
1011 if(mSubjectField) |
1027 if(mSubjectField) |
1012 { |
1028 { |
1013 msg.setSubject(mSubjectField->text()); |
1029 msg.setSubject(mSubjectField->text()); |
1659 if(mSendAction->isEnabled() != enable ) |
1675 if(mSendAction->isEnabled() != enable ) |
1660 mSendAction->setEnabled(enable); |
1676 mSendAction->setEnabled(enable); |
1661 } |
1677 } |
1662 } |
1678 } |
1663 |
1679 |
|
1680 // ---------------------------------------------------------------------------- |
|
1681 // MsgUnifiedEditorView::formatAddresses |
|
1682 // @see header |
|
1683 // ---------------------------------------------------------------------------- |
|
1684 void MsgUnifiedEditorView::formatAddresses( |
|
1685 ConvergedMessageAddressList& addresses) |
|
1686 { |
|
1687 |
|
1688 for(int i=0; i < addresses.count() ;i++ ) |
|
1689 { |
|
1690 QString addr = addresses[i]->address(); |
|
1691 |
|
1692 HBufC *tempAddr = XQConversions::qStringToS60Desc(addr); |
|
1693 |
|
1694 TPtr ptr = tempAddr->Des(); |
|
1695 |
|
1696 // Note: This is just to parse spaces etc away from phonenumbers. |
|
1697 // Ignore EFalse returned for email addresses. |
|
1698 CommonPhoneParser::ParsePhoneNumber(ptr , |
|
1699 CommonPhoneParser::ESMSNumber ); |
|
1700 |
|
1701 addr = XQConversions::s60DescToQString(tempAddr->Des()); |
|
1702 |
|
1703 addresses[i]->setAddress(addr); |
|
1704 |
|
1705 delete tempAddr; |
|
1706 } |
|
1707 } |
1664 //EOF |
1708 //EOF |