-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginimpl.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginimpl.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginimpl.h | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/today.h | 2 | ||||
-rw-r--r-- | core/pim/today/todayconfigwidget.h | 21 | ||||
-rw-r--r-- | core/pim/today/todayplugininterface.h | 79 |
12 files changed, 11 insertions, 113 deletions
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 625c7cd..4d0f8e6 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h | |||
@@ -22,6 +22,5 @@ | |||
22 | 22 | ||
23 | #include <opie/oclickablelabel.h> | 23 | #include <opie/oclickablelabel.h> |
24 | 24 | #include <opie/todayplugininterface.h> | |
25 | #include "../../todayplugininterface.h" | ||
26 | 25 | ||
27 | class DatebookPlugin : public TodayPluginObject { | 26 | class DatebookPlugin : public TodayPluginObject { |
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index 99aa76c..feba9ee 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h | |||
@@ -7,5 +7,5 @@ | |||
7 | #include <qspinbox.h> | 7 | #include <qspinbox.h> |
8 | 8 | ||
9 | #include "../../todayconfigwidget.h" | 9 | #include <opie/todayconfigwidget.h> |
10 | 10 | ||
11 | class DatebookPluginConfig : public TodayConfigWidget { | 11 | class DatebookPluginConfig : public TodayConfigWidget { |
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h index 037dff4..4dbb318 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.h +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h | |||
@@ -18,5 +18,5 @@ | |||
18 | #define DATEBOOK_PLUGIN_IMPL_H | 18 | #define DATEBOOK_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include "../../todayplugininterface.h" | 20 | #include <opie/todayplugininterface.h> |
21 | 21 | ||
22 | class DatebookPlugin; | 22 | class DatebookPlugin; |
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index a27f4c7..d2a3dcb 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h | |||
@@ -25,6 +25,6 @@ | |||
25 | #include <opie/oclickablelabel.h> | 25 | #include <opie/oclickablelabel.h> |
26 | 26 | ||
27 | #include "../../todayplugininterface.h" | 27 | #include <opie/todayplugininterface.h> |
28 | #include "../../todayconfigwidget.h" | 28 | #include <opie/todayconfigwidget.h> |
29 | 29 | ||
30 | class MailPlugin : public TodayPluginObject { | 30 | class MailPlugin : public TodayPluginObject { |
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h index 9930e6e..54412b2 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.h +++ b/core/pim/today/plugins/mail/mailpluginimpl.h | |||
@@ -18,5 +18,5 @@ | |||
18 | #define MAIL_PLUGIN_IMPL_H | 18 | #define MAIL_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include "../../todayplugininterface.h" | 20 | #include <opie/todayplugininterface.h> |
21 | 21 | ||
22 | class MailPlugin; | 22 | class MailPlugin; |
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index 2c03389..0a6669f 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -23,6 +23,5 @@ | |||
23 | #include <opie/tododb.h> | 23 | #include <opie/tododb.h> |
24 | #include <opie/oclickablelabel.h> | 24 | #include <opie/oclickablelabel.h> |
25 | 25 | #include <opie/todayplugininterface.h> | |
26 | #include "../../todayplugininterface.h" | ||
27 | 26 | ||
28 | class TodolistPlugin : public TodayPluginObject { | 27 | class TodolistPlugin : public TodayPluginObject { |
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index 26557d5..4584ebe 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h | |||
@@ -21,5 +21,5 @@ | |||
21 | #include <qspinbox.h> | 21 | #include <qspinbox.h> |
22 | 22 | ||
23 | #include "../../todayconfigwidget.h" | 23 | #include <opie/todayconfigwidget.h> |
24 | 24 | ||
25 | class TodolistPluginConfig : public TodayConfigWidget { | 25 | class TodolistPluginConfig : public TodayConfigWidget { |
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h index 29e0294..c119be2 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.h +++ b/core/pim/today/plugins/todolist/todopluginimpl.h | |||
@@ -18,5 +18,5 @@ | |||
18 | #define TODOLIST_PLUGIN_IMPL_H | 18 | #define TODOLIST_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include "../../todayplugininterface.h" | 20 | #include <opie/todayplugininterface.h> |
21 | 21 | ||
22 | class TodolistPlugin; | 22 | class TodolistPlugin; |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index f5f88f8..35758d5 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -17,5 +17,5 @@ | |||
17 | 17 | ||
18 | #include "today.h" | 18 | #include "today.h" |
19 | #include "todayconfigwidget.h" | 19 | #include <opie/todayconfigwidget.h> |
20 | 20 | ||
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index b35c9b1..92512b9 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -30,5 +30,5 @@ | |||
30 | #include "todayconfig.h" | 30 | #include "todayconfig.h" |
31 | #include "todaybase.h" | 31 | #include "todaybase.h" |
32 | #include "todayplugininterface.h" | 32 | #include <opie/todayplugininterface.h> |
33 | 33 | ||
34 | class QVBoxLayout; | 34 | class QVBoxLayout; |
diff --git a/core/pim/today/todayconfigwidget.h b/core/pim/today/todayconfigwidget.h deleted file mode 100644 index 48cf379..0000000 --- a/core/pim/today/todayconfigwidget.h +++ b/dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | |||
2 | #ifndef CONFIG_WIDGET_H | ||
3 | #define CONFIG_WIDGET_H | ||
4 | |||
5 | |||
6 | class TodayConfigWidget : public QWidget { | ||
7 | |||
8 | |||
9 | public: | ||
10 | |||
11 | TodayConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {} ; | ||
12 | virtual ~TodayConfigWidget() {}; | ||
13 | |||
14 | /** | ||
15 | * Plugins need to reimplement this in the config widget | ||
16 | * Used when the config dialog is closed to write config stuff | ||
17 | */ | ||
18 | virtual void writeConfig() = 0; | ||
19 | }; | ||
20 | |||
21 | #endif | ||
diff --git a/core/pim/today/todayplugininterface.h b/core/pim/today/todayplugininterface.h deleted file mode 100644 index becb79c..0000000 --- a/core/pim/today/todayplugininterface.h +++ b/dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | |||
2 | #ifndef TODAY_PLUGIN_INTERFACE | ||
3 | #define TODAY_PLUGIN_INTERFACE | ||
4 | |||
5 | #include <qpe/qcom.h> | ||
6 | #include "todayconfigwidget.h" | ||
7 | |||
8 | class QString; | ||
9 | class QWidget; | ||
10 | |||
11 | #ifndef IID_TodayPluginInterface | ||
12 | #define IID_TodayPluginInterface QUuid( 0x70481804, 0x2b50, 0x4fba, 0x80, 0xbb, 0x0b, 0xf8, 0xdc, 0x72, 0x04, 0x14) | ||
13 | #endif | ||
14 | |||
15 | /** | ||
16 | * | ||
17 | * | ||
18 | * | ||
19 | */ | ||
20 | class TodayPluginObject { | ||
21 | |||
22 | Q_OBJECT | ||
23 | |||
24 | public: | ||
25 | |||
26 | virtual ~TodayPluginObject() {}; | ||
27 | |||
28 | /** | ||
29 | * The name if the plugin | ||
30 | */ | ||
31 | virtual QString pluginName() const = 0; | ||
32 | |||
33 | /** | ||
34 | * Version numbering | ||
35 | */ | ||
36 | virtual double versionNumber() const = 0; | ||
37 | |||
38 | |||
39 | virtual QString pixmapNameWidget() const = 0; | ||
40 | |||
41 | /** widget for the today view | ||
42 | * It _needs_ a parent here. | ||
43 | */ | ||
44 | virtual QWidget* widget( QWidget * ) = 0; | ||
45 | |||
46 | /** | ||
47 | * Pixmap used in the config widget | ||
48 | */ | ||
49 | virtual QString pixmapNameConfig() const = 0; | ||
50 | |||
51 | /** | ||
52 | * Config plugin widget - optional | ||
53 | * If the plugin has a config widget, it _needs_ a parent here. | ||
54 | */ | ||
55 | virtual TodayConfigWidget* configWidget( QWidget * ) = 0; | ||
56 | |||
57 | /** | ||
58 | * The application that should be assigned to the button (pixmap) | ||
59 | */ | ||
60 | virtual QString appName() const = 0; | ||
61 | |||
62 | /** | ||
63 | * minimum height the plugin at least should have | ||
64 | */ | ||
65 | // virtual int minHeight() const = 0; | ||
66 | |||
67 | /** | ||
68 | * maximum height that should be used before starting scrolling | ||
69 | */ | ||
70 | // virtual int maxHeight() const = 0; | ||
71 | |||
72 | }; | ||
73 | |||
74 | |||
75 | struct TodayPluginInterface : public QUnknownInterface { | ||
76 | virtual TodayPluginObject *guiPart() = 0; | ||
77 | }; | ||
78 | |||
79 | #endif | ||