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/composemail.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
Diffstat (limited to 'noncore/net/mail/composemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/composemail.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 445cc5e..74ccc7b 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -188,7 +188,7 @@ void ComposeMail::accept() | |||
188 | qDebug( "Sending Mail with " + | 188 | qDebug( "Sending Mail with " + |
189 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); | 189 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); |
190 | #endif | 190 | #endif |
191 | Opie::osmart_pointer<Mail> mail=new Mail; | 191 | Opie::OSmartPointer<Mail> mail=new Mail; |
192 | 192 | ||
193 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 193 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
194 | mail->setMail(fromBox->currentText()); | 194 | mail->setMail(fromBox->currentText()); |
@@ -236,7 +236,7 @@ void ComposeMail::reject() | |||
236 | tr("No"),QString::null,0,1); | 236 | tr("No"),QString::null,0,1); |
237 | 237 | ||
238 | if (yesno == 0) { | 238 | if (yesno == 0) { |
239 | Opie::osmart_pointer<Mail> mail=new Mail(); | 239 | Opie::OSmartPointer<Mail> mail=new Mail(); |
240 | mail->setMail(fromBox->currentText()); | 240 | mail->setMail(fromBox->currentText()); |
241 | mail->setTo( toLine->text() ); | 241 | mail->setTo( toLine->text() ); |
242 | mail->setName(senderNameEdit->text()); | 242 | mail->setName(senderNameEdit->text()); |
@@ -256,11 +256,11 @@ void ComposeMail::reject() | |||
256 | } | 256 | } |
257 | qDebug(txt); | 257 | qDebug(txt); |
258 | mail->setMessage( txt ); | 258 | mail->setMessage( txt ); |
259 | 259 | ||
260 | /* only use the default drafts folder name! */ | 260 | /* only use the default drafts folder name! */ |
261 | Storemail wrapper(AbstractMail::draftFolder()); | 261 | Storemail wrapper(AbstractMail::draftFolder()); |
262 | wrapper.storeMail(mail); | 262 | wrapper.storeMail(mail); |
263 | 263 | ||
264 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 264 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
265 | /* attachments we will ignore! */ | 265 | /* attachments we will ignore! */ |
266 | if ( it != NULL ) { | 266 | if ( it != NULL ) { |
@@ -275,15 +275,15 @@ ComposeMail::~ComposeMail() | |||
275 | { | 275 | { |
276 | } | 276 | } |
277 | 277 | ||
278 | void ComposeMail::reEditMail(const RecMail¤t) | 278 | void ComposeMail::reEditMail(const RecMailP¤t) |
279 | { | 279 | { |
280 | RecMail data = current; | 280 | RecMailP data = current; |
281 | message->setText(data.Wrapper()->fetchBody(current).Bodytext()); | 281 | message->setText(data->Wrapper()->fetchBody(current).Bodytext()); |
282 | subjectLine->setText( data.getSubject()); | 282 | subjectLine->setText( data->getSubject()); |
283 | toLine->setText(data.To().join(",")); | 283 | toLine->setText(data->To().join(",")); |
284 | ccLine->setText(data.CC().join(",")); | 284 | ccLine->setText(data->CC().join(",")); |
285 | bccLine->setText(data.Bcc().join(",")); | 285 | bccLine->setText(data->Bcc().join(",")); |
286 | replyLine->setText(data.Replyto()); | 286 | replyLine->setText(data->Replyto()); |
287 | } | 287 | } |
288 | 288 | ||
289 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | 289 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) |