4 files changed, 46 insertions, 23 deletions

diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index 10ea2f0..7814c4f 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -18,18 +18,22 @@ public:
     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()  ) );
         }
@@ -98,18 +102,15 @@ public:
         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
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index 7dbf907..28b2e98 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -6,13 +6,13 @@
 
 ToDoEvent::ToDoEvent(const ToDoEvent &event )
 {
   *this = event;
 }
 
-ToDoEvent::ToDoEvent(bool completed, int priority, const QString &category, 
+ToDoEvent::ToDoEvent(bool completed, int priority, const QStringList &category, 
                const QString &description, bool hasDate, QDate date, int uid )
 {
     qWarning("todoEvent c'tor" );
     m_date = date;
     m_isCompleted = completed;
     m_hasDate = hasDate;
@@ -25,14 +25,14 @@ ToDoEvent::ToDoEvent(bool completed, int priority, const QString &category,
         delete uidgen;
     }// generate the ids
     m_uid = uid; 
 }
 QArray<int> ToDoEvent::categories()const
 {
-  QArray<int> array(1); // currently the datebook can be only in one category
-  array = Qtopia::Record::idsFromString( category() );
+  QArray<int> array(m_category.count() ); // currently the datebook can be only in one category
+    array = Qtopia::Record::idsFromString( m_category.join(";") );
   return array;
 }
 bool ToDoEvent::match( const QRegExp &regExp )const
 {
   if( QString::number( m_priority ).find( regExp ) != -1 ){
     return true;
@@ -52,20 +52,34 @@ bool ToDoEvent::hasDate() const
     return m_hasDate;
 }
 int ToDoEvent::priority()const
 {
     return m_priority;
 }
-QString ToDoEvent::category()const
+QStringList ToDoEvent::allCategories()const
 {
     return m_category;
 }
+void ToDoEvent::insertCategory(const QString &str )
+{
+  m_category.append( str );
+}
+void ToDoEvent::clearCategories()
+{
+  m_category.clear();
+}
+void ToDoEvent::setCategories(const QStringList &list )
+{
+  m_category = list;
+  qWarning("todoevent: %s", list.join(";" ).latin1() );
+}
 QDate ToDoEvent::date()const
 {
     return m_date;
 }
+
 QString ToDoEvent::description()const
 {
     return m_desc;
 }
 void ToDoEvent::setCompleted( bool completed )
 {
@@ -79,13 +93,14 @@ void ToDoEvent::setDescription(const QString &desc )
 {
     m_desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void ToDoEvent::setCategory( const QString &cat )
 {
   qWarning("setCategory %s", cat.latin1() );
-  m_category = cat;
+  m_category.clear();
+  m_category << cat;
 }
 void ToDoEvent::setPriority(int prio )
 {
     m_priority = prio;
 }
 void ToDoEvent::setDate( QDate date )
@@ -148,13 +163,13 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
         }
     }
     return true;
 }
 bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
 {
-    if( m_date == toDoEvent.m_date && m_isCompleted == toDoEvent.m_isCompleted && m_hasDate == toDoEvent.m_hasDate && m_priority == toDoEvent.m_priority && m_category == toDoEvent.m_category && m_desc == toDoEvent.m_category )
+    if( m_date == toDoEvent.m_date && m_isCompleted == toDoEvent.m_isCompleted && m_hasDate == toDoEvent.m_hasDate && m_priority == toDoEvent.m_priority && m_category == toDoEvent.m_category && m_desc == toDoEvent.m_desc )
         return true;
     return false;
 }
 ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
 {
     m_date = item.m_date;
diff --git a/libopie/todoevent.h b/libopie/todoevent.h
index ac996a1..0d477fd 100644
--- a/libopie/todoevent.h
+++ b/libopie/todoevent.h
@@ -1,34 +1,41 @@
 
 #ifndef todoevent_h
 #define todoevent_h
 
+#include <qstringlist.h>
 #include <qdatetime.h>
 
 class ToDoEvent {
     friend class ToDoDB;
  public:
     enum Priority { VERYHIGH=1, HIGH, NORMAL, LOW, VERYLOW };
     ToDoEvent( bool completed = false, int priority = NORMAL, 
-               const QString &category = QString::null, 
+               const QStringList &category = QStringList(), 
                const QString &description = QString::null , 
                bool hasDate = false, QDate date = QDate::currentDate(), int uid = -1 );
     ToDoEvent(const ToDoEvent & );
     bool isCompleted() const;
     bool hasDate() const;
     int priority()const ;
-    QString category()const;
+    QStringList allCategories()const;
     QArray<int> categories() const;
     QDate date()const;
     QString description()const;
 
     int uid()const { return m_uid;};
     void setCompleted(bool completed );
     void setHasDate( bool hasDate );
-    // if the category doesn't exist we will create it 
+    // if the category doesn't exist we will create it
+    // this sets the the Category after this call category will be the only category 
     void setCategory( const QString &category );
+    // adds a category to the Categories of this event
+    void insertCategory(const QString &category );
+    void clearCategories();
+    void setCategories(const QStringList& );
+
     void setPriority(int priority );
     void setDate( QDate date );
     void setDescription(const QString& );
     bool isOverdue();
 
     bool match( const QRegExp &r )const;
@@ -45,13 +52,13 @@ class ToDoEvent {
     class ToDoEventPrivate;
     ToDoEventPrivate *d;
     QDate m_date;
     bool m_isCompleted:1;
     bool m_hasDate:1;
     int m_priority;
-    QString m_category;
+    QStringList m_category;
     QString m_desc;
     int m_uid;
 };
 
 
 #endif
diff --git a/libopie/todovcalresource.cpp b/libopie/todovcalresource.cpp
index a6afe68..75f2197 100644
--- a/libopie/todovcalresource.cpp
+++ b/libopie/todovcalresource.cpp
@@ -45,13 +45,13 @@ static VObject *vobjByEvent( const ToDoEvent &event )
 
   if( event.isCompleted() )
     addPropValue( task, VCStatusProp, "COMPLETED");
 
   QString string = QString::number(event.priority() );
   addPropValue( task, VCPriorityProp, string.local8Bit() );
-  addPropValue( task, VCCategoriesProp, event.category().local8Bit() );
+  addPropValue( task, VCCategoriesProp, event.allCategories().join(";").local8Bit() );
   addPropValue( task, VCDescriptionProp, event.description().local8Bit() );
   addPropValue( task, VCSummaryProp, event.description().left(15).local8Bit() );
   return task;
 };
 
 static ToDoEvent eventByVObj( VObject *obj ){