1 files changed, 18 insertions, 18 deletions

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 78652d7..894a386 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -216,68 +216,68 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
     switch(ret)
     {
     case 0:
         {
             MimeTypes types;
             types.insert( "all", "*" );
             QString str = Opie::OFileDialog::getSaveFileName( 1,
                           "/", item->text( 2 )  , types, 0 );
 
             if( !str.isEmpty() )
             {
-                encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
+                encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
                 if (content)
                 {
                     QFile output(str);
                     output.open(IO_WriteOnly);
                     output.writeBlock(content->Content(),content->Length());
                     output.close();
                     delete content;
                 }
             }
         }
         break ;
 
     case 1:
         if (  ( ( AttachItem* )item )->Partnumber() == -1 )
         {
             setText();
         }
         else
         {
-            if (  m_recMail.Wrapper() != 0l )
+            if (  m_recMail->Wrapper() != 0l )
             { // make sure that there is a wrapper , even after delete or simular actions
-                browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
+                browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
             }
         }
         break;
     }
     delete menu;
 }
 
 
-void ViewMail::setMail( RecMail mail )
+void ViewMail::setMail( RecMailP mail )
 {
 
     m_recMail = mail;
 
-    m_mail[0] = mail.getFrom();
-    m_mail[1] = mail.getSubject();
-    m_mail[3] = mail.getDate();
-    m_mail[4] = mail.Msgid();
+    m_mail[0] = mail->getFrom();
+    m_mail[1] = mail->getSubject();
+    m_mail[3] = mail->getDate();
+    m_mail[4] = mail->Msgid();
 
-    m_mail2[0] = mail.To();
-    m_mail2[1] = mail.CC();
-    m_mail2[2] = mail.Bcc();
+    m_mail2[0] = mail->To();
+    m_mail2[1] = mail->CC();
+    m_mail2[2] = mail->Bcc();
 
     setText();
 }
 
 
 
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
     m_gotBody = false;
     deleted = false;
 
@@ -339,25 +339,25 @@ void ViewMail::setText()
     }
     else
     {
         browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
     }
     // remove later in favor of a real handling
     m_gotBody = true;
 }
 
 
 ViewMail::~ViewMail()
 {
-    m_recMail.Wrapper()->cleanMimeCache();
+    m_recMail->Wrapper()->cleanMimeCache();
     hide();
 }
 
 void ViewMail::hide()
 {
     QWidget::hide();
 
     if (_inLoop)
     {
         _inLoop = false;
         qApp->exit_loop();
 
@@ -406,36 +406,36 @@ void ViewMail::slotReply()
     for (it = lines.begin(); it != lines.end(); it++)
     {
         rtext += "> " + *it + "\n";
     }
     rtext += "\n";
 
     QString prefix;
     if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";
     else prefix = "Re: ";                // no i18n on purpose
 
     Settings *settings = new Settings();
     ComposeMail composer( settings ,this, 0, true);
-    if (m_recMail.Replyto().isEmpty()) {
-        composer.setTo( m_recMail.getFrom());
+    if (m_recMail->Replyto().isEmpty()) {
+        composer.setTo( m_recMail->getFrom());
     } else {
-        composer.setTo( m_recMail.Replyto());
+        composer.setTo( m_recMail->Replyto());
     }
     composer.setSubject( prefix + m_mail[1] );
     composer.setMessage( rtext );
-    composer.setInReplyTo(m_recMail.Msgid());
+    composer.setInReplyTo(m_recMail->Msgid());
 
     if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) )
     {
-        m_recMail.Wrapper()->answeredMail(m_recMail);
+        m_recMail->Wrapper()->answeredMail(m_recMail);
     }
 }
 
 void ViewMail::slotForward()
 {
     if (!m_gotBody)
     {
         QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
         return;
     }
 
     QString ftext;
@@ -460,17 +460,17 @@ void ViewMail::slotForward()
     ComposeMail composer( settings ,this, 0, true);
     composer.setSubject( "Fwd: " + m_mail[1] );
     composer.setMessage( ftext );
     if ( QDialog::Accepted == QPEApplication::execDialog( &composer ))
     {
     }
 }
 
 void ViewMail::slotDeleteMail( )
 {
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
-        m_recMail.Wrapper()->deleteMail( m_recMail );
+        m_recMail->Wrapper()->deleteMail( m_recMail );
         hide();
         deleted = true;
     }
 }