1 files changed, 20 insertions, 18 deletions

diff --git a/core/pim/todo/todomanager.h b/core/pim/todo/todomanager.h
index 8544277..865b47b 100644
--- a/core/pim/todo/todomanager.h
+++ b/core/pim/todo/todomanager.h
@@ -26,81 +26,83 @@
 
 */
 
 #ifndef OPIE_TODO_MANAGER_H
 #define OPIE_TODO_MANAGER_H
 
-#include <qarray.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <opie2/opimtodo.h>
+#include <opie2/otodoaccess.h>
 
 #include <qpe/categories.h>
 
-#include <opie/otodo.h>
-#include <opie/otodoaccess.h>
+#include <qarray.h>
+#include <qobject.h>
+#include <qstring.h>
 
 #include "smalltodo.h"
 
+using Opie::OPimTodo;
+using Opie::OPimTodoAccess;
 
 namespace Todo {
     class TodoManager : public QObject{
         Q_OBJECT
     public:
         bool isLoaded()const;
         void load();
         TodoManager(QObject* obj = 0);
         ~TodoManager();
 
         QStringList categories()/*const*/;
         int catId(const QString&);
-        OTodo event(int uid );
+        OPimTodo event(int uid );
 
         void updateList();
         /** returns the iterator sorted if set sorted*/
-        OTodoAccess::List list()const;
-        OTodoAccess::List sorted( bool asc, int so, int f,  int cat );
+        OPimTodoAccess::List list()const;
+        OPimTodoAccess::List sorted( bool asc, int so, int f,  int cat );
 
-        OTodoAccess::List::Iterator overDue();
-        OTodoAccess::List::Iterator fromTo( const QDate& start,
+        OPimTodoAccess::List::Iterator overDue();
+        OPimTodoAccess::List::Iterator fromTo( const QDate& start,
                                  const QDate& end );
-        OTodoAccess::List::Iterator query( const OTodo& ev, int query );
+        OPimTodoAccess::List::Iterator query( const OPimTodo& ev, int query );
 
         void setCategory( bool sort, int category = -1);
         void setShowOverDue(  bool show );
         void setSortOrder( int sortOrder );
         void setSortASC( bool );
         void sort();
 
-        OTodoAccess* todoDB();
+        OPimTodoAccess* todoDB();
         bool saveAll();
 
 
     signals:
         void update();
         void updateCategories();
 
     public slots:
-        void add( const OTodo& );
+        void add( const OPimTodo& );
         void update( int uid,  const SmallTodo& );
-        void update( int uid, const OTodo& );
+        void update( int uid, const OPimTodo& );
         bool remove( int uid );
         void remove( const QArray<int>& );
 
         /**
          * remove all completed
          */
         void removeCompleted();
         void removeAll();
         void reload();
         void save();
 
     private:
-        OTodoAccess* m_db;
-        OTodoAccess::List m_list;
-        OTodoAccess::List::Iterator m_it;
-        OTodoAccess::List m_sorted;
+        OPimTodoAccess* m_db;
+        OPimTodoAccess::List m_list;
+        OPimTodoAccess::List::Iterator m_it;
+        OPimTodoAccess::List m_sorted;
         Categories m_cat;
         int m_ca;
         /* sort cat */
         bool m_shCat;
         int m_sortOrder;
         bool m_asc;