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
@@ -9,14 +9,16 @@
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailwrapper.h>
 /* OPIE */
 //#include <qpe/qpeapplication.h>
 
 /* QT */
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #define GET_NEW_MAILS 101
 
 using namespace Opie::Core;
@@ -51,30 +53,30 @@ POP3viewItem::~POP3viewItem()
 
 AbstractMail *POP3viewItem::getWrapper()
 {
     return wrapper;
 }
 
-void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & )
+void POP3viewItem::refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > & )
 {
     refresh();
 }
 
 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)
     {
         item = new POP3folderItem( (*it), this , item );
         item->setSelectable( (*it)->may_select());
     }
     delete folders;
@@ -83,15 +85,15 @@ void POP3viewItem::refresh()
 RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 {
   
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * POP3viewItem::getContextMenu()
+Q3PopupMenu * POP3viewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
             m->insertItem(i18n("Disconnect"),0);
@@ -105,16 +107,16 @@ QPopupMenu * POP3viewItem::getContextMenu()
     }
     return m;
 }
 
 void POP3viewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     wrapper->logout();
 }
 
@@ -154,13 +156,13 @@ void POP3viewItem::contextMenuSelected(int which)
     }
 }
 
 POP3folderItem::~POP3folderItem()
 {}
 
-POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
+POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit,parent,after )
 {
     pop3 = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_POP3FOLDER );
@@ -169,26 +171,26 @@ POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent ,
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
-void POP3folderItem::refresh(QValueList<RecMailP>&target)
+void POP3folderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
         pop3->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 {
     return pop3->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * POP3folderItem::getContextMenu()
+Q3PopupMenu * POP3folderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
         m->insertItem(i18n("Refresh header list"),0);
         m->insertItem(i18n("Delete all mails"),1);
         m->insertItem(i18n("Move/Copie all mails"),2);
@@ -258,31 +260,31 @@ NNTPviewItem::~NNTPviewItem()
 
 AbstractMail *NNTPviewItem::getWrapper()
 {
     return wrapper;
 }
 
-void NNTPviewItem::refresh( QValueList<RecMailP> & )
+void NNTPviewItem::refresh( Q3ValueList<RecMailP> & )
 {
     refresh();
 }
 
 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)
     {
         item = new NNTPfolderItem( (*it), this , item );
         item->setSelectable( (*it)->may_select());
     }
     delete folders;
@@ -291,15 +293,15 @@ void NNTPviewItem::refresh()
 RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 {
  
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * NNTPviewItem::getContextMenu()
+Q3PopupMenu * NNTPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(i18n("Disconnect"),0);
             m->insertItem(i18n("Set offline"),1);
@@ -323,16 +325,16 @@ void NNTPviewItem::subscribeGroups()
         refresh();
     }
 }
 
 void NNTPviewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     wrapper->logout();
 }
 
@@ -365,13 +367,13 @@ void NNTPviewItem::contextMenuSelected(int which)
     }
 }
 
 NNTPfolderItem::~NNTPfolderItem()
 {}
 
-NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after  )
+NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem( folderInit, parent,after )
 {
     nntp = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_POP3FOLDER );
@@ -380,26 +382,26 @@ NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
-void NNTPfolderItem::refresh(QValueList<RecMailP>&target)
+void NNTPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
         nntp->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return nntp->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * NNTPfolderItem::getContextMenu()
+Q3PopupMenu * NNTPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Refresh header list"),0);
         m->insertItem(i18n("Copy all postings"),1);
     }
     return m;
@@ -450,13 +452,13 @@ IMAPviewItem::~IMAPviewItem()
 
 AbstractMail *IMAPviewItem::getWrapper()
 {
     return wrapper;
 }
 
-void IMAPviewItem::refresh(QValueList<RecMailP>&)
+void IMAPviewItem::refresh(Q3ValueList<RecMailP>&)
 {
     refreshFolders(false);
 }
 
 const QStringList&IMAPviewItem::subFolders()
 {
@@ -467,17 +469,17 @@ void IMAPviewItem::refreshFolders(bool force)
 {
     if (childCount()>0 && force==false) return;
     if (account->getOffline()) return;
 
     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;
 
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         if ((*it)->getDisplayName().lower()=="inbox")
@@ -510,15 +512,15 @@ void IMAPviewItem::refreshFolders(bool force)
             item = new IMAPfolderItem( (*it), this , item );
         }
     }
     delete folders;
 }
 
-QPopupMenu * IMAPviewItem::getContextMenu()
+Q3PopupMenu * IMAPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
             m->insertItem(i18n("Refresh folder list"),0);
@@ -612,13 +614,13 @@ RECBODYP IMAPviewItem::fetchBody(const RecMailP&)
 
 bool IMAPviewItem::offline()
 {
     return account->getOffline();
 }
 
-IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , QListViewItem*after )
+IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , Q3ListViewItem*after )
         : AccountViewItem( folderInit, parent , after )
 {
     imap = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
@@ -627,13 +629,13 @@ IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
-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 )
 {
     imap = master;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
@@ -650,13 +652,13 @@ IMAPfolderItem::~IMAPfolderItem()
 
 const QString& IMAPfolderItem::Delemiter()const
 {
     return folder->Separator();
 }
 
-void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
+void IMAPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
     {
         imap->getWrapper()->listMessages( folder->getName(),target );
     }
     else
@@ -667,15 +669,15 @@ void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
 
 RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return imap->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * IMAPfolderItem::getContextMenu()
+Q3PopupMenu * IMAPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (folder->may_select())
         {
             m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
             m->insertItem(i18n("Refresh header list"),0);
@@ -718,13 +720,13 @@ void IMAPfolderItem::deleteFolder()
                                      i18n("No"),QString::null,1,1);
    
     if (yesno == 0)
     {
         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
              * any member of it after that call!!*/
             imap->refreshFolders(true);
             if (v)
             {
@@ -797,25 +799,25 @@ MHviewItem::~MHviewItem()
 
 AbstractMail *MHviewItem::getWrapper()
 {
     return wrapper;
 }
 
-void MHviewItem::refresh( QValueList<RecMailP> & target)
+void MHviewItem::refresh( Q3ValueList<RecMailP> & target)
 {
     refresh(false);
     getWrapper()->listMessages( "",target );
 }
 
 void MHviewItem::refresh(bool force)
 {
     if (childCount()>0 && force==false) return;
     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;
     QString fname = "";
     int pos;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
@@ -854,15 +856,15 @@ void MHviewItem::refresh(bool force)
 RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 {
  
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * MHviewItem::getContextMenu()
+Q3PopupMenu * MHviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Refresh folder list"),0);
         m->insertItem(i18n("Create new folder"),1);
         m->insertItem(i18n("Delete all mails"),2);
         m->insertItem(i18n("Move/Copie all mails"),3);
@@ -917,20 +919,20 @@ void MHviewItem::contextMenuSelected(int which)
     }
 }
 
 MHfolderItem::~MHfolderItem()
 {}
 
-MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after  )
+MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit, parent,after )
 {
     mbox = parent;
     initName();
 }
 
-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 )
 {
     folder = folderInit;
     mbox = master;
     initName();
 }
@@ -964,13 +966,13 @@ void MHfolderItem::initName()
 
 const FolderP&MHfolderItem::getFolder()const
 {
     return folder;
 }
 
-void MHfolderItem::refresh(QValueList<RecMailP>&target)
+void MHfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
         mbox->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
@@ -986,28 +988,28 @@ void MHfolderItem::deleteFolder()
                                      i18n("No"),QString::null,1,1);
   
     if (yesno == 0)
     {
         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
              * any member of it after that call!!*/
             mbox->refresh(true);
             if (v)
             {
                 v->setSelected(box,true);
             }
         }
     }
 }
 
-QPopupMenu * MHfolderItem::getContextMenu()
+Q3PopupMenu * MHfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Move/Copie all mails"),2);
         m->insertItem(i18n("Delete all mails"),0);
         m->insertItem(i18n("Create new subfolder"),3);
         m->insertItem(i18n("Delete folder"),1);
@@ -1028,13 +1030,13 @@ void MHfolderItem::createFolder()
     //ndirdlg.showMaximized();
     if (ndirdlg.exec()  )
     {
         QString ndir = ndirdlg.Newdir();
         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
              * any member of it after that call!!*/
             mbox->refresh(true);
             if (v)
             {
@@ -1075,32 +1077,32 @@ bool MHfolderItem::isDraftfolder()
  * Generic stuff
  */
 
 const QString AccountViewItem::contextName="AccountViewItem";
 
 AccountViewItem::AccountViewItem( AccountView *parent )
-        : QListViewItem( parent )
+        : Q3ListViewItem( parent )
 {
     init();
     m_Backlink = 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();
 }
 
 void AccountViewItem::init()
 {
@@ -1137,16 +1139,16 @@ 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;
     }
 }
 
 bool AccountViewItem::matchName(const QString&name)const