summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-03-01 15:47:43 (UTC)
committer harlekin <harlekin>2004-03-01 15:47:43 (UTC)
commit87676b131aad1bfe979570a48107527db4040020 (patch) (unidiff)
tree9f7ee88adc4b8987e8d3387e2370719078f7ff5e
parentc50e4c32d34a0550f167480b6306aac632fb201c (diff)
downloadopie-87676b131aad1bfe979570a48107527db4040020.zip
opie-87676b131aad1bfe979570a48107527db4040020.tar.gz
opie-87676b131aad1bfe979570a48107527db4040020.tar.bz2
today plus datebook, mail, todolist plugins libopie1->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/main.cpp5
-rw-r--r--core/pim/today/plugins/datebook/datebook.pro2
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.cpp5
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.h6
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.cpp5
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.h8
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginconfig.cpp2
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginconfig.h9
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginimpl.cpp4
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginimpl.h4
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.cpp14
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.h11
-rw-r--r--core/pim/today/plugins/mail/mail.pro2
-rw-r--r--core/pim/today/plugins/mail/mailplugin.h9
-rw-r--r--core/pim/today/plugins/mail/mailpluginimpl.cpp4
-rw-r--r--core/pim/today/plugins/mail/mailpluginimpl.h4
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.cpp3
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.h4
-rw-r--r--core/pim/today/plugins/todolist/todolist.pro2
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp5
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h13
-rw-r--r--core/pim/today/plugins/todolist/todopluginconfig.h6
-rw-r--r--core/pim/today/plugins/todolist/todopluginimpl.cpp4
-rw-r--r--core/pim/today/plugins/todolist/todopluginimpl.h4
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.cpp2
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.h11
-rw-r--r--core/pim/today/today.cpp4
-rw-r--r--core/pim/today/today.h20
-rw-r--r--core/pim/today/today.pro3
-rw-r--r--core/pim/today/todaybase.cpp7
-rw-r--r--core/pim/today/todaybase.h13
-rw-r--r--core/pim/today/todayconfig.cpp2
-rw-r--r--core/pim/today/todayconfig.h10
33 files changed, 109 insertions, 98 deletions
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp
index d4ec3ce..974c050 100644
--- a/core/pim/today/main.cpp
+++ b/core/pim/today/main.cpp
@@ -1,13 +1,13 @@
1/* 1/*
2 * main.cpp 2 * main.cpp
3 * 3 *
4 * --------------------- 4 * ---------------------
5 * 5 *
6 * begin : Sun 10 17:20:00 CEST 2002 6 * begin : Sun 10 17:20:00 CEST 2002
7 * copyright : (c) 2002 by Maximilian Reiß 7 * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß
8 * email : max.reiss@gmx.de 8 * email : max.reiss@gmx.de
9 * 9 *
10 */ 10 */
11/*************************************************************************** 11/***************************************************************************
12 * * 12 * *
13 * This program is free software; you can redistribute it and/or modify * 13 * This program is free software; you can redistribute it and/or modify *
@@ -15,9 +15,10 @@
15 * the Free Software Foundation; either version 2 of the License, or * 15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. * 16 * (at your option) any later version. *
17 * * 17 * *
18 ***************************************************************************/ 18 ***************************************************************************/
19 19
20#include "today.h" 20#include "today.h"
21#include <opie/oapplicationfactory.h> 21
22#include <opie2/oapplicationfactory.h>
22 23
23OPIE_EXPORT_APP( OApplicationFactory<Today> ) 24OPIE_EXPORT_APP( OApplicationFactory<Today> )
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
@@ -10,13 +10,13 @@ INTERFACES = datebookpluginconfigbase.ui
10 10
11INCLUDEPATH += $(OPIEDIR)/include \ 11INCLUDEPATH += $(OPIEDIR)/include \
12 ../ ../library 12 ../ ../library
13DEPENDPATH += $(OPIEDIR)/include \ 13DEPENDPATH += $(OPIEDIR)/include \
14 ../ ../library 14 ../ ../library
15 15
16LIBS+= -lqpe -lopie 16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
17 17
18DESTDIR = $(OPIEDIR)/plugins/today 18DESTDIR = $(OPIEDIR)/plugins/today
19TARGET = todaydatebookplugin 19TARGET = todaydatebookplugin
20 20
21TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \ 21TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \
22 ../../../../../i18n/nl/libtodaydatebookplugin.ts \ 22 ../../../../../i18n/nl/libtodaydatebookplugin.ts \
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -12,17 +12,18 @@
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
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
24using namespace Opie; 25using namespace Opie;
25 26
26DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 27DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
27 QWidget* parent, 28 QWidget* parent,
28 bool show_location, 29 bool show_location,
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,15 +14,17 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOKEVENT_PLUGIN_H 17#ifndef DATEBOOKEVENT_PLUGIN_H
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
24using namespace Opie;
23 25
24class DateBookEvent: public OClickableLabel { 26class DateBookEvent: public OClickableLabel {
25 27
26 Q_OBJECT 28 Q_OBJECT
27 29
28public: 30public:
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,25 +1,22 @@
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 *
8 */ 7 */
9/*************************************************************************** 8/***************************************************************************
10 * * 9 * *
11 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
14 * (at your option) any later version. * 13 * (at your option) any later version. *
15 * * 14 * *
16 ***************************************************************************/ 15 ***************************************************************************/
17 16
18
19
20#include "datebookplugin.h" 17#include "datebookplugin.h"
21#include "datebookpluginconfig.h" 18#include "datebookpluginconfig.h"
22 19
23 20
24DatebookPlugin::DatebookPlugin() { 21DatebookPlugin::DatebookPlugin() {
25} 22}
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
@@ -14,18 +14,18 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOK_PLUGIN_H 17#ifndef DATEBOOK_PLUGIN_H
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
27class DatebookPlugin : public TodayPluginObject { 27class DatebookPlugin : public TodayPluginObject {
28 28
29public: 29public:
30 DatebookPlugin(); 30 DatebookPlugin();
31 ~DatebookPlugin(); 31 ~DatebookPlugin();
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,19 +14,22 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOK_PLUGIN_CONFIG_H 17#ifndef DATEBOOK_PLUGIN_CONFIG_H
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
28class DatebookPluginConfig : public TodayConfigWidget { 31class DatebookPluginConfig : public TodayConfigWidget {
29 32
30 Q_OBJECT 33 Q_OBJECT
31 34
32 35
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -32,13 +32,13 @@ TodayPluginObject* DatebookPluginImpl::guiPart() {
32QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 32QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
33 *iface = 0; 33 *iface = 0;
34 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 34 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
35 *iface = this, (*iface)->addRef(); 35 *iface = this, (*iface)->addRef();
36 }else 36 }else
37 return QS_FALSE; 37 return QS_FALSE;
38 38
39 return QS_OK; 39 return QS_OK;
40 40
41} 41}
42 42
43Q_EXPORT_INTERFACE() { 43Q_EXPORT_INTERFACE() {
44 Q_CREATE_INSTANCE( DatebookPluginImpl ); 44 Q_CREATE_INSTANCE( DatebookPluginImpl );
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,13 +14,13 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOK_PLUGIN_IMPL_H 17#ifndef DATEBOOK_PLUGIN_IMPL_H
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
22class DatebookPlugin; 22class DatebookPlugin;
23 23
24class DatebookPluginImpl : public TodayPluginInterface{ 24class DatebookPluginImpl : public TodayPluginInterface{
25 25
26public: 26public:
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
@@ -1,10 +1,10 @@
1 /* 1 /*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -97,24 +97,24 @@ void DatebookPluginWidget::getDates() {
97 if ( !m_onlyLater ) { 97 if ( !m_onlyLater ) {
98 count++; 98 count++;
99 DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); 99 DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
100 m_eventsList.append( l ); 100 m_eventsList.append( l );
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++;
117 // show only later appointments 117 // show only later appointments
118 DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); 118 DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
119 m_eventsList.append( l ); 119 m_eventsList.append( l );
120 l->show(); 120 l->show();
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
@@ -14,20 +14,23 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOK_PLUGIN_WIDGET_H 17#ifndef DATEBOOK_PLUGIN_WIDGET_H
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> 30using namespace Opie;
25#include <opie/oclickablelabel.h>
26
27#include "datebookevent.h"
28 31
29class DatebookPluginWidget : public QWidget { 32class DatebookPluginWidget : public QWidget {
30 33
31 Q_OBJECT 34 Q_OBJECT
32 35
33public: 36public:
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
@@ -8,13 +8,13 @@ SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
8 8
9INCLUDEPATH += $(OPIEDIR)/include \ 9INCLUDEPATH += $(OPIEDIR)/include \
10 ../ ../library 10 ../ ../library
11DEPENDPATH += $(OPIEDIR)/include \ 11DEPENDPATH += $(OPIEDIR)/include \
12 ../ ../library 12 ../ ../library
13 13
14LIBS+= -lqpe -lopie 14LIBS+= -lqpe -lopiecore2 -opiepim2
15 15
16DESTDIR = $(OPIEDIR)/plugins/today 16DESTDIR = $(OPIEDIR)/plugins/today
17TARGET = todaymailplugin 17TARGET = todaymailplugin
18 18
19TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \ 19TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \
20 ../../../../../i18n/nl/libtodaymailplugin.ts \ 20 ../../../../../i18n/nl/libtodaymailplugin.ts \
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
@@ -15,19 +15,22 @@
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17 17
18#ifndef MAIL_PLUGIN_H 18#ifndef MAIL_PLUGIN_H
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
29class MailPlugin : public TodayPluginObject { 32class MailPlugin : public TodayPluginObject {
30 33
31public: 34public:
32 MailPlugin(); 35 MailPlugin();
33 ~MailPlugin(); 36 ~MailPlugin();
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -35,13 +35,13 @@ TodayPluginObject* MailPluginImpl::guiPart() {
35QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 35QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
36 *iface = 0; 36 *iface = 0;
37 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 37 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
38 *iface = this, (*iface)->addRef(); 38 *iface = this, (*iface)->addRef();
39 }else 39 }else
40 return QS_FALSE; 40 return QS_FALSE;
41 41
42 return QS_OK; 42 return QS_OK;
43 43
44} 44}
45 45
46Q_EXPORT_INTERFACE() { 46Q_EXPORT_INTERFACE() {
47 Q_CREATE_INSTANCE( MailPluginImpl ); 47 Q_CREATE_INSTANCE( MailPluginImpl );
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,13 +14,13 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef MAIL_PLUGIN_IMPL_H 17#ifndef MAIL_PLUGIN_IMPL_H
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
22class MailPlugin; 22class MailPlugin;
23 23
24class MailPluginImpl : public TodayPluginInterface{ 24class MailPluginImpl : public TodayPluginInterface{
25 25
26public: 26public:
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
@@ -10,18 +10,17 @@
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
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
22MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) 21MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
23 : QWidget(parent, name ) { 22 : QWidget(parent, name ) {
24 23
25 m_mailLabel = 0l; 24 m_mailLabel = 0l;
26 m_layout = 0l; 25 m_layout = 0l;
27 26
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
@@ -16,13 +16,15 @@
16 16
17#ifndef MAIL_PLUGIN_WIDGET_H 17#ifndef MAIL_PLUGIN_WIDGET_H
18#define MAIL_PLUGIN_WIDGET_H 18#define MAIL_PLUGIN_WIDGET_H
19 19
20#include <qlayout.h> 20#include <qlayout.h>
21 21
22#include <opie/oclickablelabel.h> 22#include <opie2/oclickablelabel.h>
23
24using namespace Opie;
23 25
24class MailPluginWidget : public QWidget { 26class MailPluginWidget : public QWidget {
25 27
26 Q_OBJECT 28 Q_OBJECT
27 29
28public: 30public:
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
@@ -11,13 +11,13 @@ INTERFACES= todopluginconfigbase.ui
11 11
12INCLUDEPATH += $(OPIEDIR)/include \ 12INCLUDEPATH += $(OPIEDIR)/include \
13 ../ ../library 13 ../ ../library
14DEPENDPATH += $(OPIEDIR)/include \ 14DEPENDPATH += $(OPIEDIR)/include \
15 ../ ../library 15 ../ ../library
16 16
17LIBS+= -lqpe -lopie 17LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
18 18
19DESTDIR = $(OPIEDIR)/plugins/today 19DESTDIR = $(OPIEDIR)/plugins/today
20TARGET = todaytodolistplugin 20TARGET = todaytodolistplugin
21 21
22TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ 22TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \
23 ../../../../../i18n/nl/libtodaytodolistplugin.ts \ 23 ../../../../../i18n/nl/libtodaytodolistplugin.ts \
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
@@ -1,28 +1,25 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
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
23TodolistPlugin::TodolistPlugin() { 20TodolistPlugin::TodolistPlugin() {
24} 21}
25 22
26TodolistPlugin::~TodolistPlugin() { 23TodolistPlugin::~TodolistPlugin() {
27 delete (TodolistPluginWidget*)m_widget; 24 delete (TodolistPluginWidget*)m_widget;
28} 25}
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,20 +14,23 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODOLIST_PLUGIN_H 17#ifndef TODOLIST_PLUGIN_H
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> 30using namespace Opie;
25#include <opie/todayplugininterface.h>
26
27#include "todopluginwidget.h"
28 31
29class TodolistPlugin : public TodayPluginObject { 32class TodolistPlugin : public TodayPluginObject {
30 33
31public: 34public:
32 TodolistPlugin(); 35 TodolistPlugin();
33 ~TodolistPlugin(); 36 ~TodolistPlugin();
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
@@ -14,17 +14,17 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODOLIST_PLUGIN_CONFIG_H 17#ifndef TODOLIST_PLUGIN_CONFIG_H
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
26class TodolistPluginConfig : public TodayConfigWidget { 26class TodolistPluginConfig : public TodayConfigWidget {
27 Q_OBJECT 27 Q_OBJECT
28 28
29public: 29public:
30 30
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -33,13 +33,13 @@ TodayPluginObject* TodolistPluginImpl::guiPart() {
33QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 33QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
34 *iface = 0; 34 *iface = 0;
35 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 35 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
36 *iface = this, (*iface)->addRef(); 36 *iface = this, (*iface)->addRef();
37 }else 37 }else
38 return QS_FALSE; 38 return QS_FALSE;
39 39
40 return QS_OK; 40 return QS_OK;
41 41
42} 42}
43 43
44Q_EXPORT_INTERFACE() { 44Q_EXPORT_INTERFACE() {
45 Q_CREATE_INSTANCE( TodolistPluginImpl ); 45 Q_CREATE_INSTANCE( TodolistPluginImpl );
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
@@ -1,10 +1,10 @@
1/* 1/*
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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,13 +14,13 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODOLIST_PLUGIN_IMPL_H 17#ifndef TODOLIST_PLUGIN_IMPL_H
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
22class TodolistPlugin; 22class TodolistPlugin;
23 23
24class TodolistPluginImpl : public TodayPluginInterface{ 24class TodolistPluginImpl : public TodayPluginInterface{
25 25
26public: 26public:
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
@@ -26,13 +26,13 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
26 layoutTodo = 0l; 26 layoutTodo = 0l;
27 todoLabel = 0l; 27 todoLabel = 0l;
28 28
29 if ( todo ) { 29 if ( todo ) {
30 delete todo; 30 delete todo;
31 } 31 }
32 todo = new OTodoAccess(); 32 todo = new OPimTodoAccess();
33 todo->load(); 33 todo->load();
34 34
35 if ( layoutTodo ) { 35 if ( layoutTodo ) {
36 delete layoutTodo; 36 delete layoutTodo;
37 } 37 }
38 layoutTodo = new QVBoxLayout( this ); 38 layoutTodo = new QVBoxLayout( this );
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
@@ -16,15 +16,16 @@
16 16
17#ifndef TODOLIST_PLUGIN_WIDGET_H 17#ifndef TODOLIST_PLUGIN_WIDGET_H
18#define TODOLIST_PLUGIN_WIDGET_H 18#define TODOLIST_PLUGIN_WIDGET_H
19 19
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
25using namespace Opie;
25 26
26class TodolistPluginWidget : public QWidget { 27class TodolistPluginWidget : public QWidget {
27 28
28 Q_OBJECT 29 Q_OBJECT
29 30
30public: 31public:
@@ -38,15 +39,15 @@ protected slots:
38 void startTodolist(); 39 void startTodolist();
39 40
40private: 41private:
41 OClickableLabel *todoLabel; 42 OClickableLabel *todoLabel;
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();
49 void getTodo(); 50 void getTodo();
50 int m_maxLinesTask; 51 int m_maxLinesTask;
51 int m_maxCharClip; 52 int m_maxCharClip;
52}; 53};
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index c83a5df..b55a4a7 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,24 +1,22 @@
1/* 1/*
2 * today.cpp 2 * today.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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17
18
19#define QTOPIA_INTERNAL_LANGLIST 17#define QTOPIA_INTERNAL_LANGLIST
20 18
21#include "today.h" 19#include "today.h"
22 20
23#include <qpe/config.h> 21#include <qpe/config.h>
24#include <qpe/qcopenvelope_qws.h> 22#include <qpe/qcopenvelope_qws.h>
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index bf2293a..972731c 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -1,39 +1,39 @@
1/* 1/*
2 * today.h 2 * today.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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16
17
18#ifndef TODAY_H 16#ifndef TODAY_H
19#define TODAY_H 17#define TODAY_H
20 18
21#include <qscrollview.h>
22#include <qvbox.h>
23
24#include <qpe/qlibrary.h>
25 19
26#include "todayconfig.h" 20#include "todayconfig.h"
27#include "todaybase.h" 21#include "todaybase.h"
28 22
29#include <opie/todayplugininterface.h> 23#include <opie2/todayplugininterface.h>
24#include <opie2/oclickablelabel.h>
30 25
31class QVBoxLayout; 26#include <qpe/qlibrary.h>
32class OClickableLabel; 27
28#include <qscrollview.h>
29#include <qvbox.h>
33 30
31using namespace Opie;
32
33class QVBoxLayout;
34 34
35class Today : public TodayBase { 35class Today : public TodayBase {
36 36
37 Q_OBJECT 37 Q_OBJECT
38 38
39 public: 39 public:
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 2968e6a..b55a812 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -3,12 +3,13 @@ CONFIG += qt warn on release quick-app
3 HEADERS = today.h todaybase.h todayconfig.h 3 HEADERS = today.h todaybase.h todayconfig.h
4 SOURCES = today.cpp todaybase.cpp todayconfig.cpp main.cpp 4 SOURCES = today.cpp todaybase.cpp todayconfig.cpp main.cpp
5INTERFACES = todayconfigmiscbase.ui 5INTERFACES = todayconfigmiscbase.ui
6 6
7 INCLUDEPATH+= $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe -lopie 9LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
10 10
11 TARGET = today 11 TARGET = today
12 12
13include ( $(OPIEDIR)/include.pro ) 13include ( $(OPIEDIR)/include.pro )
14} 14}
15
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index f2958ad..14cdfd9 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,10 +1,10 @@
1/* 1/*
2 * todaybase.cpp 2 * todaybase.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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -13,17 +13,16 @@
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#include "todaybase.h" 17#include "todaybase.h"
18 18
19#include <qvbox.h>
20#include <qwhatsthis.h>
21
22#include <qpe/resource.h> 19#include <qpe/resource.h>
23 20
21#include <qvbox.h>
22#include <qwhatsthis.h>
24 23
25TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) 24TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
26 : QWidget( parent, name, WStyle_ContextHelp ) { 25 : QWidget( parent, name, WStyle_ContextHelp ) {
27 26
28 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo 27 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
29 QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla 28 QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index b0b2e14..b737351 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -1,10 +1,10 @@
1/* 1/*
2 * todaybase.h 2 * todaybase.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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,42 +14,43 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODAYBASE_H 17#ifndef TODAYBASE_H
18#define TODAYBASE_H 18#define TODAYBASE_H
19 19
20#include <opie2/oclickablelabel.h>
21
20#include <qlayout.h> 22#include <qlayout.h>
21#include <opie/oclickablelabel.h>
22 23
23class QVBox; 24class QVBox;
24class QGridLayout; 25class QGridLayout;
25class QFrame; 26class QFrame;
26class QLabel; 27class QLabel;
27class QPushButton; 28class QPushButton;
28class QBoxLayout; 29class QBoxLayout;
29 30
30 31
32using namespace Opie;
33
34
31class TodayBase : public QWidget 35class TodayBase : public QWidget
32{ 36{
33 Q_OBJECT 37 Q_OBJECT
34 38
35public: 39public:
36 TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); 40 TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 );
37 ~TodayBase(); 41 ~TodayBase();
38 42
39 QFrame* Frame4; 43 QFrame* Frame4;
40 QPushButton* DatesButton; 44 QPushButton* DatesButton;
41 QVBoxLayout* layout; 45 QVBoxLayout* layout;
42 OClickableLabel* OwnerField; 46 Opie::OClickableLabel* OwnerField;
43 QLabel* Frame; 47 QLabel* Frame;
44 QLabel* DateLabel; 48 QLabel* DateLabel;
45 QFrame* Frame15; 49 QFrame* Frame15;
46 QLabel* Opiezilla; 50 QLabel* Opiezilla;
47 QLabel* TodayLabel; 51 QLabel* TodayLabel;
48 OClickableLabel* ConfigButton; 52 OClickableLabel* ConfigButton;
49 53
50protected:
51
52
53}; 54};
54 55
55#endif 56#endif
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 9ced0d8..5c51515 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -1,10 +1,10 @@
1/* 1/*
2 * todayconfig.cpp 2 * todayconfig.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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 0a7687c..3b585c9 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -1,10 +1,10 @@
1/* 1/*
2 * todayconfig.h 2 * todayconfig.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 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
@@ -14,19 +14,19 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODAYCONFIG_H 17#ifndef TODAYCONFIG_H
18#define TODAYCONFIG_H 18#define TODAYCONFIG_H
19 19
20#include "todayconfigmiscbase.h"
21
22#include <opie2/otabwidget.h>
23
20#include <qvariant.h> 24#include <qvariant.h>
21#include <qdialog.h> 25#include <qdialog.h>
22#include <qlistview.h> 26#include <qlistview.h>
23#include <opie/otabwidget.h>
24
25
26#include "todayconfigmiscbase.h"
27 27
28class QCheckBox; 28class QCheckBox;
29class QLabel; 29class QLabel;
30class QSpinBox; 30class QSpinBox;
31class QTabWidget; 31class QTabWidget;
32 32