1 files changed, 0 insertions, 54 deletions

diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index 332034f..34fd5c5 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -1,135 +1,81 @@
 #ifndef MAILWRAPPER_H
 #define MAILWRAPPER_H
 
 #include <qpe/applnk.h>
 
 #include <libetpan/mailmime.h>
 #include <libetpan/mailimf.h>
 #include <libetpan/mailsmtp.h>
 #include <libetpan/mailstorage.h>
 #include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 
 #include "settings.h"
 
 class Attachment
 {
 public:
     Attachment( DocLnk lnk ); 
     virtual ~Attachment(){}
     const QString getFileName()const{ return doc.file(); }
     const QString getName()const{ return doc.name(); }
     const QString getMimeType()const{ return doc.type(); }
     const QPixmap getPixmap()const{ return doc.pixmap(); }
     const int getSize()const { return size; }
     DocLnk  getDocLnk() { return doc; }
     
 protected:
     DocLnk doc;
     int size;
 
 };
 
-#define FLAG_ANSWERED 0
-#define FLAG_FLAGGED  1
-#define FLAG_DELETED  2
-#define FLAG_SEEN     3
-#define FLAG_DRAFT    4
-#define FLAG_RECENT   5
-
-/* a class to describe mails in a mailbox */
-/* Attention!
-   From programmers point of view it would make sense to
-   store the mail body into this class, too.
-   But: not from the point of view of the device. 
-   Mailbodies can be real large. So we request them when 
-   needed from the mail-wrapper class direct from the server itself
-   (imap) or from a file-based cache (pop3?)
-   So there is no interface "const QString&body()" but you should
-   make a request to the mailwrapper with this class as parameter to
-   get the body. Same words for the attachments.
-*/
-class RecMail
-{
-public:
-    RecMail();
-    virtual ~RecMail(){}
-
-    const int getNumber()const{return msg_number;}
-    void setNumber(int number){msg_number=number;}
-    const QString&getDate()const{ return date; }
-    void setDate( const QString&a ) { date = a; }
-    const QString&getFrom()const{ return from; }
-    void setFrom( const QString&a ) { from = a; }
-    const QString&getSubject()const { return subject; }
-    void setSubject( const QString&s ) { subject = s; }
-    const QString&getMbox()const{return mbox;}
-    void setMbox(const QString&box){mbox = box;}
-    const QBitArray&getFlags()const{return msg_flags;}
-    void setFlags(const QBitArray&flags){msg_flags = flags;}
-
-#if 0    
-    void setDate(const QString&dstring);
-    void setDate(const QDateTime&date){mDate = date;}
-    QString getDate()const{return mDate.toString();}
-#endif
-protected:
-    QString subject,date,from,mbox;
-    int msg_number;
-    QBitArray msg_flags;
-#if 0
-    QDateTime mDate;
-#endif
-};
-
-typedef QList<RecMail> Maillist;
-
 class Mail
 {
 public:
     Mail();
     /* Possible that this destructor must not be declared virtual
      * 'cause it seems that it will never have some child classes.
      * in this case this object will not get a virtual table -> memory and
      * speed will be a little bit better?
      */
     virtual ~Mail(){}
     void addAttachment( Attachment *att ) { attList.append( att ); }
     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; }
     void setMail( const QString&s ) { mail = s; }
     const QString&getTo()const{ return to; }
     void setTo( const QString&s ) { to = s; }
     const QString&getCC()const{ return cc; }
     void setCC( const QString&s ) { cc = s; }
     const QString&getBCC()const { return bcc; }
     void setBCC( const QString&s ) { bcc = s; }
     const QString&getMessage()const { return message; }
     void setMessage( const QString&s ) { message = s; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getReply()const{ return reply; }
     void setReply( const QString&a ) { reply = a; }
 
 private:
     QList<Attachment> attList;
     QString name, mail, to, cc, bcc, reply, subject, message;
 };
 
 class Folder : public QObject
 {
     Q_OBJECT
 
 public:
     Folder( const QString&init_name );
     const QString&getDisplayName()const { return nameDisplay; }
     const QString&getName()const { return name; }
     virtual bool may_select()const{return true;};    
 
 private:
     QString nameDisplay, name;