multiple categories

1 files changed, 13 insertions, 12 deletions

diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index 10ea2f0..7814c4f 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -12,30 +12,34 @@ class FileToDoResource : public ToDoResource {
 public:
   FileToDoResource() {};
   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() ) );
-        if(!(*it).category().isEmpty() ){
-          QArray<int> arrat(1);
-          arrat = Qtopia::Record::idsFromString(  (*it).category() );
-          map.insert( "Categories", QString::number( arrat[0] ) );
-        }else
-          map.insert( "Categories", QString::null );
+        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);
@@ -92,30 +96,27 @@ public:
           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 );
         // category
         dummy = element->attribute("Categories" );
-        dumInt = dummy.toInt(&ok );
-        if(ok ) {
-          QArray<int> arrat(1);
-          arrat[0] = dumInt;
-          event.setCategory( Qtopia::Record::idsToString( arrat ) );
-        }
+        QStringList ids = QStringList::split(";", dummy );
+        event.setCategories( ids );     
+   
         //uid
         dummy = element->attribute("Uid" );
         dumInt = dummy.toInt(&ok );
         if(ok ) event.setUid( dumInt );
         m_todos.append( event );
         element = element->nextChild(); // next element
       }
       //}
     }else {
       qWarning("could not load" );
     }
     delete root;