fixx

2 files changed, 2 insertions, 31 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index f860f7d..94c3b22 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1132,13 +1132,13 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
 */
 void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 {
 
     QPtrList<KOAgendaItem> conflictItems;
     int maxSubCells = 0;
-    QIntDict<KOAgendaItem> subCellDict(5);
+    QIntDict<KOAgendaItem> subCellDict(7);
 
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if (item != placeItem) {
             if (placeItem->cellX() <= item->cellXWidth() &&
                 placeItem->cellXWidth() >= item->cellX()) {
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index a42227c..5a63b35 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1118,18 +1118,12 @@ void KOAgendaView::fillAgenda()
     mAgenda->changeColumns(mSelectedDates.count());
     qApp->processEvents(); 
     mEventIndicatorTop->changeColumns(mSelectedDates.count());
     mEventIndicatorBottom->changeColumns(mSelectedDates.count());
     setHolidayMasks();
 
-    //mAgenda->hideUnused();
-    //mAllDayAgenda->hideUnused();
- 
-    //   mAgenda->blockNextRepaint( false );
-    //   mAgenda->viewport()->repaint();
-    //   mAgenda->blockNextRepaint( true );
     mMinY.resize(mSelectedDates.count());
     mMaxY.resize(mSelectedDates.count());
 
     QPtrList<Event> dayEvents;
 
     // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
@@ -1144,13 +1138,13 @@ void KOAgendaView::fillAgenda()
     int curCol = 0;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         QDate currentDate = *dit;
         //    kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
         //              << endl;
 
-        dayEvents = calendar()->events(currentDate,true);
+        dayEvents = calendar()->events(currentDate,false);
 
         // Default values, which can never be reached
         mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
         mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
 
         unsigned int numEvent;
@@ -1286,68 +1280,45 @@ void KOAgendaView::fillAgenda()
 
         ++curCol;
     }
     mAgenda->hideUnused();
     mAllDayAgenda->hideUnused();
     mAgenda->checkScrollBoundaries();
-
     deleteSelectedDateTime();
-  
     createDayLabels();
     emit incidenceSelected( 0 );
 
     if ( globalFlagBlockAgenda == 2 ) {
         if ( KOPrefs::instance()->mSetTimeToDayStartAt )
             setStartHour( KOPrefs::instance()->mDayBegins  );
         else if ( KOPrefs::instance()->mCenterOnCurrentTime )
             setStartHour( QTime::currentTime ().hour() );
-        //  qApp->processEvents();   
     }
     qApp->processEvents(); 
-    //qDebug("qApp->processEvents(); END ");
     globalFlagBlockAgenda = 0; 
-
-    // mAgenda->hideUnused();
-    //mAllDayAgenda->hideUnused();
     mAllDayAgenda->drawContentsToPainter();
     mAgenda->drawContentsToPainter();
     repaintAgenda();
     onlyOne = false;
-    // mAgenda->finishUpdate();
-    //mAllDayAgenda->finishUpdate();
-
-    // repaintAgenda();
-    //qApp->processEvents(); 
-    // globalFlagBlockAgenda = 0;
 }
 void KOAgendaView::repaintAgenda()
 {
-   //  mAllDayAgenda->drawContentsToPainter();
-//     mAllDayAgenda->viewport()->repaint( false ); 
-//     mAgenda->drawContentsToPainter();
-//     mAgenda->viewport()->repaint( false ); 
-//     qApp->processEvents(); 
-
-    //qDebug("KOAgendaView::repaintAgenda() ");
-    //qApp->processEvents(); 
     mAgenda->viewport()->repaint( false );
     mAllDayAgenda->viewport()->repaint( false );
     mAgenda->finishUpdate();
     mAllDayAgenda->finishUpdate();
 }
 
 
 void KOAgendaView::clearView()
 {
-    //  kdDebug() << "ClearView" << endl;
     mAllDayAgenda->clear();
     mAgenda->clear();
 }
 void KOAgendaView::clearList()
 {
-    //  kdDebug() << "ClearView" << endl;
     clearView();
     mAllDayAgenda->hideUnused();
     mAgenda->hideUnused();
 }
 
 void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,