1 files changed, 18 insertions, 6 deletions

diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index 270cbd1..14cfa82 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -27,16 +27,16 @@
 */
 
 #ifndef TODO_MAIN_WINDOW_H
 #define TODO_MAIN_WINDOW_H
 
 #include <qlist.h>
-#include <qmainwindow.h>
 
 #include <opie/otodoaccess.h>
 #include <opie/otodo.h>
+#include <opie/opimmainwindow.h>
 
 #include "smalltodo.h"
 #include "todoview.h"
 #include "quickedit.h"
 #include "todomanager.h"
 
@@ -53,24 +53,24 @@ namespace Todo {
     class TemplateManager;
     class Editor;
     class TodoShow;
     class TemplateEditor;
     struct QuickEditBase;
 
-    class MainWindow : public QMainWindow {
+    class MainWindow : public OPimMainWindow {
         Q_OBJECT
+        friend class TodoView; // avoid QObject here....
     public:
         MainWindow( QWidget *parent = 0,
                     const char* name = 0 );
         ~MainWindow();
 
         /** return a context menu for an OTodo */
-        QPopupMenu* contextMenu(int uid );
+        QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE );
         QPopupMenu* options();
         QPopupMenu* edit();
-        QPopupMenu* view();
         QToolBar*   toolbar();
 
 
         void updateList();
         OTodoAccess::List list()const;
         OTodoAccess::List sorted( bool asc, int sortOrder );
@@ -133,13 +133,12 @@ private slots:
             *m_showOverDueAction,
             *m_effectiveAction;
         QWidgetStack *m_stack;
         QPopupMenu* m_catMenu,
             *m_edit,
             *m_options,
-            *m_view,
             *m_template;
         /* box with two rows
          * top will be the quick edit
          * this will bite my ass once
          * we want to have all parts
          * exchangeable
@@ -158,17 +157,19 @@ private slots:
         TemplateManager* m_tempManager;
 
 
      private slots:
         void slotShow(int);
         void slotEdit(int);
-private slots:
         void slotUpdate3( QWidget* );
+        void slotComplete( int uid );
+        void slotComplete( const OTodo& ev );
         void slotNewFromTemplate(int id );
         void slotNew();
         void slotDuplicate();
+
         void slotDelete();
         void slotDeleteAll();
         void slotDeleteCompleted();
 
         void slotEdit();
         void slotFind();
@@ -182,10 +183,21 @@ private slots:
 
 
         void slotBeam();
         void beamDone( Ir* );
         void slotShowDetails();
         void slotShowDue( bool );
+        /* reimplementation from opimmainwindow */
+    protected slots:
+        void flush();
+        void reload();
+        int create();
+        bool remove( int uid );
+        void beam(int uid, int transport = IrDa );
+        void show( int uid );
+        void edit( int uid );
+        void add( const OPimRecord& );
+        OPimRecord* record( int rtti, const QByteArray& );
     };
 };
 
 #endif