-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 6 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index a8e1503..285d2b8 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp | |||
@@ -13,12 +13,13 @@ | |||
13 | 13 | ||
14 | #include <qpe/global.h> | 14 | #include <qpe/global.h> |
15 | #include <qpe/stringutil.h> | 15 | #include <qpe/stringutil.h> |
16 | #include <qpe/timeconversion.h> | 16 | #include <qpe/timeconversion.h> |
17 | 17 | ||
18 | #include "oconversion.h" | 18 | #include "oconversion.h" |
19 | #include "opimstate.h" | ||
19 | #include "otimezone.h" | 20 | #include "otimezone.h" |
20 | #include "orecur.h" | 21 | #include "orecur.h" |
21 | #include "otodoaccessxml.h" | 22 | #include "otodoaccessxml.h" |
22 | 23 | ||
23 | namespace { | 24 | namespace { |
24 | time_t rp_end; | 25 | time_t rp_end; |
@@ -419,12 +420,15 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
419 | case OTodo::CompletedDate: | 420 | case OTodo::CompletedDate: |
420 | ev.setCompletedDate( OConversion::dateFromString( val ) ); | 421 | ev.setCompletedDate( OConversion::dateFromString( val ) ); |
421 | break; | 422 | break; |
422 | case OTodo::StartDate: | 423 | case OTodo::StartDate: |
423 | ev.setStartDate( OConversion::dateFromString( val ) ); | 424 | ev.setStartDate( OConversion::dateFromString( val ) ); |
424 | break; | 425 | break; |
426 | case OTodo::State: | ||
427 | ev.setState( val.toInt() ); | ||
428 | break; | ||
425 | case OTodo::CrossReference: | 429 | case OTodo::CrossReference: |
426 | { | 430 | { |
427 | /* | 431 | /* |
428 | * A cross refernce looks like | 432 | * A cross refernce looks like |
429 | * appname,id;appname,id | 433 | * appname,id;appname,id |
430 | * we need to split it up | 434 | * we need to split it up |
@@ -512,12 +516,14 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
512 | str += ev.recurrence().toString(); | 516 | str += ev.recurrence().toString(); |
513 | } | 517 | } |
514 | if ( ev.hasStartDate() ) | 518 | if ( ev.hasStartDate() ) |
515 | str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" "; | 519 | str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" "; |
516 | if ( ev.hasCompletedDate() ) | 520 | if ( ev.hasCompletedDate() ) |
517 | str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" "; | 521 | str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" "; |
522 | if ( ev.hasState() ) | ||
523 | str += "State=\""+QString::number( ev.state().state() )+"\" "; | ||
518 | 524 | ||
519 | 525 | ||
520 | return str; | 526 | return str; |
521 | } | 527 | } |
522 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { | 528 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { |
523 | return Qtopia::Record::idsToString( ints ); | 529 | return Qtopia::Record::idsToString( ints ); |
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index a8e1503..285d2b8 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp | |||
@@ -13,12 +13,13 @@ | |||
13 | 13 | ||
14 | #include <qpe/global.h> | 14 | #include <qpe/global.h> |
15 | #include <qpe/stringutil.h> | 15 | #include <qpe/stringutil.h> |
16 | #include <qpe/timeconversion.h> | 16 | #include <qpe/timeconversion.h> |
17 | 17 | ||
18 | #include "oconversion.h" | 18 | #include "oconversion.h" |
19 | #include "opimstate.h" | ||
19 | #include "otimezone.h" | 20 | #include "otimezone.h" |
20 | #include "orecur.h" | 21 | #include "orecur.h" |
21 | #include "otodoaccessxml.h" | 22 | #include "otodoaccessxml.h" |
22 | 23 | ||
23 | namespace { | 24 | namespace { |
24 | time_t rp_end; | 25 | time_t rp_end; |
@@ -419,12 +420,15 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
419 | case OTodo::CompletedDate: | 420 | case OTodo::CompletedDate: |
420 | ev.setCompletedDate( OConversion::dateFromString( val ) ); | 421 | ev.setCompletedDate( OConversion::dateFromString( val ) ); |
421 | break; | 422 | break; |
422 | case OTodo::StartDate: | 423 | case OTodo::StartDate: |
423 | ev.setStartDate( OConversion::dateFromString( val ) ); | 424 | ev.setStartDate( OConversion::dateFromString( val ) ); |
424 | break; | 425 | break; |
426 | case OTodo::State: | ||
427 | ev.setState( val.toInt() ); | ||
428 | break; | ||
425 | case OTodo::CrossReference: | 429 | case OTodo::CrossReference: |
426 | { | 430 | { |
427 | /* | 431 | /* |
428 | * A cross refernce looks like | 432 | * A cross refernce looks like |
429 | * appname,id;appname,id | 433 | * appname,id;appname,id |
430 | * we need to split it up | 434 | * we need to split it up |
@@ -512,12 +516,14 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
512 | str += ev.recurrence().toString(); | 516 | str += ev.recurrence().toString(); |
513 | } | 517 | } |
514 | if ( ev.hasStartDate() ) | 518 | if ( ev.hasStartDate() ) |
515 | str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" "; | 519 | str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" "; |
516 | if ( ev.hasCompletedDate() ) | 520 | if ( ev.hasCompletedDate() ) |
517 | str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" "; | 521 | str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" "; |
522 | if ( ev.hasState() ) | ||
523 | str += "State=\""+QString::number( ev.state().state() )+"\" "; | ||
518 | 524 | ||
519 | 525 | ||
520 | return str; | 526 | return str; |
521 | } | 527 | } |
522 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { | 528 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { |
523 | return Qtopia::Record::idsToString( ints ); | 529 | return Qtopia::Record::idsToString( ints ); |