author | alwin <alwin> | 2004-03-12 19:24:38 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-12 19:24:38 (UTC) |
commit | b600871ce93553a116a66fd80acd6dfc1cc46829 (patch) (unidiff) | |
tree | b361346a49e09d9f0220993583bf183cf29bd974 /noncore/net/mail/viewmail.cpp | |
parent | 874d5a34eca296263dcd1adf857aebe9981825a1 (diff) | |
download | opie-b600871ce93553a116a66fd80acd6dfc1cc46829.zip opie-b600871ce93553a116a66fd80acd6dfc1cc46829.tar.gz opie-b600871ce93553a116a66fd80acd6dfc1cc46829.tar.bz2 |
some more smart-pointers
some bugfixes
some renaming of internals
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 36 |
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 | |||
@@ -225,7 +225,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
225 | 225 | ||
226 | if( !str.isEmpty() ) | 226 | if( !str.isEmpty() ) |
227 | { | 227 | { |
228 | encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); | 228 | encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); |
229 | if (content) | 229 | if (content) |
230 | { | 230 | { |
231 | QFile output(str); | 231 | QFile output(str); |
@@ -245,9 +245,9 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
245 | } | 245 | } |
246 | else | 246 | else |
247 | { | 247 | { |
248 | if ( m_recMail.Wrapper() != 0l ) | 248 | if ( m_recMail->Wrapper() != 0l ) |
249 | { // make sure that there is a wrapper , even after delete or simular actions | 249 | { // make sure that there is a wrapper , even after delete or simular actions |
250 | browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) ); | 250 | browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) ); |
251 | } | 251 | } |
252 | } | 252 | } |
253 | break; | 253 | break; |
@@ -256,19 +256,19 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
256 | } | 256 | } |
257 | 257 | ||
258 | 258 | ||
259 | void ViewMail::setMail( RecMail mail ) | 259 | void ViewMail::setMail( RecMailP mail ) |
260 | { | 260 | { |
261 | 261 | ||
262 | m_recMail = mail; | 262 | m_recMail = mail; |
263 | 263 | ||
264 | m_mail[0] = mail.getFrom(); | 264 | m_mail[0] = mail->getFrom(); |
265 | m_mail[1] = mail.getSubject(); | 265 | m_mail[1] = mail->getSubject(); |
266 | m_mail[3] = mail.getDate(); | 266 | m_mail[3] = mail->getDate(); |
267 | m_mail[4] = mail.Msgid(); | 267 | m_mail[4] = mail->Msgid(); |
268 | 268 | ||
269 | m_mail2[0] = mail.To(); | 269 | m_mail2[0] = mail->To(); |
270 | m_mail2[1] = mail.CC(); | 270 | m_mail2[1] = mail->CC(); |
271 | m_mail2[2] = mail.Bcc(); | 271 | m_mail2[2] = mail->Bcc(); |
272 | 272 | ||
273 | setText(); | 273 | setText(); |
274 | } | 274 | } |
@@ -348,7 +348,7 @@ void ViewMail::setText() | |||
348 | 348 | ||
349 | ViewMail::~ViewMail() | 349 | ViewMail::~ViewMail() |
350 | { | 350 | { |
351 | m_recMail.Wrapper()->cleanMimeCache(); | 351 | m_recMail->Wrapper()->cleanMimeCache(); |
352 | hide(); | 352 | hide(); |
353 | } | 353 | } |
354 | 354 | ||
@@ -415,18 +415,18 @@ void ViewMail::slotReply() | |||
415 | 415 | ||
416 | Settings *settings = new Settings(); | 416 | Settings *settings = new Settings(); |
417 | ComposeMail composer( settings ,this, 0, true); | 417 | ComposeMail composer( settings ,this, 0, true); |
418 | if (m_recMail.Replyto().isEmpty()) { | 418 | if (m_recMail->Replyto().isEmpty()) { |
419 | composer.setTo( m_recMail.getFrom()); | 419 | composer.setTo( m_recMail->getFrom()); |
420 | } else { | 420 | } else { |
421 | composer.setTo( m_recMail.Replyto()); | 421 | composer.setTo( m_recMail->Replyto()); |
422 | } | 422 | } |
423 | composer.setSubject( prefix + m_mail[1] ); | 423 | composer.setSubject( prefix + m_mail[1] ); |
424 | composer.setMessage( rtext ); | 424 | composer.setMessage( rtext ); |
425 | composer.setInReplyTo(m_recMail.Msgid()); | 425 | composer.setInReplyTo(m_recMail->Msgid()); |
426 | 426 | ||
427 | if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) ) | 427 | if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) ) |
428 | { | 428 | { |
429 | m_recMail.Wrapper()->answeredMail(m_recMail); | 429 | m_recMail->Wrapper()->answeredMail(m_recMail); |
430 | } | 430 | } |
431 | } | 431 | } |
432 | 432 | ||
@@ -469,7 +469,7 @@ void ViewMail::slotDeleteMail( ) | |||
469 | { | 469 | { |
470 | 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 ) | 470 | 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 ) |
471 | { | 471 | { |
472 | m_recMail.Wrapper()->deleteMail( m_recMail ); | 472 | m_recMail->Wrapper()->deleteMail( m_recMail ); |
473 | hide(); | 473 | hide(); |
474 | deleted = true; | 474 | deleted = true; |
475 | } | 475 | } |