1 files changed, 44 insertions, 230 deletions

diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 77d3389..2bb95a2 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -1,755 +1,569 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "todotable.h"
 
+#include <opie/tododb.h>
 #include <qpe/categoryselect.h>
 #include <qpe/xmlreader.h>
 
 #include <qasciidict.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qpainter.h>
 #include <qtextcodec.h>
 #include <qtimer.h>
 #include <qdatetime.h>
 
 #include <qcursor.h>
 #include <qregexp.h>
 
 #include <errno.h>
 #include <stdlib.h>
 
 
 
-static bool taskCompare( const Task &task, const QRegExp &r, int category );
+static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category );
 
 static QString journalFileName();
 
 CheckItem::CheckItem( QTable *t, const QString &key )
     : QTableItem( t, Never, "" ), checked( FALSE ), sortKey( key )
 {
 }
 
 QString CheckItem::key() const
 {
     return sortKey;
 }
 
 void CheckItem::setChecked( bool b )
 {
     checked = b;
     table()->updateCell( row(), col() );
 }
 
 void CheckItem::toggle()
 {
     TodoTable *parent = static_cast<TodoTable*>(table());
-    Task newTodo = parent->currentEntry();
+    ToDoEvent newTodo = parent->currentEntry();
     checked = !checked;
     newTodo.setCompleted( checked );
     table()->updateCell( row(), col() );
     parent->replaceCurrentEntry( newTodo, true );
 }
 
 bool CheckItem::isChecked() const
 {
     return checked;
 }
 
 static const int BoxSize = 10;
 
 void CheckItem::paint( QPainter *p, const QColorGroup &cg, const QRect &cr,
 		       bool )
 {
     p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
 
     int marg = ( cr.width() - BoxSize ) / 2;
     int x = 0;
     int y = ( cr.height() - BoxSize ) / 2;
     p->setPen( QPen( cg.text() ) );
     p->drawRect( x + marg, y, BoxSize, BoxSize );
     p->drawRect( x + marg+1, y+1, BoxSize-2, BoxSize-2 );
     p->setPen( darkGreen );
     x += 1;
     y += 1;
     if ( checked ) {
 	QPointArray a( 7*2 );
 	int i, xx, yy;
 	xx = x+1+marg;
 	yy = y+2;
 	for ( i=0; i<3; i++ ) {
 	    a.setPoint( 2*i,   xx, yy );
 	    a.setPoint( 2*i+1, xx, yy+2 );
 	    xx++; yy++;
 	}
 	yy -= 2;
 	for ( i=3; i<7; i++ ) {
 	    a.setPoint( 2*i,   xx, yy );
 	    a.setPoint( 2*i+1, xx, yy+2 );
 	    xx++; yy--;
 	}
 	p->drawLineSegments( a );
     }
 }
 
 
 ComboItem::ComboItem( QTable *t, EditType et )
     : QTableItem( t, et, "3" ), cb( 0 )
 {
     setReplaceable( FALSE );
 }
 
 QWidget *ComboItem::createEditor() const
 {
     QString txt = text();
     ( (ComboItem*)this )->cb = new QComboBox( table()->viewport() );
     cb->insertItem( "1" );
     cb->insertItem( "2" );
     cb->insertItem( "3" );
     cb->insertItem( "4" );
     cb->insertItem( "5" );
     cb->setCurrentItem( txt.toInt() - 1 );
     return cb;
 }
 
 void ComboItem::setContentFromEditor( QWidget *w )
 {
     TodoTable *parent = static_cast<TodoTable*>(table());
-    Task newTodo = parent->currentEntry();
+    ToDoEvent newTodo = parent->currentEntry();
 
     if ( w->inherits( "QComboBox" ) )
 	setText( ( (QComboBox*)w )->currentText() );
     else
 	QTableItem::setContentFromEditor( w );
     newTodo.setPriority( text().toInt() );
     parent->replaceCurrentEntry( newTodo, true );
 }
 
 void ComboItem::setText( const QString &s )
 {
     if ( cb )
 	cb->setCurrentItem( s.toInt() - 1 );
     QTableItem::setText( s );
 }
 
 QString ComboItem::text() const
 {
     if ( cb )
 	return cb->currentText();
     return QTableItem::text();
 }
 
 
 
 TodoTable::TodoTable( QWidget *parent, const char *name )
 // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR
 //     : QTable( 0, 3, parent, name, TRUE ),
 // #else
     : QTable( 0, 3, parent, name ),
 // #endif
       showComp( true ),
       enablePainting( true ),
       mCat( 0 ),
       currFindRow( -2 )
 {
     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" ) );
     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()) );
 }
 
-void TodoTable::addEntry( const Task &todo )
+void TodoTable::addEntry( const ToDoEvent &todo )
 {
     int row = numRows();
     setNumRows( row + 1 );
     updateJournal( todo, ACTION_ADD );
-    insertIntoTable( new Task(todo), row );
+    insertIntoTable( new ToDoEvent(todo), row );
     setCurrentCell(row, currentColumn());
     updateVisible();
 }
 
 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:
             // 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<Task> &list )
+void TodoTable::internalAddEntries( QList<ToDoEvent> &list )
 {
     setNumRows( list.count() );
     int row = 0;
-    Task *it;
+    ToDoEvent *it;
     for ( it = list.first(); it; it = list.next() )
 	insertIntoTable( it, row++ );
 }
 
 
-Task TodoTable::currentEntry() const
+ToDoEvent TodoTable::currentEntry() const
 {
     QTableItem *i = item( currentRow(), 0 );
     if ( !i || rowHeight( currentRow() ) <= 0 )
-        return Task();
-    Task *todo = todoList[(CheckItem*)i];
+        return ToDoEvent();
+    ToDoEvent *todo = todoList[(CheckItem*)i];
     todo->setCompleted( ( (CheckItem*)item( currentRow(), 0 ) )->isChecked() );
     todo->setPriority( ( (ComboItem*)item( currentRow(), 1 ) )->text().toInt() );
     return *todo;
 }
 
-void TodoTable::replaceCurrentEntry( const Task &todo, bool fromTableItem )
+void TodoTable::replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem )
 {
     int row = currentRow();
     updateJournal( todo, ACTION_REPLACE, row );
 
     if ( !fromTableItem ) {
 	journalFreeReplaceEntry( todo, row );
 	updateVisible();
     }
 }
 
 void TodoTable::removeCurrentEntry()
 {
-    Task *oldTodo;
+    ToDoEvent *oldTodo;
     int row = currentRow();
     CheckItem *chk;
 
     chk = static_cast<CheckItem*>(item(row, 0 ));
     if ( !chk )
 	return;
     oldTodo = todoList[chk];
     todoList.remove( chk );
     oldTodo->setCompleted( chk->isChecked() );
     oldTodo->setPriority( static_cast<ComboItem*>(item(row, 1))->text().toInt() );
     realignTable( row );
     updateVisible();
     updateJournal( *oldTodo, ACTION_REMOVE, row );
     delete oldTodo;
 }
 
 
 bool TodoTable::save( const QString &fn )
 {
     QString strNewFile = fn + ".new";
-    QFile f( strNewFile );
-    if ( !f.open( IO_WriteOnly|IO_Raw ) )
-        return false;
-
-    QString buf("<!DOCTYPE Tasks>\n<Tasks>\n");
-    QCString str;
-    int total_written;
-
-    for ( QMap<CheckItem*, Task *>::Iterator it = todoList.begin();
+    QFile::remove( strNewFile ); // just to be sure
+    ToDoDB todoDB( strNewFile );
+    for ( QMap<CheckItem*, ToDoEvent *>::Iterator it = todoList.begin();
 	  it != todoList.end(); ++it ) {
         if ( !item( it.key()->row(), 0 ) )
             continue;
-        Task *todo = *it;
+        ToDoEvent *todo = *it;
 	// sync item with table
 	todo->setCompleted( ((CheckItem*)item(it.key()->row(), 0))->isChecked() );
 	todo->setPriority( ((ComboItem*)item( it.key()->row(), 1))->text().toInt() );
-	buf += "<Task";
-        todo->save( buf );
-	buf += " />\n";
-	str = buf.utf8();
-	total_written = f.writeBlock( str.data(), str.length() );
-	if ( total_written != int(str.length()) ) {
-	    f.close();
-	    QFile::remove( strNewFile );
-	    return false;
-	}
-	buf = "";
-    }
-
-    buf += "</Tasks>\n";
-    str = buf.utf8();
-    total_written = f.writeBlock( str.data(), str.length() );
-    if ( total_written != int(str.length()) ) {
-	f.close();
-	QFile::remove( strNewFile );
-	return false;
+	todoDB.addEvent( *todo );
     }
-    f.close();
-
+    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 )
 {
     loadFile( fn, false );
     if ( QFile::exists(journalFileName()) ) {
 	loadFile( journalFileName(), true );
 	save( fn );
     }
 //     QTable::sortColumn(2,TRUE,TRUE);
 //     QTable::sortColumn(1,TRUE,TRUE);
     QTable::sortColumn(0,TRUE,TRUE);
     setCurrentCell( 0, 2 );
 }
 
 void TodoTable::updateVisible()
 {
     if ( !isUpdatesEnabled() )
 	return;
     
 //     qDebug("--> updateVisible!");
 
     int visible = 0;
     int id = mCat.id( "Todo List", showCat );
     for ( int row = 0; row < numRows(); row++ ) {
 	CheckItem *ci = (CheckItem *)item( row, 0 );
-	Task *t = todoList[ci];
+	ToDoEvent *t = todoList[ci];
 	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...
 		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++;
 	}
     }
     if ( !visible )
 	setCurrentCell( -1, 0 );
 }
 
 void TodoTable::viewportPaintEvent( QPaintEvent *pe )
 {
     if ( enablePainting )
 	QTable::viewportPaintEvent( pe );
 }
 
 void TodoTable::setPaintingEnabled( bool e )
 {
     if ( e != enablePainting ) {
 	if ( !enablePainting ) {
 	    enablePainting = true;
 	    rowHeightChanged( 0 );
 	    viewport()->update();
 	} else {
 	    enablePainting = false;
 	}
     }
 }
 
 void TodoTable::clear()
 {
-    for ( QMap<CheckItem*, Task *>::Iterator it = todoList.begin();
+    for ( QMap<CheckItem*, ToDoEvent *>::Iterator it = todoList.begin();
 	  it != todoList.end(); ++it ) {
-	Task *todo = *it;
+	ToDoEvent *todo = *it;
 	delete todo;
     }
     todoList.clear();
     for ( int r = 0; r < numRows(); ++r ) {
 	for ( int c = 0; c < numCols(); ++c ) {
             if ( cellWidget( r, c ) )
                 clearCellWidget( r, c );
 	    clearCell( r, c );
 	}
     }
     setNumRows( 0 );
 }
 
 void TodoTable::sortColumn( int col, bool /*ascending*/, bool /*wholeRows*/ )
 {
     // The default for wholeRows is false, however
     // for this todo table we want to exchange complete
     // rows when sorting. Also, we always want ascending, since
     // the values have a logical order.
     QTable::sortColumn( col, TRUE, TRUE );
     updateVisible();
 }
 
 void TodoTable::slotCheckPriority(int row, int col )
 {
     // kludgey work around to make forward along the updated priority...
     if ( col == 1 ) {
         // let everyone know!!
         ComboItem* i = static_cast<ComboItem*>( item( row, col ) );
         emit signalPriorityChanged( i->text().toInt() );
     }
 }
 
 
-void TodoTable::updateJournal( const Task &todo, journal_action action, int row )
+void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action, int row )
 {
     QFile f( journalFileName() );
     if ( !f.open(IO_WriteOnly|IO_Append) )
 	return;
     QString buf;
     QCString str;
     buf = "<Task";
-    todo.save( buf );
+    //    todo.save( buf );
     buf += " Action=\"" + QString::number( int(action) ) + "\"";
     buf += " Row=\"" + QString::number( row ) + "\"";
     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 &strFile, bool fromJournal )
 {
-    QFile f( strFile );
-    if ( !f.open(IO_ReadOnly) )
-	return;
-
-    int action, row;
-    action = 0; row = 0;
-
-    enum Attribute {
-	FCompleted = 0,
-	FHasDate,
-	FPriority,
-	FCategories,
-	FDescription,
-	FDateYear,
-	FDateMonth,
-	FDateDay,
-	FUid,
-	FAction,
-	FRow
-    };
-
-    QAsciiDict<int> dict( 31 );
-    QList<Task> list;
-    dict.setAutoDelete( TRUE );
-    dict.insert( "Completed", new int(FCompleted) );
-    dict.insert( "HasDate", new int(FHasDate) );
-    dict.insert( "Priority", new int(FPriority) );
-    dict.insert( "Categories", new int(FCategories) );
-    dict.insert( "Description", new int(FDescription) );
-    dict.insert( "DateYear", new int(FDateYear) );
-    dict.insert( "DateMonth", new int(FDateMonth) );
-    dict.insert( "DateDay", new int(FDateDay) );
-    dict.insert( "Uid", new int(FUid) );
-    dict.insert( "Action", new int(FAction) );
-    dict.insert( "Row", new int(FRow) );
-
-    QByteArray ba = f.readAll();
-    f.close();
-    char* dt = ba.data();
-    int len = ba.size();
-    bool hasDueDate = FALSE;
-
-    action = ACTION_ADD;
-    int i = 0;
-    char *point;
-    while ( ( point = strstr( dt+i, "<Task " ) ) != NULL ) {
-	// new Task
-	i = point - dt;
-	Task *todo = new Task;
-	int dtY = 0, dtM = 0, dtD = 0;
-
-	i += 5;
-
-	while( 1 ) {
-	    while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') )
-		++i;
-	    if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
-		break;
-	    // we have another attribute, read it.
-	    int j = i;
-	    while ( j < len && dt[j] != '=' )
-		++j;
-	    char *attr = dt+i;
-	    dt[j] = '\0';
-	    i = ++j; // skip =
-	    while ( i < len && dt[i] != '"' )
-		++i;
-	    j = ++i;
-	    bool haveUtf = FALSE;
-	    bool haveEnt = FALSE;
-	    while ( j < len && dt[j] != '"' ) {
-		if ( ((unsigned char)dt[j]) > 0x7f )
-		    haveUtf = TRUE;
-		if ( dt[j] == '&' )
-		    haveEnt = TRUE;
-		++j;
-	    }
-	    if ( i == j ) {
-		// empty value
-		i = j + 1;
-		continue;
-	    }
-	    QCString value( dt+i, j-i+1 );
-	    i = j + 1;
-	    int *lookup = dict[ attr ];
-	    if ( !lookup ) {
-		todo->setCustomField(attr, value);
-		continue;
-	    }
-	    switch( *lookup ) {
-	    case FCompleted:
-		todo->setCompleted( value.toInt() );
-		break;
-	    case FHasDate:
-		// leave...
-		hasDueDate = value.toInt();
-		break;
-	    case FPriority:
-		todo->setPriority( value.toInt() );
-		break;
-	    case FCategories: {
-		//QString str = Qtopia::plainString( value );
-		todo->setCategories( Qtopia::Record::idsFromString( value ) );
-		    break;
-		}
-	    case FDescription:
-	    {
-		QString str = (haveUtf ? QString::fromUtf8( value )
-			       : QString::fromLatin1( value ) );
-		if ( haveEnt )
-		    str = Qtopia::plainString( str );
-		todo->setDescription( str );
-		break;
-	    }
-	    case FDateYear:
-		dtY = value.toInt();
-		break;
-	    case FDateMonth:
-		dtM = value.toInt();
-		break;
-	    case FDateDay:
-		dtD = value.toInt();
-		break;
-	    case FUid:
-		todo->setUid( value.toInt() );
-		break;
-	    case FAction:
-		action = value.toInt();
-		break;
-	    case FRow:
-		row = value.toInt();
-		break;
-	    default:
-		qDebug( "huh??? missing enum? -- attr.: %s", attr );
-		break;
-	    }
-	}
-        
-	if ( dtY != 0 && dtM != 0 && dtD != 0 )
-	    todo->setDueDate( QDate( dtY, dtM, dtD), hasDueDate );
-	else
-	    todo->setHasDueDate( hasDueDate );
-
-//         if ( categoryList.find( todo.category() ) == categoryList.end() )
-//             categoryList.append( todo.category() );
-
 
-	// sadly we can't delay adding of items from the journal to get
-	// the proper effect, but then, the journal should _never_ be
-	// that huge
-
-	switch( action ) {
-	case ACTION_ADD:
-	    if ( fromJournal ) {
-		int myrows = numRows();
-		setNumRows( myrows + 1 );
-		insertIntoTable( todo, myrows );
-		delete todo;
-	    } else
-		list.append( todo );
-	    break;
-	case ACTION_REMOVE:
-	    journalFreeRemoveEntry( row );
-	    break;
-	case ACTION_REPLACE:
-	    journalFreeReplaceEntry( *todo, row );
-	    delete todo;
-	    break;
-	default:
-	    break;
-	}
-    }
-//     qDebug("parsing done=%d", t.elapsed() );
-    if ( list.count() > 0 ) {
-	internalAddEntries( list );
-	list.clear();
-    }
+  QList<ToDoEvent> list;
+  ToDoDB todoDB;
+  QValueList<ToDoEvent> vaList = todoDB.rawToDos();
+  for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){
+    list.append( new ToDoEvent( (*it) ) );
+  }   
+  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 Task &todo, int row )
+void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
 {
     QString strTodo;
     strTodo = todo.description().left(40).simplifyWhiteSpace();
     if ( row == -1 ) {
-	QMapIterator<CheckItem*, Task *> it;
+	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 );
 		*(*it) = todo;
 	    }
 	}
     } else {
-	Task *t = todoList[static_cast<CheckItem*>(item(row, 0))];
+	ToDoEvent *t = todoList[static_cast<CheckItem*>(item(row, 0))];
 	todoList.remove( static_cast<CheckItem*>(item(row, 0)) );
 	delete t;
 	static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() );
 	static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) );
 	item( row, 2 )->setText( strTodo );
-	todoList.insert( static_cast<CheckItem*>(item(row,0)), new Task(todo) );
+	todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(todo) );
     }
 }
 
 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:
 		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 )
@@ -769,91 +583,91 @@ void TodoTable::slotDoFind( const QString &findString, bool caseSensitive,
     static bool wrapAround = true;
 
    if ( !backwards ) {
     for ( row = currFindRow + 1; row < rows; row++ ) {
 	chk = static_cast<CheckItem*>( item(row, 0) );
 	if ( taskCompare(*(todoList[chk]), r, category) )
 	    break;
     }
     } else {
  	for ( row = currFindRow - 1; row > -1; row-- ) {
  	    chk = static_cast<CheckItem*>( item(row, 0) );
  	    if ( taskCompare(*(todoList[chk]), r, category) )
  		break;
  	}
    }
     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;
 }
 
-static bool taskCompare( const Task &task, const QRegExp &r, int category )
+static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category )
 {
     bool returnMe;
     QArray<int> cats;
     cats = task.categories();
 
     returnMe = false;
     if ( (category == -1 && cats.count() == 0) || category == -2 )
 	returnMe = task.match( r );
     else {
 	int i;
 	for ( i = 0; i < int(cats.count()); i++ ) {
 	    if ( cats[i] == category ) {
 		returnMe = task.match( r );
 		break;
 	    }
 	}
     }
     return returnMe;
 }
 
 static QString journalFileName()
 {
     QString str;
     str = getenv( "HOME" );
     str += "/.todojournal";
     return str;
 }
 
 // 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 );
 // }