-rw-r--r-- | kmicromail/accountitem.cpp | 128 |
1 files changed, 65 insertions, 63 deletions
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp index 985a762..9b1ea2f 100644 --- a/kmicromail/accountitem.cpp +++ b/kmicromail/accountitem.cpp | |||
@@ -13,6 +13,8 @@ | |||
13 | 13 | ||
14 | /* QT */ | 14 | /* QT */ |
15 | #include <qpopupmenu.h> | 15 | #include <q3popupmenu.h> |
16 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
17 | //Added by qt3to4: | ||
18 | #include <Q3ValueList> | ||
17 | #include <kiconloader.h> | 19 | #include <kiconloader.h> |
18 | #include <klocale.h> | 20 | #include <klocale.h> |
@@ -55,5 +57,5 @@ AbstractMail *POP3viewItem::getWrapper() | |||
55 | } | 57 | } |
56 | 58 | ||
57 | void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & ) | 59 | void POP3viewItem::refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > & ) |
58 | { | 60 | { |
59 | refresh(); | 61 | refresh(); |
@@ -63,14 +65,14 @@ void POP3viewItem::refresh() | |||
63 | { | 65 | { |
64 | if (account->getOffline()) return; | 66 | if (account->getOffline()) return; |
65 | QValueList<FolderP> *folders = wrapper->listFolders(); | 67 | Q3ValueList<FolderP> *folders = wrapper->listFolders(); |
66 | QListViewItem *child = firstChild(); | 68 | Q3ListViewItem *child = firstChild(); |
67 | while ( child ) | 69 | while ( child ) |
68 | { | 70 | { |
69 | QListViewItem *tmp = child; | 71 | Q3ListViewItem *tmp = child; |
70 | child = child->nextSibling(); | 72 | child = child->nextSibling(); |
71 | delete tmp; | 73 | delete tmp; |
72 | } | 74 | } |
73 | QValueList<FolderP>::ConstIterator it; | 75 | Q3ValueList<FolderP>::ConstIterator it; |
74 | QListViewItem*item = 0; | 76 | Q3ListViewItem*item = 0; |
75 | for ( it = folders->begin(); it!=folders->end(); ++it) | 77 | for ( it = folders->begin(); it!=folders->end(); ++it) |
76 | { | 78 | { |
@@ -87,7 +89,7 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail ) | |||
87 | } | 89 | } |
88 | 90 | ||
89 | QPopupMenu * POP3viewItem::getContextMenu() | 91 | Q3PopupMenu * POP3viewItem::getContextMenu() |
90 | { | 92 | { |
91 | QPopupMenu *m = new QPopupMenu(0); | 93 | Q3PopupMenu *m = new Q3PopupMenu(0); |
92 | if (m) | 94 | if (m) |
93 | { | 95 | { |
@@ -109,8 +111,8 @@ QPopupMenu * POP3viewItem::getContextMenu() | |||
109 | void POP3viewItem::disconnect() | 111 | void POP3viewItem::disconnect() |
110 | { | 112 | { |
111 | QListViewItem *child = firstChild(); | 113 | Q3ListViewItem *child = firstChild(); |
112 | while ( child ) | 114 | while ( child ) |
113 | { | 115 | { |
114 | QListViewItem *tmp = child; | 116 | Q3ListViewItem *tmp = child; |
115 | child = child->nextSibling(); | 117 | child = child->nextSibling(); |
116 | delete tmp; | 118 | delete tmp; |
@@ -158,5 +160,5 @@ POP3folderItem::~POP3folderItem() | |||
158 | {} | 160 | {} |
159 | 161 | ||
160 | POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after ) | 162 | POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , Q3ListViewItem*after ) |
161 | : AccountViewItem(folderInit,parent,after ) | 163 | : AccountViewItem(folderInit,parent,after ) |
162 | { | 164 | { |
@@ -173,5 +175,5 @@ POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , | |||
173 | } | 175 | } |
174 | 176 | ||
175 | void POP3folderItem::refresh(QValueList<RecMailP>&target) | 177 | void POP3folderItem::refresh(Q3ValueList<RecMailP>&target) |
176 | { | 178 | { |
177 | if (folder->may_select()) | 179 | if (folder->may_select()) |
@@ -184,7 +186,7 @@ RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail) | |||
184 | } | 186 | } |
185 | 187 | ||
186 | QPopupMenu * POP3folderItem::getContextMenu() | 188 | Q3PopupMenu * POP3folderItem::getContextMenu() |
187 | { | 189 | { |
188 | QPopupMenu *m = new QPopupMenu(0); | 190 | Q3PopupMenu *m = new Q3PopupMenu(0); |
189 | if (m) | 191 | if (m) |
190 | { | 192 | { |
@@ -262,5 +264,5 @@ AbstractMail *NNTPviewItem::getWrapper() | |||
262 | } | 264 | } |
263 | 265 | ||
264 | void NNTPviewItem::refresh( QValueList<RecMailP> & ) | 266 | void NNTPviewItem::refresh( Q3ValueList<RecMailP> & ) |
265 | { | 267 | { |
266 | refresh(); | 268 | refresh(); |
@@ -270,15 +272,15 @@ void NNTPviewItem::refresh() | |||
270 | { | 272 | { |
271 | if (account->getOffline()) return; | 273 | if (account->getOffline()) return; |
272 | QValueList<FolderP> *folders = wrapper->listFolders(); | 274 | Q3ValueList<FolderP> *folders = wrapper->listFolders(); |
273 | 275 | ||
274 | QListViewItem *child = firstChild(); | 276 | Q3ListViewItem *child = firstChild(); |
275 | while ( child ) | 277 | while ( child ) |
276 | { | 278 | { |
277 | QListViewItem *tmp = child; | 279 | Q3ListViewItem *tmp = child; |
278 | child = child->nextSibling(); | 280 | child = child->nextSibling(); |
279 | delete tmp; | 281 | delete tmp; |
280 | } | 282 | } |
281 | QValueList<FolderP>::ConstIterator it; | 283 | Q3ValueList<FolderP>::ConstIterator it; |
282 | QListViewItem*item = 0; | 284 | Q3ListViewItem*item = 0; |
283 | for ( it = folders->begin(); it!=folders->end(); ++it) | 285 | for ( it = folders->begin(); it!=folders->end(); ++it) |
284 | { | 286 | { |
@@ -295,7 +297,7 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) | |||
295 | } | 297 | } |
296 | 298 | ||
297 | QPopupMenu * NNTPviewItem::getContextMenu() | 299 | Q3PopupMenu * NNTPviewItem::getContextMenu() |
298 | { | 300 | { |
299 | QPopupMenu *m = new QPopupMenu(0); | 301 | Q3PopupMenu *m = new Q3PopupMenu(0); |
300 | if (m) | 302 | if (m) |
301 | { | 303 | { |
@@ -327,8 +329,8 @@ void NNTPviewItem::subscribeGroups() | |||
327 | void NNTPviewItem::disconnect() | 329 | void NNTPviewItem::disconnect() |
328 | { | 330 | { |
329 | QListViewItem *child = firstChild(); | 331 | Q3ListViewItem *child = firstChild(); |
330 | while ( child ) | 332 | while ( child ) |
331 | { | 333 | { |
332 | QListViewItem *tmp = child; | 334 | Q3ListViewItem *tmp = child; |
333 | child = child->nextSibling(); | 335 | child = child->nextSibling(); |
334 | delete tmp; | 336 | delete tmp; |
@@ -369,5 +371,5 @@ NNTPfolderItem::~NNTPfolderItem() | |||
369 | {} | 371 | {} |
370 | 372 | ||
371 | NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after ) | 373 | NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , Q3ListViewItem*after ) |
372 | : AccountViewItem( folderInit, parent,after ) | 374 | : AccountViewItem( folderInit, parent,after ) |
373 | { | 375 | { |
@@ -384,5 +386,5 @@ NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent | |||
384 | } | 386 | } |
385 | 387 | ||
386 | void NNTPfolderItem::refresh(QValueList<RecMailP>&target) | 388 | void NNTPfolderItem::refresh(Q3ValueList<RecMailP>&target) |
387 | { | 389 | { |
388 | if (folder->may_select()) | 390 | if (folder->may_select()) |
@@ -395,7 +397,7 @@ RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail) | |||
395 | } | 397 | } |
396 | 398 | ||
397 | QPopupMenu * NNTPfolderItem::getContextMenu() | 399 | Q3PopupMenu * NNTPfolderItem::getContextMenu() |
398 | { | 400 | { |
399 | QPopupMenu *m = new QPopupMenu(0); | 401 | Q3PopupMenu *m = new Q3PopupMenu(0); |
400 | if (m) | 402 | if (m) |
401 | { | 403 | { |
@@ -454,5 +456,5 @@ AbstractMail *IMAPviewItem::getWrapper() | |||
454 | } | 456 | } |
455 | 457 | ||
456 | void IMAPviewItem::refresh(QValueList<RecMailP>&) | 458 | void IMAPviewItem::refresh(Q3ValueList<RecMailP>&) |
457 | { | 459 | { |
458 | refreshFolders(false); | 460 | refreshFolders(false); |
@@ -471,9 +473,9 @@ void IMAPviewItem::refreshFolders(bool force) | |||
471 | removeChilds(); | 473 | removeChilds(); |
472 | currentFolders.clear(); | 474 | currentFolders.clear(); |
473 | QValueList<FolderP> * folders = wrapper->listFolders(); | 475 | Q3ValueList<FolderP> * folders = wrapper->listFolders(); |
474 | 476 | ||
475 | QValueList<FolderP>::Iterator it; | 477 | Q3ValueList<FolderP>::Iterator it; |
476 | QListViewItem*item = 0; | 478 | Q3ListViewItem*item = 0; |
477 | QListViewItem*titem = 0; | 479 | Q3ListViewItem*titem = 0; |
478 | QString fname,del,search; | 480 | QString fname,del,search; |
479 | int pos; | 481 | int pos; |
@@ -514,7 +516,7 @@ void IMAPviewItem::refreshFolders(bool force) | |||
514 | } | 516 | } |
515 | 517 | ||
516 | QPopupMenu * IMAPviewItem::getContextMenu() | 518 | Q3PopupMenu * IMAPviewItem::getContextMenu() |
517 | { | 519 | { |
518 | QPopupMenu *m = new QPopupMenu(0); | 520 | Q3PopupMenu *m = new Q3PopupMenu(0); |
519 | if (m) | 521 | if (m) |
520 | { | 522 | { |
@@ -616,5 +618,5 @@ bool IMAPviewItem::offline() | |||
616 | } | 618 | } |
617 | 619 | ||
618 | IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , QListViewItem*after ) | 620 | IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , Q3ListViewItem*after ) |
619 | : AccountViewItem( folderInit, parent , after ) | 621 | : AccountViewItem( folderInit, parent , after ) |
620 | { | 622 | { |
@@ -631,5 +633,5 @@ IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent | |||
631 | } | 633 | } |
632 | 634 | ||
633 | IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ) | 635 | IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , Q3ListViewItem*after, IMAPviewItem *master ) |
634 | : AccountViewItem(folderInit, parent,after ) | 636 | : AccountViewItem(folderInit, parent,after ) |
635 | { | 637 | { |
@@ -654,5 +656,5 @@ const QString& IMAPfolderItem::Delemiter()const | |||
654 | } | 656 | } |
655 | 657 | ||
656 | void IMAPfolderItem::refresh(QValueList<RecMailP>&target) | 658 | void IMAPfolderItem::refresh(Q3ValueList<RecMailP>&target) |
657 | { | 659 | { |
658 | if (folder->may_select()) | 660 | if (folder->may_select()) |
@@ -671,7 +673,7 @@ RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail) | |||
671 | } | 673 | } |
672 | 674 | ||
673 | QPopupMenu * IMAPfolderItem::getContextMenu() | 675 | Q3PopupMenu * IMAPfolderItem::getContextMenu() |
674 | { | 676 | { |
675 | QPopupMenu *m = new QPopupMenu(0); | 677 | Q3PopupMenu *m = new Q3PopupMenu(0); |
676 | if (m) | 678 | if (m) |
677 | { | 679 | { |
@@ -722,5 +724,5 @@ void IMAPfolderItem::deleteFolder() | |||
722 | if (imap->getWrapper()->deleteMbox(folder)) | 724 | if (imap->getWrapper()->deleteMbox(folder)) |
723 | { | 725 | { |
724 | QListView*v=listView(); | 726 | Q3ListView*v=listView(); |
725 | IMAPviewItem * box = imap; | 727 | IMAPviewItem * box = imap; |
726 | /* be carefull - after that this object is destroyd so don't use | 728 | /* be carefull - after that this object is destroyd so don't use |
@@ -801,5 +803,5 @@ AbstractMail *MHviewItem::getWrapper() | |||
801 | } | 803 | } |
802 | 804 | ||
803 | void MHviewItem::refresh( QValueList<RecMailP> & target) | 805 | void MHviewItem::refresh( Q3ValueList<RecMailP> & target) |
804 | { | 806 | { |
805 | refresh(false); | 807 | refresh(false); |
@@ -812,6 +814,6 @@ void MHviewItem::refresh(bool force) | |||
812 | removeChilds(); | 814 | removeChilds(); |
813 | currentFolders.clear(); | 815 | currentFolders.clear(); |
814 | QValueList<FolderP> *folders = wrapper->listFolders(); | 816 | Q3ValueList<FolderP> *folders = wrapper->listFolders(); |
815 | QValueList<FolderP>::ConstIterator it; | 817 | Q3ValueList<FolderP>::ConstIterator it; |
816 | MHfolderItem*item = 0; | 818 | MHfolderItem*item = 0; |
817 | MHfolderItem*pmaster = 0; | 819 | MHfolderItem*pmaster = 0; |
@@ -858,7 +860,7 @@ RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) | |||
858 | } | 860 | } |
859 | 861 | ||
860 | QPopupMenu * MHviewItem::getContextMenu() | 862 | Q3PopupMenu * MHviewItem::getContextMenu() |
861 | { | 863 | { |
862 | QPopupMenu *m = new QPopupMenu(0); | 864 | Q3PopupMenu *m = new Q3PopupMenu(0); |
863 | if (m) | 865 | if (m) |
864 | { | 866 | { |
@@ -921,5 +923,5 @@ MHfolderItem::~MHfolderItem() | |||
921 | {} | 923 | {} |
922 | 924 | ||
923 | MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after ) | 925 | MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , Q3ListViewItem*after ) |
924 | : AccountViewItem(folderInit, parent,after ) | 926 | : AccountViewItem(folderInit, parent,after ) |
925 | { | 927 | { |
@@ -928,5 +930,5 @@ MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QLis | |||
928 | } | 930 | } |
929 | 931 | ||
930 | MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master) | 932 | MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, Q3ListViewItem*after, MHviewItem*master) |
931 | : AccountViewItem(folderInit, parent,after ) | 933 | : AccountViewItem(folderInit, parent,after ) |
932 | { | 934 | { |
@@ -968,5 +970,5 @@ const FolderP&MHfolderItem::getFolder()const | |||
968 | } | 970 | } |
969 | 971 | ||
970 | void MHfolderItem::refresh(QValueList<RecMailP>&target) | 972 | void MHfolderItem::refresh(Q3ValueList<RecMailP>&target) |
971 | { | 973 | { |
972 | if (folder->may_select()) | 974 | if (folder->may_select()) |
@@ -990,5 +992,5 @@ void MHfolderItem::deleteFolder() | |||
990 | if (mbox->getWrapper()->deleteMbox(folder)) | 992 | if (mbox->getWrapper()->deleteMbox(folder)) |
991 | { | 993 | { |
992 | QListView*v=listView(); | 994 | Q3ListView*v=listView(); |
993 | MHviewItem * box = mbox; | 995 | MHviewItem * box = mbox; |
994 | /* be carefull - after that this object is destroyd so don't use | 996 | /* be carefull - after that this object is destroyd so don't use |
@@ -1003,7 +1005,7 @@ void MHfolderItem::deleteFolder() | |||
1003 | } | 1005 | } |
1004 | 1006 | ||
1005 | QPopupMenu * MHfolderItem::getContextMenu() | 1007 | Q3PopupMenu * MHfolderItem::getContextMenu() |
1006 | { | 1008 | { |
1007 | QPopupMenu *m = new QPopupMenu(0); | 1009 | Q3PopupMenu *m = new Q3PopupMenu(0); |
1008 | if (m) | 1010 | if (m) |
1009 | { | 1011 | { |
@@ -1032,5 +1034,5 @@ void MHfolderItem::createFolder() | |||
1032 | if (mbox->getWrapper()->createMbox(ndir,folder)) | 1034 | if (mbox->getWrapper()->createMbox(ndir,folder)) |
1033 | { | 1035 | { |
1034 | QListView*v=listView(); | 1036 | Q3ListView*v=listView(); |
1035 | MHviewItem * box = mbox; | 1037 | MHviewItem * box = mbox; |
1036 | /* be carefull - after that this object is destroyd so don't use | 1038 | /* be carefull - after that this object is destroyd so don't use |
@@ -1079,5 +1081,5 @@ const QString AccountViewItem::contextName="AccountViewItem"; | |||
1079 | 1081 | ||
1080 | AccountViewItem::AccountViewItem( AccountView *parent ) | 1082 | AccountViewItem::AccountViewItem( AccountView *parent ) |
1081 | : QListViewItem( parent ) | 1083 | : Q3ListViewItem( parent ) |
1082 | { | 1084 | { |
1083 | init(); | 1085 | init(); |
@@ -1085,18 +1087,18 @@ AccountViewItem::AccountViewItem( AccountView *parent ) | |||
1085 | } | 1087 | } |
1086 | 1088 | ||
1087 | AccountViewItem::AccountViewItem( QListViewItem *parent) | 1089 | AccountViewItem::AccountViewItem( Q3ListViewItem *parent) |
1088 | : QListViewItem( parent),folder(0) | 1090 | : Q3ListViewItem( parent),folder(0) |
1089 | { | 1091 | { |
1090 | init(); | 1092 | init(); |
1091 | } | 1093 | } |
1092 | 1094 | ||
1093 | AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after ) | 1095 | AccountViewItem::AccountViewItem( Q3ListViewItem *parent , Q3ListViewItem*after ) |
1094 | :QListViewItem( parent,after ),folder(0) | 1096 | :Q3ListViewItem( parent,after ),folder(0) |
1095 | { | 1097 | { |
1096 | init(); | 1098 | init(); |
1097 | } | 1099 | } |
1098 | 1100 | ||
1099 | AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ) | 1101 | AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,Q3ListViewItem *parent , Q3ListViewItem*after ) |
1100 | :QListViewItem( parent,after ),folder(folderInit) | 1102 | :Q3ListViewItem( parent,after ),folder(folderInit) |
1101 | { | 1103 | { |
1102 | init(); | 1104 | init(); |
@@ -1141,8 +1143,8 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder) | |||
1141 | void AccountViewItem::removeChilds() | 1143 | void AccountViewItem::removeChilds() |
1142 | { | 1144 | { |
1143 | QListViewItem *child = firstChild(); | 1145 | Q3ListViewItem *child = firstChild(); |
1144 | while ( child ) | 1146 | while ( child ) |
1145 | { | 1147 | { |
1146 | QListViewItem *tmp = child; | 1148 | Q3ListViewItem *tmp = child; |
1147 | child = child->nextSibling(); | 1149 | child = child->nextSibling(); |
1148 | delete tmp; | 1150 | delete tmp; |