author | alwin <alwin> | 2005-03-16 11:15:08 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-16 11:15:08 (UTC) |
commit | f366c924a105ad41e974af959b23b0d30c603234 (patch) (side-by-side diff) | |
tree | 52c6f7e67add698a7fd296b76318dc2fba040139 | |
parent | 954092e015c34ea0848f41d8acb7b957b12d6384 (diff) | |
download | opie-f366c924a105ad41e974af959b23b0d30c603234.zip opie-f366c924a105ad41e974af959b23b0d30c603234.tar.gz opie-f366c924a105ad41e974af959b23b0d30c603234.tar.bz2 |
sorry, guys, checked in wrong files
-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,24 +1,24 @@ #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 { public: HolidayPlugin(){}; virtual ~HolidayPlugin(){}; virtual QString description()=0; virtual QStringList entries(const QDate&)=0; virtual QStringList entries(unsigned year, unsigned month, unsigned day)=0; }; } } #endif 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,64 +1,63 @@ #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 { namespace Datebook { class HolidayPlugin; class HolidayPluginIf:public QUnknownInterface { public: HolidayPluginIf():QUnknownInterface(){} virtual ~HolidayPluginIf(){} virtual HolidayPlugin*plugin()=0; }; -template<class T>HolidayPluginWrapper:public HolidayPluginIf +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 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 |