1 files changed, 8 insertions, 10 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index afc5618..86673aa 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -314,3 +314,3 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
 
-void SMTPwrapper::sendMail(const Opie::osmart_pointer<Mail>&mail,bool later )
+void SMTPwrapper::sendMail(const Opie::OSmartPointer<Mail>&mail,bool later )
 {
@@ -334,3 +334,3 @@ void SMTPwrapper::sendMail(const Opie::osmart_pointer<Mail>&mail,bool later )
 
-int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,RecMail*which) {
+int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) {
     size_t curTok = 0;
@@ -342,3 +342,3 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,RecMail*which) {
 
-    encodedString * data = wrap->fetchRawBody(*which);
+    encodedString * data = wrap->fetchRawBody(which);
     if (!data)
@@ -393,4 +393,4 @@ bool SMTPwrapper::flushOutbox() {
     QString oldPw, oldUser;
-    QList<RecMail> mailsToSend;
-    QList<RecMail> mailsToRemove;
+    QValueList<RecMailP> mailsToSend;
+    QValueList<RecMailP> mailsToRemove;
     QString mbox("Outgoing");
@@ -423,3 +423,2 @@ bool SMTPwrapper::flushOutbox() {
 
-    mailsToSend.setAutoDelete(false);
     sendProgress = new progressMailSend();
@@ -429,3 +428,3 @@ bool SMTPwrapper::flushOutbox() {
     while (mailsToSend.count()>0) {
-        if (sendQueuedMail(wrap,mailsToSend.at(0))==0) {
+        if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) {
             QMessageBox::critical(0,tr("Error sending mail"),
@@ -435,4 +434,4 @@ bool SMTPwrapper::flushOutbox() {
         }
-        mailsToRemove.append(mailsToSend.at(0));
-        mailsToSend.removeFirst();
+        mailsToRemove.append((*mailsToSend.begin()));
+        mailsToSend.remove(mailsToSend.begin());
         sendProgress->setCurrentMails(mailsToRemove.count());
@@ -452,3 +451,2 @@ bool SMTPwrapper::flushOutbox() {
     wrap->deleteMails(mbox,mailsToRemove);
-    mailsToSend.setAutoDelete(true);
     delete wrap;