1 files changed, 13 insertions, 11 deletions

diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index d95b3c9..dd305df 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -142,13 +142,13 @@ void OpieMail::slotEditAccounts()
 }
 
 void OpieMail::displayMail()
 {
     QListViewItem*item = mailView->currentItem();
     if (!item) return;
-    RecMail mail = ((MailListViewItem*)item)->data();
+    RecMailP mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
     ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp  );
     readMail.setBody( body );
     readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
@@ -163,16 +163,16 @@ void OpieMail::displayMail()
     }
 }
 
 void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
-    RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
-    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail.getFrom() + " - " + mail.getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
-        mail.Wrapper()->deleteMail( mail );
+        mail->Wrapper()->deleteMail( mail );
         folderView->refreshCurrent();
     }
 }
 
 void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 {
@@ -214,20 +214,22 @@ void OpieMail::slotShowFolders( bool show )
     {
         qDebug( "-> hiding" );
         folderView->hide();
     }
 }
 
-void OpieMail::refreshMailView(QList<RecMail>*list)
+void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
-    for (unsigned int i = 0; i < list->count();++i)
+
+    QValueList<RecMailP>::ConstIterator it;
+    for (it = list.begin(); it != list.end();++it)
     {
         item = new MailListViewItem(mailView,item);
-        item->storeData(*(list->at(i)));
+        item->storeData((*it));
         item->showEntry();
     }
 }
 
 void OpieMail::mailLeftClicked(int button, QListViewItem *item,const QPoint&,int )
 {
@@ -241,38 +243,38 @@ void OpieMail::mailLeftClicked(int button, QListViewItem *item,const QPoint&,int
     }
 }
 
 void OpieMail::slotMoveCopyMail()
 {
     if (!mailView->currentItem()) return;
-    RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
+    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
     AbstractMail*targetMail = 0;
     QString targetFolder = "";
     Selectstore sels;
     folderView->setupFolderselect(&sels);
     if (!sels.exec()) return;
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
-    if ( (mail.Wrapper()==targetMail && mail.getMbox()==targetFolder) ||
+    if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
             targetFolder.isEmpty())
     {
         return;
     }
     if (sels.newFolder() && !targetMail->createMbox(targetFolder))
     {
         QMessageBox::critical(0,tr("Error creating new Folder"),
                               tr("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
-    mail.Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
+    mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
     folderView->refreshCurrent();
 }
 
 void OpieMail::reEditMail()
 {
     if (!mailView->currentItem()) return;
-    
+
     ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
     compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
     compose.slotAdjustColumns();
     QPEApplication::execDialog( &compose );
 }