author | zautrix <zautrix> | 2004-10-31 12:28:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-31 12:28:03 (UTC) |
commit | bed831cc1a38d38a4c5b9329bf37b1c663142c23 (patch) (unidiff) | |
tree | db12b81ea6cee0cac347c801798d759dfe24acfb /kmicromail/composemail.cpp | |
parent | 553bd9acf9879a77c5fa925155f73afbe8a9af41 (diff) | |
download | kdepimpi-bed831cc1a38d38a4c5b9329bf37b1c663142c23.zip kdepimpi-bed831cc1a38d38a4c5b9329bf37b1c663142c23.tar.gz kdepimpi-bed831cc1a38d38a4c5b9329bf37b1c663142c23.tar.bz2 |
ompi utf8 fixes
-rw-r--r-- | kmicromail/composemail.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 5945b7f..2dcbc75 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -46,5 +46,5 @@ | |||
46 | //using namespace Opie::Core; | 46 | //using namespace Opie::Core; |
47 | //using namespace Opie::Ui; | 47 | //using namespace Opie::Ui; |
48 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal ) | 48 | ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, bool modal ) |
49 | : ComposeMailUI( parent, name, modal ) | 49 | : ComposeMailUI( parent, name, modal ) |
50 | { | 50 | { |
@@ -52,5 +52,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
52 | connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), | 52 | connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), |
53 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); | 53 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); |
54 | settings = s; | 54 | settings = sett; |
55 | m_replyid = ""; | 55 | m_replyid = ""; |
56 | if ( KOPrefs::instance()->mUseKapi) { | 56 | if ( KOPrefs::instance()->mUseKapi) { |
@@ -166,11 +166,11 @@ void ComposeMail::saveAsDraft() | |||
166 | 166 | ||
167 | Opie::Core::OSmartPointer<Mail> mail= new Mail(); | 167 | Opie::Core::OSmartPointer<Mail> mail= new Mail(); |
168 | mail->setMail(fromBox->currentText()); | 168 | mail->setMail(fromBox->currentText().utf8 ()); |
169 | mail->setTo( toLine->text() ); | 169 | mail->setTo( toLine->text().utf8 () ); |
170 | mail->setName(senderNameEdit->text()); | 170 | mail->setName(senderNameEdit->text().utf8 ()); |
171 | mail->setCC( ccLine->text() ); | 171 | mail->setCC( ccLine->text().utf8 () ); |
172 | mail->setBCC( bccLine->text() ); | 172 | mail->setBCC( bccLine->text().utf8 () ); |
173 | mail->setReply( replyLine->text() ); | 173 | mail->setReply( replyLine->text().utf8 () ); |
174 | mail->setSubject( subjectLine->text() ); | 174 | mail->setSubject( subjectLine->text().utf8 () ); |
175 | if (!m_replyid.isEmpty()) { | 175 | if (!m_replyid.isEmpty()) { |
176 | QStringList ids; | 176 | QStringList ids; |
@@ -178,5 +178,5 @@ void ComposeMail::saveAsDraft() | |||
178 | mail->setInreply(ids); | 178 | mail->setInreply(ids); |
179 | } | 179 | } |
180 | QString txt = message->text(); | 180 | QString txt = message->text().utf8 (); |
181 | if ( !sigMultiLine->text().isEmpty() ) { | 181 | if ( !sigMultiLine->text().isEmpty() ) { |
182 | txt.append( "\n--\n" ); | 182 | txt.append( "\n--\n" ); |
@@ -409,8 +409,8 @@ void ComposeMail::accept() | |||
409 | 409 | ||
410 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 410 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
411 | mail->setMail(fromBox->currentText()); | 411 | mail->setMail(fromBox->currentText().utf8 ()); |
412 | 412 | ||
413 | if ( !toLine->text().isEmpty() ) { | 413 | if ( !toLine->text().isEmpty() ) { |
414 | mail->setTo( toLine->text() ); | 414 | mail->setTo( toLine->text().utf8 () ); |
415 | } else { | 415 | } else { |
416 | QMessageBox::warning(0,i18n("Sending mail"), | 416 | QMessageBox::warning(0,i18n("Sending mail"), |
@@ -419,18 +419,18 @@ void ComposeMail::accept() | |||
419 | } | 419 | } |
420 | 420 | ||
421 | mail->setName(senderNameEdit->text()); | 421 | mail->setName(senderNameEdit->text().utf8 ()); |
422 | mail->setCC( ccLine->text() ); | 422 | mail->setCC( ccLine->text().utf8 () ); |
423 | mail->setBCC( bccLine->text() ); | 423 | mail->setBCC( bccLine->text().utf8 () ); |
424 | mail->setReply( replyLine->text() ); | 424 | mail->setReply( replyLine->text().utf8 () ); |
425 | mail->setSubject( subjectLine->text() ); | 425 | mail->setSubject( subjectLine->text().utf8 () ); |
426 | if (!m_replyid.isEmpty()) { | 426 | if (!m_replyid.isEmpty()) { |
427 | QStringList ids; | 427 | QStringList ids; |
428 | ids.append(m_replyid); | 428 | ids.append(m_replyid.utf8 ()); |
429 | mail->setInreply(ids); | 429 | mail->setInreply(ids); |
430 | } | 430 | } |
431 | QString txt = message->text(); | 431 | QString txt = message->text().utf8 (); |
432 | if ( !sigMultiLine->text().isEmpty() ) { | 432 | if ( !sigMultiLine->text().isEmpty() ) { |
433 | txt.append( "\n--\n" ); | 433 | txt.append( "\n--\n" ); |
434 | txt.append( sigMultiLine->text() ); | 434 | txt.append( sigMultiLine->text().utf8 () ); |
435 | } | 435 | } |
436 | mail->setMessage( txt ); | 436 | mail->setMessage( txt ); |
@@ -484,10 +484,10 @@ void ComposeMail::reEditMail(const RecMailP¤t) | |||
484 | { | 484 | { |
485 | RecMailP data = current; | 485 | RecMailP data = current; |
486 | message->setText(data->Wrapper()->fetchBody(current)->Bodytext()); | 486 | message->setText(QString::fromUtf8( data->Wrapper()->fetchBody(current)->Bodytext().latin1() )); |
487 | subjectLine->setText( data->getSubject()); | 487 | subjectLine->setText( QString::fromUtf8( data->getSubject().latin1() )); |
488 | toLine->setText(data->To().join(",")); | 488 | toLine->setText(QString::fromUtf8( data->To().join(",").latin1() )); |
489 | ccLine->setText(data->CC().join(",")); | 489 | ccLine->setText(QString::fromUtf8( data->CC().join(",").latin1() )); |
490 | bccLine->setText(data->Bcc().join(",")); | 490 | bccLine->setText(QString::fromUtf8( data->Bcc().join(",").latin1() )); |
491 | replyLine->setText(data->Replyto()); | 491 | replyLine->setText(QString::fromUtf8( data->Replyto().latin1() )); |
492 | } | 492 | } |
493 | 493 | ||