-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index ab50604..7a08f12 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp | |||
@@ -522,122 +522,122 @@ void OPimTodoAccessXML::todo( QAsciiDict<int>* dict, OPimTodo& ev, | |||
522 | } | 522 | } |
523 | } | 523 | } |
524 | 524 | ||
525 | // from PalmtopRecord... GPL ### FIXME | 525 | // from PalmtopRecord... GPL ### FIXME |
526 | namespace { | 526 | namespace { |
527 | QString customToXml(const QMap<QString, QString>& customMap ) | 527 | QString customToXml(const QMap<QString, QString>& customMap ) |
528 | { | 528 | { |
529 | QString buf(" "); | 529 | QString buf(" "); |
530 | for ( QMap<QString, QString>::ConstIterator cit = customMap.begin(); | 530 | for ( QMap<QString, QString>::ConstIterator cit = customMap.begin(); |
531 | cit != customMap.end(); ++cit) { | 531 | cit != customMap.end(); ++cit) { |
532 | buf += cit.key(); | 532 | buf += cit.key(); |
533 | buf += "=\""; | 533 | buf += "=\""; |
534 | buf += Qtopia::escapeString(cit.data()); | 534 | buf += Qtopia::escapeString(cit.data()); |
535 | buf += "\" "; | 535 | buf += "\" "; |
536 | } | 536 | } |
537 | return buf; | 537 | return buf; |
538 | } | 538 | } |
539 | 539 | ||
540 | 540 | ||
541 | } | 541 | } |
542 | 542 | ||
543 | QString OPimTodoAccessXML::toString( const OPimTodo& ev )const { | 543 | QString OPimTodoAccessXML::toString( const OPimTodo& ev )const { |
544 | QString str; | 544 | QString str; |
545 | 545 | ||
546 | str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" "; | 546 | str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\""; |
547 | str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" "; | 547 | str += " HasDate=\"" + QString::number( ev.hasDueDate() ) + "\""; |
548 | str += "Priority=\"" + QString::number( ev.priority() ) + "\" "; | 548 | str += " Priority=\"" + QString::number( ev.priority() ) + "\""; |
549 | str += "Progress=\"" + QString::number(ev.progress() ) + "\" "; | 549 | str += " Progress=\"" + QString::number(ev.progress() ) + "\""; |
550 | 550 | ||
551 | str += "Categories=\"" + toString( ev.categories() ) + "\" "; | 551 | str += " Categories=\"" + toString( ev.categories() ) + "\""; |
552 | str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" "; | 552 | str += " Description=\"" + Qtopia::escapeString( ev.description() ) + "\""; |
553 | str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" "; | 553 | str += " Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\""; |
554 | 554 | ||
555 | if ( ev.hasDueDate() ) { | 555 | if ( ev.hasDueDate() ) { |
556 | str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" "; | 556 | str += " DateYear=\"" + QString::number( ev.dueDate().year() ) + "\""; |
557 | str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" "; | 557 | str += " DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\""; |
558 | str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" "; | 558 | str += " DateDay=\"" + QString::number( ev.dueDate().day() ) + "\""; |
559 | } | 559 | } |
560 | str += "Uid=\"" + QString::number( ev.uid() ) + "\" "; | 560 | str += " Uid=\"" + QString::number( ev.uid() ) + "\""; |
561 | 561 | ||
562 | // append the extra options | 562 | // append the extra options |
563 | /* FIXME Qtopia::Record this is currently not | 563 | /* FIXME Qtopia::Record this is currently not |
564 | * possible you can set custom fields | 564 | * possible you can set custom fields |
565 | * but don' iterate over the list | 565 | * but don' iterate over the list |
566 | * I may do #define private protected | 566 | * I may do #define private protected |
567 | * for this case - cough --zecke | 567 | * for this case - cough --zecke |
568 | */ | 568 | */ |
569 | /* | 569 | /* |
570 | QMap<QString, QString> extras = ev.extras(); | 570 | QMap<QString, QString> extras = ev.extras(); |
571 | QMap<QString, QString>::Iterator extIt; | 571 | QMap<QString, QString>::Iterator extIt; |
572 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) | 572 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) |
573 | str += extIt.key() + "=\"" + extIt.data() + "\" "; | 573 | str += " " + extIt.key() + "=\"" + extIt.data() + "\""; |
574 | */ | 574 | */ |
575 | // cross refernce | 575 | // cross refernce |
576 | if ( ev.hasRecurrence() ) { | 576 | if ( ev.hasRecurrence() ) { |
577 | str += ev.recurrence().toString(); | 577 | str += ev.recurrence().toString(); |
578 | } | 578 | } |
579 | if ( ev.hasStartDate() ) | 579 | if ( ev.hasStartDate() ) |
580 | str += "StartDate=\""+ OPimDateConversion::dateToString( ev.startDate() ) +"\" "; | 580 | str += " StartDate=\""+ OPimDateConversion::dateToString( ev.startDate() ) +"\""; |
581 | if ( ev.hasCompletedDate() ) | 581 | if ( ev.hasCompletedDate() ) |
582 | str += "CompletedDate=\""+ OPimDateConversion::dateToString( ev.completedDate() ) +"\" "; | 582 | str += " CompletedDate=\""+ OPimDateConversion::dateToString( ev.completedDate() ) +"\""; |
583 | if ( ev.hasState() ) | 583 | if ( ev.hasState() ) |
584 | str += "State=\""+QString::number( ev.state().state() )+"\" "; | 584 | str += " State=\""+QString::number( ev.state().state() )+"\""; |
585 | 585 | ||
586 | /* | 586 | /* |
587 | * save reminders and notifiers! | 587 | * save reminders and notifiers! |
588 | * DATE_TIME:DURATION:SOUND:NOT_USED_YET;OTHER_DATE_TIME:OTHER_DURATION:SOUND:.... | 588 | * DATE_TIME:DURATION:SOUND:NOT_USED_YET;OTHER_DATE_TIME:OTHER_DURATION:SOUND:.... |
589 | */ | 589 | */ |
590 | if ( ev.hasNotifiers() ) { | 590 | if ( ev.hasNotifiers() ) { |
591 | OPimNotifyManager manager = ev.notifiers(); | 591 | OPimNotifyManager manager = ev.notifiers(); |
592 | OPimNotifyManager::Alarms alarms = manager.alarms(); | 592 | OPimNotifyManager::Alarms alarms = manager.alarms(); |
593 | if (!alarms.isEmpty() ) { | 593 | if (!alarms.isEmpty() ) { |
594 | QStringList als; | 594 | QStringList als; |
595 | OPimNotifyManager::Alarms::Iterator it = alarms.begin(); | 595 | OPimNotifyManager::Alarms::Iterator it = alarms.begin(); |
596 | for ( ; it != alarms.end(); ++it ) { | 596 | for ( ; it != alarms.end(); ++it ) { |
597 | /* only if time is valid */ | 597 | /* only if time is valid */ |
598 | if ( (*it).dateTime().isValid() ) { | 598 | if ( (*it).dateTime().isValid() ) { |
599 | als << OPimDateConversion::dateTimeToString( (*it).dateTime() ) | 599 | als << OPimDateConversion::dateTimeToString( (*it).dateTime() ) |
600 | + ":" + QString::number( (*it).duration() ) | 600 | + ":" + QString::number( (*it).duration() ) |
601 | + ":" + QString::number( (*it).sound() ) | 601 | + ":" + QString::number( (*it).sound() ) |
602 | + ":"; | 602 | + ":"; |
603 | } | 603 | } |
604 | } | 604 | } |
605 | // now write the list | 605 | // now write the list |
606 | str += "Alarms=\""+als.join(";") +"\" "; | 606 | str += " Alarms=\""+als.join(";") +"\""; |
607 | } | 607 | } |
608 | 608 | ||
609 | /* | 609 | /* |
610 | * now the same for reminders but more easy. We just save the uid of the OPimEvent. | 610 | * now the same for reminders but more easy. We just save the uid of the OPimEvent. |
611 | */ | 611 | */ |
612 | OPimNotifyManager::Reminders reminders = manager.reminders(); | 612 | OPimNotifyManager::Reminders reminders = manager.reminders(); |
613 | if (!reminders.isEmpty() ) { | 613 | if (!reminders.isEmpty() ) { |
614 | OPimNotifyManager::Reminders::Iterator it = reminders.begin(); | 614 | OPimNotifyManager::Reminders::Iterator it = reminders.begin(); |
615 | QStringList records; | 615 | QStringList records; |
616 | for ( ; it != reminders.end(); ++it ) { | 616 | for ( ; it != reminders.end(); ++it ) { |
617 | records << QString::number( (*it).recordUid() ); | 617 | records << QString::number( (*it).recordUid() ); |
618 | } | 618 | } |
619 | str += "Reminders=\""+ records.join(";") +"\" "; | 619 | str += " Reminders=\""+ records.join(";") +"\""; |
620 | } | 620 | } |
621 | } | 621 | } |
622 | str += customToXml( ev.toExtraMap() ); | 622 | str += customToXml( ev.toExtraMap() ); |
623 | 623 | ||
624 | 624 | ||
625 | return str; | 625 | return str; |
626 | } | 626 | } |
627 | QString OPimTodoAccessXML::toString( const QArray<int>& ints ) const { | 627 | QString OPimTodoAccessXML::toString( const QArray<int>& ints ) const { |
628 | return Qtopia::Record::idsToString( ints ); | 628 | return Qtopia::Record::idsToString( ints ); |
629 | } | 629 | } |
630 | 630 | ||
631 | 631 | ||
632 | QArray<int> OPimTodoAccessXML::sorted( const UIDArray& events, bool asc, | 632 | QArray<int> OPimTodoAccessXML::sorted( const UIDArray& events, bool asc, |
633 | int sortOrder,int sortFilter, | 633 | int sortOrder,int sortFilter, |
634 | const QArray<int>& categories )const { | 634 | const QArray<int>& categories )const { |
635 | Internal::OPimTodoSortVector vector(events.count(), asc,sortOrder ); | 635 | Internal::OPimTodoSortVector vector(events.count(), asc,sortOrder ); |
636 | int item = 0; | 636 | int item = 0; |
637 | 637 | ||
638 | bool bCat = sortFilter & OPimTodoAccess::FilterCategory ? true : false; | 638 | bool bCat = sortFilter & OPimTodoAccess::FilterCategory ? true : false; |
639 | bool bOnly = sortFilter & OPimTodoAccess::OnlyOverDue ? true : false; | 639 | bool bOnly = sortFilter & OPimTodoAccess::OnlyOverDue ? true : false; |
640 | bool comp = sortFilter & OPimTodoAccess::DoNotShowCompleted ? true : false; | 640 | bool comp = sortFilter & OPimTodoAccess::DoNotShowCompleted ? true : false; |
641 | bool catPassed = false; | 641 | bool catPassed = false; |
642 | int cat; | 642 | int cat; |
643 | 643 | ||