Diffstat (limited to 'core/pim/today/plugins/todolist') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/todolist/todolist.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 5 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 13 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginimpl.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginimpl.h | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.h | 11 |
8 files changed, 24 insertions, 23 deletions
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 | ||
12 | INCLUDEPATH += $(OPIEDIR)/include \ | 12 | INCLUDEPATH += $(OPIEDIR)/include \ |
13 | ../ ../library | 13 | ../ ../library |
14 | DEPENDPATH += $(OPIEDIR)/include \ | 14 | 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 |
20 | TARGET = todaytodolistplugin | 20 | TARGET = todaytodolistplugin |
21 | 21 | ||
22 | TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ | 22 | TRANSLATIONS = ../../../../../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 | |||
23 | TodolistPlugin::TodolistPlugin() { | 20 | TodolistPlugin::TodolistPlugin() { |
24 | } | 21 | } |
25 | 22 | ||
26 | TodolistPlugin::~TodolistPlugin() { | 23 | TodolistPlugin::~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> | 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 { |
30 | 33 | ||
31 | public: | 34 | public: |
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 | ||
26 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
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() { | |||
33 | QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { | 33 | QRESULT 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 | ||
44 | Q_EXPORT_INTERFACE() { | 44 | Q_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 | ||
22 | class TodolistPlugin; | 22 | class TodolistPlugin; |
23 | 23 | ||
24 | class TodolistPluginImpl : public TodayPluginInterface{ | 24 | class TodolistPluginImpl : public TodayPluginInterface{ |
25 | 25 | ||
26 | public: | 26 | public: |
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 | ||
25 | using namespace Opie; | ||
25 | 26 | ||
26 | class TodolistPluginWidget : public QWidget { | 27 | class TodolistPluginWidget : public QWidget { |
27 | 28 | ||
28 | Q_OBJECT | 29 | Q_OBJECT |
29 | 30 | ||
30 | public: | 31 | public: |
@@ -38,15 +39,15 @@ protected slots: | |||
38 | void startTodolist(); | 39 | void startTodolist(); |
39 | 40 | ||
40 | private: | 41 | private: |
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 | }; |