5 files changed, 28 insertions, 17 deletions
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 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;
 
 };