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 | |||
@@ -185,13 +185,13 @@ void ComposeMail::accept() | |||
185 | } | 185 | } |
186 | 186 | ||
187 | #if 0 | 187 | #if 0 |
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()); |
195 | 195 | ||
196 | if ( !toLine->text().isEmpty() ) { | 196 | if ( !toLine->text().isEmpty() ) { |
197 | mail->setTo( toLine->text() ); | 197 | mail->setTo( toLine->text() ); |
@@ -233,13 +233,13 @@ void ComposeMail::reject() | |||
233 | int yesno = QMessageBox::warning(0,tr("Store message"), | 233 | int yesno = QMessageBox::warning(0,tr("Store message"), |
234 | tr("Store message into drafts?"), | 234 | tr("Store message into drafts?"), |
235 | tr("Yes"), | 235 | tr("Yes"), |
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()); |
243 | mail->setCC( ccLine->text() ); | 243 | mail->setCC( ccLine->text() ); |
244 | mail->setBCC( bccLine->text() ); | 244 | mail->setBCC( bccLine->text() ); |
245 | mail->setReply( replyLine->text() ); | 245 | mail->setReply( replyLine->text() ); |
@@ -253,17 +253,17 @@ void ComposeMail::reject() | |||
253 | if ( !sigMultiLine->text().isEmpty() ) { | 253 | if ( !sigMultiLine->text().isEmpty() ) { |
254 | txt.append( "\n--\n" ); | 254 | txt.append( "\n--\n" ); |
255 | txt.append( sigMultiLine->text() ); | 255 | txt.append( sigMultiLine->text() ); |
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 ) { |
267 | QMessageBox::warning(0,tr("Store message"), | 267 | QMessageBox::warning(0,tr("Store message"), |
268 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); | 268 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); |
269 | } | 269 | } |
@@ -272,21 +272,21 @@ void ComposeMail::reject() | |||
272 | } | 272 | } |
273 | 273 | ||
274 | ComposeMail::~ComposeMail() | 274 | 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 ) |
290 | : QListViewItem( parent ) | 290 | : QListViewItem( parent ) |
291 | { | 291 | { |
292 | attachment = att; | 292 | attachment = att; |