summaryrefslogtreecommitdiffabout
path: root/kmicromail/libmailwrapper
Side-by-side diff
Diffstat (limited to 'kmicromail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp30
-rw-r--r--kmicromail/libmailwrapper/abstractmail.h12
-rw-r--r--kmicromail/libmailwrapper/generatemail.cpp6
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.cpp14
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.h6
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.cpp28
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.h14
-rw-r--r--kmicromail/libmailwrapper/libmailwrapper.pro8
-rw-r--r--kmicromail/libmailwrapper/logindialog.cpp2
-rw-r--r--kmicromail/libmailwrapper/logindialog.h2
-rw-r--r--kmicromail/libmailwrapper/mailtypes.cpp10
-rw-r--r--kmicromail/libmailwrapper/mailtypes.h14
-rw-r--r--kmicromail/libmailwrapper/mailwrapper.cpp14
-rw-r--r--kmicromail/libmailwrapper/mailwrapper.h6
-rw-r--r--kmicromail/libmailwrapper/mboxwrapper.cpp14
-rw-r--r--kmicromail/libmailwrapper/mboxwrapper.h10
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.cpp12
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.h8
-rw-r--r--kmicromail/libmailwrapper/nntpwrapper.cpp12
-rw-r--r--kmicromail/libmailwrapper/nntpwrapper.h6
-rw-r--r--kmicromail/libmailwrapper/pop3wrapper.cpp20
-rw-r--r--kmicromail/libmailwrapper/pop3wrapper.h8
-rw-r--r--kmicromail/libmailwrapper/sendmailprogress.cpp2
-rw-r--r--kmicromail/libmailwrapper/settings.cpp10
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp6
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
@@ -7,15 +7,17 @@
#include "mailtypes.h"
#include <qpe/global.h>
-#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>
#include <libetpan/mailmime.h>
@@ -110,12 +112,12 @@ QString AbstractMail::convert_String(const char*text)
/* cp & paste from launcher */
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() + "}";
}
@@ -137,18 +139,18 @@ QString AbstractMail::draftFolder()
return QString("Drafts");
}
/* 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! ");
// this is currently re-implemented in pop3wrapper and imapwrapper
int iii = 0;
int count = target.count();
- QProgressBar wid ( count );
+ Q3ProgressBar wid ( count );
wid.setCaption( i18n("Deleting ..."));
wid.show();
while (iii < count ) {
Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
@@ -176,9 +178,9 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
QMessageBox::critical(0,i18n("Error creating new Folder"),
i18n("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
return;
}
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
listMessages(fromFolder->getName(),t,acc->getMaxMailSize() );
if ( t.count() == 0 ) {
qDebug("There are no new messages %s", fromFolder->getName().latin1());
Global::statusMessage(i18n("There are no new messages"));
@@ -186,12 +188,12 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
}
Global::statusMessage(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
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();
while (iii < count ) {
RecMailP r = (*t.at( iii ));
@@ -220,23 +222,23 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer());
Global::statusMessage(i18n("Downloaded %1 messages").arg(n.count()));
#if 0
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
listMessages(fromFolder->getName(),t, maxSizeInKb);
mvcpMailList( t,targetFolder,targetWrapper,moveit);
#endif
}
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)
{
encodedString*st = 0;
int iii = 0;
@@ -245,9 +247,9 @@ void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
return;
// wel, processevents is qite strange, we need a widget for getting
// Global::statusMessage(i18n("Copy2 message %1").arg(iii)); displaye
- QProgressBar wid ( count );
+ Q3ProgressBar wid ( count );
wid.setCaption( i18n("Copying..."));
wid.show();
while (iii < count ) {
Global::statusMessage(i18n("Copy message %1 of %2").arg(iii).arg(count));
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
@@ -6,8 +6,10 @@
#include "settings.h"
#include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <opie2/osmartpointer.h>
#include "mailtypes.h"
@@ -24,28 +26,28 @@ class AbstractMail:public QObject
Q_OBJECT
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;
virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part)=0;
virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part)=0;
virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part)=0;
virtual encodedString* fetchRawBody(const RecMailP&mail)=0;
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;
void downloadNewMails(const FolderP&fromFolder,AbstractMail*targetWrapper );
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);
virtual void cleanMimeCache(){};
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
@@ -6,8 +6,10 @@
//#include <qt.h>
#include <stdlib.h>
#include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace Opie::Core;
const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
@@ -227,9 +229,9 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
mailmime_fields *fields;
mailmime_content *content;
mailmime_parameter *param;
int err;
- QCString __str;
+ Q3CString __str;
//qDebug(" Generatemail::buildTxtPart %s", str.latin1());
param = mailmime_parameter_new( strdup( "charset" ),
strdup( mCharset.latin1() ) );
if ( param == NULL )
@@ -251,9 +253,9 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
if ( txtPart == NULL )
goto err_free_fields;
{
//__str = str.utf8();
- __str = QCString (str.latin1());
+ __str = Q3CString (str.latin1());
err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
}
if ( err != MAILIMF_NO_ERROR )
goto err_free_txtPart;
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
@@ -5,8 +5,10 @@
#include <kconfig.h>
#include <kglobal.h>
#include <kstandarddirs.h>
+//Added by qt3to4:
+#include <Q3ValueList>
using namespace Opie::Core;
Genericwrapper::Genericwrapper()
@@ -181,9 +183,9 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
}
return enc;
}
-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) {
; // odebug << "too deep recursion!" << oendl;
}
@@ -199,9 +201,9 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
switch (mime->mm_type) {
case MAILMIME_SINGLE:
{
- QValueList<int>countlist = recList;
+ Q3ValueList<int>countlist = recList;
countlist.append(current_count);
r = mailmessage_fetch_section(message,mime,&data,&len);
part->setSize(len);
part->setPositionlist(countlist);
@@ -249,9 +251,9 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
case MAILMIME_MULTIPLE:
{
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);
if (cbody->mm_type==MAILMIME_MULTIPLE) {
RecPartP targetPart = new RecPart();
@@ -269,9 +271,9 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
}
break;
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 */
if (current_rec > 0) {
part->setPositionlist(countlist);
@@ -301,9 +303,9 @@ RecBodyP Genericwrapper::parseMail( mailmessage * msg )
mailmime * mime=0;
RecBodyP body = new RecBody();
//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;
}
@@ -446,9 +448,9 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
}
return res;
}
-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;
mailmessage_list * env_list = 0;
r = mailsession_get_messages_list(session,&env_list);
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
@@ -4,8 +4,10 @@
#include "abstractmail.h"
#include <qmap.h>
#include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <libetpan/clist.h>
class RecMail;
class RecBody;
@@ -50,13 +52,13 @@ protected:
QString parseMailbox( mailimf_mailbox *box );
QString parseGroup( mailimf_group *group );
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);
QString msgTempName;
unsigned int last_msg_id;
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
@@ -2,12 +2,14 @@
#include <stdlib.h>
#include <libetpan/libetpan.h>
#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>
using namespace Opie::Core;
@@ -238,9 +240,9 @@ void IMAPwrapper::logout()
m_imap = 0;
m_Lastmbox = "";
}
-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)
{
int tryAgain = 1;
while ( tryAgain >= 0 ) {
@@ -319,18 +321,18 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
if (result) mailimap_fetch_list_free(result);
}
}
-QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
{
const char *path, *mask;
int err = MAILIMAP_NO_ERROR;
clist *result = 0;
clistcell *current = 0;
clistcell*cur_flag = 0;
mailimap_mbx_list_flags*bflags = 0;
- QValueList<FolderP>* folders = new QValueList<FolderP>();
+ Q3ValueList<FolderP>* folders = new Q3ValueList<FolderP>();
login();
if (!m_imap) {
return folders;
}
@@ -612,9 +614,9 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
mailimap_msg_att * msg_att;
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);
} else {
qDebug("error fetching body %d (%d): %s", err, MAILIMAP_NO_ERROR, m_imap->imap_response );
@@ -663,9 +665,9 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
}
return l;
}
-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;
int err;
mailimap_fetch_type *fetchType;
@@ -737,17 +739,17 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
/* current_recursion is for recursive calls.
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) {
return;
}
switch (body->bd_type) {
case MAILIMAP_BODY_1PART:
{
- QValueList<int>countlist = recList;
+ Q3ValueList<int>countlist = recList;
countlist.append(current_count);
RecPartP currentPart = new RecPart();
mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part;
QString id("");
@@ -798,9 +800,9 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
}
break;
case MAILIMAP_BODY_MPART:
{
- QValueList<int>countlist = recList;
+ Q3ValueList<int>countlist = recList;
clistcell*current=0;
mailimap_body*current_body=0;
unsigned int ccount = 1;
mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart;
@@ -984,9 +986,9 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
}
target_part->setEncoding(encoding);
target_part->setSize(which->bd_size);
}
-void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
+void IMAPwrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
{
//#if 0
mailimap_flag_list*flist;
mailimap_set *set;
@@ -1004,9 +1006,9 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
mMax = count;
progress( i18n("Delete"));
- QProgressBar wid ( count );
+ Q3ProgressBar wid ( count );
wid.setCaption( i18n("Deleting ..."));
wid.show();
while (iii < count ) {
Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
@@ -1113,9 +1115,9 @@ void IMAPwrapper::answeredMail(const RecMailP&mail)
return;
}
}
-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("");
encodedString*res = fetchRawPart(mail,path,internal_call);
encodedString*r = decode_String(res,enc);
@@ -1298,9 +1300,9 @@ const QString&IMAPwrapper::getName()const
encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail)
{
// dummy
- QValueList<int> path;
+ Q3ValueList<int> path;
return fetchRawPart(mail,path,false);
}
void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
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
@@ -2,8 +2,10 @@
#ifndef __IMAPWRAPPER
#define __IMAPWRAPPER
#include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include "mailwrapper.h"
#include "abstractmail.h"
#include <libetpan/clist.h>
@@ -23,14 +25,14 @@ class IMAPwrapper : public AbstractMail
Q_OBJECT
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);
virtual void storeMessage(const char*msg,size_t length, const QString&folder);
virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
@@ -58,18 +60,18 @@ protected:
RecMail*parse_list_result(mailimap_msg_att*);
void login(bool tryTLS = true);
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);
void fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description);
void fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which);
void fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which);
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 */
static void fillBodyFields(RecPartP&target_part,mailimap_body_fields*which);
static QStringList address_list_to_stringlist(clist*list);
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
@@ -37,9 +37,10 @@ SOURCES = imapwrapper.cpp \
storemail.cpp \
../qpe/qdialog_hacked.cpp \
../qpe/global.cpp
-INTERFACES = logindialogui.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3 = logindialogui.ui \
sendmailprogressui.ui
INCLUDEPATH += ../qpe .. ../../microkde ../../microkde/kdecore ../../libetpan/include
LIBS += -lssl -lcrypto
@@ -62,4 +63,9 @@ QMAKE_LINK += /NODEFAULTLIB:LIBC
#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
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
@@ -5,9 +5,9 @@
//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 )
{
userLine->setText( (user.isEmpty()?QString(""):user) );
passLine->setText( (pass.isEmpty()?QString(""):pass) );
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
@@ -7,9 +7,9 @@ class LoginDialog : public LoginDialogUI
{
Q_OBJECT
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; }
protected slots:
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
@@ -2,8 +2,10 @@
//#include <opie2/odebug.h>
#include <stdlib.h>
+//Added by qt3to4:
+#include <Q3ValueList>
using namespace Opie::Core;
RecMail::RecMail()
:Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
@@ -282,14 +284,14 @@ const QString RecPart::searchParamter(const QString&key)const
}
return value;
}
-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;
}
@@ -322,15 +324,15 @@ const QString& RecBody::Bodytext()const
{
return m_BodyText;
}
-void RecBody::setParts(const QValueList<RecPartP>&parts)
+void RecBody::setParts(const Q3ValueList<RecPartP>&parts)
{
m_PartsList.clear();
m_PartsList = 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
@@ -13,9 +13,9 @@
#include <qbitarray.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qmap.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
class AbstractMail;
/* a class to describe mails in a mailbox */
/* Attention!
@@ -108,9 +108,9 @@ protected:
QString m_type,m_subtype,m_identifier,m_encoding,m_description;
unsigned int m_lines,m_size;
part_plist_t m_Parameters;
/* describes the position in the mail */
- QValueList<int> m_poslist;
+ Q3ValueList<int> m_poslist;
public:
RecPart();
RecPart(const RecPart&);
@@ -135,10 +135,10 @@ public:
void setParameters(const part_plist_t&list);
const part_plist_t&Parameters()const;
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;
};
typedef Opie::Core::OSmartPointer<RecPart> RecPartP;
@@ -146,9 +146,9 @@ class RecBody:public Opie::Core::ORefCount
{
protected:
QString m_BodyText;
QString mCharset;
- QValueList<RecPartP> m_PartsList;
+ Q3ValueList<RecPartP> m_PartsList;
RecPartP m_description;
public:
RecBody();
@@ -161,10 +161,10 @@ public:
void setDescription(const RecPartP&des);
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);
};
typedef Opie::Core::OSmartPointer<RecBody> RecBodyP;
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
@@ -4,8 +4,10 @@
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
#include <qdir.h>
+//Added by qt3to4:
+#include <Q3CString>
#include "mailwrapper.h"
//#include "logindialog.h"
//#include "defines.h"
@@ -80,10 +82,10 @@ QString IMAPFolder::decodeFolderName( const QString &name )
unsigned char c, i, bitcount;
unsigned long ucs4, utf16, bitbuf;
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 */
memset(base64, UNDEFINED, sizeof(base64));
for (i = 0; i < sizeof(base64chars); ++i) {
@@ -91,11 +93,11 @@ 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;
/* skip over the '-' if this is an &- sequence */
if (c == '&')
@@ -104,9 +106,9 @@ QString IMAPFolder::decodeFolderName( const QString &name )
/* convert modified UTF-7 -> UTF-16 -> UCS-4 -> UTF-8 -> HEX */
bitbuf = 0;
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;
bitcount += 6;
/* enough bits for a UTF-16 character? */
@@ -148,9 +150,9 @@ 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
@@ -5,8 +5,10 @@
#include <qbitarray.h>
#include <qdatetime.h>
#include <qfileinfo.h>
+//Added by qt3to4:
+#include <QPixmap>
#include <kiconloader.h>
#include "settings.h"
@@ -60,9 +62,9 @@ public:
* speed will be a little bit better?
*/
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; }
void setName( QString s ) { name = s; }
const QString&getMail()const{ return mail; }
@@ -85,9 +87,9 @@ public:
void setCharset( const QString&a ) { charset= a; }
const QString& getCharset() const { return charset; }
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
@@ -2,8 +2,10 @@
#include "mailtypes.h"
#include "mailwrapper.h"
#include <libetpan/libetpan.h>
#include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <stdlib.h>
#include <klocale.h>
@@ -22,9 +24,9 @@ MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name)
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);
QString p = MBOXPath+"/";
p+=mailbox;
@@ -47,11 +49,11 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
mailstorage_free(storage);
Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count()));
}
-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;
dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable);
QStringList entries = dir.entryList();
@@ -216,9 +218,9 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
mailmessage_free(msg);
return result;
}
-void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
+void MBOXwrapper::deleteMails(const QString & mailbox,const Q3ValueList<RecMailP> &target)
{
QString p = MBOXPath+"/";
p+=mailbox;
mailmbox_folder*f = 0;
@@ -230,13 +232,13 @@ void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP>
deleteMails(f,target);
mailmbox_done(f);
}
-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());
if (r!=MAILMBOX_NO_ERROR) {
; // << "error delete mail" << oendl;
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
@@ -2,8 +2,10 @@
#define __MBOX_WRAPPER_H
#include "genericwrapper.h"
#include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
class encodedString;
struct mailmbox_folder;
@@ -14,10 +16,10 @@ class MBOXwrapper : public Genericwrapper
public:
MBOXwrapper(const QString & dir,const QString&name);
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");
virtual void deleteMail(const RecMailP&mail);
virtual void answeredMail(const RecMailP&mail);
@@ -31,16 +33,16 @@ public:
virtual RecBodyP fetchBody( const RecMailP &mail );
static void mbox_progress( size_t current, size_t maximum );
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;
virtual const QString&getName()const;
virtual Account* getAccount() { return 0; };
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
@@ -4,8 +4,10 @@
#include "mailwrapper.h"
#include <libetpan/libetpan.h>
#include <qdir.h>
#include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <stdlib.h>
#include <qpe/global.h>
#include <klocale.h>
#include <kglobal.h>
@@ -63,9 +65,9 @@ MHwrapper::~MHwrapper()
{
clean_storage();
}
-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();
if (!m_storage) {
return;
@@ -79,11 +81,11 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
parseList(target,m_storage->sto_session,f, false, maxSizeInKb );
Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count()));
}
-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);
init_storage();
if (!m_storage) {
@@ -254,17 +256,17 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
if (msg) mailmessage_free(msg);
return result;
}
-void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
+void MHwrapper::deleteMails(const QString & mailbox,const Q3ValueList<RecMailP> &target)
{
QString f = buildPath(mailbox);
int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
if (r!=MAIL_NO_ERROR) {
qDebug("deleteMails: error selecting folder! ");
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());
if (r != MAIL_NO_ERROR) {
qDebug("error deleting mail ");
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
@@ -5,8 +5,10 @@
#include "maildefines.h"
#include "genericwrapper.h"
#include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
class encodedString;
struct mailmbox_folder;
class MHwrapper : public Genericwrapper
@@ -15,10 +17,10 @@ class MHwrapper : public Genericwrapper
public:
MHwrapper(const QString & dir,const QString&name);
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");
virtual void deleteMail(const RecMailP&mail);
virtual void answeredMail(const RecMailP&mail);
@@ -35,9 +37,9 @@ public:
virtual RecBodyP fetchBody( const RecMailP &mail );
static void mbox_progress( size_t current, size_t maximum );
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;
virtual const QString&getName()const;
virtual Account* getAccount() { return 0; };
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
@@ -3,8 +3,10 @@
#include "logindialog.h"
#include "mailtypes.h"
#include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <stdlib.h>
#include <libetpan/libetpan.h>
@@ -59,16 +61,16 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
if (mail->getNumber()!=last_msg_id) {
if (msg_cache.exists()) {
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);
err = mailmessage_fetch(mailmsg,&message,&length);
msg_cache.writeBlock(message,length);
} else {
QString msg="";
- msg_cache.open(IO_ReadOnly);
+ msg_cache.open(QIODevice::ReadOnly);
message = new char[4096];
memset(message,0,4096);
while (msg_cache.readBlock(message,4095)>0) {
msg+=message;
@@ -98,9 +100,9 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
return body;
}
-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();
if (!m_nntp)
return;
@@ -185,11 +187,11 @@ void NNTPwrapper::logout()
mailstorage_free(m_nntp);
m_nntp = 0;
}
-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) {
groups = account->getGroups();
}
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
@@ -4,8 +4,10 @@
#include "mailwrapper.h"
#include "genericwrapper.h"
#include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <libetpan/clist.h>
class encodedString;
struct mailstorage;
@@ -20,11 +22,11 @@ public:
NNTPwrapper( NNTPaccount *a );
virtual ~NNTPwrapper();
/* 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");
QStringList listAllNewsgroups(const QString&mask = QString::null);
virtual void deleteMail(const RecMailP&mail);
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
@@ -8,10 +8,12 @@
#include <klocale.h>
#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 */
#define HARD_MSG_SIZE_LIMIT 5242880
@@ -61,16 +63,16 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
if (mail->getNumber()!=last_msg_id) {
if (msg_cache.exists()) {
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);
err = mailmessage_fetch(mailmsg,&message,&length);
msg_cache.writeBlock(message,length);
} else {
QString msg="";
- msg_cache.open(IO_ReadOnly);
+ msg_cache.open(QIODevice::ReadOnly);
message = new char[4096];
memset(message,0,4096);
while (msg_cache.readBlock(message,4095)>0) {
msg+=message;
@@ -99,9 +101,9 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
return body;
}
-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();
if (!m_pop3)
return;
@@ -186,24 +188,24 @@ void POP3wrapper::logout()
m_pop3 = 0;
}
-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);
return folders;
}
-void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
+void POP3wrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
{
login();
if (!m_pop3)
return;
int iii = 0;
int count = target.count();
- QProgressBar wid ( count );
+ Q3ProgressBar wid ( count );
wid.setCaption( i18n("Deleting ..."));
wid.show();
while (iii < count ) {
Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
@@ -245,9 +247,9 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
}
- QProgressBar wid ( result );
+ Q3ProgressBar wid ( result );
wid.setCaption( i18n("Deleting ..."));
wid.show();
for (unsigned int i = 0; i < result; ++i) {
Global::statusMessage(i18n("Delete message %1 of %2").arg(i).arg(result));
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
@@ -4,8 +4,10 @@
#include "mailwrapper.h"
#include "genericwrapper.h"
#include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
class encodedString;
struct mailstorage;
struct mailfolder;
@@ -17,15 +19,15 @@ class POP3wrapper : public Genericwrapper
public:
POP3wrapper( POP3account *a );
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>&);
virtual RecBodyP fetchBody( 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,6 +1,6 @@
#include "sendmailprogress.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
#include <qlabel.h>
#include <klocale.h>
progressMailSend::progressMailSend(QWidget*parent, const char * name)
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
@@ -1,9 +1,9 @@
#include <stdlib.h>
#include <qdir.h>
#include <qtextcodec.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
#include <qfile.h>
//#include <opie2/odebug.h>
#include <kconfig.h>
@@ -375,13 +375,13 @@ QString SMTPaccount::getSignature()
if ( ! fi.exists() )
return QString();
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();
file.close();
@@ -398,13 +398,13 @@ void SMTPaccount::setSignature( QString b )
qDebug("new sig %s ", signature.latin1());
save();
}
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 ;
fileIn.close();
}
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
@@ -8,8 +8,10 @@
//#include <opie2/odebug.h>
//#include <qt.h>
#include <qapplication.h>
#include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <stdlib.h>
#ifndef DESKTOP_VERSION
//#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
@@ -433,10 +435,10 @@ bool SMTPwrapper::flushOutbox() {
; // odebug << "memory error" << oendl;
return false;
}
QString oldPw, oldUser;
- QValueList<RecMailP> mailsToSend;
- QValueList<RecMailP> mailsToRemove;
+ Q3ValueList<RecMailP> mailsToSend;
+ Q3ValueList<RecMailP> mailsToRemove;
QString mbox("Outgoing");
wrap->listMessages(mbox,mailsToSend);
if (mailsToSend.count()==0) {
delete wrap;