-rw-r--r-- | core/pim/datebook/holiday/national/nationalcfg.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/holiday/national/nationalcfg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/datebook/holiday/national/nationalcfg.cpp b/core/pim/datebook/holiday/national/nationalcfg.cpp index 33e9db3..5e8ec29 100644 --- a/core/pim/datebook/holiday/national/nationalcfg.cpp +++ b/core/pim/datebook/holiday/national/nationalcfg.cpp | |||
@@ -151,221 +151,221 @@ bool NHcfg::setName(const QXmlAttributes&attr) | |||
151 | return false; | 151 | return false; |
152 | } | 152 | } |
153 | _contentname = attr.value(nindx); | 153 | _contentname = attr.value(nindx); |
154 | return true; | 154 | return true; |
155 | } | 155 | } |
156 | 156 | ||
157 | bool NHcfg::parsevalue(const QString&name,const QXmlAttributes&attr) | 157 | bool NHcfg::parsevalue(const QString&name,const QXmlAttributes&attr) |
158 | { | 158 | { |
159 | if (name != _key_entry && name != _key_calc) {err = QString("Not a valid entry (%1)").arg(name); return false;} | 159 | if (name != _key_entry && name != _key_calc) {err = QString("Not a valid entry (%1)").arg(name); return false;} |
160 | 160 | ||
161 | int nindex = attr.index(_content_name); | 161 | int nindex = attr.index(_content_name); |
162 | int dindex = attr.index(_content_date); | 162 | int dindex = attr.index(_content_date); |
163 | int tindex = attr.index(_content_type); | 163 | int tindex = attr.index(_content_type); |
164 | 164 | ||
165 | if (nindex == -1) { | 165 | if (nindex == -1) { |
166 | err = QString("Listentry %1 is invalid (name missing)").arg(counter); | 166 | err = QString("Listentry %1 is invalid (name missing)").arg(counter); |
167 | return false; | 167 | return false; |
168 | } | 168 | } |
169 | m_currentEntry.setName(attr.value(nindex)); | 169 | m_currentEntry.setName(attr.value(nindex)); |
170 | 170 | ||
171 | if (tindex != -1 && attr.value(tindex)==_content_float) { | 171 | if (tindex != -1 && attr.value(tindex)==_content_float) { |
172 | m_currentEntry.setType(NHentry::floating); | 172 | m_currentEntry.setType(NHentry::floating); |
173 | return true; | 173 | return true; |
174 | } | 174 | } |
175 | 175 | ||
176 | if (dindex == -1) { | 176 | if (dindex == -1) { |
177 | err = QString("Listentry %1 is invalid ").arg(counter);return false; | 177 | err = QString("Listentry %1 is invalid ").arg(counter);return false; |
178 | } | 178 | } |
179 | 179 | ||
180 | QString txt = attr.value(nindex); | 180 | QString txt = attr.value(nindex); |
181 | QString dstring = attr.value(dindex); | 181 | QString dstring = attr.value(dindex); |
182 | QStringList e = QStringList::split("-",dstring); | 182 | QStringList e = QStringList::split("-",dstring); |
183 | if (e.count()!=2){err=QString("Datestring %1 is invalid (entry %2)").arg(dstring).arg(counter);return false;} | 183 | if (e.count()!=2){err=QString("Datestring %1 is invalid (entry %2)").arg(dstring).arg(counter);return false;} |
184 | QDate d(0,e[0].toInt(),e[1].toInt()); | 184 | QDate d(0,e[0].toInt(),e[1].toInt()); |
185 | m_currentEntry.setDate(d); | 185 | m_currentEntry.setDate(d); |
186 | return true; | 186 | return true; |
187 | } | 187 | } |
188 | 188 | ||
189 | bool NHcfg::parseCalc(const QString&name,const QXmlAttributes&attr) | 189 | bool NHcfg::parseCalc(const QString&name,const QXmlAttributes&attr) |
190 | { | 190 | { |
191 | ++level; | 191 | ++level; |
192 | int vindex = attr.index(_content_value); | 192 | int vindex = attr.index(_content_value); |
193 | if (vindex == -1) { | 193 | if (vindex == -1) { |
194 | err = QString("Value for element %1 on entry %2 is missing").arg(name).arg(counter); | 194 | err = QString("Value for element %1 on entry %2 is missing").arg(name).arg(counter); |
195 | return false; | 195 | return false; |
196 | } | 196 | } |
197 | int what_c =0; | 197 | int what_c =0; |
198 | QString what = name.lower(); | 198 | QString what = name.lower(); |
199 | QString value; | 199 | QString value; |
200 | if (what == _content_date) { | 200 | if (what == _content_date) { |
201 | what_c = 1; | 201 | what_c = 1; |
202 | } else if (what == _content_weekd) { | 202 | } else if (what == _content_weekd) { |
203 | what_c = 2; | 203 | what_c = 2; |
204 | } else if (what == _content_offset) { | 204 | } else if (what == _content_offset) { |
205 | what_c = 3; | 205 | what_c = 3; |
206 | } else if (what == _content_dayofmonth) { | 206 | } else if (what == _content_dayofmonth) { |
207 | what_c = 4; | 207 | what_c = 4; |
208 | } else if (what == _content_datedep) { | 208 | } else if (what == _content_datedep) { |
209 | what_c = 5; | 209 | what_c = 5; |
210 | } else if (what == _content_month) { | 210 | } else if (what == _content_month) { |
211 | what_c = 6; | 211 | what_c = 6; |
212 | } | 212 | } |
213 | if (what_c == 0) { | 213 | if (what_c == 0) { |
214 | err = QString("Unknown element %1 on entry %2").arg(name).arg(counter); | 214 | err = QString("Unknown element %1 on entry %2").arg(name).arg(counter); |
215 | return false; | 215 | return false; |
216 | } | 216 | } |
217 | value = attr.value(vindex).lower(); | 217 | value = attr.value(vindex).lower(); |
218 | QStringList e; | 218 | QStringList e; |
219 | QDate d; | 219 | QDate d; |
220 | bool dotformat = false; | 220 | bool dotformat = false; |
221 | switch (what_c) { | 221 | switch (what_c) { |
222 | case 1: | 222 | case 1: |
223 | if (value != "easter") { | 223 | if (value != "easter") { |
224 | e = QStringList::split("-",value); | 224 | e = QStringList::split("-",value); |
225 | if (e.count()!=2) { | 225 | if (e.count()!=2) { |
226 | e = QStringList::split(".",value); | 226 | e = QStringList::split(".",value); |
227 | dotformat = true; | 227 | dotformat = true; |
228 | } | 228 | } |
229 | if (e.count()!=2){err=QString("Datestring %1 is invalid (entry %2)").arg(value).arg(counter);return false;} | 229 | if (e.count()!=2){err=QString("Datestring %1 is invalid (entry %2)").arg(value).arg(counter);return false;} |
230 | if (!dotformat) { | 230 | if (!dotformat) { |
231 | d=QDate(0,e[0].toInt(),e[1].toInt()); | 231 | d=QDate(0,e[0].toInt(),e[1].toInt()); |
232 | } else { | 232 | } else { |
233 | d=QDate(0,e[1].toInt(),e[0].toInt()); | 233 | d=QDate(0,e[1].toInt(),e[0].toInt()); |
234 | } | 234 | } |
235 | } else { | 235 | } else { |
236 | d=QDate(9999,1,1); | 236 | d=QDate(9999,1,1); |
237 | } | 237 | } |
238 | m_currentEntry.setDate(d); | 238 | m_currentEntry.setDate(d); |
239 | break; | 239 | break; |
240 | case 2: | 240 | case 2: |
241 | m_currentEntry.setWeekday(value); | 241 | m_currentEntry.setWeekday(value); |
242 | break; | 242 | break; |
243 | case 3: | 243 | case 3: |
244 | m_currentEntry.setOffet(value.toInt()); | 244 | m_currentEntry.setOffet(value.toInt()); |
245 | break; | 245 | break; |
246 | case 4: | 246 | case 4: |
247 | m_currentEntry.setDayofmonth(value); | 247 | m_currentEntry.setDayofmonth(value); |
248 | break; | 248 | break; |
249 | case 5: | 249 | case 5: |
250 | m_currentEntry.setDaydep(value); | 250 | m_currentEntry.setDaydep(value); |
251 | break; | 251 | break; |
252 | case 6: | 252 | case 6: |
253 | m_currentEntry.setMonth(value); | 253 | m_currentEntry.setMonth(value); |
254 | break; | 254 | break; |
255 | } | 255 | } |
256 | return true; | 256 | return true; |
257 | } | 257 | } |
258 | 258 | ||
259 | bool NHcfg::endElement(const QString&, const QString&,const QString& name) | 259 | bool NHcfg::endElement(const QString&, const QString&,const QString& name) |
260 | { | 260 | { |
261 | // odebug << "End element: " << name << oendl; | 261 | // odebug << "End element: " << name << oendl; |
262 | if (name==_key_entry) { | 262 | if (name==_key_entry) { |
263 | if (m_currentEntry.type()==NHentry::fix) { | 263 | if (m_currentEntry.type()==NHentry::fix) { |
264 | currentFixList.append(m_currentEntry); | 264 | currentFixList.append(m_currentEntry); |
265 | } else { | 265 | } else { |
266 | currentFloatList.append(m_currentEntry); | 266 | currentFloatList.append(m_currentEntry); |
267 | // odebug << "Floatlist count " << currentFloatList.count() << oendl; | 267 | // odebug << "Floatlist count " << currentFloatList.count() << oendl; |
268 | } | 268 | } |
269 | } else if (name==_key_calc) { | 269 | } else if (name==_key_calc) { |
270 | 270 | ||
271 | } | 271 | } |
272 | if (stage>=3) { | 272 | if (stage>=3) { |
273 | --level; | 273 | --level; |
274 | } | 274 | } |
275 | // odebug << "Level == " << level << oendl; | 275 | // odebug << "Level == " << level << oendl; |
276 | return true; | 276 | return true; |
277 | } | 277 | } |
278 | 278 | ||
279 | QString NHcfg::errorString() const | 279 | QString NHcfg::errorString() |
280 | { | 280 | { |
281 | return err; | 281 | return err; |
282 | } | 282 | } |
283 | 283 | ||
284 | NHentry::NHentry() | 284 | NHentry::NHentry() |
285 | :m_Type(fix) | 285 | :m_Type(fix) |
286 | { | 286 | { |
287 | m_Offset=0; | 287 | m_Offset=0; |
288 | } | 288 | } |
289 | 289 | ||
290 | NHentry::~NHentry() | 290 | NHentry::~NHentry() |
291 | {} | 291 | {} |
292 | 292 | ||
293 | void NHentry::setName(const QString&aName) | 293 | void NHentry::setName(const QString&aName) |
294 | { | 294 | { |
295 | m_Name = aName; | 295 | m_Name = aName; |
296 | } | 296 | } |
297 | 297 | ||
298 | const QString&NHentry::name()const | 298 | const QString&NHentry::name()const |
299 | { | 299 | { |
300 | return m_Name; | 300 | return m_Name; |
301 | } | 301 | } |
302 | 302 | ||
303 | void NHentry::setType(NHentry::entry_type aType) | 303 | void NHentry::setType(NHentry::entry_type aType) |
304 | { | 304 | { |
305 | m_Type = aType; | 305 | m_Type = aType; |
306 | } | 306 | } |
307 | 307 | ||
308 | NHentry::entry_type NHentry::type()const | 308 | NHentry::entry_type NHentry::type()const |
309 | { | 309 | { |
310 | return m_Type; | 310 | return m_Type; |
311 | } | 311 | } |
312 | 312 | ||
313 | void NHentry::setDate(const QDate&aDate) | 313 | void NHentry::setDate(const QDate&aDate) |
314 | { | 314 | { |
315 | m_Date = aDate; | 315 | m_Date = aDate; |
316 | } | 316 | } |
317 | 317 | ||
318 | const QDate&NHentry::date()const | 318 | const QDate&NHentry::date()const |
319 | { | 319 | { |
320 | return m_Date; | 320 | return m_Date; |
321 | } | 321 | } |
322 | 322 | ||
323 | void NHentry::setWeekday(const QString&aDay) | 323 | void NHentry::setWeekday(const QString&aDay) |
324 | { | 324 | { |
325 | m_Weekday = aDay; | 325 | m_Weekday = aDay; |
326 | } | 326 | } |
327 | 327 | ||
328 | const QString&NHentry::weekday()const | 328 | const QString&NHentry::weekday()const |
329 | { | 329 | { |
330 | return m_Weekday; | 330 | return m_Weekday; |
331 | } | 331 | } |
332 | 332 | ||
333 | void NHentry::setDayofmonth(const QString&aDay) | 333 | void NHentry::setDayofmonth(const QString&aDay) |
334 | { | 334 | { |
335 | m_Dayofmonth = aDay; | 335 | m_Dayofmonth = aDay; |
336 | } | 336 | } |
337 | 337 | ||
338 | const QString&NHentry::dayofmonth()const | 338 | const QString&NHentry::dayofmonth()const |
339 | { | 339 | { |
340 | return m_Dayofmonth; | 340 | return m_Dayofmonth; |
341 | } | 341 | } |
342 | 342 | ||
343 | void NHentry::setDaydep(const QString&dep) | 343 | void NHentry::setDaydep(const QString&dep) |
344 | { | 344 | { |
345 | m_Depth = dep; | 345 | m_Depth = dep; |
346 | } | 346 | } |
347 | 347 | ||
348 | const QString&NHentry::daydep()const | 348 | const QString&NHentry::daydep()const |
349 | { | 349 | { |
350 | return m_Depth; | 350 | return m_Depth; |
351 | } | 351 | } |
352 | 352 | ||
353 | void NHentry::setMonth(const QString&month) | 353 | void NHentry::setMonth(const QString&month) |
354 | { | 354 | { |
355 | m_Month = month; | 355 | m_Month = month; |
356 | } | 356 | } |
357 | 357 | ||
358 | const QString&NHentry::month()const | 358 | const QString&NHentry::month()const |
359 | { | 359 | { |
360 | return m_Month; | 360 | return m_Month; |
361 | } | 361 | } |
362 | 362 | ||
363 | void NHentry::setOffet(int aOffset) | 363 | void NHentry::setOffet(int aOffset) |
364 | { | 364 | { |
365 | m_Offset = aOffset; | 365 | m_Offset = aOffset; |
366 | } | 366 | } |
367 | 367 | ||
368 | const int NHentry::offset()const | 368 | const int NHentry::offset()const |
369 | { | 369 | { |
370 | return m_Offset; | 370 | return m_Offset; |
371 | } | 371 | } |
diff --git a/core/pim/datebook/holiday/national/nationalcfg.h b/core/pim/datebook/holiday/national/nationalcfg.h index 2aedd95..28e1fdd 100644 --- a/core/pim/datebook/holiday/national/nationalcfg.h +++ b/core/pim/datebook/holiday/national/nationalcfg.h | |||
@@ -1,75 +1,75 @@ | |||
1 | #ifndef _NATIONAL_CFG_H | 1 | #ifndef _NATIONAL_CFG_H |
2 | #define _NATIONAL_CFG_H | 2 | #define _NATIONAL_CFG_H |
3 | 3 | ||
4 | #include <qxml.h> | 4 | #include <qxml.h> |
5 | #include <qstringlist.h> | 5 | #include <qstringlist.h> |
6 | #include <qvaluelist.h> | 6 | #include <qvaluelist.h> |
7 | #include <qmap.h> | 7 | #include <qmap.h> |
8 | #include <qdatetime.h> | 8 | #include <qdatetime.h> |
9 | 9 | ||
10 | typedef QMap<QDate,QStringList> tholidaylist; | 10 | typedef QMap<QDate,QStringList> tholidaylist; |
11 | 11 | ||
12 | class NHentry | 12 | class NHentry |
13 | { | 13 | { |
14 | public: | 14 | public: |
15 | enum entry_type{fix,floating}; | 15 | enum entry_type{fix,floating}; |
16 | NHentry(); | 16 | NHentry(); |
17 | virtual ~NHentry(); | 17 | virtual ~NHentry(); |
18 | 18 | ||
19 | void setName(const QString&); | 19 | void setName(const QString&); |
20 | const QString&name()const; | 20 | const QString&name()const; |
21 | void setType(entry_type); | 21 | void setType(entry_type); |
22 | entry_type type()const; | 22 | entry_type type()const; |
23 | void setDate(const QDate&); | 23 | void setDate(const QDate&); |
24 | const QDate&date()const; | 24 | const QDate&date()const; |
25 | void setWeekday(const QString&); | 25 | void setWeekday(const QString&); |
26 | const QString&weekday()const; | 26 | const QString&weekday()const; |
27 | void setDayofmonth(const QString&); | 27 | void setDayofmonth(const QString&); |
28 | const QString&dayofmonth()const; | 28 | const QString&dayofmonth()const; |
29 | void setDaydep(const QString&); | 29 | void setDaydep(const QString&); |
30 | const QString&daydep()const; | 30 | const QString&daydep()const; |
31 | void setMonth(const QString&); | 31 | void setMonth(const QString&); |
32 | const QString&month()const; | 32 | const QString&month()const; |
33 | void setOffet(int); | 33 | void setOffet(int); |
34 | const int offset()const; | 34 | const int offset()const; |
35 | 35 | ||
36 | protected: | 36 | protected: |
37 | entry_type m_Type; | 37 | entry_type m_Type; |
38 | QString m_Name,m_Weekday,m_Dayofmonth,m_Depth,m_Month; | 38 | QString m_Name,m_Weekday,m_Dayofmonth,m_Depth,m_Month; |
39 | QDate m_Date; | 39 | QDate m_Date; |
40 | int m_Offset; | 40 | int m_Offset; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | typedef QValueList<NHentry> tentrylist; | 43 | typedef QValueList<NHentry> tentrylist; |
44 | 44 | ||
45 | class NHcfg:public QXmlDefaultHandler | 45 | class NHcfg:public QXmlDefaultHandler |
46 | { | 46 | { |
47 | public: | 47 | public: |
48 | NHcfg(); | 48 | NHcfg(); |
49 | virtual ~NHcfg(); | 49 | virtual ~NHcfg(); |
50 | 50 | ||
51 | bool load(const QString&); | 51 | bool load(const QString&); |
52 | const tentrylist&fixDates()const; | 52 | const tentrylist&fixDates()const; |
53 | const tentrylist&floatingDates()const; | 53 | const tentrylist&floatingDates()const; |
54 | 54 | ||
55 | virtual bool warning(const QXmlParseException& e); | 55 | virtual bool warning(const QXmlParseException& e); |
56 | virtual bool error(const QXmlParseException& e); | 56 | virtual bool error(const QXmlParseException& e); |
57 | virtual bool fatalError(const QXmlParseException& e); | 57 | virtual bool fatalError(const QXmlParseException& e); |
58 | virtual bool startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr); | 58 | virtual bool startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr); |
59 | virtual bool endElement(const QString&, const QString&,const QString& name); | 59 | virtual bool endElement(const QString&, const QString&,const QString& name); |
60 | virtual QString errorString()const; | 60 | virtual QString errorString(); |
61 | 61 | ||
62 | protected: | 62 | protected: |
63 | QString err,_contentname; | 63 | QString err,_contentname; |
64 | QString _path; | 64 | QString _path; |
65 | 65 | ||
66 | NHentry m_currentEntry; | 66 | NHentry m_currentEntry; |
67 | 67 | ||
68 | bool setName(const QXmlAttributes&); | 68 | bool setName(const QXmlAttributes&); |
69 | bool parsevalue(const QString&,const QXmlAttributes&); | 69 | bool parsevalue(const QString&,const QXmlAttributes&); |
70 | bool parseCalc(const QString&,const QXmlAttributes&); | 70 | bool parseCalc(const QString&,const QXmlAttributes&); |
71 | int stage,counter,level; | 71 | int stage,counter,level; |
72 | tentrylist currentFloatList,currentFixList; | 72 | tentrylist currentFloatList,currentFixList; |
73 | }; | 73 | }; |
74 | 74 | ||
75 | #endif | 75 | #endif |