author | zecke <zecke> | 2003-02-19 14:33:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-19 14:33:49 (UTC) |
commit | 5bf8efedcb7cdbf077591cb0a9a46cbe413ad8db (patch) (unidiff) | |
tree | 46fad390578dbfe31dbb09c74bec1a453214531c /library | |
parent | bd6e39ba0c38070d07c76b67a98d2e3ab3f84cb8 (diff) | |
download | opie-5bf8efedcb7cdbf077591cb0a9a46cbe413ad8db.zip opie-5bf8efedcb7cdbf077591cb0a9a46cbe413ad8db.tar.gz opie-5bf8efedcb7cdbf077591cb0a9a46cbe413ad8db.tar.bz2 |
time_t a long in our case may be < 0
This unfscks birthdays which occur in 1944 and other prior to starting of unix time
-rw-r--r-- | library/backend/event.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/backend/event.cpp b/library/backend/event.cpp index eb238a4..0003fe9 100644 --- a/library/backend/event.cpp +++ b/library/backend/event.cpp | |||
@@ -502,212 +502,212 @@ void Event::setStart( const QDateTime &d ) | |||
502 | */ | 502 | */ |
503 | void Event::setStart( time_t time ) | 503 | void Event::setStart( time_t time ) |
504 | { | 504 | { |
505 | startUTC = time; | 505 | startUTC = time; |
506 | } | 506 | } |
507 | 507 | ||
508 | /*! | 508 | /*! |
509 | Sets the end date and time of the first or only occurance of this event | 509 | Sets the end date and time of the first or only occurance of this event |
510 | to the date and time \a d. \a d should be in local time. | 510 | to the date and time \a d. \a d should be in local time. |
511 | */ | 511 | */ |
512 | void Event::setEnd( const QDateTime &d ) | 512 | void Event::setEnd( const QDateTime &d ) |
513 | { | 513 | { |
514 | endUTC = TimeConversion::toUTC( d ); | 514 | endUTC = TimeConversion::toUTC( d ); |
515 | } | 515 | } |
516 | 516 | ||
517 | /*! | 517 | /*! |
518 | \internal | 518 | \internal |
519 | */ | 519 | */ |
520 | void Event::setEnd( time_t time ) | 520 | void Event::setEnd( time_t time ) |
521 | { | 521 | { |
522 | endUTC = time; | 522 | endUTC = time; |
523 | } | 523 | } |
524 | 524 | ||
525 | /*! | 525 | /*! |
526 | \internal | 526 | \internal |
527 | */ | 527 | */ |
528 | void Event::setTimeZone( const QString &z ) | 528 | void Event::setTimeZone( const QString &z ) |
529 | { | 529 | { |
530 | tz = z; | 530 | tz = z; |
531 | } | 531 | } |
532 | 532 | ||
533 | /*! | 533 | /*! |
534 | \internal | 534 | \internal |
535 | */ | 535 | */ |
536 | void Event::setAlarm( bool b, int minutes, SoundTypeChoice s ) | 536 | void Event::setAlarm( bool b, int minutes, SoundTypeChoice s ) |
537 | { | 537 | { |
538 | hAlarm = b; | 538 | hAlarm = b; |
539 | aMinutes = minutes; | 539 | aMinutes = minutes; |
540 | aSound = s; | 540 | aSound = s; |
541 | } | 541 | } |
542 | 542 | ||
543 | /*! | 543 | /*! |
544 | \internal | 544 | \internal |
545 | */ | 545 | */ |
546 | void Event::setRepeat( bool b, const RepeatPattern &p ) | 546 | void Event::setRepeat( bool b, const RepeatPattern &p ) |
547 | { | 547 | { |
548 | hRepeat = b; | 548 | hRepeat = b; |
549 | pattern = p; | 549 | pattern = p; |
550 | } | 550 | } |
551 | 551 | ||
552 | /*! | 552 | /*! |
553 | Sets the notes for the event to \a n. | 553 | Sets the notes for the event to \a n. |
554 | */ | 554 | */ |
555 | void Event::setNotes( const QString &n ) | 555 | void Event::setNotes( const QString &n ) |
556 | { | 556 | { |
557 | note = n; | 557 | note = n; |
558 | } | 558 | } |
559 | 559 | ||
560 | /*! | 560 | /*! |
561 | Returns the description of the event. | 561 | Returns the description of the event. |
562 | */ | 562 | */ |
563 | const QString &Event::description() const | 563 | const QString &Event::description() const |
564 | { | 564 | { |
565 | return descript; | 565 | return descript; |
566 | } | 566 | } |
567 | 567 | ||
568 | /*! | 568 | /*! |
569 | Returns the location of the event. | 569 | Returns the location of the event. |
570 | */ | 570 | */ |
571 | const QString &Event::location() const | 571 | const QString &Event::location() const |
572 | { | 572 | { |
573 | return locat; | 573 | return locat; |
574 | } | 574 | } |
575 | 575 | ||
576 | // QString Event::category() const | 576 | // QString Event::category() const |
577 | // { | 577 | // { |
578 | // return categ; | 578 | // return categ; |
579 | // } | 579 | // } |
580 | 580 | ||
581 | /*! | 581 | /*! |
582 | \internal | 582 | \internal |
583 | */ | 583 | */ |
584 | Event::Type Event::type() const | 584 | Event::Type Event::type() const |
585 | { | 585 | { |
586 | return typ; | 586 | return typ; |
587 | } | 587 | } |
588 | /* | 588 | /* |
589 | QDateTime Event::start() const { | 589 | QDateTime Event::start() const { |
590 | return start( TRUE ); | 590 | return start( TRUE ); |
591 | } | 591 | } |
592 | */ | 592 | */ |
593 | /*! | 593 | /*! |
594 | \internal | 594 | \internal |
595 | */ | 595 | */ |
596 | QDateTime Event::start( bool actual ) const | 596 | QDateTime Event::start( bool actual ) const |
597 | { | 597 | { |
598 | QDateTime dt = (startUTC > 0) ? TimeConversion::fromUTC( startUTC ) : QDateTime::currentDateTime(); | 598 | QDateTime dt = TimeConversion::fromUTC( startUTC ); |
599 | 599 | ||
600 | if ( actual && typ == AllDay ) { | 600 | if ( actual && typ == AllDay ) { |
601 | QTime t = dt.time(); | 601 | QTime t = dt.time(); |
602 | t.setHMS( 0, 0, 0 ); | 602 | t.setHMS( 0, 0, 0 ); |
603 | dt.setTime( t ); | 603 | dt.setTime( t ); |
604 | } | 604 | } |
605 | return dt; | 605 | return dt; |
606 | } | 606 | } |
607 | /* | 607 | /* |
608 | QDateTime Event::end() const { | 608 | QDateTime Event::end() const { |
609 | return end( TRUE ); | 609 | return end( TRUE ); |
610 | } | 610 | } |
611 | */ | 611 | */ |
612 | /*! | 612 | /*! |
613 | \internal | 613 | \internal |
614 | */ | 614 | */ |
615 | QDateTime Event::end( bool actual ) const | 615 | QDateTime Event::end( bool actual ) const |
616 | { | 616 | { |
617 | QDateTime dt = (endUTC > 0) ? TimeConversion::fromUTC( endUTC ) : QDateTime::currentDateTime(); | 617 | QDateTime dt = TimeConversion::fromUTC( endUTC ); |
618 | 618 | ||
619 | if ( actual && typ == AllDay ) { | 619 | if ( actual && typ == AllDay ) { |
620 | QTime t = dt.time(); | 620 | QTime t = dt.time(); |
621 | t.setHMS( 23, 59, 59 ); | 621 | t.setHMS( 23, 59, 59 ); |
622 | dt.setTime( t ); | 622 | dt.setTime( t ); |
623 | } | 623 | } |
624 | return dt; | 624 | return dt; |
625 | } | 625 | } |
626 | 626 | ||
627 | /*! | 627 | /*! |
628 | \internal | 628 | \internal |
629 | */ | 629 | */ |
630 | const QString &Event::timeZone() const | 630 | const QString &Event::timeZone() const |
631 | { | 631 | { |
632 | return tz; | 632 | return tz; |
633 | } | 633 | } |
634 | 634 | ||
635 | /*! | 635 | /*! |
636 | \internal | 636 | \internal |
637 | */ | 637 | */ |
638 | bool Event::hasAlarm() const | 638 | bool Event::hasAlarm() const |
639 | { | 639 | { |
640 | return hAlarm; | 640 | return hAlarm; |
641 | } | 641 | } |
642 | 642 | ||
643 | /*! | 643 | /*! |
644 | \internal | 644 | \internal |
645 | */ | 645 | */ |
646 | int Event::alarmTime() const | 646 | int Event::alarmTime() const |
647 | { | 647 | { |
648 | return aMinutes; | 648 | return aMinutes; |
649 | } | 649 | } |
650 | 650 | ||
651 | /*! | 651 | /*! |
652 | Returns the sound type for the alarm of this event. | 652 | Returns the sound type for the alarm of this event. |
653 | */ | 653 | */ |
654 | Event::SoundTypeChoice Event::alarmSound() const | 654 | Event::SoundTypeChoice Event::alarmSound() const |
655 | { | 655 | { |
656 | return aSound; | 656 | return aSound; |
657 | } | 657 | } |
658 | 658 | ||
659 | /*! | 659 | /*! |
660 | \internal | 660 | \internal |
661 | */ | 661 | */ |
662 | bool Event::hasRepeat() const | 662 | bool Event::hasRepeat() const |
663 | { | 663 | { |
664 | return doRepeat(); | 664 | return doRepeat(); |
665 | } | 665 | } |
666 | 666 | ||
667 | /*! | 667 | /*! |
668 | \internal | 668 | \internal |
669 | */ | 669 | */ |
670 | const Event::RepeatPattern &Event::repeatPattern() const | 670 | const Event::RepeatPattern &Event::repeatPattern() const |
671 | { | 671 | { |
672 | return pattern; | 672 | return pattern; |
673 | } | 673 | } |
674 | 674 | ||
675 | /*! | 675 | /*! |
676 | \internal | 676 | \internal |
677 | */ | 677 | */ |
678 | Event::RepeatPattern &Event::repeatPattern() | 678 | Event::RepeatPattern &Event::repeatPattern() |
679 | { | 679 | { |
680 | return pattern; | 680 | return pattern; |
681 | } | 681 | } |
682 | 682 | ||
683 | /*! | 683 | /*! |
684 | Returns the notes for the event. | 684 | Returns the notes for the event. |
685 | */ | 685 | */ |
686 | const QString &Event::notes() const | 686 | const QString &Event::notes() const |
687 | { | 687 | { |
688 | return note; | 688 | return note; |
689 | } | 689 | } |
690 | 690 | ||
691 | /*! | 691 | /*! |
692 | \internal | 692 | \internal |
693 | */ | 693 | */ |
694 | bool Event::operator==( const Event &e ) const | 694 | bool Event::operator==( const Event &e ) const |
695 | { | 695 | { |
696 | if ( uid() && e.uid() == uid() ) | 696 | if ( uid() && e.uid() == uid() ) |
697 | return TRUE; | 697 | return TRUE; |
698 | return ( e.descript == descript && | 698 | return ( e.descript == descript && |
699 | e.locat == locat && | 699 | e.locat == locat && |
700 | e.categ == categ && | 700 | e.categ == categ && |
701 | e.typ == typ && | 701 | e.typ == typ && |
702 | e.startUTC == startUTC && | 702 | e.startUTC == startUTC && |
703 | e.endUTC == endUTC && | 703 | e.endUTC == endUTC && |
704 | e.tz == tz && | 704 | e.tz == tz && |
705 | e.hAlarm == hAlarm && | 705 | e.hAlarm == hAlarm && |
706 | e.aMinutes == aMinutes && | 706 | e.aMinutes == aMinutes && |
707 | e.aSound == aSound && | 707 | e.aSound == aSound && |
708 | e.hRepeat == hRepeat && | 708 | e.hRepeat == hRepeat && |
709 | e.pattern == pattern && | 709 | e.pattern == pattern && |
710 | e.note == note ); | 710 | e.note == note ); |
711 | } | 711 | } |
712 | 712 | ||
713 | /*! | 713 | /*! |