1 files changed, 12 insertions, 3 deletions

diff --git a/core/pim/todo/templatedialogimpl.cpp b/core/pim/todo/templatedialogimpl.cpp
index c2306ac..63d8107 100644
--- a/core/pim/todo/templatedialogimpl.cpp
+++ b/core/pim/todo/templatedialogimpl.cpp
@@ -74,21 +74,27 @@ void TemplateDialogImpl::slotAdd() {
     QString str = QWidget::tr("New Template %1").arg( listView()->childCount() );
     OTodo ev;
     m_man->addEvent(str, ev);
     new TemplateListItem( listView(), str, ev );
 }
 void TemplateDialogImpl::slotRemove() {
-    TemplateListItem* item = (TemplateListItem*) listView()->currentItem();
+    if (!listView()->currentItem() )
+        return;
+
+    TemplateListItem* item = static_cast<TemplateListItem*>(  listView()->currentItem() );
     listView()->takeItem( item );
 
     m_man->removeEvent( item->text() );
 
     delete item;
 }
 void TemplateDialogImpl::slotEdit() {
-    TemplateListItem* item = (TemplateListItem*)listView()->currentItem();
+    if ( !listView()->currentItem() )
+        return;
+
+    TemplateListItem* item = static_cast<TemplateListItem*>( listView()->currentItem() );
     OTodo ev = m_win->currentEditor()->edit( m_win, item->event() );
     if ( m_win->currentEditor()->accepted() ) {
         item->setEvent( ev );
         m_man->removeEvent( item->text() );
         m_man->addEvent( item->text(), ev );
     }
@@ -96,13 +102,16 @@ void TemplateDialogImpl::slotEdit() {
 /*
  * we need to update
  * the text
  */
 
 void TemplateDialogImpl::slotReturn() {
-    TemplateListItem* tbl = (TemplateListItem*)listView()->currentItem();
+    if ( !listView()->currentItem() )
+        return;
+
+    TemplateListItem* tbl = static_cast<TemplateListItem*>( listView()->currentItem() );
 
     if (tbl->text() != edit()->text() ) {
         m_man->removeEvent( tbl->text() );
         tbl->setText( edit()->text() );
         m_man->addEvent( tbl->text(), tbl->event() );
     }