-rw-r--r-- | core/pim/todo/todotable.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h index 4f3a064..2746ce7 100644 --- a/core/pim/todo/todotable.h +++ b/core/pim/todo/todotable.h | |||
@@ -23,7 +23,8 @@ | |||
23 | 23 | ||
24 | #include <qpe/categories.h> | 24 | #include <qpe/categories.h> |
25 | #include <qpe/stringutil.h> | 25 | #include <qpe/stringutil.h> |
26 | #include <qpe/task.h> | 26 | //#include <qpe/task.h> |
27 | #include <opie/todoevent.h> | ||
27 | 28 | ||
28 | #include <qtable.h> | 29 | #include <qtable.h> |
29 | #include <qmap.h> | 30 | #include <qmap.h> |
@@ -86,11 +87,11 @@ class TodoTable : public QTable | |||
86 | 87 | ||
87 | public: | 88 | public: |
88 | TodoTable( QWidget *parent = 0, const char * name = 0 ); | 89 | TodoTable( QWidget *parent = 0, const char * name = 0 ); |
89 | void addEntry( const Task &todo ); | 90 | void addEntry( const ToDoEvent &todo ); |
90 | void clearFindRow() { currFindRow = -2; } | 91 | void clearFindRow() { currFindRow = -2; } |
91 | 92 | ||
92 | Task currentEntry() const; | 93 | ToDoEvent currentEntry() const; |
93 | void replaceCurrentEntry( const Task &todo, bool fromTableItem = false ); | 94 | void replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem = false ); |
94 | 95 | ||
95 | QStringList categories(); | 96 | QStringList categories(); |
96 | 97 | ||
@@ -128,11 +129,11 @@ protected: | |||
128 | private: | 129 | private: |
129 | void updateVisible(); | 130 | void updateVisible(); |
130 | void viewportPaintEvent( QPaintEvent * ); | 131 | void viewportPaintEvent( QPaintEvent * ); |
131 | void internalAddEntries( QList<Task> &list); | 132 | void internalAddEntries( QList<ToDoEvent> &list); |
132 | inline void insertIntoTable( Task *todo, int row ); | 133 | inline void insertIntoTable( ToDoEvent *todo, int row ); |
133 | void updateJournal( const Task &todo, journal_action action, int row = -1); | 134 | void updateJournal( const ToDoEvent &todo, journal_action action, int row = -1); |
134 | void mergeJournal(); | 135 | void mergeJournal(); |
135 | void journalFreeReplaceEntry( const Task &todo, int row ); | 136 | void journalFreeReplaceEntry( const ToDoEvent &todo, int row ); |
136 | void journalFreeRemoveEntry( int row ); | 137 | void journalFreeRemoveEntry( int row ); |
137 | inline void realignTable( int row ); | 138 | inline void realignTable( int row ); |
138 | void loadFile( const QString &strFile, bool fromJournal = false ); | 139 | void loadFile( const QString &strFile, bool fromJournal = false ); |
@@ -150,7 +151,7 @@ private slots: | |||
150 | private: | 151 | private: |
151 | friend class TodoWindow; | 152 | friend class TodoWindow; |
152 | 153 | ||
153 | QMap<CheckItem*, Task *> todoList; | 154 | QMap<CheckItem*, ToDoEvent *> todoList; |
154 | QStringList categoryList; | 155 | QStringList categoryList; |
155 | bool showComp; | 156 | bool showComp; |
156 | QString showCat; | 157 | QString showCat; |
@@ -161,7 +162,7 @@ private: | |||
161 | }; | 162 | }; |
162 | 163 | ||
163 | 164 | ||
164 | inline void TodoTable::insertIntoTable( Task *todo, int row ) | 165 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) |
165 | { | 166 | { |
166 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') | 167 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') |
167 | + todo->priority() ) | 168 | + todo->priority() ) |