adapted includes to the new lib

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,6 +1,6 @@
 #include <stdlib.h>
 #include "accountview.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
 #include "defines.h"
 #include "newmaildir.h"
 #include <qmessagebox.h>
@@ -163,7 +163,7 @@ void IMAPviewItem::refreshFolders(bool force)
     if (childCount()>0 && force==false) return;
     QList<Folder> *folders = wrapper->listFolders();
 
-    QListViewItem *child = firstChild();    
+    QListViewItem *child = firstChild();
     while ( child ) {
         QListViewItem *tmp = child;
         child = child->nextSibling();
@@ -177,7 +177,7 @@ void IMAPviewItem::refreshFolders(bool force)
     int pos;
     // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     folders->setAutoDelete(false);
-    
+
     for ( it = folders->first(); it; it = folders->next() ) {
         if (it->getDisplayName().lower()=="inbox") {
             item = new IMAPfolderItem( it, this , item );
@@ -417,7 +417,7 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
     connect( this, SIGNAL( selectionChanged( QListViewItem * ) ),
             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);
 }
@@ -607,7 +607,7 @@ MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QList
     } else if (folder->getDisplayName().lower() == "inbox") {
         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
@@ -4,9 +4,9 @@
 #include <qlistview.h>
 #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;
 class RecMail;
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
@@ -7,7 +7,8 @@
 #include <qpe/contact.h>
 
 #include "composemail.h"
-#include "smtpwrapper.h"
+
+#include <libmailwrapper/smtpwrapper.h>
 
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
     : ComposeMailUI( parent, name, modal, flags )
@@ -23,7 +24,7 @@ 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);
     }
@@ -42,7 +43,7 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     attList->addColumn( tr( "Size" ) );
 
     QList<Account> accounts = settings->getAccounts();
-    
+
     Account *it;
     for ( it = accounts.first(); it; it = accounts.next() ) {
         if ( it->getType().compare( "SMTP" ) == 0 ) {
@@ -191,7 +192,7 @@ void ComposeMail::accept()
             smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
 #endif
     Mail *mail = new Mail();
-    
+
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
     mail->setMail(fromBox->currentText());
 
@@ -221,7 +222,7 @@ 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
@@ -6,8 +6,9 @@
 
 #include "composemailui.h"
 #include "addresspickerui.h"
-#include "settings.h"
-#include "mailwrapper.h"
+#include <libmailwrapper/settings.h>
+#include <libmailwrapper/mailwrapper.h>
+
 
 
 class AddressPicker : public AddressPickerUI
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
@@ -10,7 +10,8 @@
 #include "pop3configui.h"
 #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
@@ -42,9 +42,9 @@ 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
 }
 
 TARGET       = opiemail
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
@@ -2,7 +2,8 @@
 #define __MAILLISTVIEWITEM_H
 
 #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
@@ -9,10 +9,11 @@
 #include <qpe/qpeapplication.h>
 #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
@@ -3,7 +3,7 @@
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
-#include "smtpwrapper.h"
+#include <libmailwrapper/smtpwrapper.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qapplication.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
@@ -2,7 +2,8 @@
 #define OPIEMAIL_H
 
 #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
@@ -11,12 +11,12 @@
 
 #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,
     const QString&fsize,int num,const QValueList<int>&path)
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
@@ -7,7 +7,8 @@
 #include <qvaluelist.h>
 
 #include "viewmailbase.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
+
 
 class AttachItem : public QListViewItem
 {