4 files changed, 71 insertions, 23 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,19 +1,20 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.16 ************
 
 Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
 Added columns for datetime in todo view: Last modified, created and last modified subtodo
 Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
+Made conflict detection up to 4 times faster.
 
 ********** VERSION 2.1.15 ************
 
 Fixed two layout problems on the Z:
 Made the with of the newly added buttons on the Quick-Todo smaller.
 Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible.
 
 
 ********** VERSION 2.1.14 ************
 
 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.
 Added a button to add a subtodo quickly.
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a9e402e..427d71b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -650,93 +650,110 @@ CalendarView::~CalendarView()
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 
 
 void CalendarView::nextConflict( bool all, bool allday )
 {
-    
+    static bool block = false;
+    if ( block ) return;
+    block = true;
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
         test = testlist.next();
     }
     QTime st ( 0,0,0);
     if ( mViewManager->currentView() == mViewManager->agendaView()  )
         st = mViewManager->agendaView()->agenda()->getEndTime();
     //qDebug("time %s ", st.toString().latin1());
     QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st);
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     Event * cE2 = 0;
     QPtrList<Event> testlist2 = testlist;
     test = testlist.first();
     bool skip = false;
     topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
+    //QTime tm;
+    //tm.start();
     while ( test ) {
         qApp->processEvents();
         skip = false;
         if ( !all ) skip = ( allday != test->doesFloat() );
         if ( !skip ) {
+            if ( found )
+                skip =  !test->matchTime( &startDT, &conflict );
+            else 
+               skip =  !test->matchTime( &startDT, 0 ); 
+        }
+        if ( !skip ) {
             Event * test2 = testlist2.first();
             while ( test2 ) { 
-                skip = false;
-                if ( !all ) skip = ( allday != test2->doesFloat() );
+                skip = test2->isTagged();
+                if ( !skip  && !all ) skip = ( allday != test2->doesFloat() );
+                if ( !skip ) {
+                    if ( found )
+                        skip =  !test2->matchTime( &startDT, &conflict );
+                    else 
+                        skip =  !test2->matchTime( &startDT, 0 ); 
+                }
                 if ( !skip ) {
-                    if ( !test2->isTagged() ) {
-                        if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
-                            //qDebug("overlap ");
-                            if ( ! found ) {
-                                if ( retVal >= startDT ) {
-                                    conflict = retVal; 
-                                    cE = test;
-                                    cE2 = test2;
-                                    found = true;
-                                }
-                            } else {
-                                if ( retVal >= startDT && retVal < conflict ) {
-                                    conflict = retVal; 
-                                    cE = test;
-                                    cE2 = test2;
-                                }
+                    if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
+                        //qDebug("overlap ");
+                        if ( ! found ) {
+                            if ( retVal >= startDT ) {
+                                conflict = retVal; 
+                                cE = test;
+                                cE2 = test2;
+                                found = true;
+                            }
+                        } else {
+                            if ( retVal >= startDT && retVal < conflict ) {
+                                conflict = retVal; 
+                                cE = test;
+                                cE2 = test2;
                             }
                         }
                     }
                 }
                 test2 = testlist2.next();
             }
         }
         test->setTagged( true );
         test = testlist.next();
     }
+    //qDebug("Search time : %d", tm.elapsed());
     if ( found ) {
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
+        block = false;
         return;
     }
 
     topLevelWidget()->setCaption( i18n("No conflict found") );
     qDebug("No conflict found ");
+    block = false;
     return;
 }
 
 void CalendarView::conflictAll()
 {
     nextConflict ( true, true );
 }
 void CalendarView::conflictAllday()
 {
     nextConflict ( false, true );
 }
 void CalendarView::conflictNotAll()
@@ -2763,35 +2780,44 @@ void CalendarView::changeEventDisplay(Event *which, int action)
         }
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 void CalendarView::checkConflictForEvent()
 {
 
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
-    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
+    QDateTime current = QDateTime::currentDateTime();
+    if ( ! mConflictingEvent->matchTime( &current, 0 ) ) {
+        mConflictingEvent = 0;
+        return;
+    }
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
-    QDateTime current = QDateTime::currentDateTime();
+    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     while ( test ) {
-        qApp->processEvents();
-        if ( !test->doesFloat() ) {
+        qApp->processEvents(); 
+        bool skip = false;
+        if ( found )
+            skip =  !test->matchTime( &current, &conflict );
+        else 
+            skip =  !test->matchTime( &current, 0 ); 
+        if ( !skip && !test->doesFloat() ) {
             if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal; 
                     cE = test;
                 } else {
                     if ( retVal < conflict ) {
                         conflict = retVal; 
                         cE = test;
                     }
                 }
                 found = true;
             }
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 5285559..ad66639 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -162,24 +162,44 @@ void Event::setTransparency(Event::Transparency transparency)
 }
 
 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() )
diff --git a/libkcal/event.h b/libkcal/event.h
index e6055a5..2da9770 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -29,24 +29,25 @@ namespace KCal {
 
 /**
   This class provides an Event in the sense of RFC2445.
 */
 class Event : public Incidence
 {
   public:
     enum Transparency { Opaque, Transparent };
     typedef ListBase<Event> List;
     Event();
     Event(const Event &);
     ~Event();
+    bool matchTime(QDateTime*startDT, QDateTime* endDT);
 
     QCString type() const { return "Event"; }
     IncTypeID typeID() const { return eventID; }
 
     Incidence *clone();
     QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt  ) const;
 
     /** for setting an event's ending date/time with a QDateTime. */
     void setDtEnd(const QDateTime &dtEnd);
     /** Return the event's ending date/time as a QDateTime. */
     virtual QDateTime dtEnd() const;
     /** returns an event's end time as a string formatted according to the