author | tille <tille> | 2003-05-15 13:20:20 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-15 13:20:20 (UTC) |
commit | 7a5aff141f755ea67fccfee7ccc4fbbd3d3c0b94 (patch) (unidiff) | |
tree | e7503907e2ef21dae71141abb0954a5f3c43fe34 /libopie2 | |
parent | 5b0993378eb33f4bf576b91286ece24d49806ccf (diff) | |
download | opie-7a5aff141f755ea67fccfee7ccc4fbbd3d3c0b94.zip opie-7a5aff141f755ea67fccfee7ccc4fbbd3d3c0b94.tar.gz opie-7a5aff141f755ea67fccfee7ccc4fbbd3d3c0b94.tar.bz2 |
how did this compile last time...? ;)
-rw-r--r-- | libopie2/opiepim/oevent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp index 2b138c0..83b191f 100644 --- a/libopie2/opiepim/oevent.cpp +++ b/libopie2/opiepim/oevent.cpp | |||
@@ -120,209 +120,209 @@ bool OEvent::hasNotifiers()const { | |||
120 | if (!data->manager ) | 120 | if (!data->manager ) |
121 | return false; | 121 | return false; |
122 | if (data->manager->reminders().isEmpty() && | 122 | if (data->manager->reminders().isEmpty() && |
123 | data->manager->alarms().isEmpty() ) | 123 | data->manager->alarms().isEmpty() ) |
124 | return false; | 124 | return false; |
125 | 125 | ||
126 | return true; | 126 | return true; |
127 | } | 127 | } |
128 | ORecur OEvent::recurrence()const { | 128 | ORecur OEvent::recurrence()const { |
129 | if (!data->recur) | 129 | if (!data->recur) |
130 | data->recur = new ORecur; | 130 | data->recur = new ORecur; |
131 | 131 | ||
132 | return *data->recur; | 132 | return *data->recur; |
133 | } | 133 | } |
134 | void OEvent::setRecurrence( const ORecur& rec) { | 134 | void OEvent::setRecurrence( const ORecur& rec) { |
135 | changeOrModify(); | 135 | changeOrModify(); |
136 | if (data->recur ) | 136 | if (data->recur ) |
137 | (*data->recur) = rec; | 137 | (*data->recur) = rec; |
138 | else | 138 | else |
139 | data->recur = new ORecur( rec ); | 139 | data->recur = new ORecur( rec ); |
140 | } | 140 | } |
141 | bool OEvent::hasRecurrence()const { | 141 | bool OEvent::hasRecurrence()const { |
142 | if (!data->recur ) return false; | 142 | if (!data->recur ) return false; |
143 | return data->recur->doesRecur(); | 143 | return data->recur->doesRecur(); |
144 | } | 144 | } |
145 | QString OEvent::note()const { | 145 | QString OEvent::note()const { |
146 | return data->note; | 146 | return data->note; |
147 | } | 147 | } |
148 | void OEvent::setNote( const QString& note ) { | 148 | void OEvent::setNote( const QString& note ) { |
149 | changeOrModify(); | 149 | changeOrModify(); |
150 | data->note = note; | 150 | data->note = note; |
151 | } | 151 | } |
152 | QDateTime OEvent::createdDateTime()const { | 152 | QDateTime OEvent::createdDateTime()const { |
153 | return data->created; | 153 | return data->created; |
154 | } | 154 | } |
155 | void OEvent::setCreatedDateTime( const QDateTime& time ) { | 155 | void OEvent::setCreatedDateTime( const QDateTime& time ) { |
156 | changeOrModify(); | 156 | changeOrModify(); |
157 | data->created = time; | 157 | data->created = time; |
158 | } | 158 | } |
159 | QDateTime OEvent::startDateTime()const { | 159 | QDateTime OEvent::startDateTime()const { |
160 | if ( data->isAllDay ) | 160 | if ( data->isAllDay ) |
161 | return QDateTime( data->start.date(), QTime(0, 0, 0 ) ); | 161 | return QDateTime( data->start.date(), QTime(0, 0, 0 ) ); |
162 | return data->start; | 162 | return data->start; |
163 | } | 163 | } |
164 | QDateTime OEvent::startDateTimeInZone()const { | 164 | QDateTime OEvent::startDateTimeInZone()const { |
165 | /* if no timezone, or all day event or if the current and this timeZone match... */ | 165 | /* if no timezone, or all day event or if the current and this timeZone match... */ |
166 | if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime(); | 166 | if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime(); |
167 | 167 | ||
168 | OTimeZone zone(data->timezone ); | 168 | OTimeZone zone(data->timezone ); |
169 | return zone.toDateTime( data->start, OTimeZone::current() ); | 169 | return zone.toDateTime( data->start, OTimeZone::current() ); |
170 | } | 170 | } |
171 | void OEvent::setStartDateTime( const QDateTime& dt ) { | 171 | void OEvent::setStartDateTime( const QDateTime& dt ) { |
172 | changeOrModify(); | 172 | changeOrModify(); |
173 | data->start = dt; | 173 | data->start = dt; |
174 | } | 174 | } |
175 | QDateTime OEvent::endDateTime()const { | 175 | QDateTime OEvent::endDateTime()const { |
176 | /* | 176 | /* |
177 | * if all Day event the end time needs | 177 | * if all Day event the end time needs |
178 | * to be on the same day as the start | 178 | * to be on the same day as the start |
179 | */ | 179 | */ |
180 | if ( data->isAllDay ) | 180 | if ( data->isAllDay ) |
181 | return QDateTime( data->start.date(), QTime(23, 59, 59 ) ); | 181 | return QDateTime( data->start.date(), QTime(23, 59, 59 ) ); |
182 | return data->end; | 182 | return data->end; |
183 | } | 183 | } |
184 | QDateTime OEvent::endDateTimeInZone()const { | 184 | QDateTime OEvent::endDateTimeInZone()const { |
185 | /* if no timezone, or all day event or if the current and this timeZone match... */ | 185 | /* if no timezone, or all day event or if the current and this timeZone match... */ |
186 | if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime(); | 186 | if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime(); |
187 | 187 | ||
188 | OTimeZone zone(data->timezone ); | 188 | OTimeZone zone(data->timezone ); |
189 | return zone.toDateTime( data->end, OTimeZone::current() ); | 189 | return zone.toDateTime( data->end, OTimeZone::current() ); |
190 | } | 190 | } |
191 | void OEvent::setEndDateTime( const QDateTime& dt ) { | 191 | void OEvent::setEndDateTime( const QDateTime& dt ) { |
192 | changeOrModify(); | 192 | changeOrModify(); |
193 | data->end = dt; | 193 | data->end = dt; |
194 | } | 194 | } |
195 | bool OEvent::isMultipleDay()const { | 195 | bool OEvent::isMultipleDay()const { |
196 | return data->end.date().day() - data->start.date().day(); | 196 | return data->end.date().day() - data->start.date().day(); |
197 | } | 197 | } |
198 | bool OEvent::isAllDay()const { | 198 | bool OEvent::isAllDay()const { |
199 | return data->isAllDay; | 199 | return data->isAllDay; |
200 | } | 200 | } |
201 | void OEvent::setAllDay( bool allDay ) { | 201 | void OEvent::setAllDay( bool allDay ) { |
202 | changeOrModify(); | 202 | changeOrModify(); |
203 | data->isAllDay = allDay; | 203 | data->isAllDay = allDay; |
204 | if (allDay ) data->timezone = "UTC"; | 204 | if (allDay ) data->timezone = "UTC"; |
205 | } | 205 | } |
206 | void OEvent::setTimeZone( const QString& tz ) { | 206 | void OEvent::setTimeZone( const QString& tz ) { |
207 | changeOrModify(); | 207 | changeOrModify(); |
208 | data->timezone = tz; | 208 | data->timezone = tz; |
209 | } | 209 | } |
210 | QString OEvent::timeZone()const { | 210 | QString OEvent::timeZone()const { |
211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); | 211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); |
212 | return data->timezone; | 212 | return data->timezone; |
213 | } | 213 | } |
214 | bool OEvent::match( const QRegExp& re )const { | 214 | bool OEvent::match( const QRegExp& re )const { |
215 | if ( re.match( data->description ) != -1 ){ | 215 | if ( re.match( data->description ) != -1 ){ |
216 | setLastHitField( DatebookDescription ); | 216 | setLastHitField( Qtopia::DatebookDescription ); |
217 | return true; | 217 | return true; |
218 | } | 218 | } |
219 | if ( re.match( data->note ) != -1 ){ | 219 | if ( re.match( data->note ) != -1 ){ |
220 | setLastHitField( Note ); | 220 | setLastHitField( Qtopia::Note ); |
221 | return true; | 221 | return true; |
222 | } | 222 | } |
223 | if ( re.match( data->location ) != -1 ){ | 223 | if ( re.match( data->location ) != -1 ){ |
224 | setLastHitField( Location ); | 224 | setLastHitField( Qtopia::Location ); |
225 | return true; | 225 | return true; |
226 | } | 226 | } |
227 | if ( re.match( data->start.toString() ) != -1 ){ | 227 | if ( re.match( data->start.toString() ) != -1 ){ |
228 | setLastHitField( StartDateTime ); | 228 | setLastHitField( Qtopia::StartDateTime ); |
229 | return true; | 229 | return true; |
230 | } | 230 | } |
231 | if ( re.match( data->end.toString() ) != -1 ){ | 231 | if ( re.match( data->end.toString() ) != -1 ){ |
232 | setLastHitField( EndDateTime ); | 232 | setLastHitField( Qtopia::EndDateTime ); |
233 | return true; | 233 | return true; |
234 | } | 234 | } |
235 | return false; | 235 | return false; |
236 | } | 236 | } |
237 | QString OEvent::toRichText()const { | 237 | QString OEvent::toRichText()const { |
238 | QString text; | 238 | QString text; |
239 | if ( !description().isEmpty() ) { | 239 | if ( !description().isEmpty() ) { |
240 | text += "<b>" + QObject::tr( "Description:") + "</b><br>"; | 240 | text += "<b>" + QObject::tr( "Description:") + "</b><br>"; |
241 | text += Qtopia::escapeString(description() ). | 241 | text += Qtopia::escapeString(description() ). |
242 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 242 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
243 | } | 243 | } |
244 | if ( startDateTime().isValid() ) { | 244 | if ( startDateTime().isValid() ) { |
245 | text += "<b>" + QObject::tr( "Start:") + "</b> "; | 245 | text += "<b>" + QObject::tr( "Start:") + "</b> "; |
246 | text += Qtopia::escapeString(startDateTime().toString() ). | 246 | text += Qtopia::escapeString(startDateTime().toString() ). |
247 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 247 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
248 | } | 248 | } |
249 | if ( endDateTime().isValid() ) { | 249 | if ( endDateTime().isValid() ) { |
250 | text += "<b>" + QObject::tr( "End:") + "</b> "; | 250 | text += "<b>" + QObject::tr( "End:") + "</b> "; |
251 | text += Qtopia::escapeString(endDateTime().toString() ). | 251 | text += Qtopia::escapeString(endDateTime().toString() ). |
252 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 252 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
253 | } | 253 | } |
254 | if ( !note().isEmpty() ) { | 254 | if ( !note().isEmpty() ) { |
255 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; | 255 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; |
256 | text += note(); | 256 | text += note(); |
257 | // text += Qtopia::escapeString(note() ). | 257 | // text += Qtopia::escapeString(note() ). |
258 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 258 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
259 | } | 259 | } |
260 | return text; | 260 | return text; |
261 | } | 261 | } |
262 | QString OEvent::toShortText()const { | 262 | QString OEvent::toShortText()const { |
263 | QString text; | 263 | QString text; |
264 | text += QString::number( startDateTime().date().day() ); | 264 | text += QString::number( startDateTime().date().day() ); |
265 | text += "."; | 265 | text += "."; |
266 | text += QString::number( startDateTime().date().month() ); | 266 | text += QString::number( startDateTime().date().month() ); |
267 | text += "."; | 267 | text += "."; |
268 | text += QString::number( startDateTime().date().year() ); | 268 | text += QString::number( startDateTime().date().year() ); |
269 | text += " "; | 269 | text += " "; |
270 | text += QString::number( startDateTime().time().hour() ); | 270 | text += QString::number( startDateTime().time().hour() ); |
271 | text += ":"; | 271 | text += ":"; |
272 | text += QString::number( startDateTime().time().minute() ); | 272 | text += QString::number( startDateTime().time().minute() ); |
273 | text += " - "; | 273 | text += " - "; |
274 | text += description(); | 274 | text += description(); |
275 | return text; | 275 | return text; |
276 | } | 276 | } |
277 | QString OEvent::type()const { | 277 | QString OEvent::type()const { |
278 | return QString::fromLatin1("OEvent"); | 278 | return QString::fromLatin1("OEvent"); |
279 | } | 279 | } |
280 | QString OEvent::recordField( int /*id */ )const { | 280 | QString OEvent::recordField( int /*id */ )const { |
281 | return QString::null; | 281 | return QString::null; |
282 | } | 282 | } |
283 | int OEvent::rtti() { | 283 | int OEvent::rtti() { |
284 | return OPimResolver::DateBook; | 284 | return OPimResolver::DateBook; |
285 | } | 285 | } |
286 | bool OEvent::loadFromStream( QDataStream& ) { | 286 | bool OEvent::loadFromStream( QDataStream& ) { |
287 | return true; | 287 | return true; |
288 | } | 288 | } |
289 | bool OEvent::saveToStream( QDataStream& )const { | 289 | bool OEvent::saveToStream( QDataStream& )const { |
290 | return true; | 290 | return true; |
291 | } | 291 | } |
292 | void OEvent::changeOrModify() { | 292 | void OEvent::changeOrModify() { |
293 | if ( data->count != 1 ) { | 293 | if ( data->count != 1 ) { |
294 | data->deref(); | 294 | data->deref(); |
295 | Data* d2 = new Data; | 295 | Data* d2 = new Data; |
296 | d2->description = data->description; | 296 | d2->description = data->description; |
297 | d2->location = data->location; | 297 | d2->location = data->location; |
298 | 298 | ||
299 | if (data->manager ) | 299 | if (data->manager ) |
300 | d2->manager = new OPimNotifyManager( *data->manager ); | 300 | d2->manager = new OPimNotifyManager( *data->manager ); |
301 | 301 | ||
302 | if ( data->recur ) | 302 | if ( data->recur ) |
303 | d2->recur = new ORecur( *data->recur ); | 303 | d2->recur = new ORecur( *data->recur ); |
304 | 304 | ||
305 | d2->note = data->note; | 305 | d2->note = data->note; |
306 | d2->created = data->created; | 306 | d2->created = data->created; |
307 | d2->start = data->start; | 307 | d2->start = data->start; |
308 | d2->end = data->end; | 308 | d2->end = data->end; |
309 | d2->isAllDay = data->isAllDay; | 309 | d2->isAllDay = data->isAllDay; |
310 | d2->timezone = data->timezone; | 310 | d2->timezone = data->timezone; |
311 | d2->parent = data->parent; | 311 | d2->parent = data->parent; |
312 | 312 | ||
313 | if ( data->child ) { | 313 | if ( data->child ) { |
314 | d2->child = new QArray<int>( *data->child ); | 314 | d2->child = new QArray<int>( *data->child ); |
315 | d2->child->detach(); | 315 | d2->child->detach(); |
316 | } | 316 | } |
317 | 317 | ||
318 | data = d2; | 318 | data = d2; |
319 | } | 319 | } |
320 | } | 320 | } |
321 | void OEvent::deref() { | 321 | void OEvent::deref() { |
322 | if ( data->deref() ) { | 322 | if ( data->deref() ) { |
323 | delete data; | 323 | delete data; |
324 | data = 0; | 324 | data = 0; |
325 | } | 325 | } |
326 | } | 326 | } |
327 | // FIXME | 327 | // FIXME |
328 | QMap<int, QString> OEvent::toMap()const { | 328 | QMap<int, QString> OEvent::toMap()const { |