Move XML class to internal PIM

Add namespaces!!!

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

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

25 files changed, 75 insertions, 42 deletions

diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
index a3f8e10..6712870 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
@@ -1,20 +1,22 @@
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <qpe/config.h>
 
+using namespace Opie::Core;
+
 int main( int argc, char** argv )
 {
     OApplication* app = new OApplication( argc, argv, "MyConfigDemoApplication" );
 
     OConfigGroupSaver c1( app->config(), "MyGroup" );
     app->config()->writeEntry( "AnEntry", "InMyGroup" );
     {
         OConfigGroupSaver c2( c1.config(), "AnotherGroup" );
         app->config()->writeEntry( "AnEntry", "InAnotherGroup" );
     }   // closing the scope returns to the last group
 
     app->config()->writeEntry( "AnotherEntry", "InMyGroup" );
 
     // do more stuff ...
 
     // in this (special) case it is necessary to manually call OConfig::write() (see below)
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
@@ -4,32 +4,34 @@
 #include <qhbox.h>
 #include <qvbuttongroup.h>
 #include <qhbuttongroup.h>
 #include <qlineedit.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 
 /* OPIE */
 
 #include <qpe/config.h>
 
 #include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 #include <opie2/oglobal.h>
 #include <opie2/oglobalsettings.h>
 
+using namespace Opie::Core;
+
 class DemoApp : public OApplication
 {
 Q_OBJECT
 public:
   DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 debug demo" )
   {
     // you have access to your OApplication object via oApp
     qDebug( "Process-wide OApplication object @ %0x", oApp );
 
     // you have access to global settings via OGlobalSettings
     int mode = OGlobalSettings::debugMode();
 
     QVBox* vbox = new QVBox();
     setMainWidget( vbox );
 
     g = new QVButtonGroup( "Output Strategy", vbox );
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,13 +1,15 @@
 #include <opie2/oglobalsettings.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace Opie::Core;
 
 int main( int argc, char** argv )
 {
     printf( "current debugmode seems to be '%d'\n", OGlobalSettings::debugMode() );
     printf( "output information for this mode is '%s'\n", (const char*) OGlobalSettings::debugOutput() );
 
     return 0;
 
 }
 
 //#include "moc/oconfigdemo.moc"
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,11 +1,13 @@
 #include <opie2/oprocess.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace Opie::Core;
 
 int main( int argc, char** argv )
 {
     printf( "my own PID seems to be '%d'\n", OProcess::processPID( "oprocessdemo" ) );
     printf( "the PID of process 'Mickey' seems to be '%d'\n\n", OProcess::processPID( "Mickey" ) );
 
     return 0;
 }
 
diff --git a/libopie2/examples/opiedb/sqltest/spaltenweise.cpp b/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
index 8790cdd..e1a4d5d 100644
--- a/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
+++ b/libopie2/examples/opiedb/sqltest/spaltenweise.cpp
@@ -1,23 +1,25 @@
 #include <qdir.h>
 
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
-#include "../osqlquery.h"
-#include "../osqldriver.h"
-#include "../osqlresult.h"
+#include <opie2/osqlmanager.h>
+#include <opie2/osqlquery.h>
+#include <opie2/osqldriver.h>
+#include <opie2/osqlresult.h>
+
+using namespace Opie::DB;
 
 int main( int argc,  char* argv[] ) {
 
     QPEApplication app( argc, argv );
     OSQLManager man;
     man.registerPath( QDir::currentDirPath() );
     OSQLBackEnd::ValueList list = man.queryBackEnd();
 
     OSQLDriver *driver = man.standard();
     qWarning("testmain" + driver->id() );
     driver->setUrl("/home/ich/spaltenweise");
     if ( driver->open() ) {
         qWarning("could open");
     }else
         qWarning("wasn't able to open");
     OSQLRawQuery *raw = new OSQLRawQuery("create table todolist("
diff --git a/libopie2/examples/opiedb/sqltest/spaltenweise.pro b/libopie2/examples/opiedb/sqltest/spaltenweise.pro
index f54fada..3cab802 100644
--- a/libopie2/examples/opiedb/sqltest/spaltenweise.pro
+++ b/libopie2/examples/opiedb/sqltest/spaltenweise.pro
@@ -1,13 +1,13 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= 
 SOURCES		= spaltenweise.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiesql
+LIBS            += -lqpe -lopiedb2
 TARGET		= spaltenweise
 
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiedb/sqltest/zeilenweise.cpp b/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
index e538c9f..2d11ac5 100644
--- a/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
+++ b/libopie2/examples/opiedb/sqltest/zeilenweise.cpp
@@ -1,23 +1,25 @@
 #include <qdir.h>
 
 #include <qpe/qpeapplication.h>
-#include "../osqlmanager.h"
-#include "../osqlquery.h"
-#include "../osqldriver.h"
-#include "../osqlresult.h"
+#include <opie2/osqlmanager.h>
+#include <opie2/osqlquery.h>
+#include <opie2/osqldriver.h>
+#include <opie2/osqlresult.h>
+
+using namespace Opie::DB;
 
 int main( int argc,  char* argv[] ) {
 
 QPEApplication app( argc, argv );
 OSQLManager man;
 man.registerPath( QDir::currentDirPath() );
 OSQLBackEnd::ValueList list = man.queryBackEnd();
 
 OSQLDriver *driver = man.standard();
  qWarning("testmain" + driver->id() );
  driver->setUrl("/home/ich/zeilenweise");
  if ( driver->open() ) {
      qWarning("could open");
  }else
      qWarning("wasn't able to open");
  OSQLRawQuery raw2("BEGIN TRANSACTION");      
diff --git a/libopie2/examples/opiedb/sqltest/zeilenweise.pro b/libopie2/examples/opiedb/sqltest/zeilenweise.pro
index e5cfcc7..6952921 100644
--- a/libopie2/examples/opiedb/sqltest/zeilenweise.pro
+++ b/libopie2/examples/opiedb/sqltest/zeilenweise.pro
@@ -1,13 +1,13 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= 
 SOURCES		= zeilenweise.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopiesql
+LIBS            += -lqpe -lopiedb2
 TARGET		= zeilenweise
 
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
index 79bf327..8d421fd 100644
--- a/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
+++ b/libopie2/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
@@ -1,18 +1,20 @@
 #include <opie2/osoundsystem.h>
 
+using namespace Opie::MM;
+
 int main( int argc, char** argv )
 {
     qDebug( "OPIE Sound System Demo" );
 
     OSoundSystem* sound = OSoundSystem::instance();
 
     OSoundSystem::CardIterator it = sound->iterator();
 /*
     while ( it.current() )
     {
         qDebug( "DEMO: OSoundSystem contains Interface '%s'", (const char*) it.current()->name() );
         ++it;
     }
 
 */
     OSoundCard* card = it.current();
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
@@ -1,27 +1,29 @@
 #include <qdict.h>
 #include <qsocketnotifier.h>
 #include <qstring.h>
 #include <opie2/onetwork.h>
 #include <qapplication.h>
 #include <opie2/opcap.h>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
+
+using namespace Opie::Net;
 //======================== Station help class ===============================
 
 class Station
 {
   public:
     Station( QString t, int c, bool w ) : type(t), channel(c), wep(w), beacons(1) {};
     ~Station() {};
 
     QString type;
     int channel;
     bool wep;
     int beacons;
 };
 
 QDict<Station> stations;
 
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index 4763316..4f8af60 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,22 +1,24 @@
 #include <opie2/onetwork.h>
 #include <opie2/ostation.h>
 #include <opie2/omanufacturerdb.h>
 
 #include <unistd.h>
 
+using namespace Opie::Net;
+
 int main( int argc, char** argv )
 {
     qDebug( "OPIE Network Demo" );
 
     ONetwork* net = ONetwork::instance();
 
     ONetwork::InterfaceIterator it = net->iterator();
 
     while ( it.current() )
     {
         qDebug( "DEMO: ONetwork contains Interface '%s'", (const char*) it.current()->name() );
         qDebug( "DEMO: Datalink code is '%d'", it.current()->dataLinkType() );
         qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString() );
         qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString(true) );
         qDebug( "DEMO: MAC Manufacturer seems to be '%s'", (const char*) it.current()->macAddress().manufacturer() );
         qDebug( "DEMO: Manufacturertest1 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "08:00:87" ) );
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
@@ -3,24 +3,27 @@
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "olistviewdemo.h"
 #include <opie2/oapplication.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Core;
+
 int main( int argc, char **argv )
 {
     OApplication a( argc, argv, "OListViewDemo" );
     OListViewDemo e;
     a.showMainWidget(&e);
     return a.exec();
 }
 
diff --git a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
index 5ba7b69..7834b3b 100644
--- a/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
+++ b/libopie2/examples/opieui/olistviewdemo/olistviewdemo.cpp
@@ -24,32 +24,34 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "olistviewdemo.h"
 #include <opie2/olistview.h>
 
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qlistview.h>
 
+using namespace Opie::Ui;
+
 OListViewDemo::OListViewDemo( QWidget* parent, const char* name, WFlags f )
                    :QVBox( parent, name, f )
 {
     lv = new ONamedListView( this );
     lv->setRootIsDecorated( true );
     lv->addColumns( QStringList::split( ' ', "Column1 Column2 Column3 Column4" ) );
 
     ONamedListViewItem* item = new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
     item->setText( "Column2", "ModifiedText" );
     item->setText( "Column5", "ThisColumnDoesNotExits" );
 
     new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
     new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
     new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Minni" ) );
     item = new ONamedListViewItem( lv, QStringList::split( ' ', "XXX YYY ZZZ ***" ) );
     new ONamedListViewItem( lv, QStringList::split( ' ', "Text1 Text2 Text3 Text4" ) );
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
@@ -31,21 +31,21 @@
 
 #ifndef OLISTVIEWDEMO_H
 #define OLISTVIEWDEMO_H
 
 #include <qvbox.h>
 #include <opie2/olistview.h>
 
 class OListViewDemo: public QVBox
 {
   Q_OBJECT
 
   public:
     OListViewDemo( QWidget* parent=0, const char* name=0, WFlags f=0 );
     virtual ~OListViewDemo();
 
   private:
-    ONamedListView* lv;
+    Opie::Ui::ONamedListView* lv;
 
 };
 
 #endif
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
index 7ba0f0d..4a1468d 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_example.cpp
@@ -1,29 +1,30 @@
 #include "osplitter_example.h"
 
 /* OPIE */
 
 #include <opie2/osplitter.h>
+#include <opie2/ofileselector.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
 
 /* QT*/
 #include <qdir.h>
 #include <qlayout.h>
 
-using namespace Opie;
+using namespace Opie::Ui;
 
 OPIE_EXPORT_APP( OApplicationFactory<OSplitterExample> )
 
 OSplitterExample::OSplitterExample( QWidget *w,const char* n,WFlags f )
     : QWidget( w, n, f ){
     QVBoxLayout * lay = new QVBoxLayout(this);
     OSplitter * splitter = new OSplitter( Horizontal, this );
     lay->addWidget( splitter );
     
     OFileSelector *selector = new OFileSelector( splitter, OFileSelector::FileSelector,
 						OFileSelector::Normal, QDir::homeDirPath(),
 						QString::null );
     splitter->addWidget( selector, "zoom", tr("Selector 1") );
     
     selector = new OFileSelector( splitter, OFileSelector::FileSelector, OFileSelector::Normal,
 				QDir::homeDirPath(), QString::null );
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
@@ -1,20 +1,19 @@
 /*
  * May be used, copied and modified wihtout any limitation 
  */
 
 #ifndef OSPlitter_EXAMPLE_H
 #define OSPlitter_EXAMPLE_H
 
 #include <qvbox.h>
-#include <opie2/ofileselector.h>
  
 class OSplitterExample : public QWidget {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("osplitter_example"); }
     OSplitterExample( QWidget *parent, const char* name, WFlags fl );
 
 };
 
 
 #endif
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
@@ -1,50 +1,52 @@
 
 #include <qstring.h>
 #include <qlabel.h>
 #include <qheader.h>
 #include <qlayout.h>
 
 #include <qpe/qpeapplication.h>
 
 #include <opie2/oapplicationfactory.h>
 #include "osplitter_mail.h"
 
+using namespace Opie::Ui;
+
 OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
 
 class Folder {
     int dummy;
 };
 
 // -----------------------------------------------------------------
 
 ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
     : QWidget( p, name, fl ) {
     qApp->installEventFilter( this );
     m_lstFolders.setAutoDelete( true );
     QHBoxLayout *lay = new QHBoxLayout(this);
 
     m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
     lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
-            this, SLOT(slotSizeChange(bool,const QSize&) ) );
+    connect(m_splitter, SIGNAL(sizeChanged(bool,Orientation) ),
+            this, SLOT(slotSizeChange(bool,Orientation) ) );
 
     m_overview = new QListView( m_splitter );
     m_overview->header()->setClickEnabled( FALSE );
     m_overview->addColumn( tr("Folder") );
-    m_overview->setMaximumWidth( 200 );
+//    m_overview->setMaximumWidth( 200 );
     m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
     m_splitter->setSizeChange( 300 );
 
     /* OSplitter starts with the small mode */
     m_messages = 0;
     m_message = m_attach  = 0;
 
     splitti = new OSplitter( Vertical, m_splitter, "Splitti2" );
     splitti->setSizeChange( 300 );
     splitti->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
 
     QLabel *lbl = new QLabel(splitti);
     lbl->setTextFormat ( Qt::RichText );
     lbl->setText("<br><br><b>Test Test  Test</b><br><br><p>Fooooo hjhh</p>");
 
     m_messages = new QListView( splitti );
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
@@ -3,51 +3,49 @@
  */
 
 /*
  * Header file for a more complete email client like
  * layout
  */
 
 #ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H
 #define OPIE_SPLITTER_MAIL_EXAMPLE_H
 
 #include <qwidget.h>
 #include <qlist.h>
 #include <qlistview.h>
 
 #include <opie2/osplitter.h>
 
-using Opie::OSplitter;
 
 class Folder;
 class QLabel;
 
-class OSplitter;
 class ListViews : public QWidget {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("osplitter-mail"); }
     ListViews( QWidget* parent, const char * name, WFlags fl );
     ~ListViews();
 
     bool eventFilter( QObject* , QEvent* );
 private:
     void initFolders();
     void initFolder( Folder *folder, unsigned int &count );
 
     QListView *m_messages, *m_overview;
     QLabel *m_message, *m_attach;
     QList<QListView> m_folders; // used in tab mode
     QList<Folder> m_lstFolders;
     bool m_mode : 1; // bitfield
-    OSplitter *m_splitter;
-    OSplitter *splitti;
+    Opie::Ui::OSplitter *m_splitter;
+    Opie::Ui::OSplitter *splitti;
     QListView *folder1;
 #if 0
 //private slots:
 //    void slotFolderChanged( QListViewItem* );
 //    void slotMessageChanged();
 //    void slotSizeChange( bool, const QSize& );
 #endif
 };
 
 #endif
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
@@ -4,26 +4,29 @@
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "opieuidemo.h"
 
 #include <opie2/oapplication.h>
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
 int main( int argc, char **argv )
 {
     OApplication a( argc, argv, "Opie UI Demo" );
     qDebug( "." );
     OpieUIDemo e;
     qDebug( "." );
     a.showMainWidget(&e);
     qDebug( "." );
     return a.exec();
 }
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
@@ -12,58 +12,56 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 // Qt
 
 #include <qcolor.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qvbox.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 // Qtopia
 
-#ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
-#endif
 
 // Opie
 
-#ifdef QWS
 #include <opie2/odevice.h>
-using namespace Opie;
-#endif
 
 #include <opie2/ocompletionbox.h>
 #include <opie2/olineedit.h>
 #include <opie2/ocombobox.h>
 #include <opie2/oeditlistbox.h>
 #include <opie2/oselector.h>
 #include <opie2/opopupmenu.h>
 
 #include <qtabwidget.h>
 #include "oversatileviewdemo.h"
 
 // Local
 
 #include "opieuidemo.h"
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
 enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector };
 
 OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl )
 {
 
     QMenuBar* mbar = this->menuBar();
     OPopupMenu* demo = new OPopupMenu( this );
     demo->setTitle( "Title" );
     demo->setItemParameter( demo->insertItem( "OCompletionBox", this, SLOT( demo(int) ) ), ocompletionbox );
     demo->setItemParameter( demo->insertItem( "OLineEdit", this, SLOT( demo(int) ) ), olineedit );
     demo->setItemParameter( demo->insertItem( "OComboBox", this, SLOT( demo(int) ) ), ocombobox );
     demo->setItemParameter( demo->insertItem( "OEditListBox", this, SLOT( demo(int) ) ), oeditlistbox );
     demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector );
     mbar->insertItem( "Demonstrate", demo );
 
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
@@ -5,52 +5,56 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef OPIEUIDEMO_H
 #define OPIEUIDEMO_H
 
 #include <qmainwindow.h>
 
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
+}
+}
 class QTabWidget;
 class QVBox;
 
 class OpieUIDemo : public QMainWindow {
     Q_OBJECT
 
 public:
 
     OpieUIDemo( QWidget* parent = 0, const char* name = 0, WFlags fl = WType_TopLevel );
     ~OpieUIDemo();
 
     void demoOCompletionBox();
     void demoOLineEdit();
     void demoOComboBox();
     void demoOEditListBox();
     void demoOSelector();
     
 public slots:
     void demo( int );
     void messageBox( const QString& text );
 
 protected:
     void build();
     void buildVV( QVBox* b );
     
 private:
     QTabWidget* main;
     
-    OVersatileView* vv;
+    Opie::Ui::OVersatileView* vv;
 
 };
 
 
 
 #endif
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
index 9db4e62..b6d59aa 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
@@ -25,32 +25,34 @@
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "oversatileviewdemo.h"
 #include <opie2/oversatileview.h>
 #include <opie2/oversatileviewitem.h>
 
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qlistview.h>
 
+using namespace Opie::Ui;
+
 OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlags f )
                    :QVBox( parent, name, f )
 {
     vv = new OVersatileView( this );
     
     vv->addColumn( "First" );
     vv->addColumn( "2nd" );
     vv->addColumn( "IIIrd" );
     
     QString counter;
     
     QPixmap leaf( "leaf.png" );
     QPixmap opened( "folder_opened.png" );
     QPixmap closed( "folder_closed.png" );
     
     QPixmap leaf32( "leaf32.png" );
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
@@ -21,53 +21,57 @@
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef OVERSATILEVIEWDEMO_H
 #define OVERSATILEVIEWDEMO_H
 
 #include <qvbox.h>
 
+namespace Opie {
+namespace Ui   {
 class OVersatileView;
 class OVersatileViewItem;
+}
+}
 
 class OVersatileViewDemo: public QVBox
 {
   Q_OBJECT
   
   public:
     OVersatileViewDemo( QWidget* parent=0, const char* name=0, WFlags f=0 );
     virtual ~OVersatileViewDemo();
 
   public slots:
     void selectionChanged();
-    void selectionChanged( OVersatileViewItem * );
-    void currentChanged( OVersatileViewItem * );
-    void clicked( OVersatileViewItem * );
-    void pressed( OVersatileViewItem * );
+    void selectionChanged( Opie::Ui::OVersatileViewItem * );
+    void currentChanged( Opie::Ui::OVersatileViewItem * );
+    void clicked( Opie::Ui::OVersatileViewItem * );
+    void pressed( OPie::Ui::OVersatileViewItem * );
 
-    void doubleClicked( OVersatileViewItem *item );
-    void returnPressed( OVersatileViewItem *item );
+    void doubleClicked( Opie::Ui::OVersatileViewItem *item );
+    void returnPressed( Opie::Ui::OVersatileViewItem *item );
   
-    void onItem( OVersatileViewItem *item );
+    void onItem( Opie::Ui::OVersatileViewItem *item );
     void onViewport();
 
-    void expanded( OVersatileViewItem *item );
-    void collapsed( OVersatileViewItem *item );
+    void expanded( Opie::Ui::OVersatileViewItem *item );
+    void collapsed( Opie::Ui::OVersatileViewItem *item );
     
     void moved();
 
-    void contextMenuRequested( OVersatileViewItem *item, const QPoint&, int col );
+    void contextMenuRequested( Opie::Ui::OVersatileViewItem *item, const QPoint&, int col );
     
   private:
-    OVersatileView* vv;
+    Opie::Ui::OVersatileView* vv;
 
 };
 
 #endif
diff --git a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
index b1c5e70..50cc11b 100644
--- a/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
+++ b/libopie2/examples/opieui/owidgetstack_example/owidgetstack_example.cpp
@@ -6,33 +6,33 @@
 
 /* OPIE */
 #include <opie2/oapplicationfactory.h>
 #include <opie2/owidgetstack.h>
 #include <qpe/resource.h>
 
 /* QT */
 #include <qaction.h>
 #include <qtoolbar.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qsignalmapper.h>
 
-using namespace Opie;
+using namespace Opie::Ui;
 
 OPIE_EXPORT_APP( OApplicationFactory<StackExample> )
 
 StackExample::StackExample( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl )
 {
     m_stack = new OWidgetStack( this );
     setCentralWidget( m_stack );
 
     /* nice Signal Mapper ;) */
     QSignalMapper *sm = new QSignalMapper(this);
     connect(sm, SIGNAL(mapped(int) ), m_stack, SLOT(raiseWidget(int)) );
 
     /* toolbar first but this should be known from the other examples */
     setToolBarsMovable( false );
 
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
@@ -1,28 +1,27 @@
 /*
  * You may use, modify and distribute this example without any limitation
  */
 
 #ifndef O_STACK_EXAMPLE_SIMPLE_H
 #define O_STACK_EXAMPLE_SIMPLE_H
 
 #include <qmainwindow.h>
 #include <opie2/owidgetstack.h>
 
-using namespace Opie;
 
 class StackExample : public QMainWindow {
     Q_OBJECT
 public:
     StackExample( QWidget* paren, const char* name, WFlags fl );
     ~StackExample();
     static QString appName() { return QString::fromLatin1("owidgetstack-example"); }
 
 protected:
     void closeEvent( QCloseEvent* e );
 private:
-    OWidgetStack* m_stack;
+    Opie::Ui::OWidgetStack* m_stack;
     QWidget* m_main;
 
 };
 
 #endif