Convert net to ODP and QtAUX

70 files changed, 310 insertions, 228 deletions

diff --git a/noncore/net/linphone/main.cpp b/noncore/net/linphone/main.cpp
index 9146fee..6368708 100644
--- a/noncore/net/linphone/main.cpp
+++ b/noncore/net/linphone/main.cpp
@@ -15,7 +15,9 @@
  *                                                                         *
  ***************************************************************************/
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 #include "mainwindow.h"
 
+
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 9a09c18..e4bb6c5 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -16,4 +16,5 @@
 #include <qmessagebox.h>
 
+using namespace Opie::Core;
 #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );}
 /**
@@ -50,5 +51,5 @@ AbstractMail *POP3viewItem::getWrapper()
 }
 
-void POP3viewItem::refresh(QValueList<Opie::OSmartPointer<RecMail> > & )
+void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & )
 {
     refresh();
@@ -1043,5 +1044,5 @@ AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
 }
 
-AccountViewItem::AccountViewItem( const Opie::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  )
+AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  )
        :QListViewItem( parent,after ),folder(folderInit)
 {
diff --git a/noncore/net/mail/accountitem.h b/noncore/net/mail/accountitem.h
index 276eae0..6cdb260 100644
--- a/noncore/net/mail/accountitem.h
+++ b/noncore/net/mail/accountitem.h
@@ -25,9 +25,9 @@ public:
     AccountViewItem( QListViewItem *parent);
     AccountViewItem( QListViewItem *parent , QListViewItem*after  );
-    AccountViewItem( const Opie::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  );
+    AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  );
 
     virtual ~AccountViewItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&)=0;
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&)=0;
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
     virtual QPopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
@@ -40,8 +40,8 @@ protected:
     virtual void init();
     virtual void removeChilds();
-    virtual void deleteAllMail(AbstractMail*wrapper,const Opie::OSmartPointer<Folder>&f);
+    virtual void deleteAllMail(AbstractMail*wrapper,const Opie::Core::OSmartPointer<Folder>&f);
     static const QString contextName;
     AccountView*m_Backlink;
-    Opie::OSmartPointer<Folder> folder;
+    Opie::Core::OSmartPointer<Folder> folder;
 };
 
@@ -52,6 +52,6 @@ public:
     POP3viewItem( POP3account *a, AccountView *parent );
     virtual ~POP3viewItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&target );
-    virtual RecBody fetchBody( const Opie::OSmartPointer<RecMail> &mail );
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
@@ -70,8 +70,8 @@ class POP3folderItem : public AccountViewItem
 
 public:
-    POP3folderItem( const Opie::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after  );
+    POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after  );
     virtual ~POP3folderItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&);
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -89,6 +89,6 @@ public:
     NNTPviewItem( NNTPaccount *a, AccountView *parent );
     virtual ~NNTPviewItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&target );
-    virtual RecBody fetchBody( const Opie::OSmartPointer<RecMail> &mail );
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
@@ -108,8 +108,8 @@ class NNTPfolderItem : public AccountViewItem
 
 public:
-    NNTPfolderItem(const Opie::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after  );
+    NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after  );
     virtual ~NNTPfolderItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&);
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -128,6 +128,6 @@ public:
     IMAPviewItem( IMAPaccount *a, AccountView *parent );
     virtual ~IMAPviewItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&);
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
@@ -148,9 +148,9 @@ class IMAPfolderItem : public AccountViewItem
 
 public:
-    IMAPfolderItem( const Opie::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after  );
-    IMAPfolderItem( const Opie::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
+    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after  );
+    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
     virtual ~IMAPfolderItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&);
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -170,6 +170,6 @@ public:
     MHviewItem( const QString&aMboxPath, AccountView *parent );
     virtual ~MHviewItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&target );
-    virtual RecBody fetchBody( const Opie::OSmartPointer<RecMail> &mail );
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
@@ -190,12 +190,12 @@ class MHfolderItem : public AccountViewItem
 
 public:
-    MHfolderItem( const Opie::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after  );
-    MHfolderItem( const Opie::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
+    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after  );
+    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
     virtual ~MHfolderItem();
-    virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&);
+    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
-    virtual const Opie::OSmartPointer<Folder>&getFolder()const;
+    virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const;
     virtual bool isDraftfolder();
 
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 26107ff..811e57a 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -15,4 +15,5 @@
 #include <qpopupmenu.h>
 
+using namespace Opie::Core;
 AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
         : QListView( parent, name, flags )
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index d236058..b082b1f 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -22,6 +22,6 @@ public:
     virtual ~AccountView();
     virtual void populate( QList<Account> list );
-    virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&aMail);
-    virtual void downloadMails(const Opie::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
+    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
+    virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual bool currentisDraft();
 
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 74ccc7b..5bc2883 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -14,4 +14,6 @@
 #include <libmailwrapper/mailtypes.h>
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
     : ComposeMailUI( parent, name, modal, flags )
@@ -161,5 +163,5 @@ void ComposeMail::slotAdjustColumns()
 void ComposeMail::addAttachment()
 {
-    DocLnk lnk = Opie::OFileDialog::getOpenFileName( 1, "/" );
+    DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
     if ( !lnk.name().isEmpty() ) {
         Attachment *att = new Attachment( lnk );
@@ -189,5 +191,5 @@ void ComposeMail::accept()
             smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
 #endif
-    Opie::OSmartPointer<Mail> mail=new Mail;
+    Opie::Core::OSmartPointer<Mail> mail=new Mail;
 
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
@@ -237,5 +239,5 @@ void ComposeMail::reject()
 
     if (yesno == 0) {
-        Opie::OSmartPointer<Mail> mail=new Mail();
+        Opie::Core::OSmartPointer<Mail> mail=new Mail();
         mail->setMail(fromBox->currentText());
         mail->setTo( toLine->text() );
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index c12eb30..4693927 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -38,5 +38,5 @@ public:
     virtual ~ComposeMail();
 
-    void reEditMail(const Opie::OSmartPointer<RecMail>&current);
+    void reEditMail(const Opie::Core::OSmartPointer<RecMail>&current);
 
 public slots:
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 68a7a4d..6bebb7b 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -12,4 +12,5 @@
 #include <libetpan/mailmime.h>
 
+using namespace Opie::Core;
 AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
 {
@@ -130,5 +131,5 @@ QString AbstractMail::draftFolder()
 
 /* temporary - will be removed when implemented in all classes */
-void AbstractMail::deleteMails(const QString &,const QValueList<Opie::OSmartPointer<RecMail> > &)
+void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
 }
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index b03d757..2d55c83 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -22,5 +22,5 @@ public:
     AbstractMail(){};
     virtual ~AbstractMail(){}
-    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders()=0;
+    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
     virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target )=0;
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
@@ -33,10 +33,10 @@ public:
     virtual void deleteMail(const RecMailP&mail)=0;
     virtual void answeredMail(const RecMailP&mail)=0;
-    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&)=0;
-    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::OSmartPointer<RecMail> >&target);
-    virtual int deleteMbox(const Opie::OSmartPointer<Folder>&)=0;
+    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0;
+    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target);
+    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0;
     virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
 
-    virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder,
+    virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
         const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
@@ -48,5 +48,5 @@ public:
      * them has to be appended automatic.
      */
-    virtual int createMbox(const QString&,const Opie::OSmartPointer<Folder>&parentfolder=0,
+    virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
         const QString& delemiter="/",bool getsubfolder=false);
     virtual void logout()=0;
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp
index cb7ccc0..cb58d82 100644
--- a/noncore/net/mail/libmailwrapper/generatemail.cpp
+++ b/noncore/net/mail/libmailwrapper/generatemail.cpp
@@ -6,4 +6,5 @@
 #include <qt.h>
 
+using namespace Opie::Core;
 const char* Generatemail::USER_AGENT="OpieMail v0.6";
 
@@ -280,5 +281,5 @@ mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail
 }
 
-mailimf_fields *Generatemail::createImfFields(const Opie::OSmartPointer<Mail>&mail )
+mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Mail>&mail )
 {
     mailimf_fields *fields = NULL;
@@ -400,5 +401,5 @@ mailimf_fields *Generatemail::createImfFields(const Opie::OSmartPointer<Mail>&ma
 }
 
-mailmime *Generatemail::createMimeMail(const Opie::OSmartPointer<Mail> &mail ) {
+mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &mail ) {
     mailmime *message, *txtPart;
     mailimf_fields *fields;
diff --git a/noncore/net/mail/libmailwrapper/generatemail.h b/noncore/net/mail/libmailwrapper/generatemail.h
index c246a2a..a767b61 100644
--- a/noncore/net/mail/libmailwrapper/generatemail.h
+++ b/noncore/net/mail/libmailwrapper/generatemail.h
@@ -37,6 +37,6 @@ protected:
     mailmime *buildTxtPart(const QString&str );
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
-    mailimf_fields *createImfFields(const Opie::OSmartPointer<Mail> &mail );
-    mailmime *createMimeMail(const Opie::OSmartPointer<Mail>&mail );
+    mailimf_fields *createImfFields(const Opie::Core::OSmartPointer<Mail> &mail );
+    mailmime *createMimeMail(const Opie::Core::OSmartPointer<Mail>&mail );
     clist *createRcptList( mailimf_fields *fields );
 
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index ee2c8cd..f428415 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -3,4 +3,5 @@
 #include "mailtypes.h"
 
+using namespace Opie::Core;
 Genericwrapper::Genericwrapper()
     : AbstractMail()
@@ -388,5 +389,5 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
 }
 
-void Genericwrapper::parseList(QValueList<Opie::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to)
+void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to)
 {
     int r;
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.h b/noncore/net/mail/libmailwrapper/genericwrapper.h
index f9968d1..f5b9504 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.h
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.h
@@ -39,5 +39,5 @@ public:
     virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part);
     virtual void cleanMimeCache();
-    virtual int deleteMbox(const Opie::OSmartPointer<Folder>&){return 1;}
+    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&){return 1;}
     virtual void logout(){};
     virtual void storeMessage(const char*msg,size_t length, const QString&folder){};
@@ -55,5 +55,5 @@ protected:
     static void fillParameters(RecPart&target,clist*parameters);
     static QString getencoding(mailmime_mechanism*aEnc);
-    virtual void parseList(QValueList<Opie::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false);
+    virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false);
     QStringList parseInreplies(mailimf_in_reply_to * in_replies);
 
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 071e734..56e7df9 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -7,4 +7,5 @@
 #include "logindialog.h"
 
+using namespace Opie::Core;
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
     : AbstractMail()
@@ -206,5 +207,5 @@ void IMAPwrapper::logout()
 }
 
-void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::OSmartPointer<RecMail> > &target )
+void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
 {
     int err = MAILIMAP_NO_ERROR;
@@ -267,5 +268,5 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::OSmartPoin
 }
 
-QValueList<Opie::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
+QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 3bd5967..7448acb 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -24,13 +24,13 @@ public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
-    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders();
-    virtual void listMessages(const QString & mailbox,QValueList<Opie::OSmartPointer<RecMail> >&target );
+    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
     virtual void answeredMail(const RecMailP&mail);
-    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&folder);
+    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder);
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
-    virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder,
+    virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
         const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
@@ -42,7 +42,7 @@ public:
     virtual encodedString* fetchRawBody(const RecMailP&mail);
 
-    virtual int createMbox(const QString&,const Opie::OSmartPointer<Folder>&parentfolder=0,
+    virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
         const QString& delemiter="/",bool getsubfolder=false);
-    virtual int deleteMbox(const Opie::OSmartPointer<Folder>&folder);
+    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&folder);
 
     static void imap_progress( size_t current, size_t maximum );
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index 7dd7e58..fd91fe5 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 
+using namespace Opie::Core;
 RecMail::RecMail()
-    :Opie::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
+    :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
 {
     init();
@@ -9,5 +10,5 @@ RecMail::RecMail()
 
 RecMail::RecMail(const RecMail&old)
-    :Opie::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
+    :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
 {
     init();
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index dc10de6..941556a 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -30,5 +30,5 @@ class AbstractMail;
    get the body. Same words for the attachments.
 */
-class RecMail:public Opie::ORefCount
+class RecMail:public Opie::Core::ORefCount
 {
 public:
@@ -82,5 +82,5 @@ protected:
 };
 
-typedef Opie::OSmartPointer<RecMail> RecMailP;
+typedef Opie::Core::OSmartPointer<RecMail> RecMailP;
 typedef QMap<QString,QString> part_plist_t;
 
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 9bf2fd3..eddc0b9 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -22,4 +22,5 @@
 
 
+using namespace Opie::Core;
 Attachment::Attachment( DocLnk lnk )
 {
@@ -156,5 +157,5 @@ QString IMAPFolder::decodeFolderName( const QString &name )
 
 Mail::Mail()
-    :Opie::ORefCount(),name(""), mail(""), to(""), cc(""), bcc(""), reply(""), subject(""), message("")
+    :Opie::Core::ORefCount(),name(""), mail(""), to(""), cc(""), bcc(""), reply(""), subject(""), message("")
 {
 }
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 6bf0078..542de03 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -29,5 +29,5 @@ protected:
 };
 
-class Mail:public Opie::ORefCount
+class Mail:public Opie::Core::ORefCount
 {
 public:
@@ -67,5 +67,5 @@ private:
 };
 
-class Folder:public Opie::ORefCount
+class Folder:public Opie::Core::ORefCount
 {
 public:
@@ -83,5 +83,5 @@ protected:
 };
 
-typedef Opie::OSmartPointer<Folder> FolderP;
+typedef Opie::Core::OSmartPointer<Folder> FolderP;
 
 class MHFolder : public Folder
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index 5e6b714..4aee0be 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -7,4 +7,5 @@
 #include <qpe/global.h>
 
+using namespace Opie::Core;
 MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name)
     : Genericwrapper(),MBOXPath(mbox_dir),MBOXName(mbox_name)
@@ -45,7 +46,7 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
 }
 
-QValueList<Opie::OSmartPointer<Folder> >* MBOXwrapper::listFolders()
+QValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders()
 {
-    QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >();
+    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
     QDir dir(MBOXPath);
     if (!dir.exists()) return folders;
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h
index 33eeb1e..a2ecfee 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h
@@ -17,5 +17,5 @@ public:
 
     virtual void listMessages(const QString & mailbox, QValueList<RecMailP>&target );
-    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders();
+    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
@@ -23,7 +23,7 @@ public:
     virtual void answeredMail(const RecMailP&mail);
 
-    virtual int createMbox(const QString&folder,const Opie::OSmartPointer<Folder>&f=0,
+    virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0,
         const QString&d="",bool s=false);
-    virtual int deleteMbox(const Opie::OSmartPointer<Folder>&);
+    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&);
 
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
@@ -34,5 +34,5 @@ public:
     virtual encodedString* fetchRawBody(const RecMailP&mail);
     virtual void deleteMails(const QString & FolderName,const QValueList<RecMailP> &target);
-    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&);
+    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;
     virtual const QString&getName()const;
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 0b00a2e..21e24a0 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -9,4 +9,7 @@
 #include <opie2/oprocess.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
+using namespace Opie::Core;
 MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
     : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name)
@@ -61,5 +64,5 @@ MHwrapper::~MHwrapper()
 }
 
-void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target )
+void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
 {
     init_storage();
@@ -77,7 +80,7 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::OSmartPoi
 }
 
-QValueList<Opie::OSmartPointer<Folder> >* MHwrapper::listFolders()
+QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
 {
-    QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >();
+    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
     /* this is needed! */
     if (m_storage) mailstorage_disconnect(m_storage);
@@ -318,7 +321,7 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
     OProcess *process = new OProcess();
 
-    connect(process, SIGNAL(processExited(OProcess*)),
+    connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( processEnded(OProcess*)));
-    connect(process, SIGNAL( receivedStderr(OProcess*,char*,int)),
+    connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT( oprocessStderr(OProcess*,char*,int)));
 
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.h b/noncore/net/mail/libmailwrapper/mhwrapper.h
index 208cf2f..1245507 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.h
@@ -9,5 +9,5 @@
 class encodedString;
 struct mailmbox_folder;
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 
 class MHwrapper : public Genericwrapper
@@ -18,6 +18,6 @@ public:
     virtual ~MHwrapper();
 
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target );
-    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target );
+    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
@@ -25,10 +25,10 @@ public:
     virtual void answeredMail(const RecMailP&mail);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
-    virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder,
+    virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
         const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
 
-    virtual int createMbox(const QString&folder,const Opie::OSmartPointer<Folder>&f=0,
+    virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0,
         const QString&d="",bool s=false);
-    virtual int deleteMbox(const Opie::OSmartPointer<Folder>&);
+    virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&);
 
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
@@ -38,6 +38,6 @@ public:
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
-    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::OSmartPointer<RecMail> > &target);
-    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&);
+    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target);
+    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;
     virtual const QString&getName()const;
@@ -45,6 +45,6 @@ public:
 public slots:
     /* for deleting maildirs we are using a system call */
-    virtual void oprocessStderr(OProcess*, char *buffer, int );
-    virtual void processEnded(OProcess *);
+    virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int );
+    virtual void processEnded(Opie::Core::OProcess *);
 protected:
     QString buildPath(const QString&p);
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index c0b3eec..9de958d 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -12,4 +12,5 @@
 #define HARD_MSG_SIZE_LIMIT 5242880
 
+using namespace Opie::Core;
 NNTPwrapper::NNTPwrapper( NNTPaccount *a )
 : Genericwrapper() {
@@ -97,5 +98,5 @@ RecBody NNTPwrapper::fetchBody( const RecMailP &mail ) {
 
 
-void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::OSmartPointer<RecMail> > &target )
+void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
 {
     login();
@@ -189,7 +190,7 @@ void NNTPwrapper::logout()
 }
 
-QValueList<Opie::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
+QValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
 
-    QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >();
+    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
     QStringList groups;
     if (account) {
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.h b/noncore/net/mail/libmailwrapper/nntpwrapper.h
index a7e4b95..a87a8e8 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.h
@@ -21,7 +21,7 @@ public:
 
    /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target );
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target );
     /* should only get the subscribed one */
-    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders();
+    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
@@ -29,5 +29,5 @@ public:
     virtual void deleteMail(const RecMailP&mail);
     virtual void answeredMail(const RecMailP&mail);
-    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&);
+    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
 
     virtual RecBody fetchBody( const RecMailP &mail );
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 6737d6c..f5694fe 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -11,4 +11,5 @@
 #define HARD_MSG_SIZE_LIMIT 5242880
 
+using namespace Opie::Core;
 POP3wrapper::POP3wrapper( POP3account *a )
 : Genericwrapper() {
@@ -94,5 +95,5 @@ RecBody POP3wrapper::fetchBody( const RecMailP &mail ) {
 }
 
-void POP3wrapper::listMessages(const QString &, QValueList<Opie::OSmartPointer<RecMail> > &target )
+void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target )
 {
     login();
@@ -177,6 +178,6 @@ void POP3wrapper::logout()
 
 
-QValueList<Opie::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
-    QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
+QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
+    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
     FolderP inb=new Folder("INBOX","/");
     folders->append(inb);
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index 31eb6f1..c46b941 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -18,6 +18,6 @@ public:
     virtual ~POP3wrapper();
     /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target );
-    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target );
+    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
@@ -25,5 +25,5 @@ public:
     virtual void deleteMail(const RecMailP&mail);
     virtual void answeredMail(const RecMailP&mail);
-    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&);
+    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
 
     virtual RecBody fetchBody( const RecMailP &mail );
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 86673aa..e2cea7a 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -14,4 +14,5 @@
 
 
+using namespace Opie::Core;
 progressMailSend*SMTPwrapper::sendProgress = 0;
 
@@ -313,5 +314,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
 }
 
-void SMTPwrapper::sendMail(const Opie::OSmartPointer<Mail>&mail,bool later )
+void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later )
 {
     mailmime * mimeMail;
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 71ae35c..6c5bbe8 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -24,5 +24,5 @@ public:
     SMTPwrapper(SMTPaccount * aSmtp);
     virtual ~SMTPwrapper();
-    void sendMail(const Opie::OSmartPointer<Mail>& mail,bool later=false );
+    void sendMail(const Opie::Core::OSmartPointer<Mail>& mail,bool later=false );
     bool flushOutbox();
 
@@ -51,5 +51,5 @@ protected:
     void storeMail(mailmime*mail, const QString&box);
 
-    int sendQueuedMail(AbstractMail*wrap,const Opie::OSmartPointer<RecMail>&which);
+    int sendQueuedMail(AbstractMail*wrap,const Opie::Core::OSmartPointer<RecMail>&which);
     void storeFailedMail(const char*data,unsigned int size, const char*failuremessage);
 
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp
index 595e7fc..914a11d 100644
--- a/noncore/net/mail/libmailwrapper/storemail.cpp
+++ b/noncore/net/mail/libmailwrapper/storemail.cpp
@@ -10,4 +10,5 @@
 #include <stdlib.h>
 
+using namespace Opie::Core;
 Storemail::Storemail(Account*aAccount,const QString&aFolder)
     : Generatemail()
@@ -50,5 +51,5 @@ Storemail::~Storemail()
 }
 
-int Storemail::storeMail(const Opie::OSmartPointer<Mail>&mail)
+int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail)
 {
     if (!wrapper) return 0;
diff --git a/noncore/net/mail/libmailwrapper/storemail.h b/noncore/net/mail/libmailwrapper/storemail.h
index 80c7431..4433de0 100644
--- a/noncore/net/mail/libmailwrapper/storemail.h
+++ b/noncore/net/mail/libmailwrapper/storemail.h
@@ -19,5 +19,5 @@ public:
     virtual ~Storemail();
 
-    int storeMail(const Opie::OSmartPointer<Mail>&mail);
+    int storeMail(const Opie::Core::OSmartPointer<Mail>&mail);
 
 protected:
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 005a839..926cdbd 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -53,5 +53,5 @@ INTERFACES     = editaccountsui.ui \
 	
 
-INCLUDEPATH += $(OPIEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
diff --git a/noncore/net/mail/main.cpp b/noncore/net/mail/main.cpp
index 54ac7fb..4942083 100644
--- a/noncore/net/mail/main.cpp
+++ b/noncore/net/mail/main.cpp
@@ -3,3 +3,5 @@
 #include "opiemail.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<OpieMail> )
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index de32007..f672a36 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -13,5 +13,5 @@
 #include "mailapplet.h"
 
-using namespace Opie;
+using namespace Opie::Core;
 
 MailApplet::MailApplet( QWidget *parent )
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 894a386..f00d2cb 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -19,4 +19,5 @@
 #include <qfile.h>
 
+using namespace Opie::Ui;
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                        const QString&fsize,int num,const QValueList<int>&path)
@@ -221,5 +222,5 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
             MimeTypes types;
             types.insert( "all", "*" );
-            QString str = Opie::OFileDialog::getSaveFileName( 1,
+            QString str = OFileDialog::getSaveFileName( 1,
                           "/", item->text( 2 )  , types, 0 );
 
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index c2bf08c..cbb98cc 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -5,5 +5,5 @@
 #include <qvbox.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
diff --git a/noncore/net/opieftp/main.cpp b/noncore/net/opieftp/main.cpp
index d9da4b2..330ca52 100644
--- a/noncore/net/opieftp/main.cpp
+++ b/noncore/net/opieftp/main.cpp
@@ -1,4 +1,5 @@
 
 /***************************************************************************
+
                           main.cpp  -  description
                              -------------------
@@ -14,3 +15,4 @@
 #include "opieftp.h"
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> )
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in
index 7c6949d..38fa347 100644
--- a/noncore/net/opieirc/config.in
+++ b/noncore/net/opieirc/config.in
@@ -2,3 +2,3 @@
     boolean "opie-irc (chat via your favorite IRC server)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBQTAUX
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index f69d2c4..13fcc24 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -4,6 +4,6 @@
 
 /* OPIE */
-#include <opie/ocolorbutton.h>
-#include <opie/otabwidget.h>
+#include <opie2/ocolorbutton.h>
+#include <opie2/otabwidget.h>
 #include <qpe/qpeapplication.h>
 
@@ -12,4 +12,6 @@
 #include <qwhatsthis.h>
 
+using namespace Opie;
+using namespace Opie::Ui;
 IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp)
 {
diff --git a/noncore/net/opieirc/ircsettings.h b/noncore/net/opieirc/ircsettings.h
index cb8d896..56e667b 100644
--- a/noncore/net/opieirc/ircsettings.h
+++ b/noncore/net/opieirc/ircsettings.h
@@ -26,5 +26,7 @@
 #include <qlineedit.h>
 
+namespace Opie {
 class OColorButton;
+}
 
 class IRCSettings : public QDialog {
@@ -37,11 +39,11 @@ protected slots:
 protected:
     Config       *m_config;
-    OColorButton *m_background;
-    OColorButton *m_text;
-    OColorButton *m_error;
-    OColorButton *m_self;
-    OColorButton *m_server;
-    OColorButton *m_other;
-    OColorButton *m_notification;
+    Opie::OColorButton *m_background;
+    Opie::OColorButton *m_text;
+    Opie::OColorButton *m_error;
+    Opie::OColorButton *m_self;
+    Opie::OColorButton *m_server;
+    Opie::OColorButton *m_other;
+    Opie::OColorButton *m_notification;
     QLineEdit    *m_lines;
 };
diff --git a/noncore/net/opieirc/main.cpp b/noncore/net/opieirc/main.cpp
index da38024..f3cbecc 100644
--- a/noncore/net/opieirc/main.cpp
+++ b/noncore/net/opieirc/main.cpp
@@ -1,6 +1,7 @@
 #include "mainwindow.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro
index 537f810..9039ff8 100644
--- a/noncore/net/opieirc/opieirc.pro
+++ b/noncore/net/opieirc/opieirc.pro
@@ -19,5 +19,5 @@ SOURCES		= ircchannel.cpp ircconnection.cpp \
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopieui2 -lqtaux2
 
 TARGET	= opieirc
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 817936d..93b2c67 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -35,5 +35,5 @@
 #include <qpe/resource.h>
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 #include <qpoint.h>
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index bae1c47..d913853 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -2,5 +2,5 @@
 #include <signal.h>
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 #include "device.h"
@@ -8,4 +8,6 @@
 using namespace OpieTooth;
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 namespace {
   int parsePid( const QCString& par ){
@@ -48,9 +50,9 @@ void Device::attach(){
     *m_process << "-p";
     *m_process << m_device << m_mode << m_speed;
-    connect(m_process, SIGNAL( processExited(OProcess*) ),
+    connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
 	    this, SLOT( slotExited(OProcess* ) ) );
-    connect(m_process, SIGNAL( receivedStdout(OProcess*, char*, int) ),
+    connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ),
 	    this, SLOT(slotStdOut(OProcess*,char*,int ) ) );
-    connect(m_process, SIGNAL(receivedStderr(OProcess*, char*, int ) ),
+    connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ),
 	    this, SLOT(slotStdErr(OProcess*,char*,int) ) );
     if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){
@@ -97,5 +99,5 @@ void Device::slotExited( OProcess* proc)
 	*m_hci << "hciconfig";
 	*m_hci << "hci0 up";
-	connect(m_hci, SIGNAL( processExited(OProcess*) ),
+	connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
 		this, SLOT( slotExited(OProcess* ) ) );
 	if(!m_hci->start() ){
diff --git a/noncore/net/opietooth/lib/device.h b/noncore/net/opietooth/lib/device.h
index ce7fccc..f3339fc 100644
--- a/noncore/net/opietooth/lib/device.h
+++ b/noncore/net/opietooth/lib/device.h
@@ -9,5 +9,5 @@
 #include <sys/types.h>
 
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 namespace OpieTooth {
     /**
@@ -68,7 +68,7 @@ namespace OpieTooth {
         void device(const QString& device, bool up );
     private slots:
-        virtual void slotExited( OProcess* );
-        virtual void slotStdOut(OProcess*, char*, int );
-	virtual void slotStdErr(OProcess*, char*, int );
+        virtual void slotExited( Opie::Core::OProcess* );
+        virtual void slotStdOut(Opie::Core::OProcess*, char*, int );
+	virtual void slotStdErr(Opie::Core::OProcess*, char*, int );
     private:
 	class Private;
@@ -76,6 +76,6 @@ namespace OpieTooth {
 	QString m_device;
 	bool m_attached:1;
-	OProcess* m_hci;
-	OProcess* m_process;
+	Opie::Core::OProcess* m_hci;
+	Opie::Core::OProcess* m_process;
 	QString m_devId;
 	QString m_mode;
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index c89d325..56156a8 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -1,5 +1,5 @@
 
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 #include "parser.h"
@@ -9,4 +9,6 @@
 using namespace OpieTooth;
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 Manager::Manager( const QString& dev )
   : QObject()
@@ -43,5 +45,5 @@ void Manager::isAvailable( const QString& device ){
     l2ping->setName( device.latin1() );
     *l2ping << "l2ping" << "-c1" << device;
-    connect(l2ping, SIGNAL(processExited(OProcess* ) ),
+    connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ),
             this, SLOT(slotProcessExited(OProcess*) ) );
     if (!l2ping->start() ) {
@@ -61,7 +63,7 @@ void Manager::searchDevices( const QString& device ){
     hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
     *hcitool << "hcitool" << "scan";
-    connect( hcitool, SIGNAL(processExited(OProcess*) ) ,
+    connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
              this, SLOT(slotHCIExited(OProcess* ) ) );
-    connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
+    connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
              this, SLOT(slotHCIOut(OProcess*, char*, int ) ) );
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
@@ -108,7 +110,7 @@ void Manager::searchServices( const QString& remDevice ){
     m_sdp->setName( remDevice.latin1() );
     qWarning("search Services for %s", remDevice.latin1() );
-    connect(m_sdp, SIGNAL(processExited(OProcess*) ),
+    connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotSDPExited(OProcess* ) ) );
-    connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*,  int ) ),
+    connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
             this, SLOT(slotSDPOut(OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
@@ -247,7 +249,7 @@ void Manager::searchConnections() {
     m_hcitoolCon = QString::null;
 
-    connect(proc, SIGNAL(processExited(OProcess*) ),
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotConnectionExited( OProcess*) ) );
-    connect(proc, SIGNAL(receivedStdout(OProcess*, char*, int) ),
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
             this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) );
     *proc << "hcitool";
@@ -306,7 +308,7 @@ void Manager::signalStrength( const QString &mac ) {
     OProcess* sig_proc = new OProcess();
 
-    connect(sig_proc, SIGNAL(processExited(OProcess*) ),
+    connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotSignalStrengthExited( OProcess*) ) );
-    connect(sig_proc, SIGNAL(receivedStdout(OProcess*, char*, int) ),
+    connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
             this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) );
     *sig_proc << "hcitool";
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index abc8ba1..9b1c714 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -12,5 +12,5 @@
 #include "services.h"
 
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 namespace OpieTooth {
     class Device;
@@ -143,28 +143,28 @@ namespace OpieTooth {
 
 private slots:
-        void slotProcessExited(OProcess* );
+        void slotProcessExited(Opie::Core::OProcess* );
 
-        void slotSDPExited(OProcess*);
-        void slotSDPOut(OProcess*, char*, int);
+        void slotSDPExited(Opie::Core::OProcess*);
+        void slotSDPOut(Opie::Core::OProcess*, char*, int);
 
-        void slotHCIExited(OProcess* );
-        void slotHCIOut(OProcess*, char*, int );
+        void slotHCIExited(Opie::Core::OProcess* );
+        void slotHCIOut(Opie::Core::OProcess*, char*, int );
 
-        void slotConnectionExited(OProcess* );
-        void slotConnectionOutput(OProcess*, char*, int );
+        void slotConnectionExited(Opie::Core::OProcess* );
+        void slotConnectionOutput(Opie::Core::OProcess*, char*, int );
 
-	void slotSignalStrengthOutput( OProcess*, char*, int );
-	void slotSignalStrengthExited( OProcess* );
+	void slotSignalStrengthOutput( Opie::Core::OProcess*, char*, int );
+	void slotSignalStrengthExited( Opie::Core::OProcess* );
     private:
         Services::ValueList parseSDPOutput( const QString& );
         RemoteDevice::ValueList parseHCIOutput( const QString& );
         ConnectionState::ValueList parseConnections( const QString& );
-        OProcess *m_hcitool;
-        OProcess *m_sdp; // not only one
+        Opie::Core::OProcess *m_hcitool;
+        Opie::Core::OProcess *m_sdp; // not only one
         QString m_device;
 	QMap<QString, int> m_signalStrength;
         QMap<QString, QString> m_out;
         QMap<QString, QString> m_devices;
-	QMap<OProcess*, QString> m_signalMac;
+	QMap<Opie::Core::OProcess*, QString> m_signalMac;
         QString m_hcitoolCon;
     };
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp
index c3850eb..90ef04a 100644
--- a/noncore/net/opietooth/lib/startdunconnection.cpp
+++ b/noncore/net/opietooth/lib/startdunconnection.cpp
@@ -5,4 +5,6 @@ using namespace OpieTooth;
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 StartDunConnection::StartDunConnection() {
     m_dunConnect = 0l;
@@ -40,7 +42,7 @@ void StartDunConnection::start()  {
     *m_dunConnect << "dund" << "--listen" << "--connect"  << m_mac;
 
-    connect( m_dunConnect, SIGNAL( processExited(OProcess*) ) ,
+    connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
              this, SLOT( slotExited(OProcess*) ) );
-    connect( m_dunConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+    connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
              this, SLOT( slotStdOut(OProcess*,char*,int) ) );
     if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
diff --git a/noncore/net/opietooth/lib/startdunconnection.h b/noncore/net/opietooth/lib/startdunconnection.h
index 43a852a..f6107f6 100644
--- a/noncore/net/opietooth/lib/startdunconnection.h
+++ b/noncore/net/opietooth/lib/startdunconnection.h
@@ -4,5 +4,5 @@
 #include <qobject.h>
 #include "connection.h"
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 namespace OpieTooth {
@@ -28,9 +28,9 @@ namespace OpieTooth {
 	QString m_mac;
 	ConnectionType m_connectionType;
-	OProcess* m_dunConnect;
+	Opie::Core::OProcess* m_dunConnect;
 	
     private slots:
-	void slotExited( OProcess* proc );
-                void slotStdOut( OProcess* proc, char* chars, int len );
+	void slotExited( Opie::Core::OProcess* proc );
+                void slotStdOut( Opie::Core::OProcess* proc, char* chars, int len );
     };
 
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp
index a42b407..fef35d9 100644
--- a/noncore/net/opietooth/lib/startpanconnection.cpp
+++ b/noncore/net/opietooth/lib/startpanconnection.cpp
@@ -5,4 +5,6 @@ using namespace OpieTooth;
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 StartPanConnection::StartPanConnection() {
     m_panConnect = 0l;
@@ -41,7 +43,7 @@ void StartPanConnection::start()  {
     *m_panConnect << "pand" << "--connect" << m_mac;
 
-    connect( m_panConnect, SIGNAL( processExited(OProcess*) ) ,
+    connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
              this, SLOT( slotExited(OProcess*) ) );
-    connect( m_panConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+    connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
              this, SLOT( slotStdOut(OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
@@ -71,7 +73,7 @@ void StartPanConnection::stop()  {
     *m_panConnect << "pand" << "--kill" << m_mac;
 
-    connect( m_panConnect, SIGNAL( processExited(OProcess*) ) ,
+    connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
              this, SLOT( slotExited(OProcess*) ) );
-    connect( m_panConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+    connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
              this, SLOT( slotStdOut(OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
diff --git a/noncore/net/opietooth/lib/startpanconnection.h b/noncore/net/opietooth/lib/startpanconnection.h
index 7e5bd95..e12dad0 100644
--- a/noncore/net/opietooth/lib/startpanconnection.h
+++ b/noncore/net/opietooth/lib/startpanconnection.h
@@ -4,5 +4,5 @@
 #include <qobject.h>
 #include "connection.h"
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 namespace OpieTooth {
@@ -28,9 +28,9 @@ namespace OpieTooth {
 	QString m_mac;
 	ConnectionType m_connectionType;
-	OProcess* m_panConnect;
+	Opie::Core::OProcess* m_panConnect;
 	
     private slots:
-	void slotExited( OProcess* proc );
-        void slotStdOut( OProcess* proc, char* chars, int len );
+	void slotExited( Opie::Core::OProcess* proc );
+        void slotStdOut( Opie::Core::OProcess* proc, char* chars, int len );
     };
 
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp
index 82aeebd..a96f128 100644
--- a/noncore/net/opietooth/manager/main.cpp
+++ b/noncore/net/opietooth/manager/main.cpp
@@ -1,3 +1,5 @@
 /*
+using namespace Opie::Core;
+using namespace Opie::Core;
  * main.cpp
  *
@@ -20,5 +22,5 @@
 #include "bluebase.h"
 #include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> )
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp
index 46a0e3d..1ef862a 100644
--- a/noncore/net/opietooth/manager/obexdialog.cpp
+++ b/noncore/net/opietooth/manager/obexdialog.cpp
@@ -10,9 +10,12 @@
 #include <qpe/resource.h>
 
-#include <opie/oprocess.h>
-#include <opie/ofiledialog.h>
+#include <opie2/oprocess.h>
+#include <opie2/ofiledialog.h>
 
 using namespace OpieTooth;
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+using namespace Opie::Core;
 ObexDialog::ObexDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
     : QDialog( parent, name, modal, fl ) {
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h
index b3d5e6d..d5b5682 100644
--- a/noncore/net/opietooth/manager/obexdialog.h
+++ b/noncore/net/opietooth/manager/obexdialog.h
@@ -4,5 +4,5 @@
 
 #include <qdialog.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 class QVBoxLayout;
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 4e58552..870e7fd 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -6,8 +6,10 @@
 #include <qlayout.h>
 #include <qlabel.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 using namespace OpieTooth;
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 PPPDialog::PPPDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
     : QDialog( parent, name, modal, fl ) {
@@ -53,5 +55,5 @@ void PPPDialog::connectToDevice() {
     OProcess* pppDial = new OProcess();
     *pppDial << "pppd" << m_device << "call" << connectScript;
-    connect( pppDial, SIGNAL(receivedStdout(OProcess*,char*,int) ),
+    connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ),
                 this, SLOT(fillOutPut(OProcess*,char*,int) ) );
      if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) {
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h
index bb8b734..05894e2 100644
--- a/noncore/net/opietooth/manager/pppdialog.h
+++ b/noncore/net/opietooth/manager/pppdialog.h
@@ -4,5 +4,5 @@
 
 #include <qdialog.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 class QVBoxLayout;
@@ -24,5 +24,5 @@ namespace OpieTooth {
     private slots:
         void connectToDevice();
-        void fillOutPut( OProcess* pppDial, char* cha, int len );
+        void fillOutPut( Opie::Core::OProcess* pppDial, char* cha, int len );
     protected:
         QVBoxLayout* layout;
diff --git a/noncore/net/ubrowser/main.cpp b/noncore/net/ubrowser/main.cpp
index 0488cfd..0736f1f 100644
--- a/noncore/net/ubrowser/main.cpp
+++ b/noncore/net/ubrowser/main.cpp
@@ -19,6 +19,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "mainview.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
+
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainView> )
 
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 95b03d0..da39113 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -44,4 +44,10 @@ using namespace Opie;
 #include <assert.h>
 
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Core;
+using namespace Opie::Net;
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 7dcc583..6bbc39b 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -30,4 +30,7 @@
 #include <unistd.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
+using namespace Opie::Core;
 int main( int argc, char **argv )
 {
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 5cc0daf..7add6cd 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -52,4 +52,9 @@ using namespace Opie;
 #include <unistd.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Net;
+using namespace Opie::Ui;
+using namespace Opie::Net;
+using namespace Opie::Net;
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp
index ef5d020..8312e71 100644
--- a/noncore/net/wellenreiter/gui/packetview.cpp
+++ b/noncore/net/wellenreiter/gui/packetview.cpp
@@ -26,4 +26,7 @@
 #include <qlist.h>
 
+using namespace Opie::Net;
+using namespace Opie::Net;
+using namespace Opie::Net;
 PacketView::PacketView( QWidget * parent, const char * name, WFlags f )
            :QFrame( parent, name, f )
diff --git a/noncore/net/wellenreiter/gui/packetview.h b/noncore/net/wellenreiter/gui/packetview.h
index b5f2b26..1ac19bb 100644
--- a/noncore/net/wellenreiter/gui/packetview.h
+++ b/noncore/net/wellenreiter/gui/packetview.h
@@ -24,5 +24,5 @@ class QSpinBox;
 class QLabel;
 class QTextView;
-class OPacket;
+namespace Opie {namespace Net {class Opie::Net::OPacket;}}
 
 class PacketView: public QFrame
@@ -32,5 +32,5 @@ class PacketView: public QFrame
     PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 );
 
-    void add( OPacket* p );
+    void add( Opie::Net::OPacket* p );
     const QString getLog() const;
     void clear();
@@ -42,5 +42,5 @@ class PacketView: public QFrame
     QLabel* _list;
     QTextView* _hex;
-    QList<OPacket> _packets;
+    QList<Opie::Net::OPacket> _packets;
 
 };
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 6005818..3b7120a 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -47,4 +47,10 @@ const int col_lastseen = 9;
 const int col_location = 10;
 
+using namespace Opie::Net;
+using namespace Opie::Ui;
+using namespace Opie::Net;
+using namespace Opie::Ui;
+using namespace Opie::Ui;
+using namespace Opie::Net;
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index ab870c2..6a80f70 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -29,5 +29,5 @@ class QString;
 class MScanListItem;
 
-class MScanListView: public OListView
+class MScanListView: public Opie::Ui::OListView
 {
   Q_OBJECT
@@ -37,18 +37,18 @@ class MScanListView: public OListView
     virtual ~MScanListView();
 
-    virtual OListViewItem* childFactory();
+    virtual Opie::Ui::OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   public slots:
-    void addNewItem( const QString& type, const QString&, const OMacAddress&, bool, int, int, const GpsLocation&, bool = false );
-    void addService( const QString& name, const OMacAddress& macaddr, const QString& ip );
+    void addNewItem( const QString& type, const QString&, const Opie::Net::OMacAddress&, bool, int, int, const GpsLocation&, bool = false );
+    void addService( const QString& name, const Opie::Net::OMacAddress& macaddr, const QString& ip );
 
-    void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
-    void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
-    void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo );
-    void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
+    void fromDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via );
+    void toDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via );
+    void WDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& viaFrom, const Opie::Net::OMacAddress& viaTo );
+    void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via );
 
-    void identify( const OMacAddress&, const QString& ipaddr );
+    void identify( const Opie::Net::OMacAddress&, const QString& ipaddr );
 
     void contextMenuRequested( QListViewItem* item, const QPoint&, int );
@@ -59,5 +59,5 @@ class MScanListView: public OListView
 
   protected:
-    void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" );
+    void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" );
 
 };
@@ -65,5 +65,5 @@ class MScanListView: public OListView
 //****************************** MScanListItem ****************************************************************
 
-class MScanListItem: public OListViewItem
+class MScanListItem: public Opie::Ui::OListViewItem
 {
   public:
@@ -107,5 +107,5 @@ class MScanListItem: public OListViewItem
     void setLocation( const QString& location );
 
-    virtual OListViewItem* childFactory();
+    virtual Opie::Ui::OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
@@ -126,5 +126,5 @@ class MScanListItem: public OListViewItem
 /*
 
-class MScanListViewFactory : public OListViewFactory
+class MScanListViewFactory : public Opie::Ui::OListViewFactory
 {
 public:
diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp
index 48e4847..e3c6bbe 100644
--- a/noncore/net/wellenreiter/gui/statwindow.cpp
+++ b/noncore/net/wellenreiter/gui/statwindow.cpp
@@ -17,4 +17,7 @@
 #include <opie2/olistview.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f )
            :QVBox( parent, name, f )
diff --git a/noncore/net/wellenreiter/gui/statwindow.h b/noncore/net/wellenreiter/gui/statwindow.h
index b9057e7..e11247b 100644
--- a/noncore/net/wellenreiter/gui/statwindow.h
+++ b/noncore/net/wellenreiter/gui/statwindow.h
@@ -20,5 +20,5 @@
 
 class QString;
-class OListView;
+namespace Opie {namespace Ui {class Opie::Ui::OListView;}}
 
 class MStatWindow: public QVBox
@@ -36,5 +36,5 @@ class MStatWindow: public QVBox
 
   protected:
-    OListView* table;
+    Opie::Ui::OListView* table;
 
 };
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index ce416e5..e8d9de7 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -62,4 +62,10 @@ using namespace Opie;
 #include <stdlib.h>
 
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Net;
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Core;
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
@@ -447,5 +453,5 @@ void Wellenreiter::stopClicked()
     if ( iface )
     {
-        disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
+        disconnect( SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
         iface->setChannelHopping(); // stop hopping channels
@@ -612,5 +618,5 @@ void Wellenreiter::startClicked()
     {
         // connect socket notifier and start channel hopper
-        connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
+        connect( pcap, SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) );
         connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
     }
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index d02813b..83299c9 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -19,19 +19,19 @@
 #ifdef QWS
 #include <opie2/odevice.h>
-using namespace Opie;
 #endif
 
 class QTimerEvent;
 class QPixmap;
-class OPacket;
-class OWaveLanManagementPacket;
-class OWaveLanControlPacket;
-class OWaveLanDataPacket;
-class OEthernetPacket;
-class OARPPacket;
-class OMacAddress;
-class OIPPacket;
-class OPacketCapturer;
-class OWirelessNetworkInterface;
+namespace Opie {namespace Net {class Opie::Net::OPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OWaveLanManagementPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OWaveLanControlPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OWaveLanDataPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OEthernetPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OARPPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OMacAddress;}}
+namespace Opie {namespace Net {class Opie::Net::OIPPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OPacket;}}
+namespace Opie {namespace Net {class Opie::Net::OWirelessNetworkInterface;}}
+namespace Opie {namespace Net {class Opie::Net::OPacketCapturer;}}
 class PacketView;
 class WellenreiterConfigWindow;
@@ -63,5 +63,5 @@ class Wellenreiter : public WellenreiterBase {
 
     void channelHopped(int);
-    void receivePacket(OPacket*);
+    void receivePacket(Opie::Net::OPacket*);
     void startClicked();
     void stopClicked();
@@ -74,26 +74,26 @@ class Wellenreiter : public WellenreiterBase {
 
   private:
-    void handleManagementFrame( OPacket* p, OWaveLanManagementPacket* );
-    void handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* );
-    void handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* );
-    void handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* );
-    void handleControlFrame( OPacket* p, OWaveLanControlPacket* control );
-    void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to );
-    void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to );
-    void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to );
-    void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to );
-    void handleNotification( OPacket* p );
-    void doAction( const QString& action, const QString& protocol, OPacket* p );
-    QObject* childIfToParse( OPacket* p, const QString& protocol );
-    bool checkDumpPacket( OPacket* p );
+    void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
+    void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
+    void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
+    void handleManagementFrameProbeResponse( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
+    void handleControlFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanControlPacket* control );
+    void handleWlanData( Opie::Net::OPacket* p, Opie::Net::OWaveLanDataPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
+    void handleEthernetData( Opie::Net::OPacket* p, Opie::Net::OEthernetPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
+    void handleARPData( Opie::Net::OPacket* p, Opie::Net::OARPPacket* arp, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
+    void handleIPData( Opie::Net::OPacket* p, Opie::Net::OIPPacket* ip, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
+    void handleNotification( Opie::Net::OPacket* p );
+    void doAction( const QString& action, const QString& protocol, Opie::Net::OPacket* p );
+    QObject* childIfToParse( Opie::Net::OPacket* p, const QString& protocol );
+    bool checkDumpPacket( Opie::Net::OPacket* p );
 
   private:
     #ifdef QWS
-    OSystem _system;                // Opie Operating System identifier
+    Opie::Core::OSystem _system;                // Opie Operating System identifier
     #endif
 
     QString dumpname;
-    OWirelessNetworkInterface* iface;
-    OPacketCapturer* pcap;
+    Opie::Net::OWirelessNetworkInterface* iface;
+    Opie::Net::OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
     GPS* gps;
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index 3d0595d..f035e89 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -39,4 +39,7 @@ using namespace Opie;
  *  name 'name' and widget flags set to 'f'
  */
+using namespace Opie::Ui;
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index 126aad2..e40b699 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -47,5 +47,5 @@ public:
 
 #ifdef QWS
-    OTabWidget* TabWidget;
+    Opie::Ui::OTabWidget* TabWidget;
 #else
     QTabWidget* TabWidget;