Commit 65860d49dc051c00726acf109cd08f8c11a538cb

datebook2 -> datebook move step 3.1: fix holiday plugins

  Seems I missed a few things...


5	5	#include <qobject.h>
6	6
7	7	Birthday::Birthday()
8		:Opie::Datebook::HolidayPlugin2()
	8	:Opie::Datebook::HolidayPlugin()
9	9	{
10	10	m_contactdb = new Opie::OPimContactAccess("addressplugin");
11	11	m_contactdb->load();


1	1	#ifndef __DUMMY_HOLIDAY_H
2	2	#define __DUMMY_HOLIDAY_H
3	3
4		#include <opie2/oholidayplugin2.h>
5		#include <opie2/oholidaypluginif2.h>
	4	#include <opie2/oholidayplugin.h>
	5	#include <opie2/oholidaypluginif.h>
6	6	#include <opie2/ocontactaccess.h>
7	7
8	8	#include <qmap.h>
9	9
10		class Birthday:public Opie::Datebook::HolidayPlugin2
	10	class Birthday:public Opie::Datebook::HolidayPlugin
11	11	{
12	12	typedef QMap<QDate,QStringList> tDayMap;
13	13


3	3
4	4	#include "hlist.h"
5	5
6		#include <opie2/oholidayplugin2.h>
7		#include <opie2/oholidaypluginif2.h>
	6	#include <opie2/oholidayplugin.h>
	7	#include <opie2/oholidaypluginif.h>
8	8
9	9	#include <qmap.h>
10	10
11		class ChrisHoliday:public Opie::Datebook::HolidayPlugin2
	11	class ChrisHoliday:public Opie::Datebook::HolidayPlugin
12	12	{
13	13	typedef QMap<QDate,QStringList> tDayMap;
14	14
15	15	public:
16		ChrisHoliday():Opie::Datebook::HolidayPlugin2(){_lastyear=0;}
	16	ChrisHoliday():Opie::Datebook::HolidayPlugin(){_lastyear=0;}
17	17	virtual ~ChrisHoliday(){}
18	18
19	19	virtual QString description();


9	9	#include <qpe/qpeapplication.h>
10	10
11	11	NationalHoliday::NationalHoliday()
12		:Opie::Datebook::HolidayPlugin2()
	12	:Opie::Datebook::HolidayPlugin()
13	13	{
14	14	_lastyear=0;
15	15	init_done = false;


3	3
4	4	#include "nationalcfg.h"
5	5
6		#include <opie2/oholidayplugin2.h>
7		#include <opie2/oholidaypluginif2.h>
	6	#include <opie2/oholidayplugin.h>
	7	#include <opie2/oholidaypluginif.h>
8	8	#include <opie2/oholidayplugincfgwidget.h>
9	9
10	10	#include <qmap.h>
11	11	#include <qstringlist.h>
12	12
13		class NationalHoliday:public Opie::Datebook::HolidayPlugin2
	13	class NationalHoliday:public Opie::Datebook::HolidayPlugin
14	14	{
15	15
16	16	public:


52	52
53	53	#define EXPORT_HOLIDAY_PLUGIN( Plugin ) \
54	54	Q_EXPORT_INTERFACE() { \
55		Q_CREATE_INSTANCE( Opie::Datebook::HolidayPluginWrapper2<Plugin> ) \
	55	Q_CREATE_INSTANCE( Opie::Datebook::HolidayPluginWrapper<Plugin> ) \
56	56	}
57	57	}
58	58	}