-rw-r--r-- | libopie2/opiepim/ui/oholidayplugin.h | 8 | ||||
-rw-r--r-- | libopie2/opiepim/ui/oholidaypluginif.h | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libopie2/opiepim/ui/oholidayplugin.h b/libopie2/opiepim/ui/oholidayplugin.h index f4958c8..50dfe13 100644 --- a/libopie2/opiepim/ui/oholidayplugin.h +++ b/libopie2/opiepim/ui/oholidayplugin.h | |||
@@ -1,17 +1,17 @@ | |||
1 | #ifndef _HOLIDAY_PLUGIN_H | 1 | #ifndef _HOLIDAY_PLUGIN_H |
2 | #define _HOLIDAY_PLUGIN_H | 2 | #define _HOLIDAY_PLUGIN_H |
3 | 3 | ||
4 | namespace Opie { | ||
5 | namespace Datebook { | ||
6 | |||
7 | #include <qstring.h> | 4 | #include <qstring.h> |
8 | #include <qstringlist.h> | 5 | #include <qstringlist.h> |
9 | #include <qdate.h> | 6 | #include <qdatetime.h> |
7 | |||
8 | namespace Opie { | ||
9 | namespace Datebook { | ||
10 | 10 | ||
11 | class HolidayPlugin | 11 | class HolidayPlugin |
12 | { | 12 | { |
13 | public: | 13 | public: |
14 | HolidayPlugin(){}; | 14 | HolidayPlugin(){}; |
15 | virtual ~HolidayPlugin(){}; | 15 | virtual ~HolidayPlugin(){}; |
16 | virtual QString description()=0; | 16 | virtual QString description()=0; |
17 | virtual QStringList entries(const QDate&)=0; | 17 | virtual QStringList entries(const QDate&)=0; |
diff --git a/libopie2/opiepim/ui/oholidaypluginif.h b/libopie2/opiepim/ui/oholidaypluginif.h index 6d36f08..874e5a3 100644 --- a/libopie2/opiepim/ui/oholidaypluginif.h +++ b/libopie2/opiepim/ui/oholidaypluginif.h | |||
@@ -1,35 +1,34 @@ | |||
1 | #ifndef _O_HOLIDAY_PLUGIN_IF_H | 1 | #ifndef _O_HOLIDAY_PLUGIN_IF_H |
2 | #define _O_HOLIDAY_PLUGIN_IF_H | 2 | #define _O_HOLIDAY_PLUGIN_IF_H |
3 | |||
4 | #include <opie2/odebug.h> | 3 | #include <opie2/odebug.h> |
5 | |||
6 | #include <qpe/qcom.h> | 4 | #include <qpe/qcom.h> |
5 | #include <qpe/quuid.h> | ||
7 | 6 | ||
8 | #ifndef QT_NO_COMPONENT | 7 | #ifndef QT_NO_COMPONENT |
9 | //"b981b4e9-6d5d-4ee0-a193-f8d0e443809b" | 8 | //"b981b4e9-6d5d-4ee0-a193-f8d0e443809b" |
10 | #define IID_HOLIDAY_PLUGIN QUuid(0xb981b4e9, 0x6d5d, 0x4ee0 0xa1, 0x93,0xf8, 0xd0, 0xe4, 0x43, 0x80, 0x9b) | 9 | #define IID_HOLIDAY_PLUGIN QUuid( 0xb981b4e9, 0x6d5d, 0x4ee0, 0xa1, 0x93,0xf8, 0xd0, 0xe4, 0x43, 0x80, 0x9b) |
11 | #endif | 10 | #endif |
12 | 11 | ||
13 | namespace Opie { | 12 | namespace Opie { |
14 | namespace Datebook { | 13 | namespace Datebook { |
15 | 14 | ||
16 | class HolidayPlugin; | 15 | class HolidayPlugin; |
17 | 16 | ||
18 | class HolidayPluginIf:public QUnknownInterface | 17 | class HolidayPluginIf:public QUnknownInterface |
19 | { | 18 | { |
20 | public: | 19 | public: |
21 | HolidayPluginIf():QUnknownInterface(){} | 20 | HolidayPluginIf():QUnknownInterface(){} |
22 | virtual ~HolidayPluginIf(){} | 21 | virtual ~HolidayPluginIf(){} |
23 | 22 | ||
24 | virtual HolidayPlugin*plugin()=0; | 23 | virtual HolidayPlugin*plugin()=0; |
25 | }; | 24 | }; |
26 | 25 | ||
27 | template<class T>HolidayPluginWrapper:public HolidayPluginIf | 26 | template<class T> class HolidayPluginWrapper:public HolidayPluginIf |
28 | { | 27 | { |
29 | public: | 28 | public: |
30 | HolidayPluginWrapper():HolidayPluginIf(),_plugin(0){} | 29 | HolidayPluginWrapper():HolidayPluginIf(),_plugin(0){} |
31 | virtual ~HolidayPluginWrapper(){if (_plugin) delete _plugin;} | 30 | virtual ~HolidayPluginWrapper(){if (_plugin) delete _plugin;} |
32 | 31 | ||
33 | QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface ) { | 32 | QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface ) { |
34 | odebug << "HolidayPluginWrapper::queryInterface()" << oendl; | 33 | odebug << "HolidayPluginWrapper::queryInterface()" << oendl; |
35 | *iface = 0; | 34 | *iface = 0; |