1 files changed, 19 insertions, 1 deletions

diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 4d5cb79..6fcf9f6 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -9,16 +9,18 @@
 #include <qpe/palmtoprecord.h>
 #include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 
 #include "opimstate.h"
 #include "orecur.h"
+#include "opimmaintainer.h"
+
 #include "otodo.h"
 
 
 struct OTodo::OTodoData : public QShared {
     OTodoData() : QShared() {
     };
 
     QDate date;
@@ -28,16 +30,17 @@ struct OTodo::OTodoData : public QShared {
     QString desc;
     QString sum;
     QMap<QString, QString> extra;
     ushort prog;
     bool hasAlarmDateTime :1;
     QDateTime alarmDateTime;
     OPimState state;
     ORecur recur;
+    OPimMaintainer maintainer;
 };
 
 OTodo::OTodo(const OTodo &event )
     : OPimRecord( event ),  data( event.data )
 {
     data->ref();
 //    qWarning("ref up");
 }
@@ -148,16 +151,19 @@ QString OTodo::description()const
     return data->desc;
 }
 OPimState OTodo::state()const {
     return data->state;
 }
 ORecur OTodo::recurrence()const {
     return data->recur;
 }
+OPimMaintainer OTodo::maintainer()const {
+    return data->maintainer;
+}
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
@@ -197,16 +203,20 @@ void OTodo::setAlarmDateTime( const QDateTime& alarm )
 void OTodo::setState( const OPimState& state ) {
     changeOrModify();
     data->state = state;
 }
 void OTodo::setRecurrence( const ORecur& rec) {
     changeOrModify();
     data->recur = rec;
 }
+void OTodo::setMaintainer( const OPimMaintainer& pim ) {
+    changeOrModify();
+    data->maintainer = pim;
+}
 bool OTodo::isOverdue( )
 {
     if( data->hasDate && !data->isCompleted)
 	return QDate::currentDate() > data->date;
     return false;
 }
 void OTodo::setProgress(ushort progress )
 {
@@ -316,16 +326,18 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
     if ( data->hasDate != toDoEvent.data->hasDate ) return false;
     if ( data->date != toDoEvent.data->date ) return false;
     if ( data->sum != toDoEvent.data->sum ) return false;
     if ( data->desc != toDoEvent.data->desc ) return false;
     if ( data->hasAlarmDateTime != toDoEvent.data->hasAlarmDateTime )
         return false;
     if ( data->alarmDateTime != toDoEvent.data->alarmDateTime )
 	return false;
+    if ( data->maintainer    != toDoEvent.data->maintainer )
+        return false;
 
     return OPimRecord::operator==( toDoEvent );
 }
 void OTodo::deref() {
 
 //    qWarning("deref in ToDoEvent");
     if ( data->deref() ) {
 //        qWarning("deleting");
@@ -353,17 +365,17 @@ QMap<int, QString> OTodo::toMap() const {
     map.insert( Completed, QString::number( data->isCompleted ) );
     map.insert( Description, data->desc );
     map.insert( Summary, data->sum );
     map.insert( Priority, QString::number( data->priority ) );
     map.insert( DateDay,  QString::number( data->date.day() ) );
     map.insert( DateMonth, QString::number( data->date.month() ) );
     map.insert( DateYear, QString::number( data->date.year() ) );
     map.insert( Progress, QString::number( data->prog ) );
-    map.insert( CrossReference, crossToString() );
+//    map.insert( CrossReference, crossToString() );
     map.insert( HasAlarmDateTime,  QString::number( data->hasAlarmDateTime ) );
     map.insert( AlarmDateTime, data->alarmDateTime.toString() );
 
     return map;
 }
 
 QMap<QString, QString> OTodo::toExtraMap()const {
     return data->extra;
@@ -377,29 +389,35 @@ void OTodo::changeOrModify() {
     if ( data->count != 1 ) {
         qWarning("changeOrModify");
         data->deref();
         OTodoData* d2 = new OTodoData();
         copy(data, d2 );
         data = d2;
     }
 }
+// WATCHOUT
+/*
+ * if you add something to the Data struct
+ * be sure to copy it here
+ */
 void OTodo::copy( OTodoData* src, OTodoData* dest ) {
     dest->date = src->date;
     dest->isCompleted = src->isCompleted;
     dest->hasDate = src->hasDate;
     dest->priority = src->priority;
     dest->desc = src->desc;
     dest->sum = src->sum;
     dest->extra = src->extra;
     dest->prog = src->prog;
     dest->hasAlarmDateTime = src->hasAlarmDateTime;
     dest->alarmDateTime = src->alarmDateTime;
     dest->state = src->state;
     dest->recur = src->recur;
+    dest->maintainer = src->maintainer;
 }
 QString OTodo::type() const {
     return QString::fromLatin1("OTodo");
 }
 QString OTodo::recordField(int /*id*/ )const {
     return QString::null;
 }