1 files changed, 33 insertions, 30 deletions

diff --git a/kmicromail/accountitem.h b/kmicromail/accountitem.h
index 4c92bfc..bbfd05f 100644
--- a/kmicromail/accountitem.h
+++ b/kmicromail/accountitem.h
@@ -2,15 +2,18 @@
 #define __ACCOUNT_ITEM
 
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PopupMenu>
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailwrapper.h>
 
 class POP3wrapper;
 class RecMail;
 class RecBody;
-class QPopupMenu;
+class Q3PopupMenu;
 class Selectstore;
 class AccountView;
 class POP3account;
@@ -21,19 +24,19 @@ class Folder;
 
 #define RECBODYP Opie::Core::OSmartPointer<RecBody>
 
-class AccountViewItem : public QListViewItem
+class AccountViewItem : public Q3ListViewItem
 {
 
 public:
     AccountViewItem( AccountView *parent );
-    AccountViewItem( QListViewItem *parent);
-    AccountViewItem( QListViewItem *parent , QListViewItem*after  );
-    AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  );
+    AccountViewItem( Q3ListViewItem *parent);
+    AccountViewItem( Q3ListViewItem *parent , Q3ListViewItem*after  );
+    AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,Q3ListViewItem *parent , Q3ListViewItem*after  );
 
     virtual ~AccountViewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
-    virtual QPopupMenu * getContextMenu(){return 0;};
+    virtual Q3PopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
     virtual AccountView*accountView();
     virtual bool matchName(const QString&name)const;
@@ -56,10 +59,10 @@ class POP3viewItem : public AccountViewItem
 public:
     POP3viewItem( POP3account *a, AccountView *parent );
     virtual ~POP3viewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
@@ -74,11 +77,11 @@ class POP3folderItem : public AccountViewItem
 {
 
 public:
-    POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after  );
+    POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , Q3ListViewItem*after  );
     virtual ~POP3folderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
@@ -93,10 +96,10 @@ class NNTPviewItem : public AccountViewItem
 public:
     NNTPviewItem( NNTPaccount *a, AccountView *parent );
     virtual ~NNTPviewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
@@ -112,11 +115,11 @@ class NNTPfolderItem : public AccountViewItem
 {
 
 public:
-    NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after  );
+    NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , Q3ListViewItem*after  );
     virtual ~NNTPfolderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
@@ -132,10 +135,10 @@ class IMAPviewItem : public AccountViewItem
 public:
     IMAPviewItem( IMAPaccount *a, AccountView *parent );
     virtual ~IMAPviewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     const QStringList&subFolders();
     virtual void refreshFolders(bool force=false);
@@ -152,12 +155,12 @@ class IMAPfolderItem : public AccountViewItem
 {
 
 public:
-    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after  );
-    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
+    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , Q3ListViewItem*after  );
+    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , Q3ListViewItem*after, IMAPviewItem *master  );
     virtual ~IMAPfolderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const QString& Delemiter()const;
 protected:
@@ -174,10 +177,10 @@ class MHviewItem : public AccountViewItem
 public:
     MHviewItem( const QString&aMboxPath, AccountView *parent );
     virtual ~MHviewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     QStringList subFolders();
     virtual void refresh(bool force=false);
@@ -194,12 +197,12 @@ class MHfolderItem : public AccountViewItem
 {
 
 public:
-    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after  );
-    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
+    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , Q3ListViewItem*after  );
+    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, Q3ListViewItem*after, MHviewItem*master);
     virtual ~MHfolderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const;
     virtual bool isDraftfolder();