summaryrefslogtreecommitdiff
authorzecke <zecke>2003-05-07 16:16:44 (UTC)
committer zecke <zecke>2003-05-07 16:16:44 (UTC)
commit1cee00987d34729393fb9383d90babd39517cc68 (patch) (side-by-side diff)
tree03a51eaf8bfcfd242b4bb98d29e941b0b9dcb38a
parent1e9e3371d61cfc404329a8bad51f8b061c1ad73d (diff)
downloadopie-1cee00987d34729393fb9383d90babd39517cc68.zip
opie-1cee00987d34729393fb9383d90babd39517cc68.tar.gz
opie-1cee00987d34729393fb9383d90babd39517cc68.tar.bz2
try to use the has* functions
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/taskeditoroverview.cpp4
-rw-r--r--core/pim/todo/taskeditorstatus.cpp18
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
@@ -141,10 +141,10 @@ void TaskEditorOverView::load( const OTodo& todo )
// Category
cmbCategory->setCategories( todo.categories(), "Todo List", tr( "Todo List" ) );
// Recurrence
- ckbRecurrence->setChecked( todo.recurrence().doesRecur() );
- emit recurranceEnabled( todo.recurrence().doesRecur() );
+ ckbRecurrence->setChecked( todo.hasRecurrence() );
+ emit recurranceEnabled( todo.hasRecurrence() );
// Notes
mleNotes->setText( todo.description() );
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
@@ -63,9 +63,9 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent, const char* name, WFlags f
QWidget *container = new QWidget( sv->viewport() );
sv->addChild( container );
- QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 );
+ QGridLayout *layout = new QGridLayout( container, 7, 3, 4, 4 );
// Status
QLabel *label = new QLabel( tr( "Status:" ), container );
layout->addWidget( label, 0, 0 );
@@ -90,9 +90,9 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent, const char* name, WFlags f
cmbProgress->insertItem( tr( "80 %" ) );
cmbProgress->insertItem( tr( "100 %" ) );
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 );
layout->addWidget( ckbStart, 2, 0 );
QWhatsThis::add( ckbStart, tr( "Click here to set the date this task was started." ) );
@@ -106,9 +106,9 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent, const char* name, WFlags f
popup->insertItem( m_startBook );
btnStart->setPopup( popup );
connect( m_startBook, SIGNAL( dateClicked( int, int, int ) ),
this, SLOT( slotStartChanged( int, int, int ) ) );
-
+
// Due date
ckbDue = new QCheckBox( tr( "Due Date:" ), container );
layout->addWidget( ckbDue, 3, 0 );
QWhatsThis::add( ckbDue, tr( "Click here to set the date this task needs to be completed by." ) );
@@ -122,9 +122,9 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent, const char* name, WFlags f
popup->insertItem( m_dueBook );
btnDue->setPopup( popup );
connect( m_dueBook, SIGNAL( dateClicked( int, int, int ) ),
this, SLOT( slotDueChanged( int, int, int ) ) );
-
+
// Completed
ckbComp = new QCheckBox( tr( "Completed:" ), container );
layout->addWidget( ckbComp, 4, 0 );
QWhatsThis::add( ckbComp, tr( "Click here to mark this task as completed." ) );
@@ -178,16 +178,16 @@ void TaskEditorStatus::load( const OTodo &todo )
QDate date = QDate::currentDate();
QString str = TimeString::longDateString( date );
// Status
- int state = todo.state().state();
+ int state = todo.hasState()? todo.state().state() : OPimState::NotStarted;
if ( state == OPimState::Undefined )
state = OPimState::NotStarted;
cmbStatus->setCurrentItem( state );
// Progress
cmbProgress->setCurrentItem( todo.progress() / 20 );
-
+
// Start date
ckbStart->setChecked( todo.hasStartDate() );
btnStart->setEnabled( todo.hasStartDate() );
if ( todo.hasStartDate() )
@@ -215,9 +215,9 @@ void TaskEditorStatus::load( const OTodo &todo )
else
btnComp->setText( str );
// Maintainer Mode
- state = todo.maintainer().mode();
+ state = todo.hasMaintainer() ? todo.maintainer().mode() : OPimMaintainer::Nothing;
if ( state == OPimMaintainer::Undefined )
state = OPimMaintainer::Nothing;
cmbMaintMode->setCurrentItem( state );
@@ -229,9 +229,9 @@ void TaskEditorStatus::save( OTodo &todo )
QDate inval;
// Status
todo.setState( OPimState( cmbStatus->currentItem() ) );
-
+
// Progress
todo.setProgress( cmbProgress->currentItem() * 20 );
// Start date
@@ -258,9 +258,9 @@ void TaskEditorStatus::save( OTodo &todo )
todo.setCompletedDate( m_comp );
}
else
todo.setCompletedDate( inval );
-
+
// Maintainer mode - not implemented yet
// Maintainer
/* TODO - resolve name to uid.....*/