1 files changed, 20 insertions, 0 deletions

diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 5285559..ad66639 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -110,128 +110,148 @@ void Event::setDtEnd(const QDateTime &dtEnd)
   mDtEnd = getEvenTime( dtEnd );
 
   setHasEndDate(true);
   setHasDuration(false);
 
   updated();
 }
 
 QDateTime Event::dtEnd() const
 {
   if (hasEndDate()) return mDtEnd;
   if (hasDuration()) return dtStart().addSecs(duration());
 
   return dtStart();
 }
 
 QString Event::dtEndTimeStr() const
 {
   return KGlobal::locale()->formatTime(mDtEnd.time());
 }
 
 QString Event::dtEndDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(mDtEnd.date(),shortfmt);
 }
 
 QString Event::dtEndStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDateTime(mDtEnd, shortfmt);
 }
 
 void Event::setHasEndDate(bool b)
 {
   mHasEndDate = b;
 }
 
 bool Event::hasEndDate() const
 {
   return mHasEndDate;
 }
 
 bool Event::isMultiDay() const
 {
   bool multi = !(dtStart().date() == dtEnd().date());
   return multi;
 }
 
 void Event::setTransparency(Event::Transparency transparency)
 {
   if (mReadOnly) return;
   mTransparency = transparency;
   updated();
 }
 
 Event::Transparency Event::transparency() const
 {
   return mTransparency;
 }
 
 void Event::setDuration(int seconds)
 {
   setHasEndDate(false);
   Incidence::setDuration(seconds);
 }
+bool Event::matchTime(QDateTime*startDT, QDateTime* endDT)
+{
+    if ( ! doesRecur() ) {
+        if ( doesFloat() ) {
+            if ( mDtEnd.addDays( 1 ) < *startDT)
+                return false;
+            if ( endDT && mDtStart > * endDT)
+                return false;
+        } else {
+            if ( mDtEnd < *startDT )
+                return false;
+            if ( endDT && mDtStart > * endDT)
+                return false;
+        }
+    } else {
+        if ( endDT && mDtStart > * endDT)
+            return false;
+    }
+    return true;
+}
 bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime* startDT )
 {
     if ( testEvent == this )
         return false;
     if ( ! doesRecur() && !testEvent->doesRecur() ) {
         QDateTime te;
         if ( testEvent->doesFloat() )
             te = testEvent->mDtEnd.addDays( 1 );
         else
             te = testEvent->mDtEnd;
         QDateTime e; 
         if ( doesFloat() )
             e = mDtEnd.addDays( 1 );
         else
             e = mDtEnd;
         if ( mDtStart < te && testEvent->mDtStart < e ) {
             if ( mDtStart < testEvent->mDtStart )
                 *overlapDT =  testEvent->mDtStart;
             else
                 *overlapDT =  mDtStart;
             if ( startDT )
                 return (*overlapDT >= *startDT );
             return true;
         }
         return false;
     }
     if ( !doesFloat() && !testEvent->doesFloat() && !isMultiDay() && !testEvent->isMultiDay() ) {
         if ( mDtStart.time() >=  testEvent->mDtEnd.time() || testEvent->mDtStart.time() >=  mDtEnd.time() ) {
             // no need to test. times mismatch
             //fprintf(stderr,"timi ");
             return false;
         }
     }
     Event *nonRecur = 0;
     Event *recurEvent = 0;
     if ( ! doesRecur() ) {
         nonRecur = this;
         recurEvent = testEvent;
     }
     else if ( !testEvent->doesRecur() ) {
         nonRecur = testEvent;
         recurEvent = this;
     }
     if ( nonRecur ) {
         QDateTime enr; 
         if ( nonRecur->doesFloat() )
             enr = nonRecur->mDtEnd.addDays( 1 );
         else
             enr = nonRecur->mDtEnd;
         if ( enr < recurEvent->mDtStart )
             return false;
         if ( startDT && enr < *startDT )
             return false;
         
         int recDuration = recurEvent->mDtStart.secsTo( recurEvent->mDtEnd );
         if ( recurEvent->doesFloat() )
             recDuration += 86400;
         bool ok = false;
         QDateTime recStart;
         if ( startDT ) {
             recStart = recurEvent->recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok );
         }
         if ( recStart.isValid() ) {
             //qDebug("%s start at %s ", startDT->  toString().latin1(),       recStart.toString().latin1());