author | eilers <eilers> | 2004-05-04 18:48:35 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-05-04 18:48:35 (UTC) |
commit | 04a7f91591987c01d312fbcaf6554ec6d728554d (patch) (unidiff) | |
tree | 98e10bb02d2e6c663f9c632f5e67783085683954 /libopie2 | |
parent | aa7023b05a3355f5c3d81d6efcccd8c4e7f4348c (diff) | |
download | opie-04a7f91591987c01d312fbcaf6554ec6d728554d.zip opie-04a7f91591987c01d312fbcaf6554ec6d728554d.tar.gz opie-04a7f91591987c01d312fbcaf6554ec6d728554d.tar.bz2 |
This is the reason, why I sometimes hate C++ ..
Fixed crash in find of OPimDateBookBackend_SQL
-rw-r--r-- | libopie2/opiepim/core/opimrecurrence.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiepim/core/opimrecurrence.cpp b/libopie2/opiepim/core/opimrecurrence.cpp index 98bd647..4b1d886 100644 --- a/libopie2/opiepim/core/opimrecurrence.cpp +++ b/libopie2/opiepim/core/opimrecurrence.cpp | |||
@@ -1,691 +1,691 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) The Main Author <main-author@whereever.org> | 3 | Copyright (C) The Main Author <main-author@whereever.org> |
4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | 4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "opimrecurrence.h" | 30 | #include "opimrecurrence.h" |
31 | 31 | ||
32 | /* OPIE */ | 32 | /* OPIE */ |
33 | #include <opie2/opimtimezone.h> | 33 | #include <opie2/opimtimezone.h> |
34 | #include <qpe/timeconversion.h> | 34 | #include <qpe/timeconversion.h> |
35 | 35 | ||
36 | /* QT */ | 36 | /* QT */ |
37 | #include <qshared.h> | 37 | #include <qshared.h> |
38 | 38 | ||
39 | /* STD */ | 39 | /* STD */ |
40 | #include <time.h> | 40 | #include <time.h> |
41 | 41 | ||
42 | namespace Opie { | 42 | namespace Opie { |
43 | 43 | ||
44 | struct OPimRecurrence::Data : public QShared { | 44 | struct OPimRecurrence::Data : public QShared { |
45 | Data() : QShared() { | 45 | Data() : QShared() { |
46 | type = OPimRecurrence::NoRepeat; | 46 | type = OPimRecurrence::NoRepeat; |
47 | freq = -1; | 47 | freq = -1; |
48 | days = 0; | 48 | days = 0; |
49 | pos = 0; | 49 | pos = 0; |
50 | create = QDateTime::currentDateTime(); | 50 | create = QDateTime::currentDateTime(); |
51 | hasEnd = FALSE; | 51 | hasEnd = FALSE; |
52 | end = QDate::currentDate(); | 52 | end = QDate::currentDate(); |
53 | } | 53 | } |
54 | char days; // Q_UINT8 for 8 seven days;) | 54 | char days; // Q_UINT8 for 8 seven days;) |
55 | OPimRecurrence::RepeatType type; | 55 | OPimRecurrence::RepeatType type; |
56 | int freq; | 56 | int freq; |
57 | int pos; | 57 | int pos; |
58 | bool hasEnd : 1; | 58 | bool hasEnd : 1; |
59 | QDate end; | 59 | QDate end; |
60 | QDateTime create; | 60 | QDateTime create; |
61 | int rep; | 61 | int rep; |
62 | QString app; | 62 | QString app; |
63 | ExceptionList list; | 63 | ExceptionList list; |
64 | QDate start; | 64 | QDate start; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | 67 | ||
68 | OPimRecurrence::OPimRecurrence() { | 68 | OPimRecurrence::OPimRecurrence() { |
69 | data = new Data; | 69 | data = new Data; |
70 | } | 70 | } |
71 | 71 | ||
72 | OPimRecurrence::OPimRecurrence( const QMap<int, QString>& map ) | 72 | OPimRecurrence::OPimRecurrence( const QMap<int, QString>& map ) |
73 | { | 73 | { |
74 | OPimRecurrence(); | 74 | data = new Data; |
75 | fromMap( map ); | 75 | fromMap( map ); |
76 | } | 76 | } |
77 | 77 | ||
78 | 78 | ||
79 | OPimRecurrence::OPimRecurrence( const OPimRecurrence& rec) | 79 | OPimRecurrence::OPimRecurrence( const OPimRecurrence& rec) |
80 | : data( rec.data ) | 80 | : data( rec.data ) |
81 | { | 81 | { |
82 | data->ref(); | 82 | data->ref(); |
83 | } | 83 | } |
84 | 84 | ||
85 | 85 | ||
86 | OPimRecurrence::~OPimRecurrence() { | 86 | OPimRecurrence::~OPimRecurrence() { |
87 | if ( data->deref() ) { | 87 | if ( data->deref() ) { |
88 | delete data; | 88 | delete data; |
89 | data = 0l; | 89 | data = 0l; |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | void OPimRecurrence::deref() { | 94 | void OPimRecurrence::deref() { |
95 | if ( data->deref() ) { | 95 | if ( data->deref() ) { |
96 | delete data; | 96 | delete data; |
97 | data = 0l; | 97 | data = 0l; |
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | 101 | ||
102 | bool OPimRecurrence::operator==( const OPimRecurrence& )const { | 102 | bool OPimRecurrence::operator==( const OPimRecurrence& )const { |
103 | return false; | 103 | return false; |
104 | } | 104 | } |
105 | 105 | ||
106 | 106 | ||
107 | OPimRecurrence &OPimRecurrence::operator=( const OPimRecurrence& re) { | 107 | OPimRecurrence &OPimRecurrence::operator=( const OPimRecurrence& re) { |
108 | if ( *this == re ) return *this; | 108 | if ( *this == re ) return *this; |
109 | 109 | ||
110 | re.data->ref(); | 110 | re.data->ref(); |
111 | deref(); | 111 | deref(); |
112 | data = re.data; | 112 | data = re.data; |
113 | 113 | ||
114 | return *this; | 114 | return *this; |
115 | } | 115 | } |
116 | 116 | ||
117 | 117 | ||
118 | bool OPimRecurrence::doesRecur()const { | 118 | bool OPimRecurrence::doesRecur()const { |
119 | return !( type() == NoRepeat ); | 119 | return !( type() == NoRepeat ); |
120 | } | 120 | } |
121 | 121 | ||
122 | 122 | ||
123 | /* | 123 | /* |
124 | * we try to be smart here | 124 | * we try to be smart here |
125 | * | 125 | * |
126 | */ | 126 | */ |
127 | bool OPimRecurrence::doesRecur( const QDate& date ) { | 127 | bool OPimRecurrence::doesRecur( const QDate& date ) { |
128 | /* the day before the recurrance */ | 128 | /* the day before the recurrance */ |
129 | QDate da = date.addDays(-1); | 129 | QDate da = date.addDays(-1); |
130 | 130 | ||
131 | QDate recur; | 131 | QDate recur; |
132 | if (!nextOcurrence( da, recur ) ) | 132 | if (!nextOcurrence( da, recur ) ) |
133 | return false; | 133 | return false; |
134 | 134 | ||
135 | return (recur == date); | 135 | return (recur == date); |
136 | } | 136 | } |
137 | 137 | ||
138 | 138 | ||
139 | // FIXME unuglify! | 139 | // FIXME unuglify! |
140 | // GPL from Datebookdb.cpp | 140 | // GPL from Datebookdb.cpp |
141 | // FIXME exception list! | 141 | // FIXME exception list! |
142 | bool OPimRecurrence::nextOcurrence( const QDate& from, QDate& next ) { | 142 | bool OPimRecurrence::nextOcurrence( const QDate& from, QDate& next ) { |
143 | bool stillLooking; | 143 | bool stillLooking; |
144 | stillLooking = p_nextOccurrence( from, next ); | 144 | stillLooking = p_nextOccurrence( from, next ); |
145 | while ( stillLooking && data->list.contains(next) ) | 145 | while ( stillLooking && data->list.contains(next) ) |
146 | stillLooking = p_nextOccurrence( next.addDays(1), next ); | 146 | stillLooking = p_nextOccurrence( next.addDays(1), next ); |
147 | 147 | ||
148 | return stillLooking; | 148 | return stillLooking; |
149 | } | 149 | } |
150 | 150 | ||
151 | 151 | ||
152 | bool OPimRecurrence::p_nextOccurrence( const QDate& from, QDate& next ) { | 152 | bool OPimRecurrence::p_nextOccurrence( const QDate& from, QDate& next ) { |
153 | 153 | ||
154 | // easy checks, first are we too far in the future or too far in the past? | 154 | // easy checks, first are we too far in the future or too far in the past? |
155 | QDate tmpDate; | 155 | QDate tmpDate; |
156 | int freq = frequency(); | 156 | int freq = frequency(); |
157 | int diff, diff2, a; | 157 | int diff, diff2, a; |
158 | int iday, imonth, iyear; | 158 | int iday, imonth, iyear; |
159 | int dayOfWeek = 0; | 159 | int dayOfWeek = 0; |
160 | int firstOfWeek = 0; | 160 | int firstOfWeek = 0; |
161 | int weekOfMonth; | 161 | int weekOfMonth; |
162 | 162 | ||
163 | 163 | ||
164 | if (hasEndDate() && endDate() < from) | 164 | if (hasEndDate() && endDate() < from) |
165 | return FALSE; | 165 | return FALSE; |
166 | 166 | ||
167 | if (start() >= from ) { | 167 | if (start() >= from ) { |
168 | next = start(); | 168 | next = start(); |
169 | return TRUE; | 169 | return TRUE; |
170 | } | 170 | } |
171 | 171 | ||
172 | switch ( type() ) { | 172 | switch ( type() ) { |
173 | case Weekly: | 173 | case Weekly: |
174 | /* weekly is just daily by 7 */ | 174 | /* weekly is just daily by 7 */ |
175 | /* first convert the repeatPattern.Days() mask to the next | 175 | /* first convert the repeatPattern.Days() mask to the next |
176 | day of week valid after from */ | 176 | day of week valid after from */ |
177 | dayOfWeek = from.dayOfWeek(); | 177 | dayOfWeek = from.dayOfWeek(); |
178 | dayOfWeek--; /* we want 0-6, doco for above specs 1-7 */ | 178 | dayOfWeek--; /* we want 0-6, doco for above specs 1-7 */ |
179 | 179 | ||
180 | /* this is done in case freq > 1 and from in week not | 180 | /* this is done in case freq > 1 and from in week not |
181 | for this round */ | 181 | for this round */ |
182 | // firstOfWeek = 0; this is already done at decl. | 182 | // firstOfWeek = 0; this is already done at decl. |
183 | while(!((1 << firstOfWeek) & days() )) | 183 | while(!((1 << firstOfWeek) & days() )) |
184 | firstOfWeek++; | 184 | firstOfWeek++; |
185 | 185 | ||
186 | /* there is at least one 'day', or there would be no event */ | 186 | /* there is at least one 'day', or there would be no event */ |
187 | while(!((1 << (dayOfWeek % 7)) & days() )) | 187 | while(!((1 << (dayOfWeek % 7)) & days() )) |
188 | dayOfWeek++; | 188 | dayOfWeek++; |
189 | 189 | ||
190 | dayOfWeek = dayOfWeek % 7; /* the actual day of week */ | 190 | dayOfWeek = dayOfWeek % 7; /* the actual day of week */ |
191 | dayOfWeek -= start().dayOfWeek() -1; | 191 | dayOfWeek -= start().dayOfWeek() -1; |
192 | 192 | ||
193 | firstOfWeek = firstOfWeek % 7; /* the actual first of week */ | 193 | firstOfWeek = firstOfWeek % 7; /* the actual first of week */ |
194 | firstOfWeek -= start().dayOfWeek() -1; | 194 | firstOfWeek -= start().dayOfWeek() -1; |
195 | 195 | ||
196 | // dayOfWeek may be negitive now | 196 | // dayOfWeek may be negitive now |
197 | // day of week is number of days to add to start day | 197 | // day of week is number of days to add to start day |
198 | 198 | ||
199 | freq *= 7; | 199 | freq *= 7; |
200 | // FALL-THROUGH !!!!! | 200 | // FALL-THROUGH !!!!! |
201 | case Daily: | 201 | case Daily: |
202 | // the add is for the possible fall through from weekly */ | 202 | // the add is for the possible fall through from weekly */ |
203 | if(start().addDays(dayOfWeek) > from) { | 203 | if(start().addDays(dayOfWeek) > from) { |
204 | /* first week exception */ | 204 | /* first week exception */ |
205 | next = QDate(start().addDays(dayOfWeek) ); | 205 | next = QDate(start().addDays(dayOfWeek) ); |
206 | if ((next > endDate()) | 206 | if ((next > endDate()) |
207 | && hasEndDate() ) | 207 | && hasEndDate() ) |
208 | return FALSE; | 208 | return FALSE; |
209 | return TRUE; | 209 | return TRUE; |
210 | } | 210 | } |
211 | /* if from is middle of a non-week */ | 211 | /* if from is middle of a non-week */ |
212 | 212 | ||
213 | diff = start().addDays(dayOfWeek).daysTo(from) % freq; | 213 | diff = start().addDays(dayOfWeek).daysTo(from) % freq; |
214 | diff2 = start().addDays(firstOfWeek).daysTo(from) % freq; | 214 | diff2 = start().addDays(firstOfWeek).daysTo(from) % freq; |
215 | 215 | ||
216 | if(diff != 0) | 216 | if(diff != 0) |
217 | diff = freq - diff; | 217 | diff = freq - diff; |
218 | if(diff2 != 0) | 218 | if(diff2 != 0) |
219 | diff2 = freq - diff2; | 219 | diff2 = freq - diff2; |
220 | diff = QMIN(diff, diff2); | 220 | diff = QMIN(diff, diff2); |
221 | 221 | ||
222 | next = QDate(from.addDays(diff)); | 222 | next = QDate(from.addDays(diff)); |
223 | if ( (next > endDate()) | 223 | if ( (next > endDate()) |
224 | && hasEndDate() ) | 224 | && hasEndDate() ) |
225 | return FALSE; | 225 | return FALSE; |
226 | return TRUE; | 226 | return TRUE; |
227 | case MonthlyDay: | 227 | case MonthlyDay: |
228 | iday = from.day(); | 228 | iday = from.day(); |
229 | iyear = from.year(); | 229 | iyear = from.year(); |
230 | imonth = from.month(); | 230 | imonth = from.month(); |
231 | /* find equivelent day of month for this month */ | 231 | /* find equivelent day of month for this month */ |
232 | dayOfWeek = start().dayOfWeek(); | 232 | dayOfWeek = start().dayOfWeek(); |
233 | weekOfMonth = (start().day() - 1) / 7; | 233 | weekOfMonth = (start().day() - 1) / 7; |
234 | 234 | ||
235 | /* work out when the next valid month is */ | 235 | /* work out when the next valid month is */ |
236 | a = from.year() - start().year(); | 236 | a = from.year() - start().year(); |
237 | a *= 12; | 237 | a *= 12; |
238 | a = a + (imonth - start().month()); | 238 | a = a + (imonth - start().month()); |
239 | /* a is e.start()monthsFrom(from); */ | 239 | /* a is e.start()monthsFrom(from); */ |
240 | if(a % freq) { | 240 | if(a % freq) { |
241 | a = freq - (a % freq); | 241 | a = freq - (a % freq); |
242 | imonth = from.month() + a; | 242 | imonth = from.month() + a; |
243 | if (imonth > 12) { | 243 | if (imonth > 12) { |
244 | imonth--; | 244 | imonth--; |
245 | iyear += imonth / 12; | 245 | iyear += imonth / 12; |
246 | imonth = imonth % 12; | 246 | imonth = imonth % 12; |
247 | imonth++; | 247 | imonth++; |
248 | } | 248 | } |
249 | } | 249 | } |
250 | /* imonth is now the first month after or on | 250 | /* imonth is now the first month after or on |
251 | from that matches the frequency given */ | 251 | from that matches the frequency given */ |
252 | 252 | ||
253 | /* find for this month */ | 253 | /* find for this month */ |
254 | tmpDate = QDate( iyear, imonth, 1 ); | 254 | tmpDate = QDate( iyear, imonth, 1 ); |
255 | 255 | ||
256 | iday = 1; | 256 | iday = 1; |
257 | iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7; | 257 | iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7; |
258 | iday += 7 * weekOfMonth; | 258 | iday += 7 * weekOfMonth; |
259 | while (iday > tmpDate.daysInMonth()) { | 259 | while (iday > tmpDate.daysInMonth()) { |
260 | imonth += freq; | 260 | imonth += freq; |
261 | if (imonth > 12) { | 261 | if (imonth > 12) { |
262 | imonth--; | 262 | imonth--; |
263 | iyear += imonth / 12; | 263 | iyear += imonth / 12; |
264 | imonth = imonth % 12; | 264 | imonth = imonth % 12; |
265 | imonth++; | 265 | imonth++; |
266 | } | 266 | } |
267 | tmpDate = QDate( iyear, imonth, 1 ); | 267 | tmpDate = QDate( iyear, imonth, 1 ); |
268 | /* these loops could go for a while, check end case now */ | 268 | /* these loops could go for a while, check end case now */ |
269 | if ((tmpDate > endDate()) && hasEndDate() ) | 269 | if ((tmpDate > endDate()) && hasEndDate() ) |
270 | return FALSE; | 270 | return FALSE; |
271 | iday = 1; | 271 | iday = 1; |
272 | iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7; | 272 | iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7; |
273 | iday += 7 * weekOfMonth; | 273 | iday += 7 * weekOfMonth; |
274 | } | 274 | } |
275 | tmpDate = QDate(iyear, imonth, iday); | 275 | tmpDate = QDate(iyear, imonth, iday); |
276 | 276 | ||
277 | if (tmpDate >= from) { | 277 | if (tmpDate >= from) { |
278 | next = tmpDate; | 278 | next = tmpDate; |
279 | if ((next > endDate() ) && hasEndDate() ) | 279 | if ((next > endDate() ) && hasEndDate() ) |
280 | return FALSE; | 280 | return FALSE; |
281 | return TRUE; | 281 | return TRUE; |
282 | } | 282 | } |
283 | 283 | ||
284 | /* need to find the next iteration */ | 284 | /* need to find the next iteration */ |
285 | do { | 285 | do { |
286 | imonth += freq; | 286 | imonth += freq; |
287 | if (imonth > 12) { | 287 | if (imonth > 12) { |
288 | imonth--; | 288 | imonth--; |
289 | iyear += imonth / 12; | 289 | iyear += imonth / 12; |
290 | imonth = imonth % 12; | 290 | imonth = imonth % 12; |
291 | imonth++; | 291 | imonth++; |
292 | } | 292 | } |
293 | tmpDate = QDate( iyear, imonth, 1 ); | 293 | tmpDate = QDate( iyear, imonth, 1 ); |
294 | /* these loops could go for a while, check end case now */ | 294 | /* these loops could go for a while, check end case now */ |
295 | if ((tmpDate > endDate()) && hasEndDate() ) | 295 | if ((tmpDate > endDate()) && hasEndDate() ) |
296 | return FALSE; | 296 | return FALSE; |
297 | iday = 1; | 297 | iday = 1; |
298 | iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7; | 298 | iday += (7 + dayOfWeek - tmpDate.dayOfWeek()) % 7; |
299 | iday += 7 * weekOfMonth; | 299 | iday += 7 * weekOfMonth; |
300 | } while (iday > tmpDate.daysInMonth()); | 300 | } while (iday > tmpDate.daysInMonth()); |
301 | tmpDate = QDate(iyear, imonth, iday); | 301 | tmpDate = QDate(iyear, imonth, iday); |
302 | 302 | ||
303 | next = tmpDate; | 303 | next = tmpDate; |
304 | if ((next > endDate()) && hasEndDate() ) | 304 | if ((next > endDate()) && hasEndDate() ) |
305 | return FALSE; | 305 | return FALSE; |
306 | return TRUE; | 306 | return TRUE; |
307 | case MonthlyDate: | 307 | case MonthlyDate: |
308 | iday = start().day(); | 308 | iday = start().day(); |
309 | iyear = from.year(); | 309 | iyear = from.year(); |
310 | imonth = from.month(); | 310 | imonth = from.month(); |
311 | 311 | ||
312 | a = from.year() - start().year(); | 312 | a = from.year() - start().year(); |
313 | a *= 12; | 313 | a *= 12; |
314 | a = a + (imonth - start().month()); | 314 | a = a + (imonth - start().month()); |
315 | /* a is e.start()monthsFrom(from); */ | 315 | /* a is e.start()monthsFrom(from); */ |
316 | if(a % freq) { | 316 | if(a % freq) { |
317 | a = freq - (a % freq); | 317 | a = freq - (a % freq); |
318 | imonth = from.month() + a; | 318 | imonth = from.month() + a; |
319 | if (imonth > 12) { | 319 | if (imonth > 12) { |
320 | imonth--; | 320 | imonth--; |
321 | iyear += imonth / 12; | 321 | iyear += imonth / 12; |
322 | imonth = imonth % 12; | 322 | imonth = imonth % 12; |
323 | imonth++; | 323 | imonth++; |
324 | } | 324 | } |
325 | } | 325 | } |
326 | /* imonth is now the first month after or on | 326 | /* imonth is now the first month after or on |
327 | from that matches the frequencey given */ | 327 | from that matches the frequencey given */ |
328 | 328 | ||
329 | /* this could go for a while, worse case, 4*12 iterations, probably */ | 329 | /* this could go for a while, worse case, 4*12 iterations, probably */ |
330 | while(!QDate::isValid(iyear, imonth, iday) ) { | 330 | while(!QDate::isValid(iyear, imonth, iday) ) { |
331 | imonth += freq; | 331 | imonth += freq; |
332 | if (imonth > 12) { | 332 | if (imonth > 12) { |
333 | imonth--; | 333 | imonth--; |
334 | iyear += imonth / 12; | 334 | iyear += imonth / 12; |
335 | imonth = imonth % 12; | 335 | imonth = imonth % 12; |
336 | imonth++; | 336 | imonth++; |
337 | } | 337 | } |
338 | /* these loops could go for a while, check end case now */ | 338 | /* these loops could go for a while, check end case now */ |
339 | if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() ) | 339 | if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() ) |
340 | return FALSE; | 340 | return FALSE; |
341 | } | 341 | } |
342 | 342 | ||
343 | if(QDate(iyear, imonth, iday) >= from) { | 343 | if(QDate(iyear, imonth, iday) >= from) { |
344 | /* done */ | 344 | /* done */ |
345 | next = QDate(iyear, imonth, iday); | 345 | next = QDate(iyear, imonth, iday); |
346 | if ((next > endDate()) && hasEndDate() ) | 346 | if ((next > endDate()) && hasEndDate() ) |
347 | return FALSE; | 347 | return FALSE; |
348 | return TRUE; | 348 | return TRUE; |
349 | } | 349 | } |
350 | 350 | ||
351 | /* ok, need to cycle */ | 351 | /* ok, need to cycle */ |
352 | imonth += freq; | 352 | imonth += freq; |
353 | imonth--; | 353 | imonth--; |
354 | iyear += imonth / 12; | 354 | iyear += imonth / 12; |
355 | imonth = imonth % 12; | 355 | imonth = imonth % 12; |
356 | imonth++; | 356 | imonth++; |
357 | 357 | ||
358 | while(!QDate::isValid(iyear, imonth, iday) ) { | 358 | while(!QDate::isValid(iyear, imonth, iday) ) { |
359 | imonth += freq; | 359 | imonth += freq; |
360 | imonth--; | 360 | imonth--; |
361 | iyear += imonth / 12; | 361 | iyear += imonth / 12; |
362 | imonth = imonth % 12; | 362 | imonth = imonth % 12; |
363 | imonth++; | 363 | imonth++; |
364 | if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() ) | 364 | if ((QDate(iyear, imonth, 1) > endDate()) && hasEndDate() ) |
365 | return FALSE; | 365 | return FALSE; |
366 | } | 366 | } |
367 | 367 | ||
368 | next = QDate(iyear, imonth, iday); | 368 | next = QDate(iyear, imonth, iday); |
369 | if ((next > endDate()) && hasEndDate() ) | 369 | if ((next > endDate()) && hasEndDate() ) |
370 | return FALSE; | 370 | return FALSE; |
371 | return TRUE; | 371 | return TRUE; |
372 | case Yearly: | 372 | case Yearly: |
373 | iday = start().day(); | 373 | iday = start().day(); |
374 | imonth = start().month(); | 374 | imonth = start().month(); |
375 | iyear = from.year(); // after all, we want to start in this year | 375 | iyear = from.year(); // after all, we want to start in this year |
376 | 376 | ||
377 | diff = 1; | 377 | diff = 1; |
378 | if(imonth == 2 && iday > 28) { | 378 | if(imonth == 2 && iday > 28) { |
379 | /* leap year, and it counts, calculate actual frequency */ | 379 | /* leap year, and it counts, calculate actual frequency */ |
380 | if(freq % 4) | 380 | if(freq % 4) |
381 | if (freq % 2) | 381 | if (freq % 2) |
382 | freq = freq * 4; | 382 | freq = freq * 4; |
383 | else | 383 | else |
384 | freq = freq * 2; | 384 | freq = freq * 2; |
385 | /* else divides by 4 already, leave freq alone */ | 385 | /* else divides by 4 already, leave freq alone */ |
386 | diff = 4; | 386 | diff = 4; |
387 | } | 387 | } |
388 | 388 | ||
389 | a = from.year() - start().year(); | 389 | a = from.year() - start().year(); |
390 | if(a % freq) { | 390 | if(a % freq) { |
391 | a = freq - (a % freq); | 391 | a = freq - (a % freq); |
392 | iyear = iyear + a; | 392 | iyear = iyear + a; |
393 | } | 393 | } |
394 | 394 | ||
395 | /* under the assumption we won't hit one of the special not-leap years twice */ | 395 | /* under the assumption we won't hit one of the special not-leap years twice */ |
396 | if(!QDate::isValid(iyear, imonth, iday)) { | 396 | if(!QDate::isValid(iyear, imonth, iday)) { |
397 | /* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */ | 397 | /* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */ |
398 | iyear += freq; | 398 | iyear += freq; |
399 | } | 399 | } |
400 | 400 | ||
401 | if(QDate(iyear, imonth, iday) >= from) { | 401 | if(QDate(iyear, imonth, iday) >= from) { |
402 | next = QDate(iyear, imonth, iday); | 402 | next = QDate(iyear, imonth, iday); |
403 | 403 | ||
404 | if ((next > endDate()) && hasEndDate() ) | 404 | if ((next > endDate()) && hasEndDate() ) |
405 | return FALSE; | 405 | return FALSE; |
406 | return TRUE; | 406 | return TRUE; |
407 | } | 407 | } |
408 | /* iyear == from.year(), need to advance again */ | 408 | /* iyear == from.year(), need to advance again */ |
409 | iyear += freq; | 409 | iyear += freq; |
410 | /* under the assumption we won't hit one of the special not-leap years twice */ | 410 | /* under the assumption we won't hit one of the special not-leap years twice */ |
411 | if(!QDate::isValid(iyear, imonth, iday)) { | 411 | if(!QDate::isValid(iyear, imonth, iday)) { |
412 | /* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */ | 412 | /* must have been skipping by leap years and hit one that wasn't, (e.g. 2100) */ |
413 | iyear += freq; | 413 | iyear += freq; |
414 | } | 414 | } |
415 | 415 | ||
416 | next = QDate(iyear, imonth, iday); | 416 | next = QDate(iyear, imonth, iday); |
417 | if ((next > endDate()) && hasEndDate() ) | 417 | if ((next > endDate()) && hasEndDate() ) |
418 | return FALSE; | 418 | return FALSE; |
419 | return TRUE; | 419 | return TRUE; |
420 | default: | 420 | default: |
421 | return FALSE; | 421 | return FALSE; |
422 | } | 422 | } |
423 | } | 423 | } |
424 | 424 | ||
425 | 425 | ||
426 | OPimRecurrence::RepeatType OPimRecurrence::type()const{ | 426 | OPimRecurrence::RepeatType OPimRecurrence::type()const{ |
427 | return data->type; | 427 | return data->type; |
428 | } | 428 | } |
429 | 429 | ||
430 | 430 | ||
431 | int OPimRecurrence::frequency()const { | 431 | int OPimRecurrence::frequency()const { |
432 | return data->freq; | 432 | return data->freq; |
433 | } | 433 | } |
434 | 434 | ||
435 | 435 | ||
436 | int OPimRecurrence::position()const { | 436 | int OPimRecurrence::position()const { |
437 | return data->pos; | 437 | return data->pos; |
438 | } | 438 | } |
439 | 439 | ||
440 | 440 | ||
441 | char OPimRecurrence::days() const{ | 441 | char OPimRecurrence::days() const{ |
442 | return data->days; | 442 | return data->days; |
443 | } | 443 | } |
444 | 444 | ||
445 | 445 | ||
446 | bool OPimRecurrence::hasEndDate()const { | 446 | bool OPimRecurrence::hasEndDate()const { |
447 | return data->hasEnd; | 447 | return data->hasEnd; |
448 | } | 448 | } |
449 | 449 | ||
450 | 450 | ||
451 | QDate OPimRecurrence::endDate()const { | 451 | QDate OPimRecurrence::endDate()const { |
452 | return data->end; | 452 | return data->end; |
453 | } | 453 | } |
454 | 454 | ||
455 | 455 | ||
456 | QDate OPimRecurrence::start()const{ | 456 | QDate OPimRecurrence::start()const{ |
457 | return data->start; | 457 | return data->start; |
458 | } | 458 | } |
459 | 459 | ||
460 | 460 | ||
461 | QDateTime OPimRecurrence::createdDateTime()const { | 461 | QDateTime OPimRecurrence::createdDateTime()const { |
462 | return data->create; | 462 | return data->create; |
463 | } | 463 | } |
464 | 464 | ||
465 | 465 | ||
466 | int OPimRecurrence::repetition()const { | 466 | int OPimRecurrence::repetition()const { |
467 | return data->rep; | 467 | return data->rep; |
468 | } | 468 | } |
469 | 469 | ||
470 | 470 | ||
471 | QString OPimRecurrence::service()const { | 471 | QString OPimRecurrence::service()const { |
472 | return data->app; | 472 | return data->app; |
473 | } | 473 | } |
474 | 474 | ||
475 | 475 | ||
476 | OPimRecurrence::ExceptionList& OPimRecurrence::exceptions() { | 476 | OPimRecurrence::ExceptionList& OPimRecurrence::exceptions() { |
477 | return data->list; | 477 | return data->list; |
478 | } | 478 | } |
479 | 479 | ||
480 | 480 | ||
481 | void OPimRecurrence::setType( const RepeatType& z) { | 481 | void OPimRecurrence::setType( const RepeatType& z) { |
482 | checkOrModify(); | 482 | checkOrModify(); |
483 | data->type = z; | 483 | data->type = z; |
484 | } | 484 | } |
485 | 485 | ||
486 | 486 | ||
487 | void OPimRecurrence::setFrequency( int freq ) { | 487 | void OPimRecurrence::setFrequency( int freq ) { |
488 | checkOrModify(); | 488 | checkOrModify(); |
489 | data->freq = freq; | 489 | data->freq = freq; |
490 | } | 490 | } |
491 | 491 | ||
492 | 492 | ||
493 | void OPimRecurrence::setPosition( int pos ) { | 493 | void OPimRecurrence::setPosition( int pos ) { |
494 | checkOrModify(); | 494 | checkOrModify(); |
495 | data->pos = pos; | 495 | data->pos = pos; |
496 | } | 496 | } |
497 | 497 | ||
498 | 498 | ||
499 | void OPimRecurrence::setDays( char c ) { | 499 | void OPimRecurrence::setDays( char c ) { |
500 | checkOrModify(); | 500 | checkOrModify(); |
501 | data->days = c; | 501 | data->days = c; |
502 | } | 502 | } |
503 | 503 | ||
504 | 504 | ||
505 | void OPimRecurrence::setEndDate( const QDate& dt) { | 505 | void OPimRecurrence::setEndDate( const QDate& dt) { |
506 | checkOrModify(); | 506 | checkOrModify(); |
507 | data->end = dt; | 507 | data->end = dt; |
508 | } | 508 | } |
509 | 509 | ||
510 | 510 | ||
511 | void OPimRecurrence::setCreatedDateTime( const QDateTime& t) { | 511 | void OPimRecurrence::setCreatedDateTime( const QDateTime& t) { |
512 | checkOrModify(); | 512 | checkOrModify(); |
513 | data->create = t; | 513 | data->create = t; |
514 | } | 514 | } |
515 | 515 | ||
516 | 516 | ||
517 | void OPimRecurrence::setHasEndDate( bool b) { | 517 | void OPimRecurrence::setHasEndDate( bool b) { |
518 | checkOrModify(); | 518 | checkOrModify(); |
519 | data->hasEnd = b; | 519 | data->hasEnd = b; |
520 | } | 520 | } |
521 | 521 | ||
522 | 522 | ||
523 | void OPimRecurrence::setRepitition( int rep ) { | 523 | void OPimRecurrence::setRepitition( int rep ) { |
524 | checkOrModify(); | 524 | checkOrModify(); |
525 | data->rep = rep; | 525 | data->rep = rep; |
526 | } | 526 | } |
527 | 527 | ||
528 | 528 | ||
529 | void OPimRecurrence::setService( const QString& app ) { | 529 | void OPimRecurrence::setService( const QString& app ) { |
530 | checkOrModify(); | 530 | checkOrModify(); |
531 | data->app = app; | 531 | data->app = app; |
532 | } | 532 | } |
533 | 533 | ||
534 | 534 | ||
535 | void OPimRecurrence::setStart( const QDate& dt ) { | 535 | void OPimRecurrence::setStart( const QDate& dt ) { |
536 | checkOrModify(); | 536 | checkOrModify(); |
537 | data->start = dt; | 537 | data->start = dt; |
538 | } | 538 | } |
539 | 539 | ||
540 | 540 | ||
541 | void OPimRecurrence::checkOrModify() { | 541 | void OPimRecurrence::checkOrModify() { |
542 | if ( data->count != 1 ) { | 542 | if ( data->count != 1 ) { |
543 | data->deref(); | 543 | data->deref(); |
544 | Data* d2 = new Data; | 544 | Data* d2 = new Data; |
545 | d2->days = data->days; | 545 | d2->days = data->days; |
546 | d2->type = data->type; | 546 | d2->type = data->type; |
547 | d2->freq = data->freq; | 547 | d2->freq = data->freq; |
548 | d2->pos = data->pos; | 548 | d2->pos = data->pos; |
549 | d2->hasEnd = data->hasEnd; | 549 | d2->hasEnd = data->hasEnd; |
550 | d2->end = data->end; | 550 | d2->end = data->end; |
551 | d2->create = data->create; | 551 | d2->create = data->create; |
552 | d2->rep = data->rep; | 552 | d2->rep = data->rep; |
553 | d2->app = data->app; | 553 | d2->app = data->app; |
554 | d2->list = data->list; | 554 | d2->list = data->list; |
555 | d2->start = data->start; | 555 | d2->start = data->start; |
556 | data = d2; | 556 | data = d2; |
557 | } | 557 | } |
558 | } | 558 | } |
559 | 559 | ||
560 | 560 | ||
561 | QString OPimRecurrence::toString()const { | 561 | QString OPimRecurrence::toString()const { |
562 | QString buf; | 562 | QString buf; |
563 | QMap<int, QString> recMap = toMap(); | 563 | QMap<int, QString> recMap = toMap(); |
564 | 564 | ||
565 | buf += " rtype=\""; | 565 | buf += " rtype=\""; |
566 | buf += recMap[OPimRecurrence::RType]; | 566 | buf += recMap[OPimRecurrence::RType]; |
567 | buf += "\""; | 567 | buf += "\""; |
568 | if (data->days > 0 ) | 568 | if (data->days > 0 ) |
569 | buf += " rweekdays=\"" + recMap[OPimRecurrence::RWeekdays] + "\""; | 569 | buf += " rweekdays=\"" + recMap[OPimRecurrence::RWeekdays] + "\""; |
570 | if ( data->pos != 0 ) | 570 | if ( data->pos != 0 ) |
571 | buf += " rposition=\"" + recMap[OPimRecurrence::RPosition] + "\""; | 571 | buf += " rposition=\"" + recMap[OPimRecurrence::RPosition] + "\""; |
572 | 572 | ||
573 | buf += " rfreq=\"" + recMap[OPimRecurrence::RFreq] + "\""; | 573 | buf += " rfreq=\"" + recMap[OPimRecurrence::RFreq] + "\""; |
574 | buf += " rhasenddate=\"" + recMap[OPimRecurrence::RHasEndDate]+ "\""; | 574 | buf += " rhasenddate=\"" + recMap[OPimRecurrence::RHasEndDate]+ "\""; |
575 | if ( data->hasEnd ) | 575 | if ( data->hasEnd ) |
576 | buf += " enddt=\"" | 576 | buf += " enddt=\"" |
577 | + recMap[OPimRecurrence::EndDate] | 577 | + recMap[OPimRecurrence::EndDate] |
578 | + "\""; | 578 | + "\""; |
579 | buf += " created=\"" + recMap[OPimRecurrence::Created] + "\""; | 579 | buf += " created=\"" + recMap[OPimRecurrence::Created] + "\""; |
580 | 580 | ||
581 | if ( data->list.isEmpty() ) return buf; | 581 | if ( data->list.isEmpty() ) return buf; |
582 | buf += " exceptions=\""; | 582 | buf += " exceptions=\""; |
583 | buf += recMap[OPimRecurrence::Exceptions]; | 583 | buf += recMap[OPimRecurrence::Exceptions]; |
584 | buf += "\" "; | 584 | buf += "\" "; |
585 | 585 | ||
586 | return buf; | 586 | return buf; |
587 | } | 587 | } |
588 | 588 | ||
589 | QString OPimRecurrence::rTypeString() const | 589 | QString OPimRecurrence::rTypeString() const |
590 | { | 590 | { |
591 | QString retString; | 591 | QString retString; |
592 | switch ( data->type ) { | 592 | switch ( data->type ) { |
593 | case OPimRecurrence::Daily: | 593 | case OPimRecurrence::Daily: |
594 | retString = "Daily"; | 594 | retString = "Daily"; |
595 | break; | 595 | break; |
596 | case OPimRecurrence::Weekly: | 596 | case OPimRecurrence::Weekly: |
597 | retString = "Weekly"; | 597 | retString = "Weekly"; |
598 | break; | 598 | break; |
599 | case OPimRecurrence::MonthlyDay: | 599 | case OPimRecurrence::MonthlyDay: |
600 | retString = "MonthlyDay"; | 600 | retString = "MonthlyDay"; |
601 | break; | 601 | break; |
602 | case OPimRecurrence::MonthlyDate: | 602 | case OPimRecurrence::MonthlyDate: |
603 | retString = "MonthlyDate"; | 603 | retString = "MonthlyDate"; |
604 | break; | 604 | break; |
605 | case OPimRecurrence::Yearly: | 605 | case OPimRecurrence::Yearly: |
606 | retString = "Yearly"; | 606 | retString = "Yearly"; |
607 | break; | 607 | break; |
608 | default: | 608 | default: |
609 | retString = "NoRepeat"; | 609 | retString = "NoRepeat"; |
610 | break; | 610 | break; |
611 | 611 | ||
612 | } | 612 | } |
613 | 613 | ||
614 | return retString; | 614 | return retString; |
615 | } | 615 | } |
616 | 616 | ||
617 | QMap<QString, OPimRecurrence::RepeatType> OPimRecurrence::rTypeValueConvertMap() const | 617 | QMap<QString, OPimRecurrence::RepeatType> OPimRecurrence::rTypeValueConvertMap() const |
618 | { | 618 | { |
619 | QMap<QString, RepeatType> convertMap; | 619 | QMap<QString, RepeatType> convertMap; |
620 | 620 | ||
621 | convertMap.insert( QString( "Daily" ), OPimRecurrence::Daily ); | 621 | convertMap.insert( QString( "Daily" ), OPimRecurrence::Daily ); |
622 | convertMap.insert( QString( "Weekly" ), OPimRecurrence::Weekly ); | 622 | convertMap.insert( QString( "Weekly" ), OPimRecurrence::Weekly ); |
623 | convertMap.insert( QString( "MonthlyDay" ), OPimRecurrence::MonthlyDay ); | 623 | convertMap.insert( QString( "MonthlyDay" ), OPimRecurrence::MonthlyDay ); |
624 | convertMap.insert( QString( "MonthlyDate" ), OPimRecurrence::MonthlyDate ); | 624 | convertMap.insert( QString( "MonthlyDate" ), OPimRecurrence::MonthlyDate ); |
625 | convertMap.insert( QString( "Yearly" ), OPimRecurrence::Yearly ); | 625 | convertMap.insert( QString( "Yearly" ), OPimRecurrence::Yearly ); |
626 | convertMap.insert( QString( "NoRepeat" ), OPimRecurrence::NoRepeat ); | 626 | convertMap.insert( QString( "NoRepeat" ), OPimRecurrence::NoRepeat ); |
627 | 627 | ||
628 | return convertMap; | 628 | return convertMap; |
629 | } | 629 | } |
630 | 630 | ||
631 | 631 | ||
632 | QMap<int, QString> OPimRecurrence::toMap() const | 632 | QMap<int, QString> OPimRecurrence::toMap() const |
633 | { | 633 | { |
634 | QMap<int, QString> retMap; | 634 | QMap<int, QString> retMap; |
635 | 635 | ||
636 | retMap.insert( OPimRecurrence::RType, rTypeString() ); | 636 | retMap.insert( OPimRecurrence::RType, rTypeString() ); |
637 | retMap.insert( OPimRecurrence::RWeekdays, QString::number( static_cast<int>( data->days ) ) ); | 637 | retMap.insert( OPimRecurrence::RWeekdays, QString::number( static_cast<int>( data->days ) ) ); |
638 | retMap.insert( OPimRecurrence::RPosition, QString::number(data->pos ) ); | 638 | retMap.insert( OPimRecurrence::RPosition, QString::number(data->pos ) ); |
639 | retMap.insert( OPimRecurrence::RFreq, QString::number( data->freq ) ); | 639 | retMap.insert( OPimRecurrence::RFreq, QString::number( data->freq ) ); |
640 | retMap.insert( OPimRecurrence::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) ); | 640 | retMap.insert( OPimRecurrence::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) ); |
641 | if( data -> hasEnd ) | 641 | if( data -> hasEnd ) |
642 | retMap.insert( OPimRecurrence::EndDate, QString::number( OPimTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) ); | 642 | retMap.insert( OPimRecurrence::EndDate, QString::number( OPimTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) ); |
643 | retMap.insert( OPimRecurrence::Created, QString::number( OPimTimeZone::utc().fromUTCDateTime( data->create ) ) ); | 643 | retMap.insert( OPimRecurrence::Created, QString::number( OPimTimeZone::utc().fromUTCDateTime( data->create ) ) ); |
644 | 644 | ||
645 | if ( data->list.isEmpty() ) return retMap; | 645 | if ( data->list.isEmpty() ) return retMap; |
646 | 646 | ||
647 | // save exceptions list here!! | 647 | // save exceptions list here!! |
648 | ExceptionList::ConstIterator it; | 648 | ExceptionList::ConstIterator it; |
649 | ExceptionList list = data->list; | 649 | ExceptionList list = data->list; |
650 | QString exceptBuf; | 650 | QString exceptBuf; |
651 | QDate date; | 651 | QDate date; |
652 | for ( it = list.begin(); it != list.end(); ++it ) { | 652 | for ( it = list.begin(); it != list.end(); ++it ) { |
653 | date = (*it); | 653 | date = (*it); |
654 | if ( it != list.begin() ) exceptBuf += " "; | 654 | if ( it != list.begin() ) exceptBuf += " "; |
655 | 655 | ||
656 | exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); | 656 | exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); |
657 | } | 657 | } |
658 | 658 | ||
659 | retMap.insert( OPimRecurrence::Exceptions, exceptBuf ); | 659 | retMap.insert( OPimRecurrence::Exceptions, exceptBuf ); |
660 | 660 | ||
661 | return retMap; | 661 | return retMap; |
662 | } | 662 | } |
663 | 663 | ||
664 | void OPimRecurrence::fromMap( const QMap<int, QString>& map ) | 664 | void OPimRecurrence::fromMap( const QMap<int, QString>& map ) |
665 | { | 665 | { |
666 | QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); | 666 | QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); |
667 | 667 | ||
668 | data -> type = repTypeMap[ map [OPimRecurrence::RType] ]; | 668 | data -> type = repTypeMap[ map [OPimRecurrence::RType] ]; |
669 | data -> days = (char) map[ OPimRecurrence::RWeekdays ].toInt(); | 669 | data -> days = (char) map[ OPimRecurrence::RWeekdays ].toInt(); |
670 | data -> pos = map[ OPimRecurrence::RPosition ].toInt(); | 670 | data -> pos = map[ OPimRecurrence::RPosition ].toInt(); |
671 | data -> freq = map[ OPimRecurrence::RFreq ].toInt(); | 671 | data -> freq = map[ OPimRecurrence::RFreq ].toInt(); |
672 | data -> hasEnd= map[ OPimRecurrence::RHasEndDate ].toInt() ? true : false; | 672 | data -> hasEnd= map[ OPimRecurrence::RHasEndDate ].toInt() ? true : false; |
673 | OPimTimeZone utc = OPimTimeZone::utc(); | 673 | OPimTimeZone utc = OPimTimeZone::utc(); |
674 | if ( data -> hasEnd ){ | 674 | if ( data -> hasEnd ){ |
675 | data -> end = utc.fromUTCDateTime( (time_t) map[ OPimRecurrence::EndDate ].toLong() ).date(); | 675 | data -> end = utc.fromUTCDateTime( (time_t) map[ OPimRecurrence::EndDate ].toLong() ).date(); |
676 | } | 676 | } |
677 | data -> create = utc.fromUTCDateTime( (time_t) map[ OPimRecurrence::Created ].toLong() ).date(); | 677 | data -> create = utc.fromUTCDateTime( (time_t) map[ OPimRecurrence::Created ].toLong() ).date(); |
678 | 678 | ||
679 | #if 0 | 679 | #if 0 |
680 | // FIXME: Exceptions currently not supported... | 680 | // FIXME: Exceptions currently not supported... |
681 | // Convert the list of exceptions from QString into ExceptionList | 681 | // Convert the list of exceptions from QString into ExceptionList |
682 | data -> list.clear(); | 682 | data -> list.clear(); |
683 | QString exceptStr = map[ OPimRecurrence::Exceptions ]; | 683 | QString exceptStr = map[ OPimRecurrence::Exceptions ]; |
684 | QStringList exceptList = QStringList::split( " ", exceptStr ); | 684 | QStringList exceptList = QStringList::split( " ", exceptStr ); |
685 | ... | 685 | ... |
686 | #endif | 686 | #endif |
687 | 687 | ||
688 | 688 | ||
689 | } | 689 | } |
690 | 690 | ||
691 | } | 691 | } |