1 files changed, 11 insertions, 9 deletions

diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h
index e5ed66f..a5ea9f5 100644
--- a/core/pim/todo/todoview.h
+++ b/core/pim/todo/todoview.h
@@ -25,28 +25,30 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef TODO_VIEW_H
 #define TODO_VIEW_H
 
 #include <qarray.h>
 #include <qstring.h>
 #include <qvaluelist.h>
 #include <qwidget.h>
 
-#include <opie/otodoaccess.h>
+#include <opie2/otodoaccess.h>
 
 #include "smalltodo.h"
 
+using Opie::OPimTodo;
+using Opie::OPimTodoAccess;
 
 namespace Todo {
     class MainWindow;
 
     /**
      * due to inheretince problems we need this base class
      */
     struct ViewBase {
     public:
         virtual QWidget* widget() = 0;
         virtual QString type()const = 0;
         virtual int current() = 0;
@@ -59,26 +61,26 @@ namespace Todo {
         virtual int next()  = 0;
 
         /**
          * the previous record or 0 if none is there..
          */
         virtual int prev()  = 0;
 
         /*
          * update the view
          */
         virtual void updateView() = 0;
 
-        virtual void addEvent( const OTodo& ) = 0;
-        virtual void replaceEvent( const OTodo& ) = 0;
+        virtual void addEvent( const OPimTodo& ) = 0;
+        virtual void replaceEvent( const OPimTodo& ) = 0;
         virtual void removeEvent( int uid ) = 0;
         virtual void setShowCompleted( bool ) = 0;
         virtual void setShowDeadline( bool ) = 0;
         virtual void setShowCategory( const QString& = QString::null ) = 0;
         virtual void clear() = 0;
         virtual void newDay() = 0;
     };
 
     /**
      * A base class for all TodoView which are showing
      * a list of todos.
      * Either in a QTable, QListView or any other QWidget
@@ -95,42 +97,42 @@ namespace Todo {
         /**
          * c'tor
          */
         TodoView( MainWindow* win );
 
         /**
          *d'tor
          */
         virtual ~TodoView();
 
     protected:
         MainWindow* todoWindow();
-        OTodo event(int uid );
-        OTodoAccess::List list();
-        OTodoAccess::List sorted()const;
+        OPimTodo event(int uid );
+        OPimTodoAccess::List list();
+        OPimTodoAccess::List sorted()const;
         void sort();
         void sort(int sort );
         void setSortOrder( int order );
         void setAscending( bool );
 
         /*
          * These things needs to be implemented
          * in a implementation
          */
         void showTodo( int uid );
         void edit( int uid );
         void update(int uid, const SmallTodo& to );
-        void update(int uid, const OTodo& ev);
+        void update(int uid, const OPimTodo& ev);
         void remove( int uid );
         /* will ask the user if the item should be deleted */
         void removeQuery(int uid );
         void complete( int uid );
-        void complete( const OTodo& ev );
+        void complete( const OPimTodo& ev );
     private:
         MainWindow *m_main;
-        OTodoAccess::List m_sort;
+        OPimTodoAccess::List m_sort;
         bool m_asc : 1;
         int m_sortOrder;
     };
 };
 
 #endif