154 files changed, 994 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
@@ -3,4 +3,6 @@
 #include <qpe/config.h>
+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
@@ -18,4 +18,6 @@
 #include <opie2/oglobalsettings.h>
+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,4 +1,6 @@
 #include <opie2/oglobalsettings.h>
-#include <iostream.h>
+#include <iostream>
+using namespace Opie::Core;
 int main( int argc, char** argv )
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,4 +1,6 @@
 #include <opie2/oprocess.h>
-#include <iostream.h>
+#include <iostream>
+using namespace Opie::Core;
 int main( int argc, char** argv )
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
@@ -2,8 +2,10 @@
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
+#include <opie2/osqlmanager.h>
-#include "../osqlquery.h"
+#include <opie2/osqlquery.h>
-#include "../osqldriver.h"
+#include <opie2/osqldriver.h>
-#include "../osqlresult.h"
+#include <opie2/osqlresult.h>
+using namespace Opie::DB;
 int main( int argc,  char* argv[] ) {
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
@@ -5,5 +5,5 @@ SOURCES		= spaltenweise.cpp
 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
@@ -2,8 +2,10 @@
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
+#include <opie2/osqlmanager.h>
-#include "../osqlquery.h"
+#include <opie2/osqlquery.h>
-#include "../osqldriver.h"
+#include <opie2/osqldriver.h>
-#include "../osqlresult.h"
+#include <opie2/osqlresult.h>
+using namespace Opie::DB;
 int main( int argc,  char* argv[] ) {
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
@@ -5,5 +5,5 @@ SOURCES		= zeilenweise.cpp
 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
@@ -1,4 +1,6 @@
 #include <opie2/osoundsystem.h>
+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
@@ -10,4 +10,6 @@
 #include <cstring>
+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
@@ -5,4 +5,6 @@
 #include <unistd.h>
+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
@@ -17,4 +17,7 @@
 #include <opie2/oapplication.h>
+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
@@ -38,4 +38,6 @@
 #include <qlistview.h>
+using namespace Opie::Ui;
 OListViewDemo::OListViewDemo( QWidget* parent, const char* name, WFlags f )
                   :QVBox( parent, name, 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
@@ -45,5 +45,5 @@ 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
@@ -4,4 +4,5 @@
 #include <opie2/osplitter.h>
+#include <opie2/ofileselector.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
@@ -11,5 +12,5 @@
 #include <qlayout.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
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
@@ -7,5 +7,4 @@
 #include <qvbox.h>
-#include <opie2/ofileselector.h>
 
 class OSplitterExample : public QWidget {
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
@@ -10,4 +10,6 @@
 #include "osplitter_mail.h"
+using namespace Opie::Ui;
 OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
@@ -26,11 +28,11 @@ ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
    m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
    lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
+    connect(m_splitter, SIGNAL(sizeChanged(bool,Orientation) ),
-            this, SLOT(slotSizeChange(bool,const QSize&) ) );
+            this, SLOT(slotSizeChange(bool,Orientation) ) );
    m_overview = new QListView( m_splitter );
    m_overview->header()->setClickEnabled( FALSE );
    m_overview->addColumn( tr("Folder") );
-    m_overview->setMaximumWidth( 200 );
+//    m_overview->setMaximumWidth( 200 );
    m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
    m_splitter->setSizeChange( 300 );
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
@@ -17,10 +17,8 @@
 #include <opie2/osplitter.h>
-using Opie::OSplitter;
 class Folder;
 class QLabel;
-class OSplitter;
 class ListViews : public QWidget {
    Q_OBJECT
@@ -40,6 +38,6 @@ private:
    QList<Folder> m_lstFolders;
    bool m_mode : 1; // bitfield
-    OSplitter *m_splitter;
+    Opie::Ui::OSplitter *m_splitter;
-    OSplitter *splitti;
+    Opie::Ui::OSplitter *splitti;
    QListView *folder1;
 #if 0
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
@@ -18,4 +18,7 @@
 #include <opie2/oapplication.h>
+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
@@ -26,15 +26,10 @@
 // Qtopia
-#ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
-#endif
 // Opie
-#ifdef QWS
 #include <opie2/odevice.h>
-using namespace Opie;
-#endif
 #include <opie2/ocompletionbox.h>
@@ -52,4 +47,7 @@ using namespace Opie;
 #include "opieuidemo.h"
+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
@@ -19,5 +19,9 @@
 #include <qmainwindow.h>
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
+}
+}
 class QTabWidget;
 class QVBox;
@@ -48,5 +52,5 @@ private:
    QTabWidget* main;
    
-    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
@@ -39,4 +39,6 @@
 #include <qlistview.h>
+using namespace Opie::Ui;
 OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlags f )
                   :QVBox( parent, name, 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
@@ -35,6 +35,10 @@
 #include <qvbox.h>
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
 class OVersatileViewItem;
+}
+}
 class OVersatileViewDemo: public QVBox
@@ -48,24 +52,24 @@ class OVersatileViewDemo: public QVBox
  public slots:
    void selectionChanged();
-    void selectionChanged( OVersatileViewItem * );
+    void selectionChanged( Opie::Ui::OVersatileViewItem * );
-    void currentChanged( OVersatileViewItem * );
+    void currentChanged( Opie::Ui::OVersatileViewItem * );
-    void clicked( OVersatileViewItem * );
+    void clicked( Opie::Ui::OVersatileViewItem * );
-    void pressed( OVersatileViewItem * );
+    void pressed( OPie::Ui::OVersatileViewItem * );
-    void doubleClicked( OVersatileViewItem *item );
+    void doubleClicked( Opie::Ui::OVersatileViewItem *item );
-    void returnPressed( OVersatileViewItem *item );
+    void returnPressed( Opie::Ui::OVersatileViewItem *item );
  
-    void onItem( OVersatileViewItem *item );
+    void onItem( Opie::Ui::OVersatileViewItem *item );
    void onViewport();
-    void expanded( OVersatileViewItem *item );
+    void expanded( Opie::Ui::OVersatileViewItem *item );
-    void collapsed( OVersatileViewItem *item );
+    void collapsed( Opie::Ui::OVersatileViewItem *item );
    
    void moved();
-    void contextMenuRequested( OVersatileViewItem *item, const QPoint&, int col );
+    void contextMenuRequested( Opie::Ui::OVersatileViewItem *item, const QPoint&, int col );
    
  private:
-    OVersatileView* vv;
+    Opie::Ui::OVersatileView* vv;
 };
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
@@ -20,5 +20,5 @@
 #include <qsignalmapper.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OPIE_EXPORT_APP( OApplicationFactory<StackExample> )
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
@@ -9,5 +9,4 @@
 #include <opie2/owidgetstack.h>
-using namespace Opie;
 class StackExample : public QMainWindow {
@@ -21,5 +20,5 @@ protected:
    void closeEvent( QCloseEvent* e );
 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
@@ -61,5 +61,5 @@ _;:,   .>  :=|.         This program is free software; you can
 const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
-using namespace Opie;
+using namespace Opie::Core;
 ODevice *ODevice::inst()
@@ -82,9 +82,9 @@ ODevice *ODevice::inst()
                {
                    qDebug( "ODevice() - found '%s'", (const char*) line );
-                    if ( line.contains( "sharp", false ) ) dev = new Zaurus();
+                    if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus();
-                    else if ( line.contains( "ipaq", false ) ) dev = new iPAQ();
+                    else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ();
-                    else if ( line.contains( "simpad", false ) ) dev = new SIMpad();
+                    else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad();
-                    else if ( line.contains( "jornada", false ) ) dev = new Jornada();
+                    else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada();
-                    else if ( line.contains( "ramses", false ) ) dev = new Ramses();
+                    else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses();
                    else qWarning( "ODevice() - unknown hardware - using default." );
                    break;
@@ -188,5 +188,5 @@ bool ODevice::suspend()
    bool res = false;
    ODevice::sendSuspendmsg();
-    
    struct timeval tvs, tvn;
    ::gettimeofday ( &tvs, 0 );
@@ -625,4 +625,7 @@ void ODevice::virtual_hook(int, void* ){
 void ODevice::sendSuspendmsg()
 {
+    if ( isQWS() )
+        return;
    QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
 }
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index bccb449..5ee9cca 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -41,6 +41,7 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <qstrlist.h>
-namespace Opie
+namespace Opie{
-{
+namespace Core{
    class ODeviceData;
 /**
@@ -251,5 +252,5 @@ public:
     * by the device manufacturer and will be from most preferred button to least preffered
     * button.  Note that this list only contains "user mappable" buttons.
-     * 
+     *
     * @todo Make method const and take care of calling initButtons or make that const too
     *
@@ -315,4 +316,5 @@ class ODeviceData {
 }
+}
 static inline bool isQWS()
@@ -329,4 +331,5 @@ 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
@@ -54,4 +54,8 @@
 #endif
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 /* KERNEL */
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
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
@@ -36,5 +36,7 @@
 #include <qwindowsystem_qws.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter
@@ -82,3 +84,7 @@ 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
@@ -78,5 +78,5 @@ typedef struct {
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
-using namespace Opie;
+using namespace Opie::Core::Private;
 void Jornada::init()
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
@@ -33,6 +33,7 @@
 #include <opie2/odevice.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Jornada : public ODevice
 {
@@ -46,5 +47,7 @@ class Jornada : public ODevice
    virtual int displayBrightnessResolution() const;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 5bcf6a9..77de8c5 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -54,4 +54,7 @@
 #endif
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct r_button ramses_buttons [] = {
    { Model_Ramses_MNCI,
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
@@ -35,5 +35,7 @@
 #include <qwindowsystem_qws.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Ramses : public ODevice, public QWSServer::KeyboardFilter
@@ -69,4 +71,7 @@ struct r_button {
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 90aca2f..80d40a3 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -54,5 +54,6 @@ _;:,   .>  :=|.         This program is free software; you can
 #endif
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct s_button simpad_buttons [] = {
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
@@ -36,5 +36,7 @@
 #include <qwindowsystem_qws.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class SIMpad : public ODevice, public QWSServer::KeyboardFilter
@@ -79,3 +81,7 @@ 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
@@ -54,5 +54,6 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #endif
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct yopy_button yopy_buttons [] = {
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
@@ -33,6 +33,7 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #include <opie2/odevice.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Yopy : public ODevice
 {
@@ -60,3 +61,7 @@ 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
@@ -54,5 +54,6 @@ _;:,   .>  :=|.         This program is free software; you can
 #endif
-using namespace Opie;
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 struct z_button z_buttons [] = {
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
@@ -46,6 +46,8 @@
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class Zaurus : public ODevice
 {
@@ -93,4 +95,6 @@ struct z_button {
    char *fheldaction;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiecore/device/odevicebutton.cpp b/libopie2/opiecore/device/odevicebutton.cpp
index 0b593d5..a081b7f 100644
--- a/libopie2/opiecore/device/odevicebutton.cpp
+++ b/libopie2/opiecore/device/odevicebutton.cpp
@@ -34,5 +34,8 @@
 #include <opie2/odevicebutton.h>
-using namespace Opie;
+namespace Opie {
+namespace Core {
+namespace Private {
 class OQCopMessageData
@@ -43,5 +46,8 @@ class OQCopMessageData
    QByteArray m_data;
 };
+}
+using namespace Opie::Core;
+using namespace Opie::Core::Private;
 OQCopMessage::OQCopMessage()
@@ -125,6 +131,6 @@ void OQCopMessage::setData ( const QByteArray &data )
 }
-/*! \class Opie::ODeviceButton
+/*! \class Opie::Core::ODeviceButton
-    \brief The Opie::ODeviceButton class represents a physical user mappable button on a Qtopia device.
+    \brief The Opie::Core::ODeviceButton class represents a physical user mappable button on a Qtopia device.
 
    This class represents a physical button on a Qtopia device.    A
@@ -245,2 +251,5 @@ void ODeviceButton::setHeldAction(const OQCopMessage& action)
    m_HeldAction = action;
 }
+}
+}
diff --git a/libopie2/opiecore/device/odevicebutton.h b/libopie2/opiecore/device/odevicebutton.h
index a66b88f..4000144 100644
--- a/libopie2/opiecore/device/odevicebutton.h
+++ b/libopie2/opiecore/device/odevicebutton.h
@@ -24,8 +24,10 @@
 #include <qstring.h>
-class OQCopMessageData;
-namespace Opie
+namespace Opie{
-{
+namespace Core{
+namespace Private {
+class OQCopMessageData;
+}
 class OQCopMessage
@@ -53,5 +55,5 @@ private:
    void init ( const QCString &m_channel, const QCString &message, const QByteArray &args );
-    OQCopMessageData *d;
+    Private::OQCopMessageData *d;
    class Private;
    Private* m_data;
@@ -105,4 +107,5 @@ class ODeviceButton
 }
+}
 #endif
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index d340c0e..e2f6e82 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -35,4 +35,7 @@
 #include <stdio.h>
+using namespace Opie::Core;
 OApplication* OApplication::_instance = 0;
@@ -41,4 +44,7 @@ OApplication* OApplication::_instance = 0;
 **************************************************************************************************/
+namespace Opie {
+namespace Core {
+namespace Private {
 class OApplicationPrivate
 {
@@ -47,4 +53,5 @@ class OApplicationPrivate
    ~OApplicationPrivate() {};
 };
+}
 /**************************************************************************************************
@@ -85,5 +92,5 @@ OConfig* OApplication::config()
 void OApplication::init()
 {
-    d = new OApplicationPrivate();
+    d = new Private::OApplicationPrivate();
    if ( !OApplication::_instance )
    {
@@ -126,2 +133,4 @@ 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
@@ -31,11 +31,15 @@
 #define OAPPLICATION_H
-#define oApp OApplication::oApplication()
+#define oApp Opie::Core::OApplication::oApplication()
 #include <qpe/qpeapplication.h>
+namespace Opie {
+namespace Core {
+namespace Private {
 class OApplicationPrivate;
+} // private class
 class OConfig;
@@ -99,6 +103,9 @@ class OApplication : public QPEApplication
    static OApplication* _instance;
    OConfig* _config;
-    OApplicationPrivate* d;
+    Private::OApplicationPrivate* d;
 };
+} // Core
+} // Opie
 #endif // OAPPLICATION_H
diff --git a/libopie2/opiecore/oconfig.cpp b/libopie2/opiecore/oconfig.cpp
index fb5eabb..05d8070 100644
--- a/libopie2/opiecore/oconfig.cpp
+++ b/libopie2/opiecore/oconfig.cpp
@@ -39,4 +39,6 @@
 #include <opie2/oconfig.h>
+using namespace Opie::Core;
 OConfig::OConfig( const QString &name, Domain domain )
        :Config( name, 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
@@ -41,4 +41,7 @@ class QColor;
 class QFont;
+namespace Opie {
+namespace Core {
 /**
  * A Configuration class based on the Qtopia @ref Config class
@@ -63,4 +66,5 @@ class OConfig : public Config
     * @returns the name of the current group.
     * The current group is used for searching keys and accessing entries.
+     * @todo make const
     */
    const QString& group() { return git.key(); };
@@ -73,4 +77,8 @@ class OConfig : public Config
     */
    QFont readFontEntry( const QString& key, const QFont* pDefault ) const;
+    
+private:
+    class Private;
+    Private *d;
 };
@@ -137,5 +145,10 @@ class OConfigGroupSaver
    OConfigGroupSaver( const OConfigGroupSaver& );
    OConfigGroupSaver& operator=( const OConfigGroupSaver& );
+    
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OCONFIG_H
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp
index a40ef53..cac985b 100644
--- a/libopie2/opiecore/odebug.cpp
+++ b/libopie2/opiecore/odebug.cpp
@@ -66,5 +66,6 @@
 #endif
+namespace Opie {
+namespace Core {
 /*======================================================================================
 * debug levels
@@ -615,6 +616,10 @@ void odClearDebugConfig()
 }
 #ifdef OPIE_NO_DEBUG
 #define odDebug ondDebug
 #define odBacktrace ondBacktrace
 #endif
+}
+}
+\ No newline at end of file
diff --git a/libopie2/opiecore/odebug.h b/libopie2/opiecore/odebug.h
index 85941fd..a5c9ded 100644
--- a/libopie2/opiecore/odebug.h
+++ b/libopie2/opiecore/odebug.h
@@ -48,4 +48,7 @@ class QColor;
 class QBrush;
+namespace Opie {
+namespace Core {
 class odbgstream;
 class ondbgstream;
@@ -395,4 +398,8 @@ class ondbgstream {
    ondbgstream& operator<<( const QColor & ) { return *this; }
    ondbgstream& operator<<( const QBrush & ) { return *this; }
+    
+private:
+    class Private;
+    Private *d;
 };
@@ -473,2 +480,4 @@ void odClearDebugConfig();
 #endif
+}
+}
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index 1aa206e..ea02058 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -39,4 +39,6 @@
 #include <sys/types.h>
+using namespace Opie::Core;
 static const char Base64EncMap[64] =
 {
@@ -313,5 +315,5 @@ QByteArray OGlobal::decodeBase64( const QByteArray& in) {
 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());
 }
@@ -324,5 +326,5 @@ bool OGlobal::isAppLnkFileName( const QString& str )
 bool OGlobal::isDocumentFileName( const QString& file )
 {
-    if (file.length()==0||file.at(file.length()-1)==QDir::separator()) return false;
+    if (file.isEmpty()||file.at(file.length()-1)==QDir::separator()) return false;
    if (file.startsWith(QPEApplication::documentDir()+QDir::separator())) return true;
    StorageInfo si;
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
@@ -53,4 +53,9 @@ class QFile;
 class QString;
 class DateFormat;
+namespace Opie {
+namespace Core {
 /**
 *\brief OGlobal contains a list of generic functions
@@ -147,5 +152,8 @@ private:
    static OConfig* _config;
    static OConfig* _qpe_config;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OGLOBAL_H
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index 192e55b..f34c531 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -45,4 +45,7 @@
 #include <stdlib.h>
+using namespace Opie::Core;
 QString* OGlobalSettings::s_desktopPath = 0;
 QString* OGlobalSettings::s_autostartPath = 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
@@ -37,4 +37,7 @@
 #include <qfont.h>
+/**
+ * \todo make real const values
+ */
 #define OPIE_DEFAULT_SINGLECLICK true
 #define OPIE_DEFAULT_INSERTTEAROFFHANDLES true
@@ -50,4 +53,7 @@
 // we should not habe too much configure options!!!!!! -zecke
+namespace Opie {
+namespace Core {
 /**
 * Access the OPIE global configuration settings.
@@ -369,5 +375,11 @@ 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
@@ -10,6 +10,5 @@ HEADERS     = oapplication.h            \
              oprocctrl.h               \
              osmartpointer.h           \
-              ostorageinfo.h            \
+              ostorageinfo.h            
-              xmltree.h
 SOURCES     = oapplication.cpp          \
@@ -20,6 +19,5 @@ SOURCES     = oapplication.cpp          \
              oprocess.cpp              \
              oprocctrl.cpp             \
-              ostorageinfo.cpp          \
+              ostorageinfo.cpp          
-              xmltree.cc
 include ( device/device.pro )
@@ -27,5 +25,5 @@ include ( device/device.pro )
 INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.8.5
+VERSION     = 1.9.0
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(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
@@ -42,4 +42,6 @@
 #include "oprocctrl.h"
+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
@@ -35,7 +35,12 @@
 #include "oprocess.h"
-class OProcessControllerPrivate;
 class QSocketNotifier;
+namespace Opie {
+namespace Core {
+namespace Private {
+class OProcessControllerPrivate;
 /**
 * @short Used internally by @ref OProcess
@@ -116,4 +121,7 @@ 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
@@ -62,4 +62,9 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #endif
+using namespace Opie::Core::Private;
+namespace Opie {
+namespace Core {
+namespace Private {
 class OProcessPrivate
 {
@@ -73,5 +78,5 @@ public:
    QCString shell;
 };
+}
 OProcess::OProcess( QObject *parent, const char *name )
@@ -942,2 +947,5 @@ 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
@@ -44,5 +44,11 @@ _;:, � � .> � �:=|.         This program is free software; you can
 class QSocketNotifier;
+namespace Opie {
+namespace Core {
+namespace Private {
+class OProcessController;
 class OProcessPrivate;
+}
 /**
@@ -398,4 +404,5 @@ public:
    /**
     * Lets you see what your arguments are for debugging.
+     * \todo make const
     */
@@ -717,5 +724,5 @@ protected:
     * access to various data members.
     */
-    friend class OProcessController;
+    friend class Private::OProcessController;
 private:
@@ -746,6 +753,8 @@ private:
 private:
    void init ( );
-    OProcessPrivate *d;
+    Private::OProcessPrivate *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiecore/osmartpointer.h b/libopie2/opiecore/osmartpointer.h
index 9000e71..8f9da7f 100644
--- a/libopie2/opiecore/osmartpointer.h
+++ b/libopie2/opiecore/osmartpointer.h
@@ -41,4 +41,5 @@ _;:,     .>    :=|.         This program is free software; you can
 namespace Opie {
+namespace Core {
 //! simple reference counter class
@@ -141,4 +142,5 @@ public:
 }
+}
 #endif
diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp
index aa8d2fc..8fcf5fc 100644
--- a/libopie2/opiecore/ostorageinfo.cpp
+++ b/libopie2/opiecore/ostorageinfo.cpp
@@ -30,4 +30,6 @@
 #include <opie2/ostorageinfo.h>
+using namespace Opie::Core;
 OStorageInfo::OStorageInfo( QObject *parent )
        : StorageInfo( 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
@@ -33,4 +33,7 @@
 #include <qpe/storage.h>
+namespace Opie {
+namespace Core {
 class OStorageInfo : public StorageInfo
 {
@@ -57,6 +60,11 @@ 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
@@ -4,4 +4,5 @@
  - Abstract from implementation of some dbs
  - provides( Type::What )
+  - emit signals directly on arriving of data
  
 * OSQLDriver DriverVersion - DatabaseVersion
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
@@ -22,5 +22,5 @@ SOURCES     = osqlbackend.cpp   \
 INTERFACES  =
 TARGET      = opiedb2
-VERSION     = 1.8.2
+VERSION     = 1.9.0
 INCLUDEPATH = $(OPIEDIR)/include
 DEPENDPATH  = $(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
@@ -2,4 +2,6 @@
 #include "osqlbackend.h"
+using namespace Opie::DB;
 OSQLBackEnd::OSQLBackEnd( const QString& name,
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
@@ -7,4 +7,7 @@
 #include <qvaluelist.h>
+namespace Opie {
+namespace DB {
 /**
 * OSQLBackEnd represents an available backend
@@ -71,5 +74,10 @@ private:
    bool m_default :1;
    int m_pref;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp
index 95ed77b..fc18e07 100644
--- a/libopie2/opiedb/osqlbackendmanager.cpp
+++ b/libopie2/opiedb/osqlbackendmanager.cpp
@@ -4,4 +4,8 @@
 #include "osqlbackendmanager.h"
+/**
+ * \todo FIXME CONFIG!!!
+ */
 namespace {
    class Config {
@@ -45,4 +49,8 @@ namespace {
    }
 };
+using namespace Opie::DB;
 OSQLBackEndManager::OSQLBackEndManager( const QStringList& path )
    :m_path( 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
@@ -6,4 +6,7 @@
 #include "osqlbackend.h"
+namespace Opie {
+namespace DB {
 class OSQLBackEndManager {
 public:
@@ -18,3 +21,6 @@ private:
    QStringList m_path;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqldriver.cpp b/libopie2/opiedb/osqldriver.cpp
index 258c116..a6dae77 100644
--- a/libopie2/opiedb/osqldriver.cpp
+++ b/libopie2/opiedb/osqldriver.cpp
@@ -3,4 +3,6 @@
 #include "osqldriver.h"
+using namespace Opie::DB;
 OSQLDriver::OSQLDriver( QLibrary* lib )
 : QObject(), m_lib(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
@@ -8,4 +8,8 @@
 class QLibrary;
+namespace Opie {
+namespace DB {
 class OSQLResult;
 class OSQLQuery;
@@ -85,3 +89,6 @@ 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
@@ -1,4 +1,6 @@
 #include "osqlerror.h"
+using namespace Opie::DB;
 OSQLError::OSQLError( const QString& driverText,
                      const QString& driverDatabaseText,
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
@@ -5,4 +5,7 @@
 #include <qvaluelist.h>
+namespace Opie {
+namespace DB {
 /**
 * OSQLError is the base class of all errors
@@ -57,3 +60,5 @@ 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
@@ -41,4 +41,7 @@
+using namespace Opie::DB;
+using namespace Opie::DB::Private;
 namespace {
    struct Query {
@@ -87,5 +90,5 @@ void OSQLiteDriver::setOptions( const QStringList& ) {
 bool OSQLiteDriver::open() {
    char *error;
-    odebug << "OSQLiteDriver::open: about to open" << oendl;
+    qDebug("OSQLiteDriver::open: about to open");
    m_sqlite = sqlite_open(m_url.local8Bit(),
                           0,
@@ -95,5 +98,5 @@ bool OSQLiteDriver::open() {
    if (m_sqlite == 0l ) {
        // FIXME set the last error
-        owarn << "OSQLiteDriver::open: " << error << oendl;
+        qWarning("OSQLiteDriver::open: %s", error );
        free( error );
        return false;
@@ -127,5 +130,5 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
    /* SQLITE_OK 0 if return code > 0 == failure */
    if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err)  > 0 ) {
-        owarn << "OSQLiteDriver::query: Error while executing" << oendl;
+        qWarning("OSQLiteDriver::query: Error while executing");
        free(err );
        // FixMe Errors
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
@@ -8,4 +8,8 @@
 #include "osqlresult.h"
+namespace Opie {
+namespace DB {
+namespace Private {
 class OSQLiteDriver : public OSQLDriver {
    Q_OBJECT
@@ -32,3 +36,7 @@ private:
    sqlite *m_sqlite;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlmanager.cpp b/libopie2/opiedb/osqlmanager.cpp
index 766ebe1..990d258 100644
--- a/libopie2/opiedb/osqlmanager.cpp
+++ b/libopie2/opiedb/osqlmanager.cpp
@@ -6,4 +6,6 @@
 #include "osqlitedriver.h"
+using namespace Opie::DB;
 OSQLManager::OSQLManager() {
 }
@@ -32,5 +34,5 @@ OSQLDriver* OSQLManager::load( const QString& name ) {
    if ( name == "SQLite" ) {
-        driver = new OSQLiteDriver();
+        driver = new Opie::DB::Private::OSQLiteDriver;
    }
    return driver;
@@ -43,5 +45,5 @@ OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) {
    if ( end.library() == "builtin" &&
         end.name() == "SQLite" )
-        driver = new OSQLiteDriver();
+        driver = new Opie::DB::Private::OSQLiteDriver;
    return driver;
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
@@ -9,4 +9,6 @@
+namespace Opie {
+namespace DB {
 /**
 * OSQLManager is responsible for loading
@@ -60,5 +62,9 @@ private:
    OSQLBackEnd::ValueList m_list;
    QStringList m_path;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqlquery.cpp b/libopie2/opiedb/osqlquery.cpp
index ecd53f2..8270c4c 100644
--- a/libopie2/opiedb/osqlquery.cpp
+++ b/libopie2/opiedb/osqlquery.cpp
@@ -2,4 +2,6 @@
 #include "osqlquery.h"
+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
@@ -8,4 +8,7 @@
+namespace Opie {
+namespace DB {
 /** I'm not happy with them
 class OSQLQueryOrder {
@@ -48,4 +51,7 @@ public:
    virtual QString query()const = 0;
+private:
+    class Private;
+    Private *d;    
 };
@@ -120,3 +126,5 @@ 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
@@ -2,4 +2,6 @@
 #include "osqlresult.h"
+using namespace Opie::DB;
 OSQLResultItem::OSQLResultItem( const TableString& string,
                                const TableInt& Int)
diff --git a/libopie2/opiedb/osqlresult.h b/libopie2/opiedb/osqlresult.h
index 9c9efa2..fc6f01a 100644
--- a/libopie2/opiedb/osqlresult.h
+++ b/libopie2/opiedb/osqlresult.h
@@ -8,4 +8,8 @@
 #include "osqlerror.h"
+namespace Opie {
+namespace DB {
 /**
 * ResultItem  represents one row of the resulting answer
@@ -108,5 +112,9 @@ private:
    OSQLError::ValueList m_error;
    OSQLResultItem::ValueList::Iterator it;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiedb/osqltable.cpp b/libopie2/opiedb/osqltable.cpp
index cde40f4..117cf21 100644
--- a/libopie2/opiedb/osqltable.cpp
+++ b/libopie2/opiedb/osqltable.cpp
@@ -1,4 +1,6 @@
 #include "osqltable.h"
+using namespace Opie::DB;
 OSQLTableItem::OSQLTableItem() {}
 OSQLTableItem::OSQLTableItem( enum Type type,
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
@@ -6,4 +6,6 @@
 #include <qvariant.h>
+namespace Opie {
+namespace DB {
 /**
 * OSQLTableItem saves one column of a complete
@@ -91,5 +93,10 @@ private:
    QString m_table;
    OSQLTableItem::ValueList m_list;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro
index d6f54ee..ce30dfb 100644
--- a/libopie2/opiemm/opiemm.pro
+++ b/libopie2/opiemm/opiemm.pro
@@ -6,5 +6,5 @@ SOURCES     = osoundsystem.cpp
 INTERFACES  =
 TARGET      = opiemm2
-VERSION     = 1.8.2
+VERSION     = 1.9.0
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(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
@@ -42,4 +42,6 @@
+using namespace Opie::Core;
+using namespace Opie::MM;
 /*======================================================================================
 * OSoundSystem
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
@@ -37,4 +37,7 @@
 #include <qmap.h>
+namespace Opie {
+namespace MM {
 class OAudioInterface;
 class OMixerInterface;
@@ -91,4 +94,6 @@ class OSoundSystem : public QObject
    static OSoundSystem* _instance;
    CardMap _interfaces;
+    class Private;
+    Private *d;
 };
@@ -125,4 +130,7 @@ class OSoundCard : public QObject
  private:
    void init();
+  private:
+    class Private;
+    Private *d;
 };
@@ -151,4 +159,7 @@ class OAudioInterface : public QObject
  private:
    void init();
+  private:
+    class Private;
+    Private *d;
 };
@@ -211,6 +222,12 @@ class OMixerInterface : public QObject
  private:
    void init();
+  private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OSOUNDSYSTEM_H
diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h
index 7ae27c5..1a9a7a0 100644
--- a/libopie2/opienet/802_11_user.h
+++ b/libopie2/opienet/802_11_user.h
@@ -456,3 +456,4 @@ struct ctrl_end_ack_t {
        #define IV_KEYID(iv)(((iv) >> 30) & 0x03)
 #endif
diff --git a/libopie2/opienet/dhcp.h b/libopie2/opienet/dhcp.h
index 368e375..6ba4c53 100644
--- a/libopie2/opienet/dhcp.h
+++ b/libopie2/opienet/dhcp.h
@@ -43,4 +43,5 @@
 #define DHCP_H
        #define DHCP_UDP_OVERHEAD       (14 + /* Ethernet header */     \
                                         20 + /* IP header */           \
@@ -198,4 +199,5 @@ struct dhcp_packet {
        #define FQDN_SUBOPTION_COUNT    8
 #endif
diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index 7e4ab2b..f679afb 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -8,4 +8,10 @@
 #include "odebugmapper.h"
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
+namespace Private {
 DebugMapper::DebugMapper()
 {
@@ -213,3 +219,5 @@ 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
@@ -10,4 +10,8 @@
 #include <qintdict.h>
+namespace Opie {
+namespace Net  {
+namespace Private {
 typedef QIntDict<QString> IntStringMap;
@@ -21,6 +25,12 @@ class DebugMapper
  private:
    IntStringMap _map;
+    class Private;
+    Private *d;
 };
+}
+}
+}
 #endif
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index b93b752..209ec94 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -44,4 +44,8 @@
 #include <qtextstream.h>
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
 OManufacturerDB* OManufacturerDB::_instance = 0;
@@ -134,2 +138,5 @@ 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
@@ -34,4 +34,7 @@
 #include <qmap.h>
+namespace Opie {
+namespace Net {
 /**
 * @brief A Ethernet card vendor database.
@@ -64,6 +67,11 @@ class OManufacturerDB
    QMap<QString, QString> manufacturersExt;
    static OManufacturerDB* _instance;
+    class Private;
+    Private *d;
 };
+}
+}
 #endif
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 48cfa43..7794334 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -38,4 +38,7 @@
 #include <stdio.h>
+namespace Opie {
+namespace Net  {
 /*======================================================================================
 * OMacAddress
@@ -186,4 +189,7 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 }
+namespace Private {
 /*======================================================================================
 * assorted functions
@@ -231,2 +237,5 @@ 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
@@ -42,4 +42,8 @@
 struct ifreq;
+namespace Opie {
+namespace Net  {
 class OWirelessNetworkInterface;
@@ -73,4 +77,6 @@ class OMacAddress
  friend bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
+  class Private;
+  Private *d;
 };
@@ -89,4 +95,7 @@ class OHostAddress : public QHostAddress
    ~OHostAddress();
  */
+  private:
+  class Private;
+  Private *d;
 };
@@ -116,4 +125,6 @@ class OPrivateIOCTL : public QObject
    u_int16_t _setargs;
+    class Private;
+    Private *d;
 };
@@ -122,7 +133,11 @@ class OPrivateIOCTL : public QObject
 *======================================================================================*/
+namespace Private {
 void dumpBytes( const unsigned char* data, int num );
 QString modeToString( int );
 int stringToMode( const QString& );
+}
+}
+}
 #define IW_PRIV_TYPE_MASK       0x7000
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
@@ -58,4 +58,8 @@
 #ifndef NODEBUG
 #include <opie2/odebugmapper.h>
+using namespace Opie::Core;
+using namespace Opie::Net::Private;
 DebugMapper* debugmapper = new DebugMapper();
 #endif
@@ -65,4 +69,6 @@ DebugMapper* debugmapper = new DebugMapper();
 *======================================================================================*/
+namespace Opie {
+namespace Net  {
 ONetwork* ONetwork::_instance = 0;
@@ -1238,2 +1244,5 @@ QString OOrinocoMonitoringInterface::name() const
    return "orinoco";
 }
+}
+}
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 93b129f..a953296 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -57,4 +57,7 @@
 #include <qhostaddress.h>
+namespace Opie {
+namespace Net  {
 class ONetworkInterface;
 class OWirelessNetworkInterface;
@@ -124,4 +127,6 @@ class ONetwork : public QObject
    static ONetwork* _instance;
    InterfaceMap _interfaces;
+    class Private;
+    Private *d;
 };
@@ -235,4 +240,7 @@ class ONetworkInterface : public QObject
    bool ioctl( int call ) const;
    bool ioctl( int call, struct ifreq& ) const;
+  private:
+    class Private;
+    Private *d;
 };
@@ -297,4 +305,6 @@ class OChannelHopper : public QObject
    QValueList<int> _channels;
    QValueList<int>::Iterator _channel;
+    class Private;
+    Private *d;
 };
@@ -456,4 +466,6 @@ class OWirelessNetworkInterface : public ONetworkInterface
  private:
    OChannelHopper* _hopper;
+    class Private;
+    Private *d;
 };
@@ -480,4 +492,7 @@ class OMonitoringInterface
    OWirelessNetworkInterface* _if;
    bool _prismHeader;
+  private:
+    class Private;
+    Private *d;
 };
@@ -498,4 +513,7 @@ class OCiscoMonitoringInterface : public OMonitoringInterface
    virtual QString name() const;
    virtual void setChannel( int );
+  private:
+    class Private;
+    Private *d;
 };
@@ -517,4 +535,7 @@ class OWlanNGMonitoringInterface : public OMonitoringInterface
    virtual QString name() const;
    virtual void setChannel( int );
+  private:
+    class Private;
+    Private *d;
 };
@@ -535,4 +556,8 @@ class OHostAPMonitoringInterface : public OMonitoringInterface
    virtual void setEnabled( bool );
    virtual QString name() const;
+    
+  private:
+    class Private;
+    Private *d;
 };
@@ -554,6 +579,12 @@ class OOrinocoMonitoringInterface : public OMonitoringInterface
    virtual QString name() const;
+   private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // ONETWORK_H
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index fdd519c..4081d4f 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -46,4 +46,9 @@
 #include "udp_ports.h"
+using namespace Opie::Core;
+namespace Opie {
+namespace Net  {
 /*======================================================================================
 * OPacket
@@ -1345,3 +1350,4 @@ 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
@@ -65,6 +65,8 @@ typedef struct pcap_pkthdr packetheaderstruct;
 /* FORWARDS */
-class OPacketCapturer;
 class QSocketNotifier;
+namespace Opie {
+namespace Net  {
+class OPacketCapturer;
 /*======================================================================================
@@ -142,4 +144,7 @@ class OPacket : public QObject
    const unsigned char* _data;     // pcap packet data
    const unsigned char* _end;      // end of pcap packet data
+  private:
+    class Private;
+    Private *d;
 };
@@ -164,4 +169,7 @@ class OEthernetPacket : public QObject
  private:
    const struct ether_header* _ether;
+  private:
+    class Private;
+    Private *d;
 };
@@ -182,4 +190,6 @@ class OPrismHeaderPacket : public QObject
  private:
    const struct prism_hdr* _header;
+    class Private;
+    Private *d;
 };
@@ -211,4 +221,6 @@ class OWaveLanPacket : public QObject
  private:
    const struct ieee_802_11_header* _wlanhdr;
+    class Private;
+    Private *d;
 };
@@ -240,4 +252,6 @@ class OWaveLanManagementPacket : public QObject
    const struct ieee_802_11_mgmt_header* _header;
    const struct ieee_802_11_mgmt_body* _body;
+    class Private;
+    Private *d;
 };
@@ -259,4 +273,6 @@ class OWaveLanManagementSSID : public QObject
  private:
    const struct ssid_t* _data;
+    class Private;
+    Private *d;
 };
@@ -275,4 +291,6 @@ class OWaveLanManagementRates : public QObject
  private:
    const struct rates_t* _data;
+    class Private;
+    Private *d;
 };
@@ -291,4 +309,6 @@ class OWaveLanManagementCF : public QObject
  private:
    const struct cf_t* _data;
+    class Private;
+    Private *d;
 };
@@ -307,4 +327,6 @@ class OWaveLanManagementFH : public QObject
  private:
    const struct fh_t* _data;
+    class Private;
+    Private *d;
 };
@@ -325,4 +347,6 @@ class OWaveLanManagementDS : public QObject
  private:
    const struct ds_t* _data;
+    class Private;
+    Private *d;
 };
@@ -341,4 +365,6 @@ class OWaveLanManagementTim : public QObject
  private:
    const struct tim_t* _data;
+    class Private;
+    Private *d;
 };
@@ -357,4 +383,6 @@ class OWaveLanManagementIBSS : public QObject
  private:
    const struct ibss_t* _data;
+    class Private;
+    Private *d;
 };
@@ -373,4 +401,6 @@ class OWaveLanManagementChallenge : public QObject
  private:
    const struct challenge_t* _data;
+    class Private;
+    Private *d;
 };
@@ -389,4 +419,6 @@ class OWaveLanDataPacket : public QObject
  private:
    const struct ieee_802_11_data_header* _header;
+    class Private;
+    Private *d;
 };
@@ -407,4 +439,6 @@ class OWaveLanControlPacket : public QObject
  private:
    const struct ieee_802_11_control_header* _header;
+    class Private;
+    Private *d;
 };
@@ -423,4 +457,6 @@ class OLLCPacket : public QObject
  private:
    const struct ieee_802_11_802_2_header* _header;
+    class Private;
+    Private *d;
 };
@@ -450,4 +486,6 @@ class OIPPacket : public QObject
  private:
    const struct iphdr* _iphdr;
+    class Private;
+    Private *d;
 };
@@ -474,4 +512,6 @@ class OARPPacket : public QObject
  private:
    const struct myarphdr* _arphdr;
+    class Private;
+    Private *d;
 };
@@ -495,4 +535,6 @@ class OUDPPacket : public QObject
  private:
    const struct udphdr* _udphdr;
+    class Private;
+    Private *d;
 };
@@ -523,4 +565,6 @@ class ODHCPPacket : public QObject
    const struct dhcp_packet* _dhcphdr;
    unsigned char _type;
+    class Private;
+    Private *d;
 };
@@ -546,4 +590,6 @@ class OTCPPacket : public QObject
  private:
    const struct tcphdr* _tcphdr;
+    class Private;
+    Private *d;
 };
@@ -666,5 +712,9 @@ class OPacketCapturer : public QObject
    mutable char _errbuf[PCAP_ERRBUF_SIZE];         // holds error strings from libpcap
    QMap<QString, int> _stats;                      // statistics;
+            class Private;                             // Private Forward declaration
+            Private *d;                                     // if we need to add data
 };
+}
+}
 #endif // OPCAP_H
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index 8c989d8..140b924 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -32,4 +32,9 @@
 #include <opie2/odebug.h>
+using namespace Opie::Core;
+namespace Opie {
+namespace Net {
 /*======================================================================================
 * OStation
@@ -63,2 +68,5 @@ void OStation::dump()
    qDebug( "ip:   %s", (const char*) ipAddress.toString() );
 }
+}
+}
+\ No newline at end of file
diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h
index 1e7366d..68f1114 100644
--- a/libopie2/opienet/ostation.h
+++ b/libopie2/opienet/ostation.h
@@ -41,6 +41,10 @@
 #include <sys/types.h>
+namespace Opie {
+namespace Net  {
 class OStation;
 typedef QList<OStation> OStationList;
@@ -67,6 +71,11 @@ class OStation
    int channel;
    bool encrypted;
+  private:
+    class Private;
+    Private *d;
 };
+}
+}
 #endif // OSTATION_H
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 4231a00..d4867ba 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -11,5 +11,6 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
        core/backends/otodoaccessxml.cpp \
        core/backends/odatebookaccess.cpp \
-        core/backends/odatebookaccessbackend_sql.cpp
+        core/backends/odatebookaccessbackend_sql.cpp \
+        core/backends/private/xmltree.cc
        
 HEADERS += core/backends/obackendfactory.h \
@@ -29,3 +30,4 @@ HEADERS += core/backends/obackendfactory.h \
        core/backends/otodoaccessvcal.h \
        core/backends/otodoaccessxml.h \
-        core/backends/odatebookaccess.h
+        core/backends/odatebookaccess.h \
+        core/backends/private/xmltree.h
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index f121cc2..d16d692 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -47,5 +47,5 @@
 #include <opie2/osqlquery.h>
+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
@@ -41,7 +41,11 @@
 /* aren't in namespace Opie yet - alwin */
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 namespace Opie {
@@ -92,5 +96,5 @@ 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;
        QMap<QString, QString>  requestCustom( int uid ) const;
@@ -102,5 +106,5 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
        QArray<int> m_uids;
-        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
@@ -42,5 +42,5 @@
 #include <qpe/global.h>
-#include <opie2/xmltree.h>
+#include "private/xmltree.h"
 #include <opie2/ocontactaccessbackend.h>
 #include <opie2/ocontactaccess.h>
@@ -50,4 +50,5 @@
 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
@@ -47,4 +47,6 @@
 #include <opie2/odatebookaccessbackend_sql.h>
+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
@@ -35,5 +35,9 @@
 #include <opie2/odatebookaccessbackend.h>
+namespace Opie {
+namespace DB {
 class OSQLDriver;
+}
+}
 namespace Opie {
@@ -78,5 +82,5 @@ private:
    QMap<QString, int> m_reverseFieldMap;
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
    class Private;
@@ -85,5 +89,5 @@ private:
    void initFields();
    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
@@ -42,4 +42,6 @@
 #include <opie2/opimrecurrence.h>
+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
@@ -34,7 +34,11 @@
 #include <opie2/otodoaccessbackend.h>
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 namespace Opie {
@@ -72,12 +76,12 @@ private:
    void fillDict();
    inline bool date( QDate& date, const QString& )const;
-    inline OPimTodo todo( const OSQLResult& )const;
+    inline OPimTodo todo( const Opie::DB::OSQLResult& )const;
-    inline OPimTodo todo( OSQLResultItem& )const;
+    inline OPimTodo todo( Opie::DB::OSQLResultItem& )const;
-    inline QArray<int> uids( const OSQLResult& )const;
+    inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
    OPimTodo todo( int uid )const;
    QBitArray sup() const;
    QAsciiDict<int> m_dict;
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
    QArray<int> m_uids;
    bool m_dirty : 1;
diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiepim/core/backends/private/xmltree.cc
index 059791b..40749ca 100644
--- a/libopie2/opiecore/xmltree.cc
+++ b/libopie2/opiepim/core/backends/private/xmltree.cc
@@ -18,5 +18,5 @@
 */
-#include <opie2/xmltree.h>
+#include "xmltree.h"
 #include <qpe/stringutil.h>
@@ -26,5 +26,5 @@
 #include <assert.h>
-using namespace Opie;
+using namespace Opie::Pim::Private;
 XMLElement::XMLElement()
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
@@ -26,6 +26,7 @@
 #include <qtextstream.h>
-namespace Opie
+namespace Opie {
-{
+namespace Pim  {
+namespace Private{
 /**
@@ -115,4 +116,6 @@ 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
@@ -7,6 +7,7 @@
 class QWidget;
-namespace Opie
+namespace Opie {
-{
+namespace Ui  {
+namespace Private{
 struct OSplitterContainer
@@ -24,5 +25,7 @@ struct OSplitterContainer
 };
-};
+}
+}
+}
 #endif
diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index 89f3793..bcfd3a6 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -36,5 +36,6 @@
 #include <qvbox.h>
-using namespace Opie;
+using namespace Opie::Ui;
+using namespace Opie::Ui::Private;
 /**
@@ -169,5 +170,5 @@ void OSplitter::addWidget( OSplitter* split )
    else
    {
-        Opie::OSplitterContainer con;
+        OSplitterContainer con;
        con.widget =split;
        addToBox( con );
@@ -214,5 +215,5 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
    }
 #endif
-    Opie::OSplitterContainer cont;
+    OSplitterContainer cont;
    cont.widget = wid;
    cont.icon =icon;
@@ -397,5 +398,5 @@ void OSplitter::resizeEvent( QResizeEvent* res )
 * or our own
 */
-void OSplitter::addToTab( const Opie::OSplitterContainer& con )
+void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
 {
    QWidget *wid = con.widget;
@@ -411,5 +412,5 @@ void OSplitter::addToTab( const Opie::OSplitterContainer& con )
 * adds a container to the box
 */
-void OSplitter::addToBox( const Opie::OSplitterContainer& con )
+void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con )
 {
    QWidget* wid = con.widget;
@@ -546,5 +547,5 @@ void OSplitter::commonChangeBox()
        /* tell them the world had changed */
        split->setTabWidget( 0 );
-        Opie::OSplitterContainer con;
+        OSplitterContainer con;
        con.widget = split;
        //        con.widget = split->m_tabWidget ? static_cast<QWidget*>(split->m_tabWidget)
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
@@ -24,5 +24,5 @@
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
- 
 */
@@ -49,6 +49,6 @@ class QHBox;
 */
-namespace Opie
+namespace Opie{
-{
+namespace Ui  {
 class OTabWidget;
@@ -74,5 +74,5 @@ class OSplitter : public QFrame
    Q_OBJECT
 public:
-    typedef QValueList<Opie::OSplitterContainer> ContainerList;
+    typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList;
    OSplitter( Qt::Orientation = Horizontal,  QWidget *parent = 0,
               const char* name = 0, WFlags fl = 0 );
@@ -125,6 +125,6 @@ private:
    //    void reparentAll();
    void setTabWidget( OTabWidget*);
-    void addToTab( const Opie::OSplitterContainer& );
+    void addToTab( const Opie::Ui::Private::OSplitterContainer& );
-    void addToBox( const Opie::OSplitterContainer& );
+    void addToBox( const Opie::Ui::Private::OSplitterContainer& );
    void removeFromTab( QWidget* );
    void changeTab();
@@ -146,5 +146,6 @@ private:
    Private *d;
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp
index 57e97e3..a0a6355 100644
--- a/libopie2/opieui/big-screen/owidgetstack.cpp
+++ b/libopie2/opieui/big-screen/owidgetstack.cpp
@@ -33,9 +33,9 @@
 #include <qwidgetstack.h>
-namespace {
+namespace Opie {
+namespace Ui   {
    const int mode_size = 330;
-}
-using namespace Opie;
 /**
@@ -434,2 +434,5 @@ void OWidgetStack::switchTop() {
    m_stack = 0;
 }
+}
+}
+\ No newline at end of file
diff --git a/libopie2/opieui/big-screen/owidgetstack.h b/libopie2/opieui/big-screen/owidgetstack.h
index 53818c8..d2f9a9f 100644
--- a/libopie2/opieui/big-screen/owidgetstack.h
+++ b/libopie2/opieui/big-screen/owidgetstack.h
@@ -36,6 +36,6 @@
 class QWidgetStack;
-namespace Opie
+namespace Opie {
-{
+namespace Ui {
 /**
 *
@@ -128,5 +128,6 @@ private:
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index e7daead..beb4d6c 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -40,5 +40,5 @@
 #include <qlayout.h>
-using namespace Opie;
+using namespace Opie::Ui;
 namespace
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
@@ -36,6 +36,6 @@
 #include <qdialog.h>
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
 /**
@@ -105,5 +105,6 @@ private slots:
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 15cadd4..c4d5033 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -56,6 +56,9 @@
 #include <qobjectlist.h>
-using namespace Opie;
+using namespace Opie::Ui::Private;
+namespace Opie {
+namespace Ui   {
+namespace Private {
 OFileViewInterface::OFileViewInterface( OFileSelector* selector )
        : m_selector( selector )
@@ -811,4 +814,6 @@ void OFileViewFileSystem::activate( const QString& str)
 }
+}
 /* Selector */
 /**
@@ -1165,2 +1170,4 @@ 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
@@ -53,9 +53,11 @@ class QHBox;
 typedef QMap<QString, QStringList> MimeTypes;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 class OFileViewInterface;
 class OFileViewFileListView;
+}
@@ -74,6 +76,6 @@ class OFileSelector : public QWidget
 {
    Q_OBJECT
-    friend class Opie::OFileViewInterface;
+    friend class Private::OFileViewInterface;
-    friend class Opie::OFileViewFileListView;
+    friend class Private::OFileViewFileListView;
 public:
@@ -186,11 +188,11 @@ private:
    QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType
    QWidgetStack* m_stack;  // our widget stack which will contain the views
-    OFileViewInterface* currentView() const; // returns the currentView
+    Private::OFileViewInterface* currentView() const; // returns the currentView
-    OFileViewInterface* m_current; // here is the view saved
+    Private::OFileViewInterface* m_current; // here is the view saved
    bool m_shNew   : 1; // should we show New?
    bool m_shClose : 1; // should we show Close?
    MimeTypes m_mimeType; // list of mimetypes
-    QMap<QString, OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+    QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
    QHBox* m_nameBox; // the LineEdit + Label is hold here
    QHBox* m_cmbBox; // this holds the two combo boxes
@@ -215,5 +217,6 @@ private slots:
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h
index 818ced9..376dc98 100644
--- a/libopie2/opieui/fileselector/ofileselector_p.h
+++ b/libopie2/opieui/fileselector/ofileselector_p.h
@@ -57,8 +57,8 @@ class QFileInfo;
 class QToolButton;
-namespace Opie
+namespace Opie{
-{
+namespace Ui{
 class OFileSelector;
+namespace Private {
 class OFileViewInterface
@@ -187,5 +187,7 @@ private:
 };
-};
+}
+}
+}
 #endif
diff --git a/libopie2/opieui/fileselector/ofileview.h b/libopie2/opieui/fileselector/ofileview.h
index 495401b..aaf56b1 100644
--- a/libopie2/opieui/fileselector/ofileview.h
+++ b/libopie2/opieui/fileselector/ofileview.h
@@ -38,6 +38,7 @@ class QDir;
 class DocLnk;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 /**
@@ -91,5 +92,7 @@ public:
 };
-};
+}
+}
+}
 #endif
diff --git a/libopie2/opieui/oclickablelabel.cpp b/libopie2/opieui/oclickablelabel.cpp
index 4c4e581..53cb77a 100644
--- a/libopie2/opieui/oclickablelabel.cpp
+++ b/libopie2/opieui/oclickablelabel.cpp
@@ -30,5 +30,5 @@
 #include <opie2/oclickablelabel.h>
-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
@@ -34,6 +34,6 @@
 #include <qlabel.h>
-namespace Opie
+namespace Opie{
-{
+namespace Ui  {
 /**
@@ -99,5 +99,6 @@ private:
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/odialog.cpp b/libopie2/opieui/odialog.cpp
index 4d269d4..27f8d20 100644
--- a/libopie2/opieui/odialog.cpp
+++ b/libopie2/opieui/odialog.cpp
@@ -33,4 +33,6 @@
 #warning Make Margin and Spacing device dependend and configurable!
+using namespace Opie::Ui;
 int ODialog::mMarginSize = 5;
 int ODialog::mSpacingSize = 2;
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
@@ -56,4 +56,7 @@ class QLayoutItem;
 // and I believe that maintaining a patch against QtE is more work than our classes -mml
+namespace Opie {
+namespace Ui   {
 class ODialog : public QDialog
 {
@@ -89,3 +92,5 @@ 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
@@ -39,8 +39,8 @@
 #include <qmultilineedit.h>
-using namespace Opie;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 class OFontSelectorPrivate
@@ -57,9 +57,4 @@ public:
 };
-};
-namespace
-{
 class FontListItem : public QListBoxText
 {
@@ -96,5 +91,11 @@ private:
    QString m_name;
 };
+}
+}
+}
+using namespace Opie::Ui;
+using namespace Opie::Ui::Private;
 static int findItemCB( QComboBox *box, const QString &str )
@@ -108,5 +109,4 @@ static int findItemCB( QComboBox *box, const QString &str )
 }
-}
 /* static same as anon. namespace */
 static int qt_version()
@@ -427,2 +427,3 @@ 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
@@ -36,8 +36,9 @@
 class QListBox;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
+namespace Private {
 class OFontSelectorPrivate;
+}
 /**
@@ -96,8 +97,9 @@ private:
 private:
-    OFontSelectorPrivate *d;
+    Private::OFontSelectorPrivate *d;
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp
index 9a58bb9..be47eb2 100644
--- a/libopie2/opieui/oimageeffect.cpp
+++ b/libopie2/opieui/oimageeffect.cpp
@@ -42,4 +42,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace std;
+using namespace Opie::Core;
+namespace Opie {
+namespace Ui   {
 inline unsigned int intensityValue(unsigned int color)
@@ -3766,3 +3770,4 @@ 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
@@ -40,4 +40,6 @@ class QSize;
 class QColor;
+namespace Opie {
+namespace Ui   {
 /**
 * This class includes various @ref QImage based graphical effects.
@@ -557,3 +559,6 @@ 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
@@ -37,4 +37,9 @@
 #include <opie2/olistview.h>
+using namespace Opie::Core;
+namespace Opie {
+namespace Ui   {
 /*======================================================================================
 * OListView
@@ -756,2 +761,4 @@ 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
@@ -37,4 +37,7 @@
 #include <qstringlist.h>
+namespace Opie {
+namespace Ui   {
 class OListViewItem;
@@ -55,4 +58,5 @@ class OListViewItem;
 class OListView: public QListView
 {
+    Q_OBJECT
  public:
   /**
@@ -140,6 +144,8 @@ class OListView: public QListView
  private:
    QColor m_alternateBackground;
-    bool m_fullWidth;
+    bool m_fullWidth : 1;
    QPen m_columnSeparator;
+    class Private;
+    Private *d;
 };
@@ -243,6 +249,8 @@ class OListViewItem: public QListViewItem
  private:
-    bool m_known;
+    bool m_known : 1;
-    bool m_odd;
+    bool m_odd   : 1;
+    class Private;
+    Private *d;
 };
@@ -355,4 +363,7 @@ class ONamedListView: public OListView
    virtual ONamedListViewItem* find( ONamedListViewItem* start, const QString& column, const QString& text, int recurse = -1 ) const;
    virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
+  private:
+    class Private;
+    Private *d;
 };
@@ -404,6 +415,12 @@ class ONamedListViewItem: public OListViewItem
    virtual ONamedListViewItem* find( int column, const QString& text, int recurse = -1 ) const;
    virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const;
-};
+  private:
+    class Private;
+    Private *d;
+};
+}
+}
 #endif // OLISTVIEW_H
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 1be8db5..e895edc 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -7,9 +7,7 @@ HEADERS     = oclickablelabel.h      \
              oimageeffect.h         \
              olistview.h            \
-              omessagebox.h          \
              opixmapeffect.h        \
              opopupmenu.h           \
              opixmapprovider.h      \
-              oresource.h            \
              oselector.h            \
              oseparator.h           \
@@ -32,5 +30,4 @@ SOURCES     = oclickablelabel.cpp    \
              opopupmenu.cpp         \
              opixmapprovider.cpp    \
-              oresource.cpp          \
              oselector.cpp          \
              oseparator.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
@@ -18,4 +18,6 @@
 #include <opie2/oimageeffect.h>
+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
@@ -16,4 +16,7 @@ typedef QPixmap OPixmap;
 class QColor;
+namespace Opie {
+namespace Ui   {
 /**
 * This class includes various pixmap-based graphical effects.
@@ -211,5 +214,6 @@ public:
    static OPixmap selectedPixmap( const OPixmap &pixmap, const QColor &col );
 };
+}
+}
 #endif
diff --git a/libopie2/opieui/opixmapprovider.cpp b/libopie2/opieui/opixmapprovider.cpp
index 7be9e3b..7eb67a2 100644
--- a/libopie2/opieui/opixmapprovider.cpp
+++ b/libopie2/opieui/opixmapprovider.cpp
@@ -21,4 +21,6 @@
 #include <opie2/opixmapprovider.h>
+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
@@ -24,5 +24,8 @@
 #include <qpixmap.h>
+namespace Opie {
+namespace Ui   {
 /**
+ * \todo make usefull
 * A tiny abstract class with just one method:
 * @ref pixmapFor()
@@ -49,6 +52,11 @@ public:
 protected:
    virtual void virtual_hook( int id, void* data );
+private:
+    class Private;
+    Private *d;    
 };
+}
+}
 #endif // OPIXMAPPROVIDER_H
diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp
index d5cc575..3ab8490 100644
--- a/libopie2/opieui/opopupmenu.cpp
+++ b/libopie2/opieui/opopupmenu.cpp
@@ -28,4 +28,7 @@
 #include <opie2/oconfig.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 OPopupTitle::OPopupTitle(QWidget *parent, const char *name)
    : QWidget(parent, 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
@@ -32,4 +32,6 @@
 #include <opie2/opixmapeffect.h>
+namespace Opie {
+namespace Ui   {
 /**
 * Title widget for use in @ref OPopupMenu.
@@ -257,3 +259,6 @@ 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
@@ -37,4 +37,6 @@
 */
+using namespace Opie::Ui;
 OXYSelector::OXYSelector( QWidget *parent, const char *name )
        : QWidget( parent, name )
@@ -74,5 +76,5 @@ void OXYSelector::setValues( int _xPos, int _yPos )
        else if ( xPos < minX )
                xPos = minX;
-        
        if ( yPos > maxY )
                yPos = maxY;
@@ -259,5 +261,5 @@ void OSelector::paintEvent( QPaintEvent * )
        QPoint pos = calcArrowPos( value() );
-        drawArrow( &painter, TRUE, pos );   
+        drawArrow( &painter, TRUE, pos );
        painter.end();
@@ -289,8 +291,8 @@ 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 );
        painter.end();
@@ -362,6 +364,6 @@ void OSelector::drawArrow( QPainter *painter, bool show, const QPoint &pos )
    painter->drawPolygon( array );
-  } 
+  }
-  else 
+  else
  {
    if ( orientation() == Vertical )
@@ -401,5 +403,5 @@ void OGradientSelector::init()
    color1.setRgb( 0, 0, 0 );
    color2.setRgb( 255, 255, 255 );
-    
    text1 = text2 = "";
 }
@@ -473,5 +475,5 @@ 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;
                pen.setColor( color1 );
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
@@ -28,4 +28,7 @@
 #include <qpixmap.h>
+namespace Opie {
+namespace Ui   {
 /**
 * OXYSelector is the base class for other widgets which
@@ -513,4 +516,6 @@ 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
@@ -37,4 +37,6 @@
 /* QT */
+using namespace Opie::Core;
+using namespace Opie::Ui;
 OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f)
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
@@ -36,4 +36,7 @@
 #include <qframe.h>
+namespace Opie {
+namespace Ui   {
 /**
 * Standard horizontal or vertical separator.
@@ -87,4 +90,6 @@ private:
 };
+}
+}
 #endif // OSEPARATOR_H
diff --git a/libopie2/opieui/otabbar.cpp b/libopie2/opieui/otabbar.cpp
index cd3a34b..a62e18b 100644
--- a/libopie2/opieui/otabbar.cpp
+++ b/libopie2/opieui/otabbar.cpp
@@ -32,5 +32,5 @@
 #include <opie2/otabbar.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OTabBar::OTabBar( QWidget *parent , const char *name  )
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
@@ -36,6 +36,6 @@
 #include <qtabbar.h>
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
 /**
@@ -81,5 +81,6 @@ private:
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/otabinfo.h b/libopie2/opieui/otabinfo.h
index 4a6ce14..426c45a 100644
--- a/libopie2/opieui/otabinfo.h
+++ b/libopie2/opieui/otabinfo.h
@@ -39,6 +39,6 @@
 class QWidget;
-namespace Opie
+namespace Opie{
-{
+namespace Ui  {
 /**
@@ -136,5 +136,6 @@ private:
 typedef QList<OTabInfo> OTabInfoList;
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp
index f47c90b..a9f7da9 100644
--- a/libopie2/opieui/otabwidget.cpp
+++ b/libopie2/opieui/otabwidget.cpp
@@ -42,5 +42,5 @@
 #include <qwidgetstack.h>
-using namespace Opie;
+using namespace Opie::Ui;
 OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p )
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
@@ -39,5 +39,4 @@
 #include <qlist.h>
-using namespace Opie;
 class QComboBox;
@@ -46,6 +45,6 @@ class QTabBar;
 class QWidgetStack;
-namespace Opie
+namespace Opie {
-{
+namespace Ui   {
 class OTabBar;
@@ -288,5 +287,6 @@ private:
 };
-};
+}
+}
 #endif
diff --git a/libopie2/opieui/otaskbarapplet.cpp b/libopie2/opieui/otaskbarapplet.cpp
index a67356d..b5268f0 100644
--- a/libopie2/opieui/otaskbarapplet.cpp
+++ b/libopie2/opieui/otaskbarapplet.cpp
@@ -29,4 +29,54 @@
 */
+#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
@@ -34,9 +34,18 @@
 #include <qpe/taskbarappletinterface.h>
+#include <qpe/qcom.h>
+#include <qwidget.h>
+class QMouseEvent;
+namespace Opie {
+namespace Ui   {
+namespace Private {
 /*======================================================================================
 * OTaskbarAppletWrapper
 *======================================================================================*/
+class OTaskbarAppletWrapperPrivate;
 template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
 {
@@ -81,12 +90,8 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
  private:
    T* _applet;
+    OTaskbarAppletWrapperPrivate *d;
 };
-#include <qframe.h>
+}
-#include <qwidget.h>
-#include <qpe/qpeapplication.h>
-class QMouseEvent;
 /*======================================================================================
 * OTaskbarApplet
@@ -104,26 +109,20 @@ class OTaskbarApplet : public QWidget
 {
  public:
-    OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name )
+    OTaskbarApplet( QWidget* parent, const char* name = 0 );
-    {
+    virtual ~OTaskbarApplet();
-        setFixedHeight( 18 );
-        setFixedWidth( 14 );
-    }
-    virtual ~OTaskbarApplet()
-    {
-    }
  protected:
-    virtual void popup( QWidget* widget )
+    virtual void popup( QWidget* widget );
-    {
+private:
-        QPoint curPos = mapToGlobal( QPoint( 0, 0 ) );
+    class Private;
-        int w = widget->sizeHint().width();
+    Private *d;
-        int x = curPos.x() - (w/2 );
-        if ( (x+w) > QPEApplication::desktop()->width() )
-            x = QPEApplication::desktop()->width()-w;
-        widget->move( x, curPos.y()-widget->sizeHint().height() );
-        widget->show();
-    }
 };
+}
+}
+#define EXPORT_OPIE_APPLET_v1(  AppLet ) \
+    Q_EXPORT_INTERFACE() { \
+    Q_CREATE_INSTANCE(  Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \
+    }
 #endif
diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp
index 66f9ce0..7de0fd3 100644
--- a/libopie2/opieui/otimepicker.cpp
+++ b/libopie2/opieui/otimepicker.cpp
@@ -28,12 +28,16 @@
 */
+/* OPIE */
+#include <opie2/otimepicker.h>
 /* QT */
+#include <qgroupbox.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-/* OPIE */
-#include <opie2/otimepicker.h>
-using namespace Opie;
+namespace Opie {
+namespace Ui {
 /**
@@ -221,4 +225,6 @@ OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags
        : OTimePickerDialogBase (parent , name, true , fl)
 {
+    m_timePicker = new OTimePicker(  GroupBox1, "m_timePicker" );
+    GroupBox1Layout->addWidget( m_timePicker, 0, 0 );
    connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ),
@@ -291,2 +297,5 @@ 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
@@ -33,5 +33,5 @@
 /* OPIE */
 #include <opie2/oclickablelabel.h>
-#include "otimepickerbase.h"
+#include <opie2/otimepickerbase.h>
 /* QT */
@@ -41,8 +41,7 @@
 #include <qdialog.h>
-using namespace Opie;
-// namespace Opie
+namespace Opie {
-// {
+namespace Ui   {
 /**
@@ -57,5 +56,5 @@ using namespace Opie;
 * @author Hakan Ardo, Stefan Eilers
 */
-class OTimePicker: public QWidget
+class OTimePicker : public QWidget
 {
    Q_OBJECT
@@ -115,4 +114,5 @@ public slots:
 private:
+    OTimePicker *m_timePicker;
    QTime m_time;
    class Private;
@@ -120,6 +120,13 @@ 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
@@ -12,5 +12,5 @@
            <x>0</x>
            <y>0</y>
-            <width>210</width>
+            <width>182</width>
            <height>137</height>
        </rect>
@@ -250,43 +250,7 @@
                    <number>6</number>
                </property>
-                <widget row="0"  column="0" >
-                    <class>OTimePicker</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>m_timePicker</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>3</vsizetype>
-                        </sizepolicy>
-                    </property>
-                </widget>
            </grid>
        </widget>
    </vbox>
 </widget>
-<customwidgets>
-    <customwidget>
-        <class>OTimePicker</class>
-        <header location="local">otimepicker.h</header>
-        <sizehint>
-            <width>-1</width>
-            <height>-1</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>7</hordata>
-            <verdata>1</verdata>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data>
-    </image>
-</images>
 </UI>
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 78154b7..f6c6410 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -41,4 +41,7 @@
 #include <qpopupmenu.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 /* XPM */
 static const char * view_icon_xpm[] = {
@@ -133,5 +136,5 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
    _iconview->setGridY( 42 );
    _iconview->setAutoArrange( true );
-    
    #ifdef QWS  // TODO: Let this depend on current geometry (rotation)
    _iconview->setArrangement( QIconView::TopToBottom );
@@ -139,7 +142,7 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
    _iconview->setArrangement( QIconView::LeftToRight );
    #endif
-    
    _iconview->setResizeMode( QIconView::Adjust );
-    
    // qt-embedded: map stylus right on hold to right button press
@@ -169,5 +172,5 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
    connect( a1, SIGNAL( activated() ), this, SLOT( setIconViewMode() ) );
    connect( a2, SIGNAL( activated() ), this, SLOT( setTreeViewMode() ) );
-    
    #if (QT_VERSION >= 0x030000)
    connect( _listview, SIGNAL( contextMenuRequested(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
@@ -177,5 +180,5 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
    connect( _iconview, SIGNAL( rightButtonPressed(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
    #endif
-        
    //
    // signal forwarders
@@ -186,38 +189,38 @@ 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*) ) );
    connect( _listview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
    // common signals for iconview
-    
    connect( _iconview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
    connect( _iconview, SIGNAL( selectionChanged(QIconViewItem*) ), this, SLOT( selectionChanged(QIconViewItem*) ) );
-    connect( _iconview, SIGNAL( currentChanged(QIconViewItem*) ), this, SLOT( currentChanged(QIconViewItem*) ) );   
+    connect( _iconview, SIGNAL( currentChanged(QIconViewItem*) ), this, SLOT( currentChanged(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( clicked(QIconViewItem*) ), this, SLOT( clicked(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( pressed(QIconViewItem*) ), this, SLOT( pressed(QIconViewItem*) ) );
-    
    connect( _iconview, SIGNAL( doubleClicked(QIconViewItem*) ), this, SLOT( doubleClicked(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( returnPressed(QIconViewItem*) ), this, SLOT( returnPressed(QIconViewItem*) ) );
-    
    connect( _iconview, SIGNAL( onItem(QIconViewItem*) ), this, SLOT( onItem(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
-    
    // listview only signals
-    
    connect( _listview, SIGNAL( expanded(QListViewItem*) ), this, SLOT( expanded(QListViewItem*) ) );
    connect( _listview, SIGNAL( collapsed(QListViewItem*) ), this, SLOT( collapsed(QListViewItem*) ) );
-    
    // iconview only signals
-    
    connect( _iconview, SIGNAL( moved() ), this, SIGNAL( moved() ) );
 }
@@ -421,5 +424,5 @@ void OVersatileView::returnPressed( QListViewItem * item )
    emit( returnPressed( static_cast<OVersatileViewItem*>( item ) ) );
 }
-  
 void OVersatileView::returnPressed( QIconViewItem * item )
 {
@@ -454,5 +457,5 @@ void OVersatileView::collapsed( QListViewItem *item ) // QListView
 // OVersatileView Case I - API only existing in QListView or QIconView but not in both!
 //==============================================================================================//
-    
 int OVersatileView::treeStepSize() const  // QListView
 {
@@ -746,5 +749,5 @@ void OVersatileView::triggerUpdate()  // QListView
 // only in QIconView
 //
-    
 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
@@ -46,5 +46,4 @@ class QHeader;
 class QIconSet;
 class QIconViewItem;
-class OListView;
 class QListViewItem;
 class QPopupMenu;
@@ -55,8 +54,12 @@ class QIconDragItem;
 #endif
+namespace Opie {
+namespace Ui   {
+class OListView;
 class OVersatileView : public QWidgetStack
 {
  Q_OBJECT
-  
  friend class OVersatileViewItem;
@@ -70,21 +73,21 @@ 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:
    void setViewMode( int mode );
@@ -95,13 +98,13 @@ class OVersatileView : public QWidgetStack
    virtual bool isValidViewMode( int mode ) const;
    virtual void popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col = 0 );
-  
  private:
    int _viewmode;
    bool _synchronization;
    mutable int _warningpolicy;
-    
    OListView* _listview;
    QIconView* _iconview;
-    
    QPixmap _treeleaf;
    QPixmap _treeopened;
@@ -111,17 +114,17 @@ class OVersatileView : public QWidgetStack
    QPixmap _iconopened;
    QPixmap _iconclosed;
-    
    QPopupMenu* _contextmenu;
-    
    int _iconstyle;
    int _treestyle;
-  
  private slots:
-      
    void contextMenuRequested( QListViewItem*, const QPoint&, int );
    void contextMenuRequested( QIconViewItem*, const QPoint& );
    // type converting signal forwarders
-    
    void selectionChanged( QListViewItem * );
    void currentChanged( QListViewItem * );
@@ -131,5 +134,5 @@ class OVersatileView : public QWidgetStack
    void returnPressed( QListViewItem * );
    void onItem( QListViewItem * );
-    
    void selectionChanged( QIconViewItem * );
    void currentChanged( QIconViewItem * );
@@ -139,12 +142,12 @@ class OVersatileView : public QWidgetStack
    void returnPressed( QIconViewItem * );
    void onItem( QIconViewItem * );
-    
    void expanded( QListViewItem * item ); // QListView
    void collapsed( QListViewItem * item ); // QListView
  signals:
-    
    void contextMenuRequested( OVersatileViewItem * item, const QPoint& pos, int col );
-    
    /*#ifndef QT_NO_DRAGANDDROP
    void dropped( QDropEvent *e, const QValueList<QIconDragItem> &lst );  // QIconView
@@ -174,9 +177,9 @@ public:
    };
    */
-    
    //
    // only in QListView
    //
-    
    int treeStepSize() const;  // QListView
    virtual void setTreeStepSize( int );  // QListView
@@ -227,5 +230,5 @@ public:
    void setShowSortIndicator( bool show );  // QListView
    bool showSortIndicator() const;  // QListView
-    
    int index( const OVersatileViewItem *item ) const;  // QIconView
@@ -241,7 +244,7 @@ public:
    //
-  public:    
+  public:
    uint count() const;  // QIconView
-    
    OVersatileViewItem *firstItem() const;  // QIconView
    OVersatileViewItem *lastItem() const;  // QIconView
@@ -288,5 +291,5 @@ public:
    virtual void arrangeItemsInGrid( bool update = TRUE );  // QIconView
    virtual void updateContents();  // QIconView
-  
  signals:
    /*#ifndef QT_NO_DRAGANDDROP
@@ -323,5 +326,5 @@ public:
    virtual void clearSelection();
    virtual void invertSelection();
-  
    void ensureItemVisible( const OVersatileViewItem * );
    virtual void repaintItem( const OVersatileViewItem * ) const;
@@ -345,14 +348,14 @@ public:
    void doubleClicked( OVersatileViewItem * );
    void returnPressed( OVersatileViewItem * );
-  
    void onItem( OVersatileViewItem * );
    void onViewport();
-  
  //==============================================================================================//
  // "Derived" API - Case 2: Methods existing in QListView and QIconView with differing signatures
  //==============================================================================================//
-  
  /*
-  
  public:
    virtual void insertItem( OVersatileViewItem * );  // QListView
@@ -369,21 +372,21 @@ public:
  */
-  
  signals:
    void clicked( OVersatileViewItem *, const QPoint &, int );  // QListView
    void clicked( OVersatileViewItem *, const QPoint & );  // QIconView
-    
    void pressed( OVersatileViewItem *, const QPoint &, int );  // QListView
    void pressed( OVersatileViewItem *, const QPoint & );  // QIconView
-    
    void rightButtonClicked( OVersatileViewItem* item, const QPoint& pos );  // QIconView
    void rightButtonClicked( OVersatileViewItem *, const QPoint&, int );  // QListView
-    
-    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView   
+    void rightButtonPressed( OVersatileViewItem* item, const QPoint& pos );  // QIconView
    void rightButtonPressed( OVersatileViewItem *, const QPoint&, int );  // QListView
-    
    void mouseButtonPressed( int, OVersatileViewItem *, const QPoint& , int );  // QListView
    void mouseButtonPressed( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
-    
    void mouseButtonClicked( int, OVersatileViewItem *,  const QPoint&, int );  // QListView
    void mouseButtonClicked( int button, OVersatileViewItem* item, const QPoint& pos );  // QIconView
@@ -391,4 +394,6 @@ 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
@@ -32,4 +32,6 @@
 #include <opie2/oversatileview.h>
+using namespace Opie::Ui;
 OVersatileViewItem::OVersatileViewItem( OVersatileView * parent )
              :OListViewItem( parent->_listview ), QIconViewItem( parent->_iconview ),
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
@@ -41,4 +41,7 @@
 #include <opie2/olistview.h>
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
@@ -98,3 +101,5 @@ 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
@@ -39,4 +39,6 @@
 #include <qpainter.h>
+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
@@ -38,4 +38,7 @@
 #include <qtimer.h>
+namespace Opie {
+namespace Ui   {
 /**
 * This class displays a animated waiting icon in the middle of the screen.
@@ -83,4 +86,5 @@ class OWait : public QDialog
    Private *d;
 };
+}
+}
 #endif