author | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
commit | 87676b131aad1bfe979570a48107527db4040020 (patch) (unidiff) | |
tree | 9f7ee88adc4b8987e8d3387e2370719078f7ff5e /core/pim/today/plugins | |
parent | c50e4c32d34a0550f167480b6306aac632fb201c (diff) | |
download | opie-87676b131aad1bfe979570a48107527db4040020.zip opie-87676b131aad1bfe979570a48107527db4040020.tar.gz opie-87676b131aad1bfe979570a48107527db4040020.tar.bz2 |
today plus datebook, mail, todolist plugins libopie1->libopie2
25 files changed, 77 insertions, 66 deletions
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro index 413aa47..798c981 100644 --- a/core/pim/today/plugins/datebook/datebook.pro +++ b/core/pim/today/plugins/datebook/datebook.pro | |||
@@ -14,5 +14,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
14 | ../ ../library | 14 | ../ ../library |
15 | 15 | ||
16 | LIBS+= -lqpe -lopie | 16 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 |
17 | 17 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | DESTDIR = $(OPIEDIR)/plugins/today |
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index e19a690..9a820f2 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookevent.cpp | 2 | * datebookevent.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -16,9 +16,10 @@ | |||
16 | 16 | ||
17 | #include "datebookevent.h" | 17 | #include "datebookevent.h" |
18 | |||
18 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/calendar.h> | 21 | #include <qpe/calendar.h> |
21 | 22 | ||
22 | #include <opie/odevice.h> | 23 | #include <opie2/odevice.h> |
23 | 24 | ||
24 | using namespace Opie; | 25 | using namespace Opie; |
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 1a090e3..e2ee077 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookplugin.h | 2 | * datebookplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -18,7 +18,9 @@ | |||
18 | #define DATEBOOKEVENT_PLUGIN_H | 18 | #define DATEBOOKEVENT_PLUGIN_H |
19 | 19 | ||
20 | #include <opie/oclickablelabel.h> | 20 | #include <opie2/oclickablelabel.h> |
21 | |||
21 | #include <qpe/datebookdb.h> | 22 | #include <qpe/datebookdb.h> |
22 | 23 | ||
24 | using namespace Opie; | ||
23 | 25 | ||
24 | class DateBookEvent: public OClickableLabel { | 26 | class DateBookEvent: public OClickableLabel { |
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 8dfa52f..f46806f 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp | |||
@@ -1,7 +1,6 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | * datebookplugin.cpp | 2 | * datebookplugin.cpp |
4 | * | 3 | * |
5 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003, 2004 by Maximilian Reiß |
6 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
7 | * | 6 | * |
@@ -16,6 +15,4 @@ | |||
16 | ***************************************************************************/ | 15 | ***************************************************************************/ |
17 | 16 | ||
18 | |||
19 | |||
20 | #include "datebookplugin.h" | 17 | #include "datebookplugin.h" |
21 | #include "datebookpluginconfig.h" | 18 | #include "datebookpluginconfig.h" |
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 890c59b..631d6a3 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h | |||
@@ -18,10 +18,10 @@ | |||
18 | #define DATEBOOK_PLUGIN_H | 18 | #define DATEBOOK_PLUGIN_H |
19 | 19 | ||
20 | #include <qguardedptr.h> | 20 | #include "datebookpluginwidget.h" |
21 | 21 | ||
22 | #include <opie/oclickablelabel.h> | 22 | #include <opie2/oclickablelabel.h> |
23 | #include <opie/todayplugininterface.h> | 23 | #include <opie2/todayplugininterface.h> |
24 | 24 | ||
25 | #include "datebookpluginwidget.h" | 25 | #include <qguardedptr.h> |
26 | 26 | ||
27 | class DatebookPlugin : public TodayPluginObject { | 27 | class DatebookPlugin : public TodayPluginObject { |
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index 8ead40d..5fd5221 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookpluginconfig.cpp | 2 | * datebookpluginconfig.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index 2d303fc..4f4e3f1 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookpluginconfig.h | 2 | * datebookpluginconfig.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -18,11 +18,14 @@ | |||
18 | #define DATEBOOK_PLUGIN_CONFIG_H | 18 | #define DATEBOOK_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | #include "datebookpluginconfigbase.h" | ||
21 | |||
22 | #include <opie2/todayconfigwidget.h> | ||
20 | 23 | ||
21 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
22 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
23 | 26 | ||
24 | #include <opie/todayconfigwidget.h> | ||
25 | 27 | ||
26 | #include "datebookpluginconfigbase.h" | 28 | |
29 | |||
27 | 30 | ||
28 | class DatebookPluginConfig : public TodayConfigWidget { | 31 | class DatebookPluginConfig : public TodayConfigWidget { |
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp index 6baffb9..ee250db 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookpluginimpl.cpp | 2 | * datebookpluginimpl.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -36,5 +36,5 @@ QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa | |||
36 | }else | 36 | }else |
37 | return QS_FALSE; | 37 | return QS_FALSE; |
38 | 38 | ||
39 | return QS_OK; | 39 | return QS_OK; |
40 | 40 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h index 7c19e59..d34dd6d 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.h +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookpluginimpl.h | 2 | * datebookpluginimpl.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -18,5 +18,5 @@ | |||
18 | #define DATEBOOK_PLUGIN_IMPL_H | 18 | #define DATEBOOK_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class DatebookPlugin; | 22 | class DatebookPlugin; |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 1b11d1b..b6707df 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * datebookpluginwidget.cpp | 2 | * datebookpluginwidget.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -101,16 +101,16 @@ void DatebookPluginWidget::getDates() { | |||
101 | l->show(); | 101 | l->show(); |
102 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 102 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
103 | } else { | 103 | } else { |
104 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) | 104 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) |
105 | // Show events which span over many days and are not elapsed. | 105 | // Show events which span over many days and are not elapsed. |
106 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) | 106 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) |
107 | // Show repeated event for today that is not elapsed. | 107 | // Show repeated event for today that is not elapsed. |
108 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | 108 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) |
109 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) | 109 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) |
110 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) | 110 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) |
111 | // Show repeated event for next days. | 111 | // Show repeated event for next days. |
112 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | 112 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) |
113 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) | 113 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) |
114 | ) | 114 | ) |
115 | { | 115 | { |
116 | count++; | 116 | count++; |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 8988073..68af323 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -18,12 +18,15 @@ | |||
18 | #define DATEBOOK_PLUGIN_WIDGET_H | 18 | #define DATEBOOK_PLUGIN_WIDGET_H |
19 | 19 | ||
20 | #include "datebookevent.h" | ||
21 | |||
22 | #include <opie2/oclickablelabel.h> | ||
23 | |||
24 | #include <qpe/datebookdb.h> | ||
25 | |||
20 | #include <qlayout.h> | 26 | #include <qlayout.h> |
21 | #include <qguardedptr.h> | 27 | #include <qguardedptr.h> |
22 | #include <qlist.h> | 28 | #include <qlist.h> |
23 | 29 | ||
24 | #include <qpe/datebookdb.h> | 30 | using namespace Opie; |
25 | #include <opie/oclickablelabel.h> | ||
26 | |||
27 | #include "datebookevent.h" | ||
28 | 31 | ||
29 | class DatebookPluginWidget : public QWidget { | 32 | class DatebookPluginWidget : public QWidget { |
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro index 70c484d..1c3555b 100644 --- a/core/pim/today/plugins/mail/mail.pro +++ b/core/pim/today/plugins/mail/mail.pro | |||
@@ -12,5 +12,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
12 | ../ ../library | 12 | ../ ../library |
13 | 13 | ||
14 | LIBS+= -lqpe -lopie | 14 | LIBS+= -lqpe -lopiecore2 -opiepim2 |
15 | 15 | ||
16 | DESTDIR = $(OPIEDIR)/plugins/today | 16 | DESTDIR = $(OPIEDIR)/plugins/today |
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index 7d6d5e8..1edffef 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h | |||
@@ -19,11 +19,14 @@ | |||
19 | #define MAIL_PLUGIN_H | 19 | #define MAIL_PLUGIN_H |
20 | 20 | ||
21 | #include "mailpluginwidget.h" | ||
22 | |||
23 | #include <opie2/todayplugininterface.h> | ||
24 | #include <opie2/todayconfigwidget.h> | ||
25 | |||
21 | #include <qwidget.h> | 26 | #include <qwidget.h> |
22 | #include <qguardedptr.h> | 27 | #include <qguardedptr.h> |
23 | 28 | ||
24 | #include <opie/todayplugininterface.h> | ||
25 | #include <opie/todayconfigwidget.h> | ||
26 | 29 | ||
27 | #include "mailpluginwidget.h" | 30 | |
28 | 31 | ||
29 | class MailPlugin : public TodayPluginObject { | 32 | class MailPlugin : public TodayPluginObject { |
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.cpp b/core/pim/today/plugins/mail/mailpluginimpl.cpp index dfd3a64..fac27f4 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.cpp +++ b/core/pim/today/plugins/mail/mailpluginimpl.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * mailpluginimpl.cpp | 2 | * mailpluginimpl.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -39,5 +39,5 @@ QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface * | |||
39 | }else | 39 | }else |
40 | return QS_FALSE; | 40 | return QS_FALSE; |
41 | 41 | ||
42 | return QS_OK; | 42 | return QS_OK; |
43 | 43 | ||
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h index 72e1760..35b3805 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.h +++ b/core/pim/today/plugins/mail/mailpluginimpl.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * mailpluginimpl.h | 2 | * mailpluginimpl.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -18,5 +18,5 @@ | |||
18 | #define MAIL_PLUGIN_IMPL_H | 18 | #define MAIL_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class MailPlugin; | 22 | class MailPlugin; |
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp index feecd81..4194270 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.cpp +++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp | |||
@@ -14,10 +14,9 @@ | |||
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | #include "mailpluginwidget.h" | ||
16 | 17 | ||
17 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
19 | 20 | ||
20 | #include "mailpluginwidget.h" | ||
21 | |||
22 | MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | 21 | MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) |
23 | : QWidget(parent, name ) { | 22 | : QWidget(parent, name ) { |
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h index 6d16d2c..0ad8738 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.h +++ b/core/pim/today/plugins/mail/mailpluginwidget.h | |||
@@ -20,5 +20,7 @@ | |||
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | 21 | ||
22 | #include <opie/oclickablelabel.h> | 22 | #include <opie2/oclickablelabel.h> |
23 | |||
24 | using namespace Opie; | ||
23 | 25 | ||
24 | class MailPluginWidget : public QWidget { | 26 | class MailPluginWidget : public QWidget { |
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro index 095247f..8f2f898 100644 --- a/core/pim/today/plugins/todolist/todolist.pro +++ b/core/pim/today/plugins/todolist/todolist.pro | |||
@@ -15,5 +15,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
15 | ../ ../library | 15 | ../ ../library |
16 | 16 | ||
17 | LIBS+= -lqpe -lopie | 17 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 |
18 | 18 | ||
19 | DESTDIR = $(OPIEDIR)/plugins/today | 19 | DESTDIR = $(OPIEDIR)/plugins/today |
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 801de9d..5783814 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * todoplugin.cpp | 2 | * todoplugin.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -15,10 +15,7 @@ | |||
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | |||
18 | |||
19 | #include "todoplugin.h" | 17 | #include "todoplugin.h" |
20 | #include "todopluginconfig.h" | 18 | #include "todopluginconfig.h" |
21 | 19 | ||
22 | |||
23 | TodolistPlugin::TodolistPlugin() { | 20 | TodolistPlugin::TodolistPlugin() { |
24 | } | 21 | } |
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index f68162f..bea15d5 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * todoplugin.h | 2 | * todoplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -18,12 +18,15 @@ | |||
18 | #define TODOLIST_PLUGIN_H | 18 | #define TODOLIST_PLUGIN_H |
19 | 19 | ||
20 | |||
21 | #include "todopluginwidget.h" | ||
22 | |||
23 | #include <opie2/oclickablelabel.h> | ||
24 | #include <opie2/todayplugininterface.h> | ||
25 | |||
20 | #include <qstring.h> | 26 | #include <qstring.h> |
21 | #include <qguardedptr.h> | 27 | #include <qguardedptr.h> |
22 | #include <qwidget.h> | 28 | #include <qwidget.h> |
23 | 29 | ||
24 | #include <opie/oclickablelabel.h> | 30 | using namespace Opie; |
25 | #include <opie/todayplugininterface.h> | ||
26 | |||
27 | #include "todopluginwidget.h" | ||
28 | 31 | ||
29 | class TodolistPlugin : public TodayPluginObject { | 32 | class TodolistPlugin : public TodayPluginObject { |
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index a2d7d2c..7040369 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h | |||
@@ -18,9 +18,9 @@ | |||
18 | #define TODOLIST_PLUGIN_CONFIG_H | 18 | #define TODOLIST_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | #include <qspinbox.h> | 20 | #include "todopluginconfigbase.h" |
21 | 21 | ||
22 | #include <opie/todayconfigwidget.h> | 22 | #include <opie2/todayconfigwidget.h> |
23 | 23 | ||
24 | #include "todopluginconfigbase.h" | 24 | #include <qspinbox.h> |
25 | 25 | ||
26 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.cpp b/core/pim/today/plugins/todolist/todopluginimpl.cpp index 639587f..1a6189f 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.cpp +++ b/core/pim/today/plugins/todolist/todopluginimpl.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * todopluginimpl.cpp | 2 | * todopluginimpl.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -37,5 +37,5 @@ QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa | |||
37 | }else | 37 | }else |
38 | return QS_FALSE; | 38 | return QS_FALSE; |
39 | 39 | ||
40 | return QS_OK; | 40 | return QS_OK; |
41 | 41 | ||
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h index ca62fdb..f9b0b37 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.h +++ b/core/pim/today/plugins/todolist/todopluginimpl.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * todopluginimpl.h | 2 | * todopluginimpl.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
@@ -18,5 +18,5 @@ | |||
18 | #define TODOLIST_PLUGIN_IMPL_H | 18 | #define TODOLIST_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class TodolistPlugin; | 22 | class TodolistPlugin; |
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp index 0364f94..567c70f 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.cpp +++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp | |||
@@ -30,5 +30,5 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) | |||
30 | delete todo; | 30 | delete todo; |
31 | } | 31 | } |
32 | todo = new OTodoAccess(); | 32 | todo = new OPimTodoAccess(); |
33 | todo->load(); | 33 | todo->load(); |
34 | 34 | ||
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h index 9cac43d..a020cf4 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.h +++ b/core/pim/today/plugins/todolist/todopluginwidget.h | |||
@@ -20,7 +20,8 @@ | |||
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | 21 | ||
22 | #include <opie/otodoaccess.h> | 22 | #include <opie2/otodoaccess.h> |
23 | #include <opie/oclickablelabel.h> | 23 | #include <opie2/oclickablelabel.h> |
24 | 24 | ||
25 | using namespace Opie; | ||
25 | 26 | ||
26 | class TodolistPluginWidget : public QWidget { | 27 | class TodolistPluginWidget : public QWidget { |
@@ -42,7 +43,7 @@ private: | |||
42 | QVBoxLayout* layoutTodo; | 43 | QVBoxLayout* layoutTodo; |
43 | 44 | ||
44 | OTodoAccess *todo; | 45 | OPimTodoAccess *todo; |
45 | OTodoAccess::List m_list; | 46 | OPimTodoAccess::List m_list; |
46 | OTodoAccess::List::Iterator m_it; | 47 | OPimTodoAccess::List::Iterator m_it; |
47 | 48 | ||
48 | void readConfig(); | 49 | void readConfig(); |