18 files changed, 388 insertions, 44 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index acd65c4..cd238ef 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -1114,40 +1114,40 @@ static VObject *createVObject( const OContact &c )
     VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
     safeAddProp( title, VCWorkProp );
 
 
     QStringList emails = c.emailList();
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
 	VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
 	safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
     if ( c.birthday().isValid() ){
 	    QString birthd_rfc2425 = QString("%1-%2-%3")
-		    .arg( c.birthday().year() ) 
+		    .arg( c.birthday().year() )
 		    .arg( c.birthday().month(), 2 )
 		    .arg( c.birthday().day(), 2 );
 	    // Now replace spaces with "0"...
 	    int pos = 0;
 	    while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
 		    birthd_rfc2425.replace( pos, 1, "0" );
-		    
+
 	    qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
 	    safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
     }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
 	VObject *org = safeAddProp( vcard, VCOrgProp );
 	safeAddPropValue( org, VCOrgNameProp, c.company() );
 	safeAddPropValue( org, VCOrgUnitProp, c.department() );
 	safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
     // some values we have to export as custom fields
     safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
     safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
     safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
 
@@ -1375,37 +1375,37 @@ static OContact parseVObject( VObject *obj )
 	    c.setAssistant( value );
 	}
 	else if ( name == "X-Qtopia-Spouse" ) {
 	    c.setSpouse( value );
 	}
 	else if ( name == "X-Qtopia-Gender" ) {
 	    c.setGender( value );
 	}
 	else if ( name == "X-Qtopia-Anniversary" ) {
 	    c.setAnniversary( TimeConversion::fromString( value ) );
 	}
 	else if ( name == "X-Qtopia-Nickname" ) {
 	    c.setNickname( value );
 	}
 	else if ( name == "X-Qtopia-Children" ) {
 	    c.setChildren( value );
-	}	
+	}
 	else if ( name == VCBirthDateProp ) {
 		// Reading Birthdate regarding RFC 2425 (5.8.4)
 		c.setBirthday( convVCardDateToDate( value ) );
-		
+
 	}
 
 #if 0
 	else {
 	    printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
 		QCString name = vObjectName( o );
 		QString value = vObjectStringZValue( o );
 		printf(" subprop: %s = %s\n", name.data(), value.latin1() );
 	    }
 	}
 #endif
     }
@@ -1451,33 +1451,42 @@ void OContact::writeVCard( const QString &filename, const OContact &contact)
 	cleanStrTbl();
 }
 
 /*!
   Returns the set of contacts read as VCards from the file \a filename.
 */
 QValueList<OContact> OContact::readVCard( const QString &filename )
 {
     qDebug("trying to open %s, exists=%d", filename.utf8().data(), QFileInfo( filename.utf8().data() ).size() );
     VObject *obj = Parse_MIME_FromFileName( (char *)filename.utf8().data() );
 
     qDebug("vobject = %p", obj );
 
     QValueList<OContact> contacts;
 
     while ( obj ) {
-	contacts.append( parseVObject( obj ) );
+        OContact con = parseVObject( obj );
+        /*
+         * if uid is 0 assign a new one
+         * this at least happens on
+         * Nokia6210
+         */
+        if ( con.uid() == 0 )
+            con.setUid( 1 );
+
+	contacts.append(con  );
 
 	VObject *t = obj;
 	obj = nextVObjectInList(obj);
 	cleanVObject( t );
     }
 
     return contacts;
 }
 
 /*!
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QString &regexp ) const
 {
     return match(QRegExp(regexp));
@@ -1514,79 +1523,79 @@ QString OContact::type() const
 
 // Definition is missing ! (se)
 QMap<QString,QString> OContact::toExtraMap() const
 {
 	qWarning ("Function not implemented: OContact::toExtraMap()");
 	QMap <QString,QString> useless;
 	return useless;
 }
 
 class QString OContact::recordField( int pos ) const
 {
 	QStringList SLFIELDS = fields(); // ?? why this ? (se)
 	return SLFIELDS[pos];
 }
 
 // In future releases, we should store birthday and anniversary
-// internally as QDate instead of QString ! 
+// internally as QDate instead of QString !
 // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se)
 
 /*! \fn void OContact::setBirthday( const QDate& date )
   Sets the birthday for the contact to \a date.
 */
 void OContact::setBirthday( const QDate &v )
-{ 
+{
 	if ( ( !v.isNull() ) && ( v.isValid() ) )
 		replace( Qtopia::Birthday, TimeConversion::toString( v ) );
-	
+
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date.
 */
 void OContact::setAnniversary( const QDate &v )
 {
 	if ( ( !v.isNull() ) && ( v.isValid() ) )
 		replace( Qtopia::Anniversary, TimeConversion::toString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
-QDate OContact::birthday() const 
-{ 
+QDate OContact::birthday() const
+{
 	QString str = find( Qtopia::Birthday );
 	qWarning ("Birthday %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return  TimeConversion::fromString ( str );
 	else
 		return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
-QDate OContact::anniversary() const 
-{ 
+QDate OContact::anniversary() const
+{
 	QDate empty;
 	QString str = find( Qtopia::Anniversary );
 	qWarning ("Anniversary %s", str.latin1() );
 	if ( !str.isEmpty() )
-		return TimeConversion::fromString ( str ); 
+		return TimeConversion::fromString ( str );
 	else
 		return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
 
     // if no default, set it as the default email and don't insert
     if ( def.isEmpty() ) {
 	setDefaultEmail( e ); // will insert into the list for us
 	return;
     }
@@ -1594,60 +1603,60 @@ void OContact::insertEmail( const QString &v )
     // otherwise, insert assuming doesn't already exist
     QString emailsStr = find( Qtopia::Emails );
     if ( emailsStr.contains( e ))
 	return;
     if ( !emailsStr.isEmpty() )
 	emailsStr += emailSeparator();
     emailsStr += e;
     replace( Qtopia::Emails, emailsStr );
 }
 
 void OContact::removeEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
     QString emailsStr = find( Qtopia::Emails );
     QStringList emails = emailList();
-	
+
     // otherwise, must first contain it
     if ( !emailsStr.contains( e ) )
 	return;
 
     // remove it
     //qDebug(" removing email from list %s", e.latin1());
     emails.remove( e );
     // reset the string
     emailsStr = emails.join(emailSeparator()); // Sharp's brain dead separator
     replace( Qtopia::Emails, emailsStr );
 
     // if default, then replace the default email with the first one
     if ( def == e ) {
 	//qDebug("removeEmail is default; setting new default");
 	if ( !emails.count() )
 	    clearEmails();
 	else // setDefaultEmail will remove e from the list
 	    setDefaultEmail( emails.first() );
     }
 }
 void OContact::clearEmails()
 {
     mMap.remove( Qtopia::DefaultEmail );
     mMap.remove( Qtopia::Emails );
 }
 void OContact::setDefaultEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
 
     //qDebug("OContact::setDefaultEmail %s", e.latin1());
     replace( Qtopia::DefaultEmail, e );
 
-    if ( !e.isEmpty() )	
+    if ( !e.isEmpty() )
 	insertEmail( e );
-	
+
 }
 
 void OContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
 	insertEmail( *it );
 }
 
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h
index dbb94ed..d9ccad4 100644
--- a/libopie/pim/opimrecord.h
+++ b/libopie/pim/opimrecord.h
@@ -1,28 +1,28 @@
 #ifndef OPIE_PIM_RECORD_H
 #define OPIE_PIM_RECORD_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 #include <qpe/palmtoprecord.h>
 
 
 /**
- * This is the base class for 
+ * This is the base class for
  * all PIM Records
  *
  */
 class OPimRecord : public Qtopia::Record {
 public:
     /**
      * c'tor
      * uid of 0 isEmpty
      * uid of 1 will be assigned a new one
      */
     OPimRecord(int uid = 0);
     ~OPimRecord();
 
     /**
      * copy c'tor
      */
@@ -97,33 +97,33 @@ public:
 
     /**
      * clear the relations for all relations
      * with app
      */
     void clearRelation( const QString& app );
 
     /**
      * add a relation
      */
     void addRelation( const QString& app,  int id );
 
     /**
      * set the relations for an app
      */
     void setRelations( const QString&, QArray<int> ids );
-    
+
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
 protected:
     Qtopia::UidGen &uidGen();
     QString crossToString()const;
 
 private:
     class OPimRecordPrivate;
     OPimRecordPrivate *d;
     QMap<QString, QArray<int> > m_relations;
     static Qtopia::UidGen m_uidGen;
 
 };
diff --git a/libopie/pim/opimstate.cpp b/libopie/pim/opimstate.cpp
new file mode 100644
index 0000000..6fb2feb
--- a/dev/null
+++ b/libopie/pim/opimstate.cpp
@@ -0,0 +1,64 @@
+#include <qshared.h>
+
+#include "opimstate.h"
+
+/*
+ * for one int this does not make
+ * much sense but never the less
+ * we will do it for the future
+ */
+struct OPimState::Data : public QShared {
+    Data() : QShared(),state(Undefined) {
+    }
+    int state;
+};
+
+OPimState::OPimState( int state ) {
+    data = new Data;
+    data->state = state;
+}
+OPimState::OPimState( const OPimState& st) :
+    data( st.data ) {
+    /* ref up */
+    data->ref();
+}
+OPimState::~OPimState() {
+    if ( data->deref() ) {
+        delete data ;
+        data = 0;
+    }
+}
+bool OPimState::operator==( const OPimState& st) {
+    if ( data->state == st.data->state ) return true;
+
+    return false;
+}
+OPimState &OPimState::operator=( const OPimState& st) {
+    st.data->ref();
+    deref();
+    data = st.data;
+
+    return *this;
+}
+void OPimState::setState( int st) {
+    copyInternally();
+    data->state = st;
+}
+int OPimState::state()const {
+    return data->state;
+}
+void OPimState::deref() {
+    if ( data->deref() ) {
+        delete data;
+        data = 0l;
+    }
+}
+void OPimState::copyInternally() {
+    /* we need to change it */
+    if ( data->count != 1 ) {
+        data->deref();
+        Data* d2 = new Data;
+        d2->state = data->state;
+        data = d2;
+    }
+}
diff --git a/libopie/pim/opimstate.h b/libopie/pim/opimstate.h
new file mode 100644
index 0000000..731181e
--- a/dev/null
+++ b/libopie/pim/opimstate.h
@@ -0,0 +1,44 @@
+#ifndef OPIE_PIM_STATE_H
+#define OPIE_PIM_STATE_H
+
+#include <qstring.h>
+
+/**
+ * The State of a Task
+ * This class encapsules the state of a todo
+ * and it's shared too
+ */
+/*
+ * in c a simple struct would be enough ;)
+ * g_new_state();
+ * g_do_some_thing( state_t*  );
+ * ;)
+ */
+class OPimState {
+public:
+    enum State {
+        Started = 0,
+        Postponed,
+        Finished,
+        NotStarted,
+        Undefined
+    };
+    OPimState( int state = Undefined );
+    OPimState( const OPimState& );
+    ~OPimState();
+
+    bool operator==( const OPimState& );
+    OPimState &operator=( const OPimState& );
+    void setState( int state);
+    int state()const;
+private:
+    void deref();
+    inline void copyInternally();
+    struct Data;
+    Data* data;
+    class Private;
+    Private *d;
+};
+
+
+#endif
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 2f4a5d3..8ed41e2 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -221,33 +221,33 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
       m_direction( false )
 {
 }
 template <class T>
 uint ORecordListIterator<T>::current()const {
     return m_current;
 }
 template <class T>
 void ORecordListIterator<T>::setCurrent( uint cur ) {
     if( cur < m_uids.count() ) {
 	m_end = false;
 	m_current= cur;
     }
 }
 template <class T>
 uint ORecordListIterator<T>::count()const {
- return m_uids.count();
+    return m_uids.count();
 }
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                              const Base* acc )
     : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::begin() {
     Iterator it( m_ids, m_acc );
     return it;
 }
diff --git a/libopie/pim/orecur.cpp b/libopie/pim/orecur.cpp
index 6c81f8f..257d4fd 100644
--- a/libopie/pim/orecur.cpp
+++ b/libopie/pim/orecur.cpp
@@ -8,32 +8,33 @@ struct ORecur::Data : public QShared {
     Data() : QShared() {
         type = ORecur::NoRepeat;
         freq = -1;
         days = 0;
         pos = 0;
         create = -1;
         hasEnd = FALSE;
         end = 0;
     }
     char days; // Q_UINT8 for 8 seven days;)
     ORecur::RepeatType type;
     int freq;
     int pos;
     bool hasEnd : 1;
     time_t end;
     time_t create;
+    int rep;
 };
 
 
 ORecur::ORecur() {
     data = new Data;
 }
 ORecur::ORecur( const ORecur& rec)
     : data( rec.data )
 {
     data->ref();
 }
 ORecur::~ORecur() {
     if ( data->deref() ) {
         delete data;
         data = 0l;
     }
@@ -65,63 +66,71 @@ int ORecur::position()const {
 }
 char ORecur::days() const{
     return data->days;
 }
 bool ORecur::hasEndDate()const {
     return data->hasEnd;
 }
 QDate ORecur::endDate()const {
     return TimeConversion::fromUTC( data->end ).date();
 }
 time_t ORecur::endDateUTC()const {
     return data->end;
 }
 time_t ORecur::createTime()const {
     return data->create;
 }
+int ORecur::repetition()const {
+    return data->rep;
+}
 void ORecur::setType( const RepeatType& z) {
     checkOrModify();
     data->type = z;
 }
 void ORecur::setFrequency( int freq ) {
     checkOrModify();
     data->freq = freq;
 }
 void ORecur::setPosition( int pos ) {
     checkOrModify();
     data->pos = pos;
 }
 void ORecur::setDays( char c ) {
     checkOrModify();
     data->days = c;
 }
 void ORecur::setEndDate( const QDate& dt) {
     checkOrModify();
     data->end = TimeConversion::toUTC( dt );
 }
 void ORecur::setEndDateUTC( time_t t) {
     checkOrModify();
     data->end = t;
 }
 void ORecur::setCreateTime( time_t t) {
     checkOrModify();
     data->create = t;
 }
 void ORecur::setHasEndDate( bool b) {
     checkOrModify();
     data->hasEnd = b;
 }
+void ORecur::setRepitition( int rep ) {
+    checkOrModify();
+    data->rep = rep;
+}
 void ORecur::checkOrModify() {
     if ( data->count !=  1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->days = data->days;
         d2->type = data->type;
         d2->freq = data->freq;
         d2->pos  = data->pos;
         d2->hasEnd = data->hasEnd;
         d2->end  = data->end;
         d2->create = data->create;
+        d2->rep = data->rep;
         data = d2;
     }
 }
 
diff --git a/libopie/pim/orecur.h b/libopie/pim/orecur.h
index 89258f8..d24d72d 100644
--- a/libopie/pim/orecur.h
+++ b/libopie/pim/orecur.h
@@ -18,37 +18,39 @@ public:
     enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
                 FRI = 0x10, SAT = 0x20, SUN = 0x40 };
     ORecur();
     ORecur( const ORecur& );
     ~ORecur();
 
     ORecur &operator=( const ORecur& );
     bool operator==(const ORecur& )const;
     RepeatType type()const;
     int frequency()const;
     int position()const;
     char days()const;
     bool hasEndDate()const;
     QDate endDate()const;
     time_t endDateUTC()const;
     time_t createTime()const;
+    int repetition()const;
 
     void setType( const RepeatType& );
     void setFrequency( int freq );
     void setPosition( int pos );
     void setDays( char c);
     void setEndDate( const QDate& dt );
     void setEndDateUTC( time_t );
     void setCreateTime( time_t );
     void setHasEndDate( bool b );
+    void setRepitition(int );
 private:
     void deref();
     inline void checkOrModify();
 
 
     class Data;
     Data* data;
     class ORecurPrivate;
     ORecurPrivate *d;
 };
 
 #endif
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 765d5a9..0d5b1d3 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -1,48 +1,51 @@
 
 #include <qobject.h>
 #include <qshared.h>
 
 
 
 #include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
 #include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 
-
+#include "opimstate.h"
+#include "orecur.h"
 #include "otodo.h"
 
 
 struct OTodo::OTodoData : public QShared {
     OTodoData() : QShared() {
     };
 
     QDate date;
     bool isCompleted:1;
     bool hasDate:1;
     int priority;
     QString desc;
     QString sum;
     QMap<QString, QString> extra;
     ushort prog;
     bool hasAlarmDateTime :1;
     QDateTime alarmDateTime;
+    OPimState state;
+    ORecur recur;
 };
 
 OTodo::OTodo(const OTodo &event )
     : OPimRecord( event ),  data( event.data )
 {
     data->ref();
 //    qWarning("ref up");
 }
 OTodo::~OTodo() {
 
 //    qWarning("~OTodo "  );
     if ( data->deref() ) {
 //        qWarning("OTodo::dereffing");
         delete data;
         data = 0l;
     }
@@ -131,32 +134,38 @@ ushort OTodo::progress() const
     return data->prog;
 }
 QDate OTodo::dueDate()const
 {
     return data->date;
 }
 
 QDateTime OTodo::alarmDateTime() const
 {
     return data->alarmDateTime;
 }
 
 QString OTodo::description()const
 {
     return data->desc;
 }
+OPimState OTodo::state()const {
+    return data->state;
+}
+ORecur OTodo::recurrence()const {
+    return data->recur;
+}
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
 {
     changeOrModify();
     data->hasAlarmDateTime = hasAlarmDateTime;
 }
 void OTodo::setDescription(const QString &desc )
@@ -172,32 +181,40 @@ void OTodo::setSummary( const QString& sum )
 }
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 void OTodo::setDueDate( QDate date )
 {
     changeOrModify();
     data->date = date;
 }
 void OTodo::setAlarmDateTime( const QDateTime& alarm )
 {
     changeOrModify();
     data->alarmDateTime = alarm;
 }
+void OTodo::setState( const OPimState& state ) {
+    changeOrModify();
+    data->state = state;
+}
+void OTodo::setRecurrence( const ORecur& rec) {
+    changeOrModify();
+    data->recur = rec;
+}
 bool OTodo::isOverdue( )
 {
     if( data->hasDate && !data->isCompleted)
 	return QDate::currentDate() > data->date;
     return false;
 }
 void OTodo::setProgress(ushort progress )
 {
     changeOrModify();
     data->prog = progress;
 }
 QString OTodo::toShortText() const {
  return summary();
 }
 /*!
   Returns a richt text string
@@ -345,42 +362,44 @@ QMap<int, QString> OTodo::toMap() const {
     map.insert( HasAlarmDateTime,  QString::number( data->hasAlarmDateTime ) );
     map.insert( AlarmDateTime, data->alarmDateTime.toString() );
 
     return map;
 }
 
 QMap<QString, QString> OTodo::toExtraMap()const {
     return data->extra;
 }
 /**
  *  change or modify looks at the ref count and either
  *  creates a new QShared Object or it can modify it
  * right in place
  */
 void OTodo::changeOrModify() {
     if ( data->count != 1 ) {
-//        qWarning("changeOrModify");
+        qWarning("changeOrModify");
         data->deref();
         OTodoData* d2 = new OTodoData();
         copy(data, d2 );
         data = d2;
     }
 }
 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;
 }
 QString OTodo::type() const {
     return QString::fromLatin1("OTodo");
 }
 QString OTodo::recordField(int id )const {
     return QString::null;
 }
 
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h
index 5bd91d6..2cdc587 100644
--- a/libopie/pim/otodo.h
+++ b/libopie/pim/otodo.h
@@ -3,50 +3,57 @@
 #define OPIE_TODO_EVENT_H
 
 
 #include <qarray.h>
 #include <qmap.h>
 #include <qregexp.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qvaluelist.h>
 
 #include <qpe/recordfields.h>
 #include <qpe/palmtopuidgen.h>
 
 #include <opie/opimrecord.h>
 
 
+class OPimState;
+class ORecur;
 class OTodo : public  OPimRecord  {
 public:
     typedef QValueList<OTodo> ValueList;
     enum RecordFields {
         Uid = Qtopia::UID_ID,
         Category = Qtopia::CATEGORY_ID,
         HasDate,
         Completed,
         Description,
         Summary,
         Priority,
         DateDay,
         DateMonth,
         DateYear,
         Progress,
         CrossReference,
         HasAlarmDateTime,
-        AlarmDateTime
+        AlarmDateTime,
+        State,
+        Recurrance,
+        Alarms,
+        Reminders,
+        Notifiers
     };
  public:
     // priorities from Very low to very high
     enum TaskPriority { VeryHigh=1,  High,  Normal,  Low, VeryLow };
 
     /* Constructs a new ToDoEvent
        @param completed Is the TodoEvent completed
        @param priority What is the priority of this ToDoEvent
        @param category Which category does it belong( uid )
        @param summary A small summary of the todo
        @param description What is this ToDoEvent about
        @param hasDate Does this Event got a deadline
        @param date what is the deadline?
        @param uid what is the UUID of this Event
     **/
     OTodo( bool completed = false, int priority = Normal,
@@ -98,32 +105,42 @@ public:
     /**
      * progress as ushort 0, 20, 40, 60, 80 or 100%
      */
     ushort progress() const;
 
     /**
      * The due Date
      */
     QDate dueDate()const;
 
     /**
      * Alarm Date and Time
      */
     QDateTime alarmDateTime()const;
 
     /**
+     * What is the state of this OTodo?
+     */
+    OPimState state()const;
+
+    /**
+     * the recurrance of this
+     */
+    ORecur recurrence()const;
+
+    /**
      * The description of the todo
      */
     QString description()const;
 
     /**
      * A small summary of the todo
      */
     QString summary() const;
 
     /**
      * @reimplemented
      * Return this todoevent in a RichText formatted QString
      */
     QString toRichText() const;
 
     /**
@@ -157,39 +174,47 @@ public:
 
     /**
      * Set the priority of the Todo
      */
     void setPriority(int priority );
 
     /**
      * Set the progress.
      */
     void setProgress( ushort progress );
 
     /**
      * set the end date
      */
     void setDueDate( QDate date );
 
+
+    void setRecurrence( const ORecur& );
     /**
      * set the alarm time
      */
     void setAlarmDateTime ( const QDateTime& alarm );
 
     void setDescription(const QString& );
     void setSummary(const QString& );
+
+    /**
+     * set the state of a Todo
+     * @param state State what the todo should take
+     */
+    void setState( const OPimState& state);
     bool isOverdue();
 
 
     bool match( const QRegExp &r )const;
 
     bool operator<(const OTodo &toDoEvent )const;
     bool operator<=(const OTodo &toDoEvent )const;
     bool operator!=(const OTodo &toDoEvent )const;
     bool operator>(const OTodo &toDoEvent )const;
     bool operator>=(const OTodo &toDoEvent)const;
     bool operator==(const OTodo &toDoEvent )const;
     OTodo &operator=(const OTodo &toDoEvent );
 
  private:
     class OTodoPrivate;
     struct OTodoData;
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index dbb94ed..d9ccad4 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -1,28 +1,28 @@
 #ifndef OPIE_PIM_RECORD_H
 #define OPIE_PIM_RECORD_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 #include <qpe/palmtoprecord.h>
 
 
 /**
- * This is the base class for 
+ * This is the base class for
  * all PIM Records
  *
  */
 class OPimRecord : public Qtopia::Record {
 public:
     /**
      * c'tor
      * uid of 0 isEmpty
      * uid of 1 will be assigned a new one
      */
     OPimRecord(int uid = 0);
     ~OPimRecord();
 
     /**
      * copy c'tor
      */
@@ -97,33 +97,33 @@ public:
 
     /**
      * clear the relations for all relations
      * with app
      */
     void clearRelation( const QString& app );
 
     /**
      * add a relation
      */
     void addRelation( const QString& app,  int id );
 
     /**
      * set the relations for an app
      */
     void setRelations( const QString&, QArray<int> ids );
-    
+
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
 protected:
     Qtopia::UidGen &uidGen();
     QString crossToString()const;
 
 private:
     class OPimRecordPrivate;
     OPimRecordPrivate *d;
     QMap<QString, QArray<int> > m_relations;
     static Qtopia::UidGen m_uidGen;
 
 };
diff --git a/libopie2/opiepim/core/opimstate.cpp b/libopie2/opiepim/core/opimstate.cpp
new file mode 100644
index 0000000..6fb2feb
--- a/dev/null
+++ b/libopie2/opiepim/core/opimstate.cpp
@@ -0,0 +1,64 @@
+#include <qshared.h>
+
+#include "opimstate.h"
+
+/*
+ * for one int this does not make
+ * much sense but never the less
+ * we will do it for the future
+ */
+struct OPimState::Data : public QShared {
+    Data() : QShared(),state(Undefined) {
+    }
+    int state;
+};
+
+OPimState::OPimState( int state ) {
+    data = new Data;
+    data->state = state;
+}
+OPimState::OPimState( const OPimState& st) :
+    data( st.data ) {
+    /* ref up */
+    data->ref();
+}
+OPimState::~OPimState() {
+    if ( data->deref() ) {
+        delete data ;
+        data = 0;
+    }
+}
+bool OPimState::operator==( const OPimState& st) {
+    if ( data->state == st.data->state ) return true;
+
+    return false;
+}
+OPimState &OPimState::operator=( const OPimState& st) {
+    st.data->ref();
+    deref();
+    data = st.data;
+
+    return *this;
+}
+void OPimState::setState( int st) {
+    copyInternally();
+    data->state = st;
+}
+int OPimState::state()const {
+    return data->state;
+}
+void OPimState::deref() {
+    if ( data->deref() ) {
+        delete data;
+        data = 0l;
+    }
+}
+void OPimState::copyInternally() {
+    /* we need to change it */
+    if ( data->count != 1 ) {
+        data->deref();
+        Data* d2 = new Data;
+        d2->state = data->state;
+        data = d2;
+    }
+}
diff --git a/libopie2/opiepim/core/opimstate.h b/libopie2/opiepim/core/opimstate.h
new file mode 100644
index 0000000..731181e
--- a/dev/null
+++ b/libopie2/opiepim/core/opimstate.h
@@ -0,0 +1,44 @@
+#ifndef OPIE_PIM_STATE_H
+#define OPIE_PIM_STATE_H
+
+#include <qstring.h>
+
+/**
+ * The State of a Task
+ * This class encapsules the state of a todo
+ * and it's shared too
+ */
+/*
+ * in c a simple struct would be enough ;)
+ * g_new_state();
+ * g_do_some_thing( state_t*  );
+ * ;)
+ */
+class OPimState {
+public:
+    enum State {
+        Started = 0,
+        Postponed,
+        Finished,
+        NotStarted,
+        Undefined
+    };
+    OPimState( int state = Undefined );
+    OPimState( const OPimState& );
+    ~OPimState();
+
+    bool operator==( const OPimState& );
+    OPimState &operator=( const OPimState& );
+    void setState( int state);
+    int state()const;
+private:
+    void deref();
+    inline void copyInternally();
+    struct Data;
+    Data* data;
+    class Private;
+    Private *d;
+};
+
+
+#endif
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp
index 6c81f8f..257d4fd 100644
--- a/libopie2/opiepim/core/orecur.cpp
+++ b/libopie2/opiepim/core/orecur.cpp
@@ -8,32 +8,33 @@ struct ORecur::Data : public QShared {
     Data() : QShared() {
         type = ORecur::NoRepeat;
         freq = -1;
         days = 0;
         pos = 0;
         create = -1;
         hasEnd = FALSE;
         end = 0;
     }
     char days; // Q_UINT8 for 8 seven days;)
     ORecur::RepeatType type;
     int freq;
     int pos;
     bool hasEnd : 1;
     time_t end;
     time_t create;
+    int rep;
 };
 
 
 ORecur::ORecur() {
     data = new Data;
 }
 ORecur::ORecur( const ORecur& rec)
     : data( rec.data )
 {
     data->ref();
 }
 ORecur::~ORecur() {
     if ( data->deref() ) {
         delete data;
         data = 0l;
     }
@@ -65,63 +66,71 @@ int ORecur::position()const {
 }
 char ORecur::days() const{
     return data->days;
 }
 bool ORecur::hasEndDate()const {
     return data->hasEnd;
 }
 QDate ORecur::endDate()const {
     return TimeConversion::fromUTC( data->end ).date();
 }
 time_t ORecur::endDateUTC()const {
     return data->end;
 }
 time_t ORecur::createTime()const {
     return data->create;
 }
+int ORecur::repetition()const {
+    return data->rep;
+}
 void ORecur::setType( const RepeatType& z) {
     checkOrModify();
     data->type = z;
 }
 void ORecur::setFrequency( int freq ) {
     checkOrModify();
     data->freq = freq;
 }
 void ORecur::setPosition( int pos ) {
     checkOrModify();
     data->pos = pos;
 }
 void ORecur::setDays( char c ) {
     checkOrModify();
     data->days = c;
 }
 void ORecur::setEndDate( const QDate& dt) {
     checkOrModify();
     data->end = TimeConversion::toUTC( dt );
 }
 void ORecur::setEndDateUTC( time_t t) {
     checkOrModify();
     data->end = t;
 }
 void ORecur::setCreateTime( time_t t) {
     checkOrModify();
     data->create = t;
 }
 void ORecur::setHasEndDate( bool b) {
     checkOrModify();
     data->hasEnd = b;
 }
+void ORecur::setRepitition( int rep ) {
+    checkOrModify();
+    data->rep = rep;
+}
 void ORecur::checkOrModify() {
     if ( data->count !=  1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->days = data->days;
         d2->type = data->type;
         d2->freq = data->freq;
         d2->pos  = data->pos;
         d2->hasEnd = data->hasEnd;
         d2->end  = data->end;
         d2->create = data->create;
+        d2->rep = data->rep;
         data = d2;
     }
 }
 
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h
index 89258f8..d24d72d 100644
--- a/libopie2/opiepim/core/orecur.h
+++ b/libopie2/opiepim/core/orecur.h
@@ -18,37 +18,39 @@ public:
     enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
                 FRI = 0x10, SAT = 0x20, SUN = 0x40 };
     ORecur();
     ORecur( const ORecur& );
     ~ORecur();
 
     ORecur &operator=( const ORecur& );
     bool operator==(const ORecur& )const;
     RepeatType type()const;
     int frequency()const;
     int position()const;
     char days()const;
     bool hasEndDate()const;
     QDate endDate()const;
     time_t endDateUTC()const;
     time_t createTime()const;
+    int repetition()const;
 
     void setType( const RepeatType& );
     void setFrequency( int freq );
     void setPosition( int pos );
     void setDays( char c);
     void setEndDate( const QDate& dt );
     void setEndDateUTC( time_t );
     void setCreateTime( time_t );
     void setHasEndDate( bool b );
+    void setRepitition(int );
 private:
     void deref();
     inline void checkOrModify();
 
 
     class Data;
     Data* data;
     class ORecurPrivate;
     ORecurPrivate *d;
 };
 
 #endif
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index acd65c4..cd238ef 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1114,40 +1114,40 @@ static VObject *createVObject( const OContact &c )
     VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
     safeAddProp( title, VCWorkProp );
 
 
     QStringList emails = c.emailList();
     emails.prepend( c.defaultEmail() );
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
 	VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
 	safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
     if ( c.birthday().isValid() ){
 	    QString birthd_rfc2425 = QString("%1-%2-%3")
-		    .arg( c.birthday().year() ) 
+		    .arg( c.birthday().year() )
 		    .arg( c.birthday().month(), 2 )
 		    .arg( c.birthday().day(), 2 );
 	    // Now replace spaces with "0"...
 	    int pos = 0;
 	    while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
 		    birthd_rfc2425.replace( pos, 1, "0" );
-		    
+
 	    qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
 	    safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
     }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
 	VObject *org = safeAddProp( vcard, VCOrgProp );
 	safeAddPropValue( org, VCOrgNameProp, c.company() );
 	safeAddPropValue( org, VCOrgUnitProp, c.department() );
 	safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
     // some values we have to export as custom fields
     safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
     safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
     safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
 
@@ -1375,37 +1375,37 @@ static OContact parseVObject( VObject *obj )
 	    c.setAssistant( value );
 	}
 	else if ( name == "X-Qtopia-Spouse" ) {
 	    c.setSpouse( value );
 	}
 	else if ( name == "X-Qtopia-Gender" ) {
 	    c.setGender( value );
 	}
 	else if ( name == "X-Qtopia-Anniversary" ) {
 	    c.setAnniversary( TimeConversion::fromString( value ) );
 	}
 	else if ( name == "X-Qtopia-Nickname" ) {
 	    c.setNickname( value );
 	}
 	else if ( name == "X-Qtopia-Children" ) {
 	    c.setChildren( value );
-	}	
+	}
 	else if ( name == VCBirthDateProp ) {
 		// Reading Birthdate regarding RFC 2425 (5.8.4)
 		c.setBirthday( convVCardDateToDate( value ) );
-		
+
 	}
 
 #if 0
 	else {
 	    printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
 	    VObjectIterator nit;
 	    initPropIterator( &nit, o );
 	    while( moreIteration( &nit ) ) {
 		VObject *o = nextVObject( &nit );
 		QCString name = vObjectName( o );
 		QString value = vObjectStringZValue( o );
 		printf(" subprop: %s = %s\n", name.data(), value.latin1() );
 	    }
 	}
 #endif
     }
@@ -1451,33 +1451,42 @@ void OContact::writeVCard( const QString &filename, const OContact &contact)
 	cleanStrTbl();
 }
 
 /*!
   Returns the set of contacts read as VCards from the file \a filename.
 */
 QValueList<OContact> OContact::readVCard( const QString &filename )
 {
     qDebug("trying to open %s, exists=%d", filename.utf8().data(), QFileInfo( filename.utf8().data() ).size() );
     VObject *obj = Parse_MIME_FromFileName( (char *)filename.utf8().data() );
 
     qDebug("vobject = %p", obj );
 
     QValueList<OContact> contacts;
 
     while ( obj ) {
-	contacts.append( parseVObject( obj ) );
+        OContact con = parseVObject( obj );
+        /*
+         * if uid is 0 assign a new one
+         * this at least happens on
+         * Nokia6210
+         */
+        if ( con.uid() == 0 )
+            con.setUid( 1 );
+
+	contacts.append(con  );
 
 	VObject *t = obj;
 	obj = nextVObjectInList(obj);
 	cleanVObject( t );
     }
 
     return contacts;
 }
 
 /*!
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QString &regexp ) const
 {
     return match(QRegExp(regexp));
@@ -1514,79 +1523,79 @@ QString OContact::type() const
 
 // Definition is missing ! (se)
 QMap<QString,QString> OContact::toExtraMap() const
 {
 	qWarning ("Function not implemented: OContact::toExtraMap()");
 	QMap <QString,QString> useless;
 	return useless;
 }
 
 class QString OContact::recordField( int pos ) const
 {
 	QStringList SLFIELDS = fields(); // ?? why this ? (se)
 	return SLFIELDS[pos];
 }
 
 // In future releases, we should store birthday and anniversary
-// internally as QDate instead of QString ! 
+// internally as QDate instead of QString !
 // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se)
 
 /*! \fn void OContact::setBirthday( const QDate& date )
   Sets the birthday for the contact to \a date.
 */
 void OContact::setBirthday( const QDate &v )
-{ 
+{
 	if ( ( !v.isNull() ) && ( v.isValid() ) )
 		replace( Qtopia::Birthday, TimeConversion::toString( v ) );
-	
+
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date.
 */
 void OContact::setAnniversary( const QDate &v )
 {
 	if ( ( !v.isNull() ) && ( v.isValid() ) )
 		replace( Qtopia::Anniversary, TimeConversion::toString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
-QDate OContact::birthday() const 
-{ 
+QDate OContact::birthday() const
+{
 	QString str = find( Qtopia::Birthday );
 	qWarning ("Birthday %s", str.latin1() );
 	if ( !str.isEmpty() )
 		return  TimeConversion::fromString ( str );
 	else
 		return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
-QDate OContact::anniversary() const 
-{ 
+QDate OContact::anniversary() const
+{
 	QDate empty;
 	QString str = find( Qtopia::Anniversary );
 	qWarning ("Anniversary %s", str.latin1() );
 	if ( !str.isEmpty() )
-		return TimeConversion::fromString ( str ); 
+		return TimeConversion::fromString ( str );
 	else
 		return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
 
     // if no default, set it as the default email and don't insert
     if ( def.isEmpty() ) {
 	setDefaultEmail( e ); // will insert into the list for us
 	return;
     }
@@ -1594,60 +1603,60 @@ void OContact::insertEmail( const QString &v )
     // otherwise, insert assuming doesn't already exist
     QString emailsStr = find( Qtopia::Emails );
     if ( emailsStr.contains( e ))
 	return;
     if ( !emailsStr.isEmpty() )
 	emailsStr += emailSeparator();
     emailsStr += e;
     replace( Qtopia::Emails, emailsStr );
 }
 
 void OContact::removeEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
     QString def = defaultEmail();
     QString emailsStr = find( Qtopia::Emails );
     QStringList emails = emailList();
-	
+
     // otherwise, must first contain it
     if ( !emailsStr.contains( e ) )
 	return;
 
     // remove it
     //qDebug(" removing email from list %s", e.latin1());
     emails.remove( e );
     // reset the string
     emailsStr = emails.join(emailSeparator()); // Sharp's brain dead separator
     replace( Qtopia::Emails, emailsStr );
 
     // if default, then replace the default email with the first one
     if ( def == e ) {
 	//qDebug("removeEmail is default; setting new default");
 	if ( !emails.count() )
 	    clearEmails();
 	else // setDefaultEmail will remove e from the list
 	    setDefaultEmail( emails.first() );
     }
 }
 void OContact::clearEmails()
 {
     mMap.remove( Qtopia::DefaultEmail );
     mMap.remove( Qtopia::Emails );
 }
 void OContact::setDefaultEmail( const QString &v )
 {
     QString e = v.simplifyWhiteSpace();
 
     //qDebug("OContact::setDefaultEmail %s", e.latin1());
     replace( Qtopia::DefaultEmail, e );
 
-    if ( !e.isEmpty() )	
+    if ( !e.isEmpty() )
 	insertEmail( e );
-	
+
 }
 
 void OContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
 	insertEmail( *it );
 }
 
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 2f4a5d3..8ed41e2 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -221,33 +221,33 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
       m_direction( false )
 {
 }
 template <class T>
 uint ORecordListIterator<T>::current()const {
     return m_current;
 }
 template <class T>
 void ORecordListIterator<T>::setCurrent( uint cur ) {
     if( cur < m_uids.count() ) {
 	m_end = false;
 	m_current= cur;
     }
 }
 template <class T>
 uint ORecordListIterator<T>::count()const {
- return m_uids.count();
+    return m_uids.count();
 }
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                              const Base* acc )
     : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::begin() {
     Iterator it( m_ids, m_acc );
     return it;
 }
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 765d5a9..0d5b1d3 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -1,48 +1,51 @@
 
 #include <qobject.h>
 #include <qshared.h>
 
 
 
 #include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
 #include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 
-
+#include "opimstate.h"
+#include "orecur.h"
 #include "otodo.h"
 
 
 struct OTodo::OTodoData : public QShared {
     OTodoData() : QShared() {
     };
 
     QDate date;
     bool isCompleted:1;
     bool hasDate:1;
     int priority;
     QString desc;
     QString sum;
     QMap<QString, QString> extra;
     ushort prog;
     bool hasAlarmDateTime :1;
     QDateTime alarmDateTime;
+    OPimState state;
+    ORecur recur;
 };
 
 OTodo::OTodo(const OTodo &event )
     : OPimRecord( event ),  data( event.data )
 {
     data->ref();
 //    qWarning("ref up");
 }
 OTodo::~OTodo() {
 
 //    qWarning("~OTodo "  );
     if ( data->deref() ) {
 //        qWarning("OTodo::dereffing");
         delete data;
         data = 0l;
     }
@@ -131,32 +134,38 @@ ushort OTodo::progress() const
     return data->prog;
 }
 QDate OTodo::dueDate()const
 {
     return data->date;
 }
 
 QDateTime OTodo::alarmDateTime() const
 {
     return data->alarmDateTime;
 }
 
 QString OTodo::description()const
 {
     return data->desc;
 }
+OPimState OTodo::state()const {
+    return data->state;
+}
+ORecur OTodo::recurrence()const {
+    return data->recur;
+}
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
 {
     changeOrModify();
     data->hasAlarmDateTime = hasAlarmDateTime;
 }
 void OTodo::setDescription(const QString &desc )
@@ -172,32 +181,40 @@ void OTodo::setSummary( const QString& sum )
 }
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 void OTodo::setDueDate( QDate date )
 {
     changeOrModify();
     data->date = date;
 }
 void OTodo::setAlarmDateTime( const QDateTime& alarm )
 {
     changeOrModify();
     data->alarmDateTime = alarm;
 }
+void OTodo::setState( const OPimState& state ) {
+    changeOrModify();
+    data->state = state;
+}
+void OTodo::setRecurrence( const ORecur& rec) {
+    changeOrModify();
+    data->recur = rec;
+}
 bool OTodo::isOverdue( )
 {
     if( data->hasDate && !data->isCompleted)
 	return QDate::currentDate() > data->date;
     return false;
 }
 void OTodo::setProgress(ushort progress )
 {
     changeOrModify();
     data->prog = progress;
 }
 QString OTodo::toShortText() const {
  return summary();
 }
 /*!
   Returns a richt text string
@@ -345,42 +362,44 @@ QMap<int, QString> OTodo::toMap() const {
     map.insert( HasAlarmDateTime,  QString::number( data->hasAlarmDateTime ) );
     map.insert( AlarmDateTime, data->alarmDateTime.toString() );
 
     return map;
 }
 
 QMap<QString, QString> OTodo::toExtraMap()const {
     return data->extra;
 }
 /**
  *  change or modify looks at the ref count and either
  *  creates a new QShared Object or it can modify it
  * right in place
  */
 void OTodo::changeOrModify() {
     if ( data->count != 1 ) {
-//        qWarning("changeOrModify");
+        qWarning("changeOrModify");
         data->deref();
         OTodoData* d2 = new OTodoData();
         copy(data, d2 );
         data = d2;
     }
 }
 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;
 }
 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 5bd91d6..2cdc587 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -3,50 +3,57 @@
 #define OPIE_TODO_EVENT_H
 
 
 #include <qarray.h>
 #include <qmap.h>
 #include <qregexp.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qvaluelist.h>
 
 #include <qpe/recordfields.h>
 #include <qpe/palmtopuidgen.h>
 
 #include <opie/opimrecord.h>
 
 
+class OPimState;
+class ORecur;
 class OTodo : public  OPimRecord  {
 public:
     typedef QValueList<OTodo> ValueList;
     enum RecordFields {
         Uid = Qtopia::UID_ID,
         Category = Qtopia::CATEGORY_ID,
         HasDate,
         Completed,
         Description,
         Summary,
         Priority,
         DateDay,
         DateMonth,
         DateYear,
         Progress,
         CrossReference,
         HasAlarmDateTime,
-        AlarmDateTime
+        AlarmDateTime,
+        State,
+        Recurrance,
+        Alarms,
+        Reminders,
+        Notifiers
     };
  public:
     // priorities from Very low to very high
     enum TaskPriority { VeryHigh=1,  High,  Normal,  Low, VeryLow };
 
     /* Constructs a new ToDoEvent
        @param completed Is the TodoEvent completed
        @param priority What is the priority of this ToDoEvent
        @param category Which category does it belong( uid )
        @param summary A small summary of the todo
        @param description What is this ToDoEvent about
        @param hasDate Does this Event got a deadline
        @param date what is the deadline?
        @param uid what is the UUID of this Event
     **/
     OTodo( bool completed = false, int priority = Normal,
@@ -98,32 +105,42 @@ public:
     /**
      * progress as ushort 0, 20, 40, 60, 80 or 100%
      */
     ushort progress() const;
 
     /**
      * The due Date
      */
     QDate dueDate()const;
 
     /**
      * Alarm Date and Time
      */
     QDateTime alarmDateTime()const;
 
     /**
+     * What is the state of this OTodo?
+     */
+    OPimState state()const;
+
+    /**
+     * the recurrance of this
+     */
+    ORecur recurrence()const;
+
+    /**
      * The description of the todo
      */
     QString description()const;
 
     /**
      * A small summary of the todo
      */
     QString summary() const;
 
     /**
      * @reimplemented
      * Return this todoevent in a RichText formatted QString
      */
     QString toRichText() const;
 
     /**
@@ -157,39 +174,47 @@ public:
 
     /**
      * Set the priority of the Todo
      */
     void setPriority(int priority );
 
     /**
      * Set the progress.
      */
     void setProgress( ushort progress );
 
     /**
      * set the end date
      */
     void setDueDate( QDate date );
 
+
+    void setRecurrence( const ORecur& );
     /**
      * set the alarm time
      */
     void setAlarmDateTime ( const QDateTime& alarm );
 
     void setDescription(const QString& );
     void setSummary(const QString& );
+
+    /**
+     * set the state of a Todo
+     * @param state State what the todo should take
+     */
+    void setState( const OPimState& state);
     bool isOverdue();
 
 
     bool match( const QRegExp &r )const;
 
     bool operator<(const OTodo &toDoEvent )const;
     bool operator<=(const OTodo &toDoEvent )const;
     bool operator!=(const OTodo &toDoEvent )const;
     bool operator>(const OTodo &toDoEvent )const;
     bool operator>=(const OTodo &toDoEvent)const;
     bool operator==(const OTodo &toDoEvent )const;
     OTodo &operator=(const OTodo &toDoEvent );
 
  private:
     class OTodoPrivate;
     struct OTodoData;