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
@@ -6,3 +6,3 @@
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
@@ -20,3 +20,4 @@
20#include "today.h" 20#include "today.h"
21#include <opie/oapplicationfactory.h> 21
22#include <opie2/oapplicationfactory.h>
22 23
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
@@ -15,3 +15,3 @@ DEPENDPATH += $(OPIEDIR)/include \
15 15
16LIBS+= -lqpe -lopie 16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
17 17
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
@@ -3,3 +3,3 @@
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
@@ -17,2 +17,3 @@
17#include "datebookevent.h" 17#include "datebookevent.h"
18
18#include <qpe/config.h> 19#include <qpe/config.h>
@@ -21,3 +22,3 @@
21 22
22#include <opie/odevice.h> 23#include <opie2/odevice.h>
23 24
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
@@ -3,3 +3,3 @@
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
@@ -19,5 +19,7 @@
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
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,2 +1 @@
1
2/* /*
@@ -4,3 +3,3 @@
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
@@ -17,4 +16,2 @@
17 16
18
19
20#include "datebookplugin.h" 17#include "datebookplugin.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
@@ -19,8 +19,8 @@
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
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
@@ -3,3 +3,3 @@
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
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
@@ -3,3 +3,3 @@
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
@@ -19,2 +19,5 @@
19 19
20#include "datebookpluginconfigbase.h"
21
22#include <opie2/todayconfigwidget.h>
20 23
@@ -23,5 +26,5 @@
23 26
24#include <opie/todayconfigwidget.h>
25 27
26#include "datebookpluginconfigbase.h" 28
29
27 30
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
@@ -3,3 +3,3 @@
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
@@ -37,3 +37,3 @@ QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa
37 return QS_FALSE; 37 return QS_FALSE;
38 38
39 return QS_OK; 39 return QS_OK;
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
@@ -3,3 +3,3 @@
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
@@ -19,3 +19,3 @@
19 19
20#include <opie/todayplugininterface.h> 20#include <opie2/todayplugininterface.h>
21 21
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
@@ -3,3 +3,3 @@
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
@@ -102,4 +102,4 @@ void DatebookPluginWidget::getDates() {
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.
@@ -108,8 +108,8 @@ void DatebookPluginWidget::getDates() {
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 {
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
@@ -19,2 +19,8 @@
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>
@@ -23,6 +29,3 @@
23 29
24#include <qpe/datebookdb.h> 30using namespace Opie;
25#include <opie/oclickablelabel.h>
26
27#include "datebookevent.h"
28 31
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
@@ -13,3 +13,3 @@ DEPENDPATH += $(OPIEDIR)/include \
13 13
14LIBS+= -lqpe -lopie 14LIBS+= -lqpe -lopiecore2 -opiepim2
15 15
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
@@ -20,2 +20,7 @@
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>
@@ -23,6 +28,4 @@
23 28
24#include <opie/todayplugininterface.h>
25#include <opie/todayconfigwidget.h>
26 29
27#include "mailpluginwidget.h" 30
28 31
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
@@ -3,3 +3,3 @@
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
@@ -40,3 +40,3 @@ QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface *
40 return QS_FALSE; 40 return QS_FALSE;
41 41
42 return QS_OK; 42 return QS_OK;
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
@@ -3,3 +3,3 @@
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
@@ -19,3 +19,3 @@
19 19
20#include <opie/todayplugininterface.h> 20#include <opie2/todayplugininterface.h>
21 21
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
@@ -15,2 +15,3 @@
15 ***************************************************************************/ 15 ***************************************************************************/
16#include "mailpluginwidget.h"
16 17
@@ -19,4 +20,2 @@
19 20
20#include "mailpluginwidget.h"
21
22MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) 21MailPluginWidget::MailPluginWidget( QWidget *parent, const char* 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
@@ -21,3 +21,5 @@
21 21
22#include <opie/oclickablelabel.h> 22#include <opie2/oclickablelabel.h>
23
24using namespace Opie;
23 25
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
@@ -16,3 +16,3 @@ DEPENDPATH += $(OPIEDIR)/include \
16 16
17LIBS+= -lqpe -lopie 17LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
18 18
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
@@ -3,3 +3,3 @@
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
@@ -16,4 +16,2 @@
16 16
17
18
19#include "todoplugin.h" 17#include "todoplugin.h"
@@ -21,3 +19,2 @@
21 19
22
23TodolistPlugin::TodolistPlugin() { 20TodolistPlugin::TodolistPlugin() {
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
@@ -3,3 +3,3 @@
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
@@ -19,2 +19,8 @@
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>
@@ -23,6 +29,3 @@
23 29
24#include <opie/oclickablelabel.h> 30using namespace Opie;
25#include <opie/todayplugininterface.h>
26
27#include "todopluginwidget.h"
28 31
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
@@ -19,7 +19,7 @@
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
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
@@ -3,3 +3,3 @@
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
@@ -38,3 +38,3 @@ QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa
38 return QS_FALSE; 38 return QS_FALSE;
39 39
40 return QS_OK; 40 return QS_OK;
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
@@ -3,3 +3,3 @@
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
@@ -19,3 +19,3 @@
19 19
20#include <opie/todayplugininterface.h> 20#include <opie2/todayplugininterface.h>
21 21
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
@@ -31,3 +31,3 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
31 } 31 }
32 todo = new OTodoAccess(); 32 todo = new OPimTodoAccess();
33 todo->load(); 33 todo->load();
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
@@ -21,5 +21,6 @@
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
@@ -43,5 +44,5 @@ private:
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
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
@@ -3,3 +3,3 @@
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
@@ -16,4 +16,2 @@
16 16
17
18
19#define QTOPIA_INTERNAL_LANGLIST 17#define QTOPIA_INTERNAL_LANGLIST
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
@@ -3,3 +3,3 @@
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
@@ -15,4 +15,2 @@
15 ***************************************************************************/ 15 ***************************************************************************/
16
17
18#ifndef TODAY_H 16#ifndef TODAY_H
@@ -20,6 +18,2 @@
20 18
21#include <qscrollview.h>
22#include <qvbox.h>
23
24#include <qpe/qlibrary.h>
25 19
@@ -28,7 +22,13 @@
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
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
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe -lopie 9LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
10 10
@@ -14 +14,2 @@ include ( $(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
@@ -3,3 +3,3 @@
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
@@ -18,7 +18,6 @@
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
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
@@ -3,3 +3,3 @@
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
@@ -19,4 +19,5 @@
19 19
20#include <opie2/oclickablelabel.h>
21
20#include <qlayout.h> 22#include <qlayout.h>
21#include <opie/oclickablelabel.h>
22 23
@@ -30,2 +31,5 @@ class QBoxLayout;
30 31
32using namespace Opie;
33
34
31class TodayBase : public QWidget 35class TodayBase : public QWidget
@@ -41,3 +45,3 @@ public:
41 QVBoxLayout* layout; 45 QVBoxLayout* layout;
42 OClickableLabel* OwnerField; 46 Opie::OClickableLabel* OwnerField;
43 QLabel* Frame; 47 QLabel* Frame;
@@ -49,5 +53,2 @@ public:
49 53
50protected:
51
52
53}; 54};
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
@@ -3,3 +3,3 @@
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
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
@@ -3,3 +3,3 @@
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
@@ -19,2 +19,6 @@
19 19
20#include "todayconfigmiscbase.h"
21
22#include <opie2/otabwidget.h>
23
20#include <qvariant.h> 24#include <qvariant.h>
@@ -22,6 +26,2 @@
22#include <qlistview.h> 26#include <qlistview.h>
23#include <opie/otabwidget.h>
24
25
26#include "todayconfigmiscbase.h"
27 27