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 @@
 #ifndef _HOLIDAY_PLUGIN_H
 #define _HOLIDAY_PLUGIN_H
 
-namespace Opie {
-namespace Datebook {
-
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qdate.h>
+#include <qdatetime.h>
+
+namespace Opie {
+namespace Datebook {
 
 class HolidayPlugin
 {
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 @@
 #ifndef _O_HOLIDAY_PLUGIN_IF_H
 #define _O_HOLIDAY_PLUGIN_IF_H
-
 #include <opie2/odebug.h>
-
 #include <qpe/qcom.h>
+#include <qpe/quuid.h>
 
 #ifndef QT_NO_COMPONENT
 //"b981b4e9-6d5d-4ee0-a193-f8d0e443809b"
-#define IID_HOLIDAY_PLUGIN QUuid(0xb981b4e9, 0x6d5d, 0x4ee0 0xa1, 0x93,0xf8, 0xd0, 0xe4, 0x43, 0x80, 0x9b)
+#define IID_HOLIDAY_PLUGIN QUuid( 0xb981b4e9, 0x6d5d, 0x4ee0, 0xa1, 0x93,0xf8, 0xd0, 0xe4, 0x43, 0x80, 0x9b)
 #endif
 
 namespace Opie {
@@ -24,7 +23,7 @@ public:
    virtual HolidayPlugin*plugin()=0;
 };
 
-template<class T>HolidayPluginWrapper:public HolidayPluginIf
+template<class T> class HolidayPluginWrapper:public HolidayPluginIf
 {
 public:
     HolidayPluginWrapper():HolidayPluginIf(),_plugin(0){}
@@ -33,7 +32,7 @@ public:
     QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface ) {
         odebug << "HolidayPluginWrapper::queryInterface()" << oendl;
         *iface = 0;
-        if (uuid==IID_HOLIDAY_PLUGIN||uuid==IID_QUnknown) {
+        if (uuid == IID_HOLIDAY_PLUGIN || uuid == IID_QUnknown) {
             *iface = this;
         } else {
             return  QS_FALSE;