-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 @@ -20,13 +20,14 @@ #ifndef TODOTABLE_H #define TODOTABLE_H #include <qpe/categories.h> #include <qpe/stringutil.h> -#include <qpe/task.h> +//#include <qpe/task.h> +#include <opie/todoevent.h> #include <qtable.h> #include <qmap.h> #include <qguardedptr.h> class Node; @@ -83,17 +84,17 @@ enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; class TodoTable : public QTable { Q_OBJECT public: TodoTable( QWidget *parent = 0, const char * name = 0 ); - void addEntry( const Task &todo ); + void addEntry( const ToDoEvent &todo ); void clearFindRow() { currFindRow = -2; } - Task currentEntry() const; - void replaceCurrentEntry( const Task &todo, bool fromTableItem = false ); + ToDoEvent currentEntry() const; + void replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem = false ); QStringList categories(); void setShowCompleted( bool sc ) { showComp = sc; updateVisible(); } bool showCompleted() const { return showComp; } @@ -125,17 +126,17 @@ signals: protected: void keyPressEvent( QKeyEvent *e ); private: void updateVisible(); void viewportPaintEvent( QPaintEvent * ); - void internalAddEntries( QList<Task> &list); - inline void insertIntoTable( Task *todo, int row ); - void updateJournal( const Task &todo, journal_action action, int row = -1); + void internalAddEntries( QList<ToDoEvent> &list); + inline void insertIntoTable( ToDoEvent *todo, int row ); + void updateJournal( const ToDoEvent &todo, journal_action action, int row = -1); void mergeJournal(); - void journalFreeReplaceEntry( const Task &todo, int row ); + void journalFreeReplaceEntry( const ToDoEvent &todo, int row ); void journalFreeRemoveEntry( int row ); inline void realignTable( int row ); void loadFile( const QString &strFile, bool fromJournal = false ); private slots: void slotClicked( int row, int col, int button, const QPoint &pos ); @@ -147,24 +148,24 @@ private slots: void slotShowMenu(); void rowHeightChanged( int row ); private: friend class TodoWindow; - QMap<CheckItem*, Task *> todoList; + QMap<CheckItem*, ToDoEvent *> todoList; QStringList categoryList; bool showComp; QString showCat; QTimer *menuTimer; bool enablePainting; Categories mCat; int currFindRow; }; -inline void TodoTable::insertIntoTable( Task *todo, int row ) +inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) { QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') + todo->priority() ) + Qtopia::buildSortKey( todo->description() ); CheckItem *chk = new CheckItem( this, sortKey ); chk->setChecked( todo->isCompleted() ); |