| -rw-r--r-- | libkcal/event.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libkcal/event.cpp b/libkcal/event.cpp index 235ae55..46e8174 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -173,3 +173,3 @@ void Event::setDuration(int seconds) } -bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, bool inFutureOnly ) +bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, QDateTime* startDT ) { @@ -193,4 +193,4 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, bool inFut *overlapDT = mDtStart; - if ( inFutureOnly ) - return (*overlapDT >= QDateTime::currentDateTime() ); + if ( startDT ) + return (*overlapDT >= *startDT ); return true; @@ -217,3 +217,3 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, bool inFut return false; - if ( inFutureOnly && enr < QDateTime::currentDateTime() ) + if ( startDT && enr < *startDT ) return false; @@ -235,4 +235,4 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, bool inFut *overlapDT = nonRecur->mDtStart; - if ( inFutureOnly ) { - if ( *overlapDT >= QDateTime::currentDateTime() ) + if ( startDT ) { + if ( *overlapDT >= *startDT ) return true; @@ -276,4 +276,4 @@ bool Event::isOverlapping ( Event* testEvent, QDateTime* overlapDT, bool inFut *overlapDT = incidenceStart; - if ( inFutureOnly ) { - if ( *overlapDT >= QDateTime::currentDateTime() ) + if ( startDT ) { + if ( *overlapDT >= *startDT ) return true; |