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
@@ -14,4 +14,6 @@
 /* QT */
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kiconloader.h>
@@ -56,3 +58,3 @@ AbstractMail *POP3viewItem::getWrapper()
 
-void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & )
+void POP3viewItem::refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > & )
 {
@@ -64,7 +66,7 @@ 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();
@@ -72,4 +74,4 @@ void POP3viewItem::refresh()
     }
-    QValueList<FolderP>::ConstIterator it;
-    QListViewItem*item = 0;
+    Q3ValueList<FolderP>::ConstIterator it;
+    Q3ListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
@@ -88,5 +90,5 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 
-QPopupMenu * POP3viewItem::getContextMenu()
+Q3PopupMenu * POP3viewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -110,6 +112,6 @@ void POP3viewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
@@ -159,3 +161,3 @@ POP3folderItem::~POP3folderItem()
 
-POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
+POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit,parent,after )
@@ -174,3 +176,3 @@ POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent ,
 
-void POP3folderItem::refresh(QValueList<RecMailP>&target)
+void POP3folderItem::refresh(Q3ValueList<RecMailP>&target)
 {
@@ -185,5 +187,5 @@ RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 
-QPopupMenu * POP3folderItem::getContextMenu()
+Q3PopupMenu * POP3folderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -263,3 +265,3 @@ AbstractMail *NNTPviewItem::getWrapper()
 
-void NNTPviewItem::refresh( QValueList<RecMailP> & )
+void NNTPviewItem::refresh( Q3ValueList<RecMailP> & )
 {
@@ -271,8 +273,8 @@ 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();
@@ -280,4 +282,4 @@ void NNTPviewItem::refresh()
     }
-    QValueList<FolderP>::ConstIterator it;
-    QListViewItem*item = 0;
+    Q3ValueList<FolderP>::ConstIterator it;
+    Q3ListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
@@ -296,5 +298,5 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 
-QPopupMenu * NNTPviewItem::getContextMenu()
+Q3PopupMenu * NNTPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -328,6 +330,6 @@ void NNTPviewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
@@ -370,3 +372,3 @@ NNTPfolderItem::~NNTPfolderItem()
 
-NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after  )
+NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem( folderInit, parent,after )
@@ -385,3 +387,3 @@ NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent
 
-void NNTPfolderItem::refresh(QValueList<RecMailP>&target)
+void NNTPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
@@ -396,5 +398,5 @@ RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
 
-QPopupMenu * NNTPfolderItem::getContextMenu()
+Q3PopupMenu * NNTPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -455,3 +457,3 @@ AbstractMail *IMAPviewItem::getWrapper()
 
-void IMAPviewItem::refresh(QValueList<RecMailP>&)
+void IMAPviewItem::refresh(Q3ValueList<RecMailP>&)
 {
@@ -472,7 +474,7 @@ void IMAPviewItem::refreshFolders(bool force)
     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;
@@ -515,5 +517,5 @@ void IMAPviewItem::refreshFolders(bool force)
 
-QPopupMenu * IMAPviewItem::getContextMenu()
+Q3PopupMenu * IMAPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -617,3 +619,3 @@ 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 )
@@ -632,3 +634,3 @@ 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 )
@@ -655,3 +657,3 @@ const QString& IMAPfolderItem::Delemiter()const
 
-void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
+void IMAPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
@@ -672,5 +674,5 @@ RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 
-QPopupMenu * IMAPfolderItem::getContextMenu()
+Q3PopupMenu * IMAPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -723,3 +725,3 @@ void IMAPfolderItem::deleteFolder()
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             IMAPviewItem * box = imap;
@@ -802,3 +804,3 @@ AbstractMail *MHviewItem::getWrapper()
 
-void MHviewItem::refresh( QValueList<RecMailP> & target)
+void MHviewItem::refresh( Q3ValueList<RecMailP> & target)
 {
@@ -813,4 +815,4 @@ void MHviewItem::refresh(bool force)
     currentFolders.clear();
-    QValueList<FolderP> *folders = wrapper->listFolders();
-    QValueList<FolderP>::ConstIterator it;
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ValueList<FolderP>::ConstIterator it;
     MHfolderItem*item = 0;
@@ -859,5 +861,5 @@ RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 
-QPopupMenu * MHviewItem::getContextMenu()
+Q3PopupMenu * MHviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -922,3 +924,3 @@ MHfolderItem::~MHfolderItem()
 
-MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after  )
+MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit, parent,after )
@@ -929,3 +931,3 @@ 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 )
@@ -969,3 +971,3 @@ const FolderP&MHfolderItem::getFolder()const
 
-void MHfolderItem::refresh(QValueList<RecMailP>&target)
+void MHfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
@@ -991,3 +993,3 @@ void MHfolderItem::deleteFolder()
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             MHviewItem * box = mbox;
@@ -1004,5 +1006,5 @@ void MHfolderItem::deleteFolder()
 
-QPopupMenu * MHfolderItem::getContextMenu()
+Q3PopupMenu * MHfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
@@ -1033,3 +1035,3 @@ void MHfolderItem::createFolder()
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             MHviewItem * box = mbox;
@@ -1080,3 +1082,3 @@ const QString AccountViewItem::contextName="AccountViewItem";
 AccountViewItem::AccountViewItem( AccountView *parent )
-        : QListViewItem( parent )
+        : Q3ListViewItem( parent )
 {
@@ -1086,4 +1088,4 @@ AccountViewItem::AccountViewItem( AccountView *parent )
 
-AccountViewItem::AccountViewItem( QListViewItem *parent)
-        : QListViewItem( parent),folder(0)
+AccountViewItem::AccountViewItem( Q3ListViewItem *parent)
+        : Q3ListViewItem( parent),folder(0)
 {
@@ -1092,4 +1094,4 @@ AccountViewItem::AccountViewItem( QListViewItem *parent)
 
-AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
-        :QListViewItem( parent,after ),folder(0)
+AccountViewItem::AccountViewItem( Q3ListViewItem *parent , Q3ListViewItem*after  )
+        :Q3ListViewItem( parent,after ),folder(0)
 {
@@ -1098,4 +1100,4 @@ AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
 
-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)
 {
@@ -1142,6 +1144,6 @@ void AccountViewItem::removeChilds()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();