Make OTodo compile

add the MaintainerMode to OTodo

5 files changed, 106 insertions, 1 deletions

diff --git a/libopie2/opiepim/core/opimmaintainer.cpp b/libopie2/opiepim/core/opimmaintainer.cpp
new file mode 100644
index 0000000..e34f035
--- a/dev/null
+++ b/libopie2/opiepim/core/opimmaintainer.cpp
@@ -0,0 +1,37 @@
+#include "opimmaintainer.h"
+
+OPimMaintainer::OPimMaintainer( enum Mode mode, int uid )
+    :  m_mode(mode), m_uid(uid )
+{}
+OPimMaintainer::~OPimMaintainer() {
+}
+OPimMaintainer::OPimMaintainer( const OPimMaintainer& main ) {
+    *this = main;
+}
+OPimMaintainer &OPimMaintainer::operator=( const OPimMaintainer& main ) {
+    m_mode = main.m_mode;
+    m_uid  = main.m_uid;
+
+    return *this;
+}
+bool OPimMaintainer::operator==( const OPimMaintainer& main ) {
+    if (m_mode != main.m_mode ) return false;
+    if (m_uid  != main.m_uid  ) return false;
+
+    return true;
+}
+bool OPimMaintainer::operator!=( const OPimMaintainer& main ) {
+    return !(*this == main );
+}
+OPimMaintainer::Mode OPimMaintainer::mode()const {
+    return m_mode;
+}
+int OPimMaintainer::uid()const {
+    return m_uid;
+}
+void OPimMaintainer::setMode( enum Mode mo) {
+    m_mode = mo;
+}
+void OPimMaintainer::setUid( int uid ) {
+    m_uid = uid;
+}
diff --git a/libopie2/opiepim/core/opimmaintainer.h b/libopie2/opiepim/core/opimmaintainer.h
new file mode 100644
index 0000000..310e15a
--- a/dev/null
+++ b/libopie2/opiepim/core/opimmaintainer.h
@@ -0,0 +1,36 @@
+#ifndef OPIE_PIM_MAINTAINER_H
+#define OPIE_PIM_MAINTAINER_H
+
+#include <qstring.h>
+
+/**
+ * Who maintains what?
+ */
+class OPimMaintainer {
+public:
+    enum Mode { Undefined = -1,
+                Responsible = 0,
+                DoneBy,
+                Coordinating };
+    OPimMaintainer( enum Mode mode = Undefined, int uid = 0);
+    OPimMaintainer( const OPimMaintainer& );
+    ~OPimMaintainer();
+
+    OPimMaintainer &operator=( const OPimMaintainer& );
+    bool operator==( const OPimMaintainer& );
+    bool operator!=( const OPimMaintainer& );
+
+
+    Mode mode()const;
+    int uid()const;
+
+    void setMode( enum Mode );
+    void setUid( int uid );
+
+private:
+    Mode m_mode;
+    int m_uid;
+
+};
+
+#endif
diff --git a/libopie2/opiepim/core/opimxrefmanager.cpp b/libopie2/opiepim/core/opimxrefmanager.cpp
index d49f5f5..965f542 100644
--- a/libopie2/opiepim/core/opimxrefmanager.cpp
+++ b/libopie2/opiepim/core/opimxrefmanager.cpp
@@ -3,12 +3,14 @@
 
 OPimXRefManager::OPimXRefManager() {
 }
 OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
     m_list = ref.m_list;
 }
+OPimXRefManager::~OPimXRefManager() {
+}
 OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
     m_list = ref.m_list;
     return *this;
 }
 bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
     //   if ( m_list == ref.m_list ) return true;
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 4d5cb79..6fcf9f6 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -11,12 +11,14 @@
 #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() {
     };
@@ -30,12 +32,13 @@ struct OTodo::OTodoData : public QShared {
     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();
@@ -150,12 +153,15 @@ QString OTodo::description()const
 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 )
@@ -199,12 +205,16 @@ void OTodo::setState( const OPimState& state ) {
     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;
 }
@@ -318,12 +328,14 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
     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");
@@ -355,13 +367,13 @@ QMap<int, QString> OTodo::toMap() const {
     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;
 }
 
@@ -379,12 +391,17 @@ void OTodo::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;
@@ -392,12 +409,13 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) {
     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;
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index 2cdc587..70b0253 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -15,12 +15,13 @@
 
 #include <opie/opimrecord.h>
 
 
 class OPimState;
 class ORecur;
+class OPimMaintainer;
 class OTodo : public  OPimRecord  {
 public:
     typedef QValueList<OTodo> ValueList;
     enum RecordFields {
         Uid = Qtopia::UID_ID,
         Category = Qtopia::CATEGORY_ID,
@@ -125,12 +126,17 @@ public:
     /**
      * the recurrance of this
      */
     ORecur recurrence()const;
 
     /**
+     * the Maintainer of this OTodo
+     */
+    OPimMaintainer maintainer()const;
+
+    /**
      * The description of the todo
      */
     QString description()const;
 
     /**
      * A small summary of the todo
@@ -199,12 +205,18 @@ public:
 
     /**
      * set the state of a Todo
      * @param state State what the todo should take
      */
     void setState( const OPimState& state);
+
+    /**
+     * set the Maintainer Mode
+     */
+    void setMaintainer( const OPimMaintainer& );
+
     bool isOverdue();
 
 
     bool match( const QRegExp &r )const;
 
     bool operator<(const OTodo &toDoEvent )const;