1 files changed, 15 insertions, 11 deletions

diff --git a/examples/simple-pim/simple.h b/examples/simple-pim/simple.h
index bf9ede7..2a6e8ce 100644
--- a/examples/simple-pim/simple.h
+++ b/examples/simple-pim/simple.h
@@ -15,22 +15,26 @@
 
 
 
 #include <qmainwindow.h>  // from this class we will inherit
 #include <qlistview.h> // A ListView for our PIM records
 
-#include <opie/otodoaccess.h>
-#include <opie/odatebookaccess.h>
+#include <opie2/otodoaccess.h>
+#include <opie2/odatebookaccess.h>
 
 class QPushButton; // forward declaration to not include the header. This can save time when compiling
 class QAction;
 class PIMListView;
 class QDate;
 class QCopChannel;
+namespace Opie{
+namespace Ui  {
 class OWait;
 class OTabWidget;
+}
+}
 
 /*
  * A mainwindow is a special QWidget it helps layouting
  * toolbar, statusbar, menubar. Got dockable areas
  * So in one sentence it is a MainWindow :)
  */
@@ -47,28 +51,28 @@ private slots:
     void slotDesktopReceive( const QCString&, const QByteArray& );
     void slotLoad();
     void slotLoadForDay(int, int, int );
     void slotLoadForDay(const QDate&);
     void slotShow();
     void slotDate();
-    void slotShowRecord( const OPimRecord& );
+    void slotShowRecord( const Opie::OPimRecord& );
 
 private:
     void initUI();
     QAction *m_fire;
     QAction *m_dateAction;
-    OTabWidget* m_tab;
+    Opie::Ui::OTabWidget* m_tab;
 
-    OTodoAccess     m_tb;
-    ODateBookAccess m_db;
+    Opie::OPimTodoAccess     m_tb;
+    Opie::ODateBookAccess m_db;
     PIMListView    *m_todoView;
     PIMListView    *m_dateView;
 
     int m_synced; // a counter for synced objects..
     QCopChannel    *m_desktopChannel;
-    OWait          *m_loading;
+    Opie::Ui::OWait          *m_loading;
 };
 
 /*
  * Instead of the simple QWidgets we will design
  * a new widget based on a QListView
  * it should show either Todos or EffectiveEvents
@@ -77,19 +81,19 @@ class PIMListView :  public QListView {
     Q_OBJECT
 public:
     PIMListView( QWidget* parent, const char* name, WFlags fl= 0 );
     ~PIMListView();
 
 
-    void set( OTodoAccess::List );
-    void set( const OEffectiveEvent::ValueList& );
+    void set( Opie::OPimTodoAccess::List );
+    void set( const Opie::OEffectiveEvent::ValueList& );
     void showCurrentRecord();
 
 signals:
-    void showRecord( const OPimRecord& );
+    void showRecord( const Opie::OPimRecord& );
 
 private:
-    static QString makeString( const OEffectiveEvent& ev );
+    static QString makeString( const Opie::OEffectiveEvent& ev );
 
 };
 
 #endif