1 files changed, 8 insertions, 0 deletions

diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index 6b10ec2..1e40c40 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -1,116 +1,124 @@
 
 #include <qdir.h>
 #include <opie/tododb.h>
 #include <opie/xmltree.h>
 #include <opie/todoresource.h>
 #include <qpe/palmtoprecord.h>
 #include <qpe/global.h>
 
 using namespace Opie;
 
 namespace {
 
 class FileToDoResource : public ToDoResource {
 public:
   FileToDoResource() {};
     // FIXME better parsing
   bool save(const QString &name, const QValueList<ToDoEvent> &m_todos ){
     // prepare the XML
     XMLElement *tasks = new XMLElement( );
     tasks->setTagName("Tasks" );
     for( QValueList<ToDoEvent>::ConstIterator it = m_todos.begin(); it != m_todos.end(); ++it ){
         XMLElement::AttributeMap map;
         XMLElement *task = new XMLElement();
         map.insert( "Completed", QString::number((int)(*it).isCompleted() ) );
         map.insert( "HasDate", QString::number((int)(*it).hasDate() ) );
         map.insert( "Priority", QString::number( (*it).priority() ) );
+        map.insert( "Progress", QString::number( (*it).progress() ) );
         map.insert( "Summary", (*it).summary() );
         QArray<int> arrat = (*it).categories();
         QString attr;
         for(uint i=0; i < arrat.count(); i++ ){
           attr.append(QString::number(arrat[i])+";" );
         }
         if(!attr.isEmpty() ) // remove the last ;
           attr.remove(attr.length()-1, 1 );
         map.insert( "Categories", attr );
         //else
         //map.insert( "Categories", QString::null );
         map.insert( "Description", (*it).description() );
         if( (*it).hasDate() ){
           map.insert("DateYear",  QString::number( (*it).date().year()  ) );
           map.insert("DateMonth", QString::number( (*it).date().month() ) );
           map.insert("DateDay", QString::number( (*it).date().day()  ) );
         }
         map.insert("Uid", QString::number( (*it).uid() ) );
         task->setTagName("Task" );
         task->setAttributes( map );
         tasks->appendChild(task);
     }
     QFile file( name);
     if( file.open(IO_WriteOnly ) ){
       QTextStream stream(&file );
       stream.setEncoding( QTextStream::UnicodeUTF8 );
       stream << "<!DOCTYPE Tasks>" << endl;
       tasks->save(stream );
       delete tasks;
       stream << "</Tasks>" << endl;
       file.close();
       return true;
     }
     return false;
   }
   QValueList<ToDoEvent> load( const QString &name ){
     qWarning("loading tododb" );
     QValueList<ToDoEvent> m_todos;
     XMLElement *root = XMLElement::load( name );
     if(root != 0l ){ // start parsing
       qWarning("ToDoDB::load tagName(): %s", root->tagName().latin1()  );
         //if( root->tagName() == QString::fromLatin1("Tasks" ) ){// Start
       XMLElement *element = root->firstChild();
       element = element->firstChild();
       while( element ){
         if( element->tagName() != QString::fromLatin1("Task") ){
           element = element->nextChild();
           continue;
         }
         qWarning("ToDoDB::load element tagName() : %s", element->tagName().latin1() );
         QString dummy;
         ToDoEvent event;
         bool ok;
         int dumInt;
         // completed
         dummy = element->attribute("Completed" );
         dumInt = dummy.toInt(&ok );
         if(ok ) event.setCompleted( dumInt == 0 ? false : true );
+        // progress
+        dummy = element->attribute("Progress" );
+        {
+            ushort dumShort = dummy.toUShort(&ok);
+            event.setProgress( dumShort );
+
+        }
         // hasDate
         dummy = element->attribute("HasDate" );
         dumInt = dummy.toInt(&ok );
         if(ok ) event.setHasDate( dumInt == 0 ? false: true );
         // set the date
         bool hasDa = dumInt;
         if ( hasDa ) { //parse the date
           int year, day, month = 0;
           year = day = month;
           // year
           dummy = element->attribute("DateYear" );
           dumInt = dummy.toInt(&ok );
           if( ok ) year = dumInt;
           // month
           dummy = element->attribute("DateMonth" );
           dumInt = dummy.toInt(&ok );
           if(ok ) month = dumInt;
           dummy = element->attribute("DateDay" );
           dumInt = dummy.toInt(&ok );
           if(ok ) day = dumInt;
           // set the date
           QDate date( year, month, day );
           event.setDate( date);
         }
         dummy = element->attribute("Priority" );
         dumInt = dummy.toInt(&ok );
         if(!ok ) dumInt = ToDoEvent::NORMAL;
         event.setPriority( dumInt );
         //description
         dummy = element->attribute("Description" );
         event.setDescription( dummy );
         dummy = element->attribute("Summary" );