2 files changed, 13 insertions, 12 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
@@ -202,80 +202,81 @@ void DueTextItem::setToDoEvent( const ToDoEvent *ev )
   }
   //qWarning("m_off=%d", m_off );
 }
 void DueTextItem::paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected )
 {
   //qWarning ("paint m_off=%d", m_off );
   QColorGroup cg2(cg);
   QColor text = cg.text();
   if( m_hasDate && !m_completed ){
     if( m_off < 0 ){
       cg2.setColor(QColorGroup::Text, QColor(red ) );
     }else if( m_off == 0 ){
       cg2.setColor(QColorGroup::Text, QColor(yellow) ); // orange isn't predefined
     }else if( m_off > 0){
       cg2.setColor(QColorGroup::Text, QColor(green ) );
     }
   }
   QTableItem::paint(p, cg2, cr, selected );
   cg2.setColor(QColorGroup::Text, text );
 }
 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 ) ),
              this, SLOT( slotCheckPriority( int, int ) ) );
     connect( this, SIGNAL( currentChanged( int, int ) ),
              this, SLOT( slotCurrentChanged( int, int ) ) );
 
     menuTimer = new QTimer( this );
     connect( menuTimer, SIGNAL(timeout()), this, SLOT(slotShowMenu()) );
 
     mDayTimer = new QTimer( this );
     connect( mDayTimer, SIGNAL(timeout()), this, SLOT(slotCheckDay() ) );
     mDay = QDate::currentDate();
 }
 
 void TodoTable::addEntry( const ToDoEvent &todo )
 {
     int row = numRows();
     setNumRows( row + 1 );
     updateJournal( todo, ACTION_ADD );
     insertIntoTable( new ToDoEvent(todo), row );
     setCurrentCell(row, currentColumn());
     updateVisible();
@@ -284,65 +285,65 @@ void TodoTable::addEntry( const ToDoEvent &todo )
 void TodoTable::slotClicked( int row, int col, int, const QPoint &pos )
 {
     if ( !cellGeometry( row, col ).contains(pos) )
         return;
     // let's switch on the column number...
     switch ( col )
     {
         case 0: {
                 CheckItem *i = static_cast<CheckItem*>(item( row, col ));
                 if ( i ) {
                     int x = pos.x() - columnPos( col );
                     int y = pos.y() - rowPos( row );
                     int w = columnWidth( col );
                     int h = rowHeight( row );
                     if ( i && x >= ( w - BoxSize ) / 2 && x <= ( w - BoxSize ) / 2 + BoxSize &&
                             y >= ( h - BoxSize ) / 2 && y <= ( h - BoxSize ) / 2 + BoxSize ) {
                         i->toggle();
                     }
                     emit signalDoneChanged( i->isChecked() );
                 }
             }
             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 );
 }
 
 void TodoTable::slotShowMenu()
 {
     emit signalShowMenu( QCursor::pos() );
 }
 
 void TodoTable::slotCurrentChanged( int, int )
 {
     menuTimer->stop();
 }
 
 void TodoTable::internalAddEntries( QList<ToDoEvent> &list )
 {
     setNumRows( list.count() );
     int row = 0;
     ToDoEvent *it;
     for ( it = list.first(); it; it = list.next() )
         insertIntoTable( it, row++ );
 }
 
@@ -409,78 +410,81 @@ bool TodoTable::save( const QString &fn )
     if(!todoDB.save() ){
       QFile::remove( strNewFile );
       return false;
     };
     // now do the rename
     if ( ::rename( strNewFile, fn ) < 0 )
         qWarning( "problem renaming file %s to %s errno %d",
                   strNewFile.latin1(), fn.latin1(), errno );
 
     // remove the journal
     QFile::remove( journalFileName() );
     return true;
 }
 
 void TodoTable::load( const QString &fn )
 {
   if ( QFile::exists(journalFileName()) ) {
     applyJournal();
     QFile::remove(journalFileName() );
   }
     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;
                     for ( uint it = 0; it < vlCats.count(); ++it ) {
                         if ( vlCats[it] == id ) {
                             hide = false;
                             break;
                         }
                     }
                 }
             }
         }
         if ( hide ) {
             if ( currentRow() == row )
                 setCurrentCell( -1, 0 );
             if ( rowHeight( row ) > 0 )
                 hideRow( row );
         } else {
             if ( rowHeight( row ) == 0 ) {
                 showRow( row );
                 adjustRow( row );
             }
             visible++;
@@ -570,65 +574,65 @@ void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action )
     }
     if(!attr.isEmpty() ) // remove the last ;
       attr.remove(attr.length()-1, 1 );
     buf += " Categories=\"" + attr + "\"";
     buf += " Description=\"" + todo.description() + "\"";
     buf += " Summary=\"" + todo.summary() + "\"";
     if(todo.hasDate() ) {
       buf += " DateYear=\""+QString::number( todo.date().year() ) + "\"";
       buf += " DateMonth=\"" + QString::number( todo.date().month() ) + "\"";
       buf += " DateDay=\"" + QString::number( todo.date().day() ) + "\"";
     }
     buf += "/>\n";
     str = buf.utf8();
     f.writeBlock( str.data(), str.length() );
     f.close();
 }
 
 void TodoTable::rowHeightChanged( int row )
 {
     if ( enablePainting )
         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();
     if( strTodo.isEmpty() ){
         strTodo = todo.description().left(40).simplifyWhiteSpace();
         //todo.setSummary(strTodo );
     }
     if ( row == -1 ) {
         QMapIterator<CheckItem*, ToDoEvent *> it;
         for ( it = todoList.begin(); it != todoList.end(); ++it ) {
             if ( *(*it) == todo ) {
                 row = it.key()->row();
                 it.key()->setChecked( todo.isCompleted() );
                 static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) );
                 item( row, 2 )->setText( strTodo );
 
                 if (showDeadl){
                   static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo );
                 }
 
                 *(*it) = todo;
             }
         }
@@ -652,65 +656,65 @@ void TodoTable::journalFreeRemoveEntry( int row )
     CheckItem *chk;
     chk = static_cast<CheckItem*>(item(row, 0 ));
     if ( !chk )
         return;
     todoList.remove( chk );
 
     realignTable( row );
 }
 
 void TodoTable::keyPressEvent( QKeyEvent *e )
 {
         if ( e->key() == Key_Space || e->key() == Key_Return ) {
                 switch ( currentColumn() ) {
                 case 0: {
                         CheckItem *i = static_cast<CheckItem*>(item(currentRow(),
                                                                     currentColumn()));
                         if ( i )
                                 i->toggle();
                         break;
                 }
                 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;
 }
 
 void TodoTable::slotDoFind( const QString &findString, bool caseSensitive,
                             bool backwards, int category )
 {
     // we have to iterate through the table, this gives the illusion that
     // sorting is actually being used.
     if ( currFindRow < -1 )
         currFindRow = currentRow() - 1;
     clearSelection( TRUE );
     int rows,
         row;
     CheckItem *chk;
     QRegExp r( findString );
 
     r.setCaseSensitive( caseSensitive );
     rows = numRows();
     static bool wrapAround = true;
 
    if ( !backwards ) {
@@ -729,116 +733,116 @@ void TodoTable::slotDoFind( const QString &findString, bool caseSensitive,
     if ( row >= rows || row < 0 ) {
         if ( row < 0 )
             currFindRow = rows;
         else
             currFindRow = -1;
         if ( wrapAround )
             emit signalWrapAround();
         else
             emit signalNotFound();
         wrapAround = !wrapAround;
     } else {
         currFindRow = row;
         QTableSelection foundSelection;
         foundSelection.init( currFindRow, 0 );
         foundSelection.expandTo( currFindRow, numCols() - 1 );
         addSelection( foundSelection );
         setCurrentCell( currFindRow, numCols() - 1 );
         // we should always be able to wrap around and find this again,
         // so don't give confusing not found message...
         wrapAround = true;
     }
 }
 
 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;
       file2.close();
     }
     XMLElement *root = XMLElement::load(journalFileName()+ "_new");
     XMLElement *el = root->firstChild();
     el = el->firstChild();
     ToDoDB tododb; // allready loaded ;)
     bool ok;
     int action;
     QString dummy;
     while( el ){
       dummy = el->attribute("Action" );
       action = dummy.toInt(&ok );
       ToDoEvent ev = xmlToEvent( el );
       if(ok ){
         switch( action){
         case ACTION_ADD:
           tododb.addEvent(ev );
           break;
         case ACTION_REMOVE:
           tododb.removeEvent( ev );
           break;
         case ACTION_REPLACE:
           tododb.replaceEvent( ev );
           break;
         }
       }
       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 )
 {
   QString dummy;
   bool ok;
   int action;
   dummy = el->attribute("Action" );
   action = dummy.toInt(&ok );
   ToDoEvent ev = xmlToEvent( el );
   if( ok ){
     switch( action ){
     case ACTION_ADD:
       addEntry( ev );
       break;
     case ACTION_REMOVE:{ // find an entry with the same uid and remove it then
       break;
     }
     case ACTION_REPLACE:
       break;
     }
   }
 }
 */
@@ -889,57 +893,57 @@ static ToDoEvent xmlToEvent( XMLElement *element )
   bool hasDa = dumInt;
   if ( hasDa ) { //parse the date
     int year, day, month = 0;
     year = day = month;
     // year
     dummy = element->attribute("DateYear" );
     dumInt = dummy.toInt(&ok );
     if( ok ) year = dumInt;
     // month
     dummy = element->attribute("DateMonth" );
     dumInt = dummy.toInt(&ok );
     if(ok ) month = dumInt;
     dummy = element->attribute("DateDay" );
     dumInt = dummy.toInt(&ok );
     if(ok ) day = dumInt;
     // set the date
     QDate date( year, month, day );
     event.setDate( date);
   }
   dummy = element->attribute("Priority" );
   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;
 // }
 
 // int TodoTable::rowPos( int row ) const
 // {
 //     return 18*row;
 // }
 
 // int TodoTable::rowAt( int pos ) const
 // {
 //     return QMIN( pos/18, numRows()-1 );
 // }
 
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h
index 7539df1..387dddb 100644
--- a/core/pim/todo/todotable.h
+++ b/core/pim/todo/todotable.h
@@ -163,67 +163,64 @@ private:
     void loadFile( const QString &strFile);
 
 private slots:
     void slotClicked( int row, int col, int button, const QPoint &pos );
     void slotPressed( int row, int col, int button, const QPoint &pos );
     void slotCheckPriority(int row, int col );
     void slotCurrentChanged(int row, int col );
     void slotDoFind( const QString &findString, bool caseSensetive,
                      bool backwards, int category );
     void slotShowMenu();
     void rowHeightChanged( int row );
     void slotCheckDay(); // check the day
 
 private:
     friend class TodoWindow;
 
     QMap<CheckItem*, ToDoEvent *> todoList;
     QStringList categoryList;
     bool showComp;
     QString showCat;
     QTimer *menuTimer;
     QDate mDay;
     QTimer *mDayTimer; // see if the day changed
     bool enablePainting;
     Categories mCat;
     int currFindRow;
     bool showDeadl:1;
 };
 
 
 inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
 {
-    int rows = numRows();
-    ++rows;
-    setNumRows( rows );
     QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A')
                               + todo->priority() )
                       + Qtopia::buildSortKey( todo->description() );
     CheckItem *chk = new CheckItem( this, sortKey );
     chk->setChecked( todo->isCompleted() );
     ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent );
     cmb->setText( QString::number( todo->priority() ) );
     QString sum = todo->summary();
     QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum );
     ti->setReplaceable( false );
 
     DueTextItem *due = new DueTextItem(this, todo );
     setItem( row, 3, due);
 
     setItem( row, 0, chk );
     setItem( row, 1, cmb );
     setItem( row, 2, ti );
 
 
     todoList.insert( chk, todo );
 }
 
 inline void TodoTable::realignTable( int row )
 {
   QTableItem *ti1,
     *ti2,
     *ti3,
     *ti4;
     int totalRows = numRows();
     for ( int curr = row; curr < totalRows - 1; curr++ ) {
         // this is bad, we must take the item out and then
         // set it. In the end, it behaves no worse (time wise)