author | zautrix <zautrix> | 2005-07-10 20:11:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-10 20:11:56 (UTC) |
commit | f06311e58cb5887fd673eb1c2c48acf7cd987ad9 (patch) (unidiff) | |
tree | 301c74302cdddaa3716d79117023228005ebd265 | |
parent | cb784d21ad22ab72a4e3231974f67816185675fd (diff) | |
download | kdepimpi-f06311e58cb5887fd673eb1c2c48acf7cd987ad9.zip kdepimpi-f06311e58cb5887fd673eb1c2c48acf7cd987ad9.tar.gz kdepimpi-f06311e58cb5887fd673eb1c2c48acf7cd987ad9.tar.bz2 |
smarter faster conflict search
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 1 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 42 | ||||
-rw-r--r-- | libkcal/event.cpp | 20 | ||||
-rw-r--r-- | libkcal/event.h | 1 |
4 files changed, 56 insertions, 8 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 1f06f1e..c0d63e5 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,31 +1,32 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.16 ************ | 3 | ********** VERSION 2.1.16 ************ |
4 | 4 | ||
5 | Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus. | 5 | Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus. |
6 | Added columns for datetime in todo view: Last modified, created and last modified subtodo | 6 | Added columns for datetime in todo view: Last modified, created and last modified subtodo |
7 | Fixed a bug in agenda view displaying recurring multiday events which are longer than two days. | 7 | Fixed a bug in agenda view displaying recurring multiday events which are longer than two days. |
8 | Made conflict detection up to 4 times faster. | ||
8 | 9 | ||
9 | ********** VERSION 2.1.15 ************ | 10 | ********** VERSION 2.1.15 ************ |
10 | 11 | ||
11 | Fixed two layout problems on the Z: | 12 | Fixed two layout problems on the Z: |
12 | Made the with of the newly added buttons on the Quick-Todo smaller. | 13 | Made the with of the newly added buttons on the Quick-Todo smaller. |
13 | Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible. | 14 | Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible. |
14 | 15 | ||
15 | 16 | ||
16 | ********** VERSION 2.1.14 ************ | 17 | ********** VERSION 2.1.14 ************ |
17 | 18 | ||
18 | Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done. | 19 | Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done. |
19 | Added a button to add a subtodo quickly. | 20 | Added a button to add a subtodo quickly. |
20 | 21 | ||
21 | Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ). | 22 | Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ). |
22 | Added an option to change the layout of the list week to column mode. | 23 | Added an option to change the layout of the list week to column mode. |
23 | 24 | ||
24 | Fixed some usability problems in pi-sync mode by adding some progress information about file transfer. | 25 | Fixed some usability problems in pi-sync mode by adding some progress information about file transfer. |
25 | 26 | ||
26 | Fixed pi-sync problems with the new multi calendar feature. | 27 | Fixed pi-sync problems with the new multi calendar feature. |
27 | Now pi-sync behaviour should be: | 28 | Now pi-sync behaviour should be: |
28 | 1) Local sends file request ( as usual ) | 29 | 1) Local sends file request ( as usual ) |
29 | 2) Remote sends file which contains data of all enabled ( the calendar where the "eye" column is checked ) calendars. | 30 | 2) Remote sends file which contains data of all enabled ( the calendar where the "eye" column is checked ) calendars. |
30 | 3) Local syncs with data, adds new entries to default calendar and sends file back ( as usual ). | 31 | 3) Local syncs with data, adds new entries to default calendar and sends file back ( as usual ). |
31 | If the data which local receives contains entries which are on disabled calendars on local this entries are updated and not added as duplicates to the default calendar. | 32 | If the data which local receives contains entries which are on disabled calendars on local this entries are updated and not added as duplicates to the default calendar. |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a9e402e..427d71b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -638,117 +638,134 @@ void CalendarView::init() | |||
638 | #ifndef DESKTOP_VERSION | 638 | #ifndef DESKTOP_VERSION |
639 | //US listen for arriving address resultsets | 639 | //US listen for arriving address resultsets |
640 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), | 640 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), |
641 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 641 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
642 | #endif | 642 | #endif |
643 | mDateNavigator->setCalendar( mCalendar ); | 643 | mDateNavigator->setCalendar( mCalendar ); |
644 | } | 644 | } |
645 | 645 | ||
646 | 646 | ||
647 | CalendarView::~CalendarView() | 647 | CalendarView::~CalendarView() |
648 | { | 648 | { |
649 | // kdDebug() << "~CalendarView()" << endl; | 649 | // kdDebug() << "~CalendarView()" << endl; |
650 | //qDebug("CalendarView::~CalendarView() "); | 650 | //qDebug("CalendarView::~CalendarView() "); |
651 | delete mDialogManager; | 651 | delete mDialogManager; |
652 | delete mViewManager; | 652 | delete mViewManager; |
653 | delete mStorage; | 653 | delete mStorage; |
654 | delete mDateFrame ; | 654 | delete mDateFrame ; |
655 | delete mEventViewerDialog; | 655 | delete mEventViewerDialog; |
656 | //kdDebug() << "~CalendarView() done" << endl; | 656 | //kdDebug() << "~CalendarView() done" << endl; |
657 | } | 657 | } |
658 | 658 | ||
659 | 659 | ||
660 | void CalendarView::nextConflict( bool all, bool allday ) | 660 | void CalendarView::nextConflict( bool all, bool allday ) |
661 | { | 661 | { |
662 | 662 | static bool block = false; | |
663 | if ( block ) return; | ||
664 | block = true; | ||
663 | QPtrList<Event> testlist = mCalendar->events(); | 665 | QPtrList<Event> testlist = mCalendar->events(); |
664 | Event * test = testlist.first(); | 666 | Event * test = testlist.first(); |
665 | while ( test ) { | 667 | while ( test ) { |
666 | test->setTagged( false ); | 668 | test->setTagged( false ); |
667 | test = testlist.next(); | 669 | test = testlist.next(); |
668 | } | 670 | } |
669 | QTime st ( 0,0,0); | 671 | QTime st ( 0,0,0); |
670 | if ( mViewManager->currentView() == mViewManager->agendaView() ) | 672 | if ( mViewManager->currentView() == mViewManager->agendaView() ) |
671 | st = mViewManager->agendaView()->agenda()->getEndTime(); | 673 | st = mViewManager->agendaView()->agenda()->getEndTime(); |
672 | //qDebug("time %s ", st.toString().latin1()); | 674 | //qDebug("time %s ", st.toString().latin1()); |
673 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); | 675 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); |
674 | QDateTime conflict; | 676 | QDateTime conflict; |
675 | QDateTime retVal; | 677 | QDateTime retVal; |
676 | bool found = false; | 678 | bool found = false; |
677 | Event * cE = 0; | 679 | Event * cE = 0; |
678 | Event * cE2 = 0; | 680 | Event * cE2 = 0; |
679 | QPtrList<Event> testlist2 = testlist; | 681 | QPtrList<Event> testlist2 = testlist; |
680 | test = testlist.first(); | 682 | test = testlist.first(); |
681 | bool skip = false; | 683 | bool skip = false; |
682 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 684 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
685 | //QTime tm; | ||
686 | //tm.start(); | ||
683 | while ( test ) { | 687 | while ( test ) { |
684 | qApp->processEvents(); | 688 | qApp->processEvents(); |
685 | skip = false; | 689 | skip = false; |
686 | if ( !all ) skip = ( allday != test->doesFloat() ); | 690 | if ( !all ) skip = ( allday != test->doesFloat() ); |
687 | if ( !skip ) { | 691 | if ( !skip ) { |
692 | if ( found ) | ||
693 | skip = !test->matchTime( &startDT, &conflict ); | ||
694 | else | ||
695 | skip = !test->matchTime( &startDT, 0 ); | ||
696 | } | ||
697 | if ( !skip ) { | ||
688 | Event * test2 = testlist2.first(); | 698 | Event * test2 = testlist2.first(); |
689 | while ( test2 ) { | 699 | while ( test2 ) { |
690 | skip = false; | 700 | skip = test2->isTagged(); |
691 | if ( !all ) skip = ( allday != test2->doesFloat() ); | 701 | if ( !skip && !all ) skip = ( allday != test2->doesFloat() ); |
702 | if ( !skip ) { | ||
703 | if ( found ) | ||
704 | skip = !test2->matchTime( &startDT, &conflict ); | ||
705 | else | ||
706 | skip = !test2->matchTime( &startDT, 0 ); | ||
707 | } | ||
692 | if ( !skip ) { | 708 | if ( !skip ) { |
693 | if ( !test2->isTagged() ) { | ||
694 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { | 709 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { |
695 | //qDebug("overlap "); | 710 | //qDebug("overlap "); |
696 | if ( ! found ) { | 711 | if ( ! found ) { |
697 | if ( retVal >= startDT ) { | 712 | if ( retVal >= startDT ) { |
698 | conflict = retVal; | 713 | conflict = retVal; |
699 | cE = test; | 714 | cE = test; |
700 | cE2 = test2; | 715 | cE2 = test2; |
701 | found = true; | 716 | found = true; |
702 | } | 717 | } |
703 | } else { | 718 | } else { |
704 | if ( retVal >= startDT && retVal < conflict ) { | 719 | if ( retVal >= startDT && retVal < conflict ) { |
705 | conflict = retVal; | 720 | conflict = retVal; |
706 | cE = test; | 721 | cE = test; |
707 | cE2 = test2; | 722 | cE2 = test2; |
708 | } | 723 | } |
709 | } | 724 | } |
710 | } | 725 | } |
711 | } | 726 | } |
712 | } | ||
713 | test2 = testlist2.next(); | 727 | test2 = testlist2.next(); |
714 | } | 728 | } |
715 | } | 729 | } |
716 | test->setTagged( true ); | 730 | test->setTagged( true ); |
717 | test = testlist.next(); | 731 | test = testlist.next(); |
718 | } | 732 | } |
733 | //qDebug("Search time : %d", tm.elapsed()); | ||
719 | if ( found ) { | 734 | if ( found ) { |
720 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 735 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
721 | mViewManager->showDayView(); | 736 | mViewManager->showDayView(); |
722 | mNavigator->slotDaySelect( conflict.date() ); | 737 | mNavigator->slotDaySelect( conflict.date() ); |
723 | int hour = conflict.time().hour(); | 738 | int hour = conflict.time().hour(); |
724 | mViewManager->agendaView()->setStartHour( hour ); | 739 | mViewManager->agendaView()->setStartHour( hour ); |
725 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); | 740 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); |
741 | block = false; | ||
726 | return; | 742 | return; |
727 | } | 743 | } |
728 | 744 | ||
729 | topLevelWidget()->setCaption( i18n("No conflict found") ); | 745 | topLevelWidget()->setCaption( i18n("No conflict found") ); |
730 | qDebug("No conflict found "); | 746 | qDebug("No conflict found "); |
747 | block = false; | ||
731 | return; | 748 | return; |
732 | } | 749 | } |
733 | 750 | ||
734 | void CalendarView::conflictAll() | 751 | void CalendarView::conflictAll() |
735 | { | 752 | { |
736 | nextConflict ( true, true ); | 753 | nextConflict ( true, true ); |
737 | } | 754 | } |
738 | void CalendarView::conflictAllday() | 755 | void CalendarView::conflictAllday() |
739 | { | 756 | { |
740 | nextConflict ( false, true ); | 757 | nextConflict ( false, true ); |
741 | } | 758 | } |
742 | void CalendarView::conflictNotAll() | 759 | void CalendarView::conflictNotAll() |
743 | { | 760 | { |
744 | nextConflict ( false, false ); | 761 | nextConflict ( false, false ); |
745 | } | 762 | } |
746 | 763 | ||
747 | void CalendarView::setCalReadOnly( int id, bool readO ) | 764 | void CalendarView::setCalReadOnly( int id, bool readO ) |
748 | { | 765 | { |
749 | if ( readO ) { | 766 | if ( readO ) { |
750 | emit save(); | 767 | emit save(); |
751 | } | 768 | } |
752 | mCalendar->setReadOnly( id, readO ); | 769 | mCalendar->setReadOnly( id, readO ); |
753 | } | 770 | } |
754 | void CalendarView::setScrollBarStep(int val ) | 771 | void CalendarView::setScrollBarStep(int val ) |
@@ -2751,59 +2768,68 @@ void CalendarView::changeEventDisplay(Event *which, int action) | |||
2751 | clearallviews = true; | 2768 | clearallviews = true; |
2752 | mDateNavigator->updateView(); | 2769 | mDateNavigator->updateView(); |
2753 | //mDialogManager->updateSearchDialog(); | 2770 | //mDialogManager->updateSearchDialog(); |
2754 | if (which) { | 2771 | if (which) { |
2755 | // If there is an event view visible update the display | 2772 | // If there is an event view visible update the display |
2756 | mViewManager->currentView()->changeEventDisplay(which,action); | 2773 | mViewManager->currentView()->changeEventDisplay(which,action); |
2757 | // TODO: check, if update needed | 2774 | // TODO: check, if update needed |
2758 | // if (which->getTodoStatus()) { | 2775 | // if (which->getTodoStatus()) { |
2759 | mTodoList->updateView(); | 2776 | mTodoList->updateView(); |
2760 | if ( action != KOGlobals::EVENTDELETED ) { | 2777 | if ( action != KOGlobals::EVENTDELETED ) { |
2761 | mConflictingEvent = which ; | 2778 | mConflictingEvent = which ; |
2762 | QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) ); | 2779 | QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) ); |
2763 | } | 2780 | } |
2764 | // } | 2781 | // } |
2765 | } else { | 2782 | } else { |
2766 | mViewManager->currentView()->updateView(); | 2783 | mViewManager->currentView()->updateView(); |
2767 | } | 2784 | } |
2768 | } | 2785 | } |
2769 | void CalendarView::checkConflictForEvent() | 2786 | void CalendarView::checkConflictForEvent() |
2770 | { | 2787 | { |
2771 | 2788 | ||
2772 | if (!KOPrefs::instance()->mConfirm) | 2789 | if (!KOPrefs::instance()->mConfirm) |
2773 | return; | 2790 | return; |
2774 | if ( ! mConflictingEvent ) return; | 2791 | if ( ! mConflictingEvent ) return; |
2775 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 2792 | QDateTime current = QDateTime::currentDateTime(); |
2793 | if ( ! mConflictingEvent->matchTime( ¤t, 0 ) ) { | ||
2794 | mConflictingEvent = 0; | ||
2795 | return; | ||
2796 | } | ||
2776 | QPtrList<Event> testlist = mCalendar->events(); | 2797 | QPtrList<Event> testlist = mCalendar->events(); |
2777 | Event * test = testlist.first(); | 2798 | Event * test = testlist.first(); |
2778 | QDateTime conflict; | 2799 | QDateTime conflict; |
2779 | QDateTime retVal; | 2800 | QDateTime retVal; |
2780 | bool found = false; | 2801 | bool found = false; |
2781 | Event * cE = 0; | 2802 | Event * cE = 0; |
2782 | QDateTime current = QDateTime::currentDateTime(); | 2803 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
2783 | while ( test ) { | 2804 | while ( test ) { |
2784 | qApp->processEvents(); | 2805 | qApp->processEvents(); |
2785 | if ( !test->doesFloat() ) { | 2806 | bool skip = false; |
2807 | if ( found ) | ||
2808 | skip = !test->matchTime( ¤t, &conflict ); | ||
2809 | else | ||
2810 | skip = !test->matchTime( ¤t, 0 ); | ||
2811 | if ( !skip && !test->doesFloat() ) { | ||
2786 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { | 2812 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { |
2787 | if ( ! found ) { | 2813 | if ( ! found ) { |
2788 | conflict = retVal; | 2814 | conflict = retVal; |
2789 | cE = test; | 2815 | cE = test; |
2790 | } else { | 2816 | } else { |
2791 | if ( retVal < conflict ) { | 2817 | if ( retVal < conflict ) { |
2792 | conflict = retVal; | 2818 | conflict = retVal; |
2793 | cE = test; | 2819 | cE = test; |
2794 | } | 2820 | } |
2795 | } | 2821 | } |
2796 | found = true; | 2822 | found = true; |
2797 | } | 2823 | } |
2798 | } | 2824 | } |
2799 | test = testlist.next(); | 2825 | test = testlist.next(); |
2800 | } | 2826 | } |
2801 | if ( found ) { | 2827 | if ( found ) { |
2802 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; | 2828 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; |
2803 | qApp->processEvents(); | 2829 | qApp->processEvents(); |
2804 | int km = KMessageBox::warningContinueCancel(this,mess, | 2830 | int km = KMessageBox::warningContinueCancel(this,mess, |
2805 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); | 2831 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); |
2806 | if ( km != KMessageBox::Continue ) | 2832 | if ( km != KMessageBox::Continue ) |
2807 | return; | 2833 | return; |
2808 | 2834 | ||
2809 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 2835 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
diff --git a/libkcal/event.cpp b/libkcal/event.cpp index 5285559..ad66639 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp | |||
@@ -150,48 +150,68 @@ bool Event::hasEndDate() const | |||
150 | 150 | ||
151 | bool Event::isMultiDay() const | 151 | bool Event::isMultiDay() const |
152 | { | 152 | { |
153 | bool multi = !(dtStart().date() == dtEnd().date()); | 153 | bool multi = !(dtStart().date() == dtEnd().date()); |
154 | return multi; | 154 | return multi; |
155 | } | 155 | } |
156 | 156 | ||
157 | void Event::setTransparency(Event::Transparency transparency) | 157 | void Event::setTransparency(Event::Transparency transparency) |
158 | { | 158 | { |
159 | if (mReadOnly) return; | 159 | if (mReadOnly) return; |
160 | mTransparency = transparency; | 160 | mTransparency = transparency; |
161 | updated(); | 161 | updated(); |
162 | } | 162 | } |
163 | 163 | ||
164 | Event::Transparency Event::transparency() const | 164 | Event::Transparency Event::transparency() const |
165 | { | 165 | { |
166 | return mTransparency; | 166 | return mTransparency; |
167 | } | 167 | } |
168 | 168 | ||
169 | void Event::setDuration(int seconds) | 169 | void Event::setDuration(int seconds) |
170 | { | 170 | { |
171 | setHasEndDate(false); | 171 | setHasEndDate(false); |
172 | Incidence::setDuration(seconds); | 172 | Incidence::setDuration(seconds); |
173 | } | 173 | } |
174 | bool Event::matchTime(QDateTime*startDT, QDateTime* endDT) | ||
175 | { | ||
176 | if ( ! doesRecur() ) { | ||
177 | if ( doesFloat() ) { | ||
178 | if ( mDtEnd.addDays( 1 ) < *startDT) | ||
179 | return false; | ||
180 | if ( endDT && mDtStart > * endDT) | ||
181 | return false; | ||
182 | } else { | ||
183 | if ( mDtEnd < *startDT ) | ||
184 | return false; | ||
185 | if ( endDT && mDtStart > * endDT) | ||
186 | return false; | ||
187 | } | ||
188 | } else { | ||
189 | if ( endDT && mDtStart > * endDT) | ||
190 | return false; | ||
191 | } | ||
192 | return true; | ||
193 | } | ||
174 | bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, QDateTime* startDT ) | 194 | bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, QDateTime* startDT ) |
175 | { | 195 | { |
176 | if ( testEvent == this ) | 196 | if ( testEvent == this ) |
177 | return false; | 197 | return false; |
178 | if ( ! doesRecur() && !testEvent->doesRecur() ) { | 198 | if ( ! doesRecur() && !testEvent->doesRecur() ) { |
179 | QDateTime te; | 199 | QDateTime te; |
180 | if ( testEvent->doesFloat() ) | 200 | if ( testEvent->doesFloat() ) |
181 | te = testEvent->mDtEnd.addDays( 1 ); | 201 | te = testEvent->mDtEnd.addDays( 1 ); |
182 | else | 202 | else |
183 | te = testEvent->mDtEnd; | 203 | te = testEvent->mDtEnd; |
184 | QDateTime e; | 204 | QDateTime e; |
185 | if ( doesFloat() ) | 205 | if ( doesFloat() ) |
186 | e = mDtEnd.addDays( 1 ); | 206 | e = mDtEnd.addDays( 1 ); |
187 | else | 207 | else |
188 | e = mDtEnd; | 208 | e = mDtEnd; |
189 | if ( mDtStart < te && testEvent->mDtStart < e ) { | 209 | if ( mDtStart < te && testEvent->mDtStart < e ) { |
190 | if ( mDtStart < testEvent->mDtStart ) | 210 | if ( mDtStart < testEvent->mDtStart ) |
191 | *overlapDT = testEvent->mDtStart; | 211 | *overlapDT = testEvent->mDtStart; |
192 | else | 212 | else |
193 | *overlapDT = mDtStart; | 213 | *overlapDT = mDtStart; |
194 | if ( startDT ) | 214 | if ( startDT ) |
195 | return (*overlapDT >= *startDT ); | 215 | return (*overlapDT >= *startDT ); |
196 | return true; | 216 | return true; |
197 | } | 217 | } |
diff --git a/libkcal/event.h b/libkcal/event.h index e6055a5..2da9770 100644 --- a/libkcal/event.h +++ b/libkcal/event.h | |||
@@ -17,48 +17,49 @@ | |||
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #ifndef EVENT_H | 21 | #ifndef EVENT_H |
22 | #define EVENT_H | 22 | #define EVENT_H |
23 | // | 23 | // |
24 | // Event component, representing a VEVENT object | 24 | // Event component, representing a VEVENT object |
25 | // | 25 | // |
26 | 26 | ||
27 | #include "incidence.h" | 27 | #include "incidence.h" |
28 | namespace KCal { | 28 | namespace KCal { |
29 | 29 | ||
30 | /** | 30 | /** |
31 | This class provides an Event in the sense of RFC2445. | 31 | This class provides an Event in the sense of RFC2445. |
32 | */ | 32 | */ |
33 | class Event : public Incidence | 33 | class Event : public Incidence |
34 | { | 34 | { |
35 | public: | 35 | public: |
36 | enum Transparency { Opaque, Transparent }; | 36 | enum Transparency { Opaque, Transparent }; |
37 | typedef ListBase<Event> List; | 37 | typedef ListBase<Event> List; |
38 | Event(); | 38 | Event(); |
39 | Event(const Event &); | 39 | Event(const Event &); |
40 | ~Event(); | 40 | ~Event(); |
41 | bool matchTime(QDateTime*startDT, QDateTime* endDT); | ||
41 | 42 | ||
42 | QCString type() const { return "Event"; } | 43 | QCString type() const { return "Event"; } |
43 | IncTypeID typeID() const { return eventID; } | 44 | IncTypeID typeID() const { return eventID; } |
44 | 45 | ||
45 | Incidence *clone(); | 46 | Incidence *clone(); |
46 | QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt ) const; | 47 | QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt ) const; |
47 | 48 | ||
48 | /** for setting an event's ending date/time with a QDateTime. */ | 49 | /** for setting an event's ending date/time with a QDateTime. */ |
49 | void setDtEnd(const QDateTime &dtEnd); | 50 | void setDtEnd(const QDateTime &dtEnd); |
50 | /** Return the event's ending date/time as a QDateTime. */ | 51 | /** Return the event's ending date/time as a QDateTime. */ |
51 | virtual QDateTime dtEnd() const; | 52 | virtual QDateTime dtEnd() const; |
52 | /** returns an event's end time as a string formatted according to the | 53 | /** returns an event's end time as a string formatted according to the |
53 | users locale settings */ | 54 | users locale settings */ |
54 | QString dtEndTimeStr() const; | 55 | QString dtEndTimeStr() const; |
55 | /** returns an event's end date as a string formatted according to the | 56 | /** returns an event's end date as a string formatted according to the |
56 | users locale settings */ | 57 | users locale settings */ |
57 | QString dtEndDateStr(bool shortfmt=true) const; | 58 | QString dtEndDateStr(bool shortfmt=true) const; |
58 | /** returns an event's end date and time as a string formatted according | 59 | /** returns an event's end date and time as a string formatted according |
59 | to the users locale settings */ | 60 | to the users locale settings */ |
60 | QString dtEndStr(bool shortfmt=true) const; | 61 | QString dtEndStr(bool shortfmt=true) const; |
61 | void setHasEndDate(bool); | 62 | void setHasEndDate(bool); |
62 | /** Return whether the event has an end date/time. */ | 63 | /** Return whether the event has an end date/time. */ |
63 | bool hasEndDate() const; | 64 | bool hasEndDate() const; |
64 | 65 | ||