-rw-r--r-- | core/pim/todo/mainwindow.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h index fd0e1bd..6a7296b 100644 --- a/core/pim/todo/mainwindow.h +++ b/core/pim/todo/mainwindow.h | |||
@@ -32,7 +32,8 @@ | |||
32 | #include <qlist.h> | 32 | #include <qlist.h> |
33 | 33 | ||
34 | #include <opie/otodoaccess.h> | 34 | #include <opie2/otodoaccess.h> |
35 | #include <opie/otodo.h> | 35 | #include <opie2/opimtodo.h> |
36 | #include <opie/opimmainwindow.h> | 36 | #include <opie2/opimmainwindow.h> |
37 | #include <opie2/owidgetstack.h> | ||
37 | 38 | ||
38 | #include "smalltodo.h" | 39 | #include "smalltodo.h" |
@@ -45,9 +46,10 @@ class QMenuBar; | |||
45 | class QToolBar; | 46 | class QToolBar; |
46 | class QAction; | 47 | class QAction; |
47 | class OWidgetStack; | ||
48 | class Ir; | 48 | class Ir; |
49 | class QVBox; | 49 | class QVBox; |
50 | class QLineEdit; | 50 | class QLineEdit; |
51 | 51 | ||
52 | using namespace Opie; | ||
53 | |||
52 | namespace Todo { | 54 | namespace Todo { |
53 | typedef TodoView View; | 55 | typedef TodoView View; |
@@ -70,5 +72,5 @@ namespace Todo { | |||
70 | ~MainWindow(); | 72 | ~MainWindow(); |
71 | 73 | ||
72 | /** return a context menu for an OTodo */ | 74 | /** return a context menu for an OPimTodo */ |
73 | QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); | 75 | QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); |
74 | QPopupMenu* options(); | 76 | QPopupMenu* options(); |
@@ -78,9 +80,9 @@ namespace Todo { | |||
78 | 80 | ||
79 | void updateList(); | 81 | void updateList(); |
80 | OTodoAccess::List list()const; | 82 | OPimTodoAccess::List list()const; |
81 | OTodoAccess::List sorted( bool asc, int sortOrder ); | 83 | OPimTodoAccess::List sorted( bool asc, int sortOrder ); |
82 | OTodoAccess::List sorted( bool asc, int sortOrder, int addFilter ); | 84 | OPimTodoAccess::List sorted( bool asc, int sortOrder, int addFilter ); |
83 | 85 | ||
84 | OTodo event(int uid ); | 86 | OPimTodo event(int uid ); |
85 | 87 | ||
86 | bool isSyncing()const; | 88 | bool isSyncing()const; |
@@ -94,5 +96,5 @@ namespace Todo { | |||
94 | QuickEditBase* quickEditor(); | 96 | QuickEditBase* quickEditor(); |
95 | 97 | ||
96 | void updateTodo( const OTodo& ); | 98 | void updateTodo( const OPimTodo& ); |
97 | void populateTemplates(); | 99 | void populateTemplates(); |
98 | Editor* currentEditor(); | 100 | Editor* currentEditor(); |
@@ -109,5 +111,5 @@ private slots: | |||
109 | private: | 111 | private: |
110 | /* handle setting and removing alarms */ | 112 | /* handle setting and removing alarms */ |
111 | void handleAlarms( const OTodo& oldTodo, const OTodo& newTodo ); | 113 | void handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo ); |
112 | void receiveFile( const QString& filename ); | 114 | void receiveFile( const QString& filename ); |
113 | void connectBase( ViewBase* ); | 115 | void connectBase( ViewBase* ); |
@@ -166,5 +168,5 @@ private slots: | |||
166 | void slotUpdate3( QWidget* ); | 168 | void slotUpdate3( QWidget* ); |
167 | void slotComplete( int uid ); | 169 | void slotComplete( int uid ); |
168 | void slotComplete( const OTodo& ev ); | 170 | void slotComplete( const OPimTodo& ev ); |
169 | void slotNewFromTemplate(int id ); | 171 | void slotNewFromTemplate(int id ); |
170 | void slotNew(); | 172 | void slotNew(); |