save and restore CompletedDate and StartDate

2 files changed, 26 insertions, 0 deletions

diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 71b6a7e..a8e1503 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -6,24 +6,25 @@
 #include <sys/types.h>
 
 #include <unistd.h>
 
 
 #include <qfile.h>
 #include <qvector.h>
 
 #include <qpe/global.h>
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 
+#include "oconversion.h"
 #include "otimezone.h"
 #include "orecur.h"
 #include "otodoaccessxml.h"
 
 namespace {
     time_t rp_end;
     ORecur* rec;
     ORecur *recur() {
         if (!rec ) rec = new ORecur;
         return rec;
     }
     int snd;
@@ -89,24 +90,25 @@ bool OTodoAccessXML::load() {
     dict.insert("Categories" ,     new int(OTodo::Category)         );
     dict.insert("Uid" ,            new int(OTodo::Uid)              );
     dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     dict.insert("Completed" ,      new int(OTodo::Completed)        );
     dict.insert("Description" ,    new int(OTodo::Description)      );
     dict.insert("Summary" ,        new int(OTodo::Summary)          );
     dict.insert("Priority" ,       new int(OTodo::Priority)         );
     dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     dict.insert("Progress" ,       new int(OTodo::Progress)         );
     dict.insert("CompletedDate",   new int(OTodo::CompletedDate)    );
+    dict.insert("StartDate",       new int(OTodo::StartDate)        );
     dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
     dict.insert("State",           new int(OTodo::State)            );
     dict.insert("Alarms",          new int(OTodo::Alarms)           );
     dict.insert("Reminders",       new int(OTodo::Reminders)        );
     dict.insert("Notifiers",       new int(OTodo::Notifiers)        );
     dict.insert("Maintainer",      new int(OTodo::Maintainer)       );
     dict.insert("rtype", new int(FRType) );
     dict.insert("rweekdays", new int(FRWeekdays) );
     dict.insert("rposition", new int(FRPosition) );
     dict.insert("rfreq", new int(FRFreq) );
     dict.insert("start", new int(FRStart) );
     dict.insert("rhasenddate", new int(FRHasEndDate) );
@@ -405,24 +407,30 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
     case OTodo::DateDay:
         m_day = val.toInt();
         break;
     case OTodo::DateMonth:
         m_month = val.toInt();
         break;
     case OTodo::DateYear:
         m_year = val.toInt();
         break;
     case OTodo::Progress:
         ev.setProgress( val.toInt() );
         break;
+    case OTodo::CompletedDate:
+        ev.setCompletedDate( OConversion::dateFromString( val ) );
+        break;
+    case OTodo::StartDate:
+        ev.setStartDate( OConversion::dateFromString( val ) );
+        break;
     case OTodo::CrossReference:
     {
         /*
          * A cross refernce looks like
          * appname,id;appname,id
          * we need to split it up
          */
         QStringList  refs = QStringList::split(';', val );
         QStringList::Iterator strIt;
         for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) {
             int pos = (*strIt).find(',');
             if ( pos > -1 )
@@ -494,24 +502,29 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
      * for this case - cough  --zecke
      */
     /*
     QMap<QString, QString> extras = ev.extras();
     QMap<QString, QString>::Iterator extIt;
     for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
         str += extIt.key() + "=\"" +  extIt.data() + "\" ";
     */
     // cross refernce
     if ( ev.hasRecurrence() ) {
         str += ev.recurrence().toString();
     }
+    if ( ev.hasStartDate() )
+        str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" ";
+    if ( ev.hasCompletedDate() )
+        str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" ";
+
 
     return str;
 }
 QString OTodoAccessXML::toString( const QArray<int>& ints ) const {
     return Qtopia::Record::idsToString( ints );
 }
 
 /* internal class for sorting
  *
  * Inspired by todoxmlio.cpp from TT
  */
 
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 71b6a7e..a8e1503 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -6,24 +6,25 @@
 #include <sys/types.h>
 
 #include <unistd.h>
 
 
 #include <qfile.h>
 #include <qvector.h>
 
 #include <qpe/global.h>
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 
+#include "oconversion.h"
 #include "otimezone.h"
 #include "orecur.h"
 #include "otodoaccessxml.h"
 
 namespace {
     time_t rp_end;
     ORecur* rec;
     ORecur *recur() {
         if (!rec ) rec = new ORecur;
         return rec;
     }
     int snd;
@@ -89,24 +90,25 @@ bool OTodoAccessXML::load() {
     dict.insert("Categories" ,     new int(OTodo::Category)         );
     dict.insert("Uid" ,            new int(OTodo::Uid)              );
     dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     dict.insert("Completed" ,      new int(OTodo::Completed)        );
     dict.insert("Description" ,    new int(OTodo::Description)      );
     dict.insert("Summary" ,        new int(OTodo::Summary)          );
     dict.insert("Priority" ,       new int(OTodo::Priority)         );
     dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     dict.insert("Progress" ,       new int(OTodo::Progress)         );
     dict.insert("CompletedDate",   new int(OTodo::CompletedDate)    );
+    dict.insert("StartDate",       new int(OTodo::StartDate)        );
     dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
     dict.insert("State",           new int(OTodo::State)            );
     dict.insert("Alarms",          new int(OTodo::Alarms)           );
     dict.insert("Reminders",       new int(OTodo::Reminders)        );
     dict.insert("Notifiers",       new int(OTodo::Notifiers)        );
     dict.insert("Maintainer",      new int(OTodo::Maintainer)       );
     dict.insert("rtype", new int(FRType) );
     dict.insert("rweekdays", new int(FRWeekdays) );
     dict.insert("rposition", new int(FRPosition) );
     dict.insert("rfreq", new int(FRFreq) );
     dict.insert("start", new int(FRStart) );
     dict.insert("rhasenddate", new int(FRHasEndDate) );
@@ -405,24 +407,30 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
     case OTodo::DateDay:
         m_day = val.toInt();
         break;
     case OTodo::DateMonth:
         m_month = val.toInt();
         break;
     case OTodo::DateYear:
         m_year = val.toInt();
         break;
     case OTodo::Progress:
         ev.setProgress( val.toInt() );
         break;
+    case OTodo::CompletedDate:
+        ev.setCompletedDate( OConversion::dateFromString( val ) );
+        break;
+    case OTodo::StartDate:
+        ev.setStartDate( OConversion::dateFromString( val ) );
+        break;
     case OTodo::CrossReference:
     {
         /*
          * A cross refernce looks like
          * appname,id;appname,id
          * we need to split it up
          */
         QStringList  refs = QStringList::split(';', val );
         QStringList::Iterator strIt;
         for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) {
             int pos = (*strIt).find(',');
             if ( pos > -1 )
@@ -494,24 +502,29 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
      * for this case - cough  --zecke
      */
     /*
     QMap<QString, QString> extras = ev.extras();
     QMap<QString, QString>::Iterator extIt;
     for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
         str += extIt.key() + "=\"" +  extIt.data() + "\" ";
     */
     // cross refernce
     if ( ev.hasRecurrence() ) {
         str += ev.recurrence().toString();
     }
+    if ( ev.hasStartDate() )
+        str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" ";
+    if ( ev.hasCompletedDate() )
+        str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" ";
+
 
     return str;
 }
 QString OTodoAccessXML::toString( const QArray<int>& ints ) const {
     return Qtopia::Record::idsToString( ints );
 }
 
 /* internal class for sorting
  *
  * Inspired by todoxmlio.cpp from TT
  */