1 files changed, 5 insertions, 27 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 7f6aac1..1796df7 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -6,27 +6,18 @@
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 
 #include "settings.h"
+#include "generatemail.h"
 
-class Mail;
-class AbstractMail;
-class RecMail;
-class Attachment;
-struct mailimf_fields;
-struct mailimf_field;
-struct mailimf_mailbox;
-struct mailmime;
-struct mailimf_address_list;
-class progressMailSend;
-struct mailsmtp;
 class SMTPaccount;
+class AbstractMail;
 
-class SMTPwrapper : public QObject
+class SMTPwrapper : public Generatemail
 {
     Q_OBJECT
 
 public:
     SMTPwrapper(SMTPaccount * aSmtp);
     virtual ~SMTPwrapper();
@@ -42,41 +33,28 @@ protected:
     mailsmtp *m_smtp;
     SMTPaccount * m_SmtpAccount;
 
     void connect_server();
     void disc_server();
     int start_smtp_tls();
-    
-    mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
-    mailimf_fields *createImfFields(const Mail &mail );
-    mailmime *createMimeMail(const Mail&mail );
-
-    mailimf_address_list *parseAddresses(const QString&addr );
-    void addFileParts( mailmime *message,const QList<Attachment>&files );
-    mailmime *buildTxtPart(const QString&str );
-    mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
+
+
     void smtpSend( mailmime *mail,bool later);
-    clist *createRcptList( mailimf_fields *fields );
 
     static void storeMail(const char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static void progress( size_t current, size_t maximum );
-    static void addRcpts( clist *list, mailimf_address_list *addr_list );
-    static char *getFrom( mailmime *mail );
-    static char *getFrom( mailimf_field *ffrom);
-    static mailimf_field *getField( mailimf_fields *fields, int type );
 
     int smtpSend(char*from,clist*rcpts,const char*data,size_t size);
 
     void storeMail(mailmime*mail, const QString&box);
 
     int sendQueuedMail(AbstractMail*wrap,RecMail*which);
     void storeFailedMail(const char*data,unsigned int size, const char*failuremessage);
 
     int m_queuedMail;
-    static const char* USER_AGENT;
 
 protected slots:
     void emitQCop( int queued );
 
 };