1 files changed, 13 insertions, 9 deletions

diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 779b28c..15f733b 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -222,40 +222,41 @@ void DueTextItem::paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bo
 TodoTable::TodoTable( QWidget *parent, const char *name )
 // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR
 //     : QTable( 0, 3, parent, name, TRUE ),
 // #else
     : QTable( 0, 4, parent, name ),
 // #endif
       showComp( true ),
       enablePainting( true ),
       mCat( 0 ),
       currFindRow( -2 ),
       showDeadl( true)
 {
+    setNumRows(0);
     mCat.load( categoryFileName() );
     setSorting( TRUE );
     setSelectionMode( NoSelection );
     setColumnStretchable( 2, TRUE );
     setColumnWidth( 0, 20 );
     setColumnWidth( 1, 35 );
 
     setLeftMargin( 0 );
     verticalHeader()->hide();
     horizontalHeader()->setLabel( 0, tr( "C." ) );
     horizontalHeader()->setLabel( 1, tr( "Prior." ) );
     horizontalHeader()->setLabel( 2, tr( "Description" ) );
 
     setColumnStretchable( 3, FALSE );
     setColumnWidth( 3, 20 );
-    horizontalHeader()->setLabel( 3, tr( "Deadline" ) );    
+    horizontalHeader()->setLabel( 3, tr( "Deadline" ) );
 
     if (showDeadl){
       showColumn (3);
     }else{
       hideColumn (3);
     }
 
     connect( this, SIGNAL( clicked( int, int, int, const QPoint & ) ),
              this, SLOT( slotClicked( int, int, int, const QPoint & ) ) );
     connect( this, SIGNAL( pressed( int, int, int, const QPoint & ) ),
              this, SLOT( slotPressed( int, int, int, const QPoint & ) ) );
     connect( this, SIGNAL( valueChanged( int, int ) ),
@@ -304,25 +305,25 @@ void TodoTable::slotClicked( int row, int col, int, const QPoint &pos )
             }
             break;
         case 1:
             break;
         case 2:
           // Show detailed view of the selected entry
           {
             menuTimer->stop();
             ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(row, 0))];
             emit showDetails( *todo );
           }
           break;
-        case 3: 
+        case 3:
           // may as well edit it...
           menuTimer->stop();
           emit signalEdit();
           break;
     }
 }
 
 void TodoTable::slotPressed( int row, int col, int, const QPoint &pos )
 {
     if ( col == 2 && cellGeometry( row, col ).contains(pos) )
         menuTimer->start( 750, TRUE );
 }
@@ -429,38 +430,41 @@ void TodoTable::load( const QString &fn )
     loadFile( fn );
 //     QTable::sortColumn(2,TRUE,TRUE);
 //     QTable::sortColumn(1,TRUE,TRUE);
     QTable::sortColumn(0,TRUE,TRUE);
     setCurrentCell( 0, 2 );
     setSorting(true );
     mDayTimer->start( 60 * 1000 ); // gone in 60 seconds?
 }
 void TodoTable::updateVisible()
 {
     if ( !isUpdatesEnabled() )
         return;
-  
+
     if (showDeadl){
       showColumn (3);
       adjustColumn(3);
     }else{
       hideColumn (3);
       adjustColumn(2);
     }
 
     int visible = 0;
     int id = mCat.id( "Todo List", showCat );
     for ( int row = 0; row < numRows(); row++ ) {
         CheckItem *ci = (CheckItem *)item( row, 0 );
         ToDoEvent *t = todoList[ci];
+                if (!t)
+                    continue;
+
         QArray<int> vlCats = t->categories();
         bool hide = false;
         if ( !showComp && ci->isChecked() )
             hide = true;
         if ( !showCat.isEmpty() ) {
             if ( showCat == tr( "Unfiled" ) ) {
                 if ( vlCats.count() > 0 )
                     hide = true;
             } else {
                 // do some comparing, we have to reverse our idea here... which idea? - zecke
                 if ( !hide ) {
                     hide = true;
@@ -590,25 +594,25 @@ void TodoTable::rowHeightChanged( int row )
         QTable::rowHeightChanged( row );
 }
 
 void TodoTable::loadFile( const QString &/*we use the standard*/ )
 {
 
   QList<ToDoEvent> list;
   ToDoDB todoDB;
   QValueList<ToDoEvent> vaList = todoDB.rawToDos();
   for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){
     ToDoEvent *event = new ToDoEvent( (*it) );
     list.append( event );
-  }   
+  }
   vaList.clear();
   //     qDebug("parsing done=%d", t.elapsed() );
   if ( list.count() > 0 ) {
     internalAddEntries( list );
     list.clear();
   }
 //     qDebug("loading done: t=%d", t.elapsed() );
 }
 
 void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
 {
     QString strTodo = todo.summary();
@@ -672,25 +676,25 @@ void TodoTable::keyPressEvent( QKeyEvent *e )
                 case 1:
                         break;
                 case 2:{
                         ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(currentRow(), 0))];
                         emit showDetails(*todo);
                         break;
                 }
                 case 3:
                         // Future: Let us change the dueDate directly...
                         emit signalEdit();
                 default:
                         break;
-                        }       
+                }
         } else
                 QTable::keyPressEvent( e );
 }
 
 
 QStringList TodoTable::categories()
 {
     // This is called seldom, so calling a load in here
     // should be fine.
     mCat.load( categoryFileName() );
     QStringList categoryList = mCat.labels( "Todo List" );
     return categoryList;
@@ -749,25 +753,25 @@ void TodoTable::slotDoFind( const QString &findString, bool caseSensitive,
     }
 }
 
 int TodoTable::showCategoryId() const
 {
     int id;
     id = -1;
     // if allcategories are selected, you get unfiled...
     if ( showCat != tr( "Unfiled" ) && showCat != tr( "All" ) )
         id = mCat.id( "Todo List", showCat );
     return id;
 }
-void TodoTable::applyJournal() 
+void TodoTable::applyJournal()
 {
   // we need to hack
   QFile file( journalFileName() );
   if( file.open(IO_ReadOnly ) ) {
     QByteArray ar = file.readAll();
     file.close();
     QFile file2( journalFileName() + "_new" );
     if( file2.open(IO_WriteOnly ) ){
       QTextStream str(&file2 );
       str << QString::fromLatin1("<Tasks>") << endl;
       str << ar.data();
       str << QString::fromLatin1("</Tasks>") << endl;
@@ -800,25 +804,25 @@ void TodoTable::applyJournal()
       el = el->nextChild();
     }
     QFile::remove(journalFileName()+ "_new" );
     tododb.save();
   }
 }
 void TodoTable::slotCheckDay()
 {
   QDate date = QDate::currentDate();
   if( mDay.daysTo(date )!= 0 ){
     setPaintingEnabled( FALSE );
     for(int i=0; i < numRows(); i++ ){
-      ToDoEvent *t = todoList[static_cast<CheckItem*>(item(i, 0))];      
+      ToDoEvent *t = todoList[static_cast<CheckItem*>(item(i, 0))];
       static_cast<DueTextItem*>(item(i, 3) )->setToDoEvent( t );
 
     }
     setPaintingEnabled( TRUE );
     mDay = date;
     }
   mDayTimer->start( 60 * 1000 ); // 60 seconds
 }
 // check Action and decide
 /*
 void TodoTable::doApply(XMLElement *el )
 {
@@ -909,26 +913,26 @@ static ToDoEvent xmlToEvent( XMLElement *element )
   dumInt = dummy.toInt(&ok );
   if(!ok ) dumInt = ToDoEvent::NORMAL;
   event.setPriority( dumInt );
   //description
   dummy = element->attribute("Description" );
   event.setDescription( dummy );
   // summary
   dummy = element->attribute("Summary" );
   event.setSummary( dummy );
   // category
   dummy = element->attribute("Categories" );
   QStringList ids = QStringList::split(";", dummy );
-  event.setCategories( ids );     
-  
+  event.setCategories( ids );
+
   //uid
   dummy = element->attribute("Uid" );
   dumInt = dummy.toInt(&ok );
   if(ok ) event.setUid( dumInt );
   return event;
 }
 
 }
 // int TodoTable::rowHeight( int ) const
 // {
 //     return 18;
 // }