initial public commit of qt4 portp1

25 files changed, 159 insertions, 115 deletions

diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 870985e..746d2ae 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -9,11 +9,13 @@
 
 
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <klocale.h>
 #include <kdecore/kstandarddirs.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
@@ -112,8 +114,8 @@ QString AbstractMail::gen_attachment_id()
 {
     QFile file( "/proc/sys/kernel/random/uuid" );
-    if (!file.open(IO_ReadOnly ) )
+    if (!file.open(QIODevice::ReadOnly ) )
         return QString::null;
 
-    QTextStream stream(&file);
+    Q3TextStream stream(&file);
 
     return "{" + stream.read().stripWhiteSpace() + "}";
@@ -139,8 +141,8 @@ QString AbstractMail::draftFolder()
 
 /* temporary - will be removed when implemented in all classes */
-void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
+void AbstractMail::deleteMails(const QString &,const Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
 }
-void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
+void AbstractMail::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
     //qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
@@ -148,5 +150,5 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
     int iii = 0;
     int count = target.count(); 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
@@ -178,5 +180,5 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
             return;
         }
-    QValueList<RecMailP> t;
+    Q3ValueList<RecMailP> t;
     listMessages(fromFolder->getName(),t,acc->getMaxMailSize() );
     if ( t.count() == 0 ) {
@@ -188,8 +190,8 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     qDebug(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
     qApp->processEvents();
-    QValueList<RecMailP> e;
+    Q3ValueList<RecMailP> e;
     targetMail->listMessages(lfName,e,acc->getMaxMailSize() );
     //qDebug("target has mails %d ", e.count());
-    QValueList<RecMailP> n; 
+    Q3ValueList<RecMailP> n; 
     int iii = 0;
     int count = t.count();  
@@ -222,5 +224,5 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     
 #if 0
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
  listMessages(fromFolder->getName(),t, maxSizeInKb);
  mvcpMailList( t,targetFolder,targetWrapper,moveit);
@@ -231,10 +233,10 @@ void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
     const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
 {
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
  listMessages(fromFolder->getName(),t, maxSizeInKb);
  mvcpMailList( t,targetFolder,targetWrapper,moveit);
 
 }
-void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
+void AbstractMail::mvcpMailList(const Q3ValueList<RecMailP>& t,
                                 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
@@ -247,5 +249,5 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
     // Global::statusMessage(i18n("Copy2 message %1").arg(iii)); displaye
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Copying..."));
     wid.show();
diff --git a/kmicromail/libmailwrapper/abstractmail.h b/kmicromail/libmailwrapper/abstractmail.h
index 2069ca1..f606b1f 100644
--- a/kmicromail/libmailwrapper/abstractmail.h
+++ b/kmicromail/libmailwrapper/abstractmail.h
@@ -8,4 +8,6 @@
 
 #include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <opie2/osmartpointer.h>
 #include "mailtypes.h"
@@ -26,6 +28,6 @@ public:
     AbstractMail(){};
     virtual ~AbstractMail(){}
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
-    virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target, int sizeInKb = 0 )=0;
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
+    virtual void listMessages(const QString & mailbox,Q3ValueList<RecMailP>&target, int sizeInKb = 0 )=0;
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
     virtual RecBodyP fetchBody(const RecMailP&mail)=0;
@@ -36,8 +38,8 @@ public:
 
     virtual void deleteMail(const RecMailP&mail)=0;
-    virtual void deleteMailList(const QValueList<RecMailP>&target);
+    virtual void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail)=0;
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0;
-    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target);
+    virtual void deleteMails(const QString & FolderName,const Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target);
     virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0;
     virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
@@ -45,5 +47,5 @@ public:
     virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
                               const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int sizeInKb = 0);
-    virtual void mvcpMailList(const QValueList<RecMailP>& t,
+    virtual void mvcpMailList(const Q3ValueList<RecMailP>& t,
                       const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp
index 2d213fe..ddad21b 100644
--- a/kmicromail/libmailwrapper/generatemail.cpp
+++ b/kmicromail/libmailwrapper/generatemail.cpp
@@ -8,4 +8,6 @@
 #include <stdlib.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace Opie::Core;
@@ -229,5 +231,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     mailmime_parameter *param;
     int err;
-    QCString __str;
+    Q3CString __str;
     //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
     param = mailmime_parameter_new( strdup( "charset" ),
@@ -253,5 +255,5 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     {
         //__str = str.utf8();
-        __str = QCString (str.latin1());
+        __str = Q3CString (str.latin1());
         err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
     }
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 0b6adf7..633ab42 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -7,4 +7,6 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 
@@ -183,5 +185,5 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
 }
 
-void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
+void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,Q3ValueList<int>recList,unsigned int current_rec,int current_count)
 {
     if (current_rec >= 10) {
@@ -201,5 +203,5 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     case MAILMIME_SINGLE:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
@@ -251,5 +253,5 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
         unsigned int ccount = 1;
         mailmime*cbody=0;
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
             cbody = (mailmime*)clist_content(cur);
@@ -271,5 +273,5 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     case MAILMIME_MESSAGE:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
         /* the own header is always at recursion 0 - we don't need that */
@@ -303,5 +305,5 @@ RecBodyP Genericwrapper::parseMail( mailmessage * msg )
     //memset(&fields, 0, sizeof(struct mailmime_single_fields));
     err = mailmessage_get_bodystructure(msg,&mime);
-    QValueList<int>recList;
+    Q3ValueList<int>recList;
     traverseBody(body,msg,mime,recList);
     return body;
@@ -448,5 +450,5 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
 }
 
-void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
+void Genericwrapper::parseList(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
 {
     int r;
diff --git a/kmicromail/libmailwrapper/genericwrapper.h b/kmicromail/libmailwrapper/genericwrapper.h
index c35a6da..a50161d 100644
--- a/kmicromail/libmailwrapper/genericwrapper.h
+++ b/kmicromail/libmailwrapper/genericwrapper.h
@@ -6,4 +6,6 @@
 #include <qmap.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libetpan/clist.h>
 
@@ -52,9 +54,9 @@ protected:
     QString parseAddressList( mailimf_address_list *list );
 
-    void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
+    void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,Q3ValueList<int>recList,unsigned int current_rek=0,int current_count=1);
     static void fillSingleBody(RecPartP&target,mailmessage*message,mailmime*mime);
     static void fillParameters(RecPartP&target,clist*parameters);
     static QString getencoding(mailmime_mechanism*aEnc);
-    virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false, int maxSizeInKb = 0);
+    virtual void parseList(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false, int maxSizeInKb = 0);
     QStringList parseInreplies(mailimf_in_reply_to * in_replies);
 
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 4f0c849..f73f4cc 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -4,8 +4,10 @@
 #include <qpe/global.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include "genericwrapper.h"
 #include <kglobal.h>
@@ -240,5 +242,5 @@ void IMAPwrapper::logout()
 }
 
-void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
+void IMAPwrapper::listMessages(const QString&mailbox,Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
 {
 
@@ -321,5 +323,5 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
@@ -330,5 +332,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
     mailimap_mbx_list_flags*bflags = 0;
 
-    QValueList<FolderP>* folders = new QValueList<FolderP>();
+    Q3ValueList<FolderP>* folders = new Q3ValueList<FolderP>();
     login();
     if (!m_imap) {
@@ -614,5 +616,5 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
-        QValueList<int> path;
+        Q3ValueList<int> path;
         body_desc = item->att_data.att_static->att_data.att_body;
         traverseBody(mail,body_desc,body,0,path);
@@ -665,5 +667,5 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 }
 
-encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call)
+encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call)
 {
     encodedString*res=new encodedString;
@@ -739,5 +741,5 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
    current_count means the position inside the internal loop! */
 void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,
-    int current_recursion,QValueList<int>recList,int current_count)
+    int current_recursion,Q3ValueList<int>recList,int current_count)
 {
     if (!body || current_recursion>=10) {
@@ -747,5 +749,5 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
     case MAILIMAP_BODY_1PART:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
         RecPartP currentPart = new RecPart();
@@ -800,5 +802,5 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
     case MAILIMAP_BODY_MPART:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         clistcell*current=0;
         mailimap_body*current_body=0;
@@ -986,5 +988,5 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
     target_part->setSize(which->bd_size);
 }
-void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
+void IMAPwrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
     //#if 0
@@ -1006,5 +1008,5 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
     progress( i18n("Delete")); 
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
@@ -1115,5 +1117,5 @@ void IMAPwrapper::answeredMail(const RecMailP&mail)
 }
 
-QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
+QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call,const QString&enc)
 {
     QString body("");
@@ -1300,5 +1302,5 @@ encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail)
 {
     // dummy
-    QValueList<int> path;
+    Q3ValueList<int> path;
     return fetchRawPart(mail,path,false);
 }
diff --git a/kmicromail/libmailwrapper/imapwrapper.h b/kmicromail/libmailwrapper/imapwrapper.h
index 31c60a8..d3d3ecd 100644
--- a/kmicromail/libmailwrapper/imapwrapper.h
+++ b/kmicromail/libmailwrapper/imapwrapper.h
@@ -4,4 +4,6 @@
 
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "mailwrapper.h"
 #include "abstractmail.h"
@@ -25,10 +27,10 @@ public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
-    virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target , int sizeInKb = 0);
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox,Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target , int sizeInKb = 0);
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
-    void deleteMailList(const QValueList<RecMailP>&target);
+    void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder);
@@ -60,6 +62,6 @@ protected:
     bool start_tls(bool force=true);
 
-    virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc="");
-    virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call);
+    virtual QString fetchTextPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call=false,const QString&enc="");
+    virtual encodedString*fetchRawPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call);
     int selectMbox(const QString&mbox);
 
@@ -69,5 +71,5 @@ protected:
     void fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which);
     void fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which);
-    void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,QValueList<int>recList,int current_count=1);
+    void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,Q3ValueList<int>recList,int current_count=1);
 
     /* just helpers */
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro
index 646630b..6b595ab 100644
--- a/kmicromail/libmailwrapper/libmailwrapper.pro
+++ b/kmicromail/libmailwrapper/libmailwrapper.pro
@@ -39,5 +39,6 @@ SOURCES         = imapwrapper.cpp \
                ../qpe/global.cpp
 
-INTERFACES     = logindialogui.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3     = logindialogui.ui \
               sendmailprogressui.ui
 
@@ -64,2 +65,7 @@ OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3
+
diff --git a/kmicromail/libmailwrapper/logindialog.cpp b/kmicromail/libmailwrapper/logindialog.cpp
index 31b75d0..d1f4b5d 100644
--- a/kmicromail/libmailwrapper/logindialog.cpp
+++ b/kmicromail/libmailwrapper/logindialog.cpp
@@ -7,5 +7,5 @@
 //using namespace Opie::Core;
 
-LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, const char *name, bool modal, WFlags flags )
+LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
     : LoginDialogUI( parent, name, modal, flags )
 {
diff --git a/kmicromail/libmailwrapper/logindialog.h b/kmicromail/libmailwrapper/logindialog.h
index f406f2c..a18daa5 100644
--- a/kmicromail/libmailwrapper/logindialog.h
+++ b/kmicromail/libmailwrapper/logindialog.h
@@ -9,5 +9,5 @@ class LoginDialog : public LoginDialogUI
 
 public:
-    LoginDialog(const QString&user,const QString&pass, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    LoginDialog(const QString&user,const QString&pass, QWidget *parent = 0, const char *name = 0, bool modal = false, Qt::WFlags flags = 0 );
     QString getUser() { return _user; }
     QString getPassword() { return _pass; }
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp
index 70a0ab5..84ccf9f 100644
--- a/kmicromail/libmailwrapper/mailtypes.cpp
+++ b/kmicromail/libmailwrapper/mailtypes.cpp
@@ -4,4 +4,6 @@
 
 #include <stdlib.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace Opie::Core;
@@ -284,10 +286,10 @@ const QString RecPart::searchParamter(const QString&key)const
 }
 
-void RecPart::setPositionlist(const QValueList<int>&poslist)
+void RecPart::setPositionlist(const Q3ValueList<int>&poslist)
 {
     m_poslist = poslist;
 }
 
-const QValueList<int>& RecPart::Positionlist()const
+const Q3ValueList<int>& RecPart::Positionlist()const
 {
     return m_poslist;
@@ -324,5 +326,5 @@ const QString& RecBody::Bodytext()const
 }
 
-void RecBody::setParts(const QValueList<RecPartP>&parts)
+void RecBody::setParts(const Q3ValueList<RecPartP>&parts)
 {
     m_PartsList.clear();
@@ -330,5 +332,5 @@ void RecBody::setParts(const QValueList<RecPartP>&parts)
 }
 
-const QValueList<RecPartP>& RecBody::Parts()const
+const Q3ValueList<RecPartP>& RecBody::Parts()const
 {
     return m_PartsList;
diff --git a/kmicromail/libmailwrapper/mailtypes.h b/kmicromail/libmailwrapper/mailtypes.h
index 97f10d7..ac7f8da 100644
--- a/kmicromail/libmailwrapper/mailtypes.h
+++ b/kmicromail/libmailwrapper/mailtypes.h
@@ -15,5 +15,5 @@
 #include <qstringlist.h>
 #include <qmap.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 class AbstractMail;
@@ -110,5 +110,5 @@ protected:
     part_plist_t m_Parameters;
     /* describes the position in the mail */
-    QValueList<int> m_poslist;
+    Q3ValueList<int> m_poslist;
 
 public:
@@ -137,6 +137,6 @@ public:
     void addParameter(const QString&key,const QString&value);
     const QString searchParamter(const QString&key)const;
-    void setPositionlist(const QValueList<int>&poslist);
-    const QValueList<int>& Positionlist()const;
+    void setPositionlist(const Q3ValueList<int>&poslist);
+    const Q3ValueList<int>& Positionlist()const;
 };
 
@@ -148,5 +148,5 @@ protected:
     QString m_BodyText;
     QString mCharset;
-    QValueList<RecPartP> m_PartsList;
+    Q3ValueList<RecPartP> m_PartsList;
     RecPartP m_description;
 
@@ -163,6 +163,6 @@ public:
     const RecPartP& Description()const;
 
-    void setParts(const QValueList<RecPartP>&parts);
-    const QValueList<RecPartP>& Parts()const;
+    void setParts(const Q3ValueList<RecPartP>&parts);
+    const Q3ValueList<RecPartP>& Parts()const;
     void addPart(const RecPartP&part);
 };
diff --git a/kmicromail/libmailwrapper/mailwrapper.cpp b/kmicromail/libmailwrapper/mailwrapper.cpp
index 2ee1ab3..9c299e8 100644
--- a/kmicromail/libmailwrapper/mailwrapper.cpp
+++ b/kmicromail/libmailwrapper/mailwrapper.cpp
@@ -6,4 +6,6 @@
 #include <string.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "mailwrapper.h"
@@ -82,6 +84,6 @@ QString IMAPFolder::decodeFolderName( const QString &name )
   unsigned char base64[256], utf8[6];
   unsigned long srcPtr = 0;
-  QCString dst = "";
-  QCString src = name.ascii();
+  Q3CString dst = "";
+  Q3CString src = name.ascii();
 
   /* initialize modified base64 decoding table */
@@ -93,7 +95,7 @@ QString IMAPFolder::decodeFolderName( const QString &name )
   /* loop until end of string */
   while (srcPtr < src.length ()) {
-    c = src[srcPtr++];
+    c = src.at(srcPtr++);
     /* deal with literal characters and &- */
-    if (c != '&' || src[srcPtr] == '-') {
+    if (c != '&' || src.at(srcPtr) == '-') {
       /* encode literally */
       dst += c;
@@ -106,5 +108,5 @@ QString IMAPFolder::decodeFolderName( const QString &name )
       bitcount = 0;
       ucs4 = 0;
-      while ((c = base64[(unsigned char) src[srcPtr]]) != UNDEFINED) {
+      while ((c = base64[(unsigned char) src.at(srcPtr)]) != UNDEFINED) {
         ++srcPtr;
         bitbuf = (bitbuf << 6) | c;
@@ -150,5 +152,5 @@ QString IMAPFolder::decodeFolderName( const QString &name )
       }
       /* skip over trailing '-' in modified UTF-7 encoding */
-      if (src[srcPtr] == '-')
+      if (src.at(srcPtr) == '-')
         ++srcPtr;
     }
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index 3e8b51f..bebabf4 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -7,4 +7,6 @@
 #include <qdatetime.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <QPixmap>
 #include <kiconloader.h>
 
@@ -62,5 +64,5 @@ public:
     virtual ~Mail(){}
     void addAttachment( Attachment *att ) { attList.append( att ); }
-    const QList<Attachment>& getAttachments()const { return attList; }
+    const QList<Attachment*>& getAttachments()const { return attList; }
     void removeAttachment( Attachment *att ) { attList.remove( att ); }
     const QString&getName()const { return name; }
@@ -87,5 +89,5 @@ public:
 
 private:
-    QList<Attachment> attList;
+    QList<Attachment*> attList;
     QString name, mail, to, cc, bcc, reply, subject, message, charset;
     QStringList m_in_reply_to;
diff --git a/kmicromail/libmailwrapper/mboxwrapper.cpp b/kmicromail/libmailwrapper/mboxwrapper.cpp
index 87f8c8a..888cae2 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.cpp
+++ b/kmicromail/libmailwrapper/mboxwrapper.cpp
@@ -4,4 +4,6 @@
 #include <libetpan/libetpan.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
 #include <klocale.h>
@@ -24,5 +26,5 @@ MBOXwrapper::~MBOXwrapper()
 }
 
-void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target )
+void MBOXwrapper::listMessages(const QString & mailbox, Q3ValueList<RecMailP> &target )
 {
     mailstorage*storage = mailstorage_new(NULL);
@@ -49,7 +51,7 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders()
 {
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<Opie::Core::OSmartPointer<Folder> >();
     QDir dir(MBOXPath);
     if (!dir.exists()) return folders;
@@ -218,5 +220,5 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
 }
 
-void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
+void MBOXwrapper::deleteMails(const QString & mailbox,const Q3ValueList<RecMailP> &target)
 {
     QString p = MBOXPath+"/";
@@ -232,9 +234,9 @@ void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP>
 }
 
-void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target)
+void MBOXwrapper::deleteMails(mailmbox_folder*f,const Q3ValueList<RecMailP> &target)
 {
     if (!f) return;
     int r;
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it=target.begin(); it != target.end();++it) {
         r = mailmbox_delete_msg(f,(*it)->getNumber());
diff --git a/kmicromail/libmailwrapper/mboxwrapper.h b/kmicromail/libmailwrapper/mboxwrapper.h
index d03940f..e658a71 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.h
+++ b/kmicromail/libmailwrapper/mboxwrapper.h
@@ -4,4 +4,6 @@
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class encodedString;
@@ -16,6 +18,6 @@ public:
     virtual ~MBOXwrapper();
 
-    virtual void listMessages(const QString & mailbox, QValueList<RecMailP>&target );
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, Q3ValueList<RecMailP>&target );
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
@@ -33,5 +35,5 @@ public:
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
-    virtual void deleteMails(const QString & FolderName,const QValueList<RecMailP> &target);
+    virtual void deleteMails(const QString & FolderName,const Q3ValueList<RecMailP> &target);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;
@@ -40,5 +42,5 @@ public:
 
 protected:
-    static void deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target);
+    static void deleteMails(mailmbox_folder*f,const Q3ValueList<RecMailP> &target);
     QString MBOXPath;
     QString MBOXName;
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 787e85d..4cd7a94 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -6,4 +6,6 @@
 #include <qdir.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
 #include <qpe/global.h>
@@ -65,5 +67,5 @@ MHwrapper::~MHwrapper()
 }
 
-void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb  )
+void MHwrapper::listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb  )
 {
     init_storage();
@@ -81,7 +83,7 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
 {
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<Opie::Core::OSmartPointer<Folder> >();
     /* this is needed! */
     if (m_storage) mailstorage_disconnect(m_storage);
@@ -256,5 +258,5 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
 }
 
-void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
+void MHwrapper::deleteMails(const QString & mailbox,const Q3ValueList<RecMailP> &target)
 {
     QString f = buildPath(mailbox);
@@ -264,5 +266,5 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &
         return;
     }
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it=target.begin(); it!=target.end();++it) {
         r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber());
diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h
index 36a443a..6151ff1 100644
--- a/kmicromail/libmailwrapper/mhwrapper.h
+++ b/kmicromail/libmailwrapper/mhwrapper.h
@@ -7,4 +7,6 @@
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class encodedString;
@@ -17,6 +19,6 @@ public:
     virtual ~MHwrapper();
 
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
@@ -37,5 +39,5 @@ public:
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
-    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target);
+    virtual void deleteMails(const QString & FolderName,const Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;
diff --git a/kmicromail/libmailwrapper/nntpwrapper.cpp b/kmicromail/libmailwrapper/nntpwrapper.cpp
index 93cd2b5..b328ecd 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.cpp
+++ b/kmicromail/libmailwrapper/nntpwrapper.cpp
@@ -5,4 +5,6 @@
 
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <stdlib.h>
@@ -61,5 +63,5 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
             msg_cache.remove();
         }
-        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        msg_cache.open(QIODevice::ReadWrite|QIODevice::Truncate);
         last_msg_id = mail->getNumber();
         err = mailsession_get_message(m_nntp->sto_session, mail->getNumber(), &mailmsg);
@@ -68,5 +70,5 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
     } else {
         QString msg="";
-        msg_cache.open(IO_ReadOnly);
+        msg_cache.open(QIODevice::ReadOnly);
         message = new char[4096];
         memset(message,0,4096);
@@ -100,5 +102,5 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
 
 
-void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb)
+void NNTPwrapper::listMessages(const QString & which, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb)
 {
     login();
@@ -187,7 +189,7 @@ void NNTPwrapper::logout()
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
 
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<Opie::Core::OSmartPointer<Folder> >();
     QStringList groups;
     if (account) {
diff --git a/kmicromail/libmailwrapper/nntpwrapper.h b/kmicromail/libmailwrapper/nntpwrapper.h
index 8c54f12..7c8e671 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.h
+++ b/kmicromail/libmailwrapper/nntpwrapper.h
@@ -6,4 +6,6 @@
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libetpan/clist.h>
 
@@ -22,7 +24,7 @@ public:
 
    /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
+    virtual void listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
     /* should only get the subscribed one */
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 2888f7c..ebeed71 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -10,6 +10,8 @@
 #include <qpe/global.h>
 #include <qfile.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 /* we don't fetch messages larger than 5 MB */
@@ -63,5 +65,5 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
             msg_cache.remove();
         }
-        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        msg_cache.open(QIODevice::ReadWrite|QIODevice::Truncate);
         last_msg_id = mail->getNumber();
         err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg);
@@ -70,5 +72,5 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     } else {
         QString msg="";
-        msg_cache.open(IO_ReadOnly);
+        msg_cache.open(QIODevice::ReadOnly);
         message = new char[4096];
         memset(message,0,4096);
@@ -101,5 +103,5 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
 }
 
-void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
+void POP3wrapper::listMessages(const QString &, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
 {
     login();
@@ -188,6 +190,6 @@ void POP3wrapper::logout()
 
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<FolderP>();
     FolderP inb=new Folder("INBOX","/");
     folders->append(inb);
@@ -195,5 +197,5 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
 }
 
-void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
+void POP3wrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
     login();
@@ -203,5 +205,5 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
     int count = target.count(); 
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
@@ -247,5 +249,5 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
 
 
-    QProgressBar wid ( result );
+    Q3ProgressBar wid ( result );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
diff --git a/kmicromail/libmailwrapper/pop3wrapper.h b/kmicromail/libmailwrapper/pop3wrapper.h
index ebc2fc7..a077877 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.h
+++ b/kmicromail/libmailwrapper/pop3wrapper.h
@@ -6,4 +6,6 @@
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class encodedString;
@@ -19,11 +21,11 @@ public:
     virtual ~POP3wrapper();
     /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
-    virtual void deleteMailList(const QValueList<RecMailP>&target);
+    virtual void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
diff --git a/kmicromail/libmailwrapper/sendmailprogress.cpp b/kmicromail/libmailwrapper/sendmailprogress.cpp
index 20dfe9b..6cd6409 100644
--- a/kmicromail/libmailwrapper/sendmailprogress.cpp
+++ b/kmicromail/libmailwrapper/sendmailprogress.cpp
@@ -1,4 +1,4 @@
 #include "sendmailprogress.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qlabel.h>
 #include <klocale.h>
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 9436d43..fc01528 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -3,5 +3,5 @@
 
 #include <qtextcodec.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 
@@ -377,9 +377,9 @@ QString SMTPaccount::getSignature()
 
     QFile file( signature );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return QString();
         
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     QString text = ts.read();
@@ -400,9 +400,9 @@ void SMTPaccount::setSignature( QString b )
     }
     QFile fileIn( signature );
-    if (!fileIn.open( IO_WriteOnly ) ) {
+    if (!fileIn.open( QIODevice::WriteOnly ) ) {
         qDebug("OM: Cannot write signature file %s ", signature.latin1() );
         return ;
     } 
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     tsIn << b ;
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 7c813cc..2df55ff 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -10,4 +10,6 @@
 #include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
 #ifndef DESKTOP_VERSION
@@ -435,6 +437,6 @@ bool SMTPwrapper::flushOutbox() {
     }
     QString oldPw, oldUser;
-    QValueList<RecMailP> mailsToSend;
-    QValueList<RecMailP> mailsToRemove;
+    Q3ValueList<RecMailP> mailsToSend;
+    Q3ValueList<RecMailP> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);