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 @@
 
 /* QT */
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -55,5 +57,5 @@ AbstractMail *POP3viewItem::getWrapper()
 }
 
-void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & )
+void POP3viewItem::refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > & )
 {
     refresh();
@@ -63,14 +65,14 @@ void POP3viewItem::refresh()
 {
     if (account->getOffline()) return;
-    QValueList<FolderP> *folders = wrapper->listFolders();
-    QListViewItem *child = firstChild();
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
-    QValueList<FolderP>::ConstIterator it;
-    QListViewItem*item = 0;
+    Q3ValueList<FolderP>::ConstIterator it;
+    Q3ListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
@@ -87,7 +89,7 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 }
 
-QPopupMenu * POP3viewItem::getContextMenu()
+Q3PopupMenu * POP3viewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -109,8 +111,8 @@ QPopupMenu * POP3viewItem::getContextMenu()
 void POP3viewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
@@ -158,5 +160,5 @@ POP3folderItem::~POP3folderItem()
 {}
 
-POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
+POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit,parent,after )
 {
@@ -173,5 +175,5 @@ POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent ,
 }
 
-void POP3folderItem::refresh(QValueList<RecMailP>&target)
+void POP3folderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
@@ -184,7 +186,7 @@ RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 }
 
-QPopupMenu * POP3folderItem::getContextMenu()
+Q3PopupMenu * POP3folderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -262,5 +264,5 @@ AbstractMail *NNTPviewItem::getWrapper()
 }
 
-void NNTPviewItem::refresh( QValueList<RecMailP> & )
+void NNTPviewItem::refresh( Q3ValueList<RecMailP> & )
 {
     refresh();
@@ -270,15 +272,15 @@ void NNTPviewItem::refresh()
 {
     if (account->getOffline()) return;
-    QValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
 
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
-    QValueList<FolderP>::ConstIterator it;
-    QListViewItem*item = 0;
+    Q3ValueList<FolderP>::ConstIterator it;
+    Q3ListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
@@ -295,7 +297,7 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 }
 
-QPopupMenu * NNTPviewItem::getContextMenu()
+Q3PopupMenu * NNTPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -327,8 +329,8 @@ void NNTPviewItem::subscribeGroups()
 void NNTPviewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
@@ -369,5 +371,5 @@ NNTPfolderItem::~NNTPfolderItem()
 {}
 
-NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after  )
+NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem( folderInit, parent,after )
 {
@@ -384,5 +386,5 @@ NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent
 }
 
-void NNTPfolderItem::refresh(QValueList<RecMailP>&target)
+void NNTPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
@@ -395,7 +397,7 @@ RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
 }
 
-QPopupMenu * NNTPfolderItem::getContextMenu()
+Q3PopupMenu * NNTPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -454,5 +456,5 @@ AbstractMail *IMAPviewItem::getWrapper()
 }
 
-void IMAPviewItem::refresh(QValueList<RecMailP>&)
+void IMAPviewItem::refresh(Q3ValueList<RecMailP>&)
 {
     refreshFolders(false);
@@ -471,9 +473,9 @@ void IMAPviewItem::refreshFolders(bool force)
     removeChilds();
     currentFolders.clear();
-    QValueList<FolderP> * folders = wrapper->listFolders();
+    Q3ValueList<FolderP> * folders = wrapper->listFolders();
 
-    QValueList<FolderP>::Iterator it;
-    QListViewItem*item = 0;
-    QListViewItem*titem = 0;
+    Q3ValueList<FolderP>::Iterator it;
+    Q3ListViewItem*item = 0;
+    Q3ListViewItem*titem = 0;
     QString fname,del,search;
     int pos;
@@ -514,7 +516,7 @@ void IMAPviewItem::refreshFolders(bool force)
 }
 
-QPopupMenu * IMAPviewItem::getContextMenu()
+Q3PopupMenu * IMAPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -616,5 +618,5 @@ bool IMAPviewItem::offline()
 }
 
-IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , QListViewItem*after )
+IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , Q3ListViewItem*after )
         : AccountViewItem( folderInit, parent , after )
 {
@@ -631,5 +633,5 @@ IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent
 }
 
-IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  )
+IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , Q3ListViewItem*after, IMAPviewItem *master  )
         : AccountViewItem(folderInit, parent,after )
 {
@@ -654,5 +656,5 @@ const QString& IMAPfolderItem::Delemiter()const
 }
 
-void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
+void IMAPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
@@ -671,7 +673,7 @@ RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 }
 
-QPopupMenu * IMAPfolderItem::getContextMenu()
+Q3PopupMenu * IMAPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -722,5 +724,5 @@ void IMAPfolderItem::deleteFolder()
         if (imap->getWrapper()->deleteMbox(folder))
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             IMAPviewItem * box = imap;
             /* be carefull - after that this object is destroyd so don't use
@@ -801,5 +803,5 @@ AbstractMail *MHviewItem::getWrapper()
 }
 
-void MHviewItem::refresh( QValueList<RecMailP> & target)
+void MHviewItem::refresh( Q3ValueList<RecMailP> & target)
 {
     refresh(false);
@@ -812,6 +814,6 @@ void MHviewItem::refresh(bool force)
     removeChilds();
     currentFolders.clear();
-    QValueList<FolderP> *folders = wrapper->listFolders();
-    QValueList<FolderP>::ConstIterator it;
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ValueList<FolderP>::ConstIterator it;
     MHfolderItem*item = 0;
     MHfolderItem*pmaster = 0;
@@ -858,7 +860,7 @@ RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 }
 
-QPopupMenu * MHviewItem::getContextMenu()
+Q3PopupMenu * MHviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -921,5 +923,5 @@ MHfolderItem::~MHfolderItem()
 {}
 
-MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after  )
+MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit, parent,after )
 {
@@ -928,5 +930,5 @@ MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QLis
 }
 
-MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master)
+MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, Q3ListViewItem*after, MHviewItem*master)
         : AccountViewItem(folderInit, parent,after )
 {
@@ -968,5 +970,5 @@ const FolderP&MHfolderItem::getFolder()const
 }
 
-void MHfolderItem::refresh(QValueList<RecMailP>&target)
+void MHfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
@@ -990,5 +992,5 @@ void MHfolderItem::deleteFolder()
         if (mbox->getWrapper()->deleteMbox(folder))
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
@@ -1003,7 +1005,7 @@ void MHfolderItem::deleteFolder()
 }
 
-QPopupMenu * MHfolderItem::getContextMenu()
+Q3PopupMenu * MHfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
@@ -1032,5 +1034,5 @@ void MHfolderItem::createFolder()
         if (mbox->getWrapper()->createMbox(ndir,folder))
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
@@ -1079,5 +1081,5 @@ const QString AccountViewItem::contextName="AccountViewItem";
 
 AccountViewItem::AccountViewItem( AccountView *parent )
-        : QListViewItem( parent )
+        : Q3ListViewItem( parent )
 {
     init();
@@ -1085,18 +1087,18 @@ AccountViewItem::AccountViewItem( AccountView *parent )
 }
 
-AccountViewItem::AccountViewItem( QListViewItem *parent)
-        : QListViewItem( parent),folder(0)
+AccountViewItem::AccountViewItem( Q3ListViewItem *parent)
+        : Q3ListViewItem( parent),folder(0)
 {
     init();
 }
 
-AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
-        :QListViewItem( parent,after ),folder(0)
+AccountViewItem::AccountViewItem( Q3ListViewItem *parent , Q3ListViewItem*after  )
+        :Q3ListViewItem( parent,after ),folder(0)
 {
     init();
 }
 
-AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  )
-       :QListViewItem( parent,after ),folder(folderInit)
+AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,Q3ListViewItem *parent , Q3ListViewItem*after  )
+       :Q3ListViewItem( parent,after ),folder(folderInit)
 {
     init();
@@ -1141,8 +1143,8 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
 void AccountViewItem::removeChilds()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;