-rw-r--r-- | core/pim/todo/todomanager.h | 38 |
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 | |||
@@ -30,15 +30,17 @@ | |||
30 | #define OPIE_TODO_MANAGER_H | 30 | #define OPIE_TODO_MANAGER_H |
31 | 31 | ||
32 | #include <qarray.h> | 32 | #include <opie2/opimtodo.h> |
33 | #include <qobject.h> | 33 | #include <opie2/otodoaccess.h> |
34 | #include <qstring.h> | ||
35 | 34 | ||
36 | #include <qpe/categories.h> | 35 | #include <qpe/categories.h> |
37 | 36 | ||
38 | #include <opie/otodo.h> | 37 | #include <qarray.h> |
39 | #include <opie/otodoaccess.h> | 38 | #include <qobject.h> |
39 | #include <qstring.h> | ||
40 | 40 | ||
41 | #include "smalltodo.h" | 41 | #include "smalltodo.h" |
42 | 42 | ||
43 | using Opie::OPimTodo; | ||
44 | using Opie::OPimTodoAccess; | ||
43 | 45 | ||
44 | namespace Todo { | 46 | namespace Todo { |
@@ -53,15 +55,15 @@ namespace Todo { | |||
53 | QStringList categories()/*const*/; | 55 | QStringList categories()/*const*/; |
54 | int catId(const QString&); | 56 | int catId(const QString&); |
55 | OTodo event(int uid ); | 57 | OPimTodo event(int uid ); |
56 | 58 | ||
57 | void updateList(); | 59 | void updateList(); |
58 | /** returns the iterator sorted if set sorted*/ | 60 | /** returns the iterator sorted if set sorted*/ |
59 | OTodoAccess::List list()const; | 61 | OPimTodoAccess::List list()const; |
60 | OTodoAccess::List sorted( bool asc, int so, int f, int cat ); | 62 | OPimTodoAccess::List sorted( bool asc, int so, int f, int cat ); |
61 | 63 | ||
62 | OTodoAccess::List::Iterator overDue(); | 64 | OPimTodoAccess::List::Iterator overDue(); |
63 | OTodoAccess::List::Iterator fromTo( const QDate& start, | 65 | OPimTodoAccess::List::Iterator fromTo( const QDate& start, |
64 | const QDate& end ); | 66 | const QDate& end ); |
65 | OTodoAccess::List::Iterator query( const OTodo& ev, int query ); | 67 | OPimTodoAccess::List::Iterator query( const OPimTodo& ev, int query ); |
66 | 68 | ||
67 | void setCategory( bool sort, int category = -1); | 69 | void setCategory( bool sort, int category = -1); |
@@ -71,5 +73,5 @@ namespace Todo { | |||
71 | void sort(); | 73 | void sort(); |
72 | 74 | ||
73 | OTodoAccess* todoDB(); | 75 | OPimTodoAccess* todoDB(); |
74 | bool saveAll(); | 76 | bool saveAll(); |
75 | 77 | ||
@@ -80,7 +82,7 @@ namespace Todo { | |||
80 | 82 | ||
81 | public slots: | 83 | public slots: |
82 | void add( const OTodo& ); | 84 | void add( const OPimTodo& ); |
83 | void update( int uid, const SmallTodo& ); | 85 | void update( int uid, const SmallTodo& ); |
84 | void update( int uid, const OTodo& ); | 86 | void update( int uid, const OPimTodo& ); |
85 | bool remove( int uid ); | 87 | bool remove( int uid ); |
86 | void remove( const QArray<int>& ); | 88 | void remove( const QArray<int>& ); |
@@ -95,8 +97,8 @@ namespace Todo { | |||
95 | 97 | ||
96 | private: | 98 | private: |
97 | OTodoAccess* m_db; | 99 | OPimTodoAccess* m_db; |
98 | OTodoAccess::List m_list; | 100 | OPimTodoAccess::List m_list; |
99 | OTodoAccess::List::Iterator m_it; | 101 | OPimTodoAccess::List::Iterator m_it; |
100 | OTodoAccess::List m_sorted; | 102 | OPimTodoAccess::List m_sorted; |
101 | Categories m_cat; | 103 | Categories m_cat; |
102 | int m_ca; | 104 | int m_ca; |