1 files changed, 6 insertions, 58 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 426e8f9..2582931 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -83,48 +83,49 @@
 
 #ifndef DESKTOP_VERSION
 #include <libkcal/sharpformat.h>
 #include <externalapphandler.h>
 #endif
 #include <libkcal/phoneformat.h>
 #ifndef KORG_NOMAIL
 #include "komailclient.h"
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koeventeditor.h"
 #include "kotodoeditor.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
 #include "publishdialog.h"
 #include "kofilterview.h"
 #include "koglobals.h"
 #include "koviewmanager.h"
 #include "koagendaview.h"
+#include "koagenda.h"
 #include "kodialogmanager.h"
 #include "outgoingdialog.h"
 #include "incomingdialog.h"
 #include "datenavigatorcontainer.h"
 #include "statusdialog.h"
 #include "kdatenavigator.h"
 #include "kotodoview.h"
 #include "datenavigator.h"
 #include "resourceview.h"
 #include "navigatorbar.h"
 #include "searchdialog.h"
 #include "mainwindow.h"
 #include "categoryeditdialog.h"
 
 #include "calendarview.h"
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h> 
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
 #include <qprocess.h>
@@ -642,49 +643,53 @@ void CalendarView::init()
   mDateNavigator->setCalendar( mCalendar );
 }
 
 
 CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 void CalendarView::nextConflict( bool all, bool allday )
 {
     
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
         test = testlist.next();
     }
-    QDateTime startDT = QDateTime (mNavigator->selectedDates().first().addDays(1), QTime ( 0,0,0));
+    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;
     while ( test ) {
         skip = false;
         if ( !all ) skip = ( allday != test->doesFloat() );
         if ( !skip ) {
             Event * test2 = testlist2.first();
             while ( test2 ) { 
                 skip = false;
                 if ( !all ) skip = ( allday != test2->doesFloat() );
                 if ( !skip ) {
                     if ( !test2->isTagged() ) {
                         if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
                             //qDebug("overlap ");
                             if ( ! found ) {
                                 if ( retVal >= startDT ) {
                                     conflict = retVal; 
                                     cE = test;
@@ -699,105 +704,48 @@ void CalendarView::nextConflict( bool all, bool allday )
                                 }
                             }
                         }
                     }
                 }
                 test2 = testlist2.next();
             }
         }
         test->setTagged( true );
         test = testlist.next();
     }
     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 ) ) );
         return;
     }
 
     topLevelWidget()->setCaption( i18n("No conflict found") );
     qDebug("No conflict found ");
     return;
-
-
-
-
-
-#if 0
-
-
-    QDate end = start.addDays( 365*2);
-    while ( start < end ) {
-        QPtrList<Event> eventList = calendar()->events( start );
-        Event * ev = eventList.first(); 
-        QPtrList<Event> test =  eventList;
-        while ( ev ) {
-            //qDebug("found %d on %s ", eventList.count(), start.toString().latin1());
-            Event * t_ev =  test.first();
-            QDateTime es =  ev->dtStart();
-            QDateTime ee =  ev->dtEnd();
-            if ( ev->doesFloat() )
-                ee = ee.addDays( 1 );
-            if ( ! all ) {
-                if ( ev->doesFloat() != allday ) 
-                    t_ev = 0;
-            }
-            while ( t_ev ) {
-                bool skip = false;
-                if ( ! all ) {
-                    if ( t_ev->doesFloat() != allday ) 
-                        skip = true;
-                }
-                if ( !skip && ev != t_ev ) {
-                    QDateTime ets =  t_ev->dtStart();
-                    QDateTime ete =  t_ev->dtEnd();
-                    if ( t_ev->doesFloat() )
-                        ete = ete.addDays( 1 );
-                    //qDebug("test %s -- %s -------- %s -- %s ", es.toString().latin1() , ee.toString().latin1(),  ets.toString().latin1() , ete.toString().latin1()  );
-                    if ( es < ete && ets < ee ) {
-                        if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
-                            mViewManager->showDayView();
-                        mNavigator->slotDaySelect( start );
-                        int hour = es.time().hour();
-                        if ( ets > es )
-                            hour = ets.time().hour();
-                        mViewManager->agendaView()->setStartHour( hour  );
-                        topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( ev->summary().left( 20 ) ).arg( t_ev->summary().left( 20 ) ) );
-                        return;
-                    }
-                }
-                t_ev =  test.next(); 
-            }
-            ev = eventList.next();
-        } 
-        start = start.addDays( 1 );
-    }
-    topLevelWidget()->setCaption( i18n("No conflict found within the next two years") );
-    qDebug("No conflict found ");
-#endif
 }
 
 void CalendarView::conflictAll()
 {
     nextConflict ( true, true );
 }
 void CalendarView::conflictAllday()
 {
     nextConflict ( false, true );
 }
 void CalendarView::conflictNotAll()
 {
     nextConflict ( false, false );
 }
 
 void CalendarView::setCalReadOnly( int id, bool readO )
 {
     if ( readO ) {
         emit save();
     }
     mCalendar->setReadOnly( id, readO );   
 }
 void CalendarView::setScrollBarStep(int val )
 {