summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/datebook/config.in2
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.cpp3
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.h3
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.cpp3
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.h9
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 @@
1 config TODAY_DATEBOOK 1 config TODAY_DATEBOOK
2 boolean "datebook" 2 boolean "datebook"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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
@@ -19,13 +19,14 @@
19#include <qpe/config.h> 19#include <qpe/config.h>
20#include <qpe/qcopenvelope_qws.h> 20#include <qpe/qcopenvelope_qws.h>
21#include <qpe/calendar.h> 21#include <qpe/calendar.h>
22 22
23#include <opie2/odevice.h> 23#include <opie2/odevice.h>
24 24
25using namespace Opie; 25using namespace Opie::Ui;
26using namespace Opie::Core;
26 27
27DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 28DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
28 QWidget* parent, 29 QWidget* parent,
29 bool show_location, 30 bool show_location,
30 bool show_notes, 31 bool show_notes,
31 bool timeExtraLine, 32 bool timeExtraLine,
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
@@ -18,15 +18,14 @@
18#define DATEBOOKEVENT_PLUGIN_H 18#define DATEBOOKEVENT_PLUGIN_H
19 19
20#include <opie2/oclickablelabel.h> 20#include <opie2/oclickablelabel.h>
21 21
22#include <qpe/datebookdb.h> 22#include <qpe/datebookdb.h>
23 23
24using namespace Opie;
25 24
26class DateBookEvent: public OClickableLabel { 25class DateBookEvent: public Opie::Ui::OClickableLabel {
27 26
28 Q_OBJECT 27 Q_OBJECT
29 28
30public: 29public:
31 DateBookEvent( const EffectiveEvent &ev, 30 DateBookEvent( const EffectiveEvent &ev,
32 QWidget* parent = 0, 31 QWidget* parent = 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
@@ -16,12 +16,15 @@
16 16
17#include "todopluginwidget.h" 17#include "todopluginwidget.h"
18 18
19#include <qpe/config.h> 19#include <qpe/config.h>
20#include <qpe/qcopenvelope_qws.h> 20#include <qpe/qcopenvelope_qws.h>
21 21
22using namespace Opie::Ui;
23using namespace Opie;
24
22TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) 25TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
23 : QWidget( parent, name ) { 26 : QWidget( parent, name ) {
24 27
25 todo = 0l; 28 todo = 0l;
26 layoutTodo = 0l; 29 layoutTodo = 0l;
27 todoLabel = 0l; 30 todoLabel = 0l;
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
@@ -19,13 +19,12 @@
19 19
20#include <qlayout.h> 20#include <qlayout.h>
21 21
22#include <opie2/otodoaccess.h> 22#include <opie2/otodoaccess.h>
23#include <opie2/oclickablelabel.h> 23#include <opie2/oclickablelabel.h>
24 24
25using namespace Opie;
26 25
27class TodolistPluginWidget : public QWidget { 26class TodolistPluginWidget : public QWidget {
28 27
29 Q_OBJECT 28 Q_OBJECT
30 29
31public: 30public:
@@ -36,18 +35,18 @@ public:
36 void reinitialize(); 35 void reinitialize();
37 36
38protected slots: 37protected slots:
39 void startTodolist(); 38 void startTodolist();
40 39
41private: 40private:
42 OClickableLabel *todoLabel; 41 Opie::Ui::OClickableLabel *todoLabel;
43 QVBoxLayout* layoutTodo; 42 QVBoxLayout* layoutTodo;
44 43
45 OPimTodoAccess *todo; 44 Opie::OPimTodoAccess *todo;
46 OPimTodoAccess::List m_list; 45 Opie::OPimTodoAccess::List m_list;
47 OPimTodoAccess::List::Iterator m_it; 46 Opie::OPimTodoAccess::List::Iterator m_it;
48 47
49 void readConfig(); 48 void readConfig();
50 void getTodo(); 49 void getTodo();
51 int m_maxLinesTask; 50 int m_maxLinesTask;
52 int m_maxCharClip; 51 int m_maxCharClip;
53}; 52};