1 files changed, 15 insertions, 15 deletions

diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp
index 48fa02e..4f7ec0c 100644
--- a/noncore/net/mail/libmailwrapper/generatemail.cpp
+++ b/noncore/net/mail/libmailwrapper/generatemail.cpp
@@ -7,3 +7,3 @@
 
-const char* Generatemail::USER_AGENT="OpieMail v0.5";
+const char* Generatemail::USER_AGENT="OpieMail v0.6";
 
@@ -281,3 +281,3 @@ mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail
 
-mailimf_fields *Generatemail::createImfFields(const Mail&mail )
+mailimf_fields *Generatemail::createImfFields(const Opie::osmart_pointer<Mail>&mail )
 {
@@ -289,3 +289,3 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
     clist*in_reply_to = 0;
-    char *subject = strdup( mail.getSubject().latin1() );
+    char *subject = strdup( mail->getSubject().latin1() );
     int err;
@@ -293,3 +293,3 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
 
-    sender = newMailbox( mail.getName(), mail.getMail() );
+    sender = newMailbox( mail->getName(), mail->getMail() );
     if ( sender == NULL ) {
@@ -299,3 +299,3 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
     if (res) {
-        fromBox = newMailbox( mail.getName(), mail.getMail() );
+        fromBox = newMailbox( mail->getName(), mail->getMail() );
     }
@@ -319,8 +319,8 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
 
-    if (res) to = parseAddresses( mail.getTo() );
-    if (res) cc = parseAddresses( mail.getCC() );
-    if (res) bcc = parseAddresses( mail.getBCC() );
-    if (res) reply = parseAddresses( mail.getReply() );
+    if (res) to = parseAddresses( mail->getTo() );
+    if (res) cc = parseAddresses( mail->getCC() );
+    if (res) bcc = parseAddresses( mail->getBCC() );
+    if (res) reply = parseAddresses( mail->getReply() );
 
-    if (res && mail.Inreply().count()>0) {
+    if (res && mail->Inreply().count()>0) {
         in_reply_to = clist_new();
@@ -328,4 +328,4 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
         unsigned int nsize = 0;
-        for (QStringList::ConstIterator it=mail.Inreply().begin();
-             it != mail.Inreply().end();++it) {
+        for (QStringList::ConstIterator it=mail->Inreply().begin();
+             it != mail->Inreply().end();++it) {
             if ((*it).isEmpty())
@@ -401,3 +401,3 @@ mailimf_fields *Generatemail::createImfFields(const Mail&mail )
 
-mailmime *Generatemail::createMimeMail(const Mail &mail ) {
+mailmime *Generatemail::createMimeMail(const Opie::osmart_pointer<Mail> &mail ) {
     mailmime *message, *txtPart;
@@ -416,3 +416,3 @@ mailmime *Generatemail::createMimeMail(const Mail &mail ) {
 
-    txtPart = buildTxtPart( mail.getMessage() );
+    txtPart = buildTxtPart( mail->getMessage() );
 
@@ -425,3 +425,3 @@ mailmime *Generatemail::createMimeMail(const Mail &mail ) {
 
-    addFileParts( message, mail.getAttachments() );
+    addFileParts( message, mail->getAttachments() );