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
@@ -2,3 +2,3 @@
 #include "accountview.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
 #include "defines.h"
@@ -165,3 +165,3 @@ void IMAPviewItem::refreshFolders(bool force)
 
-    QListViewItem *child = firstChild();    
+    QListViewItem *child = firstChild();
     while ( child ) {
@@ -179,3 +179,3 @@ void IMAPviewItem::refreshFolders(bool force)
     folders->setAutoDelete(false);
-    
+
     for ( it = folders->first(); it; it = folders->next() ) {
@@ -419,3 +419,3 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
     connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int  ) ),this,
-            SLOT( slotHold( int, QListViewItem *,const QPoint&,int  ) ) );         
+            SLOT( slotHold( int, QListViewItem *,const QPoint&,int  ) ) );
 
@@ -609,3 +609,3 @@ MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QList
     } else {
-                setPixmap( 0, PIXMAP_MBOXFOLDER );
+        setPixmap( 0, PIXMAP_MBOXFOLDER );
         }
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
@@ -6,5 +6,5 @@
 
-#include "settings.h"
-#include "mailwrapper.h"
-#include "abstractmail.h"
+#include <libmailwrapper/settings.h>
+#include <libmailwrapper/mailwrapper.h>
+#include <libmailwrapper/abstractmail.h>
 
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
@@ -9,3 +9,4 @@
 #include "composemail.h"
-#include "smtpwrapper.h"
+
+#include <libmailwrapper/smtpwrapper.h>
 
@@ -25,3 +26,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     QString defmail = c.defaultEmail();
-    
+
     if (defmail.length()!=0) {
@@ -44,3 +45,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     QList<Account> accounts = settings->getAccounts();
-    
+
     Account *it;
@@ -193,3 +194,3 @@ void ComposeMail::accept()
     Mail *mail = new Mail();
-    
+
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
@@ -223,3 +224,3 @@ void ComposeMail::accept()
     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
@@ -8,4 +8,5 @@
 #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
@@ -12,3 +12,4 @@
 #include "nntpconfigui.h"
-#include "settings.h"
+#include <libmailwrapper/settings.h>
+
 
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
@@ -44,5 +44,5 @@ 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
@@ -4,3 +4,4 @@
 #include <qlistview.h>
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
+
 
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
@@ -11,2 +11,3 @@
 
+
 #include "defines.h"
@@ -14,3 +15,3 @@
 #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
@@ -5,3 +5,3 @@
 #include "composemail.h"
-#include "smtpwrapper.h"
+#include <libmailwrapper/smtpwrapper.h>
 #include <qpe/qcopenvelope_qws.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
@@ -4,3 +4,4 @@
 #include "mainwindow.h"
-#include "settings.h"
+#include <libmailwrapper/settings.h>
+
 
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
@@ -13,8 +13,8 @@
 
-#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>
 
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
@@ -9,3 +9,4 @@
 #include "viewmailbase.h"
-#include "mailtypes.h"
+#include <libmailwrapper/mailtypes.h>
+