--- a/emailservices/nmclientapi/src/nmapitypesconverter.cpp Thu Sep 30 11:43:07 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapitypesconverter.cpp Thu Oct 14 17:33:43 2010 +0300
@@ -17,86 +17,110 @@
#include "nmapiheaders.h"
+namespace EmailClientApi
+{
/*!
converts nmmailbox to client api NmApiMailbox
*/
-EmailClientApi::NmApiMailbox NmToApiConverter::NmMailbox2NmApiMailbox(const NmMailbox &mailbox)
+NmApiMailbox NmToApiConverter::NmMailbox2NmApiMailbox(const NmMailbox &mailbox)
{
NM_FUNCTION;
- EmailClientApi::NmApiMailbox api_mailbox;
- api_mailbox.setId(mailbox.id().id());
- api_mailbox.setName(mailbox.name());
+ NmApiMailbox apiMailbox;
+ apiMailbox.setId(mailbox.id().id());
+ apiMailbox.setName(mailbox.name());
NmMailbox tmp(mailbox);
- api_mailbox.setAddress(tmp.address().address());
- return api_mailbox;
+ apiMailbox.setAddress(tmp.address().address());
+ return apiMailbox;
}
/*!
converts NmFolder to client api NmFolder
*/
-EmailClientApi::NmApiFolder NmToApiConverter::NmFolder2NmApiFolder(const NmFolder &folder)
+NmApiFolder NmToApiConverter::NmFolder2NmApiFolder(const NmFolder &folder)
{
NM_FUNCTION;
- EmailClientApi::NmApiFolder api_folder;
+ NmApiFolder apiFolder;
+
+ apiFolder.setParentFolderId(folder.parentId().id());
+ apiFolder.setId(folder.folderId().id());
+ apiFolder.setName(folder.name());
- api_folder.setParentFolderId(folder.parentId().id());
- api_folder.setId(folder.folderId().id());
- api_folder.setName(folder.name());
- api_folder.setFolderType((EmailClientApi::NmApiEmailFolderType) folder.folderType());
- return api_folder;
+ switch ( folder.folderType() )
+ {
+ case NmFolderInbox:
+ apiFolder.setFolderType(EmailClientApi::Inbox);
+ break;
+ case NmFolderOutbox:
+ apiFolder.setFolderType(EmailClientApi::Outbox);
+ break;
+ case NmFolderDrafts:
+ apiFolder.setFolderType(EmailClientApi::Drafts);
+ break;
+ case NmFolderSent:
+ apiFolder.setFolderType(EmailClientApi::Sent);
+ break;
+ case NmFolderDeleted:
+ apiFolder.setFolderType(EmailClientApi::Deleted);
+ break;
+ case NmFolderOther:
+ default:
+ apiFolder.setFolderType(EmailClientApi::EOther);
+ break;
+ }
+ return apiFolder;
}
/*!
converts NmMessageEnvelope to client api NmApiMessageEnvelope
*/
-EmailClientApi::NmApiMessageEnvelope NmToApiConverter::NmMessageEnvelope2NmApiMessageEnvelope(
+NmApiMessageEnvelope NmToApiConverter::NmMessageEnvelope2NmApiMessageEnvelope(
const NmMessageEnvelope &envelope)
{
NM_FUNCTION;
- EmailClientApi::NmApiMessageEnvelope api_env;
+ NmApiMessageEnvelope apiEnv;
QList<NmAddress> to = envelope.toRecipients();
QList<NmAddress> cc = envelope.ccRecipients();
QList<NmAddress> bcc = envelope.bccRecipients();
- QList<EmailClientApi::NmApiEmailAddress> to_api = NmAddress2QString(to);
- QList<EmailClientApi::NmApiEmailAddress> cc_api = NmAddress2QString(cc);
- QList<EmailClientApi::NmApiEmailAddress> bcc_api = NmAddress2QString(bcc);
+ QList<NmApiEmailAddress> to_api = NmAddress2QString(to);
+ QList<NmApiEmailAddress> cc_api = NmAddress2QString(cc);
+ QList<NmApiEmailAddress> bcc_api = NmAddress2QString(bcc);
- api_env.setToRecipients(to_api);
- api_env.setCcRecipients(cc_api);
- api_env.setBccRecipients(bcc_api);
+ apiEnv.setToRecipients(to_api);
+ apiEnv.setCcRecipients(cc_api);
+ apiEnv.setBccRecipients(bcc_api);
- api_env.setHasAttachments(envelope.hasAttachments());
- api_env.setId(envelope.messageId().id());
- api_env.setIsForwarded(envelope.isForwarded());
- api_env.setIsRead(envelope.isRead());
- api_env.setIsReplied(envelope.isReplied());
- api_env.setParentFolder(envelope.folderId().id());
+ apiEnv.setHasAttachments(envelope.hasAttachments());
+ apiEnv.setId(envelope.messageId().id());
+ apiEnv.setIsForwarded(envelope.isForwarded());
+ apiEnv.setIsRead(envelope.isRead());
+ apiEnv.setIsReplied(envelope.isReplied());
+ apiEnv.setParentFolder(envelope.folderId().id());
- api_env.setSender(envelope.sender().address());
- api_env.setSentTime(envelope.sentTime());
- api_env.setSubject(envelope.subject());
+ apiEnv.setSender(envelope.sender().address());
+ apiEnv.setSentTime(envelope.sentTime());
+ apiEnv.setSubject(envelope.subject());
NmId mailboxId(envelope.mailboxId());
- api_env.setMailboxId(mailboxId.id());
- api_env.setFlags(static_cast<EmailClientApi::NmApiMessageFlags>(static_cast<int>(envelope.flags())), true);
+ apiEnv.setMailboxId(mailboxId.id());
+ apiEnv.setFlags(static_cast<NmApiMessageFlags>(static_cast<int>(envelope.flags())), true);
- return api_env;
+ return apiEnv;
}
/*!
converts QList of NmAddresses to Qlist of email client apis NmApiEmailAddresses
*/
-QList<EmailClientApi::NmApiEmailAddress> NmToApiConverter::NmAddress2QString(
+QList<NmApiEmailAddress> NmToApiConverter::NmAddress2QString(
const QList<NmAddress> &addresses)
{
NM_FUNCTION;
- QList<EmailClientApi::NmApiEmailAddress> nmAddresses;
+ QList<NmApiEmailAddress> nmAddresses;
for (int i = 0; i < addresses.count(); i++) {
- EmailClientApi::NmApiEmailAddress addr;
+ NmApiEmailAddress addr;
addr.setAddress(addresses[i].address());
addr.setDisplayName(addresses[i].displayName());
@@ -109,52 +133,56 @@
/*!
converts nmmessage to client api NmApiMessage
*/
-EmailClientApi::NmApiMessage NmToApiConverter::NmMessage2NmApiMessage(NmMessage &message)
+NmApiMessage NmToApiConverter::NmMessage2NmApiMessage(NmMessage &message)
{
NM_FUNCTION;
- EmailClientApi::NmApiMessage api_message;
+ NmApiMessage apiMessage;
QList<NmMessagePart*> attachments;
message.attachmentList(attachments);
if (attachments.size() > 0){
- QList<EmailClientApi::NmApiAttachment> api_attachments;
+ QList<NmApiAttachment> apiAttachments;
for (int i = 0; i < attachments.size(); i++){
NmMessagePart *part = attachments.at(i);
- if (part->contentType().compare(EmailClientApi::NmApiContentTypeTextPlain) != 0 &&
- part->contentType().compare(EmailClientApi::NmApiContentTypeTextHtml) != 0) {
- EmailClientApi::NmApiAttachment api_attachment;
- api_attachment.setFileName(part->attachmentName());
- api_attachment.setId(part->partId().id());
- api_attachment.setContentType(part->contentType());
- api_attachment.setSize(part->size());
- api_attachments.append(api_attachment);
+ if (part->contentType().compare(NmApiContentTypeTextPlain) != 0 &&
+ part->contentType().compare(NmApiContentTypeTextHtml) != 0) {
+ NmApiAttachment apiAttachment;
+ apiAttachment.setFileName(part->attachmentName());
+ apiAttachment.setId(part->partId().id());
+ apiAttachment.setContentType(part->contentType());
+ apiAttachment.setSize(part->size());
+ apiAttachments.append(apiAttachment);
}
}
- api_message.setAttachments(api_attachments);
+ apiMessage.setAttachments(apiAttachments);
}
- EmailClientApi::NmApiMessageEnvelope api_envelope = NmMessageEnvelope2NmApiMessageEnvelope(message.envelope());
- api_message.setEnvelope(api_envelope);
+ NmApiMessageEnvelope apiEnvelope = NmMessageEnvelope2NmApiMessageEnvelope(message.envelope());
+ apiMessage.setEnvelope(apiEnvelope);
const NmMessagePart *plaintext = message.plainTextBodyPart();
if (plaintext) {
- EmailClientApi::NmApiTextContent api_plaintext;
- api_plaintext.setContent(plaintext->textContent());
- api_plaintext.setId(plaintext->partId().id());
- api_plaintext.setContentType(plaintext->contentType());
- api_plaintext.setSize(plaintext->size());
- api_message.setPlainTextContent(api_plaintext);
+ NmApiTextContent apiPlainText;
+ apiPlainText.setContent(plaintext->textContent());
+ apiPlainText.setId(plaintext->partId().id());
+ apiPlainText.setContentType(plaintext->contentType());
+ apiPlainText.setSize(plaintext->size());
+ apiMessage.setPlainTextContent(apiPlainText);
}
const NmMessagePart *htmlcontent = message.htmlBodyPart();
if (htmlcontent) {
- EmailClientApi::NmApiTextContent api_htmlcontent;
- api_htmlcontent.setContent(htmlcontent->textContent());
- api_htmlcontent.setId(htmlcontent->partId().id());
- api_htmlcontent.setContentType(htmlcontent->contentType());
- api_htmlcontent.setSize(htmlcontent->size());
- api_message.setHtmlContent(api_htmlcontent);
+ NmApiTextContent apiHtmlContent;
+ apiHtmlContent.setContent(htmlcontent->textContent());
+ apiHtmlContent.setId(htmlcontent->partId().id());
+ apiHtmlContent.setContentType(htmlcontent->contentType());
+ apiHtmlContent.setSize(htmlcontent->size());
+ apiMessage.setHtmlContent(apiHtmlContent);
}
- return api_message;
+ return apiMessage;
+}
}
+
+
+