Diffstat (limited to 'core/pim/datebook/holiday/national/nationalholiday.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/holiday/national/nationalholiday.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/pim/datebook/holiday/national/nationalholiday.cpp b/core/pim/datebook/holiday/national/nationalholiday.cpp index 26cd913..52f3489 100644 --- a/core/pim/datebook/holiday/national/nationalholiday.cpp +++ b/core/pim/datebook/holiday/national/nationalholiday.cpp | |||
@@ -1,4 +1,5 @@ | |||
1 | #include "nationalholiday.h" | 1 | #include "nationalholiday.h" |
2 | #include "nationalcfg.h" | 2 | #include "nationalcfg.h" |
3 | #include "nationalcfgwidget.h" | ||
3 | 4 | ||
4 | #include <opie2/odebug.h> | 5 | #include <opie2/odebug.h> |
@@ -27,5 +28,4 @@ void NationalHoliday::init() | |||
27 | cfg.setGroup("entries"); | 28 | cfg.setGroup("entries"); |
28 | files = cfg.readListEntry("files"); | 29 | files = cfg.readListEntry("files"); |
29 | odebug << "Read " << files << oendl; | ||
30 | } | 30 | } |
31 | 31 | ||
@@ -33,10 +33,12 @@ void NationalHoliday::load_days() | |||
33 | { | 33 | { |
34 | if (init_done) return; | 34 | if (init_done) return; |
35 | Config cfg("nationaldays"); | ||
36 | cfg.setGroup("entries"); | ||
35 | QStringList::ConstIterator it; | 37 | QStringList::ConstIterator it; |
36 | NHcfg readit; | 38 | NHcfg readit; |
37 | for (it=files.begin();it!=files.end();++it) { | 39 | for (it=files.begin();it!=files.end();++it) { |
38 | odebug << QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it) << oendl; | 40 | if (!readit.load(QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it))) { |
39 | if (!readit.load(QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it))) | ||
40 | continue; | 41 | continue; |
42 | } | ||
41 | tholidaylist::ConstIterator it; | 43 | tholidaylist::ConstIterator it; |
42 | for (it=readit.days().begin();it!=readit.days().end();++it) { | 44 | for (it=readit.days().begin();it!=readit.days().end();++it) { |
@@ -121,3 +123,8 @@ QValueList<EffectiveEvent> NationalHoliday::events(const QDate&start,const QDate | |||
121 | } | 123 | } |
122 | 124 | ||
125 | Opie::Datebook::HolidayPluginConfigWidget*NationalHoliday::configWidget(QWidget *parent, const char *name, QWidget::WFlags fl) | ||
126 | { | ||
127 | return new NationalHolidayConfigWidget(parent,name,fl); | ||
128 | } | ||
129 | |||
123 | EXPORT_HOLIDAY_PLUGIN(NationalHoliday); | 130 | EXPORT_HOLIDAY_PLUGIN(NationalHoliday); |