summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-28 13:53:45 (UTC)
committer zautrix <zautrix>2005-06-28 13:53:45 (UTC)
commitf9ba5ebe92b1ec1e00e6977b6433a5ad25fc45ff (patch) (side-by-side diff)
treeedebb12db30f3043450386da58adb7d5981b1044
parent5861dc779cce151b7a05f3295ca11ffbf39e5a20 (diff)
downloadkdepimpi-f9ba5ebe92b1ec1e00e6977b6433a5ad25fc45ff.zip
kdepimpi-f9ba5ebe92b1ec1e00e6977b6433a5ad25fc45ff.tar.gz
kdepimpi-f9ba5ebe92b1ec1e00e6977b6433a5ad25fc45ff.tar.bz2
cal time fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libkcal/calendarlocal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 18f1af8..418bfca 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -722,65 +722,65 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
/*
// crap !!!
if ( rStart <= end ) { // Start date not after range
if ( rStart >= start ) { // Start date within range
found = true;
} else if ( event->recurrence()->duration() == -1 ) { // Recurs forever
found = true;
} else if ( event->recurrence()->duration() == 0 ) { // End date set
QDate rEnd = event->recurrence()->endDate();
if ( rEnd >= start && rEnd <= end ) { // End date within range
found = true;
}
} else { // Duration set
// TODO: Calculate end date from duration. Should be done in Event
// For now include all events with a duration.
found = true;
}
}
*/
}
if ( found ) eventList.append( event );
} else {
QDate s = event->dtStart().date();
QDate e = event->dtEnd().date();
if ( inclusive ) {
if ( s >= start && e <= end ) {
eventList.append( event );
}
} else {
- if ( ( s >= start && s <= end ) || ( e >= start && e <= end ) ) {
+ if ( ( e >= start && s <= end ) ) {
eventList.append( event );
}
}
}
}
return eventList;
}
QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
{
return rawEventsForDate( qdt.date() );
}
QPtrList<Event> CalendarLocal::rawEvents()
{
QPtrList<Event> el;
for ( Event *it = mEventList.first(); it; it = mEventList.next() )
if ( it->calEnabled() ) el.append( it );
return el;
}
bool CalendarLocal::addJournal(Journal *journal)
{
if ( journal->dtStart().isValid())
kdDebug(5800) << "Adding Journal on " << journal->dtStart().toString() << endl;
else
kdDebug(5800) << "Adding Journal without a DTSTART" << endl;
mJournalList.append(journal);
journal->registerObserver( this );