work on plugins finished.

these plugins now may have a config-widget (sorry guys - I had to change the
plugininterface and so the UUID again.)
the plugin for nationalholidays now has such a widget, the datebook will insert
configwidgets into its settingsdialog.
corrected the .pro file of opiepim2/ui so it contains the header/cpp files
for that pluginsystem.

1 files changed, 2 insertions, 4 deletions

diff --git a/libopie2/opiepim/ui/oholidaypluginif.h b/libopie2/opiepim/ui/oholidaypluginif.h
index 825d3ad..618d371 100644
--- a/libopie2/opiepim/ui/oholidaypluginif.h
+++ b/libopie2/opiepim/ui/oholidaypluginif.h
@@ -1,44 +1,43 @@
 #ifndef _O_HOLIDAY_PLUGIN_IF_H
 #define _O_HOLIDAY_PLUGIN_IF_H
 #include <opie2/odebug.h>
 #include <qpe/qcom.h>
 
 #ifndef QT_NO_COMPONENT
-//017f90d4-34fc-4dc5-aed7-498c6da6571e
-#define IID_HOLIDAY_PLUGIN QUuid(0x017f90d4,0x34fc,0x4dc5,0xae,0xd7,0x49,0x8c,0x6d,0xa6,0x57,0x1e)
+//c0a5f73f-975e-4492-9285-af555284c4ab
+#define IID_HOLIDAY_PLUGIN        QUuid(0xc0a5f73f,0x975e,0x4492,0x92,0x85,0xaf,0x55,0x52,0x84,0xc4,0xab)
 #endif
 
 namespace Opie {
 namespace Datebook {
 
 class HolidayPlugin;
 
 class HolidayPluginIf:public QUnknownInterface
 {
 public:
    HolidayPluginIf():QUnknownInterface(){}
    virtual ~HolidayPluginIf(){}
    
    virtual HolidayPlugin*plugin()=0;
 };
 
 template<class T> class HolidayPluginWrapper:public HolidayPluginIf
 {
 public:
     HolidayPluginWrapper():HolidayPluginIf(),_plugin(0){}
     virtual ~HolidayPluginWrapper(){if (_plugin) delete _plugin;}
 
     QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface ) {
-        odebug << "HolidayPluginWrapper::queryInterface()" << oendl;
         *iface = 0;
         if (uuid == IID_HOLIDAY_PLUGIN || uuid == IID_QUnknown) {
             *iface = this;
         } else {
             return  QS_FALSE;
         }
         if (*iface) (*iface)->addRef();
         return QS_OK;
     }
 
     // from qcom
     Q_REFCOUNT
@@ -46,17 +45,16 @@ public:
     virtual T*plugin() {
         if (!_plugin) {_plugin = new T();}
         return _plugin;
     }
 protected:
     T*_plugin;
 };
 
 #define EXPORT_HOLIDAY_PLUGIN(  Plugin ) \
     Q_EXPORT_INTERFACE() { \
     Q_CREATE_INSTANCE(  Opie::Datebook::HolidayPluginWrapper<Plugin> ) \
     }
-
 }
 }
 #endif