156 files changed, 1001 insertions, 337 deletions
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
index a3f8e10..6712870 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
@@ -1,10 +1,12 @@
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <qpe/config.h>
+using namespace Opie::Core;
 int main( int argc, char** argv )
 {
    OApplication* app = new OApplication( argc, argv, "MyConfigDemoApplication" );
    OConfigGroupSaver c1( app->config(), "MyGroup" );
    app->config()->writeEntry( "AnEntry", "InMyGroup" );
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
index e8bf04f..0b8e1fe 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
@@ -14,12 +14,14 @@
 #include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 #include <opie2/oglobal.h>
 #include <opie2/oglobalsettings.h>
+using namespace Opie::Core;
 class DemoApp : public OApplication
 {
 Q_OBJECT
 public:
  DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 debug demo" )
  {
diff --git a/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.cpp b/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.cpp
index 2f5220b..56f1a0b 100644
--- a/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.cpp
+++ b/libopie2/examples/opiecore/oglobalsettingsdemo/oglobalsettingsdemo.cpp
@@ -1,8 +1,10 @@
 #include <opie2/oglobalsettings.h>
-#include <iostream.h>
+#include <iostream>
+using namespace Opie::Core;
 int main( int argc, char** argv )
 {
    printf( "current debugmode seems to be '%d'\n", OGlobalSettings::debugMode() );
    printf( "output information for this mode is '%s'\n", (const char*) OGlobalSettings::debugOutput() );
diff --git a/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp
index 0abf53e..2193565 100644
--- a/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp
+++ b/libopie2/examples/opiecore/oprocessdemo/oprocessdemo.cpp
@@ -1,8 +1,10 @@
 #include <opie2/oprocess.h>
-#include <iostream.h>
+#include <iostream>
+using namespace Opie::Core;
 int main( int argc, char** argv )
 {
    printf( "my own PID seems to be '%d'\n", OProcess::processPID( "oprocessdemo" ) );
    printf( "the PID of process 'Mickey' seems to be '%d'\n\n", OProcess::processPID( "Mickey" ) );
diff --git a/libopie2/examples/opiedb/sqltest/spaltenweise.cpp b/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
index 8790cdd..e1a4d5d 100644
--- a/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
+++ b/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
@@ -1,13 +1,15 @@
 #include <qdir.h>
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
+#include <opie2/osqlmanager.h>
-#include "../osqlquery.h"
+#include <opie2/osqlquery.h>
-#include "../osqldriver.h"
+#include <opie2/osqldriver.h>
-#include "../osqlresult.h"
+#include <opie2/osqlresult.h>
+using namespace Opie::DB;
 int main( int argc,  char* argv[] ) {
    QPEApplication app( argc, argv );
    OSQLManager man;
    man.registerPath( QDir::currentDirPath() );
diff --git a/libopie2/examples/opiedb/sqltest/spaltenweise.pro b/libopie2/examples/opiedb/sqltest/spaltenweise.pro
index f54fada..3cab802 100644
--- a/libopie2/examples/opiedb/sqltest/spaltenweise.pro
+++ b/libopie2/examples/opiedb/sqltest/spaltenweise.pro
@@ -1,13 +1,13 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = 
        SOURCES         = spaltenweise.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiesql
+LIBS            += -lqpe -lopiedb2
        TARGET  = spaltenweise
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiedb/sqltest/zeilenweise.cpp b/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
index e538c9f..2d11ac5 100644
--- a/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
+++ b/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
@@ -1,13 +1,15 @@
 #include <qdir.h>
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
+#include <opie2/osqlmanager.h>
-#include "../osqlquery.h"
+#include <opie2/osqlquery.h>
-#include "../osqldriver.h"
+#include <opie2/osqldriver.h>
-#include "../osqlresult.h"
+#include <opie2/osqlresult.h>
+using namespace Opie::DB;
 int main( int argc,  char* argv[] ) {
 QPEApplication app( argc, argv );
 OSQLManager man;
 man.registerPath( QDir::currentDirPath() );
diff --git a/libopie2/examples/opiedb/sqltest/zeilenweise.pro b/libopie2/examples/opiedb/sqltest/zeilenweise.pro
index e5cfcc7..6952921 100644
--- a/libopie2/examples/opiedb/sqltest/zeilenweise.pro
+++ b/libopie2/examples/opiedb/sqltest/zeilenweise.pro
@@ -1,13 +1,13 @@
        TEMPLATE= app
        CONFIG  = qt warn_on release
        HEADERS         = 
        SOURCES         = zeilenweise.cpp
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiesql
+LIBS            += -lqpe -lopiedb2
        TARGET  = zeilenweise
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
index 79bf327..8d421fd 100644
--- a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
+++ b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
@@ -1,8 +1,10 @@
 #include <opie2/osoundsystem.h>
+using namespace Opie::MM;
 int main( int argc, char** argv )
 {
    qDebug( "OPIE Sound System Demo" );
    OSoundSystem* sound = OSoundSystem::instance();
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
index eb2e8e8..f1966c1 100644
--- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
+++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
@@ -6,12 +6,14 @@
 #include <opie2/opcap.h>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+using namespace Opie::Net;
 //======================== Station help class ===============================
 class Station
 {
  public:
    Station( QString t, int c, bool w ) : type(t), channel(c), wep(w), beacons(1) {};
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index 4763316..4f8af60 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,12 +1,14 @@
 #include <opie2/onetwork.h>
 #include <opie2/ostation.h>
 #include <opie2/omanufacturerdb.h>
 #include <unistd.h>
+using namespace Opie::Net;
 int main( int argc, char** argv )
 {
    qDebug( "OPIE Network Demo" );
    ONetwork* net = ONetwork::instance();
diff --git a/libopie2/examples/opieui/olistviewdemo/main.cpp b/libopie2/examples/opieui/olistviewdemo/main.cpp
index a93f361..cd49c28 100644
--- a/libopie2/examples/opieui/olistviewdemo/main.cpp
+++ b/libopie2/examples/opieui/olistviewdemo/main.cpp
@@ -13,12 +13,15 @@
 **
 **********************************************************************/
 #include "olistviewdemo.h"
 #include <opie2/oapplication.h>
+using namespace Opie::Ui;
+using namespace Opie::Core;
 int main( int argc, char **argv )
 {
    OApplication a( argc, argv, "OListViewDemo" );
    OListViewDemo e;
    a.showMainWidget(&e);
    return a.exec();
diff --git a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
index 5ba7b69..7834b3b 100644
--- a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
+++ b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
@@ -34,12 +34,14 @@
 #include <opie2/olistview.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qlistview.h>
+using namespace Opie::Ui;
 OListViewDemo::OListViewDemo( QWidget* parent, const char* name, WFlags f )
                   :QVBox( parent, name, f )
 {
    lv = new ONamedListView( this );
    lv->setRootIsDecorated( true );
    lv->addColumns( QStringList::split( ' ', "Column1 Column2 Column3 Column4" ) );
diff --git a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.h b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.h
index 8a5986a..0b5c498 100644
--- a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.h
+++ b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.h
@@ -41,11 +41,11 @@ class OListViewDemo: public QVBox
  public:
    OListViewDemo( QWidget* parent=0, const char* name=0, WFlags f=0 );
    virtual ~OListViewDemo();
  private:
-    ONamedListView* lv;
+    Opie::Ui::ONamedListView* lv;
 };
 #endif
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
index 7ba0f0d..4a1468d 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
@@ -1,19 +1,20 @@
 #include "osplitter_example.h"
 /* OPIE */
 #include <opie2/osplitter.h>
+#include <opie2/ofileselector.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
 /* QT*/
 #include <qdir.h>
 #include <qlayout.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
 OSplitterExample::OSplitterExample( QWidget *w,const char* n,WFlags f )
    : QWidget( w, n, f ){
    QVBoxLayout * lay = new QVBoxLayout(this);
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_example.h b/libopie2/examples/opieui/osplitter_example/osplitter_example.h
index 176ad62..0cf28aa 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_example.h
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_example.h
@@ -3,13 +3,12 @@
 */
 #ifndef OSPlitter_EXAMPLE_H
 #define OSPlitter_EXAMPLE_H
 #include <qvbox.h>
-#include <opie2/ofileselector.h>
 
 class OSplitterExample : public QWidget {
    Q_OBJECT
 public:
    static QString appName() { return QString::fromLatin1("osplitter_example"); }
    OSplitterExample( QWidget *parent, const char* name, WFlags fl );
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
index 789496c..6443dc0 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
@@ -6,12 +6,14 @@
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
 #include "osplitter_mail.h"
+using namespace Opie::Ui;
 OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
 class Folder {
    int dummy;
 };
@@ -22,19 +24,19 @@ ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
    qApp->installEventFilter( this );
    m_lstFolders.setAutoDelete( true );
    QHBoxLayout *lay = new QHBoxLayout(this);
    m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
    lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
+    connect(m_splitter, SIGNAL(sizeChanged(bool,Orientation) ),
-            this, SLOT(slotSizeChange(bool,const QSize&) ) );
+            this, SLOT(slotSizeChange(bool,Orientation) ) );
    m_overview = new QListView( m_splitter );
    m_overview->header()->setClickEnabled( FALSE );
    m_overview->addColumn( tr("Folder") );
-    m_overview->setMaximumWidth( 200 );
+//    m_overview->setMaximumWidth( 200 );
    m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
    m_splitter->setSizeChange( 300 );
    /* OSplitter starts with the small mode */
    m_messages = 0;
    m_message = m_attach  = 0;
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h
index 1447a92..67961fb 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h
@@ -13,18 +13,16 @@
 #include <qwidget.h>
 #include <qlist.h>
 #include <qlistview.h>
 #include <opie2/osplitter.h>
-using Opie::OSplitter;
 class Folder;
 class QLabel;
-class OSplitter;
 class ListViews : public QWidget {
    Q_OBJECT
 public:
    static QString appName() { return QString::fromLatin1("osplitter-mail"); }
    ListViews( QWidget* parent, const char * name, WFlags fl );
    ~ListViews();
@@ -36,14 +34,14 @@ private:
    QListView *m_messages, *m_overview;
    QLabel *m_message, *m_attach;
    QList<QListView> m_folders; // used in tab mode
    QList<Folder> m_lstFolders;
    bool m_mode : 1; // bitfield
-    OSplitter *m_splitter;
+    Opie::Ui::OSplitter *m_splitter;
-    OSplitter *splitti;
+    Opie::Ui::OSplitter *splitti;
    QListView *folder1;
 #if 0
 //private slots:
 //    void slotFolderChanged( QListViewItem* );
 //    void slotMessageChanged();
 //    void slotSizeChange( bool, const QSize& );
diff --git a/libopie2/examples/opieui/oversatileviewdemo/main.cpp b/libopie2/examples/opieui/oversatileviewdemo/main.cpp
index d8c01a4..bcda14c 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/main.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/main.cpp
@@ -14,12 +14,15 @@
 **********************************************************************/
 #include "opieuidemo.h"
 #include <opie2/oapplication.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 int main( int argc, char **argv )
 {
    OApplication a( argc, argv, "Opie UI Demo" );
    qDebug( "." );
    OpieUIDemo e;
    qDebug( "." );
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
index 0d8bc9f..754a744 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
@@ -22,23 +22,18 @@
 #include <qvbox.h>
 #include <qstring.h>
 #include <qstringlist.h>
 // Qtopia
-#ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
-#endif
 // Opie
-#ifdef QWS
 #include <opie2/odevice.h>
-using namespace Opie;
-#endif
 #include <opie2/ocompletionbox.h>
 #include <opie2/olineedit.h>
 #include <opie2/ocombobox.h>
 #include <opie2/oeditlistbox.h>
 #include <opie2/oselector.h>
@@ -48,12 +43,15 @@ using namespace Opie;
 #include "oversatileviewdemo.h"
 // Local
 #include "opieuidemo.h"
+using namespace Opie::Core;
+using namespace Opie::Ui;
 enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector };
 OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
    : QMainWindow( parent, name, fl )
 {
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.h b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.h
index 0519ae6..382885f 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.h
+++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.h
@@ -15,13 +15,17 @@
 #ifndef OPIEUIDEMO_H
 #define OPIEUIDEMO_H
 #include <qmainwindow.h>
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
+}
+}
 class QTabWidget;
 class QVBox;
 class OpieUIDemo : public QMainWindow {
    Q_OBJECT
@@ -44,13 +48,13 @@ protected:
    void build();
    void buildVV( QVBox* b );
    
 private:
    QTabWidget* main;
    
-    OVersatileView* vv;
+    Opie::Ui::OVersatileView* vv;
 };
 #endif
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
index 9db4e62..b6d59aa 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
@@ -35,12 +35,14 @@
 #include <opie2/oversatileviewitem.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qlistview.h>
+using namespace Opie::Ui;
 OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlags f )
                   :QVBox( parent, name, f )
 {
    vv = new OVersatileView( this );
    
    vv->addColumn( "First" );
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.h b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.h
index 79318d0..35e2c3c 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.h
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.h
@@ -31,43 +31,47 @@
 #ifndef OVERSATILEVIEWDEMO_H
 #define OVERSATILEVIEWDEMO_H
 #include <qvbox.h>
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
 class OVersatileViewItem;
+}
+}
 class OVersatileViewDemo: public QVBox
 {
  Q_OBJECT
  
  public:
    OVersatileViewDemo( QWidget* parent=0, const char* name=0, WFlags f=0 );
    virtual ~OVersatileViewDemo();
  public slots:
    void selectionChanged();
-    void selectionChanged( OVersatileViewItem * );
+    void selectionChanged( Opie::Ui::OVersatileViewItem * );
-    void currentChanged( OVersatileViewItem * );
+    void currentChanged( Opie::Ui::OVersatileViewItem * );
-    void clicked( OVersatileViewItem * );
+    void clicked( Opie::Ui::OVersatileViewItem * );
-    void pressed( OVersatileViewItem * );
+    void pressed( OPie::Ui::OVersatileViewItem * );
-    void doubleClicked( OVersatileViewItem *item );
+    void doubleClicked( Opie::Ui::OVersatileViewItem *item );
-    void returnPressed( OVersatileViewItem *item );
+    void returnPressed( Opie::Ui::OVersatileViewItem *item );
  
-    void onItem( OVersatileViewItem *item );
+    void onItem( Opie::Ui::OVersatileViewItem *item );
    void onViewport();
-    void expanded( OVersatileViewItem *item );
+    void expanded( Opie::Ui::OVersatileViewItem *item );
-    void collapsed( OVersatileViewItem *item );
+    void collapsed( Opie::Ui::OVersatileViewItem *item );
    
    void moved();
-    void contextMenuRequested( OVersatileViewItem *item, const QPoint&, int col );
+    void contextMenuRequested( Opie::Ui::OVersatileViewItem *item, const QPoint&, int col );
    
  private:
-    OVersatileView* vv;
+    Opie::Ui::OVersatileView* vv;
 };
 #endif
diff --git a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
index b1c5e70..50cc11b 100644
--- a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
+++ b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
@@ -16,13 +16,13 @@
 #include <qmenubar.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qsignalmapper.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OPIE_EXPORT_APP( OApplicationFactory<StackExample> )
 StackExample::StackExample( QWidget* parent, const char* name, WFlags fl )
    : QMainWindow( parent, name, fl )
 {
diff --git a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.h b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.h
index aea85cb..c9b70cb 100644
--- a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.h
+++ b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.h
@@ -5,24 +5,23 @@
 #ifndef O_STACK_EXAMPLE_SIMPLE_H
 #define O_STACK_EXAMPLE_SIMPLE_H
 #include <qmainwindow.h>
 #include <opie2/owidgetstack.h>
-using namespace Opie;
 class StackExample : public QMainWindow {
    Q_OBJECT
 public:
    StackExample( QWidget* paren, const char* name, WFlags fl );
    ~StackExample();
    static QString appName() { return QString::fromLatin1("owidgetstack-example"); }
 protected:
    void closeEvent( QCloseEvent* e );
 private:
-    OWidgetStack* m_stack;
+    Opie::Ui::OWidgetStack* m_stack;
    QWidget* m_main;
 };
 #endif
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 27b0e53..f3e2cfb 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -57,13 +57,13 @@ _;:,   .>  :=|.         This program is free software; you can
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
-using namespace Opie;
+using namespace Opie::Core;
 ODevice *ODevice::inst()
 {
    static ODevice *dev = 0;
    // rewrite this to only use /proc/cpuinfo or so
@@ -78,17 +78,17 @@ ODevice *ODevice::inst()
            {
                QString line;
                line = s.readLine();
                if ( line.startsWith( "Hardware" ) )
                {
                    qDebug( "ODevice() - found '%s'", (const char*) line );
-                    if ( line.contains( "sharp", false ) ) dev = new Zaurus();
+                    if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus();
-                    else if ( line.contains( "ipaq", false ) ) dev = new iPAQ();
+                    else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ();
-                    else if ( line.contains( "simpad", false ) ) dev = new SIMpad();
+                    else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad();
-                    else if ( line.contains( "jornada", false ) ) dev = new Jornada();
+                    else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada();
-                    else if ( line.contains( "ramses", false ) ) dev = new Ramses();
+                    else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses();
                    else qWarning( "ODevice() - unknown hardware - using default." );
                    break;
                }
            }
        }
        else
@@ -184,13 +184,13 @@ bool ODevice::suspend()
    if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
        return false;
    bool res = false;
    ODevice::sendSuspendmsg();
-    
    struct timeval tvs, tvn;
    ::gettimeofday ( &tvs, 0 );
    ::sync(); // flush fs caches
    res = ( ::system ( "apm --suspend" ) == 0 );
@@ -621,8 +621,11 @@ void ODevice::remapHeldAction ( int button, const OQCopMessage &action )
 void ODevice::virtual_hook(int, void* ){
 }
 void ODevice::sendSuspendmsg()
 {
+    if ( isQWS() )
+        return;
    QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
 }
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index bccb449..5ee9cca 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -37,14 +37,15 @@ _;:,   .>  :=|.         This program is free software; you can
 /* QT */
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qstring.h>
 #include <qstrlist.h>
-namespace Opie
+namespace Opie{
-{
+namespace Core{
    class ODeviceData;
 /**
 * The available devices
 */
 enum OModel {
    Model_Unknown, // = 0
@@ -247,13 +248,13 @@ public:
    /**
     * Returns the available buttons on this device.  The number and location
     * of buttons will vary depending on the device.  Button numbers will be assigned
     * by the device manufacturer and will be from most preferred button to least preffered
     * button.  Note that this list only contains "user mappable" buttons.
-     * 
+     *
     * @todo Make method const and take care of calling initButtons or make that const too
     *
     */
    const QValueList<ODeviceButton> &buttons();
    /**
@@ -311,12 +312,13 @@ class ODeviceData {
    QValueList <ODeviceButton> *m_buttons;
    uint                        m_holdtime;
    QStrList                   *m_cpu_frequencies;
 };
 }
+}
 static inline bool isQWS()
 {
    return qApp ? ( qApp->type() == QApplication::GuiServer ) : false;
 }
@@ -325,8 +327,9 @@ static QCString makeChannel ( const char *str )
    if ( str && !::strchr ( str, '/' ))
        return QCString ( "QPE/Application/" ) + str;
    else
        return str;
 }
 #endif
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 8ecea1b..177fd4c 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -50,12 +50,16 @@
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 /* KERNEL */
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h
index f512344..4f4af46 100644
--- a/libopie2/opiecore/device/odevice_ipaq.h
+++ b/libopie2/opiecore/device/odevice_ipaq.h
@@ -32,13 +32,15 @@
 #include "odevice.h"
 /* QT */
 #include <qwindowsystem_qws.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter
 {
  protected:
    virtual void init();
@@ -78,7 +80,11 @@ struct i_button {
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index 37bd6e9..b79b0b5 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -74,13 +74,13 @@ typedef struct {
        unsigned char brightness;
 } FLITE_IN;
 #define LED_ON    OD_IOW( 'f', 5, LED_IN )
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
-using namespace Opie;
+using namespace Opie::Core::Private;
 void Jornada::init()
 {
    d->m_vendorstr = "HP";
    d->m_vendor = Vendor_HP;
    d->m_modelstr = "Jornada 56x";
diff --git a/libopie2/opiecore/device/odevice_jornada.h b/libopie2/opiecore/device/odevice_jornada.h
index 59be8da..c37d75e 100644
--- a/libopie2/opiecore/device/odevice_jornada.h
+++ b/libopie2/opiecore/device/odevice_jornada.h
@@ -29,22 +29,25 @@
 #ifndef ODEVICE_JORNADA
 #define ODEVICE_JORNADA
 #include <opie2/odevice.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Jornada : public ODevice
 {
  protected:
    virtual void init();
  public:
    virtual bool setSoftSuspend ( bool soft );
    virtual bool setDisplayBrightness ( int b );
    virtual int displayBrightnessResolution() const;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 5bcf6a9..77de8c5 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -50,12 +50,15 @@
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct r_button ramses_buttons [] = {
    { Model_Ramses_MNCI,
    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
    "devicebuttons/z_menu",
    "QPE/TaskBar", "toggleMenu()",
    "QPE/TaskBar", "toggleStartMenu()" },
diff --git a/libopie2/opiecore/device/odevice_ramses.h b/libopie2/opiecore/device/odevice_ramses.h
index 1b660ab..e673b1a 100644
--- a/libopie2/opiecore/device/odevice_ramses.h
+++ b/libopie2/opiecore/device/odevice_ramses.h
@@ -31,13 +31,15 @@
 #define ODEVICE_RAMSES
 #include <opie2/odevice.h>
 /* QT */
 #include <qwindowsystem_qws.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Ramses : public ODevice, public QWSServer::KeyboardFilter
 {
  protected:
    virtual void init();
@@ -65,8 +67,11 @@ struct r_button {
    char *pix;
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 90aca2f..80d40a3 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -50,13 +50,14 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct s_button simpad_buttons [] = {
    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
    Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"),
    "devicebuttons/simpad_lower_up",
    "datebook", "nextView()",
diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h
index 3287ee8..1848151 100644
--- a/libopie2/opiecore/device/odevice_simpad.h
+++ b/libopie2/opiecore/device/odevice_simpad.h
@@ -32,13 +32,15 @@
 #include <opie2/odevice.h>
 /* QT */
 #include <qwindowsystem_qws.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class SIMpad : public ODevice, public QWSServer::KeyboardFilter
 {
  protected:
    virtual void init();
    virtual void initButtons();
@@ -75,7 +77,11 @@ struct s_button {
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index d241db8..f7a4025 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -50,13 +50,14 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct yopy_button yopy_buttons [] = {
    { Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Action Button" ),
        "devicebuttons/yopy_action",
        "datebook", "nextView()",
        "today", "raise()" },
diff --git a/libopie2/opiecore/device/odevice_yopy.h b/libopie2/opiecore/device/odevice_yopy.h
index be8f62c..7d85479 100644
--- a/libopie2/opiecore/device/odevice_yopy.h
+++ b/libopie2/opiecore/device/odevice_yopy.h
@@ -29,14 +29,15 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #ifndef ODEVICE_YOPY
 #define ODEVICE_YOPY
 #include <opie2/odevice.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Yopy : public ODevice
 {
  protected:
    virtual void init();
    virtual void initButtons();
@@ -56,7 +57,11 @@ struct yopy_button
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 8ab3cbe..0d21f26 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -50,13 +50,14 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct z_button z_buttons [] = {
    { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
    "devicebuttons/z_calendar",
    "datebook", "nextView()",
    "today", "raise()" },
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index f5c5172..ffb648f 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -42,14 +42,16 @@
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Zaurus : public ODevice
 {
  protected:
    virtual void init();
    virtual void initButtons();
@@ -89,8 +91,10 @@ struct z_button {
    char *pix;
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevicebutton.cpp b/libopie2/opiecore/device/odevicebutton.cpp
index 0b593d5..a081b7f 100644
--- a/libopie2/opiecore/device/odevicebutton.cpp
+++ b/libopie2/opiecore/device/odevicebutton.cpp
@@ -30,22 +30,28 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <opie2/odevicebutton.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class OQCopMessageData
 {
  public:
    QCString m_channel;
    QCString m_message;
    QByteArray m_data;
 };
+}
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 OQCopMessage::OQCopMessage()
        : d ( 0 )
 {
    init ( QCString(), QCString(), QByteArray());
 }
@@ -121,14 +127,14 @@ void OQCopMessage::setMessage ( const QCString &m )
 void OQCopMessage::setData ( const QByteArray &data )
 {
    d->m_data = data;
 }
-/*! \class Opie::ODeviceButton
+/*! \class Opie::Core::ODeviceButton
-    \brief The Opie::ODeviceButton class represents a physical user mappable button on a Qtopia device.
+    \brief The Opie::Core::ODeviceButton class represents a physical user mappable button on a Qtopia device.
 
    This class represents a physical button on a Qtopia device.    A
    device may have "user programmable" buttons.
    The location and number of buttons will vary from device to
    device.    userText() and pixmap() may be used to describe this button
    to the user in help documentation.
@@ -241,6 +247,9 @@ void ODeviceButton::setFactoryPresetHeldAction(const OQCopMessage& action)
 }
 void ODeviceButton::setHeldAction(const OQCopMessage& action)
 {
    m_HeldAction = action;
 }
+}
+}
diff --git a/libopie2/opiecore/device/odevicebutton.h b/libopie2/opiecore/device/odevicebutton.h
index a66b88f..4000144 100644
--- a/libopie2/opiecore/device/odevicebutton.h
+++ b/libopie2/opiecore/device/odevicebutton.h
@@ -20,16 +20,18 @@
 #ifndef DEVICE_BUTTON_H
 #define DEVICE_BUTTON_H
 #include <qpixmap.h>
 #include <qstring.h>
-class OQCopMessageData;
-namespace Opie
+namespace Opie{
-{
+namespace Core{
+namespace Private {
+class OQCopMessageData;
+}
 class OQCopMessage
 {
 public:
    OQCopMessage ( );
    OQCopMessage ( const OQCopMessage &copy );
@@ -49,13 +51,13 @@ public:
    bool send ( );
 private:
    void init ( const QCString &m_channel, const QCString &message, const QByteArray &args );
-    OQCopMessageData *d;
+    Private::OQCopMessageData *d;
    class Private;
    Private* m_data;
 };
 /**
@@ -101,8 +103,9 @@ class ODeviceButton
    OQCopMessage m_HeldAction;
    class Private;
    Private *d;
 };
 }
+}
 #endif
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index d340c0e..e2f6e82 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -31,24 +31,31 @@
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 #include <signal.h>
 #include <stdio.h>
+using namespace Opie::Core;
 OApplication* OApplication::_instance = 0;
 /**************************************************************************************************
 * OApplicationPrivate
 **************************************************************************************************/
+namespace Opie {
+namespace Core {
+namespace Private {
 class OApplicationPrivate
 {
  public:
    OApplicationPrivate() {};
    ~OApplicationPrivate() {};
 };
+}
 /**************************************************************************************************
 * OApplication
 **************************************************************************************************/
@@ -81,13 +88,13 @@ OConfig* OApplication::config()
    return _config;
 }
 void OApplication::init()
 {
-    d = new OApplicationPrivate();
+    d = new Private::OApplicationPrivate();
    if ( !OApplication::_instance )
    {
        OApplication::_instance = this;
        /* register SIGSEGV handler to give programs an option
         * to exit gracefully, e.g. save or close devices or files.
@@ -122,6 +129,8 @@ void OApplication::setTitle( const QString& title ) const
            mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title );
        else
            mainWidget()->setCaption( _appname );
    }
 }
+}
+}
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index cc506a2..c1e32a6 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -27,19 +27,23 @@
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OAPPLICATION_H
 #define OAPPLICATION_H
-#define oApp OApplication::oApplication()
+#define oApp Opie::Core::OApplication::oApplication()
 #include <qpe/qpeapplication.h>
+namespace Opie {
+namespace Core {
+namespace Private {
 class OApplicationPrivate;
+} // private class
 class OConfig;
 class OApplication : public QPEApplication
 {
  Q_OBJECT
@@ -95,10 +99,13 @@ class OApplication : public QPEApplication
    void init();
  private:
    const QCString _appname;
    static OApplication* _instance;
    OConfig* _config;
-    OApplicationPrivate* d;
+    Private::OApplicationPrivate* d;
 };
+} // Core
+} // Opie
 #endif // OAPPLICATION_H
diff --git a/libopie2/opiecore/oconfig.cpp b/libopie2/opiecore/oconfig.cpp
index fb5eabb..05d8070 100644
--- a/libopie2/opiecore/oconfig.cpp
+++ b/libopie2/opiecore/oconfig.cpp
@@ -35,12 +35,14 @@
 #include <qcolor.h>
 /* OPIE */
 #include <opie2/oconfig.h>
+using namespace Opie::Core;
 OConfig::OConfig( const QString &name, Domain domain )
        :Config( name, domain )
 {
    qDebug( "OConfig::OConfig()" );
 }
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h
index becf70d..29c1f86 100644
--- a/libopie2/opiecore/oconfig.h
+++ b/libopie2/opiecore/oconfig.h
@@ -37,12 +37,15 @@
 #include <qpe/config.h>
 class QColor;
 class QFont;
+namespace Opie {
+namespace Core {
 /**
  * A Configuration class based on the Qtopia @ref Config class
  * featuring additional handling of color and font entries
  */
 class OConfig : public Config
@@ -59,22 +62,27 @@ class OConfig : public Config
     * dynamically created objects.
     */
    virtual ~OConfig();
    /**
     * @returns the name of the current group.
     * The current group is used for searching keys and accessing entries.
+     * @todo make const
     */
    const QString& group() { return git.key(); };
    /**
     * @returns a @ref QColor entry or a @a default value if the key is not found.
     */
    QColor readColorEntry( const QString& key, const QColor* pDefault ) const;
    /**
     * @returns a @ref QFont value or a @a default value if the key is not found.
     */
    QFont readFontEntry( const QString& key, const QFont* pDefault ) const;
+    
+private:
+    class Private;
+    Private *d;
 };
 /**
 * @brief Helper class for easier use of OConfig groups.
 *
 * Careful programmers always set the group of a
@@ -133,9 +141,14 @@ class OConfigGroupSaver
  private:
    OConfig* _config;
    QString _oldgroup;
    OConfigGroupSaver( const OConfigGroupSaver& );
    OConfigGroupSaver& operator=( const OConfigGroupSaver& );
+    
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OCONFIG_H
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp
index a40ef53..cac985b 100644
--- a/libopie2/opiecore/odebug.cpp
+++ b/libopie2/opiecore/odebug.cpp
@@ -62,13 +62,14 @@
 #include <string.h>
 #ifndef OPIE_NO_BACKTRACE
 #include <execinfo.h>
 #endif
+namespace Opie {
+namespace Core {
 /*======================================================================================
 * debug levels
 *======================================================================================*/
 enum DebugLevels {
    ODEBUG_INFO     = 0,
@@ -611,10 +612,14 @@ void odClearDebugConfig()
    /*
    delete oDebug_data->config;
    oDebug_data->config = 0;
    */
 }
 #ifdef OPIE_NO_DEBUG
 #define odDebug ondDebug
 #define odBacktrace ondBacktrace
 #endif
+}
+}
+\ No newline at end of file
diff --git a/libopie2/opiecore/odebug.h b/libopie2/opiecore/odebug.h
index 85941fd..a5c9ded 100644
--- a/libopie2/opiecore/odebug.h
+++ b/libopie2/opiecore/odebug.h
@@ -44,12 +44,15 @@ class QSize;
 class QRect;
 class QRegion;
 class QStringList;
 class QColor;
 class QBrush;
+namespace Opie {
+namespace Core {
 class odbgstream;
 class ondbgstream;
 #ifdef __GNUC__
 #define o_funcinfo "[" << __PRETTY_FUNCTION__ << "] "
 #else
@@ -391,12 +394,16 @@ class ondbgstream {
    ondbgstream& operator<<( const QSize & )  { return *this; }
    ondbgstream& operator<<( const QRect & )  { return *this; }
    ondbgstream& operator<<( const QRegion & ) { return *this; }
    ondbgstream& operator<<( const QStringList & ) { return *this; }
    ondbgstream& operator<<( const QColor & ) { return *this; }
    ondbgstream& operator<<( const QBrush & ) { return *this; }
+    
+private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * related functions
 *======================================================================================*/
@@ -469,6 +476,8 @@ void odClearDebugConfig();
 #define odDebug ondDebug
 #define odBacktrace ondBacktrace
 #endif
 #endif
+}
+}
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index 1aa206e..ea02058 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -35,12 +35,14 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <unistd.h>
 #include <sys/types.h>
+using namespace Opie::Core;
 static const char Base64EncMap[64] =
 {
  0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
  0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
  0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
  0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
@@ -309,24 +311,24 @@ QByteArray OGlobal::decodeBase64( const QByteArray& in) {
    return out;
 }
 bool OGlobal::isAppLnkFileName( const QString& str )
 {
-    if (str.length()==0||str.at(str.length()-1)==QDir::separator()) return false;
+    if (str.isEmpty()||str.at(str.length()-1)==QDir::separator()) return false;
    return str.startsWith(MimeType::appsFolderName()+QDir::separator());
 }
 /* ToDo:
 * This fun should check the document-path value for the mounted media
 * which has to be implemented later. this moment we just check for a
 * mounted media name.
 */
 bool OGlobal::isDocumentFileName( const QString& file )
 {
-    if (file.length()==0||file.at(file.length()-1)==QDir::separator()) return false;
+    if (file.isEmpty()||file.at(file.length()-1)==QDir::separator()) return false;
    if (file.startsWith(QPEApplication::documentDir()+QDir::separator())) return true;
    StorageInfo si;
    QList< FileSystem > fl =  si.fileSystems();
    FileSystem*fs;
    for (fs = fl.first();fs!=0;fs=fl.next()) {
        if (fs->isRemovable()&&file.startsWith(fs->name()+QDir::separator()))
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h
index aeee75e..e6a6c46 100644
--- a/libopie2/opiecore/oglobal.h
+++ b/libopie2/opiecore/oglobal.h
@@ -49,12 +49,17 @@
 //      You're right. I deleted global as the base class. -mickeyl
 class QFile;
 class QString;
 class DateFormat;
+namespace Opie {
+namespace Core {
 /**
 *\brief OGlobal contains a list of generic functions
 *
 * The class OGlobal contains small utility functions
 * which might be useful for other applications to use. It features access
 * to the global device config and specialized functions to get information
@@ -143,9 +148,12 @@ public:
    static QGuardedPtr<QWidget>* builtinRunning();
   //@}
 private:
    static OConfig* _config;
    static OConfig* _qpe_config;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OGLOBAL_H
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index 192e55b..f34c531 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -41,12 +41,15 @@
 #include <qdir.h>
 /* UNIX */
 #include <stdlib.h>
+using namespace Opie::Core;
 QString* OGlobalSettings::s_desktopPath = 0;
 QString* OGlobalSettings::s_autostartPath = 0;
 QString* OGlobalSettings::s_trashPath = 0;
 QString* OGlobalSettings::s_documentPath = 0;
 QFont *OGlobalSettings::_generalFont = 0;
 QFont *OGlobalSettings::_fixedFont = 0;
diff --git a/libopie2/opiecore/oglobalsettings.h b/libopie2/opiecore/oglobalsettings.h
index e3ac148..8eea709 100644
--- a/libopie2/opiecore/oglobalsettings.h
+++ b/libopie2/opiecore/oglobalsettings.h
@@ -33,12 +33,15 @@
 #define OGLOBALSETTINGS_H
 #include <qstring.h>
 #include <qcolor.h>
 #include <qfont.h>
+/**
+ * \todo make real const values
+ */
 #define OPIE_DEFAULT_SINGLECLICK true
 #define OPIE_DEFAULT_INSERTTEAROFFHANDLES true
 #define OPIE_DEFAULT_AUTOSELECTDELAY -1
 #define OPIE_DEFAULT_CHANGECURSOR true
 #define OPIE_DEFAULT_LARGE_CURSOR false
 #define OPIE_DEFAULT_VISUAL_ACTIVATE true
@@ -46,12 +49,15 @@
 //FIXME: There's still a whole lot of stuff in here which has to be revised
 //FIXME: before public usage... lack of time to do it at once - so it will
 //FIXME: happen step-by-step. ML.
 // we should not habe too much configure options!!!!!! -zecke
+namespace Opie {
+namespace Core {
 /**
 * Access the OPIE global configuration settings.
 *
 */
 class OGlobalSettings
 {
@@ -365,9 +371,15 @@ private:
    static QColor * OpieGray;
    static QColor * OpieBlue;
    static QColor * OpieAlternate;   
    static QColor * OpieHighlight;
    
    friend class OApplication;
+private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 523d6a7..ff3c036 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -6,30 +6,28 @@ HEADERS     = oapplication.h            \
              odebug.h                  \
              oglobal.h                 \
              oglobalsettings.h         \
              oprocess.h                \
              oprocctrl.h               \
              osmartpointer.h           \
-              ostorageinfo.h            \
+              ostorageinfo.h            
-              xmltree.h
 SOURCES     = oapplication.cpp          \
              oconfig.cpp               \
              odebug.cpp                \
              oglobal.cpp               \
              oglobalsettings.cpp       \
              oprocess.cpp              \
              oprocctrl.cpp             \
-              ostorageinfo.cpp          \
+              ostorageinfo.cpp          
-              xmltree.cc
 include ( device/device.pro )
 INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.8.5
+VERSION     = 1.9.0
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 !contains( platform, x11 ) {
  LIBS        = -lqpe
  include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/opiecore/oprocctrl.cpp b/libopie2/opiecore/oprocctrl.cpp
index 0403526..46708ba 100644
--- a/libopie2/opiecore/oprocctrl.cpp
+++ b/libopie2/opiecore/oprocctrl.cpp
@@ -38,12 +38,14 @@
 #include <unistd.h>
 #include <assert.h>
 #include <qsocketnotifier.h>
 #include "oprocctrl.h"
+using namespace Opie::Core::Private;
 OProcessController *OProcessController::theOProcessController = 0;
 struct sigaction OProcessController::oldChildHandlerData;
 bool OProcessController::handlerSet = false;
 OProcessController::OProcessController()
diff --git a/libopie2/opiecore/oprocctrl.h b/libopie2/opiecore/oprocctrl.h
index 44b8a48..4922ba2 100644
--- a/libopie2/opiecore/oprocctrl.h
+++ b/libopie2/opiecore/oprocctrl.h
@@ -31,15 +31,20 @@
 #include <qvaluelist.h>
 #include <qtimer.h>
 #include "oprocess.h"
-class OProcessControllerPrivate;
 class QSocketNotifier;
+namespace Opie {
+namespace Core {
+namespace Private {
+class OProcessControllerPrivate;
 /**
 * @short Used internally by @ref OProcess
 * @internal
 * @author Christian Czezakte <e9025461@student.tuwien.ac.at>
 *
 *  A class for internal use by OProcess only. -- Exactly one instance
@@ -112,10 +117,13 @@ private:
    OProcessController( const OProcessController& );
    OProcessController& operator= ( const OProcessController& );
    OProcessControllerPrivate *d;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp
index 6349c83..dfde74a 100644
--- a/libopie2/opiecore/oprocess.cpp
+++ b/libopie2/opiecore/oprocess.cpp
@@ -58,24 +58,29 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #include <sys/select.h>
 #endif
 #ifdef HAVE_INITGROUPS
 #include <grp.h>
 #endif
+using namespace Opie::Core::Private;
+namespace Opie {
+namespace Core {
+namespace Private {
 class OProcessPrivate
 {
 public:
    OProcessPrivate() : useShell( false )
    { }
    bool useShell;
    QMap<QString, QString> env;
    QString wd;
    QCString shell;
 };
+}
 OProcess::OProcess( QObject *parent, const char *name )
        : QObject( parent, name )
 {
    init ( );
 }
@@ -938,6 +943,9 @@ int OProcess::processPID( const QString& process )
    else
    {
        //qDebug( "process '%s' not found", (const char*) process );
        return 0;
    }
 }
+}
+}
diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h
index 1a2472d..eb56b03 100644
--- a/libopie2/opiecore/oprocess.h
+++ b/libopie2/opiecore/oprocess.h
@@ -40,13 +40,19 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #include <sys/types.h> // for pid_t
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
 class QSocketNotifier;
+namespace Opie {
+namespace Core {
+namespace Private {
+class OProcessController;
 class OProcessPrivate;
+}
 /**
 * Child process invocation, monitoring and control.
 *
 * @sect General usage and features
 *
@@ -394,12 +400,13 @@ public:
     *  had been specified in the call to @ref start().
    */
    bool closeStderr();
    /**
     * Lets you see what your arguments are for debugging.
+     * \todo make const
     */
    const QValueList<QCString> &args()
    {
        return arguments;
    }
@@ -713,13 +720,13 @@ protected:
    int input_total;   // total length of input_data
    /**
     * @ref OProcessController is a friend of OProcess because it has to have
     * access to various data members.
     */
-    friend class OProcessController;
+    friend class Private::OProcessController;
 private:
    /**
     * Searches for a valid shell.
     * Here is the algorithm used for finding an executable shell:
     *
@@ -742,11 +749,13 @@ private:
    // Disallow assignment and copy-construction
    OProcess( const OProcess& );
    OProcess& operator= ( const OProcess& );
 private:
    void init ( );
-    OProcessPrivate *d;
+    Private::OProcessPrivate *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiecore/osmartpointer.h b/libopie2/opiecore/osmartpointer.h
index 9000e71..8f9da7f 100644
--- a/libopie2/opiecore/osmartpointer.h
+++ b/libopie2/opiecore/osmartpointer.h
@@ -37,12 +37,13 @@ _;:,     .>    :=|.         This program is free software; you can
 * \brief smart pointer and reference counter
 * \author Rajko Albrecht
 *
 */
 namespace Opie {
+namespace Core {
 //! simple reference counter class
 class ORefCount {
 protected:
    //! reference count member
    long m_RefCount;
@@ -137,9 +138,10 @@ public:
    bool operator! () const { return (ptr == NULL); }
    //! support if (!pointer)" as non const
    bool operator! () { return (ptr == NULL); }
 };
 }
+}
 #endif
diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp
index aa8d2fc..8fcf5fc 100644
--- a/libopie2/opiecore/ostorageinfo.cpp
+++ b/libopie2/opiecore/ostorageinfo.cpp
@@ -26,12 +26,14 @@
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <opie2/ostorageinfo.h>
+using namespace Opie::Core;
 OStorageInfo::OStorageInfo( QObject *parent )
        : StorageInfo( parent )
 {
 }
 OStorageInfo::~OStorageInfo()
diff --git a/libopie2/opiecore/ostorageinfo.h b/libopie2/opiecore/ostorageinfo.h
index 740fa85..4e1097f 100644
--- a/libopie2/opiecore/ostorageinfo.h
+++ b/libopie2/opiecore/ostorageinfo.h
@@ -29,12 +29,15 @@
 #ifndef OSTORAGE_H
 #define OSTORAGE_H
 #include <qpe/storage.h>
+namespace Opie {
+namespace Core {
 class OStorageInfo : public StorageInfo
 {
  Q_OBJECT
  public:
@@ -53,10 +56,15 @@ class OStorageInfo : public StorageInfo
    QString sdPath() const;
   /**
    * @returns the mount path of the MMC (MultiMedia) card
    *
    **/
    QString mmcPath() const;
+private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OSTORAGE_H
diff --git a/libopie2/opiedb/TODO b/libopie2/opiedb/TODO
index ca04ac6..8b86187 100644
--- a/libopie2/opiedb/TODO
+++ b/libopie2/opiedb/TODO
@@ -1,9 +1,10 @@
 * something like Capabilities of a Driver
  - ROWID
  - How to declare INTEGER PRIMARY KEY
  - Abstract from implementation of some dbs
  - provides( Type::What )
+  - emit signals directly on arriving of data
  
 * OSQLDriver DriverVersion - DatabaseVersion
 * Better OSQLQueries
   - more than OSQLRawQuery
 \ No newline at end of file
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index c773d6c..147435a 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -18,13 +18,13 @@ SOURCES     = osqlbackend.cpp   \
              osqlresult.cpp   \
              osqltable.cpp    \
              osqlbackendmanager.cpp \
              osqlitedriver.cpp
 INTERFACES  =
 TARGET      = opiedb2
-VERSION     = 1.8.2
+VERSION     = 1.9.0
 INCLUDEPATH = $(OPIEDIR)/include
 DEPENDPATH  = $(OPIEDIR)/include
 LIBS       += -lopiecore2 -lqpe -lsqlite
 !contains( platform, x11 ) {
  include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/opiedb/osqlbackend.cpp b/libopie2/opiedb/osqlbackend.cpp
index d6c39a9..6e5159f 100644
--- a/libopie2/opiedb/osqlbackend.cpp
+++ b/libopie2/opiedb/osqlbackend.cpp
@@ -1,9 +1,11 @@
 #include "osqlbackend.h"
+using namespace Opie::DB;
 OSQLBackEnd::OSQLBackEnd( const QString& name,
                          const QString& vendor,
                          const QString& license,
                          const QCString& lib )
    : m_name( name), m_vendor( vendor),  m_license( license ), m_lib( lib )
diff --git a/libopie2/opiedb/osqlbackend.h b/libopie2/opiedb/osqlbackend.h
index ad879a4..28451b6 100644
--- a/libopie2/opiedb/osqlbackend.h
+++ b/libopie2/opiedb/osqlbackend.h
@@ -3,12 +3,15 @@
 #define OSQL_BACKEND_H
 #include <qcstring.h>
 #include <qstring.h>
 #include <qvaluelist.h>
+namespace Opie {
+namespace DB {
 /**
 * OSQLBackEnd represents an available backend
 * to the Opie Database Service
 * It's used to easily extend OSQL services by
 * 3rd party plugins.
 * It's used to show
@@ -67,9 +70,14 @@ private:
    QString m_name;
    QString m_vendor;
    QString m_license;
    QCString m_lib;
    bool m_default :1;
    int m_pref;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp
index 95ed77b..fc18e07 100644
--- a/libopie2/opiedb/osqlbackendmanager.cpp
+++ b/libopie2/opiedb/osqlbackendmanager.cpp
@@ -1,11 +1,15 @@
 #include <qdir.h>
 #include <qmap.h>
 #include "osqlbackendmanager.h"
+/**
+ * \todo FIXME CONFIG!!!
+ */
 namespace {
    class Config {
        typedef QMap<QString, QString> List;
    public:
        Config( const QString& fileName );
        /**
@@ -41,12 +45,16 @@ namespace {
        return true;
    }
    QString Config::value( const QString& key ) {
        return m_list[key];
    }
 };
+using namespace Opie::DB;
 OSQLBackEndManager::OSQLBackEndManager( const QStringList& path )
    :m_path( path )
 {
 }
 OSQLBackEndManager::~OSQLBackEndManager() {
 }
diff --git a/libopie2/opiedb/osqlbackendmanager.h b/libopie2/opiedb/osqlbackendmanager.h
index bc357a9..00e81fc 100644
--- a/libopie2/opiedb/osqlbackendmanager.h
+++ b/libopie2/opiedb/osqlbackendmanager.h
@@ -2,19 +2,25 @@
 #define OSQL_BACKEND_MANAGER_H
 #include <qstringlist.h>
 #include "osqlbackend.h"
+namespace Opie {
+namespace DB {
 class OSQLBackEndManager {
 public:
    OSQLBackEndManager(const QStringList& path );
    ~OSQLBackEndManager();
    OSQLBackEnd::ValueList scan();
 private:
    OSQLBackEnd::ValueList scanDir( const QString& dir );
    OSQLBackEnd file2backend( const QString& file );
    class OSQLBackEndManagerPrivate;
    OSQLBackEndManagerPrivate* d;
    QStringList m_path;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqldriver.cpp b/libopie2/opiedb/osqldriver.cpp
index 258c116..a6dae77 100644
--- a/libopie2/opiedb/osqldriver.cpp
+++ b/libopie2/opiedb/osqldriver.cpp
@@ -1,10 +1,12 @@
 #include <qpe/qlibrary.h>
 #include "osqldriver.h"
+using namespace Opie::DB;
 OSQLDriver::OSQLDriver( QLibrary* lib )
 : QObject(), m_lib(lib) {
 }
 OSQLDriver::~OSQLDriver() {
    delete m_lib;
 }
diff --git a/libopie2/opiedb/osqldriver.h b/libopie2/opiedb/osqldriver.h
index 68d8ee6..492b8dd 100644
--- a/libopie2/opiedb/osqldriver.h
+++ b/libopie2/opiedb/osqldriver.h
@@ -4,12 +4,16 @@
 #include <qobject.h>
 #include <qstring.h>
 #include "osqltable.h"
 class QLibrary;
+namespace Opie {
+namespace DB {
 class OSQLResult;
 class OSQLQuery;
 class OSQLError;
 /**
 * A OSQLDriver implements the communication with
@@ -81,7 +85,10 @@ private:
    QLibrary* m_lib;
    class OSQLDriverPrivate;
    OSQLDriverPrivate *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlerror.cpp b/libopie2/opiedb/osqlerror.cpp
index 3890a50..165ba65 100644
--- a/libopie2/opiedb/osqlerror.cpp
+++ b/libopie2/opiedb/osqlerror.cpp
@@ -1,8 +1,10 @@
 #include "osqlerror.h"
+using namespace Opie::DB;
 OSQLError::OSQLError( const QString& driverText,
                      const QString& driverDatabaseText,
                      int type, int subType )
    : m_drvText( driverText ), m_drvDBText( driverDatabaseText ),
      m_type( type ), m_number( subType )
 {
diff --git a/libopie2/opiedb/osqlerror.h b/libopie2/opiedb/osqlerror.h
index 35a4368..8fa973d 100644
--- a/libopie2/opiedb/osqlerror.h
+++ b/libopie2/opiedb/osqlerror.h
@@ -1,12 +1,15 @@
 #ifndef OSQL_ERROR_H
 #define OSQL_ERROR_H
 #include <qstring.h>
 #include <qvaluelist.h>
+namespace Opie {
+namespace DB {
 /**
 * OSQLError is the base class of all errors
 */
 class OSQLError {
 public:
    typedef QValueList<OSQLError> ValueList;
@@ -53,7 +56,9 @@ private:
    int m_type;
    int m_number;
    class OSQLErrorPrivate;
    OSQLErrorPrivate* d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 6141504..47bc250 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -37,12 +37,15 @@
 // fromLocal8Bit() does not work as expected. Thus it
 // is replaced by fromLatin1() (eilers)
 #define __BUGGY_LOCAL8BIT_
+using namespace Opie::DB;
+using namespace Opie::DB::Private;
 namespace {
    struct Query {
        OSQLError::ValueList errors;
        OSQLResultItem::ValueList items;
        OSQLiteDriver *driver;
    };
@@ -83,21 +86,21 @@ void OSQLiteDriver::setOptions( const QStringList& ) {
 /*
 * try to open a db specified via setUrl
 * and options
 */
 bool OSQLiteDriver::open() {
    char *error;
-    odebug << "OSQLiteDriver::open: about to open" << oendl;
+    qDebug("OSQLiteDriver::open: about to open");
    m_sqlite = sqlite_open(m_url.local8Bit(),
                           0,
                           &error );
    /* failed to open */
    if (m_sqlite == 0l ) {
        // FIXME set the last error
-        owarn << "OSQLiteDriver::open: " << error << oendl;
+        qWarning("OSQLiteDriver::open: %s", error );
        free( error );
        return false;
    }
    return true;
 }
@@ -123,13 +126,13 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
    }
    Query query;
    query.driver = this;
    char *err;
    /* SQLITE_OK 0 if return code > 0 == failure */
    if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err)  > 0 ) {
-        owarn << "OSQLiteDriver::query: Error while executing" << oendl;
+        qWarning("OSQLiteDriver::query: Error while executing");
        free(err );
        // FixMe Errors
    }
    OSQLResult result(OSQLResult::Success,
                      query.items,
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h
index 6984539..3e1325b 100644
--- a/libopie2/opiedb/osqlitedriver.h
+++ b/libopie2/opiedb/osqlitedriver.h
@@ -4,12 +4,16 @@
 #include <sqlite.h>
 #include "osqldriver.h"
 #include "osqlerror.h"
 #include "osqlresult.h"
+namespace Opie {
+namespace DB {
+namespace Private {
 class OSQLiteDriver : public OSQLDriver {
    Q_OBJECT
 public:
    OSQLiteDriver( QLibrary *lib = 0l );
    ~OSQLiteDriver();
    QString id()const;
@@ -28,7 +32,11 @@ private:
    OSQLResultItem m_items;
    int handleCallBack( int, char**, char** );
    static int call_back( void*, int, char**, char** );
    QString m_url;
    sqlite *m_sqlite;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlmanager.cpp b/libopie2/opiedb/osqlmanager.cpp
index 766ebe1..990d258 100644
--- a/libopie2/opiedb/osqlmanager.cpp
+++ b/libopie2/opiedb/osqlmanager.cpp
@@ -2,12 +2,14 @@
 #include <stdlib.h>
 #include "osqlmanager.h"
 #include "osqlbackendmanager.h"
 #include "osqlitedriver.h"
+using namespace Opie::DB;
 OSQLManager::OSQLManager() {
 }
 OSQLBackEnd::ValueList OSQLManager::queryBackEnd() {
    m_list.clear();
    QString opie = QString::fromLatin1( getenv("OPIEDIR") );
    QString qpe = QString::fromLatin1( getenv("QPEDIR") );
@@ -28,24 +30,24 @@ OSQLBackEnd::ValueList OSQLManager::queryBackEnd() {
 * beeing in libqpe and not libqte
 */
 OSQLDriver* OSQLManager::load( const QString& name ) {
    OSQLDriver* driver = 0l;
    if ( name == "SQLite" ) {
-        driver = new OSQLiteDriver();
+        driver = new Opie::DB::Private::OSQLiteDriver;
    }
    return driver;
 }
 /*
 * same as above
 */
 OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) {
    OSQLDriver *driver = 0l;
    if ( end.library() == "builtin" &&
         end.name() == "SQLite" )
-        driver = new OSQLiteDriver();
+        driver = new Opie::DB::Private::OSQLiteDriver;
    return driver;
 }
 /*
 * let's find the a default with the highes preference
 */
diff --git a/libopie2/opiedb/osqlmanager.h b/libopie2/opiedb/osqlmanager.h
index 5323b14..ca73c64 100644
--- a/libopie2/opiedb/osqlmanager.h
+++ b/libopie2/opiedb/osqlmanager.h
@@ -5,12 +5,14 @@
 #include <qobject.h>
 #include <qstringlist.h>
 #include "osqlbackend.h"
+namespace Opie {
+namespace DB {
 /**
 * OSQLManager is responsible for loading
 * and unloading, querying different OSQL
 * services
 * Load a OSQLDriver and delete it yourself
 *
@@ -56,9 +58,13 @@ public:
     */
    bool unregisterPath( const QString& path );
 private:
    OSQLBackEnd::ValueList builtIn()const;
    OSQLBackEnd::ValueList m_list;
    QStringList m_path;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlquery.cpp b/libopie2/opiedb/osqlquery.cpp
index ecd53f2..8270c4c 100644
--- a/libopie2/opiedb/osqlquery.cpp
+++ b/libopie2/opiedb/osqlquery.cpp
@@ -1,9 +1,11 @@
 #include "osqlquery.h"
+using namespace Opie::DB;
 OSQLQuery::OSQLQuery() {
 }
 OSQLQuery::~OSQLQuery() {
 }
 OSQLRawQuery::OSQLRawQuery(const QString& query)
diff --git a/libopie2/opiedb/osqlquery.h b/libopie2/opiedb/osqlquery.h
index 63c26b0..0265d2b 100644
--- a/libopie2/opiedb/osqlquery.h
+++ b/libopie2/opiedb/osqlquery.h
@@ -4,12 +4,15 @@
 #include <qmap.h>
 #include <qvaluelist.h>
 #include <qstring.h>
+namespace Opie {
+namespace DB {
 /** I'm not happy with them
 class OSQLQueryOrder {
 public:
    typedef QValueList<OSQLQueryOrder> ValueList;
    OSQLQueryOrder(const QString& table = QString::null );
    OSQLQueryOrder( const OSQLQueryOrder& );
@@ -44,12 +47,15 @@ private:
 class OSQLQuery {
 public:
    OSQLQuery();
    virtual ~OSQLQuery();
    virtual QString query()const = 0;
+private:
+    class Private;
+    Private *d;    
 };
 class OSQLRawQuery : public OSQLQuery {
 public:
    OSQLRawQuery( const QString& query );
    ~OSQLRawQuery();
@@ -116,7 +122,9 @@ public:
    /*
    void setValue( const QString& field, const QString& value );
    void setValue( const QMap<QString, QString> &fields );
    QString query() const;
 };
 */
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlresult.cpp b/libopie2/opiedb/osqlresult.cpp
index 42da356..bad7d8b 100644
--- a/libopie2/opiedb/osqlresult.cpp
+++ b/libopie2/opiedb/osqlresult.cpp
@@ -1,9 +1,11 @@
 #include "osqlresult.h"
+using namespace Opie::DB;
 OSQLResultItem::OSQLResultItem( const TableString& string,
                                const TableInt& Int)
    : m_string( string ), m_int( Int )
 {
 }
diff --git a/libopie2/opiedb/osqlresult.h b/libopie2/opiedb/osqlresult.h
index 9c9efa2..fc6f01a 100644
--- a/libopie2/opiedb/osqlresult.h
+++ b/libopie2/opiedb/osqlresult.h
@@ -4,12 +4,16 @@
 #include <qdatetime.h>
 #include <qmap.h>
 #include <qvaluelist.h>
 #include "osqlerror.h"
+namespace Opie {
+namespace DB {
 /**
 * ResultItem  represents one row of the resulting answer
 */
 class OSQLResultItem {
 public:
    typedef QValueList<OSQLResultItem> ValueList;
@@ -104,9 +108,13 @@ public:
    OSQLResultItem::ValueList::ConstIterator iterator()const;
 private:
    enum State m_state;
    OSQLResultItem::ValueList m_list;
    OSQLError::ValueList m_error;
    OSQLResultItem::ValueList::Iterator it;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqltable.cpp b/libopie2/opiedb/osqltable.cpp
index cde40f4..117cf21 100644
--- a/libopie2/opiedb/osqltable.cpp
+++ b/libopie2/opiedb/osqltable.cpp
@@ -1,8 +1,10 @@
 #include "osqltable.h"
+using namespace Opie::DB;
 OSQLTableItem::OSQLTableItem() {}
 OSQLTableItem::OSQLTableItem( enum Type type,
                              const QString& field,
                              const QVariant& var)
    : m_type( type ), m_field( field ), m_var( var )
 {
diff --git a/libopie2/opiedb/osqltable.h b/libopie2/opiedb/osqltable.h
index 87f7e74..86c30dd 100644
--- a/libopie2/opiedb/osqltable.h
+++ b/libopie2/opiedb/osqltable.h
@@ -2,12 +2,14 @@
 #define OSQL_TABLE_H
 #include <qstring.h>
 #include <qvaluelist.h>
 #include <qvariant.h>
+namespace Opie {
+namespace DB {
 /**
 * OSQLTableItem saves one column of a complete
 * table
 */
 class OSQLTableItem {
 public:
@@ -87,9 +89,14 @@ public:
    QString tableName()const;
 private:
    QString m_table;
    OSQLTableItem::ValueList m_list;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro
index d6f54ee..ce30dfb 100644
--- a/libopie2/opiemm/opiemm.pro
+++ b/libopie2/opiemm/opiemm.pro
@@ -2,13 +2,13 @@ TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = osoundsystem.h
 SOURCES     = osoundsystem.cpp
 INTERFACES  =
 TARGET      = opiemm2
-VERSION     = 1.8.2
+VERSION     = 1.9.0
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 !contains( platform, x11 ) {
  include ( $(OPIEDIR)/include.pro )
 }
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index 51e088c..07f26c0 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -38,12 +38,14 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/soundcard.h>
 #include <sys/stat.h>
+using namespace Opie::Core;
+using namespace Opie::MM;
 /*======================================================================================
 * OSoundSystem
 *======================================================================================*/
 OSoundSystem* OSoundSystem::_instance = 0;
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h
index 096d397..3c3b622 100644
--- a/libopie2/opiemm/osoundsystem.h
+++ b/libopie2/opiemm/osoundsystem.h
@@ -33,12 +33,15 @@
 #define OSOUNDSYSTEM_H
 #include <qobject.h>
 #include <qdict.h>
 #include <qmap.h>
+namespace Opie {
+namespace MM {
 class OAudioInterface;
 class OMixerInterface;
 class OSoundCard;
 /*======================================================================================
 * OSoundSystem
@@ -87,12 +90,14 @@ class OSoundSystem : public QObject
  protected:
    OSoundSystem();
  private:
    static OSoundSystem* _instance;
    CardMap _interfaces;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OSoundCard
 *======================================================================================*/
@@ -121,12 +126,15 @@ class OSoundCard : public QObject
  protected:
    OAudioInterface* _audio;
    OMixerInterface* _mixer;
  private:
    void init();
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OAudioInterface
 *======================================================================================*/
@@ -147,12 +155,15 @@ class OAudioInterface : public QObject
  protected:
    const int _sfd;
  private:
    void init();
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OMixerInterface
 *======================================================================================*/
@@ -207,10 +218,16 @@ class OMixerInterface : public QObject
  protected:
    int _fd;
    QMap<QString, int> _channels;
  private:
    void init();
+  private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OSOUNDSYSTEM_H
diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h
index 7ae27c5..1a9a7a0 100644
--- a/libopie2/opienet/802_11_user.h
+++ b/libopie2/opienet/802_11_user.h
@@ -452,7 +452,8 @@ struct ctrl_end_ack_t {
        #define CTRL_END_ACK_LEN(2+2+6+6+4)
        #define IV_IV(iv)((iv) & 0xFFFFFF)
        #define IV_PAD(iv)(((iv) >> 24) & 0x3F)
        #define IV_KEYID(iv)(((iv) >> 30) & 0x03)
 #endif
diff --git a/libopie2/opienet/dhcp.h b/libopie2/opienet/dhcp.h
index 368e375..6ba4c53 100644
--- a/libopie2/opienet/dhcp.h
+++ b/libopie2/opienet/dhcp.h
@@ -39,12 +39,13 @@
 * To learn more about Vixie Enterprises, see ``http://www.vix.com''.
 */
 #ifndef DHCP_H
 #define DHCP_H
        #define DHCP_UDP_OVERHEAD       (14 + /* Ethernet header */     \
                                         20 + /* IP header */           \
                                 8)   /* UDP header */
        #define DHCP_SNAME_LEN  64
        #define DHCP_FILE_LEN   128
        #define DHCP_FIXED_NON_UDP236
@@ -194,8 +195,9 @@ struct dhcp_packet {
        #define FQDN_RCODE2             5
        #define FQDN_HOSTNAME           6
        #define FQDN_DOMAINNAME                 7
        #define FQDN_FQDN               8
        #define FQDN_SUBOPTION_COUNT    8
 #endif
diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index 7e4ab2b..f679afb 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -4,12 +4,18 @@
 */
 #include <opie2/odebug.h>
 #include "odebugmapper.h"
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
+namespace Private {
 DebugMapper::DebugMapper()
 {
    odebug << "DebugMapper::DebugMapper()" << oendl;
    _map.insert( 0x8902, new QString("SIOCSPGRP") );
@@ -209,7 +215,9 @@ const QString& DebugMapper::map( int value ) const
    else
    {
        return *result;
    }
 }
+}
+}
+}
diff --git a/libopie2/opienet/odebugmapper.h b/libopie2/opienet/odebugmapper.h
index 66b331d..f47db47 100644
--- a/libopie2/opienet/odebugmapper.h
+++ b/libopie2/opienet/odebugmapper.h
@@ -6,21 +6,31 @@
 #ifndef DEBUGMAPPER_H
 #define DEBUGMAPPER_H
 #include <qstring.h>
 #include <qintdict.h>
+namespace Opie {
+namespace Net  {
+namespace Private {
 typedef QIntDict<QString> IntStringMap;
 class DebugMapper
 {
  public:
    DebugMapper();
    ~DebugMapper();
    const QString& map( int value ) const;
  private:
    IntStringMap _map;
+    class Private;
+    Private *d;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index b93b752..209ec94 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -40,12 +40,16 @@
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
 OManufacturerDB* OManufacturerDB::_instance = 0;
 OManufacturerDB* OManufacturerDB::instance()
 {
    if ( !OManufacturerDB::_instance )
    {
@@ -130,6 +134,9 @@ const QString& OManufacturerDB::lookup( const QString& macaddr ) const
 const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const
 {
    QMap<QString,QString>::ConstIterator it = manufacturersExt.find( macaddr.upper().left(8) );
    return it == manufacturersExt.end() ? lookup( macaddr ) : *it;
 }
+}
+}
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h
index c2712e5..5c1940e 100644
--- a/libopie2/opienet/omanufacturerdb.h
+++ b/libopie2/opienet/omanufacturerdb.h
@@ -30,12 +30,15 @@
 #ifndef OMANUFACTURERDB_H
 #define OMANUFACTURERDB_H
 #include <qmap.h>
+namespace Opie {
+namespace Net {
 /**
 * @brief A Ethernet card vendor database.
 *
 * This class encapsulates the lookup of Ethernet vendor given a
 * certain Mac Address. Only the first three bytes define the vendor.
 */
@@ -60,10 +63,15 @@ class OManufacturerDB
    virtual ~OManufacturerDB();
  private:
    QMap<QString, QString> manufacturers;
    QMap<QString, QString> manufacturersExt;
    static OManufacturerDB* _instance;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 48cfa43..7794334 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -34,12 +34,15 @@
 #include <opie2/omanufacturerdb.h>
 #include <net/if.h>
 #include <assert.h>
 #include <stdio.h>
+namespace Opie {
+namespace Net  {
 /*======================================================================================
 * OMacAddress
 *======================================================================================*/
 // static initializer for broadcast and unknown MAC Adresses
 const unsigned char __broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -182,12 +185,15 @@ void OPrivateIOCTL::invoke() const
 void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 {
    u_int32_t* arglist = (u_int32_t*) &( (OWirelessNetworkInterface*) parent() )->_iwr.u.name;
    arglist[num] = value;
 }
+namespace Private {
 /*======================================================================================
 * assorted functions
 *======================================================================================*/
 void dumpBytes( const unsigned char* data, int num )
 {
@@ -227,6 +233,9 @@ QString modeToString( int mode )
        case IW_MODE_REPEAT:        return "repeater";
        case IW_MODE_SECOND:        return "second";
        case IW_MODE_MONITOR:       return "monitor";
        default: assert( 0 );
    }
 }
+}
+}
+}
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index bddfab9..ca6815d 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -38,12 +38,16 @@
 #include <qhostaddress.h>
 #include <qobject.h>
 #include <sys/types.h>
 struct ifreq;
+namespace Opie {
+namespace Net  {
 class OWirelessNetworkInterface;
 /*======================================================================================
 * OMacAddress
 *======================================================================================*/
@@ -69,12 +73,14 @@ class OMacAddress
    static const OMacAddress& unknown;   // 44:44:44:44:44:44
  private:
    unsigned char _bytes[6];
  friend bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
+  class Private;
+  Private *d;
 };
 bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
@@ -85,12 +91,15 @@ bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
 class OHostAddress : public QHostAddress
 {
  /*public:
    OHostAddress();
    ~OHostAddress();
  */
+  private:
+  class Private;
+  Private *d;
 };
 /*======================================================================================
 * OPrivateIOCTL
 *======================================================================================*/
@@ -112,21 +121,27 @@ class OPrivateIOCTL : public QObject
  private:
    u_int32_t _ioctl;
    u_int16_t _getargs;
    u_int16_t _setargs;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * Miscellaneous
 *======================================================================================*/
+namespace Private {
 void dumpBytes( const unsigned char* data, int num );
 QString modeToString( int );
 int stringToMode( const QString& );
+}
+}
+}
 #define IW_PRIV_TYPE_MASK       0x7000
 #define IW_PRIV_TYPE_NONE       0x0000
 #define IW_PRIV_TYPE_BYTE       0x1000
 #define IW_PRIV_TYPE_CHAR       0x2000
 #define IW_PRIV_TYPE_INT        0x4000
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index e5b091f..ab3e77f 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -54,19 +54,25 @@
 #include <linux/sockios.h>
 #include <net/if_arp.h>
 #include <stdarg.h>
 #ifndef NODEBUG
 #include <opie2/odebugmapper.h>
+using namespace Opie::Core;
+using namespace Opie::Net::Private;
 DebugMapper* debugmapper = new DebugMapper();
 #endif
 /*======================================================================================
 * ONetwork
 *======================================================================================*/
+namespace Opie {
+namespace Net  {
 ONetwork* ONetwork::_instance = 0;
 ONetwork::ONetwork()
 {
    odebug << "ONetwork::ONetwork()" << oendl;
    odebug << "ONetwork: This code has been compiled against Wireless Extensions V" << WIRELESS_EXT << oendl;
@@ -1234,6 +1240,9 @@ void OOrinocoMonitoringInterface::setEnabled( bool b )
 QString OOrinocoMonitoringInterface::name() const
 {
    return "orinoco";
 }
+}
+}
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 93b129f..a953296 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -53,12 +53,15 @@
 #include <qvaluelist.h>
 #include <qdict.h>
 #include <qmap.h>
 #include <qobject.h>
 #include <qhostaddress.h>
+namespace Opie {
+namespace Net  {
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
 class OMonitoringInterface;
 /*======================================================================================
@@ -120,12 +123,14 @@ class ONetwork : public QObject
  protected:
    ONetwork();
  private:
    static ONetwork* _instance;
    InterfaceMap _interfaces;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * ONetworkInterface
 *======================================================================================*/
@@ -231,12 +236,15 @@ class ONetworkInterface : public QObject
  protected:
    struct ifreq& ifr() const;
    virtual void init();
    bool ioctl( int call ) const;
    bool ioctl( int call, struct ifreq& ) const;
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OChannelHopper
 *======================================================================================*/
@@ -293,12 +301,14 @@ class OChannelHopper : public QObject
  private:
    OWirelessNetworkInterface* _iface;
    int _interval;
    int _tid;
    QValueList<int> _channels;
    QValueList<int>::Iterator _channel;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWirelessNetworkInterface
 *======================================================================================*/
@@ -452,12 +462,14 @@ class OWirelessNetworkInterface : public ONetworkInterface
    mutable struct iwreq _iwr;
    QMap<int,int> _channels;
    struct iw_range _range;
  private:
    OChannelHopper* _hopper;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OMonitoringInterface
 *======================================================================================*/
@@ -476,12 +488,15 @@ class OMonitoringInterface
    virtual QString name() const = 0;
  protected:
    OWirelessNetworkInterface* _if;
    bool _prismHeader;
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OCiscoMonitoring
@@ -494,12 +509,15 @@ class OCiscoMonitoringInterface : public OMonitoringInterface
    OCiscoMonitoringInterface( ONetworkInterface*, bool _prismHeader );
    virtual ~OCiscoMonitoringInterface();
    virtual void setEnabled( bool );
    virtual QString name() const;
    virtual void setChannel( int );
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWlanNGMonitoringInterface
@@ -513,12 +531,15 @@ class OWlanNGMonitoringInterface : public OMonitoringInterface
    virtual ~OWlanNGMonitoringInterface();
  public:
    virtual void setEnabled( bool );
    virtual QString name() const;
    virtual void setChannel( int );
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OHostAPMonitoringInterface
@@ -531,12 +552,16 @@ class OHostAPMonitoringInterface : public OMonitoringInterface
    OHostAPMonitoringInterface( ONetworkInterface*, bool _prismHeader );
    virtual ~OHostAPMonitoringInterface();
  public:
    virtual void setEnabled( bool );
    virtual QString name() const;
+    
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OOrinocoMonitoringInterface
 *======================================================================================*/
@@ -550,10 +575,16 @@ class OOrinocoMonitoringInterface : public OMonitoringInterface
   public:
    virtual void setChannel( int );
    virtual void setEnabled( bool );
    virtual QString name() const;
+   private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // ONETWORK_H
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index fdd519c..4081d4f 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -42,12 +42,17 @@
 #include <sys/types.h>
 #include <unistd.h>
 /* LOCAL */
 #include "udp_ports.h"
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
 /*======================================================================================
 * OPacket
 *======================================================================================*/
 OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent )
        :QObject( parent, "Generic" ), _hdr( header ), _data( data )
@@ -1341,7 +1346,8 @@ bool OPacketCapturer::swapped() const
 QString OPacketCapturer::version() const
 {
    return QString().sprintf( "%d.%d", pcap_major_version( _pch ), pcap_minor_version( _pch ) );
 }
+}
+}
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index b873b49..dc609a3 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -61,14 +61,16 @@ extern "C"  // work around a bpf/pcap conflict in recent headers
 /* TYPEDEFS */
 typedef struct timeval timevalstruct;
 typedef struct pcap_pkthdr packetheaderstruct;
 /* FORWARDS */
-class OPacketCapturer;
 class QSocketNotifier;
+namespace Opie {
+namespace Net  {
+class OPacketCapturer;
 /*======================================================================================
 * OPacket - A frame on the wire
 *======================================================================================*/
 /** @brief A class representing a data frame on the wire.
@@ -138,12 +140,15 @@ class OPacket : public QObject
    QString _dumpStructure( QObjectList* ) const;
  private:
    const packetheaderstruct _hdr;  // pcap packet header
    const unsigned char* _data;     // pcap packet data
    const unsigned char* _end;      // end of pcap packet data
+  private:
+    class Private;
+    Private *d;
 };
 QTextStream& operator<<( QTextStream& s, const OPacket& p );
 /*======================================================================================
 * OEthernetPacket - DLT_EN10MB frame
@@ -160,12 +165,15 @@ class OEthernetPacket : public QObject
    OMacAddress sourceAddress() const;
    OMacAddress destinationAddress() const;
    int type() const;
  private:
    const struct ether_header* _ether;
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OPrismHeaderPacket - DLT_PRISM_HEADER frame
 *======================================================================================*/
@@ -178,12 +186,14 @@ class OPrismHeaderPacket : public QObject
    virtual ~OPrismHeaderPacket();
    unsigned int signalStrength() const;
  private:
    const struct prism_hdr* _header;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanPacket - DLT_IEEE802_11 frame
 *======================================================================================*/
@@ -207,12 +217,14 @@ class OWaveLanPacket : public QObject
    int subType() const;
    int version() const;
    bool usesWep() const;
  private:
    const struct ieee_802_11_header* _wlanhdr;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementPacket - type: management (T_MGMT)
 *======================================================================================*/
@@ -236,12 +248,14 @@ class OWaveLanManagementPacket : public QObject
    bool canCFP_REQ() const;
    bool canPrivacy() const;
  private:
    const struct ieee_802_11_mgmt_header* _header;
    const struct ieee_802_11_mgmt_body* _body;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementSSID
 *======================================================================================*/
@@ -255,12 +269,14 @@ class OWaveLanManagementSSID : public QObject
    virtual ~OWaveLanManagementSSID();
    QString ID( bool decloak = false ) const;
  private:
    const struct ssid_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementRates
 *======================================================================================*/
@@ -271,12 +287,14 @@ class OWaveLanManagementRates : public QObject
  public:
    OWaveLanManagementRates( const unsigned char*, const struct rates_t*, QObject* parent = 0 );
    virtual ~OWaveLanManagementRates();
  private:
    const struct rates_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementCF
 *======================================================================================*/
@@ -287,12 +305,14 @@ class OWaveLanManagementCF : public QObject
  public:
    OWaveLanManagementCF( const unsigned char*, const struct cf_t*, QObject* parent = 0 );
    virtual ~OWaveLanManagementCF();
  private:
    const struct cf_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementFH
 *======================================================================================*/
@@ -303,12 +323,14 @@ class OWaveLanManagementFH : public QObject
  public:
    OWaveLanManagementFH( const unsigned char*, const struct fh_t*, QObject* parent = 0 );
    virtual ~OWaveLanManagementFH();
  private:
    const struct fh_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementDS
 *======================================================================================*/
@@ -321,12 +343,14 @@ class OWaveLanManagementDS : public QObject
    virtual ~OWaveLanManagementDS();
    int channel() const;
  private:
    const struct ds_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementTim
 *======================================================================================*/
@@ -337,12 +361,14 @@ class OWaveLanManagementTim : public QObject
  public:
    OWaveLanManagementTim( const unsigned char*, const struct tim_t*, QObject* parent = 0 );
    virtual ~OWaveLanManagementTim();
  private:
    const struct tim_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementIBSS
 *======================================================================================*/
@@ -353,12 +379,14 @@ class OWaveLanManagementIBSS : public QObject
  public:
    OWaveLanManagementIBSS( const unsigned char*, const struct ibss_t*, QObject* parent = 0 );
    virtual ~OWaveLanManagementIBSS();
  private:
    const struct ibss_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanManagementChallenge
 *======================================================================================*/
@@ -369,12 +397,14 @@ class OWaveLanManagementChallenge : public QObject
  public:
    OWaveLanManagementChallenge( const unsigned char*, const struct challenge_t*, QObject* parent = 0 );
    virtual ~OWaveLanManagementChallenge();
  private:
    const struct challenge_t* _data;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanDataPacket - type: data (T_DATA)
 *======================================================================================*/
@@ -385,12 +415,14 @@ class OWaveLanDataPacket : public QObject
  public:
    OWaveLanDataPacket( const unsigned char*, const struct ieee_802_11_data_header*, OWaveLanPacket* parent = 0 );
    virtual ~OWaveLanDataPacket();
  private:
    const struct ieee_802_11_data_header* _header;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OWaveLanControlPacket - type: control (T_CTRL)
 *======================================================================================*/
@@ -403,12 +435,14 @@ class OWaveLanControlPacket : public QObject
    virtual ~OWaveLanControlPacket();
    QString controlType() const;
  private:
    const struct ieee_802_11_control_header* _header;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OLLCPacket - IEEE 802.2 Link Level Control
 *======================================================================================*/
@@ -419,12 +453,14 @@ class OLLCPacket : public QObject
  public:
    OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 );
    virtual ~OLLCPacket();
  private:
    const struct ieee_802_11_802_2_header* _header;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OIPPacket
 *======================================================================================*/
@@ -446,12 +482,14 @@ class OIPPacket : public QObject
    int ttl() const;
    int protocol() const;
    int checksum() const;
  private:
    const struct iphdr* _iphdr;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OARPPacket
 *======================================================================================*/
@@ -470,12 +508,14 @@ class OARPPacket : public QObject
    //int type() const;
    QString type() const;
  private:
    const struct myarphdr* _arphdr;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OUDPPacket
 *======================================================================================*/
@@ -491,12 +531,14 @@ class OUDPPacket : public QObject
    int toPort() const;
    int length() const;
    int checksum() const;
  private:
    const struct udphdr* _udphdr;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * ODHCPPacket
 *======================================================================================*/
@@ -519,12 +561,14 @@ class ODHCPPacket : public QObject
    bool isReply() const;
    QString type() const;
  private:
    const struct dhcp_packet* _dhcphdr;
    unsigned char _type;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OTCPPacket
 *======================================================================================*/
@@ -542,12 +586,14 @@ class OTCPPacket : public QObject
    int ack() const;
    int window() const;
    int checksum() const;
  private:
    const struct tcphdr* _tcphdr;
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * OPacketCapturer
 *======================================================================================*/
@@ -662,10 +708,14 @@ class OPacketCapturer : public QObject
    bool _open;                                     // check this before doing pcap calls
    pcap_t* _pch;                                   // pcap library handle
    pcap_dumper_t* _pcd;                            // pcap dumper handle
    QSocketNotifier* _sn;                           // socket notifier for main loop
    mutable char _errbuf[PCAP_ERRBUF_SIZE];         // holds error strings from libpcap
    QMap<QString, int> _stats;                      // statistics;
+            class Private;                             // Private Forward declaration
+            Private *d;                                     // if we need to add data
 };
+}
+}
 #endif // OPCAP_H
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index 8c989d8..140b924 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -28,12 +28,17 @@
 */
 #include <opie2/ostation.h>
 #include <opie2/odebug.h>
+using namespace Opie::Core;
+namespace Opie {
+namespace Net {
 /*======================================================================================
 * OStation
 *======================================================================================*/
 OStation::OStation()
 {
@@ -59,6 +64,9 @@ void OStation::dump()
    odebug << "------- OStation::dump() ------------" << oendl;
    qDebug( "type: %s", (const char*) type );
    qDebug( "mac:  %s", (const char*) macAddress.toString() );
    qDebug( "ap:   %s", (const char*) apAddress.toString() );
    qDebug( "ip:   %s", (const char*) ipAddress.toString() );
 }
+}
+}
+\ No newline at end of file
diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h
index 1e7366d..68f1114 100644
--- a/libopie2/opienet/ostation.h
+++ b/libopie2/opienet/ostation.h
@@ -37,14 +37,18 @@
 #include <qstring.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 #include <sys/types.h>
+namespace Opie {
+namespace Net  {
 class OStation;
 typedef QList<OStation> OStationList;
 /*======================================================================================
 * OStation
 *======================================================================================*/
@@ -63,11 +67,16 @@ class OStation
    /* WaveLan */
    QString ssid;
    OMacAddress apAddress;
    int channel;
    bool encrypted;
+  private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OSTATION_H
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 4231a00..d4867ba 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -7,13 +7,14 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
        core/backends/otodoaccessbackend.cpp \
        core/backends/otodoaccess.cpp \
        core/backends/otodoaccesssql.cpp \
        core/backends/otodoaccessvcal.cpp \
        core/backends/otodoaccessxml.cpp \
        core/backends/odatebookaccess.cpp \
-        core/backends/odatebookaccessbackend_sql.cpp
+        core/backends/odatebookaccessbackend_sql.cpp \
+        core/backends/private/xmltree.cc
        
 HEADERS += core/backends/obackendfactory.h \
        core/backends/ocontactaccessbackend.h \
        core/backends/ocontactaccessbackend_sql.h \
        core/backends/ocontactaccessbackend_vcard.h \
        core/backends/ocontactaccessbackend_xml.h \
@@ -25,7 +26,8 @@ HEADERS += core/backends/obackendfactory.h \
        core/backends/opimaccesstemplate.h \
        core/backends/otodoaccessbackend.h \
        core/backends/otodoaccess.h \
        core/backends/otodoaccesssql.h \
        core/backends/otodoaccessvcal.h \
        core/backends/otodoaccessxml.h \
-        core/backends/odatebookaccess.h
+        core/backends/odatebookaccess.h \
+        core/backends/private/xmltree.h
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index f121cc2..d16d692 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -43,13 +43,13 @@
 #include <opie2/opimdateconversion.h>
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
+using namespace Opie::DB;
 // If defined, we use a horizontal table ( uid, attr1, attr2, attr3, ..., attrn ) instead
 // vertical like "uid, type, value".
 // DON'T DEACTIVATE THIS DEFINE IN PRODUCTIVE ENVIRONMENTS !!
 #define __STORE_HORIZONTAL_
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
index 58ae2ae..ba122ec 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
@@ -37,15 +37,19 @@
 #include <opie2/ocontactaccess.h>
 #include <qlist.h>
 #include <qdict.h>
 /* aren't in namespace Opie yet - alwin */
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 namespace Opie {
 /* the default xml implementation */
 /**
 * This class is the SQL implementation of a Contact backend
@@ -88,22 +92,22 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
        bool replace ( const OPimContact &contact );
        bool remove ( int uid );
        bool reload();
 private:
-        QArray<int> extractUids( OSQLResult& res ) const;
+        QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
        QMap<int, QString>  requestNonCustom( int uid ) const;
        QMap<QString, QString>  requestCustom( int uid ) const;
        void update();
 protected:
        bool m_changed;
        QString m_fileName;
        QArray<int> m_uids;
-        OSQLDriver* m_driver;
+        Opie::DB::OSQLDriver* m_driver;
 };
 }
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 5d92b8f..f5e76d5 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -38,20 +38,21 @@
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
 #include <qpe/global.h>
-#include <opie2/xmltree.h>
+#include "private/xmltree.h"
 #include <opie2/ocontactaccessbackend.h>
 #include <opie2/ocontactaccess.h>
 #include <stdlib.h>
 #include <errno.h>
 using namespace Opie;
+using namespace Opie::Pim::Private;
 namespace Opie {
 OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ):
        m_changed( false )
 {
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index 2ee76cc..a779dc1 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -43,12 +43,14 @@
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 #include <opie2/opimrecurrence.h>
 #include <opie2/odatebookaccessbackend_sql.h>
+using namespace Opie::DB;
 namespace Opie {
 ODateBookAccessBackend_SQL::ODateBookAccessBackend_SQL( const QString& ,
                                                        const QString& fileName )
        : ODateBookAccessBackend(), m_driver( NULL ) 
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
index cbfeb97..60d7f21 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
@@ -31,13 +31,17 @@
 #include <qmap.h>
 #include <opie2/osqlresult.h>
 #include <opie2/odatebookaccessbackend.h>
+namespace Opie {
+namespace DB {
 class OSQLDriver;
+}
+}
 namespace Opie {
 /**
 * This is the default SQL implementation for DateBoook SQL storage
 * It fully implements the interface
 * @see ODateBookAccessBackend
@@ -74,20 +78,20 @@ private:
    QString m_fileName;
    QArray<int> m_uids;
    QMap<int, QString> m_fieldMap;
    QMap<QString, int> m_reverseFieldMap;
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
    class Private;
    Private *d;
    void initFields();
    void update();
-    QArray<int> extractUids( OSQLResult& res ) const;
+    QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
 };
 }
 #endif
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 72232e5..d218090 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -38,12 +38,14 @@
 #include <opie2/otodoaccesssql.h>
 #include <opie2/opimstate.h>
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimrecurrence.h>
+using namespace Opie::DB;
 using namespace Opie;
 /*
 * first some query
 * CREATE query
 * LOAD query
 * INSERT
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index e945863..0ae2591 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -30,15 +30,19 @@
 #define OPIE_PIM_ACCESS_SQL_H
 #include <qasciidict.h>
 #include <opie2/otodoaccessbackend.h>
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 namespace Opie {
 class OPimTodoAccessBackendSQL : public OPimTodoAccessBackend {
 public:
    OPimTodoAccessBackendSQL( const QString& file );
@@ -68,20 +72,20 @@ public:
    
 private:
    void update()const;
    void fillDict();
    inline bool date( QDate& date, const QString& )const;
-    inline OPimTodo todo( const OSQLResult& )const;
+    inline OPimTodo todo( const Opie::DB::OSQLResult& )const;
-    inline OPimTodo todo( OSQLResultItem& )const;
+    inline OPimTodo todo( Opie::DB::OSQLResultItem& )const;
-    inline QArray<int> uids( const OSQLResult& )const;
+    inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
    OPimTodo todo( int uid )const;
    QBitArray sup() const;
    QAsciiDict<int> m_dict;
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
    QArray<int> m_uids;
    bool m_dirty : 1;
 };
 }
diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiepim/core/backends/private/xmltree.cc
index 059791b..40749ca 100644
--- a/libopie2/opiecore/xmltree.cc
+++ b/libopie2/opiepim/core/backends/private/xmltree.cc
@@ -14,21 +14,21 @@
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
-#include <opie2/xmltree.h>
+#include "xmltree.h"
 #include <qpe/stringutil.h>
 #include <qxml.h>
 #include <assert.h>
-using namespace Opie;
+using namespace Opie::Pim::Private;
 XMLElement::XMLElement()
    : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 )
 {
 }
diff --git a/libopie2/opiecore/xmltree.h b/libopie2/opiepim/core/backends/private/xmltree.h
index 4b6bdfa..9817a02 100644
--- a/libopie2/opiecore/xmltree.h
+++ b/libopie2/opiepim/core/backends/private/xmltree.h
@@ -22,14 +22,15 @@
 #define __bookmarks_h__
 #include <qstring.h>
 #include <qmap.h>
 #include <qtextstream.h>
-namespace Opie
+namespace Opie {
-{
+namespace Pim  {
+namespace Private{
 /**
 *  A small xml lib written by Simon Hausmann.
 */ 
 class XMLElement
 {
@@ -111,9 +112,11 @@ private:
    XMLElement( const XMLElement &rhs );
    XMLElement &operator=( const XMLElement &rhs );
    class Private;
    Private* d;
 };
+}
+}
 } // namespace Opie
 #endif
diff --git a/libopie2/opieui/big-screen/obigscreen_p.h b/libopie2/opieui/big-screen/obigscreen_p.h
index db8fc83..a85a56c 100644
--- a/libopie2/opieui/big-screen/obigscreen_p.h
+++ b/libopie2/opieui/big-screen/obigscreen_p.h
@@ -3,14 +3,15 @@
 /* QT */
 #include <qstring.h>
 class QWidget;
-namespace Opie
+namespace Opie {
-{
+namespace Ui  {
+namespace Private{
 struct OSplitterContainer
 {
    bool operator==( const OSplitterContainer& o) const
    {
        if (widget != o.widget ) return false;
@@ -20,9 +21,11 @@ struct OSplitterContainer
    }
    QWidget* widget;
    QString icon;
    QString name;
 };
-};
+}
+}
+}
 #endif
diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index 89f3793..bcfd3a6 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -32,13 +32,14 @@
 #include <opie2/otabwidget.h>
 /* QT */
 #include <qvaluelist.h>
 #include <qvbox.h>
-using namespace Opie;
+using namespace Opie::Ui;
+using namespace Opie::Ui::Private;
 /**
 *
 * This is the constructor of OSplitter
 * You might want to call setSizeChange to tell
 * OSplitter to change its layout when a specefic
@@ -165,13 +166,13 @@ void OSplitter::addWidget( OSplitter* split )
     * set tab widget
     */
    if (m_tabWidget )
        setTabWidget( m_parentTab );
    else
    {
-        Opie::OSplitterContainer con;
+        OSplitterContainer con;
        con.widget =split;
        addToBox( con );
    }
 }
 /*
@@ -210,13 +211,13 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
    if (!wid )
    {
        qWarning("Widget is not valid!");
        return;
    }
 #endif
-    Opie::OSplitterContainer cont;
+    OSplitterContainer cont;
    cont.widget = wid;
    cont.icon =icon;
    cont.name = label;
    m_container.append( cont );
@@ -393,13 +394,13 @@ void OSplitter::resizeEvent( QResizeEvent* res )
 }
 /*
 * Adds a container to a tab either the parent tab
 * or our own
 */
-void OSplitter::addToTab( const Opie::OSplitterContainer& con )
+void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
 {
    QWidget *wid = con.widget;
    // not needed widgetstack will reparent as well    wid.reparent(m_tabWidget, wid->getWFlags(), QPoint(0, 0) );
    if (m_parentTab )
        m_parentTab->addTab( wid, con.icon, con.name );
    else
@@ -407,13 +408,13 @@ void OSplitter::addToTab( const Opie::OSplitterContainer& con )
 }
 /*
 * adds a container to the box
 */
-void OSplitter::addToBox( const Opie::OSplitterContainer& con )
+void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con )
 {
    QWidget* wid = con.widget;
    wid->reparent(m_hbox, 0,  QPoint(0, 0) );
 }
@@ -542,13 +543,13 @@ void OSplitter::commonChangeBox()
        addToBox( (*it) );
    }
    for ( OSplitter* split = m_splitter.first(); split; split = m_splitter.next() )
    {
        /* tell them the world had changed */
        split->setTabWidget( 0 );
-        Opie::OSplitterContainer con;
+        OSplitterContainer con;
        con.widget = split;
        //        con.widget = split->m_tabWidget ? static_cast<QWidget*>(split->m_tabWidget)
        //                     : static_cast<QWidget*>(split->m_hbox);
        addToBox( con );
    }
diff --git a/libopie2/opieui/big-screen/osplitter.h b/libopie2/opieui/big-screen/osplitter.h
index 2daae7f..7b5ea53 100644
--- a/libopie2/opieui/big-screen/osplitter.h
+++ b/libopie2/opieui/big-screen/osplitter.h
@@ -20,13 +20,13 @@
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
- 
 */
 #ifndef OSPLITTER_H
 #define OSPLITTER_H
 #include "obigscreen_p.h"
@@ -45,14 +45,14 @@ class QHBox;
 * TODO
 * -check API docu
 * -one more example
 * -allow inserting at a position
 */
-namespace Opie
+namespace Opie{
-{
+namespace Ui  {
 class OTabWidget;
 /**
 *
 * If you've widgets that could be placed side by side but you think
 * on small resolutions is not enough place but it would really make sense
@@ -70,13 +70,13 @@ class OTabWidget;
 * @author zecke
 */
 class OSplitter : public QFrame
 {
    Q_OBJECT
 public:
-    typedef QValueList<Opie::OSplitterContainer> ContainerList;
+    typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList;
    OSplitter( Qt::Orientation = Horizontal,  QWidget *parent = 0,
               const char* name = 0, WFlags fl = 0 );
    ~OSplitter();
    void setLabel( const QString& name );
    void setIconName( const QString& name );
@@ -121,14 +121,14 @@ protected:
 private:
    /* true if OTabMode */
    bool layoutMode()const;
    //    void reparentAll();
    void setTabWidget( OTabWidget*);
-    void addToTab( const Opie::OSplitterContainer& );
+    void addToTab( const Opie::Ui::Private::OSplitterContainer& );
-    void addToBox( const Opie::OSplitterContainer& );
+    void addToBox( const Opie::Ui::Private::OSplitterContainer& );
    void removeFromTab( QWidget* );
    void changeTab();
    void changeHBox();
    void changeVBox();
    void commonChangeBox();
    QHBox *m_hbox;
@@ -142,9 +142,10 @@ private:
    QString m_icon, m_name;
    struct Private;
    Private *d;
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp
index 57e97e3..a0a6355 100644
--- a/libopie2/opieui/big-screen/owidgetstack.cpp
+++ b/libopie2/opieui/big-screen/owidgetstack.cpp
@@ -29,17 +29,17 @@
 #include "owidgetstack.h"
 /* QT */
 #include <qapplication.h>
 #include <qwidgetstack.h>
-namespace {
+namespace Opie {
+namespace Ui   {
    const int mode_size = 330;
-}
-using namespace Opie;
 /**
 * This is the standard widget. For simple usage see the example. Normally this widget
 * is the central widget of a QMainWindow.
 * Use removeWidget before you delete a widget yourself. OWidgetStack does not
 * yet recognize removal of children.
@@ -430,6 +430,9 @@ void OWidgetStack::switchTop() {
        }
    }
    delete m_stack;
    m_stack = 0;
 }
+}
+}
+\ No newline at end of file
diff --git a/libopie2/opieui/big-screen/owidgetstack.h b/libopie2/opieui/big-screen/owidgetstack.h
index 53818c8..d2f9a9f 100644
--- a/libopie2/opieui/big-screen/owidgetstack.h
+++ b/libopie2/opieui/big-screen/owidgetstack.h
@@ -32,14 +32,14 @@
 /* QT*/
 #include <qframe.h>
 #include <qmap.h>
 class QWidgetStack;
-namespace Opie
+namespace Opie {
-{
+namespace Ui {
 /**
 *
 * OWidgetStack is the answer to the problem of using Opie at different screen
 * sizes and to have a different behaviour. Most applications use a QWidgetStack
 * to supply a view on click. And by clicking the (X) you go back but this
 * behaviour feels strange on bigger screens. It's ok on smaller one because
@@ -124,9 +124,10 @@ private:
    bool m_forced : 1;
    struct Private;
    Private *d;
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index e7daead..beb4d6c 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -36,13 +36,13 @@
 /* QT */
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qlayout.h>
-using namespace Opie;
+using namespace Opie::Ui;
 namespace
 {
 /*
 * helper functions to load the start dir
 * and to save it
diff --git a/libopie2/opieui/fileselector/ofiledialog.h b/libopie2/opieui/fileselector/ofiledialog.h
index 01a599b..dfecf3d 100644
--- a/libopie2/opieui/fileselector/ofiledialog.h
+++ b/libopie2/opieui/fileselector/ofiledialog.h
@@ -32,14 +32,14 @@
 /* OPIE */
 #include <opie2/ofileselector.h>
 /* QT */
 #include <qdialog.h>
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
 /**
 * This class places a OFileSelector inside a QDialog.
 * It provides static method for letting a user chose
 * a file for either opening or saving.
 * Most of the time  the c'tor will not be used instead using
@@ -101,9 +101,10 @@ private:
 private slots:
    void slotFileSelected( const QString & );
    void slotDirSelected(const QString & );
    void slotSelectorOk();
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 15cadd4..c4d5033 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -52,14 +52,17 @@
 #include <qlistview.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 #include <qregexp.h>
 #include <qobjectlist.h>
-using namespace Opie;
+using namespace Opie::Ui::Private;
+namespace Opie {
+namespace Ui   {
+namespace Private {
 OFileViewInterface::OFileViewInterface( OFileSelector* selector )
        : m_selector( selector )
 {}
 OFileViewInterface::~OFileViewInterface()
 {}
@@ -807,12 +810,14 @@ QWidget* OFileViewFileSystem::widget( QWidget* parent )
 void OFileViewFileSystem::activate( const QString& str)
 {
    m_all = (str != QObject::tr("Files") );
 }
+}
 /* Selector */
 /**
 * @short new and complete c'tor
 *
 * Create a OFileSelector to let the user select a file. It can
 * either be used to open a file, select a save name in a dir or
@@ -1161,6 +1166,8 @@ void OFileSelector::setNameVisible( bool b )
    if ( b )
        m_nameBox->show();
    else
        m_nameBox->hide();
 }
+}
+}
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index 7fa657b..2205963 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -49,17 +49,19 @@ class QLineEdit;
 class QComboBox;
 class QWidgetStack;
 class QHBox;
 typedef QMap<QString, QStringList> MimeTypes;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 class OFileViewInterface;
 class OFileViewFileListView;
+}
 /**
 * @short a dropin replacement for the FileSelector
 *
 * This class is first used insert the OFileDialog.
@@ -70,14 +72,14 @@ class OFileViewFileListView;
 * @author zecke
 * @version 0.1
 */
 class OFileSelector : public QWidget
 {
    Q_OBJECT
-    friend class Opie::OFileViewInterface;
+    friend class Private::OFileViewInterface;
-    friend class Opie::OFileViewFileListView;
+    friend class Private::OFileViewFileListView;
 public:
    /**
     * The Mode of the Fileselector
     * Open = Open A File
     * Save = Save a File
@@ -182,19 +184,19 @@ private:
    void initViews();
 private:
    QLineEdit* m_lneEdit; // the LineEdit for the Name
    QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType
    QWidgetStack* m_stack;  // our widget stack which will contain the views
-    OFileViewInterface* currentView() const; // returns the currentView
+    Private::OFileViewInterface* currentView() const; // returns the currentView
-    OFileViewInterface* m_current; // here is the view saved
+    Private::OFileViewInterface* m_current; // here is the view saved
    bool m_shNew   : 1; // should we show New?
    bool m_shClose : 1; // should we show Close?
    MimeTypes m_mimeType; // list of mimetypes
-    QMap<QString, OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+    QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
    QHBox* m_nameBox; // the LineEdit + Label is hold here
    QHBox* m_cmbBox; // this holds the two combo boxes
    QString m_startDir;
    int m_mode;
    int m_selector;
@@ -211,9 +213,10 @@ private slots:
    void slotViewChange( const QString& );
    bool eventFilter (QObject *o, QEvent *e);
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h
index 818ced9..376dc98 100644
--- a/libopie2/opieui/fileselector/ofileselector_p.h
+++ b/libopie2/opieui/fileselector/ofileselector_p.h
@@ -53,16 +53,16 @@
 typedef QMap<QString, QStringList> MimeTypes;
 /* the View Interface */
 class QFileInfo;
 class QToolButton;
-namespace Opie
+namespace Opie{
-{
+namespace Ui{
 class OFileSelector;
+namespace Private {
 class OFileViewInterface
 {
 public:
    OFileViewInterface( OFileSelector* selector );
    virtual ~OFileViewInterface();
@@ -183,9 +183,11 @@ private:
 private:
    QListView* m_view;
 };
-};
+}
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofileview.h b/libopie2/opieui/fileselector/ofileview.h
index 495401b..aaf56b1 100644
--- a/libopie2/opieui/fileselector/ofileview.h
+++ b/libopie2/opieui/fileselector/ofileview.h
@@ -34,14 +34,15 @@
 #include <qwidget.h>
 class QFileInfo;
 class QDir;
 class DocLnk;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 /**
 * A OFileView is a specialised View for the
 * OFileSelector
 * With a View you can chage the user visible
 * representation of a OFileLister
@@ -87,9 +88,11 @@ public:
    virtual ~OFileViewFactory() = 0;
    OFileView* newView(QWidget *parent, const char *name );
    QString name()const;
 };
-};
+}
+}
+}
 #endif
diff --git a/libopie2/opieui/oclickablelabel.cpp b/libopie2/opieui/oclickablelabel.cpp
index 4c4e581..53cb77a 100644
--- a/libopie2/opieui/oclickablelabel.cpp
+++ b/libopie2/opieui/oclickablelabel.cpp
@@ -26,13 +26,13 @@
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <opie2/oclickablelabel.h>
-using namespace Opie;
+using namespace Opie::Ui;
 /**
 * This constructs the clickable ButtonLabel
 *
 * @param parent The parent of this label
 * @param name A name of this label @see QObject
diff --git a/libopie2/opieui/oclickablelabel.h b/libopie2/opieui/oclickablelabel.h
index b224d61..90859a0 100644
--- a/libopie2/opieui/oclickablelabel.h
+++ b/libopie2/opieui/oclickablelabel.h
@@ -30,14 +30,14 @@
 #ifndef OCLICKABLELABEL_H
 #define OCLICKABLELABEL_H
 /* QT */
 #include <qlabel.h>
-namespace Opie
+namespace Opie{
-{
+namespace Ui  {
 /**
 * This class is a special QLabel which can behave
 * as a QPushButton or QToggleButton.
 * The reason to use a clickable is if you want to save space
 * or you want to skip the border of a normal button
@@ -95,9 +95,10 @@ private:
 private:
    class Private;
    Private *d; // private d pointer
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/odialog.cpp b/libopie2/opieui/odialog.cpp
index 4d269d4..27f8d20 100644
--- a/libopie2/opieui/odialog.cpp
+++ b/libopie2/opieui/odialog.cpp
@@ -29,12 +29,14 @@
 */
 #include <opie2/odialog.h>
 #warning Make Margin and Spacing device dependend and configurable!
+using namespace Opie::Ui;
 int ODialog::mMarginSize = 5;
 int ODialog::mSpacingSize = 2;
 ODialog::ODialog(QWidget *parent, const char *name, bool modal, WFlags f)
        :QDialog(parent, name, modal, f)
 {
diff --git a/libopie2/opieui/odialog.h b/libopie2/opieui/odialog.h
index ceff612..57f534c 100644
--- a/libopie2/opieui/odialog.h
+++ b/libopie2/opieui/odialog.h
@@ -52,12 +52,15 @@ class QLayoutItem;
 */
 // lets fix up Qt instead! Size does matter. -zecke
 // while that may be true, reducing maintainance effort for the future does also matter -
 // and I believe that maintaining a patch against QtE is more work than our classes -mml
+namespace Opie {
+namespace Ui   {
 class ODialog : public QDialog
 {
  Q_OBJECT
  public:
@@ -85,7 +88,9 @@ class ODialog : public QDialog
    static int mSpacingSize;
    class ODialogPrivate;
    ODialogPrivate *d;
 };
+}
+}
 #endif // ODIALOG_H
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index f93781f..b19c26e 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -35,16 +35,16 @@
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qmultilineedit.h>
-using namespace Opie;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 class OFontSelectorPrivate
 {
 public:
    QListBox *      m_font_family_list;
    QComboBox *     m_font_style_list;
@@ -53,17 +53,12 @@ public:
    bool            m_pointbug : 1;
    FontDatabase    m_fdb;
 };
-};
-namespace
-{
 class FontListItem : public QListBoxText
 {
 public:
    FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText()
    {
        m_name = t;
@@ -92,25 +87,30 @@ public:
 private:
    QStringList m_styles;
    QValueList<int> m_sizes;
    QString m_name;
 };
+}
+}
+}
+using namespace Opie::Ui;
+using namespace Opie::Ui::Private;
 static int findItemCB( QComboBox *box, const QString &str )
 {
    for ( int i = 0; i < box->count(); i++ )
    {
        if ( box->text ( i ) == str )
            return i;
    }
    return -1;
 }
-}
 /* static same as anon. namespace */
 static int qt_version()
 {
    const char *qver = qVersion();
    return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
@@ -423,6 +423,7 @@ void OFontSelector::resizeEvent ( QResizeEvent *re )
    QWidget::resizeEvent ( re );
    if ( d->m_preview )
        d->m_preview->setFixedHeight ( d->m_preview->height());
 }
diff --git a/libopie2/opieui/ofontselector.h b/libopie2/opieui/ofontselector.h
index ad51819..1d97233 100644
--- a/libopie2/opieui/ofontselector.h
+++ b/libopie2/opieui/ofontselector.h
@@ -32,16 +32,17 @@
 /* QT */
 #include <qwidget.h>
 class QListBox;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 class OFontSelectorPrivate;
+}
 /**
 * This class lets you chose a Font out of a list of Fonts.
 * It can show a preview too. This selector will use all available
 * fonts
 *
@@ -92,13 +93,14 @@ protected:
 private:
    void loadFonts ( QListBox * );
    void changeFont ( );
 private:
-    OFontSelectorPrivate *d;
+    Private::OFontSelectorPrivate *d;
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp
index 9a58bb9..be47eb2 100644
--- a/libopie2/opieui/oimageeffect.cpp
+++ b/libopie2/opieui/oimageeffect.cpp
@@ -38,12 +38,16 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <opie2/odebug.h>
 #define MaxRGB 255L
 #define DegreesToRadians(x) ((x)*M_PI/180.0)
 using namespace std;
+using namespace Opie::Core;
+namespace Opie {
+namespace Ui   {
 inline unsigned int intensityValue(unsigned int color)
 {
    return((unsigned int)((0.299*qRed(color) +
                           0.587*qGreen(color) +
                           0.1140000000000001*qBlue(color))));
@@ -3762,7 +3766,8 @@ void OImageEffect::contrastHSV(QImage &img, bool sharpen)
        data[i] = qRgba(c.red(), c.green(), c.blue(), qAlpha(data[i]));
    }
 }
+}
+}
diff --git a/libopie2/opieui/oimageeffect.h b/libopie2/opieui/oimageeffect.h
index fb4d22d..4f86d5b 100644
--- a/libopie2/opieui/oimageeffect.h
+++ b/libopie2/opieui/oimageeffect.h
@@ -36,12 +36,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define OIMAGEEFFECT_H
 class QImage;
 class QSize;
 class QColor;
+namespace Opie {
+namespace Ui   {
 /**
 * This class includes various @ref QImage based graphical effects.
 *
 * Everything is
 * static, so there is no need to create an instance of this class. You can
 * just call the static methods. They are encapsulated here merely to provide
@@ -553,7 +555,10 @@ private:
                     unsigned int *f, unsigned int *g);
    static unsigned int generateNoise(unsigned int pixel, NoiseType type);
    static unsigned int interpolateColor(QImage *image, double x, double y,
                                         unsigned int background);
 };
+}
+}
 #endif
diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index 0ee2fde..38670b4 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -33,12 +33,17 @@
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/olistview.h>
+using namespace Opie::Core;
+namespace Opie {
+namespace Ui   {
 /*======================================================================================
 * OListView
 *======================================================================================*/
 OListView::OListView( QWidget *parent, const char *name )
          :QListView( parent, name )
@@ -752,6 +757,8 @@ ONamedListViewItem* ONamedListViewItem::find( const QString& column, const QStri
    if ( col != -1 )
        return ( (ONamedListView*) listView() )->find( (ONamedListViewItem*) firstChild(), col, text, recurse );
    else
        return 0;
 }
+}
+}
diff --git a/libopie2/opieui/olistview.h b/libopie2/opieui/olistview.h
index 59b0973..8195a62 100644
--- a/libopie2/opieui/olistview.h
+++ b/libopie2/opieui/olistview.h
@@ -33,12 +33,15 @@
 #include <qcolor.h>
 #include <qlistview.h>
 #include <qpen.h>
 #include <qdatastream.h>
 #include <qstringlist.h>
+namespace Opie {
+namespace Ui   {
 class OListViewItem;
 /*======================================================================================
 * OListView
 *======================================================================================*/
@@ -51,12 +54,13 @@ class OListViewItem;
 * for the width of the widget ( >= Qt 3 only ) and persistence capabilities.
 *
 * @author Michael 'Mickey' Lauer <mickey@vanille.de>
 */
 class OListView: public QListView
 {
+    Q_OBJECT
  public:
   /**
    * Constructor.
    *
    * The parameters @a parent and @a name are handled by
    * @ref QListView, as usual.
@@ -136,14 +140,16 @@ class OListView: public QListView
     * expand the current OListViewItem
     */
    void expand(QListViewItem*);
  private:
    QColor m_alternateBackground;
-    bool m_fullWidth;
+    bool m_fullWidth : 1;
    QPen m_columnSeparator;
+    class Private;
+    Private *d;
 };
 #ifndef QT_NO_DATASTREAM
 /**
  * @relates OListView
  * Writes @a listview to the @a stream and returns a reference to the stream.
@@ -239,14 +245,16 @@ class OListViewItem: public QListViewItem
    /**
     * expand the the item
     */
    virtual void expand(){};
  private:
-    bool m_known;
+    bool m_known : 1;
-    bool m_odd;
+    bool m_odd   : 1;
+    class Private;
+    Private *d;
 };
 #ifndef QT_NO_DATASTREAM
 /**
  * @relates QListViewItem
  * Writes listview @a item and all subitems recursively to @a stream
@@ -351,12 +359,15 @@ class ONamedListView: public OListView
     */
    virtual ONamedListViewItem* find( ONamedListViewItem* start, int column, const QString& text, int recurse = -1 ) const;
    virtual ONamedListViewItem* find( int column, const QString& text, int recurse = -1 ) const;
    virtual ONamedListViewItem* find( ONamedListViewItem* start, const QString& column, const QString& text, int recurse = -1 ) const;
    virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
+  private:
+    class Private;
+    Private *d;
 };
 /*======================================================================================
 * ONamedListViewItem
 *======================================================================================*/
@@ -400,10 +411,16 @@ class ONamedListViewItem: public OListViewItem
     * <li>set it to -1 for maximum recursion.
     * </ul>
     * @sa ONamedListView::find()
     */
    virtual ONamedListViewItem* find( int column, const QString& text, int recurse = -1 ) const;
    virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
-};
+  private:
+    class Private;
+    Private *d;
+};
+}
+}
 #endif // OLISTVIEW_H
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 1be8db5..e895edc 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -3,17 +3,15 @@ CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = oclickablelabel.h      \
              odialog.h              \
              ofontselector.h        \
              oimageeffect.h         \
              olistview.h            \
-              omessagebox.h          \
              opixmapeffect.h        \
              opopupmenu.h           \
              opixmapprovider.h      \
-              oresource.h            \
              oselector.h            \
              oseparator.h           \
              otabinfo.h             \
              otabbar.h              \
              otabwidget.h           \
              otaskbarapplet.h       \
@@ -28,13 +26,12 @@ SOURCES     = oclickablelabel.cpp    \
              ofontselector.cpp      \
              oimageeffect.cpp       \
              olistview.cpp          \
              opixmapeffect.cpp      \
              opopupmenu.cpp         \
              opixmapprovider.cpp    \
-              oresource.cpp          \
              oselector.cpp          \
              oseparator.cpp         \
              otabbar.cpp            \
              otabwidget.cpp         \
              otaskbarapplet.cpp     \
              oticker.cpp            \
diff --git a/libopie2/opieui/opixmapeffect.cpp b/libopie2/opieui/opixmapeffect.cpp
index 05f851d..794c7b2 100644
--- a/libopie2/opieui/opixmapeffect.cpp
+++ b/libopie2/opieui/opixmapeffect.cpp
@@ -14,12 +14,14 @@
 /* OPIE */
 #include <opie2/opixmapeffect.h>
 #include <opie2/oimageeffect.h>
+using namespace Opie::Ui;
 //======================================================================
 //
 // Gradient effects
 //
 //======================================================================
diff --git a/libopie2/opieui/opixmapeffect.h b/libopie2/opieui/opixmapeffect.h
index 283fe2d..b780f9f 100644
--- a/libopie2/opieui/opixmapeffect.h
+++ b/libopie2/opieui/opixmapeffect.h
@@ -12,12 +12,15 @@
 #include <qsize.h>
 typedef QPixmap OPixmap;
 class QColor;
+namespace Opie {
+namespace Ui   {
 /**
 * This class includes various pixmap-based graphical effects.
 *
 * Everything is
 * static, so there is no need to create an instance of this class. You can
 * just call the static methods. They are encapsulated here merely to provide
@@ -207,9 +210,10 @@ public:
     * on the desktop.
     * @param pixmap the pixmap to select
     * @param col the selected color, usually from QColorGroup::highlight().
     */
    static OPixmap selectedPixmap( const OPixmap &pixmap, const QColor &col );
 };
+}
+}
 #endif
diff --git a/libopie2/opieui/opixmapprovider.cpp b/libopie2/opieui/opixmapprovider.cpp
index 7be9e3b..7eb67a2 100644
--- a/libopie2/opieui/opixmapprovider.cpp
+++ b/libopie2/opieui/opixmapprovider.cpp
@@ -17,11 +17,13 @@
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 #include <opie2/opixmapprovider.h>
+using namespace Opie::Ui;
 OPixmapProvider::~OPixmapProvider() {}
 void OPixmapProvider::virtual_hook( int , void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/libopie2/opieui/opixmapprovider.h b/libopie2/opieui/opixmapprovider.h
index 5b76647..9d9bd69 100644
--- a/libopie2/opieui/opixmapprovider.h
+++ b/libopie2/opieui/opixmapprovider.h
@@ -20,13 +20,16 @@
 #ifndef OPIXMAPPROVIDER_H
 #define OPIXMAPPROVIDER_H
 #include <qpixmap.h>
+namespace Opie {
+namespace Ui   {
 /**
+ * \todo make usefull
 * A tiny abstract class with just one method:
 * @ref pixmapFor()
 *
 * It will be called whenever an icon is searched for @p text.
 *
 * Used e.g. by @ref KHistoryCombo
@@ -45,10 +48,15 @@ public:
     *             See @ref KIcon::StdSize.
     * @return the pixmap for the arguments, or null if there is none
     */
    virtual QPixmap pixmapFor( const QString& text, int size = 0 ) = 0;
 protected:
    virtual void virtual_hook( int id, void* data );
+private:
+    class Private;
+    Private *d;    
 };
+}
+}
 #endif // OPIXMAPPROVIDER_H
diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp
index d5cc575..3ab8490 100644
--- a/libopie2/opieui/opopupmenu.cpp
+++ b/libopie2/opieui/opopupmenu.cpp
@@ -24,12 +24,15 @@
 /* OPIE */
 #include <opie2/opopupmenu.h>
 #include <opie2/oconfig.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 OPopupTitle::OPopupTitle(QWidget *parent, const char *name)
    : QWidget(parent, name)
 {
    setMinimumSize(16, fontMetrics().height()+8);
 }
diff --git a/libopie2/opieui/opopupmenu.h b/libopie2/opieui/opopupmenu.h
index 54e4301..419a954 100644
--- a/libopie2/opieui/opopupmenu.h
+++ b/libopie2/opieui/opopupmenu.h
@@ -28,12 +28,14 @@
 #include <qpopupmenu.h>
 /* OPIE */
 #include <opie2/opixmapeffect.h>
+namespace Opie {
+namespace Ui   {
 /**
 * Title widget for use in @ref OPopupMenu.
 *
 * You usually don't have to create this manually since
 * @ref OPopupMenu::insertTitle will do it for you, but it is allowed if
 * you wish to customize it's look.
@@ -253,7 +255,10 @@ protected slots:
 private:
    class OPopupMenuPrivate;
    OPopupMenuPrivate *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp
index 23b3ce3..5f6f10f 100644
--- a/libopie2/opieui/oselector.cpp
+++ b/libopie2/opieui/oselector.cpp
@@ -33,12 +33,14 @@
 //-----------------------------------------------------------------------------
 /*
 * 2D value selector.
 * The contents of the selector are drawn by derived class.
 */
+using namespace Opie::Ui;
 OXYSelector::OXYSelector( QWidget *parent, const char *name )
        : QWidget( parent, name )
 {
        xPos = 0;
        yPos = 0;
        minX = 0;
@@ -70,13 +72,13 @@ void OXYSelector::setValues( int _xPos, int _yPos )
        yPos = _yPos;
        if ( xPos > maxX )
                xPos = maxX;
        else if ( xPos < minX )
                xPos = minX;
-        
        if ( yPos > maxY )
                yPos = maxY;
        else if ( yPos < minY )
                yPos = minY;
        int xp = 2 + (width() - 4) * xPos / (maxX - minX);
@@ -255,13 +257,13 @@ void OSelector::paintEvent( QPaintEvent * )
                else
                        qDrawShadePanel( &painter, 3, 0, width()-6, height()-5,
                                colorGroup(), TRUE, 2, &brush );
        }
        QPoint pos = calcArrowPos( value() );
-        drawArrow( &painter, TRUE, pos );   
+        drawArrow( &painter, TRUE, pos );
        painter.end();
 }
 void OSelector::mousePressEvent( QMouseEvent *e )
 {
@@ -285,16 +287,16 @@ void OSelector::valueChange()
        QPainter painter;
        QPoint pos;
        painter.begin( this );
        pos = calcArrowPos( prevValue() );
-        drawArrow( &painter, FALSE, pos );   
+        drawArrow( &painter, FALSE, pos );
        pos = calcArrowPos( value() );
-        drawArrow( &painter, TRUE, pos );   
+        drawArrow( &painter, TRUE, pos );
        painter.end();
 }
 void OSelector::moveArrow( const QPoint &pos )
 {
@@ -358,14 +360,14 @@ void OSelector::drawArrow( QPainter *painter, bool show, const QPoint &pos )
      array.setPoint( 0, pos.x()+0, pos.y()+0 );
      array.setPoint( 1, pos.x()+5, pos.y()+5 );
      array.setPoint( 2, pos.x()-5, pos.y()+5 );
    }
    painter->drawPolygon( array );
-  } 
+  }
-  else 
+  else
  {
    if ( orientation() == Vertical )
    {
       repaint(pos.x(), pos.y()-5, 6, 11, true);
    }
    else
@@ -397,13 +399,13 @@ OGradientSelector::~OGradientSelector()
 void OGradientSelector::init()
 {
    color1.setRgb( 0, 0, 0 );
    color2.setRgb( 255, 255, 255 );
-    
    text1 = text2 = "";
 }
 void OGradientSelector::drawContents( QPainter *painter )
 {
@@ -469,13 +471,13 @@ void OGradientSelector::drawContents( QPainter *painter )
                         painter->fontMetrics().width( text2 )) / 2;
                QPen pen( color2 );
                painter->setPen( pen );
                painter->drawText( xPos, yPos, text2 );
                yPos = contentsRect().bottom() - painter->fontMetrics().descent() - 2;
-                xPos = contentsRect().left() + (contentsRect().width() - 
+                xPos = contentsRect().left() + (contentsRect().width() -
                        painter->fontMetrics().width( text1 )) / 2;
                pen.setColor( color1 );
                painter->setPen( pen );
                painter->drawText( xPos, yPos, text1 );
        }
        else
diff --git a/libopie2/opieui/oselector.h b/libopie2/opieui/oselector.h
index f832239..fe75a46 100644
--- a/libopie2/opieui/oselector.h
+++ b/libopie2/opieui/oselector.h
@@ -24,12 +24,15 @@
 #define __OSELECT_H__
 #include <qwidget.h>
 #include <qrangecontrol.h>
 #include <qpixmap.h>
+namespace Opie {
+namespace Ui   {
 /**
 * OXYSelector is the base class for other widgets which
 * provides the ability to choose from a two-dimensional
 * range of values. The currently chosen value is indicated
 * by a cross. An example is the @ref OHSSelector which
 * allows to choose from a range of colors, and which is
@@ -509,10 +512,12 @@ protected:
 private:
  class OColorPrivate;
  OColorPrivate *d;
 };
+}
+}
        #endif  // __OSELECT_H__
diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp
index b93c225..bbc4381 100644
--- a/libopie2/opieui/oseparator.cpp
+++ b/libopie2/opieui/oseparator.cpp
@@ -33,12 +33,14 @@
 #include <opie2/odebug.h>
 #include <opie2/oseparator.h>
 /* QT */
+using namespace Opie::Core;
+using namespace Opie::Ui;
 OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f)
   : QFrame(parent, name, f)
 {
   setLineWidth(1);
   setMidLineWidth(0);
diff --git a/libopie2/opieui/oseparator.h b/libopie2/opieui/oseparator.h
index e59b3f4..6fc4344 100644
--- a/libopie2/opieui/oseparator.h
+++ b/libopie2/opieui/oseparator.h
@@ -32,12 +32,15 @@
 #ifndef OSEPARATOR_H
 #define OSEPARATOR_H
 #include <qframe.h>
+namespace Opie {
+namespace Ui   {
 /**
 * Standard horizontal or vertical separator.
 *
 * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 * @author Michael Roth <mroth@wirlweb.de>
 * @version $Id$
@@ -83,8 +86,10 @@ protected:
  virtual void drawFrame( QPainter * );
 private:
  class OSeparatorPrivate* d;
 };
+}
+}
 #endif // OSEPARATOR_H
diff --git a/libopie2/opieui/otabbar.cpp b/libopie2/opieui/otabbar.cpp
index cd3a34b..a62e18b 100644
--- a/libopie2/opieui/otabbar.cpp
+++ b/libopie2/opieui/otabbar.cpp
@@ -28,13 +28,13 @@
                             Boston, MA 02111-1307, USA.
 */
 #include <opie2/otabbar.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OTabBar::OTabBar( QWidget *parent , const char *name  )
        :QTabBar( parent, name )
 {}
 void OTabBar::paintLabel( QPainter* p, const QRect& br, QTab* t, bool has_focus ) const
diff --git a/libopie2/opieui/otabbar.h b/libopie2/opieui/otabbar.h
index 2f35c85..925ae96 100644
--- a/libopie2/opieui/otabbar.h
+++ b/libopie2/opieui/otabbar.h
@@ -32,14 +32,14 @@
 #ifndef OTABBAR_H
 #define OTABBAR_H
 /* QT */
 #include <qtabbar.h>
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
 /**
 * @class OTabBar
 * @brief The OTabBar class is a derivative of QTabBar.
 *
 * OTabBar is a derivation of TrollTech's QTabBar which provides
@@ -77,9 +77,10 @@ protected:
 private:
    class Private;
    Private *d;
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/otabinfo.h b/libopie2/opieui/otabinfo.h
index 4a6ce14..426c45a 100644
--- a/libopie2/opieui/otabinfo.h
+++ b/libopie2/opieui/otabinfo.h
@@ -35,14 +35,14 @@
 /* QT */
 #include <qlist.h>
 #include <qstring.h>
 class QWidget;
-namespace Opie
+namespace Opie{
-{
+namespace Ui  {
 /**
 * @class OTabInfo
 * @brief The OTabInfo class is used internally by OTabWidget to keep track
 *        of widgets added to the control.
 *
@@ -132,9 +132,10 @@ private:
 /**
 * @class OTabInfoList
 * @brief A list of OTabInfo objects used by OTabWidget.
 */
 typedef QList<OTabInfo> OTabInfoList;
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp
index f47c90b..a9f7da9 100644
--- a/libopie2/opieui/otabwidget.cpp
+++ b/libopie2/opieui/otabwidget.cpp
@@ -38,13 +38,13 @@
 #include <opie2/otabbar.h>
 /* QT */
 #include <qcombobox.h>
 #include <qwidgetstack.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p )
        : QWidget( parent, name )
 {
    if ( s == Global )
    {
diff --git a/libopie2/opieui/otabwidget.h b/libopie2/opieui/otabwidget.h
index 092f22c..6a64b7d 100644
--- a/libopie2/opieui/otabwidget.h
+++ b/libopie2/opieui/otabwidget.h
@@ -35,21 +35,20 @@
 #include <opie2/otabinfo.h>
 /* QT */
 #include <qwidget.h>
 #include <qlist.h>
-using namespace Opie;
 class QComboBox;
 class QPixmap;
 class QTabBar;
 class QWidgetStack;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
 class OTabBar;
 /**
 * @class OTabWidget
 * @brief The OTabWidget class provides a stack of widgets.
@@ -284,9 +283,10 @@ private:
 *
 * @param id Index of widget selected.
 */
    void slotTabListSelected( int );
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/otaskbarapplet.cpp b/libopie2/opieui/otaskbarapplet.cpp
index a67356d..b5268f0 100644
--- a/libopie2/opieui/otaskbarapplet.cpp
+++ b/libopie2/opieui/otaskbarapplet.cpp
@@ -25,8 +25,58 @@
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
+#include <opie2/otaskbarapplet.h>
+#include <qpe/qpeapplication.h>
+#include <qframe.h>
+using namespace Opie::Ui;
+/**
+ * \todo no example yet!!!
+ * If you want to implement an Applet for the Opie Taskbar
+ * use this interface.
+ * The only specail thing about applets is that you need to build
+ * it as plugin/library and do EXPORT_OPIE_APPLET_v1( YourApplet )
+ * at the bottom of your application. This takes care of
+ * the activation and implementing the TaskbarAppletInterface.
+ * You also need to add a static int position() functions to your
+ * application.
+ * \code
+ *    class MyApplet : public OTaskBarApplet {
+ *     public:
+ *      static int position() { return 3: }
+ *      void doStuff() {
+ *          popup( myWidget );
+ *      }
+ *    };
+ *    EXPORT_OPIE_APPLET_v1( MyApplet )
+ * \endcode
+ *
+ * @author Michael Lauer
+ * @version 0.5
+ * @see TaskbarAppletInterface
+ */
+OTaskbarApplet::OTaskbarApplet( QWidget* parent, const char* name  )
+    :QWidget( parent, name ){
+    setFixedHeight( 18 );
+    setFixedWidth( 14 );
+}
+OTaskbarApplet::~OTaskbarApplet(){
+}
+void OTaskbarApplet::popup( QWidget* widget ){
+    QPoint curPos = mapToGlobal( QPoint( 0, 0 ) );
+    int w = widget->sizeHint().width();
+    int x = curPos.x() - (w/2 );
+    if ( (x+w) > QPEApplication::desktop()->width() )
+        x = QPEApplication::desktop()->width()-w;
+    widget->move( x, curPos.y()-widget->sizeHint().height() );
+    widget->show();
+}
-// Empty on purpose until we shipped Opie 1.0 (see otaskbarapplet.h for explanation)
diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 074367f..0c85ee7 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -30,17 +30,26 @@
 */
 #ifndef OTASKBARAPPLET_H
 #define OTASKBARAPPLET_H
 #include <qpe/taskbarappletinterface.h>
+#include <qpe/qcom.h>
+#include <qwidget.h>
+class QMouseEvent;
+namespace Opie {
+namespace Ui   {
+namespace Private {
 /*======================================================================================
 * OTaskbarAppletWrapper
 *======================================================================================*/
+class OTaskbarAppletWrapperPrivate;
 template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
 {
  public:
    OTaskbarAppletWrapper():_applet( 0 )
    {
    }
@@ -77,20 +86,16 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
    {
        return T::position();
    }
  private:
    T* _applet;
+    OTaskbarAppletWrapperPrivate *d;
 };
-#include <qframe.h>
+}
-#include <qwidget.h>
-#include <qpe/qpeapplication.h>
-class QMouseEvent;
 /*======================================================================================
 * OTaskbarApplet
 *======================================================================================*/
 // Must be inline until after we shipped Opie 1.0
@@ -100,31 +105,25 @@ class QMouseEvent;
 // the dynamic loader [dlopen] tries to resolve an applet which
 // inherits OTaskbarApplet
 class OTaskbarApplet : public QWidget
 {
  public:
-    OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name )
+    OTaskbarApplet( QWidget* parent, const char* name = 0 );
-    {
+    virtual ~OTaskbarApplet();
-        setFixedHeight( 18 );
-        setFixedWidth( 14 );
-    }
-    virtual ~OTaskbarApplet()
-    {
-    }
  protected:
-    virtual void popup( QWidget* widget )
+    virtual void popup( QWidget* widget );
-    {
+private:
-        QPoint curPos = mapToGlobal( QPoint( 0, 0 ) );
+    class Private;
-        int w = widget->sizeHint().width();
+    Private *d;
-        int x = curPos.x() - (w/2 );
-        if ( (x+w) > QPEApplication::desktop()->width() )
-            x = QPEApplication::desktop()->width()-w;
-        widget->move( x, curPos.y()-widget->sizeHint().height() );
-        widget->show();
-    }
 };
+}
+}
+#define EXPORT_OPIE_APPLET_v1(  AppLet ) \
+    Q_EXPORT_INTERFACE() { \
+    Q_CREATE_INSTANCE(  Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \
+    }
 #endif
diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp
index 66f9ce0..7de0fd3 100644
--- a/libopie2/opieui/otimepicker.cpp
+++ b/libopie2/opieui/otimepicker.cpp
@@ -24,20 +24,24 @@
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
+/* OPIE */
+#include <opie2/otimepicker.h>
 /* QT */
+#include <qgroupbox.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-/* OPIE */
-#include <opie2/otimepicker.h>
-using namespace Opie;
+namespace Opie {
+namespace Ui {
 /**
 * Constructs the widget
 * @param parent The parent of the OTimePicker
 * @param name The name of the object
 * @param fl Window Flags
@@ -217,12 +221,14 @@ void OTimePicker::setHour(int h)
 * @param name The name of the object
 * @param fl Possible window flags
 */
 OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags fl )
        : OTimePickerDialogBase (parent , name, true , fl)
 {
+    m_timePicker = new OTimePicker(  GroupBox1, "m_timePicker" );
+    GroupBox1Layout->addWidget( m_timePicker, 0, 0 );
    connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ),
              this, SLOT( setTime(const QTime&) ) );
    connect ( minuteField, SIGNAL( textChanged(const QString&) ),
              this, SLOT ( setMinute(const QString&) ) );
    connect ( hourField, SIGNAL( textChanged(const QString&) ),
@@ -287,6 +293,9 @@ void OTimePickerDialog::setMinute ( const QString& minute )
    if ( QTime::isValid ( m_time.hour(), minute.toInt(), 00 ) )
    {
        m_time.setHMS ( m_time.hour(), minute.toInt(), 00 );
        setTime ( m_time );
    }
 }
+}
+}
diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h
index 2da7773..01bb557 100644
--- a/libopie2/opieui/otimepicker.h
+++ b/libopie2/opieui/otimepicker.h
@@ -29,37 +29,36 @@
 #ifndef OTIMEPICKER_H
 #define OTIMEPICKER_H
 /* OPIE */
 #include <opie2/oclickablelabel.h>
-#include "otimepickerbase.h"
+#include <opie2/otimepickerbase.h>
 /* QT */
 #include <qwidget.h>
 #include <qvaluelist.h>
 #include <qdatetime.h>
 #include <qdialog.h>
-using namespace Opie;
-// namespace Opie
+namespace Opie {
-// {
+namespace Ui   {
 /**
 * A class to pick time. It uses clickable labels
 * internally to allow a quick selection of a time.
 * A time can be selected by two clicks of a user
 *
 * @short A widget to quickly pick a QTime
 * @version 1.0
 * @see QWidget
 * @see QTime
 * @author Hakan Ardo, Stefan Eilers
 */
-class OTimePicker: public QWidget
+class OTimePicker : public QWidget
 {
    Q_OBJECT
 public:
    OTimePicker(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
@@ -111,15 +110,23 @@ public:
 public slots:
    void setTime( const QTime& time );
    void setHour( const QString& hour );
    void setMinute( const QString& minute );
 private:
+    OTimePicker *m_timePicker;
    QTime m_time;
    class Private;
    Private* d;
 };
-// };
+}
+}
+/* for Qt2  */
+#if ( QT_VERSION-0 >= 0x030000 )
+#error "Fix the UI File to use namespaces"
+#else
+typedef Opie::Ui::OTimePicker OUIOTimePicker;
+#endif
 #endif
diff --git a/libopie2/opieui/otimepickerbase.ui b/libopie2/opieui/otimepickerbase.ui
index 3e7f2fb..c2eb7c5 100644
--- a/libopie2/opieui/otimepickerbase.ui
+++ b/libopie2/opieui/otimepickerbase.ui
@@ -8,13 +8,13 @@
    </property>
    <property stdset="1">
        <name>geometry</name>
        <rect>
            <x>0</x>
            <y>0</y>
-            <width>210</width>
+            <width>182</width>
            <height>137</height>
        </rect>
    </property>
    <property stdset="1">
        <name>sizePolicy</name>
        <sizepolicy>
@@ -246,47 +246,11 @@
                    <number>11</number>
                </property>
                <property stdset="1">
                    <name>spacing</name>
                    <number>6</number>
                </property>
-                <widget row="0"  column="0" >
-                    <class>OTimePicker</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>m_timePicker</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>3</vsizetype>
-                        </sizepolicy>
-                    </property>
-                </widget>
            </grid>
        </widget>
    </vbox>
 </widget>
-<customwidgets>
-    <customwidget>
-        <class>OTimePicker</class>
-        <header location="local">otimepicker.h</header>
-        <sizehint>
-            <width>-1</width>
-            <height>-1</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>7</hordata>
-            <verdata>1</verdata>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data>
-    </image>
-</images>
 </UI>
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 78154b7..f6c6410 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -37,12 +37,15 @@
 /* QT */
 #include <qaction.h>
 #include <qpopupmenu.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 /* XPM */
 static const char * view_icon_xpm[] = {
 "16 16 16 1",
        " c None",
        ".c #87BD88",
        "+c #8BBE8B",
@@ -129,21 +132,21 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
    _listview->setAllColumnsShowFocus( true );
    _listview->setRootIsDecorated( true );
    _listview->setShowSortIndicator( true );
    _iconview->setGridX( 90 );
    _iconview->setGridY( 42 );
    _iconview->setAutoArrange( true );
-    
    #ifdef QWS  // TODO: Let this depend on current geometry (rotation)
    _iconview->setArrangement( QIconView::TopToBottom );
    #else
    _iconview->setArrangement( QIconView::LeftToRight );
    #endif
-    
    _iconview->setResizeMode( QIconView::Adjust );
-    
    // qt-embedded: map stylus right on hold to right button press
    #ifdef QWS
    ( (QPEApplication*) qApp)->setStylusOperation( _iconview->viewport(), QPEApplication::RightOnHold );
    ( (QPEApplication*) qApp)->setStylusOperation( _listview->viewport(), QPEApplication::RightOnHold );
    #endif
@@ -165,63 +168,63 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
    if ( mode == Icons )
        a1->setOn( true );
    else if ( mode == Tree )
        a2->setOn( true );
    connect( a1, SIGNAL( activated() ), this, SLOT( setIconViewMode() ) );
    connect( a2, SIGNAL( activated() ), this, SLOT( setTreeViewMode() ) );
-    
    #if (QT_VERSION >= 0x030000)
    connect( _listview, SIGNAL( contextMenuRequested(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
    connect( _iconview, SIGNAL( contextMenuRequested(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
    #else
    connect( _listview, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
    connect( _iconview, SIGNAL( rightButtonPressed(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
    #endif
-        
    //
    // signal forwarders
    //
    // unfortunately we can't short-circuit all the QListView and QIconView signals
    // to OVersatileView signals, because the signal/slot mechanism doesn't allow
    // type-conversion :-(
    // common signals for listview
-    
    connect( _listview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
    connect( _listview, SIGNAL( selectionChanged(QListViewItem*) ), this, SLOT( selectionChanged(QListViewItem*) ) );
-    connect( _listview, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( currentChanged(QListViewItem*) ) );   
+    connect( _listview, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( currentChanged(QListViewItem*) ) );
    connect( _listview, SIGNAL( clicked(QListViewItem*) ), this, SLOT( clicked(QListViewItem*) ) );
    connect( _listview, SIGNAL( pressed(QListViewItem*) ), this, SLOT( pressed(QListViewItem*) ) );
-    
    connect( _listview, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( doubleClicked(QListViewItem*) ) );
    connect( _listview, SIGNAL( returnPressed(QListViewItem*) ), this, SLOT( returnPressed(QListViewItem*) ) );
-    
    connect( _listview, SIGNAL( onItem(QListViewItem*) ), this, SLOT( onItem(QListViewItem*) ) );
    connect( _listview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
    // common signals for iconview
-    
    connect( _iconview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
    connect( _iconview, SIGNAL( selectionChanged(QIconViewItem*) ), this, SLOT( selectionChanged(QIconViewItem*) ) );
-    connect( _iconview, SIGNAL( currentChanged(QIconViewItem*) ), this, SLOT( currentChanged(QIconViewItem*) ) );   
+    connect( _iconview, SIGNAL( currentChanged(QIconViewItem*) ), this, SLOT( currentChanged(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( clicked(QIconViewItem*) ), this, SLOT( clicked(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( pressed(QIconViewItem*) ), this, SLOT( pressed(QIconViewItem*) ) );
-    
    connect( _iconview, SIGNAL( doubleClicked(QIconViewItem*) ), this, SLOT( doubleClicked(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( returnPressed(QIconViewItem*) ), this, SLOT( returnPressed(QIconViewItem*) ) );
-    
    connect( _iconview, SIGNAL( onItem(QIconViewItem*) ), this, SLOT( onItem(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
-    
    // listview only signals
-    
    connect( _listview, SIGNAL( expanded(QListViewItem*) ), this, SLOT( expanded(QListViewItem*) ) );
    connect( _listview, SIGNAL( collapsed(QListViewItem*) ), this, SLOT( collapsed(QListViewItem*) ) );
-    
    // iconview only signals
-    
    connect( _iconview, SIGNAL( moved() ), this, SIGNAL( moved() ) );
 }
 OVersatileView::~OVersatileView()
 {
 }
@@ -417,13 +420,13 @@ void OVersatileView::doubleClicked( QIconViewItem * item )
 }
 void OVersatileView::returnPressed( QListViewItem * item )
 {
    emit( returnPressed( static_cast<OVersatileViewItem*>( item ) ) );
 }
-  
 void OVersatileView::returnPressed( QIconViewItem * item )
 {
    emit( returnPressed( static_cast<OVersatileViewItem*>( item ) ) );
 }
 void OVersatileView::onItem( QListViewItem * item )
@@ -450,13 +453,13 @@ void OVersatileView::collapsed( QListViewItem *item ) // QListView
    emit( collapsed( static_cast<OVersatileViewItem*>( item ) ) );
 }
 //=============================================================================================//
 // OVersatileView Case I - API only existing in QListView or QIconView but not in both!
 //==============================================================================================//
-    
 int OVersatileView::treeStepSize() const  // QListView
 {
    if ( !isValidViewMode( Tree ) )
    {
        return -1;
    }
@@ -742,13 +745,13 @@ void OVersatileView::triggerUpdate()  // QListView
    _listview->triggerUpdate();
 }
 //
 // only in QIconView
 //
-    
 uint OVersatileView::count() const  // QIconView
 {
    if ( !isValidViewMode( Icons ) )
    {
        return 0;
    }
diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h
index 8af21dc..61b61db 100644
--- a/libopie2/opieui/oversatileview.h
+++ b/libopie2/opieui/oversatileview.h
@@ -42,113 +42,116 @@
 /* FORWARDS */
 class QHeader;
 class QIconSet;
 class QIconViewItem;
-class OListView;
 class QListViewItem;
 class QPopupMenu;
 class QString;
 #ifndef QT_NO_DRAGANDDROP
 class QIconDragItem;
 #endif
+namespace Opie {
+namespace Ui   {
+class OListView;
 class OVersatileView : public QWidgetStack
 {
  Q_OBJECT
-  
  friend class OVersatileViewItem;
  //==============================================================================================//
  // OVersatileView High Level API
  //==============================================================================================//
  public:
    OVersatileView( QWidget* parent = 0, const char* name = 0, int mode = 0 );
    ~OVersatileView();
    QPopupMenu* contextMenu() const;
-  
    void setSynchronization( bool sync );
    bool synchronization();
-    
    enum ViewMode { Tree = 0, Icons };
    int viewMode();
-    
    QIconView* iconView() const;
    OListView* listView() const;
-    
    enum WarningPolicy { None = 0, Warn, WarnReturn };
-    
    void setWarningPolicy( int ) const;  // warn, if calling a method which doesn't apply to the current viewmode
    bool warningPolicy() const;
-    
    void setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened, QPixmap& closed );
-    
  public slots:
    void setViewMode( int mode );
    void setIconViewMode();
    void setTreeViewMode();
  protected:
    virtual bool isValidViewMode( int mode ) const;
    virtual void popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col = 0 );
-  
  private:
    int _viewmode;
    bool _synchronization;
    mutable int _warningpolicy;
-    
    OListView* _listview;
    QIconView* _iconview;
-    
    QPixmap _treeleaf;
    QPixmap _treeopened;
    QPixmap _treeclosed;
    QPixmap _iconleaf;
    QPixmap _iconopened;
    QPixmap _iconclosed;
-    
    QPopupMenu* _contextmenu;
-    
    int _iconstyle;
    int _treestyle;
-  
  private slots:
-      
    void contextMenuRequested( QListViewItem*, const QPoint&, int );
    void contextMenuRequested( QIconViewItem*, const QPoint& );
    // type converting signal forwarders
-    
    void selectionChanged( QListViewItem * );
    void currentChanged( QListViewItem * );
    void clicked( QListViewItem * );
    void pressed( QListViewItem * );
    void doubleClicked( QListViewItem * );
    void returnPressed( QListViewItem * );
    void onItem( QListViewItem * );
-    
    void selectionChanged( QIconViewItem * );
    void currentChanged( QIconViewItem * );
    void clicked( QIconViewItem * );
    void pressed( QIconViewItem * );
    void doubleClicked( QIconViewItem * );
    void returnPressed( QIconViewItem * );
    void onItem( QIconViewItem * );
-    
    void expanded( QListViewItem * item ); // QListView
    void collapsed( QListViewItem * item ); // QListView
  signals:
-    
    void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col );
-    
    /*#ifndef QT_NO_DRAGANDDROP
    void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst );  // QIconView
    #endif
    void itemRenamed( OVersatileViewItem *item, const QString & );  // QIconView
    void itemRenamed( OVersatileViewItem *item );  // QIconView
    */
@@ -170,17 +173,17 @@ public:
    };
    enum ItemTextPos {  // QIconView
    Bottom = 0,
    Right
    };
    */
-    
    //
    // only in QListView
    //
-    
    int treeStepSize() const;  // QListView
    virtual void setTreeStepSize( int );  // QListView
    QHeader * header() const;  // QListView
    virtual int addColumn( const QString &label, int size = -1);  // QListView
@@ -223,13 +226,13 @@ public:
    virtual void setRootIsDecorated( bool );  // QListView
    bool rootIsDecorated() const;  // QListView
    void setShowSortIndicator( bool show );  // QListView
    bool showSortIndicator() const;  // QListView
-    
    int index( const OVersatileViewItem *item ) const;  // QIconView
  public slots:
    void triggerUpdate();  // QListView
  signals:
@@ -237,15 +240,15 @@ public:
    void collapsed( OVersatileViewItem *item ); // QListView
    //
    // only in QIconView
    //
-  public:    
+  public:
    uint count() const;  // QIconView
-    
    OVersatileViewItem *firstItem() const;  // QIconView
    OVersatileViewItem *lastItem() const;  // QIconView
    OVersatileViewItem *findItem( const QPoint &pos ) const; // QIconView
    OVersatileViewItem *findItem( const QString &text ) const; // QIconView
@@ -284,13 +287,13 @@ public:
    bool wordWrapIconText() const;  // QIconView
  public slots:
    virtual void arrangeItemsInGrid( const QSize &grid, bool update = TRUE );  // QIconView
    virtual void arrangeItemsInGrid( bool update = TRUE );  // QIconView
    virtual void updateContents();  // QIconView
-  
  signals:
    /*#ifndef QT_NO_DRAGANDDROP
    void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst );  // QIconView
    #endif
    */
    void moved();  // QIconView
@@ -319,13 +322,13 @@ public:
    void setSelectionMode( SelectionMode mode );
    SelectionMode selectionMode() const;
    virtual void selectAll( bool select );
    virtual void clearSelection();
    virtual void invertSelection();
-  
    void ensureItemVisible( const OVersatileViewItem * );
    virtual void repaintItem( const OVersatileViewItem * ) const;
    virtual void setCurrentItem( OVersatileViewItem * );
    OVersatileViewItem * currentItem() const;
@@ -341,22 +344,22 @@ public:
    void currentChanged( OVersatileViewItem * );
    void clicked( OVersatileViewItem * );
    void pressed( OVersatileViewItem * );
    void doubleClicked( OVersatileViewItem * );
    void returnPressed( OVersatileViewItem * );
-  
    void onItem( OVersatileViewItem * );
    void onViewport();
-  
  //==============================================================================================//
  // "Derived" API - Case 2: Methods existing in QListView and QIconView with differing signatures
  //==============================================================================================//
-  
  /*
-  
  public:
    virtual void insertItem( OVersatileViewItem * );  // QListView
    virtual void insertItem( OVersatileViewItem *item, OVersatileViewItem *after = 0L );  // QIconView
    virtual void setSelected( OVersatileViewItem *, bool );  // QListView
    virtual void setSelected( OVersatileViewItem *item, bool s, bool cb = FALSE );  // QIconView
@@ -365,30 +368,32 @@ public:
    void setSorting( bool sort, bool ascending = TRUE );  // QIconView
    void sort(); // #### make virtual in next major release  // QListView
    virtual void sort( bool ascending = TRUE );  // QIconView
  */
-  
  signals:
    void clicked( OVersatileViewItem *, const QPoint &, int );  // QListView
    void clicked( OVersatileViewItem *, const QPoint & );  // QIconView
-    
    void pressed( OVersatileViewItem *, const QPoint &, int );  // QListView
    void pressed( OVersatileViewItem *, const QPoint & );  // QIconView
-    
    void rightButtonClicked( OVersatileViewItem* item, const QPoint& pos );  // QIconView
    void rightButtonClicked( OVersatileViewItem *, const QPoint&, int );  // QListView
-    
-    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView   
+    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView
    void rightButtonPressed( OVersatileViewItem *, const QPoint&, int );  // QListView
-    
    void mouseButtonPressed( int, OVersatileViewItem *, const QPoint& , int );  // QListView
    void mouseButtonPressed( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
-    
    void mouseButtonClicked( int, OVersatileViewItem *,  const QPoint&, int );  // QListView
    void mouseButtonClicked( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
 };
+}
+}
 #endif
diff --git a/libopie2/opieui/oversatileviewitem.cpp b/libopie2/opieui/oversatileviewitem.cpp
index 66de8eb..03c6738 100644
--- a/libopie2/opieui/oversatileviewitem.cpp
+++ b/libopie2/opieui/oversatileviewitem.cpp
@@ -28,12 +28,14 @@
 */
 #include <opie2/oversatileviewitem.h>
 #include <opie2/oversatileview.h>
+using namespace Opie::Ui;
 OVersatileViewItem::OVersatileViewItem( OVersatileView * parent )
              :OListViewItem( parent->_listview ), QIconViewItem( parent->_iconview ),
              _versatileview( parent )
 {
    init();
 }
diff --git a/libopie2/opieui/oversatileviewitem.h b/libopie2/opieui/oversatileviewitem.h
index ee8ee20..c4977af 100644
--- a/libopie2/opieui/oversatileviewitem.h
+++ b/libopie2/opieui/oversatileviewitem.h
@@ -37,12 +37,15 @@
 #include <qiconview.h>
 /* OPIE */
 #include <opie2/olistview.h>
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
 class OVersatileViewItem : public OListViewItem, public QIconViewItem
 {
  public:
    OVersatileViewItem( OVersatileView * parent );
@@ -94,7 +97,9 @@ class OVersatileViewItem : public OListViewItem, public QIconViewItem
        
  private:
    void init();
 };
+}
+}
 #endif
diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp
index 8bb4ed6..9519888 100644
--- a/libopie2/opieui/owait.cpp
+++ b/libopie2/opieui/owait.cpp
@@ -35,12 +35,14 @@
 #include <qpe/resource.h>
 /* QT */
 #include <qlayout.h>
 #include <qpainter.h>
+using namespace Opie::Ui;
 static int frame = 0;
 /**
 * This will construct a modal dialog.
 *
 * The default timer length is 10.
diff --git a/libopie2/opieui/owait.h b/libopie2/opieui/owait.h
index 3267064..03c33e4 100644
--- a/libopie2/opieui/owait.h
+++ b/libopie2/opieui/owait.h
@@ -34,12 +34,15 @@
 /* QT */
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qtimer.h>
+namespace Opie {
+namespace Ui   {
 /**
 * This class displays a animated waiting icon in the middle of the screen.
 *
 * @short modal hour glass dialog
 * @see QDialog
 * @author Maximilian Rei�
@@ -79,8 +82,9 @@ class OWait : public QDialog
    QTimer *m_waitTimer;
    int m_timerLength;
    int m_aniSize;
    class Private;
    Private *d;
 };
+}
+}
 #endif
diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp
index 2d8397e..e954cc8 100644
--- a/libqtaux/oticker.cpp
+++ b/libqtaux/oticker.cpp
@@ -30,12 +30,14 @@
 #include "oticker.h"
 /* OPIE */
 #include <qpe/config.h>
+using namespace Opie::Ui;
 OTicker::OTicker( QWidget* parent )
        : QLabel( parent )
 {
    setTextFormat( Qt::RichText );
    Config cfg( "qpe" );
    cfg.setGroup( "Appearance" );
diff --git a/libqtaux/oticker.h b/libqtaux/oticker.h
index 4026eb5..a89d334 100644
--- a/libqtaux/oticker.h
+++ b/libqtaux/oticker.h
@@ -38,12 +38,15 @@
 #include <qstring.h>
 #include <qslider.h>
 #include <qlabel.h>
 #include <qframe.h>
 #include <qcolor.h>
+namespace Opie {
+namespace Ui   {
 /**
 * @class OTicker
 * @brief The OTicker class provides a QLabel widget that scroll its contents
 *
 */
 class OTicker : public QLabel {
@@ -140,7 +143,9 @@ private:
    QColor backgroundcolor, foregroundcolor;
    QString scrollText;
    QPixmap scrollTextPixmap;
    int pos, updateTimerTime, scrollLength;
 };
+}
+}
 #endif