Move XML class to internal PIM

Add namespaces!!!

Opie::Core and Opie::Core::Private
Opie::Net  and Opie::Net::Private
Opie::Ui   and Opie::Ui::Private
Opie::MM   and Opie::MM::Private
Opie::DB   and Opie::DB::Private

PIM classes are not yet converted because we will do other work
on it as well

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
@@ -4,2 +4,4 @@
 
+using namespace Opie::Core;
+
 int main( int argc, char** argv )
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
@@ -19,2 +19,4 @@
 
+using namespace Opie::Core;
+
 class DemoApp : public OApplication
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,3 +1,5 @@
 #include <opie2/oglobalsettings.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace Opie::Core;
 
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,3 +1,5 @@
 #include <opie2/oprocess.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace Opie::Core;
 
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
@@ -3,6 +3,8 @@
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
-#include "../osqlquery.h"
-#include "../osqldriver.h"
-#include "../osqlresult.h"
+#include <opie2/osqlmanager.h>
+#include <opie2/osqlquery.h>
+#include <opie2/osqldriver.h>
+#include <opie2/osqlresult.h>
+
+using namespace Opie::DB;
 
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
@@ -6,3 +6,3 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiesql
+LIBS            += -lqpe -lopiedb2
         TARGET  = spaltenweise
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
@@ -3,6 +3,8 @@
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
-#include "../osqlquery.h"
-#include "../osqldriver.h"
-#include "../osqlresult.h"
+#include <opie2/osqlmanager.h>
+#include <opie2/osqlquery.h>
+#include <opie2/osqldriver.h>
+#include <opie2/osqlresult.h>
+
+using namespace Opie::DB;
 
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
@@ -6,3 +6,3 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiesql
+LIBS            += -lqpe -lopiedb2
         TARGET  = zeilenweise
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
@@ -2,2 +2,4 @@
 
+using namespace Opie::MM;
+
 int main( int argc, char** argv )
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
@@ -11,2 +11,4 @@
 
+
+using namespace Opie::Net;
 //======================== Station help class ===============================
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
@@ -6,2 +6,4 @@
 
+using namespace Opie::Net;
+
 int main( int argc, char** argv )
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
@@ -18,2 +18,5 @@
 
+using namespace Opie::Ui;
+using namespace Opie::Core;
+
 int main( int argc, char **argv )
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
@@ -39,2 +39,4 @@
 
+using namespace Opie::Ui;
+
 OListViewDemo::OListViewDemo( QWidget* parent, const char* name, WFlags f )
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
@@ -46,3 +46,3 @@ class OListViewDemo: public QVBox
   private:
-    ONamedListView* lv;
+    Opie::Ui::ONamedListView* lv;
 
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
@@ -5,2 +5,3 @@
 #include <opie2/osplitter.h>
+#include <opie2/ofileselector.h>
 #include <qpe/qpeapplication.h>
@@ -12,3 +13,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
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
@@ -8,3 +8,2 @@
 #include <qvbox.h>
-#include <opie2/ofileselector.h>
  
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
@@ -11,2 +11,4 @@
 
+using namespace Opie::Ui;
+
 OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
@@ -27,4 +29,4 @@ ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
     lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
-            this, SLOT(slotSizeChange(bool,const QSize&) ) );
+    connect(m_splitter, SIGNAL(sizeChanged(bool,Orientation) ),
+            this, SLOT(slotSizeChange(bool,Orientation) ) );
 
@@ -33,3 +35,3 @@ ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
     m_overview->addColumn( tr("Folder") );
-    m_overview->setMaximumWidth( 200 );
+//    m_overview->setMaximumWidth( 200 );
     m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
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
@@ -18,3 +18,2 @@
 
-using Opie::OSplitter;
 
@@ -23,3 +22,2 @@ class QLabel;
 
-class OSplitter;
 class ListViews : public QWidget {
@@ -41,4 +39,4 @@ private:
     bool m_mode : 1; // bitfield
-    OSplitter *m_splitter;
-    OSplitter *splitti;
+    Opie::Ui::OSplitter *m_splitter;
+    Opie::Ui::OSplitter *splitti;
     QListView *folder1;
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
@@ -19,2 +19,5 @@
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
 int main( int argc, char **argv )
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
@@ -27,6 +27,4 @@
 
-#ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
-#endif
 
@@ -34,6 +32,3 @@
 
-#ifdef QWS
 #include <opie2/odevice.h>
-using namespace Opie;
-#endif
 
@@ -53,2 +48,5 @@ using namespace Opie;
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
 enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector };
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
@@ -20,3 +20,7 @@
 
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
+}
+}
 class QTabWidget;
@@ -49,3 +53,3 @@ private:
     
-    OVersatileView* vv;
+    Opie::Ui::OVersatileView* vv;
 
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
@@ -40,2 +40,4 @@
 
+using namespace Opie::Ui;
+
 OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlags f )
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
@@ -36,4 +36,8 @@
 
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
 class OVersatileViewItem;
+}
+}
 
@@ -49,15 +53,15 @@ class OVersatileViewDemo: public QVBox
     void selectionChanged();
-    void selectionChanged( OVersatileViewItem * );
-    void currentChanged( OVersatileViewItem * );
-    void clicked( OVersatileViewItem * );
-    void pressed( OVersatileViewItem * );
+    void selectionChanged( Opie::Ui::OVersatileViewItem * );
+    void currentChanged( Opie::Ui::OVersatileViewItem * );
+    void clicked( Opie::Ui::OVersatileViewItem * );
+    void pressed( OPie::Ui::OVersatileViewItem * );
 
-    void doubleClicked( OVersatileViewItem *item );
-    void returnPressed( OVersatileViewItem *item );
+    void doubleClicked( Opie::Ui::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 collapsed( OVersatileViewItem *item );
+    void expanded( Opie::Ui::OVersatileViewItem *item );
+    void collapsed( Opie::Ui::OVersatileViewItem *item );
     
@@ -65,6 +69,6 @@ class OVersatileViewDemo: public QVBox
 
-    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;
 
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
@@ -21,3 +21,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
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
@@ -10,3 +10,2 @@
 
-using namespace Opie;
 
@@ -22,3 +21,3 @@ protected:
 private:
-    OWidgetStack* m_stack;
+    Opie::Ui::OWidgetStack* m_stack;
     QWidget* m_main;
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
@@ -62,3 +62,3 @@ const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
 
-using namespace Opie;
+using namespace Opie::Core;
 
@@ -83,7 +83,7 @@ ODevice *ODevice::inst()
                     qDebug( "ODevice() - found '%s'", (const char*) line );
-                    if ( line.contains( "sharp", false ) ) dev = new Zaurus();
-                    else if ( line.contains( "ipaq", false ) ) dev = new iPAQ();
-                    else if ( line.contains( "simpad", false ) ) dev = new SIMpad();
-                    else if ( line.contains( "jornada", false ) ) dev = new Jornada();
-                    else if ( line.contains( "ramses", false ) ) dev = new Ramses();
+                    if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus();
+                    else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ();
+                    else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad();
+                    else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada();
+                    else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses();
                     else qWarning( "ODevice() - unknown hardware - using default." );
@@ -189,3 +189,3 @@ bool ODevice::suspend()
     ODevice::sendSuspendmsg();
-    
+
     struct timeval tvs, tvn;
@@ -626,2 +626,5 @@ 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
@@ -42,4 +42,5 @@ _;:,   .>  :=|.         This program is free software; you can
 
-namespace Opie
-{
+namespace Opie{
+namespace Core{
+
     class ODeviceData;
@@ -252,3 +253,3 @@ public:
      * 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
@@ -316,2 +317,3 @@ class ODeviceData {
 }
+}
 
@@ -330,2 +332,3 @@ static QCString makeChannel ( const char *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
@@ -55,2 +55,6 @@
 
+
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
+
 /* KERNEL */
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
@@ -37,3 +37,5 @@
 
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 
@@ -83,2 +85,6 @@ struct i_button {
 
+}
+}
+}
+
 #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
@@ -79,3 +79,3 @@ typedef struct {
 
-using namespace Opie;
+using namespace Opie::Core::Private;
 
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
@@ -34,4 +34,5 @@
 
-using namespace Opie;
-
+namespace Opie {
+namespace Core {
+namespace Private {
 class Jornada : public ODevice
@@ -47,3 +48,5 @@ class Jornada : public ODevice
 };
-
+}
+}
+}
 #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
@@ -55,2 +55,5 @@
 
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
+
 struct r_button ramses_buttons [] = {
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
@@ -36,3 +36,5 @@
 
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 
@@ -70,2 +72,5 @@ struct r_button {
 };
+}
+}
+}
 
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
@@ -55,3 +55,4 @@ _;:,   .>  :=|.         This program is free software; you can
 
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 
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
@@ -37,3 +37,5 @@
 
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 
@@ -80,2 +82,6 @@ struct s_button {
 
+}
+}
+}
+
 #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
@@ -55,3 +55,4 @@ _;:,     .>    :=|.         This program is free software; you can
 
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 
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
@@ -34,4 +34,5 @@ _;:,     .>    :=|.         This program is free software; you can
 
-using namespace Opie;
-
+namespace Opie {
+namespace Core {
+namespace Private {
 class Yopy : public ODevice
@@ -61,2 +62,6 @@ struct yopy_button
 
+}
+}
+}
+
 #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
@@ -55,3 +55,4 @@ _;:,   .>  :=|.         This program is free software; you can
 
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 
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
@@ -47,4 +47,6 @@
 
-using namespace Opie;
 
+namespace Opie {
+namespace Core {
+namespace Private {
 class Zaurus : public ODevice
@@ -94,3 +96,5 @@ struct z_button {
 };
-
+}
+}
+}
 #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
@@ -35,3 +35,6 @@
 
-using namespace Opie;
+
+namespace Opie {
+namespace Core {
+namespace Private {
 
@@ -44,3 +47,6 @@ class OQCopMessageData
 };
+}
 
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 
@@ -126,4 +132,4 @@ void OQCopMessage::setData ( const QByteArray &data )
 
-/*! \class Opie::ODeviceButton
-    \brief The Opie::ODeviceButton class represents a physical user mappable button on a Qtopia device.
+/*! \class Opie::Core::ODeviceButton
+    \brief The Opie::Core::ODeviceButton class represents a physical user mappable button on a Qtopia device.
  
@@ -246 +252,4 @@ void ODeviceButton::setHeldAction(const OQCopMessage& 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
@@ -25,6 +25,8 @@
 
-class OQCopMessageData;
 
-namespace Opie
-{
+namespace Opie{
+namespace Core{
+namespace Private {
+class OQCopMessageData;
+}
 
@@ -54,3 +56,3 @@ private:
 
-    OQCopMessageData *d;
+    Private::OQCopMessageData *d;
     class Private;
@@ -106,2 +108,3 @@ class ODeviceButton
 }
+}
 
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
@@ -36,2 +36,5 @@
 
+using namespace Opie::Core;
+
+
 OApplication* OApplication::_instance = 0;
@@ -42,2 +45,5 @@ OApplication* OApplication::_instance = 0;
 
+namespace Opie {
+namespace Core {
+namespace Private {
 class OApplicationPrivate
@@ -48,2 +54,3 @@ class OApplicationPrivate
 };
+}
 
@@ -86,3 +93,3 @@ void OApplication::init()
 {
-    d = new OApplicationPrivate();
+    d = new Private::OApplicationPrivate();
     if ( !OApplication::_instance )
@@ -127 +134,3 @@ void OApplication::setTitle( const QString& title ) const
 
+}
+}
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
@@ -32,3 +32,3 @@
 
-#define oApp OApplication::oApplication()
+#define oApp Opie::Core::OApplication::oApplication()
 
@@ -37,4 +37,8 @@
 
-
+namespace Opie {
+namespace Core {
+namespace Private {
 class OApplicationPrivate;
+} // private class
+
 class OConfig;
@@ -100,5 +104,8 @@ class OApplication : public QPEApplication
     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
@@ -40,2 +40,4 @@
 
+using namespace Opie::Core;
+
 OConfig::OConfig( const QString &name, Domain domain )
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
@@ -42,2 +42,5 @@ class QFont;
 
+namespace Opie {
+namespace Core {
+
 /**
@@ -64,2 +67,3 @@ class OConfig : public Config
      * The current group is used for searching keys and accessing entries.
+     * @todo make const
      */
@@ -74,2 +78,6 @@ class OConfig : public Config
     QFont readFontEntry( const QString& key, const QFont* pDefault ) const;
+    
+private:
+    class Private;
+    Private *d;
 };
@@ -138,3 +146,8 @@ class OConfigGroupSaver
     OConfigGroupSaver& operator=( const OConfigGroupSaver& );
+    
+    class Private;
+    Private *d;
 };
+}
+}
 
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
@@ -67,3 +67,4 @@
 
-
+namespace Opie {
+namespace Core {
 /*======================================================================================
@@ -616,2 +617,3 @@ void odClearDebugConfig()
 
+
 #ifdef OPIE_NO_DEBUG
@@ -620 +622,4 @@ void odClearDebugConfig()
 #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
@@ -49,2 +49,5 @@ class QBrush;
 
+namespace Opie {
+namespace Core {
+
 class odbgstream;
@@ -396,2 +399,6 @@ class ondbgstream {
     ondbgstream& operator<<( const QBrush & ) { return *this; }
+    
+private:
+    class Private;
+    Private *d;
 };
@@ -474 +481,3 @@ void odClearDebugConfig();
 
+}
+}
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
@@ -40,2 +40,4 @@
 
+using namespace Opie::Core;
+
 static const char Base64EncMap[64] =
@@ -314,3 +316,3 @@ 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());
@@ -325,3 +327,3 @@ 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;
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
@@ -54,2 +54,7 @@ class QString;
 class DateFormat;
+
+
+
+namespace Opie {
+namespace Core {
 /**
@@ -148,4 +153,7 @@ private:
     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
@@ -46,2 +46,5 @@
 
+
+using namespace Opie::Core;
+
 QString* OGlobalSettings::s_desktopPath = 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
@@ -38,2 +38,5 @@
 
+/**
+ * \todo make real const values
+ */
 #define OPIE_DEFAULT_SINGLECLICK true
@@ -51,2 +54,5 @@
 
+namespace Opie {
+namespace Core {
+
 /**
@@ -370,4 +376,10 @@ private:
     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
@@ -11,4 +11,3 @@ HEADERS     = oapplication.h            \
               osmartpointer.h           \
-              ostorageinfo.h            \
-              xmltree.h
+              ostorageinfo.h            
 
@@ -21,4 +20,3 @@ SOURCES     = oapplication.cpp          \
               oprocctrl.cpp             \
-              ostorageinfo.cpp          \
-              xmltree.cc
+              ostorageinfo.cpp          
 
@@ -28,3 +26,3 @@ INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.8.5
+VERSION     = 1.9.0
 INCLUDEPATH += $(OPIEDIR)/include
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
@@ -43,2 +43,4 @@
 
+using namespace Opie::Core::Private;
+
 OProcessController *OProcessController::theOProcessController = 0;
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
@@ -36,5 +36,10 @@
 
-class OProcessControllerPrivate;
 class QSocketNotifier;
 
+
+namespace Opie {
+namespace Core {
+namespace Private {
+class OProcessControllerPrivate;
+
 /**
@@ -117,2 +122,5 @@ private:
 
+}
+}
+}
 
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
@@ -63,2 +63,7 @@ _;:,     .>    :=|.         This program is free software; you can
 
+using namespace Opie::Core::Private;
+
+namespace Opie {
+namespace Core {
+namespace Private {
 class OProcessPrivate
@@ -74,3 +79,3 @@ public:
 };
-
+}
 
@@ -943 +948,4 @@ int OProcess::processPID( const QString& process )
 }
+
+}
+}
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
@@ -45,3 +45,9 @@ _;:,     .>    :=|.         This program is free software; you can
 class QSocketNotifier;
+
+namespace Opie {
+namespace Core {
+namespace Private {
+class OProcessController;
 class OProcessPrivate;
+}
 
@@ -399,2 +405,3 @@ public:
      * Lets you see what your arguments are for debugging.
+     * \todo make const
      */
@@ -718,3 +725,3 @@ protected:
      */
-    friend class OProcessController;
+    friend class Private::OProcessController;
 
@@ -747,4 +754,6 @@ private:
     void init ( );
-    OProcessPrivate *d;
+    Private::OProcessPrivate *d;
 };
+}
+}
 
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
@@ -42,2 +42,3 @@ _;:,     .>    :=|.         This program is free software; you can
 namespace Opie {
+namespace Core {
 
@@ -142,2 +143,3 @@ public:
 }
+}
 
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
@@ -31,2 +31,4 @@
 
+using namespace Opie::Core;
+
 OStorageInfo::OStorageInfo( QObject *parent )
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
@@ -34,2 +34,5 @@
 
+namespace Opie {
+namespace Core {
+
 class OStorageInfo : public StorageInfo
@@ -58,4 +61,9 @@ class OStorageInfo : public StorageInfo
     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
@@ -5,2 +5,3 @@
   - provides( Type::What )
+  - emit signals directly on arriving of data
   
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
@@ -23,3 +23,3 @@ INTERFACES  =
 TARGET      = opiedb2
-VERSION     = 1.8.2
+VERSION     = 1.9.0
 INCLUDEPATH = $(OPIEDIR)/include
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
@@ -3,2 +3,4 @@
 
+using namespace Opie::DB;
+
 
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
@@ -8,2 +8,5 @@
 
+
+namespace Opie {
+namespace DB {
 /**
@@ -72,4 +75,9 @@ private:
     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
@@ -5,2 +5,6 @@
 
+/**
+ * \todo FIXME CONFIG!!!
+ */
+
 namespace {
@@ -46,2 +50,6 @@ namespace {
 };
+
+
+using namespace Opie::DB;
+
 OSQLBackEndManager::OSQLBackEndManager( const QStringList& path )
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
@@ -7,2 +7,5 @@
 
+namespace Opie {
+namespace DB {
+
 class OSQLBackEndManager {
@@ -19,2 +22,5 @@ private:
 };
+}
+}
+
 #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
@@ -4,2 +4,4 @@
 
+using namespace Opie::DB;
+
 OSQLDriver::OSQLDriver( QLibrary* 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
@@ -9,2 +9,6 @@
 class QLibrary;
+
+namespace Opie {
+namespace DB {
+
 class OSQLResult;
@@ -86,2 +90,5 @@ private:
 
+}
+}
+
 #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
@@ -2,2 +2,4 @@
 
+using namespace Opie::DB;
+
 OSQLError::OSQLError( const QString& driverText,
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
@@ -6,2 +6,5 @@
 
+
+namespace Opie {
+namespace DB {
 /**
@@ -58,2 +61,4 @@ private:
 
+}
+}
 #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
@@ -42,2 +42,5 @@
 
+using namespace Opie::DB;
+using namespace Opie::DB::Private;
+
 namespace {
@@ -88,3 +91,3 @@ 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(),
@@ -96,3 +99,3 @@ bool OSQLiteDriver::open() {
         // FIXME set the last error
-        owarn << "OSQLiteDriver::open: " << error << oendl;
+        qWarning("OSQLiteDriver::open: %s", error );
         free( error );
@@ -128,3 +131,3 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     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 );
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
@@ -9,2 +9,6 @@
 
+namespace Opie {
+namespace DB {
+namespace Private {
+
 class OSQLiteDriver : public OSQLDriver {
@@ -33,2 +37,6 @@ private:
 };
+}
+}
+}
+
 #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
@@ -7,2 +7,4 @@
 
+using namespace Opie::DB;
+
 OSQLManager::OSQLManager() {
@@ -33,3 +35,3 @@ OSQLDriver* OSQLManager::load( const QString& name ) {
     if ( name == "SQLite" ) {
-        driver = new OSQLiteDriver();
+        driver = new Opie::DB::Private::OSQLiteDriver;
     }
@@ -44,3 +46,3 @@ OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) {
          end.name() == "SQLite" )
-        driver = new OSQLiteDriver();
+        driver = new Opie::DB::Private::OSQLiteDriver;
 
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
@@ -10,2 +10,4 @@
 
+namespace Opie {
+namespace DB {
 /**
@@ -61,3 +63,7 @@ private:
     QStringList m_path;
+    class Private;
+    Private *d;
 };
+}
+}
 
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
@@ -3,2 +3,4 @@
 
+using namespace Opie::DB;
+
 OSQLQuery::OSQLQuery() {
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
@@ -9,2 +9,5 @@
 
+namespace Opie {
+namespace DB {
+
 /** I'm not happy with them
@@ -49,2 +52,5 @@ public:
     virtual QString query()const = 0;
+private:
+    class Private;
+    Private *d;    
 };
@@ -121,2 +127,4 @@ public:
 */
+}
+}
 #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
@@ -3,2 +3,4 @@
 
+using namespace Opie::DB;
+
 OSQLResultItem::OSQLResultItem( const TableString& string,
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
@@ -9,2 +9,6 @@
 #include "osqlerror.h"
+
+namespace Opie {
+namespace DB {
+
 /**
@@ -109,4 +113,8 @@ private:
     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
@@ -2,2 +2,4 @@
 
+using namespace Opie::DB;
+
 OSQLTableItem::OSQLTableItem() {}
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
@@ -7,2 +7,4 @@
 
+namespace Opie {
+namespace DB {
 /**
@@ -92,4 +94,9 @@ private:
     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
@@ -7,3 +7,3 @@ INTERFACES  =
 TARGET      = opiemm2
-VERSION     = 1.8.2
+VERSION     = 1.9.0
 INCLUDEPATH += $(OPIEDIR)/include
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
@@ -43,2 +43,4 @@
 
+using namespace Opie::Core;
+using namespace Opie::MM;
 /*======================================================================================
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
@@ -38,2 +38,5 @@
 
+namespace Opie {
+namespace MM {
+
 class OAudioInterface;
@@ -92,2 +95,4 @@ class OSoundSystem : public QObject
     CardMap _interfaces;
+    class Private;
+    Private *d;
 };
@@ -126,2 +131,5 @@ class OSoundCard : public QObject
     void init();
+  private:
+    class Private;
+    Private *d;
 };
@@ -152,2 +160,5 @@ class OAudioInterface : public QObject
     void init();
+  private:
+    class Private;
+    Private *d;
 };
@@ -212,4 +223,10 @@ class OMixerInterface : public QObject
     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
@@ -457,2 +457,3 @@ struct ctrl_end_ack_t {
 
+
 #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
@@ -44,2 +44,3 @@
 
+
         #define DHCP_UDP_OVERHEAD       (14 + /* Ethernet header */     \
@@ -199,2 +200,3 @@ struct dhcp_packet {
 
+
 #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
@@ -9,2 +9,8 @@
 
+using namespace Opie::Core;
+
+namespace Opie {
+namespace Net  {
+namespace Private {
+
 DebugMapper::DebugMapper()
@@ -214,2 +220,4 @@ const QString& DebugMapper::map( int value ) const
 
-
+}
+}
+}
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
@@ -11,2 +11,6 @@
 
+namespace Opie {
+namespace Net  {
+namespace Private {
+
 typedef QIntDict<QString> IntStringMap;
@@ -22,4 +26,10 @@ class DebugMapper
     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
@@ -45,2 +45,6 @@
 
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
+
 OManufacturerDB* OManufacturerDB::_instance = 0;
@@ -135 +139,4 @@ const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const
 
+}
+}
+
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
@@ -35,2 +35,5 @@
 
+namespace Opie {
+namespace Net {
+
 /**
@@ -65,4 +68,9 @@ class OManufacturerDB
     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
@@ -39,2 +39,5 @@
 
+namespace Opie {
+namespace Net  {
+
 /*======================================================================================
@@ -187,2 +190,5 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 
+
+
+namespace Private {
 /*======================================================================================
@@ -232 +238,4 @@ QString modeToString( int mode )
 }
+}
+}
+}
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
@@ -43,2 +43,6 @@
 struct ifreq;
+
+namespace Opie {
+namespace Net  {
+
 class OWirelessNetworkInterface;
@@ -74,2 +78,4 @@ class OMacAddress
   friend bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
+  class Private;
+  Private *d;
 
@@ -90,2 +96,5 @@ class OHostAddress : public QHostAddress
   */
+  private:
+  class Private;
+  Private *d;
 };
@@ -117,2 +126,4 @@ class OPrivateIOCTL : public QObject
 
+    class Private;
+    Private *d;
 };
@@ -123,2 +134,3 @@ class OPrivateIOCTL : public QObject
 
+namespace Private {
 void dumpBytes( const unsigned char* data, int num );
@@ -126,2 +138,5 @@ QString modeToString( int );
 int stringToMode( const QString& );
+}
+}
+}
 
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
@@ -59,2 +59,6 @@
 #include <opie2/odebugmapper.h>

+
+
+using namespace Opie::Core;
+using namespace Opie::Net::Private;
 DebugMapper* debugmapper = new DebugMapper();

@@ -66,2 +70,4 @@ DebugMapper* debugmapper = new DebugMapper();
 

+namespace Opie {
+namespace Net  {
 ONetwork* ONetwork::_instance = 0;

@@ -1239 +1245,4 @@ QString OOrinocoMonitoringInterface::name() const
 }

+
+}
+}
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
@@ -58,2 +58,5 @@
 
+namespace Opie {
+namespace Net  {
+
 class ONetworkInterface;
@@ -125,2 +128,4 @@ class ONetwork : public QObject
     InterfaceMap _interfaces;
+    class Private;
+    Private *d;
 };
@@ -236,2 +241,5 @@ class ONetworkInterface : public QObject
     bool ioctl( int call, struct ifreq& ) const;
+  private:
+    class Private;
+    Private *d;
 };
@@ -298,2 +306,4 @@ class OChannelHopper : public QObject
     QValueList<int>::Iterator _channel;
+    class Private;
+    Private *d;
 };
@@ -457,2 +467,4 @@ class OWirelessNetworkInterface : public ONetworkInterface
     OChannelHopper* _hopper;
+    class Private;
+    Private *d;
 };
@@ -481,2 +493,5 @@ class OMonitoringInterface
     bool _prismHeader;
+  private:
+    class Private;
+    Private *d;
 
@@ -499,2 +514,5 @@ class OCiscoMonitoringInterface : public OMonitoringInterface
     virtual void setChannel( int );
+  private:
+    class Private;
+    Private *d;
 
@@ -518,2 +536,5 @@ class OWlanNGMonitoringInterface : public OMonitoringInterface
     virtual void setChannel( int );
+  private:
+    class Private;
+    Private *d;
 
@@ -536,2 +557,6 @@ class OHostAPMonitoringInterface : public OMonitoringInterface
     virtual QString name() const;
+    
+  private:
+    class Private;
+    Private *d;
  };
@@ -555,4 +580,10 @@ class OOrinocoMonitoringInterface : public OMonitoringInterface
 
+   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
@@ -47,2 +47,7 @@
 
+using namespace Opie::Core;
+
+namespace Opie {
+namespace Net  {
+
 /*======================================================================================
@@ -1346,2 +1351,3 @@ QString OPacketCapturer::version() const
 
-
+}
+}
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
@@ -66,4 +66,6 @@ typedef struct pcap_pkthdr packetheaderstruct;
 /* FORWARDS */
-class OPacketCapturer;
 class QSocketNotifier;
+namespace Opie {
+namespace Net  {
+class OPacketCapturer;
 
@@ -143,2 +145,5 @@ class OPacket : public QObject
     const unsigned char* _end;      // end of pcap packet data
+  private:
+    class Private;
+    Private *d;
 };
@@ -165,2 +170,5 @@ class OEthernetPacket : public QObject
     const struct ether_header* _ether;
+  private:
+    class Private;
+    Private *d;
 };
@@ -183,2 +191,4 @@ class OPrismHeaderPacket : public QObject
     const struct prism_hdr* _header;
+    class Private;
+    Private *d;
 };
@@ -212,2 +222,4 @@ class OWaveLanPacket : public QObject
     const struct ieee_802_11_header* _wlanhdr;
+    class Private;
+    Private *d;
 };
@@ -241,2 +253,4 @@ class OWaveLanManagementPacket : public QObject
     const struct ieee_802_11_mgmt_body* _body;
+    class Private;
+    Private *d;
 };
@@ -260,2 +274,4 @@ class OWaveLanManagementSSID : public QObject
     const struct ssid_t* _data;
+    class Private;
+    Private *d;
 };
@@ -276,2 +292,4 @@ class OWaveLanManagementRates : public QObject
     const struct rates_t* _data;
+    class Private;
+    Private *d;
 };
@@ -292,2 +310,4 @@ class OWaveLanManagementCF : public QObject
     const struct cf_t* _data;
+    class Private;
+    Private *d;
 };
@@ -308,2 +328,4 @@ class OWaveLanManagementFH : public QObject
     const struct fh_t* _data;
+    class Private;
+    Private *d;
 };
@@ -326,2 +348,4 @@ class OWaveLanManagementDS : public QObject
     const struct ds_t* _data;
+    class Private;
+    Private *d;
 };
@@ -342,2 +366,4 @@ class OWaveLanManagementTim : public QObject
     const struct tim_t* _data;
+    class Private;
+    Private *d;
 };
@@ -358,2 +384,4 @@ class OWaveLanManagementIBSS : public QObject
     const struct ibss_t* _data;
+    class Private;
+    Private *d;
 };
@@ -374,2 +402,4 @@ class OWaveLanManagementChallenge : public QObject
     const struct challenge_t* _data;
+    class Private;
+    Private *d;
 };
@@ -390,2 +420,4 @@ class OWaveLanDataPacket : public QObject
     const struct ieee_802_11_data_header* _header;
+    class Private;
+    Private *d;
 };
@@ -408,2 +440,4 @@ class OWaveLanControlPacket : public QObject
     const struct ieee_802_11_control_header* _header;
+    class Private;
+    Private *d;
 };
@@ -424,2 +458,4 @@ class OLLCPacket : public QObject
     const struct ieee_802_11_802_2_header* _header;
+    class Private;
+    Private *d;
 };
@@ -451,2 +487,4 @@ class OIPPacket : public QObject
     const struct iphdr* _iphdr;
+    class Private;
+    Private *d;
 };
@@ -475,2 +513,4 @@ class OARPPacket : public QObject
     const struct myarphdr* _arphdr;
+    class Private;
+    Private *d;
 };
@@ -496,2 +536,4 @@ class OUDPPacket : public QObject
     const struct udphdr* _udphdr;
+    class Private;
+    Private *d;
 };
@@ -524,2 +566,4 @@ class ODHCPPacket : public QObject
     unsigned char _type;
+    class Private;
+    Private *d;
 };
@@ -547,2 +591,4 @@ class OTCPPacket : public QObject
     const struct tcphdr* _tcphdr;
+    class Private;
+    Private *d;
 };
@@ -667,3 +713,7 @@ class OPacketCapturer : public QObject
     QMap<QString, int> _stats;                      // statistics;
+            class Private;                             // Private Forward declaration
+            Private *d;                                     // if we need to add data
 };
+}
+}
 
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
@@ -33,2 +33,7 @@
 
+
+using namespace Opie::Core;
+
+namespace Opie {
+namespace Net {
 /*======================================================================================
@@ -64 +69,4 @@ void OStation::dump()
 }
+
+}
+}
\ 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
@@ -42,4 +42,8 @@
 
+namespace Opie {
+namespace Net  {
+
 class OStation;
 
+
 typedef QList<OStation> OStationList;
@@ -68,4 +72,9 @@ class OStation
     bool encrypted;
+  private:
+    class Private;
+    Private *d;
 };
 
+}
+}
 
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
@@ -12,3 +12,4 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
         core/backends/odatebookaccess.cpp \
-        core/backends/odatebookaccessbackend_sql.cpp
+        core/backends/odatebookaccessbackend_sql.cpp \
+        core/backends/private/xmltree.cc
         
@@ -30,2 +31,3 @@ HEADERS += core/backends/obackendfactory.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
@@ -48,3 +48,3 @@
 
-
+using namespace Opie::DB;
 
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
@@ -42,2 +42,4 @@
 /* aren't in namespace Opie yet - alwin */
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
@@ -45,2 +47,4 @@ class OSQLResult;
 class OSQLResultItem;
+}
+}
 
@@ -93,3 +97,3 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
  private:
-        QArray<int> extractUids( OSQLResult& res ) const;
+        QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
         QMap<int, QString>  requestNonCustom( int uid ) const;
@@ -103,3 +107,3 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
 
-        OSQLDriver* m_driver;
+        Opie::DB::OSQLDriver* m_driver;
 };
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
@@ -43,3 +43,3 @@
 
-#include <opie2/xmltree.h>
+#include "private/xmltree.h"
 #include <opie2/ocontactaccessbackend.h>
@@ -51,2 +51,3 @@
 using namespace Opie;
+using namespace Opie::Pim::Private;
 
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
@@ -48,2 +48,4 @@
 
+using namespace Opie::DB;
+
 namespace Opie {
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
@@ -36,3 +36,7 @@
 
+namespace Opie {
+namespace DB {
 class OSQLDriver;
+}
+}
 
@@ -79,3 +83,3 @@ private:
 
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
 
@@ -86,3 +90,3 @@ private:
     void update();
-    QArray<int> extractUids( OSQLResult& res ) const;
+    QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
 
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
@@ -43,2 +43,4 @@
 
+using namespace Opie::DB;
+
 using namespace Opie;
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
@@ -35,2 +35,4 @@
 
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
@@ -38,2 +40,4 @@ class OSQLResult;
 class OSQLResultItem;
+}
+}
 
@@ -73,5 +77,5 @@ private:
     inline bool date( QDate& date, const QString& )const;
-    inline OPimTodo todo( const OSQLResult& )const;
-    inline OPimTodo todo( OSQLResultItem& )const;
-    inline QArray<int> uids( const OSQLResult& )const;
+    inline OPimTodo todo( const Opie::DB::OSQLResult& )const;
+    inline OPimTodo todo( Opie::DB::OSQLResultItem& )const;
+    inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
     OPimTodo todo( int uid )const;
@@ -80,3 +84,3 @@ private:
     QAsciiDict<int> m_dict;
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
     QArray<int> m_uids;
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
@@ -19,3 +19,3 @@
 
-#include <opie2/xmltree.h>
+#include "xmltree.h"
 
@@ -27,3 +27,3 @@
 
-using namespace Opie;
+using namespace Opie::Pim::Private;
 
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
@@ -27,4 +27,5 @@
 
-namespace Opie
-{
+namespace Opie {
+namespace Pim  {
+namespace Private{
 
@@ -116,2 +117,4 @@ private:
 
+}
+}
 } // namespace Opie
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
@@ -8,4 +8,5 @@ class QWidget;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui  {
+namespace Private{
 
@@ -25,3 +26,5 @@ struct OSplitterContainer
 
-};
+}
+}
+}
 
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
@@ -37,3 +37,4 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
+using namespace Opie::Ui::Private;
 
@@ -170,3 +171,3 @@ void OSplitter::addWidget( OSplitter* split )
     {
-        Opie::OSplitterContainer con;
+        OSplitterContainer con;
         con.widget =split;
@@ -215,3 +216,3 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
 #endif
-    Opie::OSplitterContainer cont;
+    OSplitterContainer cont;
     cont.widget = wid;
@@ -398,3 +399,3 @@ void OSplitter::resizeEvent( QResizeEvent* res )
  */
-void OSplitter::addToTab( const Opie::OSplitterContainer& con )
+void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
 {
@@ -412,3 +413,3 @@ void OSplitter::addToTab( const Opie::OSplitterContainer& con )
  */
-void OSplitter::addToBox( const Opie::OSplitterContainer& con )
+void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con )
 {
@@ -547,3 +548,3 @@ void OSplitter::commonChangeBox()
         split->setTabWidget( 0 );
-        Opie::OSplitterContainer con;
+        OSplitterContainer con;
         con.widget = split;
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
@@ -25,3 +25,3 @@
                              Boston, MA 02111-1307, USA.
- 
+
 */
@@ -50,4 +50,4 @@ class QHBox;
 
-namespace Opie
-{
+namespace Opie{
+namespace Ui  {
 class OTabWidget;
@@ -75,3 +75,3 @@ class OSplitter : public QFrame
 public:
-    typedef QValueList<Opie::OSplitterContainer> ContainerList;
+    typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList;
     OSplitter( Qt::Orientation = Horizontal,  QWidget *parent = 0,
@@ -126,4 +126,4 @@ private:
     void setTabWidget( OTabWidget*);
-    void addToTab( const Opie::OSplitterContainer& );
-    void addToBox( const Opie::OSplitterContainer& );
+    void addToTab( const Opie::Ui::Private::OSplitterContainer& );
+    void addToBox( const Opie::Ui::Private::OSplitterContainer& );
     void removeFromTab( QWidget* );
@@ -147,3 +147,4 @@ private:
 };
-};
+}
+}
 
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
@@ -34,7 +34,7 @@
 
-namespace {
+namespace Opie {
+namespace Ui   {
     const int mode_size = 330;
-}
 
-using namespace Opie;
+
 
@@ -435 +435,4 @@ void OWidgetStack::switchTop() {
 }
+
+}
+}
\ 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
@@ -37,4 +37,4 @@ class QWidgetStack;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui {
 /**
@@ -129,3 +129,4 @@ private:
 
-};
+}
+}
 
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
@@ -41,3 +41,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
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
@@ -37,4 +37,4 @@
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
 
@@ -106,3 +106,4 @@ private slots:
 
-};
+}
+}
 
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
@@ -57,4 +57,7 @@
 
-using namespace Opie;
+using namespace Opie::Ui::Private;
 
+namespace Opie {
+namespace Ui   {
+namespace Private {
 OFileViewInterface::OFileViewInterface( OFileSelector* selector )
@@ -812,2 +815,4 @@ void OFileViewFileSystem::activate( const QString& str)
 
+
+}
 /* Selector */
@@ -1166 +1171,3 @@ void OFileSelector::setNameVisible( bool b )
 
+}
+}
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
@@ -54,7 +54,9 @@ typedef QMap<QString, QStringList> MimeTypes;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
 
+namespace Private {
 class OFileViewInterface;
 class OFileViewFileListView;
+}
 
@@ -75,4 +77,4 @@ class OFileSelector : public QWidget
     Q_OBJECT
-    friend class Opie::OFileViewInterface;
-    friend class Opie::OFileViewFileListView;
+    friend class Private::OFileViewInterface;
+    friend class Private::OFileViewFileListView;
 
@@ -187,4 +189,4 @@ private:
     QWidgetStack* m_stack;  // our widget stack which will contain the views
-    OFileViewInterface* currentView() const; // returns the currentView
-    OFileViewInterface* m_current; // here is the view saved
+    Private::OFileViewInterface* currentView() const; // returns the currentView
+    Private::OFileViewInterface* m_current; // here is the view saved
     bool m_shNew   : 1; // should we show New?
@@ -193,3 +195,3 @@ private:
 
-    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
@@ -216,3 +218,4 @@ private slots:
 
-};
+}
+}
 
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
@@ -58,6 +58,6 @@ class QToolButton;
 
-namespace Opie
-{
-
+namespace Opie{
+namespace Ui{
 class OFileSelector;
+namespace Private {
 
@@ -188,3 +188,5 @@ private:
 
-};
+}
+}
+}
 
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
@@ -39,4 +39,5 @@ class DocLnk;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
+namespace Private {
 
@@ -92,3 +93,5 @@ public:
 
-};
+}
+}
+}
 
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
@@ -31,3 +31,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
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
@@ -35,4 +35,4 @@
 
-namespace Opie
-{
+namespace Opie{
+namespace Ui  {
 
@@ -100,3 +100,4 @@ private:
 
-};
+}
+}
 
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
@@ -34,2 +34,4 @@
 
+using namespace Opie::Ui;
+
 int ODialog::mMarginSize = 5;
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
@@ -57,2 +57,5 @@ class QLayoutItem;
 
+namespace Opie {
+namespace Ui   {
+
 class ODialog : public QDialog
@@ -90,2 +93,4 @@ class ODialog : public QDialog
 };
+}
+}
 #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
@@ -40,6 +40,6 @@
 
-using namespace Opie;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
+namespace Private {
 
@@ -58,7 +58,2 @@ public:
 
-};
-
-namespace
-{
-
 class FontListItem : public QListBoxText
@@ -97,3 +92,9 @@ private:
 };
+}
+}
+}
+
 
+using namespace Opie::Ui;
+using namespace Opie::Ui::Private;
 
@@ -109,3 +110,2 @@ static int findItemCB( QComboBox *box, const QString &str )
 
-}
 /* static same as anon. namespace */
@@ -428 +428,2 @@ void OFontSelector::resizeEvent ( QResizeEvent *re )
 }
+
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
@@ -37,6 +37,7 @@ class QListBox;
 
-namespace Opie
-{
-
+namespace Opie {
+namespace Ui   {
+namespace Private {
 class OFontSelectorPrivate;
+}
 
@@ -97,6 +98,7 @@ private:
 private:
-    OFontSelectorPrivate *d;
+    Private::OFontSelectorPrivate *d;
 };
 
-};
+}
+}
 
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
@@ -43,2 +43,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace std;
+using namespace Opie::Core;
+
+namespace Opie {
+namespace Ui   {
 
@@ -3767,2 +3771,3 @@ void OImageEffect::contrastHSV(QImage &img, bool sharpen)
 
-
+}
+}
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
@@ -41,2 +41,4 @@ class QColor;
 
+namespace Opie {
+namespace Ui   {
 /**
@@ -558,2 +560,5 @@ private:
 
+}
+}
+
 #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
@@ -38,2 +38,7 @@
 
+using namespace Opie::Core;
+
+
+namespace Opie {
+namespace Ui   {
 /*======================================================================================
@@ -757 +762,3 @@ ONamedListViewItem* ONamedListViewItem::find( const QString& column, const QStri
 
+}
+}
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
@@ -38,2 +38,5 @@
 
+
+namespace Opie {
+namespace Ui   {
 class OListViewItem;
@@ -56,2 +59,3 @@ class OListView: public QListView
 {
+    Q_OBJECT
   public:
@@ -141,4 +145,6 @@ class OListView: public QListView
     QColor m_alternateBackground;
-    bool m_fullWidth;
+    bool m_fullWidth : 1;
     QPen m_columnSeparator;
+    class Private;
+    Private *d;
 };
@@ -244,4 +250,6 @@ class OListViewItem: public QListViewItem
   private:
-    bool m_known;
-    bool m_odd;
+    bool m_known : 1;
+    bool m_odd   : 1;
+    class Private;
+    Private *d;
 };
@@ -356,2 +364,5 @@ class ONamedListView: public OListView
     virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
+  private:
+    class Private;
+    Private *d;
 };
@@ -405,4 +416,10 @@ class ONamedListViewItem: public OListViewItem
     virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
-};
 
+  private:
+    class Private;
+    Private *d;
+
+};
+}
+}
 
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
@@ -8,3 +8,2 @@ HEADERS     = oclickablelabel.h      \
               olistview.h            \
-              omessagebox.h          \
               opixmapeffect.h        \
@@ -12,3 +11,2 @@ HEADERS     = oclickablelabel.h      \
               opixmapprovider.h      \
-              oresource.h            \
               oselector.h            \
@@ -33,3 +31,2 @@ SOURCES     = oclickablelabel.cpp    \
               opixmapprovider.cpp    \
-              oresource.cpp          \
               oselector.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
@@ -19,2 +19,4 @@
 
+
+using namespace Opie::Ui;
 //======================================================================
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
@@ -17,2 +17,5 @@ class QColor;
 
+
+namespace Opie {
+namespace Ui   {
 /**
@@ -212,3 +215,4 @@ public:
 };
-
+}
+}
 
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
@@ -22,2 +22,4 @@
 
+using namespace Opie::Ui;
+
 OPixmapProvider::~OPixmapProvider() {}
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
@@ -25,3 +25,6 @@
 
+namespace Opie {
+namespace Ui   {
 /**
+ * \todo make usefull
  * A tiny abstract class with just one method:
@@ -50,4 +53,9 @@ protected:
     virtual void virtual_hook( int id, void* data );
+private:
+    class Private;
+    Private *d;    
 };
 
+}
+}
 
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
@@ -29,2 +29,5 @@
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
 OPopupTitle::OPopupTitle(QWidget *parent, const char *name)
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
@@ -33,2 +33,4 @@
 
+namespace Opie {
+namespace Ui   {
 /**
@@ -258,2 +260,5 @@ private:
 
+}
+}
+
 #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
@@ -38,2 +38,4 @@
 
+using namespace Opie::Ui;
+
 OXYSelector::OXYSelector( QWidget *parent, const char *name )
@@ -75,3 +77,3 @@ void OXYSelector::setValues( int _xPos, int _yPos )
                 xPos = minX;
-        
+
         if ( yPos > maxY )
@@ -260,3 +262,3 @@ void OSelector::paintEvent( QPaintEvent * )
         QPoint pos = calcArrowPos( value() );
-        drawArrow( &painter, TRUE, pos );   
+        drawArrow( &painter, TRUE, pos );
 
@@ -290,6 +292,6 @@ void OSelector::valueChange()
         pos = calcArrowPos( prevValue() );
-        drawArrow( &painter, FALSE, pos );   
+        drawArrow( &painter, FALSE, pos );
 
         pos = calcArrowPos( value() );
-        drawArrow( &painter, TRUE, pos );   
+        drawArrow( &painter, TRUE, pos );
 
@@ -363,4 +365,4 @@ void OSelector::drawArrow( QPainter *painter, bool show, const QPoint &pos )
     painter->drawPolygon( array );
-  } 
-  else 
+  }
+  else
   {
@@ -402,3 +404,3 @@ void OGradientSelector::init()
     color2.setRgb( 255, 255, 255 );
-    
+
     text1 = text2 = "";
@@ -474,3 +476,3 @@ void OGradientSelector::drawContents( QPainter *painter )
                 yPos = contentsRect().bottom() - painter->fontMetrics().descent() - 2;
-                xPos = contentsRect().left() + (contentsRect().width() - 
+                xPos = contentsRect().left() + (contentsRect().width() -
                         painter->fontMetrics().width( text1 )) / 2;
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
@@ -29,2 +29,5 @@
 
+
+namespace Opie {
+namespace Ui   {
 /**
@@ -514,2 +517,4 @@ private:
 
+}
+}
 
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
@@ -38,2 +38,4 @@
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
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
@@ -37,2 +37,5 @@
 
+namespace Opie {
+namespace Ui   {
+
 /**
@@ -88,2 +91,4 @@ private:
 
+}
+}
 
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
@@ -33,3 +33,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
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
@@ -37,4 +37,4 @@
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
 
@@ -82,3 +82,4 @@ private:
 
-};
+}
+}
 
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
@@ -40,4 +40,4 @@ class QWidget;
 
-namespace Opie
-{
+namespace Opie{
+namespace Ui  {
 
@@ -137,3 +137,4 @@ typedef QList<OTabInfo> OTabInfoList;
 
-};
+}
+}
 
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
@@ -43,3 +43,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
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
@@ -40,3 +40,2 @@
 
-using namespace Opie;
 
@@ -47,4 +46,4 @@ class QWidgetStack;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
 
@@ -289,3 +288,4 @@ private:
 
-};
+}
+}
 
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
@@ -30,3 +30,53 @@
 */
+#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
@@ -35,3 +35,11 @@
 #include <qpe/taskbarappletinterface.h>
+#include <qpe/qcom.h>
 
+#include <qwidget.h>
+
+class QMouseEvent;
+
+namespace Opie {
+namespace Ui   {
+namespace Private {
 /*======================================================================================
@@ -40,2 +48,3 @@
 
+class OTaskbarAppletWrapperPrivate;
 template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
@@ -82,10 +91,6 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
     T* _applet;
+    OTaskbarAppletWrapperPrivate *d;
 };
 
-#include <qframe.h>
-#include <qwidget.h>
-#include <qpe/qpeapplication.h>
-
-class QMouseEvent;
-
+}
 /*======================================================================================
@@ -105,24 +110,18 @@ class OTaskbarApplet : public QWidget
   public:
-    OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name )
-    {
-        setFixedHeight( 18 );
-        setFixedWidth( 14 );
-    }
-
-    virtual ~OTaskbarApplet()
-    {
-    }
+    OTaskbarApplet( QWidget* parent, const char* name = 0 );
+    virtual ~OTaskbarApplet();
 
   protected:
-    virtual void 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();
-    }
+    virtual void popup( QWidget* widget );
+private:
+    class Private;
+    Private *d;
 };
+}
+}
+
+#define EXPORT_OPIE_APPLET_v1(  AppLet ) \
+    Q_EXPORT_INTERFACE() { \
+    Q_CREATE_INSTANCE(  Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \
+    }
 
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
@@ -29,3 +29,7 @@
 
+/* OPIE */
+#include <opie2/otimepicker.h>
+
 /* QT */
+#include <qgroupbox.h>
 #include <qlayout.h>
@@ -33,6 +37,6 @@
 
-/* OPIE */
-#include <opie2/otimepicker.h>
 
-using namespace Opie;
+
+namespace Opie {
+namespace Ui {
 
@@ -222,2 +226,4 @@ OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags
 {
+    m_timePicker = new OTimePicker(  GroupBox1, "m_timePicker" );
+    GroupBox1Layout->addWidget( m_timePicker, 0, 0 );
 
@@ -292 +298,4 @@ void OTimePickerDialog::setMinute ( const QString& minute )
 }
+
+}
+}
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
@@ -34,3 +34,3 @@
 #include <opie2/oclickablelabel.h>
-#include "otimepickerbase.h"
+#include <opie2/otimepickerbase.h>
 
@@ -42,6 +42,5 @@
 
-using namespace Opie;
 
-// namespace Opie
-// {
+namespace Opie {
+namespace Ui   {
 
@@ -58,3 +57,3 @@ using namespace Opie;
  */
-class OTimePicker: public QWidget
+class OTimePicker : public QWidget
 {
@@ -116,2 +115,3 @@ public slots:
 private:
+    OTimePicker *m_timePicker;
     QTime m_time;
@@ -121,4 +121,11 @@ private:
 
-// };
+}
+}
 
+/* 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
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>210</width>
+            <width>182</width>
             <height>137</height>
@@ -251,16 +251,2 @@
                 </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>
@@ -269,24 +255,2 @@
 </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
@@ -42,2 +42,5 @@
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
 /* XPM */
@@ -134,3 +137,3 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     _iconview->setAutoArrange( true );
-    
+
     #ifdef QWS  // TODO: Let this depend on current geometry (rotation)
@@ -140,5 +143,5 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     #endif
-    
+
     _iconview->setResizeMode( QIconView::Adjust );
-    
+
     // qt-embedded: map stylus right on hold to right button press
@@ -170,3 +173,3 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     connect( a2, SIGNAL( activated() ), this, SLOT( setTreeViewMode() ) );
-    
+
     #if (QT_VERSION >= 0x030000)
@@ -178,3 +181,3 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     #endif
-        
+
     //
@@ -187,12 +190,12 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     // 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*) ) );
@@ -201,22 +204,22 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     // 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() ) );
@@ -422,3 +425,3 @@ void OVersatileView::returnPressed( QListViewItem * item )
 }
-  
+
 void OVersatileView::returnPressed( QIconViewItem * item )
@@ -455,3 +458,3 @@ void OVersatileView::collapsed( QListViewItem *item ) // QListView
 //==============================================================================================//
-    
+
 int OVersatileView::treeStepSize() const  // QListView
@@ -747,3 +750,3 @@ void OVersatileView::triggerUpdate()  // QListView
 //
-    
+
 uint OVersatileView::count() const  // QIconView
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
@@ -47,3 +47,2 @@ class QIconSet;
 class QIconViewItem;
-class OListView;
 class QListViewItem;
@@ -56,2 +55,6 @@ class QIconDragItem;
 
+namespace Opie {
+namespace Ui   {
+class OListView;
+
 class OVersatileView : public QWidgetStack
@@ -59,3 +62,3 @@ class OVersatileView : public QWidgetStack
   Q_OBJECT
-  
+
   friend class OVersatileViewItem;
@@ -71,19 +74,19 @@ class OVersatileView : public QWidgetStack
     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:
@@ -96,3 +99,3 @@ class OVersatileView : public QWidgetStack
     virtual void popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col = 0 );
-  
+
   private:
@@ -101,6 +104,6 @@ class OVersatileView : public QWidgetStack
     mutable int _warningpolicy;
-    
+
     OListView* _listview;
     QIconView* _iconview;
-    
+
     QPixmap _treeleaf;
@@ -112,10 +115,10 @@ class OVersatileView : public QWidgetStack
     QPixmap _iconclosed;
-    
+
     QPopupMenu* _contextmenu;
-    
+
     int _iconstyle;
     int _treestyle;
-  
+
   private slots:
-      
+
     void contextMenuRequested( QListViewItem*, const QPoint&, int );
@@ -124,3 +127,3 @@ class OVersatileView : public QWidgetStack
     // type converting signal forwarders
-    
+
     void selectionChanged( QListViewItem * );
@@ -132,3 +135,3 @@ class OVersatileView : public QWidgetStack
     void onItem( QListViewItem * );
-    
+
     void selectionChanged( QIconViewItem * );
@@ -140,3 +143,3 @@ class OVersatileView : public QWidgetStack
     void onItem( QIconViewItem * );
-    
+
     void expanded( QListViewItem * item ); // QListView
@@ -145,5 +148,5 @@ class OVersatileView : public QWidgetStack
   signals:
-    
+
     void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col );
-    
+
     /*#ifndef QT_NO_DRAGANDDROP
@@ -175,3 +178,3 @@ public:
     */
-    
+
     //
@@ -179,3 +182,3 @@ public:
     //
-    
+
     int treeStepSize() const;  // QListView
@@ -228,3 +231,3 @@ public:
     bool showSortIndicator() const;  // QListView
-    
+
     int index( const OVersatileViewItem *item ) const;  // QIconView
@@ -242,5 +245,5 @@ public:
 
-  public:    
+  public:
     uint count() const;  // QIconView
-    
+
     OVersatileViewItem *firstItem() const;  // QIconView
@@ -289,3 +292,3 @@ public:
     virtual void updateContents();  // QIconView
-  
+
   signals:
@@ -324,3 +327,3 @@ public:
     virtual void invertSelection();
-  
+
     void ensureItemVisible( const OVersatileViewItem * );
@@ -346,6 +349,6 @@ public:
     void returnPressed( OVersatileViewItem * );
-  
+
     void onItem( OVersatileViewItem * );
     void onViewport();
-  
+
   //==============================================================================================//
@@ -353,5 +356,5 @@ public:
   //==============================================================================================//
-  
+
   /*
-  
+
   public:
@@ -370,3 +373,3 @@ public:
   */
-  
+
   signals:
@@ -374,15 +377,15 @@ public:
     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
@@ -392,2 +395,4 @@ public:
 
+}
+}
 #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
@@ -33,2 +33,4 @@
 
+using namespace Opie::Ui;
+
 OVersatileViewItem::OVersatileViewItem( OVersatileView * parent )
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
@@ -42,2 +42,5 @@
 
+namespace Opie {
+namespace Ui   {
+
 class OVersatileView;
@@ -99,2 +102,4 @@ class OVersatileViewItem : public OListViewItem, public QIconViewItem
 
+}
+}
 #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
@@ -40,2 +40,4 @@
 
+using namespace Opie::Ui;
+
 static int frame = 0;
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
@@ -39,2 +39,5 @@
 
+
+namespace Opie {
+namespace Ui   {
 /**
@@ -84,3 +87,4 @@ class OWait : public QDialog
 };
-
+}
+}
 #endif
diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp
index 2d8397e..e954cc8 100644
--- a/libqtaux/oticker.cpp
+++ b/libqtaux/oticker.cpp
@@ -35,2 +35,4 @@
 
+using namespace Opie::Ui;
+
 OTicker::OTicker( QWidget* parent )
diff --git a/libqtaux/oticker.h b/libqtaux/oticker.h
index 4026eb5..a89d334 100644
--- a/libqtaux/oticker.h
+++ b/libqtaux/oticker.h
@@ -43,2 +43,5 @@
 
+
+namespace Opie {
+namespace Ui   {
 /**
@@ -145,2 +148,4 @@ private:
 
+}
+}
 #endif