author | harlekin <harlekin> | 2004-01-04 02:46:56 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-04 02:46:56 (UTC) |
commit | cda867a4d179eb3320c5a043cb9116014fa736b8 (patch) (side-by-side diff) | |
tree | 1dafac9c041634e19fab18759f181c41500346a5 /noncore/net/mail | |
parent | 7bfc0889cf761e20402f775a46c8b8508c48ed8f (diff) | |
download | opie-cda867a4d179eb3320c5a043cb9116014fa736b8.zip opie-cda867a4d179eb3320c5a043cb9116014fa736b8.tar.gz opie-cda867a4d179eb3320c5a043cb9116014fa736b8.tar.bz2 |
adapted includes to the new lib
-rw-r--r-- | noncore/net/mail/accountview.cpp | 10 | ||||
-rw-r--r-- | noncore/net/mail/accountview.h | 6 | ||||
-rw-r--r-- | noncore/net/mail/composemail.cpp | 11 | ||||
-rw-r--r-- | noncore/net/mail/composemail.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/editaccounts.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 4 | ||||
-rw-r--r-- | noncore/net/mail/mailistviewitem.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 3 |
12 files changed, 33 insertions, 26 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 9f07f56..2ce89db 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp @@ -1,5 +1,5 @@ #include <stdlib.h> #include "accountview.h" -#include "mailtypes.h" +#include <libmailwrapper/mailtypes.h> #include "defines.h" #include "newmaildir.h" @@ -164,5 +164,5 @@ void IMAPviewItem::refreshFolders(bool force) QList<Folder> *folders = wrapper->listFolders(); - QListViewItem *child = firstChild(); + QListViewItem *child = firstChild(); while ( child ) { QListViewItem *tmp = child; @@ -178,5 +178,5 @@ void IMAPviewItem::refreshFolders(bool force) // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! folders->setAutoDelete(false); - + for ( it = folders->first(); it; it = folders->next() ) { if (it->getDisplayName().lower()=="inbox") { @@ -418,5 +418,5 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) SLOT( refresh( QListViewItem * ) ) ); connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this, - SLOT( slotHold( int, QListViewItem *,const QPoint&,int ) ) ); + SLOT( slotHold( int, QListViewItem *,const QPoint&,int ) ) ); setSorting(0); @@ -608,5 +608,5 @@ MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QList setPixmap( 0, PIXMAP_INBOXFOLDER); } else { - setPixmap( 0, PIXMAP_MBOXFOLDER ); + setPixmap( 0, PIXMAP_MBOXFOLDER ); } setText( 0, folder->getDisplayName() ); diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h index 361dd86..1d2bf19 100644 --- a/noncore/net/mail/accountview.h +++ b/noncore/net/mail/accountview.h @@ -5,7 +5,7 @@ #include <qlist.h> -#include "settings.h" -#include "mailwrapper.h" -#include "abstractmail.h" +#include <libmailwrapper/settings.h> +#include <libmailwrapper/mailwrapper.h> +#include <libmailwrapper/abstractmail.h> class POP3wrapper; diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 13c7900..5e823e8 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp @@ -8,5 +8,6 @@ #include "composemail.h" -#include "smtpwrapper.h" + +#include <libmailwrapper/smtpwrapper.h> ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) @@ -24,5 +25,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m QStringList mails = c.emailList(); QString defmail = c.defaultEmail(); - + if (defmail.length()!=0) { fromBox->insertItem(defmail); @@ -43,5 +44,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m QList<Account> accounts = settings->getAccounts(); - + Account *it; for ( it = accounts.first(); it; it = accounts.next() ) { @@ -192,5 +193,5 @@ void ComposeMail::accept() #endif Mail *mail = new Mail(); - + SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); mail->setMail(fromBox->currentText()); @@ -222,5 +223,5 @@ void ComposeMail::accept() SMTPwrapper wrapper( settings ); wrapper.sendMail( *mail,smtp,checkBoxLater->isChecked() ); - + QDialog::accept(); } diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index 230e397..604c862 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h @@ -7,6 +7,7 @@ #include "composemailui.h" #include "addresspickerui.h" -#include "settings.h" -#include "mailwrapper.h" +#include <libmailwrapper/settings.h> +#include <libmailwrapper/mailwrapper.h> + diff --git a/noncore/net/mail/editaccounts.h b/noncore/net/mail/editaccounts.h index 10ed8b8..6022eef 100644 --- a/noncore/net/mail/editaccounts.h +++ b/noncore/net/mail/editaccounts.h @@ -11,5 +11,6 @@ #include "smtpconfigui.h" #include "nntpconfigui.h" -#include "settings.h" +#include <libmailwrapper/settings.h> + class AccountListItem : public QListViewItem diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index 69e1450..a96c88e 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro @@ -43,7 +43,7 @@ INCLUDEPATH += $(OPIEDIR)/include CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) contains( CONFTEST, y ){ - LIBS += -lqpe -letpan -lssl -lcrypto -lopie -liconv + LIBS += -lqpe -lopie -lmailwrapper -liconv }else{ - LIBS += -lqpe -lopie -llibmailwrapper + LIBS += -lqpe -lopie -lmailwrapper } diff --git a/noncore/net/mail/mailistviewitem.h b/noncore/net/mail/mailistviewitem.h index 60bfdda..271f616 100644 --- a/noncore/net/mail/mailistviewitem.h +++ b/noncore/net/mail/mailistviewitem.h @@ -3,5 +3,6 @@ #include <qlistview.h> -#include "mailtypes.h" +#include <libmailwrapper/mailtypes.h> + class MailListViewItem:public QListViewItem diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 6511b1f..43d02e7 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp @@ -10,8 +10,9 @@ #include <qpe/resource.h> + #include "defines.h" #include "mainwindow.h" #include "viewmail.h" -#include "mailtypes.h" +#include <libmailwrapper/mailtypes.h> #include "mailistviewitem.h" diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index 54453b7..fcd48e2 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp @@ -4,5 +4,5 @@ #include "editaccounts.h" #include "composemail.h" -#include "smtpwrapper.h" +#include <libmailwrapper/smtpwrapper.h> #include <qpe/qcopenvelope_qws.h> #include <qaction.h> diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h index 4e3c974..ebed5d8 100644 --- a/noncore/net/mail/opiemail.h +++ b/noncore/net/mail/opiemail.h @@ -3,5 +3,6 @@ #include "mainwindow.h" -#include "settings.h" +#include <libmailwrapper/settings.h> + class OpieMail : public MainWindow diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index ed77eb5..9ca6383 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp @@ -12,10 +12,10 @@ #include <opie/ofiledialog.h> -#include "settings.h" +#include <libmailwrapper/settings.h> #include "composemail.h" #include "viewmail.h" -#include "abstractmail.h" +#include <libmailwrapper/abstractmail.h> #include "accountview.h" -#include "mailtypes.h" +#include <libmailwrapper/mailtypes.h> AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index 29681cc..2d0e024 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h @@ -8,5 +8,6 @@ #include "viewmailbase.h" -#include "mailtypes.h" +#include <libmailwrapper/mailtypes.h> + class AttachItem : public QListViewItem |