| -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 @@ -33,5 +33,6 @@ -#include <opie/otodoaccess.h> -#include <opie/otodo.h> -#include <opie/opimmainwindow.h> +#include <opie2/otodoaccess.h> +#include <opie2/opimtodo.h> +#include <opie2/opimmainwindow.h> +#include <opie2/owidgetstack.h> @@ -46,3 +47,2 @@ class QToolBar; class QAction; -class OWidgetStack; class Ir; @@ -51,2 +51,4 @@ class QLineEdit; +using namespace Opie; + namespace Todo { @@ -71,3 +73,3 @@ namespace Todo { - /** return a context menu for an OTodo */ + /** return a context menu for an OPimTodo */ QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE ); @@ -79,7 +81,7 @@ namespace Todo { void updateList(); - OTodoAccess::List list()const; - OTodoAccess::List sorted( bool asc, int sortOrder ); - OTodoAccess::List sorted( bool asc, int sortOrder, int addFilter ); + OPimTodoAccess::List list()const; + OPimTodoAccess::List sorted( bool asc, int sortOrder ); + OPimTodoAccess::List sorted( bool asc, int sortOrder, int addFilter ); - OTodo event(int uid ); + OPimTodo event(int uid ); @@ -95,3 +97,3 @@ namespace Todo { - void updateTodo( const OTodo& ); + void updateTodo( const OPimTodo& ); void populateTemplates(); @@ -110,3 +112,3 @@ private slots: /* handle setting and removing alarms */ - void handleAlarms( const OTodo& oldTodo, const OTodo& newTodo ); + void handleAlarms( const OPimTodo& oldTodo, const OPimTodo& newTodo ); void receiveFile( const QString& filename ); @@ -167,3 +169,3 @@ private slots: void slotComplete( int uid ); - void slotComplete( const OTodo& ev ); + void slotComplete( const OPimTodo& ev ); void slotNewFromTemplate(int id ); |