summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ui/oholidayplugin.h8
-rw-r--r--libopie2/opiepim/ui/oholidaypluginif.h9
2 files changed, 8 insertions, 9 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,12 +1,12 @@
1#ifndef _HOLIDAY_PLUGIN_H 1#ifndef _HOLIDAY_PLUGIN_H
2#define _HOLIDAY_PLUGIN_H 2#define _HOLIDAY_PLUGIN_H
3 3
4namespace Opie {
5namespace 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
8namespace Opie {
9namespace Datebook {
10 10
11class HolidayPlugin 11class HolidayPlugin
12{ 12{
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,13 +1,12 @@
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
13namespace Opie { 12namespace Opie {
@@ -24,7 +23,7 @@ public:
24 virtual HolidayPlugin*plugin()=0; 23 virtual HolidayPlugin*plugin()=0;
25}; 24};
26 25
27template<class T>HolidayPluginWrapper:public HolidayPluginIf 26template<class T> class HolidayPluginWrapper:public HolidayPluginIf
28{ 27{
29public: 28public:
30 HolidayPluginWrapper():HolidayPluginIf(),_plugin(0){} 29 HolidayPluginWrapper():HolidayPluginIf(),_plugin(0){}
@@ -33,7 +32,7 @@ public:
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;
36 if (uuid==IID_HOLIDAY_PLUGIN||uuid==IID_QUnknown) { 35 if (uuid == IID_HOLIDAY_PLUGIN || uuid == IID_QUnknown) {
37 *iface = this; 36 *iface = this;
38 } else { 37 } else {
39 return QS_FALSE; 38 return QS_FALSE;