try to use the has* functions

2 files changed, 11 insertions, 11 deletions

diff --git a/core/pim/todo/taskeditoroverview.cpp b/core/pim/todo/taskeditoroverview.cpp
index 92408ba..9a8abea 100644
--- a/core/pim/todo/taskeditoroverview.cpp
+++ b/core/pim/todo/taskeditoroverview.cpp
@@ -143,6 +143,6 @@ void TaskEditorOverView::load( const OTodo& todo )
 
     // Recurrence
-    ckbRecurrence->setChecked( todo.recurrence().doesRecur() );
-    emit recurranceEnabled( todo.recurrence().doesRecur() );
+    ckbRecurrence->setChecked( todo.hasRecurrence() );
+    emit recurranceEnabled( todo.hasRecurrence() );
 
     // Notes
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index b11fdab..4331877 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -65,5 +65,5 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     sv->addChild( container );
 
-    QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 ); 
+    QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 );
 
     // Status
@@ -92,5 +92,5 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     layout->addMultiCellWidget( cmbProgress, 1, 1, 1, 2 );
     QWhatsThis::add( cmbProgress, tr( "Select progress made on this task here." ) );
-    
+
     // Start date
     ckbStart = new QCheckBox( tr( "Start Date:" ), container );
@@ -108,5 +108,5 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     connect( m_startBook, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( slotStartChanged( int, int, int ) ) );
-        
+
     // Due date
     ckbDue = new QCheckBox( tr( "Due Date:" ), container );
@@ -124,5 +124,5 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     connect( m_dueBook, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( slotDueChanged( int, int, int ) ) );
-    
+
     // Completed
     ckbComp = new QCheckBox( tr( "Completed:" ), container );
@@ -180,5 +180,5 @@ void TaskEditorStatus::load( const OTodo &todo )
 
     // Status
-    int state = todo.state().state();
+    int state = todo.hasState()? todo.state().state() : OPimState::NotStarted;
     if ( state == OPimState::Undefined )
         state = OPimState::NotStarted;
@@ -187,5 +187,5 @@ void TaskEditorStatus::load( const OTodo &todo )
     // Progress
     cmbProgress->setCurrentItem( todo.progress() / 20 );
-    
+
     // Start date
     ckbStart->setChecked( todo.hasStartDate() );
@@ -217,5 +217,5 @@ void TaskEditorStatus::load( const OTodo &todo )
 
     // Maintainer Mode
-    state = todo.maintainer().mode();
+    state = todo.hasMaintainer() ? todo.maintainer().mode() : OPimMaintainer::Nothing;
     if ( state == OPimMaintainer::Undefined )
         state = OPimMaintainer::Nothing;
@@ -231,5 +231,5 @@ void TaskEditorStatus::save( OTodo &todo )
     // Status
     todo.setState( OPimState( cmbStatus->currentItem() ) );
-    
+
     // Progress
     todo.setProgress( cmbProgress->currentItem() * 20 );
@@ -260,5 +260,5 @@ void TaskEditorStatus::save( OTodo &todo )
     else
         todo.setCompletedDate( inval );
-    
+
     // Maintainer mode - not implemented yet