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
@@ -10,5 +10,7 @@
 
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <klocale.h>
@@ -16,3 +18,3 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <stdlib.h>
@@ -113,6 +115,6 @@ 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);
 
@@ -140,6 +142,6 @@ 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)
 {
@@ -149,3 +151,3 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
     int count = target.count(); 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
@@ -179,3 +181,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
         }
-    QValueList<RecMailP> t;
+    Q3ValueList<RecMailP> t;
     listMessages(fromFolder->getName(),t,acc->getMaxMailSize() );
@@ -189,6 +191,6 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     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;
@@ -223,3 +225,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
 #if 0
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
  listMessages(fromFolder->getName(),t, maxSizeInKb);
@@ -232,3 +234,3 @@ void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
 {
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
  listMessages(fromFolder->getName(),t, maxSizeInKb);
@@ -237,3 +239,3 @@ void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
 }
-void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
+void AbstractMail::mvcpMailList(const Q3ValueList<RecMailP>& t,
                                 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
@@ -248,3 +250,3 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Copying..."));
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
@@ -9,2 +9,4 @@
 #include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <opie2/osmartpointer.h>
@@ -27,4 +29,4 @@ public:
     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;
@@ -37,6 +39,6 @@ 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;
@@ -46,3 +48,3 @@ public:
                               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);
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
@@ -9,2 +9,4 @@
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -230,3 +232,3 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     int err;
-    QCString __str;
+    Q3CString __str;
     //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
@@ -254,3 +256,3 @@ 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
@@ -8,2 +8,4 @@
 #include <kstandarddirs.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -184,3 +186,3 @@ 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)
 {
@@ -202,3 +204,3 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
@@ -252,3 +254,3 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
         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)) {
@@ -272,3 +274,3 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
@@ -304,3 +306,3 @@ RecBodyP Genericwrapper::parseMail( mailmessage * msg )
     err = mailmessage_get_bodystructure(msg,&mime);
-    QValueList<int>recList;
+    Q3ValueList<int>recList;
     traverseBody(body,msg,mime,recList);
@@ -449,3 +451,3 @@ 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)
 {
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
@@ -7,2 +7,4 @@
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libetpan/clist.h>
@@ -53,3 +55,3 @@ protected:
 
-    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);
@@ -57,3 +59,3 @@ protected:
     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
@@ -5,2 +5,4 @@
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "imapwrapper.h"
@@ -8,3 +10,3 @@
 #include "logindialog.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include "genericwrapper.h"
@@ -241,3 +243,3 @@ 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)
 {
@@ -322,3 +324,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
@@ -331,3 +333,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 
-    QValueList<FolderP>* folders = new QValueList<FolderP>();
+    Q3ValueList<FolderP>* folders = new Q3ValueList<FolderP>();
     login();
@@ -615,3 +617,3 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
         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;
@@ -666,3 +668,3 @@ 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)
 {
@@ -740,3 +742,3 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
 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)
 {
@@ -748,3 +750,3 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
@@ -801,3 +803,3 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         clistcell*current=0;
@@ -987,3 +989,3 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
 }
-void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
+void IMAPwrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
@@ -1007,3 +1009,3 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
@@ -1116,3 +1118,3 @@ 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)
 {
@@ -1301,3 +1303,3 @@ 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
@@ -5,2 +5,4 @@
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "mailwrapper.h"
@@ -26,4 +28,4 @@ public:
     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");
@@ -31,3 +33,3 @@ public:
     virtual void deleteMail(const RecMailP&mail);
-    void deleteMailList(const QValueList<RecMailP>&target);
+    void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail);
@@ -61,4 +63,4 @@ protected:
 
-    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);
@@ -70,3 +72,3 @@ protected:
     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);
 
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
@@ -40,3 +40,4 @@ SOURCES         = imapwrapper.cpp \
 
-INTERFACES     = logindialogui.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3     = logindialogui.ui \
               sendmailprogressui.ui
@@ -65 +66,6 @@ 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
@@ -8,3 +8,3 @@
 
-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
@@ -10,3 +10,3 @@ 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; }
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
@@ -5,2 +5,4 @@
 #include <stdlib.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -285,3 +287,3 @@ const QString RecPart::searchParamter(const QString&key)const
 
-void RecPart::setPositionlist(const QValueList<int>&poslist)
+void RecPart::setPositionlist(const Q3ValueList<int>&poslist)
 {
@@ -290,3 +292,3 @@ void RecPart::setPositionlist(const QValueList<int>&poslist)
 
-const QValueList<int>& RecPart::Positionlist()const
+const Q3ValueList<int>& RecPart::Positionlist()const
 {
@@ -325,3 +327,3 @@ const QString& RecBody::Bodytext()const
 
-void RecBody::setParts(const QValueList<RecPartP>&parts)
+void RecBody::setParts(const Q3ValueList<RecPartP>&parts)
 {
@@ -331,3 +333,3 @@ void RecBody::setParts(const QValueList<RecPartP>&parts)
 
-const QValueList<RecPartP>& RecBody::Parts()const
+const Q3ValueList<RecPartP>& RecBody::Parts()const
 {
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
@@ -16,3 +16,3 @@
 #include <qmap.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
@@ -111,3 +111,3 @@ protected:
     /* describes the position in the mail */
-    QValueList<int> m_poslist;
+    Q3ValueList<int> m_poslist;
 
@@ -138,4 +138,4 @@ public:
     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;
 };
@@ -149,3 +149,3 @@ protected:
     QString mCharset;
-    QValueList<RecPartP> m_PartsList;
+    Q3ValueList<RecPartP> m_PartsList;
     RecPartP m_description;
@@ -164,4 +164,4 @@ public:
 
-    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
@@ -7,2 +7,4 @@
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -83,4 +85,4 @@ QString IMAPFolder::decodeFolderName( const QString &name )
   unsigned long srcPtr = 0;
-  QCString dst = "";
-  QCString src = name.ascii();
+  Q3CString dst = "";
+  Q3CString src = name.ascii();
 
@@ -94,5 +96,5 @@ QString IMAPFolder::decodeFolderName( const QString &name )
   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 */
@@ -107,3 +109,3 @@ QString IMAPFolder::decodeFolderName( const QString &name )
       ucs4 = 0;
-      while ((c = base64[(unsigned char) src[srcPtr]]) != UNDEFINED) {
+      while ((c = base64[(unsigned char) src.at(srcPtr)]) != UNDEFINED) {
         ++srcPtr;
@@ -151,3 +153,3 @@ 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
@@ -8,2 +8,4 @@
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <QPixmap>
 #include <kiconloader.h>
@@ -63,3 +65,3 @@ public:
     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 ); }
@@ -88,3 +90,3 @@ public:
 private:
-    QList<Attachment> attList;
+    QList<Attachment*> attList;
     QString name, mail, to, cc, bcc, reply, subject, message, charset;
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
@@ -5,2 +5,4 @@
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
@@ -25,3 +27,3 @@ MBOXwrapper::~MBOXwrapper()
 
-void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target )
+void MBOXwrapper::listMessages(const QString & mailbox, Q3ValueList<RecMailP> &target )
 {
@@ -50,5 +52,5 @@ 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);
@@ -219,3 +221,3 @@ 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)
 {
@@ -233,3 +235,3 @@ 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)
 {
@@ -237,3 +239,3 @@ void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &targ
     int r;
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it=target.begin(); it != target.end();++it) {
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
@@ -5,2 +5,4 @@
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -17,4 +19,4 @@ public:
 
-    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");
@@ -34,3 +36,3 @@ 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>&);
@@ -41,3 +43,3 @@ public:
 protected:
-    static void deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target);
+    static void deleteMails(mailmbox_folder*f,const Q3ValueList<RecMailP> &target);
     QString MBOXPath;
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
@@ -7,2 +7,4 @@
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
@@ -66,3 +68,3 @@ 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  )
 {
@@ -82,5 +84,5 @@ 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! */
@@ -257,3 +259,3 @@ 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)
 {
@@ -265,3 +267,3 @@ void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &
     }
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it=target.begin(); it!=target.end();++it) {
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
@@ -8,2 +8,4 @@
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -18,4 +20,4 @@ public:
 
-    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");
@@ -38,3 +40,3 @@ 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>&);
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
@@ -6,2 +6,4 @@
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -62,3 +64,3 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
         }
-        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        msg_cache.open(QIODevice::ReadWrite|QIODevice::Truncate);
         last_msg_id = mail->getNumber();
@@ -69,3 +71,3 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
         QString msg="";
-        msg_cache.open(IO_ReadOnly);
+        msg_cache.open(QIODevice::ReadOnly);
         message = new char[4096];
@@ -101,3 +103,3 @@ 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)
 {
@@ -188,5 +190,5 @@ 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;
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
@@ -7,2 +7,4 @@
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libetpan/clist.h>
@@ -23,5 +25,5 @@ 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 */
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
@@ -11,4 +11,6 @@
 #include <qfile.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -64,3 +66,3 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
         }
-        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        msg_cache.open(QIODevice::ReadWrite|QIODevice::Truncate);
         last_msg_id = mail->getNumber();
@@ -71,3 +73,3 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
         QString msg="";
-        msg_cache.open(IO_ReadOnly);
+        msg_cache.open(QIODevice::ReadOnly);
         message = new char[4096];
@@ -102,3 +104,3 @@ 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 )
 {
@@ -189,4 +191,4 @@ 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","/");
@@ -196,3 +198,3 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
 
-void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
+void POP3wrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
@@ -204,3 +206,3 @@ void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
@@ -248,3 +250,3 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
 
-    QProgressBar wid ( result );
+    Q3ProgressBar wid ( result );
     wid.setCaption( i18n("Deleting ..."));
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
@@ -7,2 +7,4 @@
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -20,4 +22,4 @@ public:
     /* 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 */
@@ -26,3 +28,3 @@ public:
     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);
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,3 +1,3 @@
 #include "sendmailprogress.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qlabel.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
@@ -4,3 +4,3 @@
 #include <qtextcodec.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
@@ -378,3 +378,3 @@ QString SMTPaccount::getSignature()
     QFile file( signature );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return QString();
@@ -382,3 +382,3 @@ QString SMTPaccount::getSignature()
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
@@ -401,3 +401,3 @@ 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() );
@@ -405,3 +405,3 @@ void SMTPaccount::setSignature( QString b )
     } 
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
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
@@ -11,2 +11,4 @@
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
@@ -436,4 +438,4 @@ bool SMTPwrapper::flushOutbox() {
     QString oldPw, oldUser;
-    QValueList<RecMailP> mailsToSend;
-    QValueList<RecMailP> mailsToRemove;
+    Q3ValueList<RecMailP> mailsToSend;
+    Q3ValueList<RecMailP> mailsToRemove;
     QString mbox("Outgoing");