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 @@ -22,7 +22,8 @@ #include <opie2/odevice.h> -using namespace Opie; +using namespace Opie::Ui; +using namespace Opie::Core; DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QWidget* parent, 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 @@ -21,9 +21,8 @@ #include <qpe/datebookdb.h> -using namespace Opie; -class DateBookEvent: public OClickableLabel { +class DateBookEvent: public Opie::Ui::OClickableLabel { Q_OBJECT 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 @@ -19,6 +19,9 @@ #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 ) { 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 @@ -22,7 +22,6 @@ #include <opie2/otodoaccess.h> #include <opie2/oclickablelabel.h> -using namespace Opie; class TodolistPluginWidget : public QWidget { @@ -39,12 +38,12 @@ 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(); |