Enhancements of kopiemail

1 files changed, 22 insertions, 7 deletions

diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 128a7c0..3998abd 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -1,48 +1,49 @@
+// CHANGED 2004-09-31 Lutz Rogowski
 #include "abstractmail.h"
 #include "imapwrapper.h"
 #include "pop3wrapper.h"
 #include "nntpwrapper.h"
 #include "mhwrapper.h"
 #include "mailtypes.h"
 
 
 
 #include <kdecore/kstandarddirs.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
 #include <libetpan/mailmime.h>
 
 using namespace Opie::Core;
 AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
 {
     return new IMAPwrapper(a);
 }
 
 AbstractMail* AbstractMail::getWrapper(POP3account *a)
 {
     return new POP3wrapper(a);
 }
 
 AbstractMail* AbstractMail::getWrapper(NNTPaccount *a)
 {
     return new NNTPwrapper(a);
 }
 
 AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name)
 {
     return new MHwrapper(a,name);
 }
 
 AbstractMail* AbstractMail::getWrapper(Account*a)
 {
     if (!a) return 0;
     switch (a->getType()) {
         case MAILLIB::A_IMAP:
             return new IMAPwrapper((IMAPaccount*)a);
             break;
         case MAILLIB::A_POP3:
             return new POP3wrapper((POP3account*)a);
             break;
         case MAILLIB::A_NNTP:
@@ -92,81 +93,95 @@ QString AbstractMail::convert_String(const char*text)
     QString result(text);
 
     /* due a bug in libetpan it isn't usable this moment */
 /*    int err = mailmime_encoded_phrase_parse("iso-8859-1",
         text, strlen(text),&index, "iso-8859-1",&res);*/
     //odebug << "Input: " << text << "" << oendl; 
     if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
 //        result = QString(res);
 //        odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; 
     }
     if (res) free(res);
     return result;
 }
 
 /* cp & paste from launcher */
 QString AbstractMail::gen_attachment_id()
 {
     QFile file( "/proc/sys/kernel/random/uuid" );
     if (!file.open(IO_ReadOnly ) )
         return QString::null;
 
     QTextStream stream(&file);
 
     return "{" + stream.read().stripWhiteSpace() + "}";
 }
 
 int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
 {
     return 0;
 }
 
 QString AbstractMail::defaultLocalfolder()
 {
     //  QString f = getenv( "HOME" );
     QString f = locateLocal( "data", "kmicromail/localmail");
     //  f += "/Applications/opiemail/localmail";
     return f;
 }
 
 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::deleteMailList(const QValueList<RecMailP>&target)
+{
+    qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
 
+}
 void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
-    const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+    const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
+{
+ QValueList<RecMailP> t;
+ listMessages(fromFolder->getName(),t, maxSizeInKb);
+ mvcpMailList( t,targetFolder,targetWrapper,moveit);
+
+}
+void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
+                                const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
-    QValueList<RecMailP> t;
-    listMessages(fromFolder->getName(),t);
+   
     encodedString*st = 0;
-    while (t.count()>0) {
-        RecMailP r = (*t.begin());
+    int iii = 0;
+    int count = t.count();
+    while (iii < count ) {
+        RecMailP r = (*t.at( iii ));
         st = fetchRawBody(r);
         if (st) {
             targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
             delete st;
         }
-        t.remove(t.begin());
+        ++iii;
     }
     if (moveit) {
-        deleteAllMail(fromFolder);
+        deleteMailList( t );
+        //deleteAllMail(fromFolder);
     }
 }
 
 void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
     encodedString*st = 0;
     st = fetchRawBody(mail);
     if (st) {
         targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
         delete st;
     }
     if (moveit) {
         deleteMail(mail);
     }
 }