1 files changed, 61 insertions, 3 deletions

diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index ada596c..c3eeee2 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -33,42 +33,46 @@ int OCalendarHelper::dayOfWeek( char day ) {
         i <<= 1;
         ++dayOfWeek;
     }
     return dayOfWeek;
 }
 int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) {
     return ( second.year() - first.year() ) * 12 +
         second.month() - first.month();
 }
 
 struct OEvent::Data : public QShared {
     Data() : QShared() {
+        child = 0;
         recur = 0;
         manager = 0;
         isAllDay = false;
+        parent = 0;
     }
     ~Data() {
         delete manager;
         delete recur;
     }
     QString description;
     QString location;
     OPimNotifyManager* manager;
     ORecur* recur;
     QString note;
     QDateTime created;
     QDateTime start;
     QDateTime end;
     bool isAllDay : 1;
     QString timezone;
+    QArray<int>* child;
+    int parent;
 };
 
 OEvent::OEvent( int uid )
     : OPimRecord( uid ) {
     data = new Data;
 }
 OEvent::OEvent( const OEvent& ev)
     : OPimRecord( ev ), data( ev.data )
 {
     data->ref();
 }
 OEvent::~OEvent() {
@@ -93,35 +97,41 @@ QString OEvent::description()const {
 }
 void OEvent::setDescription( const QString& description ) {
     changeOrModify();
     data->description = description;
 }
 void OEvent::setLocation( const QString& loc ) {
     changeOrModify();
     data->location = loc;
 }
 QString OEvent::location()const {
     return data->location;
 }
-OPimNotifyManager &OEvent::notifiers() {
+OPimNotifyManager &OEvent::notifiers()const {
     // I hope we can skip the changeOrModify here
     // the notifier should take care of it
     // and OPimNotify is shared too
     if (!data->manager )
         data->manager = new OPimNotifyManager;
 
     return *data->manager;
 }
 bool OEvent::hasNotifiers()const {
-    return  ( data->manager);
+    if (!data->manager )
+        return false;
+    if (data->manager->reminders().isEmpty() &&
+        data->manager->alarms().isEmpty() )
+        return false;
+
+    return true;
 }
 ORecur OEvent::recurrence()const {
     if (!data->recur)
         data->recur = new ORecur;
 
     return *data->recur;
 }
 void OEvent::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
@@ -188,24 +198,25 @@ bool OEvent::isAllDay()const {
     return data->isAllDay;
 }
 void OEvent::setAllDay( bool allDay ) {
     changeOrModify();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
 void OEvent::setTimeZone( const QString& tz ) {
     changeOrModify();
     data->timezone = tz;
 }
 QString OEvent::timeZone()const {
+    if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
 bool OEvent::match( const QRegExp& )const {
     // FIXME
     return false;
 }
 QString OEvent::toRichText()const {
     // FIXME
     return "OEvent test";
 }
 QString OEvent::toShortText()const {
     return "OEvent shotText";
@@ -230,43 +241,90 @@ void OEvent::changeOrModify() {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
         d2->manager = data->manager;
         d2->recur = data->recur;
         d2->note = data->note;
         d2->created = data->created;
         d2->start = data->start;
         d2->end = data->end;
         d2->isAllDay = data->isAllDay;
         d2->timezone = data->timezone;
+        d2->parent = data->parent;
+        d2->child = data->child;
+
+        if (d2->child )
+            d2->child->detach();
 
         data = d2;
     }
 }
 void OEvent::deref() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 // FIXME
 QMap<int, QString> OEvent::toMap()const {
     return QMap<int, QString>();
 }
 QMap<QString, QString> OEvent::toExtraMap()const {
     return QMap<QString, QString>();
 }
+int OEvent::parent()const {
+    return data->parent;
+}
+void OEvent::setParent( int uid ) {
+    changeOrModify();
+    data->parent = uid;
+}
+QArray<int> OEvent::children() const{
+    if (!data->child) return QArray<int>();
+    else
+        return data->child->copy();
+}
+void OEvent::setChildren( const QArray<int>& arr ) {
+    changeOrModify();
+    if (data->child) delete data->child;
 
-
+    data->child = new QArray<int>( arr );
+    data->child->detach();
+}
+void OEvent::addChild( int uid ) {
+    changeOrModify();
+    if (!data->child ) {
+        data->child = new QArray<int>(1);
+        (*data->child)[0] = uid;
+    }else{
+        int count = data->child->count();
+        data->child->resize( count + 1 );
+        (*data->child)[count] = uid;
+    }
+}
+void OEvent::removeChild( int uid ) {
+    if (!data->child || !data->child->contains( uid ) ) return;
+    changeOrModify();
+    QArray<int> newAr( data->child->count() - 1 );
+    int j = 0;
+    uint count = data->child->count();
+    for ( uint i = 0; i < count; i++ ) {
+        if ( (*data->child)[i] != uid ) {
+            newAr[j] = (*data->child)[i];
+            j++;
+        }
+    }
+    (*data->child) = newAr;
+}
 struct OEffectiveEvent::Data : public QShared {
     Data() : QShared() {
     }
     OEvent event;
     QDate date;
     QTime start, end;
     QDate startDate, endDate;
     bool dates : 1;
 };
 
 OEffectiveEvent::OEffectiveEvent() {
     data = new Data;