2 files changed, 3 insertions, 3 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index a28fc3e..294f37c 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -311,138 +311,139 @@ TodoWindow::~TodoWindow()
 
 void TodoWindow::slotDelete()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     if ( table->currentRow() == -1 )
         return;
 
     QString strName = table->text( table->currentRow(), 2 ).left( 30 );
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), strName ) )
         return;
 
 
 
     table->setPaintingEnabled( false );
     table->removeCurrentEntry();
     table->setPaintingEnabled( true );
 
     if ( table->numRows() == 0 ) {
         currentEntryChanged( -1, 0 );
         findAction->setEnabled( FALSE );
     }
     mStack->raiseWidget(1);
 }
 void TodoWindow::slotDeleteAll()
 {
   if(syncing) {
     QMessageBox::warning(this, tr("Todo"),
                          tr("Can not edit data, currently syncing"));
     return;
   }
   
   //QString strName = table->text( table->currentRow(), 2 ).left( 30 );
   
   if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("Delete all tasks?") ) )
     return;
   
   
   
   table->setPaintingEnabled( false );
   table->removeAllEntries();
   table->setPaintingEnabled( true );
   
   if ( table->numRows() == 0 ) {
     currentEntryChanged( -1, 0 );
     findAction->setEnabled( FALSE );
   }
   mStack->raiseWidget(1 );
 }
 
 void TodoWindow::slotEdit()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     ToDoEvent todo = table->currentEntry();
-
+    qWarning("slotEdit" );
     NewTaskDialog e( todo, this, 0, TRUE );
     e.setCaption( tr( "Edit Task" ) );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 
     if ( ret == QDialog::Accepted ) {
+      qWarning("Replacing now" );
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         table->replaceCurrentEntry( todo );
         table->setPaintingEnabled( true );
     }
     populateCategories();
     mStack->raiseWidget( 1 );
 }
 void TodoWindow::slotDuplicate()
 {
   if(syncing) {
     QMessageBox::warning(this, tr("Todo"),
                          tr("Can not edit data, currently syncing"));
     return;
   }
   ToDoEvent ev = table->currentEntry();
   ToDoEvent ev2 = ToDoEvent( ev ); // what about the uid
   int uid;
   { // uid
     Qtopia::UidGen *uidgen = new Qtopia::UidGen();
     uid = uidgen->generate();
     delete uidgen;
   }
   ev2.setUid( uid );
   table->setPaintingEnabled( false );
   table->addEntry( ev2 );
   table->setPaintingEnabled( true );
 
   mStack->raiseWidget( 1 );
 }
 void TodoWindow::slotShowPopup( const QPoint &p )
 {
     contextMenu->popup( p );
 }
 
 void TodoWindow::showCompleted( bool s )
 {
     if ( !table->isUpdatesEnabled() )
         return;
     table->setPaintingEnabled( false );
     table->setShowCompleted( s );
     table->setPaintingEnabled( true );
     mStack->raiseWidget( 1 );
 }
 
 void TodoWindow::currentEntryChanged( int r, int )
 {
     if ( r != -1 && table->rowHeight( r ) > 0 ) {
         editAction->setEnabled( TRUE );
         deleteAction->setEnabled( TRUE );
         duplicateAction->setEnabled( TRUE );
         deleteAllAction->setEnabled( TRUE );
     } else {
         editAction->setEnabled( FALSE );
         deleteAction->setEnabled( FALSE );
         duplicateAction->setEnabled( FALSE );
         deleteAllAction->setEnabled( FALSE );
     }
 }
 
 void TodoWindow::setCategory( int c )
 {
     if ( c <= 0 ) return;
     if ( !table->isUpdatesEnabled() )
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index dc60cc4..208a084 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -580,130 +580,129 @@ void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action )
       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;
     strTodo = todo.description().left(40).simplifyWhiteSpace();
     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;
             }
         }
     } else {
         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 );
 
          if (showDeadl){
           static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo );
          }
-        ToDoEvent *ev = new ToDoEvent( todo );
-        todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(ev) );
+        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 )
 {
     // 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 ) {