Changeset View
Changeset View
Standalone View
Standalone View
src/sorting.cpp
Show All 24 Lines | |||||
25 | #include "todo.h" | 25 | #include "todo.h" | ||
26 | #include "utils.h" | 26 | #include "utils.h" | ||
27 | 27 | | |||
28 | // PENDING(kdab) Review | 28 | // PENDING(kdab) Review | ||
29 | // The QString::compare() need to be replace by a DUI string comparisons. | 29 | // The QString::compare() need to be replace by a DUI string comparisons. | ||
30 | // See http://qt.gitorious.org/maemo-6-ui-framework/libdui | 30 | // See http://qt.gitorious.org/maemo-6-ui-framework/libdui | ||
31 | // If not compiled in "meego-mode" should we be using locale compares? | 31 | // If not compiled in "meego-mode" should we be using locale compares? | ||
32 | 32 | | |||
33 | using namespace KCalCore; | 33 | using namespace KCalendarCore; | ||
34 | 34 | | |||
35 | /** | 35 | /** | ||
36 | * How one QDateTime compares with another. | 36 | * How one QDateTime compares with another. | ||
37 | * | 37 | * | ||
38 | * If any all-day events are involved, comparison of QDateTime values | 38 | * If any all-day events are involved, comparison of QDateTime values | ||
39 | * requires them to be considered as representing time periods. An all-day | 39 | * requires them to be considered as representing time periods. An all-day | ||
40 | * instance represents a time period from 00:00:00 to 23:59:59.999 on a given | 40 | * instance represents a time period from 00:00:00 to 23:59:59.999 on a given | ||
41 | * date, while a date/time instance can be considered to represent a time | 41 | * date, while a date/time instance can be considered to represent a time | ||
▲ Show 20 Lines • Show All 142 Lines • ▼ Show 20 Line(s) | 183 | return (start1 > end2) ? After | |||
184 | : (start1 == end2) ? (end1 == end2 ? AtEnd : static_cast<DateTimeComparison>(AtEnd | After)) | 184 | : (start1 == end2) ? (end1 == end2 ? AtEnd : static_cast<DateTimeComparison>(AtEnd | After)) | ||
185 | : (end1 == end2) ? static_cast<DateTimeComparison>(Inside | AtEnd) | 185 | : (end1 == end2) ? static_cast<DateTimeComparison>(Inside | AtEnd) | ||
186 | : (end1 < end2) ? Inside : static_cast<DateTimeComparison>(Inside | AtEnd | After); | 186 | : (end1 < end2) ? Inside : static_cast<DateTimeComparison>(Inside | AtEnd | After); | ||
187 | } | 187 | } | ||
188 | } | 188 | } | ||
189 | return (start1 == start2) ? Equal : (start1 < start2) ? Before : After; | 189 | return (start1 == start2) ? Equal : (start1 < start2) ? Before : After; | ||
190 | } | 190 | } | ||
191 | 191 | | |||
192 | bool KCalCore::Events::startDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) | 192 | bool KCalendarCore::Events::startDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) | ||
193 | { | 193 | { | ||
194 | DateTimeComparison res = compare(e1->dtStart(), e1->allDay(), e2->dtStart(), e2->allDay()); | 194 | DateTimeComparison res = compare(e1->dtStart(), e1->allDay(), e2->dtStart(), e2->allDay()); | ||
195 | if (res == Equal) { | 195 | if (res == Equal) { | ||
196 | return Events::summaryLessThan(e1, e2); | 196 | return Events::summaryLessThan(e1, e2); | ||
197 | } else { | 197 | } else { | ||
198 | return (res & Before || res & AtStart); | 198 | return (res & Before || res & AtStart); | ||
199 | } | 199 | } | ||
200 | } | 200 | } | ||
201 | 201 | | |||
202 | bool KCalCore::Events::startDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) | 202 | bool KCalendarCore::Events::startDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) | ||
203 | { | 203 | { | ||
204 | DateTimeComparison res = compare(e1->dtStart(), e1->allDay(), e2->dtStart(), e2->allDay()); | 204 | DateTimeComparison res = compare(e1->dtStart(), e1->allDay(), e2->dtStart(), e2->allDay()); | ||
205 | if (res == Equal) { | 205 | if (res == Equal) { | ||
206 | return Events::summaryMoreThan(e1, e2); | 206 | return Events::summaryMoreThan(e1, e2); | ||
207 | } else { | 207 | } else { | ||
208 | return (res & After || res & AtEnd); | 208 | return (res & After || res & AtEnd); | ||
209 | } | 209 | } | ||
210 | } | 210 | } | ||
211 | 211 | | |||
212 | bool KCalCore::Events::summaryLessThan(const Event::Ptr &e1, const Event::Ptr &e2) | 212 | bool KCalendarCore::Events::summaryLessThan(const Event::Ptr &e1, const Event::Ptr &e2) | ||
213 | { | 213 | { | ||
214 | return QString::compare(e1->summary(), e2->summary(), Qt::CaseInsensitive) < 0; | 214 | return QString::compare(e1->summary(), e2->summary(), Qt::CaseInsensitive) < 0; | ||
215 | } | 215 | } | ||
216 | 216 | | |||
217 | bool KCalCore::Events::summaryMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) | 217 | bool KCalendarCore::Events::summaryMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) | ||
218 | { | 218 | { | ||
219 | return QString::compare(e1->summary(), e2->summary(), Qt::CaseInsensitive) > 0; | 219 | return QString::compare(e1->summary(), e2->summary(), Qt::CaseInsensitive) > 0; | ||
220 | } | 220 | } | ||
221 | 221 | | |||
222 | bool KCalCore::Events::endDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) | 222 | bool KCalendarCore::Events::endDateLessThan(const Event::Ptr &e1, const Event::Ptr &e2) | ||
223 | { | 223 | { | ||
224 | DateTimeComparison res = compare(e1->dtEnd(), e1->allDay(), e2->dtEnd(), e2->allDay()); | 224 | DateTimeComparison res = compare(e1->dtEnd(), e1->allDay(), e2->dtEnd(), e2->allDay()); | ||
225 | if (res == Equal) { | 225 | if (res == Equal) { | ||
226 | return Events::summaryLessThan(e1, e2); | 226 | return Events::summaryLessThan(e1, e2); | ||
227 | } else { | 227 | } else { | ||
228 | return (res & Before || res & AtStart); | 228 | return (res & Before || res & AtStart); | ||
229 | } | 229 | } | ||
230 | } | 230 | } | ||
231 | 231 | | |||
232 | bool KCalCore::Events::endDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) | 232 | bool KCalendarCore::Events::endDateMoreThan(const Event::Ptr &e1, const Event::Ptr &e2) | ||
233 | { | 233 | { | ||
234 | DateTimeComparison res = compare(e1->dtEnd(), e1->allDay(), e2->dtEnd(), e2->allDay()); | 234 | DateTimeComparison res = compare(e1->dtEnd(), e1->allDay(), e2->dtEnd(), e2->allDay()); | ||
235 | if (res == Equal) { | 235 | if (res == Equal) { | ||
236 | return Events::summaryMoreThan(e1, e2); | 236 | return Events::summaryMoreThan(e1, e2); | ||
237 | } else { | 237 | } else { | ||
238 | return (res & After || res & AtEnd); | 238 | return (res & After || res & AtEnd); | ||
239 | } | 239 | } | ||
240 | } | 240 | } | ||
241 | 241 | | |||
242 | bool KCalCore::Journals::dateLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | 242 | bool KCalendarCore::Journals::dateLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | ||
243 | { | 243 | { | ||
244 | DateTimeComparison res = compare(j1->dtStart(), j1->allDay(), j2->dtStart(), j2->allDay()); | 244 | DateTimeComparison res = compare(j1->dtStart(), j1->allDay(), j2->dtStart(), j2->allDay()); | ||
245 | return (res & Before || res & AtStart); | 245 | return (res & Before || res & AtStart); | ||
246 | } | 246 | } | ||
247 | 247 | | |||
248 | bool KCalCore::Journals::dateMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | 248 | bool KCalendarCore::Journals::dateMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | ||
249 | { | 249 | { | ||
250 | DateTimeComparison res = compare(j1->dtStart(), j1->allDay(), j2->dtStart(), j2->allDay()); | 250 | DateTimeComparison res = compare(j1->dtStart(), j1->allDay(), j2->dtStart(), j2->allDay()); | ||
251 | return (res & After || res & AtEnd); | 251 | return (res & After || res & AtEnd); | ||
252 | } | 252 | } | ||
253 | 253 | | |||
254 | bool KCalCore::Journals::summaryLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | 254 | bool KCalendarCore::Journals::summaryLessThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | ||
255 | { | 255 | { | ||
256 | return QString::compare(j1->summary(), j2->summary(), Qt::CaseInsensitive) < 0; | 256 | return QString::compare(j1->summary(), j2->summary(), Qt::CaseInsensitive) < 0; | ||
257 | } | 257 | } | ||
258 | 258 | | |||
259 | bool KCalCore::Journals::summaryMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | 259 | bool KCalendarCore::Journals::summaryMoreThan(const Journal::Ptr &j1, const Journal::Ptr &j2) | ||
260 | { | 260 | { | ||
261 | return QString::compare(j1->summary(), j2->summary(), Qt::CaseInsensitive) > 0; | 261 | return QString::compare(j1->summary(), j2->summary(), Qt::CaseInsensitive) > 0; | ||
262 | } | 262 | } | ||
263 | 263 | | |||
264 | bool KCalCore::Todos::startDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 264 | bool KCalendarCore::Todos::startDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
265 | { | 265 | { | ||
266 | DateTimeComparison res = compare(t1->dtStart(), t1->allDay(), t2->dtStart(), t2->allDay()); | 266 | DateTimeComparison res = compare(t1->dtStart(), t1->allDay(), t2->dtStart(), t2->allDay()); | ||
267 | if (res == Equal) { | 267 | if (res == Equal) { | ||
268 | return Todos::summaryLessThan(t1, t2); | 268 | return Todos::summaryLessThan(t1, t2); | ||
269 | } else { | 269 | } else { | ||
270 | return (res & Before || res & AtStart); | 270 | return (res & Before || res & AtStart); | ||
271 | } | 271 | } | ||
272 | } | 272 | } | ||
273 | 273 | | |||
274 | bool KCalCore::Todos::startDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 274 | bool KCalendarCore::Todos::startDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
275 | { | 275 | { | ||
276 | DateTimeComparison res = compare(t1->dtStart(), t1->allDay(), t2->dtStart(), t2->allDay()); | 276 | DateTimeComparison res = compare(t1->dtStart(), t1->allDay(), t2->dtStart(), t2->allDay()); | ||
277 | if (res == Equal) { | 277 | if (res == Equal) { | ||
278 | return Todos::summaryMoreThan(t1, t2); | 278 | return Todos::summaryMoreThan(t1, t2); | ||
279 | } else { | 279 | } else { | ||
280 | return (res & After || res & AtEnd); | 280 | return (res & After || res & AtEnd); | ||
281 | } | 281 | } | ||
282 | } | 282 | } | ||
283 | 283 | | |||
284 | bool KCalCore::Todos::dueDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 284 | bool KCalendarCore::Todos::dueDateLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
285 | { | 285 | { | ||
286 | DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); | 286 | DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); | ||
287 | if (res == Equal) { | 287 | if (res == Equal) { | ||
288 | return Todos::summaryLessThan(t1, t2); | 288 | return Todos::summaryLessThan(t1, t2); | ||
289 | } else { | 289 | } else { | ||
290 | return (res & Before || res & AtStart); | 290 | return (res & Before || res & AtStart); | ||
291 | } | 291 | } | ||
292 | } | 292 | } | ||
293 | 293 | | |||
294 | bool KCalCore::Todos::dueDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 294 | bool KCalendarCore::Todos::dueDateMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
295 | { | 295 | { | ||
296 | DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); | 296 | DateTimeComparison res = compare(t1->dtDue(), t1->allDay(), t2->dtDue(), t2->allDay()); | ||
297 | if (res == Equal) { | 297 | if (res == Equal) { | ||
298 | return Todos::summaryMoreThan(t1, t2); | 298 | return Todos::summaryMoreThan(t1, t2); | ||
299 | } else { | 299 | } else { | ||
300 | return (res & After || res & AtEnd); | 300 | return (res & After || res & AtEnd); | ||
301 | } | 301 | } | ||
302 | } | 302 | } | ||
303 | 303 | | |||
304 | bool KCalCore::Todos::priorityLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 304 | bool KCalendarCore::Todos::priorityLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
305 | { | 305 | { | ||
306 | if (t1->priority() < t2->priority()) { | 306 | if (t1->priority() < t2->priority()) { | ||
307 | return true; | 307 | return true; | ||
308 | } else if (t1->priority() == t2->priority()) { | 308 | } else if (t1->priority() == t2->priority()) { | ||
309 | return Todos::summaryLessThan(t1, t2); | 309 | return Todos::summaryLessThan(t1, t2); | ||
310 | } else { | 310 | } else { | ||
311 | return false; | 311 | return false; | ||
312 | } | 312 | } | ||
313 | } | 313 | } | ||
314 | 314 | | |||
315 | bool KCalCore::Todos::priorityMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 315 | bool KCalendarCore::Todos::priorityMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
316 | { | 316 | { | ||
317 | if (t1->priority() > t2->priority()) { | 317 | if (t1->priority() > t2->priority()) { | ||
318 | return true; | 318 | return true; | ||
319 | } else if (t1->priority() == t2->priority()) { | 319 | } else if (t1->priority() == t2->priority()) { | ||
320 | return Todos::summaryMoreThan(t1, t2); | 320 | return Todos::summaryMoreThan(t1, t2); | ||
321 | } else { | 321 | } else { | ||
322 | return false; | 322 | return false; | ||
323 | } | 323 | } | ||
324 | } | 324 | } | ||
325 | 325 | | |||
326 | bool KCalCore::Todos::percentLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 326 | bool KCalendarCore::Todos::percentLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
327 | { | 327 | { | ||
328 | if (t1->percentComplete() < t2->percentComplete()) { | 328 | if (t1->percentComplete() < t2->percentComplete()) { | ||
329 | return true; | 329 | return true; | ||
330 | } else if (t1->percentComplete() == t2->percentComplete()) { | 330 | } else if (t1->percentComplete() == t2->percentComplete()) { | ||
331 | return Todos::summaryLessThan(t1, t2); | 331 | return Todos::summaryLessThan(t1, t2); | ||
332 | } else { | 332 | } else { | ||
333 | return false; | 333 | return false; | ||
334 | } | 334 | } | ||
335 | } | 335 | } | ||
336 | 336 | | |||
337 | bool KCalCore::Todos::percentMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 337 | bool KCalendarCore::Todos::percentMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
338 | { | 338 | { | ||
339 | if (t1->percentComplete() > t2->percentComplete()) { | 339 | if (t1->percentComplete() > t2->percentComplete()) { | ||
340 | return true; | 340 | return true; | ||
341 | } else if (t1->percentComplete() == t2->percentComplete()) { | 341 | } else if (t1->percentComplete() == t2->percentComplete()) { | ||
342 | return Todos::summaryMoreThan(t1, t2); | 342 | return Todos::summaryMoreThan(t1, t2); | ||
343 | } else { | 343 | } else { | ||
344 | return false; | 344 | return false; | ||
345 | } | 345 | } | ||
346 | } | 346 | } | ||
347 | 347 | | |||
348 | bool KCalCore::Todos::summaryLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 348 | bool KCalendarCore::Todos::summaryLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
349 | { | 349 | { | ||
350 | return QString::compare(t1->summary(), t2->summary(), Qt::CaseInsensitive) < 0; | 350 | return QString::compare(t1->summary(), t2->summary(), Qt::CaseInsensitive) < 0; | ||
351 | } | 351 | } | ||
352 | 352 | | |||
353 | bool KCalCore::Todos::summaryMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 353 | bool KCalendarCore::Todos::summaryMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
354 | { | 354 | { | ||
355 | return QString::compare(t1->summary(), t2->summary(), Qt::CaseInsensitive) > 0; | 355 | return QString::compare(t1->summary(), t2->summary(), Qt::CaseInsensitive) > 0; | ||
356 | } | 356 | } | ||
357 | 357 | | |||
358 | bool KCalCore::Todos::createdLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 358 | bool KCalendarCore::Todos::createdLessThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
359 | { | 359 | { | ||
360 | DateTimeComparison res = compare(t1->created(), t1->allDay(), t2->created(), t2->allDay()); | 360 | DateTimeComparison res = compare(t1->created(), t1->allDay(), t2->created(), t2->allDay()); | ||
361 | if (res == Equal) { | 361 | if (res == Equal) { | ||
362 | return Todos::summaryLessThan(t1, t2); | 362 | return Todos::summaryLessThan(t1, t2); | ||
363 | } else { | 363 | } else { | ||
364 | return (res & Before || res & AtStart); | 364 | return (res & Before || res & AtStart); | ||
365 | } | 365 | } | ||
366 | } | 366 | } | ||
367 | 367 | | |||
368 | bool KCalCore::Todos::createdMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | 368 | bool KCalendarCore::Todos::createdMoreThan(const Todo::Ptr &t1, const Todo::Ptr &t2) | ||
369 | { | 369 | { | ||
370 | DateTimeComparison res = compare(t1->created(), t1->allDay(), t2->created(), t2->allDay()); | 370 | DateTimeComparison res = compare(t1->created(), t1->allDay(), t2->created(), t2->allDay()); | ||
371 | if (res == Equal) { | 371 | if (res == Equal) { | ||
372 | return Todos::summaryMoreThan(t1, t2); | 372 | return Todos::summaryMoreThan(t1, t2); | ||
373 | } else { | 373 | } else { | ||
374 | return (res & After || res & AtEnd); | 374 | return (res & After || res & AtEnd); | ||
375 | } | 375 | } | ||
376 | } | 376 | } | ||
377 | 377 | | |||
378 | bool KCalCore::Incidences::dateLessThan(const Incidence::Ptr &i1, | 378 | bool KCalendarCore::Incidences::dateLessThan(const Incidence::Ptr &i1, | ||
379 | const Incidence::Ptr &i2) | 379 | const Incidence::Ptr &i2) | ||
380 | { | 380 | { | ||
381 | DateTimeComparison res = compare(i1->dateTime(Incidence::RoleSort), i1->allDay(), | 381 | DateTimeComparison res = compare(i1->dateTime(Incidence::RoleSort), i1->allDay(), | ||
382 | i2->dateTime(Incidence::RoleSort), i2->allDay()); | 382 | i2->dateTime(Incidence::RoleSort), i2->allDay()); | ||
383 | if (res == Equal) { | 383 | if (res == Equal) { | ||
384 | return Incidences::summaryLessThan(i1, i2); | 384 | return Incidences::summaryLessThan(i1, i2); | ||
385 | } else { | 385 | } else { | ||
386 | return (res & Before || res & AtStart); | 386 | return (res & Before || res & AtStart); | ||
387 | } | 387 | } | ||
388 | } | 388 | } | ||
389 | 389 | | |||
390 | bool KCalCore::Incidences::dateMoreThan(const Incidence::Ptr &i1, | 390 | bool KCalendarCore::Incidences::dateMoreThan(const Incidence::Ptr &i1, | ||
391 | const Incidence::Ptr &i2) | 391 | const Incidence::Ptr &i2) | ||
392 | { | 392 | { | ||
393 | DateTimeComparison res = compare(i1->dateTime(Incidence::RoleSort), i1->allDay(), | 393 | DateTimeComparison res = compare(i1->dateTime(Incidence::RoleSort), i1->allDay(), | ||
394 | i2->dateTime(Incidence::RoleSort), i2->allDay()); | 394 | i2->dateTime(Incidence::RoleSort), i2->allDay()); | ||
395 | if (res == Equal) { | 395 | if (res == Equal) { | ||
396 | return Incidences::summaryMoreThan(i1, i2); | 396 | return Incidences::summaryMoreThan(i1, i2); | ||
397 | } else { | 397 | } else { | ||
398 | return (res & After || res & AtEnd); | 398 | return (res & After || res & AtEnd); | ||
399 | } | 399 | } | ||
400 | } | 400 | } | ||
401 | 401 | | |||
402 | bool KCalCore::Incidences::createdLessThan(const Incidence::Ptr &i1, | 402 | bool KCalendarCore::Incidences::createdLessThan(const Incidence::Ptr &i1, | ||
403 | const Incidence::Ptr &i2) | 403 | const Incidence::Ptr &i2) | ||
404 | { | 404 | { | ||
405 | DateTimeComparison res = compare(i1->created(), i1->allDay(), i2->created(), i2->allDay()); | 405 | DateTimeComparison res = compare(i1->created(), i1->allDay(), i2->created(), i2->allDay()); | ||
406 | if (res == Equal) { | 406 | if (res == Equal) { | ||
407 | return Incidences::summaryLessThan(i1, i2); | 407 | return Incidences::summaryLessThan(i1, i2); | ||
408 | } else { | 408 | } else { | ||
409 | return (res & Before || res & AtStart); | 409 | return (res & Before || res & AtStart); | ||
410 | } | 410 | } | ||
411 | } | 411 | } | ||
412 | 412 | | |||
413 | bool KCalCore::Incidences::createdMoreThan(const Incidence::Ptr &i1, | 413 | bool KCalendarCore::Incidences::createdMoreThan(const Incidence::Ptr &i1, | ||
414 | const Incidence::Ptr &i2) | 414 | const Incidence::Ptr &i2) | ||
415 | { | 415 | { | ||
416 | DateTimeComparison res = compare(i1->created(), i1->allDay(), i2->created(), i2->allDay()); | 416 | DateTimeComparison res = compare(i1->created(), i1->allDay(), i2->created(), i2->allDay()); | ||
417 | if (res == Equal) { | 417 | if (res == Equal) { | ||
418 | return Incidences::summaryMoreThan(i1, i2); | 418 | return Incidences::summaryMoreThan(i1, i2); | ||
419 | } else { | 419 | } else { | ||
420 | return (res & After || res & AtEnd); | 420 | return (res & After || res & AtEnd); | ||
421 | } | 421 | } | ||
422 | } | 422 | } | ||
423 | 423 | | |||
424 | bool KCalCore::Incidences::summaryLessThan(const Incidence::Ptr &i1, | 424 | bool KCalendarCore::Incidences::summaryLessThan(const Incidence::Ptr &i1, | ||
425 | const Incidence::Ptr &i2) | 425 | const Incidence::Ptr &i2) | ||
426 | { | 426 | { | ||
427 | return QString::compare(i1->summary(), i2->summary(), Qt::CaseInsensitive) < 0; | 427 | return QString::compare(i1->summary(), i2->summary(), Qt::CaseInsensitive) < 0; | ||
428 | } | 428 | } | ||
429 | 429 | | |||
430 | bool KCalCore::Incidences::summaryMoreThan(const Incidence::Ptr &i1, | 430 | bool KCalendarCore::Incidences::summaryMoreThan(const Incidence::Ptr &i1, | ||
431 | const Incidence::Ptr &i2) | 431 | const Incidence::Ptr &i2) | ||
432 | { | 432 | { | ||
433 | return QString::compare(i1->summary(), i2->summary(), Qt::CaseInsensitive) > 0; | 433 | return QString::compare(i1->summary(), i2->summary(), Qt::CaseInsensitive) > 0; | ||
434 | } | 434 | } | ||
435 | 435 | |