-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 | |||
@@ -6,2 +6,7 @@ | |||
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 |
@@ -29,3 +34,3 @@ | |||
29 | #include <qcursor.h> | 34 | #include <qcursor.h> |
30 | #include <qtextbrowser.h> | 35 | #include <q3textbrowser.h> |
31 | #include <qregexp.h> | 36 | #include <qregexp.h> |
@@ -65,3 +70,3 @@ OpieMail::~OpieMail() | |||
65 | 70 | ||
66 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 71 | void OpieMail::appMessage(const Q3CString &msg, const QByteArray &data) |
67 | { | 72 | { |
@@ -70,3 +75,3 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | |||
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 | { |
@@ -85,3 +90,3 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
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; |
@@ -102,3 +107,3 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
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; |
@@ -281,3 +286,3 @@ void OpieMail::replyMail() | |||
281 | 286 | ||
282 | QListViewItem*item = mailView->currentItem(); | 287 | Q3ListViewItem*item = mailView->currentItem(); |
283 | if (!item) return; | 288 | if (!item) return; |
@@ -333,3 +338,3 @@ void OpieMail::slotDownloadMail( ) | |||
333 | { | 338 | { |
334 | QListViewItem*item = mailView->currentItem(); | 339 | Q3ListViewItem*item = mailView->currentItem(); |
335 | if (!item ) { | 340 | if (!item ) { |
@@ -374,3 +379,3 @@ void OpieMail::deleteAndDisplayNextMail(ViewMail * vm) | |||
374 | { | 379 | { |
375 | QListViewItem*item = mailView->currentItem(); | 380 | Q3ListViewItem*item = mailView->currentItem(); |
376 | if (!item ) { | 381 | if (!item ) { |
@@ -394,3 +399,3 @@ 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; |
@@ -410,3 +415,3 @@ void OpieMail::displayMail() | |||
410 | { | 415 | { |
411 | QListViewItem*item = mailView->currentItem(); | 416 | Q3ListViewItem*item = mailView->currentItem(); |
412 | if (!item) return; | 417 | if (!item) return; |
@@ -434,3 +439,3 @@ void OpieMail::displayMail() | |||
434 | { | 439 | { |
435 | QListViewItem*item = mailView->currentItem(); | 440 | Q3ListViewItem*item = mailView->currentItem(); |
436 | if (item) | 441 | if (item) |
@@ -441,3 +446,3 @@ void OpieMail::slotGetAllMail() | |||
441 | { | 446 | { |
442 | QListViewItem * item = folderView->firstChild(); | 447 | Q3ListViewItem * item = folderView->firstChild(); |
443 | while ( item ){ | 448 | while ( item ){ |
@@ -449,3 +454,3 @@ void OpieMail::slotGetMail() | |||
449 | { | 454 | { |
450 | QListViewItem * item = folderView->currentItem(); | 455 | Q3ListViewItem * item = folderView->currentItem(); |
451 | if ( ! item ) return; | 456 | if ( ! item ) return; |
@@ -466,3 +471,3 @@ void OpieMail::slotDeleteAllMail() | |||
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 ) |
@@ -494,3 +499,3 @@ void OpieMail::selectAll() | |||
494 | { | 499 | { |
495 | QListViewItem* item = mailView->firstChild (); | 500 | Q3ListViewItem* item = mailView->firstChild (); |
496 | while ( item ) { | 501 | while ( item ) { |
@@ -501,3 +506,3 @@ void OpieMail::selectAll() | |||
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 | { |
@@ -508,3 +513,3 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | |||
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) |
@@ -555,3 +560,3 @@ void OpieMail::slotShowFolders( bool show ) | |||
555 | 560 | ||
556 | void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | 561 | void OpieMail::refreshMailView(const Q3ValueList<RecMailP>&list) |
557 | { | 562 | { |
@@ -560,3 +565,3 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | |||
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) |
@@ -570,3 +575,3 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | |||
570 | 575 | ||
571 | void OpieMail::mailLeftClicked( QListViewItem *item ) | 576 | void OpieMail::mailLeftClicked( Q3ListViewItem *item ) |
572 | { | 577 | { |
@@ -616,3 +621,3 @@ void OpieMail::slotMoveCopyAllMail() | |||
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 ) |