summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountview.cpp1
-rw-r--r--noncore/net/mail/accountview.h2
-rw-r--r--noncore/net/mail/imapwrapper.cpp2
-rw-r--r--noncore/net/mail/imapwrapper.h25
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.h25
-rw-r--r--noncore/net/mail/libmailwrapper/mailwrapper.h19
-rw-r--r--noncore/net/mail/mail.pro3
-rw-r--r--noncore/net/mail/mailwrapper.h19
9 files changed, 57 insertions, 41 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index c6a44ab..a531976 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,13 +1,14 @@
#include "accountview.h"
+#include "imapwrapper.h"
#include "defines.h"
IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
: AccountViewItem( parent )
{
account = a;
wrapper = new IMAPwrapper( account );
setPixmap( 0, PIXMAP_IMAPFOLDER );
setText( 0, account->getAccountName() );
setOpen( true );
}
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 14d8efa..2bc8023 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -1,20 +1,22 @@
#ifndef ACCOUNTVIEW_H
#define ACCOUNTVIEW_H
#include <qlistview.h>
#include "settings.h"
#include "mailwrapper.h"
+class IMAPwrapper;
+
class AccountViewItem : public QListViewItem
{
public:
AccountViewItem( QListView *parent ) : QListViewItem( parent ) {}
AccountViewItem( QListViewItem *parent ) : QListViewItem( parent ) {}
virtual void refresh(Maillist&)=0;
virtual QString fetchBody(const RecMail&)=0;
};
class IMAPviewItem : public AccountViewItem
{
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index fc12947..7b78499 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,16 +1,16 @@
#include <stdlib.h>
-#include "mailwrapper.h"
+#include "imapwrapper.h"
IMAPwrapper::IMAPwrapper( IMAPaccount *a )
{
account = a;
}
void imap_progress( size_t current, size_t maximum )
{
qDebug( "IMAP: %i of %i", current, maximum );
}
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
new file mode 100644
index 0000000..65c36e0
--- a/dev/null
+++ b/noncore/net/mail/imapwrapper.h
@@ -0,0 +1,25 @@
+#ifndef __IMAPWRAPPER
+#define __IMAPWRAPPER
+
+#include "mailwrapper.h"
+#include <libetpan/mailimap.h>
+
+class IMAPwrapper : public QObject
+{
+ Q_OBJECT
+
+public:
+ IMAPwrapper( IMAPaccount *a );
+ QList<IMAPFolder>* listFolders();
+ void listMessages(const QString & mailbox,Maillist&target );
+ QString fetchBody(const QString & mailbox,const RecMail&mail);
+
+protected:
+ RecMail*parse_list_result(mailimap_msg_att*);
+
+private:
+ IMAPaccount *account;
+
+};
+
+#endif
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index fc12947..7b78499 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -1,16 +1,16 @@
#include <stdlib.h>
-#include "mailwrapper.h"
+#include "imapwrapper.h"
IMAPwrapper::IMAPwrapper( IMAPaccount *a )
{
account = a;
}
void imap_progress( size_t current, size_t maximum )
{
qDebug( "IMAP: %i of %i", current, maximum );
}
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
new file mode 100644
index 0000000..65c36e0
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -0,0 +1,25 @@
+#ifndef __IMAPWRAPPER
+#define __IMAPWRAPPER
+
+#include "mailwrapper.h"
+#include <libetpan/mailimap.h>
+
+class IMAPwrapper : public QObject
+{
+ Q_OBJECT
+
+public:
+ IMAPwrapper( IMAPaccount *a );
+ QList<IMAPFolder>* listFolders();
+ void listMessages(const QString & mailbox,Maillist&target );
+ QString fetchBody(const QString & mailbox,const RecMail&mail);
+
+protected:
+ RecMail*parse_list_result(mailimap_msg_att*);
+
+private:
+ IMAPaccount *account;
+
+};
+
+#endif
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index f45eab7..955a8e2 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -1,21 +1,20 @@
#ifndef MAILWRAPPER_H
#define MAILWRAPPER_H
#include <qpe/applnk.h>
#include <libetpan/mailmime.h>
#include <libetpan/mailimf.h>
#include <libetpan/mailsmtp.h>
-#include <libetpan/mailimap.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(){}
@@ -153,31 +152,13 @@ private:
clist *createRcptList( mailimf_fields *fields );
char *getFrom( mailmime *mail );
SMTPaccount *getAccount( QString from );
void writeToFile( QString file, mailmime *mail );
void readFromFile( QString file, char **data, size_t *size );
static QString mailsmtpError( int err );
static QString getTmpFile();
Settings *settings;
};
-class IMAPwrapper : public QObject
-{
- Q_OBJECT
-
-public:
- IMAPwrapper( IMAPaccount *a );
- QList<IMAPFolder>* listFolders();
- void listMessages(const QString & mailbox,Maillist&target );
- QString fetchBody(const QString & mailbox,const RecMail&mail);
-
-protected:
- RecMail*parse_list_result(mailimap_msg_att*);
-
-private:
- IMAPaccount *account;
-
-};
-
#endif
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 46a476d..2142cdc 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,23 +1,24 @@
CONFIG += qt warn_on debug quick-app
HEADERS = defines.h \
logindialog.h \
settings.h \
editaccounts.h \
mailwrapper.h \
composemail.h \
accountview.h \
mainwindow.h \
- opiemail.h
+ opiemail.h \
+ imapwrapper.h
SOURCES = main.cpp \
opiemail.cpp \
mainwindow.cpp \
accountview.cpp \
composemail.cpp \
mailwrapper.cpp \
imapwrapper.cpp \
addresspicker.cpp \
editaccounts.cpp \
logindialog.cpp \
settings.cpp
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index f45eab7..955a8e2 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -1,21 +1,20 @@
#ifndef MAILWRAPPER_H
#define MAILWRAPPER_H
#include <qpe/applnk.h>
#include <libetpan/mailmime.h>
#include <libetpan/mailimf.h>
#include <libetpan/mailsmtp.h>
-#include <libetpan/mailimap.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(){}
@@ -153,31 +152,13 @@ private:
clist *createRcptList( mailimf_fields *fields );
char *getFrom( mailmime *mail );
SMTPaccount *getAccount( QString from );
void writeToFile( QString file, mailmime *mail );
void readFromFile( QString file, char **data, size_t *size );
static QString mailsmtpError( int err );
static QString getTmpFile();
Settings *settings;
};
-class IMAPwrapper : public QObject
-{
- Q_OBJECT
-
-public:
- IMAPwrapper( IMAPaccount *a );
- QList<IMAPFolder>* listFolders();
- void listMessages(const QString & mailbox,Maillist&target );
- QString fetchBody(const QString & mailbox,const RecMail&mail);
-
-protected:
- RecMail*parse_list_result(mailimap_msg_att*);
-
-private:
- IMAPaccount *account;
-
-};
-
#endif