-rw-r--r-- | kmicromail/opiemail.cpp | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 75a75b9..f453be5 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -5,4 +5,9 @@ | |||
5 | #define protected public | 5 | #define protected public |
6 | #include <qwidget.h> | 6 | #include <qwidget.h> |
7 | //Added by qt3to4: | ||
8 | #include <Q3ValueList> | ||
9 | #include <Q3CString> | ||
10 | #include <QPixmap> | ||
11 | #include <Q3PopupMenu> | ||
7 | #undef protected | 12 | #undef protected |
8 | #include "koprefsdialog.h" | 13 | #include "koprefsdialog.h" |
@@ -28,5 +33,5 @@ | |||
28 | #include <qtimer.h> | 33 | #include <qtimer.h> |
29 | #include <qcursor.h> | 34 | #include <qcursor.h> |
30 | #include <qtextbrowser.h> | 35 | #include <q3textbrowser.h> |
31 | #include <qregexp.h> | 36 | #include <qregexp.h> |
32 | #include <qpe/global.h> | 37 | #include <qpe/global.h> |
@@ -64,10 +69,10 @@ OpieMail::~OpieMail() | |||
64 | } | 69 | } |
65 | 70 | ||
66 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 71 | void OpieMail::appMessage(const Q3CString &msg, const QByteArray &data) |
67 | { | 72 | { |
68 | 73 | ||
69 | } | 74 | } |
70 | #include <stdlib.h> | 75 | #include <stdlib.h> |
71 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 76 | void OpieMail::message(const Q3CString &msg, const QByteArray &data) |
72 | { | 77 | { |
73 | // copied from old mail2 | 78 | // copied from old mail2 |
@@ -84,5 +89,5 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
84 | { | 89 | { |
85 | //qDebug("writeMail(QString,QString) "); | 90 | //qDebug("writeMail(QString,QString) "); |
86 | QDataStream stream(data,IO_ReadOnly); | 91 | QDataStream stream(data,QIODevice::ReadOnly); |
87 | stream >> mPendingName >> mPendingEmail; | 92 | stream >> mPendingName >> mPendingEmail; |
88 | // removing the whitespaces at beginning and end is needed! | 93 | // removing the whitespaces at beginning and end is needed! |
@@ -101,5 +106,5 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
101 | { | 106 | { |
102 | //qDebug(" newMail(QString)"); | 107 | //qDebug(" newMail(QString)"); |
103 | QDataStream stream(data,IO_ReadOnly); | 108 | QDataStream stream(data,QIODevice::ReadOnly); |
104 | stream >> mPendingName; | 109 | stream >> mPendingName; |
105 | // the format is | 110 | // the format is |
@@ -280,5 +285,5 @@ void OpieMail::replyMail() | |||
280 | { | 285 | { |
281 | 286 | ||
282 | QListViewItem*item = mailView->currentItem(); | 287 | Q3ListViewItem*item = mailView->currentItem(); |
283 | if (!item) return; | 288 | if (!item) return; |
284 | RecMailP mail = ((MailListViewItem*)item)->data(); | 289 | RecMailP mail = ((MailListViewItem*)item)->data(); |
@@ -332,5 +337,5 @@ void OpieMail::closeViewMail(ViewMail * vm) | |||
332 | void OpieMail::slotDownloadMail( ) | 337 | void OpieMail::slotDownloadMail( ) |
333 | { | 338 | { |
334 | QListViewItem*item = mailView->currentItem(); | 339 | Q3ListViewItem*item = mailView->currentItem(); |
335 | if (!item ) { | 340 | if (!item ) { |
336 | Global::statusMessage("Error: No item slected!"); | 341 | Global::statusMessage("Error: No item slected!"); |
@@ -373,5 +378,5 @@ void OpieMail::slotDownloadMail( ) | |||
373 | void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) | 378 | void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) |
374 | { | 379 | { |
375 | QListViewItem*item = mailView->currentItem(); | 380 | Q3ListViewItem*item = mailView->currentItem(); |
376 | if (!item ) { | 381 | if (!item ) { |
377 | closeViewMail(vm); | 382 | closeViewMail(vm); |
@@ -393,5 +398,5 @@ void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) | |||
393 | void OpieMail::displayNextMail(ViewMail * vm) | 398 | void OpieMail::displayNextMail(ViewMail * vm) |
394 | { | 399 | { |
395 | QListViewItem*item = mailView->currentItem(); | 400 | Q3ListViewItem*item = mailView->currentItem(); |
396 | if (!item) return; | 401 | if (!item) return; |
397 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); | 402 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); |
@@ -409,5 +414,5 @@ void OpieMail::displayNextMail(ViewMail * vm) | |||
409 | void OpieMail::displayMail() | 414 | void OpieMail::displayMail() |
410 | { | 415 | { |
411 | QListViewItem*item = mailView->currentItem(); | 416 | Q3ListViewItem*item = mailView->currentItem(); |
412 | if (!item) return; | 417 | if (!item) return; |
413 | RecMailP mail = ((MailListViewItem*)item)->data(); | 418 | RecMailP mail = ((MailListViewItem*)item)->data(); |
@@ -433,5 +438,5 @@ void OpieMail::displayMail() | |||
433 | else | 438 | else |
434 | { | 439 | { |
435 | QListViewItem*item = mailView->currentItem(); | 440 | Q3ListViewItem*item = mailView->currentItem(); |
436 | if (item) | 441 | if (item) |
437 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); | 442 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); |
@@ -440,5 +445,5 @@ void OpieMail::displayMail() | |||
440 | void OpieMail::slotGetAllMail() | 445 | void OpieMail::slotGetAllMail() |
441 | { | 446 | { |
442 | QListViewItem * item = folderView->firstChild(); | 447 | Q3ListViewItem * item = folderView->firstChild(); |
443 | while ( item ){ | 448 | while ( item ){ |
444 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); | 449 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); |
@@ -448,5 +453,5 @@ void OpieMail::slotGetAllMail() | |||
448 | void OpieMail::slotGetMail() | 453 | void OpieMail::slotGetMail() |
449 | { | 454 | { |
450 | QListViewItem * item = folderView->currentItem(); | 455 | Q3ListViewItem * item = folderView->currentItem(); |
451 | if ( ! item ) return; | 456 | if ( ! item ) return; |
452 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); | 457 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); |
@@ -465,5 +470,5 @@ void OpieMail::slotDeleteAllMail() | |||
465 | { | 470 | { |
466 | 471 | ||
467 | QValueList<RecMailP> t; | 472 | Q3ValueList<RecMailP> t; |
468 | if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 473 | if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) |
469 | { | 474 | { |
@@ -493,5 +498,5 @@ void OpieMail::clearSelection() | |||
493 | void OpieMail::selectAll() | 498 | void OpieMail::selectAll() |
494 | { | 499 | { |
495 | QListViewItem* item = mailView->firstChild (); | 500 | Q3ListViewItem* item = mailView->firstChild (); |
496 | while ( item ) { | 501 | while ( item ) { |
497 | mailView->setSelected ( item, true ); | 502 | mailView->setSelected ( item, true ); |
@@ -500,5 +505,5 @@ void OpieMail::selectAll() | |||
500 | } | 505 | } |
501 | 506 | ||
502 | void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | 507 | void OpieMail::mailHold(int button, Q3ListViewItem *item,const QPoint&,int ) |
503 | { | 508 | { |
504 | if (!mailView->currentItem()) return; | 509 | if (!mailView->currentItem()) return; |
@@ -507,5 +512,5 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | |||
507 | if (button!=2) {return;} | 512 | if (button!=2) {return;} |
508 | if (!item) return; | 513 | if (!item) return; |
509 | QPopupMenu *m = new QPopupMenu(0); | 514 | Q3PopupMenu *m = new Q3PopupMenu(0); |
510 | if (m) | 515 | if (m) |
511 | { | 516 | { |
@@ -554,10 +559,10 @@ void OpieMail::slotShowFolders( bool show ) | |||
554 | } | 559 | } |
555 | 560 | ||
556 | void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | 561 | void OpieMail::refreshMailView(const Q3ValueList<RecMailP>&list) |
557 | { | 562 | { |
558 | MailListViewItem*item = 0; | 563 | MailListViewItem*item = 0; |
559 | mailView->clear(); | 564 | mailView->clear(); |
560 | 565 | ||
561 | QValueList<RecMailP>::ConstIterator it; | 566 | Q3ValueList<RecMailP>::ConstIterator it; |
562 | for (it = list.begin(); it != list.end();++it) | 567 | for (it = list.begin(); it != list.end();++it) |
563 | { | 568 | { |
@@ -569,5 +574,5 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | |||
569 | } | 574 | } |
570 | 575 | ||
571 | void OpieMail::mailLeftClicked( QListViewItem *item ) | 576 | void OpieMail::mailLeftClicked( Q3ListViewItem *item ) |
572 | { | 577 | { |
573 | mailView->clearSelection(); | 578 | mailView->clearSelection(); |
@@ -615,5 +620,5 @@ void OpieMail::slotMoveCopyAllMail() | |||
615 | 620 | ||
616 | if (!mailView->currentItem()) return; | 621 | if (!mailView->currentItem()) return; |
617 | QValueList<RecMailP> t; | 622 | Q3ValueList<RecMailP> t; |
618 | // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 623 | // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) |
619 | { | 624 | { |