4 files changed, 12 insertions, 8 deletions

diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index f0128bc..a8349c1 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -1,21 +1,23 @@
 #include <qlayout.h>
 
 #include "taskeditoroverview.h"
 #include "taskeditorstatus.h"
 #include "taskeditoralarms.h"
 
 #include "otaskeditor.h"
 
 using namespace Opie::Ui;
+using namespace Opie;
+
 OTaskEditor::OTaskEditor(int cur)
     : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
     init();
     init( cur );
 }
 OTaskEditor::OTaskEditor( const OPimTodo& to)
     : QDialog( 0, 0, TRUE, WStyle_ContextHelp ) {
     init();
     init( to );
 }
 OTaskEditor::~OTaskEditor() {
 
diff --git a/core/pim/todo/otaskeditor.h b/core/pim/todo/otaskeditor.h
index 4a00018..65e7bda 100644
--- a/core/pim/todo/otaskeditor.h
+++ b/core/pim/todo/otaskeditor.h
@@ -1,43 +1,44 @@
 #ifndef OPIE_TASK_EDITOR_H
 #define OPIE_TASK_EDITOR_H
 
 #include <qdialog.h>
 
 #include <opie2/opimtodo.h>
 #include <opie2/otabwidget.h>
 #include <opie2/opimrecurrencewidget.h>
+#include <opie2/opimrecurrencewidget.h>
 
 class TaskEditorOverView;
 class TaskEditorStatus;
 class TaskEditorAlarms;
 class QMultiLineEdit;
 
 class OTaskEditor : public QDialog {
     Q_OBJECT
 public:
     OTaskEditor(int cur);
-    OTaskEditor( const OPimTodo& todo );
+    OTaskEditor( const Opie::OPimTodo& todo );
     ~OTaskEditor();
 
     /*
      * same as the c'tor but this gives us the
      * power to 'preload' the dialog
      */
     void init( int cur );
-    void init( const OPimTodo& todo );
+    void init( const Opie::OPimTodo& todo );
 
-    OPimTodo todo()const;
+    Opie::OPimTodo todo()const;
 private:
-    void load( const OPimTodo& );
+    void load( const Opie::OPimTodo& );
     void init();
 
     Opie::Ui::OTabWidget         *m_tab;
     TaskEditorOverView *m_overView;
     TaskEditorStatus   *m_stat;
     TaskEditorAlarms   *m_alarm;
     TaskEditorAlarms   *m_remind;
     OPimRecurrenceWidget  *m_rec;
-            OPimTodo    m_todo;
+            Opie::OPimTodo      m_todo;
 };
 
 #endif
diff --git a/core/pim/todo/todoeditor.cpp b/core/pim/todo/todoeditor.cpp
index 879d809..4b5ecb1 100644
--- a/core/pim/todo/todoeditor.cpp
+++ b/core/pim/todo/todoeditor.cpp
@@ -1,18 +1,19 @@
 
 #include <qpe/qpeapplication.h>
 
 #include "otaskeditor.h"
 #include "todoeditor.h"
 
+using namespace Opie;
 using namespace Todo;
 
 Editor::Editor() {
     m_accepted = false;
     m_self = 0l;
 }
 Editor::~Editor() {
     delete m_self;
     m_self = 0;
 }
 OPimTodo Editor::newTodo( int cur,
                            QWidget*) {
diff --git a/core/pim/todo/todoeditor.h b/core/pim/todo/todoeditor.h
index bcfd205..1ac7f8a 100644
--- a/core/pim/todo/todoeditor.h
+++ b/core/pim/todo/todoeditor.h
@@ -2,28 +2,28 @@
 #define OPIE_TODO_EDITOR_H
 
 #include <opie2/opimtodo.h>
 
 
 class OTaskEditor;
 namespace Todo {
     class Editor {
     public:
         Editor();
         ~Editor();
 
-        OPimTodo newTodo( int currentCatId,
+        Opie::OPimTodo newTodo( int currentCatId,
                            QWidget* par );
-        OPimTodo edit( QWidget* par,
-                        const OPimTodo& ev = OPimTodo() );
+        Opie::OPimTodo edit( QWidget* par,
+                             const Opie::OPimTodo& ev = Opie::OPimTodo() );
 
 
         bool accepted()const;
     protected:
         OTaskEditor* self();
     private:
         bool m_accepted: 1;
         OTaskEditor* m_self;
     };
 };
 
 #endif