Compile fixes

5 files changed, 11 insertions, 9 deletions

diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in
index 7a14438..413e0b8 100644
--- a/core/pim/today/plugins/datebook/config.in
+++ b/core/pim/today/plugins/datebook/config.in
@@ -1,4 +1,4 @@
   config TODAY_DATEBOOK
     boolean "datebook"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 9a820f2..f5b0d0a 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -17,17 +17,18 @@
 #include "datebookevent.h"
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/calendar.h>
 
 #include <opie2/odevice.h>
 
-using namespace Opie;
+using namespace Opie::Ui;
+using namespace Opie::Core;
 
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
                              QWidget* parent,
                              bool show_location,
                              bool show_notes,
                              bool timeExtraLine,
                              int maxCharClip,
                              const char* name,
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index e2ee077..973efe4 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -16,19 +16,18 @@
 
 #ifndef DATEBOOKEVENT_PLUGIN_H
 #define DATEBOOKEVENT_PLUGIN_H
 
 #include <opie2/oclickablelabel.h>
 
 #include <qpe/datebookdb.h>
 
-using namespace Opie; 
 
-class DateBookEvent: public OClickableLabel {
+class DateBookEvent: public Opie::Ui::OClickableLabel {
 
      Q_OBJECT
 
 public:
      DateBookEvent( const EffectiveEvent &ev,
                     QWidget* parent = 0,
                     bool show_location = 0,
                     bool show_notes = 0,
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp
index 567c70f..7ce703e 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.cpp
+++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp
@@ -14,16 +14,19 @@
  *                                                                         *
  ***************************************************************************/
 
 #include "todopluginwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
+using namespace Opie::Ui;
+using namespace Opie;
+
 TodolistPluginWidget::TodolistPluginWidget( QWidget *parent,  const char* name )
     : QWidget( parent, name ) {
 
     todo = 0l;
     layoutTodo = 0l;
     todoLabel = 0l;
 
     if ( todo ) {
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h
index a020cf4..86a9f27 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.h
+++ b/core/pim/today/plugins/todolist/todopluginwidget.h
@@ -17,39 +17,38 @@
 #ifndef TODOLIST_PLUGIN_WIDGET_H
 #define TODOLIST_PLUGIN_WIDGET_H
 
 #include <qlayout.h>
 
 #include <opie2/otodoaccess.h>
 #include <opie2/oclickablelabel.h>
 
-using namespace Opie; 
 
 class TodolistPluginWidget : public QWidget {
 
     Q_OBJECT
 
 public:
     TodolistPluginWidget( QWidget *parent,  const char *name );
     ~TodolistPluginWidget();
 
     void refresh();
     void reinitialize();
 
 protected slots:
     void  startTodolist();
 
 private:
-    OClickableLabel *todoLabel;
+    Opie::Ui::OClickableLabel *todoLabel;
     QVBoxLayout* layoutTodo;
 
-    OPimTodoAccess *todo;
-    OPimTodoAccess::List m_list;
-    OPimTodoAccess::List::Iterator m_it;
+    Opie::OPimTodoAccess *todo;
+    Opie::OPimTodoAccess::List m_list;
+    Opie::OPimTodoAccess::List::Iterator m_it;
 
     void readConfig();
     void getTodo();
     int m_maxLinesTask;
     int m_maxCharClip;
 };
 
 #endif