16 files changed, 94 insertions, 52 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index a2fb68c..be4ce0a 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -412,65 +412,65 @@ OContact::~OContact()
  Sets the uid for this record to \a id.
 */
 /*! \enum OContact::journal_action
  \internal
 */
 /*!
  \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
    QMap<int, QString> map = mMap;
    QString cats = idsToString( categories() );
    if ( !cats.isEmpty() )
        map.insert( Qtopia::AddressCategory, cats );
    return map;
 }
 /*!
  Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
    QString str;
    bool marker = false;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
        text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>";
-    
    if ( !(value = jobTitle()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
        text += Qtopia::escapeString(comp) + "<br>";
    text += "<hr><br>";
    // defailt email
    QString defEmail = defaultEmail();
    if ( !defEmail.isEmpty() )
        text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>"
                + Qtopia::escapeString(defEmail) + "<br>";
    text += "<br>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
        marker = true;
    }
@@ -953,71 +953,65 @@ void OContact::setChildren( const QString &str )
 /*!
  \overload
  Returns TRUE if the contact matches the regular expression \a regexp.
  Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
    setLastHitField( -1 );
    bool match;
    match = false;
    QMap<int, QString>::ConstIterator it;
    for ( it = mMap.begin(); it != mMap.end(); ++it ) {
        if ( (*it).find( r ) > -1 ) {
            setLastHitField( it.key() );
            match = true;
            break;
        }
    }
    return match;
 }
 QString OContact::toShortText() const
 {
        return ( fullName() );
 }
 QString OContact::type() const
 {
        return QString::fromLatin1( "OContact" );
 }
-// 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 !
 // 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. If date is null
  the current stored date will be removed.
 */
 void OContact::setBirthday( const QDate &v )
 {
        if ( v.isNull() ){
                qWarning( "Remove Birthday");
                replace( Qtopia::Birthday, QString::null );
                return;
        }
        if ( v.isValid() )
                replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 }
 /*! \fn void OContact::setAnniversary( const QDate &date )
  Sets the anniversary of the contact to \a date. If date is
  null, the current stored date will be removed.
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index e4f5d92..7bcf944 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -207,110 +207,110 @@ 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& re )const {
    if ( re.match( data->description ) != -1 ){
        setLastHitField( Qtopia::DatebookDescription );
        return true;
    }
    if ( re.match( data->note ) != -1 ){
        setLastHitField( Qtopia::Note );
        return true;
    }
    if ( re.match( data->location ) != -1 ){
        setLastHitField( Qtopia::Location );
        return true;
    }
    if ( re.match( data->start.toString() ) != -1 ){
        setLastHitField( Qtopia::StartDateTime );
        return true;
    }
    if ( re.match( data->end.toString() ) != -1 ){
        setLastHitField( Qtopia::EndDateTime );
        return true;
    }
    return false;
 }
 QString OEvent::toRichText()const {
    QString text, value;
-    
    // description
    text += "<b><h3><img src=\"datebook/DateBook\">";
    if ( !description().isEmpty() ) {
        text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
    }
    text += "</h3></b><br><hr><br>";
-    
    // location
    if ( !(value = location()).isEmpty() ) {
        text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
        text += Qtopia::escapeString(value) + "<br>";
    }
    // all day event
    if ( isAllDay() ) {
        text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
    }
    // multiple day event
    else if ( isMultipleDay () ) {
        text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
    }
    // start & end times
    else {
        // start time
        if ( startDateTime().isValid() ) {
            text += "<b>" + QObject::tr( "Start:") + "</b> ";
            text += Qtopia::escapeString(startDateTime().toString() ).
                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
        }
        // end time
        if ( endDateTime().isValid() ) {
            text += "<b>" + QObject::tr( "End:") + "</b> ";
            text += Qtopia::escapeString(endDateTime().toString() ).
                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
        }
    }
-    
    // categories
    if ( categoryNames("Calendar").count() ){
            text += "<b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames("Calendar").join(", ");
            text += "<br>";
    }
-    
    //notes
    if ( !note().isEmpty() ) {
        text += "<b>" + QObject::tr( "Note:") + "</b><br>";
        text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
    }
    return text;
 }
 QString OEvent::toShortText()const {
    QString text;
    text += QString::number( startDateTime().date().day() );
    text += ".";
    text += QString::number( startDateTime().date().month() );
    text += ".";
    text += QString::number( startDateTime().date().year() );
    text += " ";
    text += QString::number( startDateTime().time().hour() );
    text += ":";
    text += QString::number( startDateTime().time().minute() );
    text += " - ";
    text += description();
    return text;
 }
 QString OEvent::type()const {
    return QString::fromLatin1("OEvent");
 }
 QString OEvent::recordField( int /*id */ )const {
    return QString::null;
 }
 int OEvent::rtti() {
    return OPimResolver::DateBook;
@@ -331,67 +331,64 @@ void OEvent::changeOrModify() {
        if (data->manager )
            d2->manager = new OPimNotifyManager( *data->manager );
        if ( data->recur )
            d2->recur = new ORecur( *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;
        if ( data->child ) {
            d2->child = new QArray<int>( *data->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;
diff --git a/libopie/pim/oevent.h b/libopie/pim/oevent.h
index b696d81..30f442e 100644
--- a/libopie/pim/oevent.h
+++ b/libopie/pim/oevent.h
@@ -103,65 +103,64 @@ public:
    /** in current timezone */
    QDateTime endDateTime()const;
    QDateTime endDateTimeInZone()const;
    bool isMultipleDay()const;
    bool isAllDay()const;
    void setAllDay( bool isAllDay );
    /* pin this event to a timezone! FIXME */
    void setTimeZone( const QString& timeZone );
    QString timeZone()const;
    virtual bool match( const QRegExp& )const;
    /** For exception to recurrence here is a list of children...  */
    QArray<int> children()const;
    void setChildren( const QArray<int>& );
    void addChild( int uid );
    void removeChild( int uid );
    /** return the parent OEvent */
    int parent()const;
    void setParent( int uid );
    /* needed reimp */
    QString toRichText()const;
    QString toShortText()const;
    QString type()const;
    QMap<int, QString> toMap()const;
-    QMap<QString, QString> toExtraMap()const;
    QString recordField(int )const;
    static int rtti();
    bool loadFromStream( QDataStream& );
    bool saveToStream( QDataStream& )const;
 /*    bool operator==( const OEvent& );
    bool operator!=( const OEvent& );
    bool operator<( const OEvent& );
    bool operator<=( const OEvent& );
    bool operator>( const OEvent& );
    bool operator>=(const OEvent& );
 */
 private:
    inline void changeOrModify();
    void deref();
    struct Data;
    Data* data;
    class Private;
    Private* priv;
 };
 /**
 * AN Event can span through multiple days. We split up a multiday eve
 */
 class OEffectiveEvent {
 public:
    typedef QValueList<OEffectiveEvent> ValueList;
    enum Position { MidWay, Start, End, StartEnd };
        // If we calculate the effective event of a multi-day event
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index 0c9734d..2365748 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -145,32 +145,38 @@ bool OPimRecord::saveToStream( QDataStream& stream )const {
        flush( (*it).partner( OPimXRef::One),  stream  );
        flush( (*it).partner( OPimXRef::Two),  stream  );
    }
    return true;
 }
 void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const{
    str << par.service();
    str << par.uid();
    str << par.field();
 }
 OPimXRefPartner OPimRecord::partner( QDataStream& stream ) {
    OPimXRefPartner par;
    QString str;
    int i;
    stream >> str;
    par.setService( str );
    stream >> i;
    par.setUid( i );
    stream >> i ;
    par.setField( i );
    return par;
 }
 void OPimRecord::setLastHitField( int lastHit )const {
    m_lastHit = lastHit;
 }
 int OPimRecord::lastHitField()const{
    return m_lastHit;
 }
+QMap<QString, QString> OPimRecord::toExtraMap()const {
+    return customMap;
+}
+void OPimRecord::setExtraMap( const QMap<QString, QString>& map) {
+    customMap = map;
+}
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h
index 494c78e..563b19c 100644
--- a/libopie/pim/opimrecord.h
+++ b/libopie/pim/opimrecord.h
@@ -1,41 +1,46 @@
 #ifndef OPIE_PIM_RECORD_H
 #define OPIE_PIM_RECORD_H
 #include <qdatastream.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
+/*
+ * we need to get customMap which is private...
+ */
+#define private protected
 #include <qpe/palmtoprecord.h>
+#undef private
 #include <opie/opimxrefmanager.h>
 /**
 * 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
     */
    OPimRecord( const OPimRecord& rec );
    /**
     * copy operator
     */
    OPimRecord &operator=( const OPimRecord& );
    /**
     * category names resolved
     */
    QStringList categoryNames( const QString& appname )const;
@@ -65,65 +70,66 @@ public:
    /**
     * a small one line summary
     */
    virtual QString toShortText()const = 0;
    /**
     * the name of the Record
     */
    virtual QString type()const = 0;
    /**
     * matches the Records the regular expression?
     */
    virtual bool match( const QString &regexp ) const
        {setLastHitField( -1 );
            return Qtopia::Record::match(QRegExp(regexp));};
    /**
     * if implemented this function returns which item has been
     * last hit by the match() function.
     * or -1 if not implemented or no hit has occured
     */
    int lastHitField()const;
    /**
     * converts the internal structure to a map
     */
    virtual QMap<int, QString> toMap()const = 0;
    /**
     * key value representation of extra items
     */
-    virtual QMap<QString, QString> toExtraMap()const = 0;
+    QMap<QString, QString> toExtraMap()const;
+    void setExtraMap( const QMap<QString, QString>& );
    /**
     * the name for a recordField
     */
    virtual QString recordField(int)const = 0;
    /**
     * returns a reference of the
     * Cross Reference Manager
     * Partner 'One' is THIS PIM RECORD!
     * 'Two' is the Partner where we link to
     */
    OPimXRefManager& xrefmanager();
    /**
     * set the uid
     */
    virtual void setUid( int uid );
    /*
     * used inside the Templates for casting
     * REIMPLEMENT in your ....
     */
    static int rtti();
    /**
     * some marshalling and de marshalling code
     * saves the OPimRecord
     * to and from a DataStream
     */
    virtual bool loadFromStream(QDataStream& );
    virtual bool saveToStream( QDataStream& stream )const;
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index c84eeeb..38b93f7 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -250,112 +250,112 @@ void OTodo::setMaintainer( const OPimMaintainer& pim ) {
        (*data->maintainer) = pim;
    else
        data->maintainer = new OPimMaintainer( pim );
 }
 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
 */
 QString OTodo::toRichText() const
 {
  QString text;
  QStringList catlist;
  // summary
  text += "<b><h3><img src=\"todo/TodoList\">";
  if ( !summary().isEmpty() ) {
      text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
  }
  text += "</h3></b><br><hr><br>";
-    
  // description
  if( !description().isEmpty() ){
    text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ;
  }
  // priority
  int priorityval = priority();
  text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
          QString::number( priorityval ) + "\">";
 //  text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" +
 //          QString::number( priority() ) + "\"><br>";
  switch ( priorityval )
  {
    case 1 : text += QObject::tr( "Very high" );
        break;
    case 2 : text += QObject::tr( "High" );
        break;
    case 3 : text += QObject::tr( "Normal" );
        break;
    case 4 : text += QObject::tr( "Low" );
        break;
    case 5 : text += QObject::tr( "Very low" );
        break;
  };
  text += "<br>";
-    
  // progress
  text += "<b>" + QObject::tr( "Progress:") + " </b>"
          + QString::number( progress() ) + " %<br>";
-          
  // due date
  if (hasDueDate() ){
    QDate dd = dueDate();
    int off = QDate::currentDate().daysTo( dd );
-    
    text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\"";
    if ( off < 0 )
      text += "#FF0000";
    else if ( off == 0 )
      text += "#FFFF00";
    else if ( off > 0 )
      text += "#00FF00";
    text += "\">" + dd.toString() + "</font><br>";
  }
-  
  // categories
  text += "<b>" + QObject::tr( "Category:") + "</b> ";
  text += categoryNames( "Todo List" ).join(", ");
  text += "<br>";
  return text;
 }
 bool OTodo::hasNotifiers()const {
    if (!data->notifiers) return false;
    return !data->notifiers->isEmpty();
 }
 OPimNotifyManager& OTodo::notifiers() {
    if (!data->notifiers )
        data->notifiers = new OPimNotifyManager;
    return (*data->notifiers);
 }
 const OPimNotifyManager& OTodo::notifiers()const{
    if (!data->notifiers )
        data->notifiers = new OPimNotifyManager;
    return (*data->notifiers);
 }
 bool OTodo::operator<( const OTodo &toDoEvent )const{
    if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
    if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
    if( hasDueDate() && toDoEvent.hasDueDate() ){
        if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
            return priority() < toDoEvent.priority();
        }else{
            return dueDate() < toDoEvent.dueDate();
        }
@@ -431,67 +431,64 @@ OTodo &OTodo::operator=(const OTodo &item )
    OPimRecord::operator=( item );
    //qWarning("operator= ref ");
    item.data->ref();
    deref();
    data = item.data;
    return *this;
 }
 QMap<int, QString> OTodo::toMap() const {
    QMap<int, QString> map;
    map.insert( Uid, QString::number( uid() ) );
    map.insert( Category,  idsToString( categories() ) );
    map.insert( HasDate, QString::number( data->hasDate ) );
    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() );
    /* FIXME!!!   map.insert( State,  );
    map.insert( Recurrence, );
    map.insert( Reminders, );
    map.
    */
    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");
        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;
    if (src->state )
        dest->state = new OPimState( *src->state );
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h
index 4d5ee36..f9a345a 100644
--- a/libopie/pim/otodo.h
+++ b/libopie/pim/otodo.h
@@ -164,65 +164,64 @@ public:
    /**
     * A small summary of the todo
     */
    QString summary() const;
    /**
     * @reimplemented
     * Return this todoevent in a RichText formatted QString
     */
    QString toRichText() const;
    bool hasNotifiers()const;
    /*
     * FIXME check if the sharing is still fine!! -zecke
     * ### CHECK If API is fine
     */
    /**
     * return a reference to our notifiers...
     */
    OPimNotifyManager &notifiers();
    /**
     *
     */
    const OPimNotifyManager &notifiers()const;
    /**
     * reimplementations
     */
    QString type()const;
    QString toShortText()const;
-    QMap<QString, QString> toExtraMap()const;
    QString recordField(int id )const;
    /**
     * toMap puts all data into the map. int relates
     * to ToDoEvent RecordFields enum
     */
    QMap<int, QString> toMap()const;
    /**
     * Set if this Todo is completed
     */
    void setCompleted(bool completed );
    /**
     * set if this todo got an end data
     */
    void setHasDueDate( bool hasDate );
    // FIXME we do not have these for start, completed
    // cause we'll use the isNull() of QDate for figuring
    // out if it's has a date...
    // decide what to do here? -zecke
    /**
     * Set the priority of the Todo
     */
    void setPriority(int priority );
    /**
     * Set the progress.
     */
    void setProgress( ushort progress );
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 2b62f0d..3d15354 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -468,67 +468,89 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
    /* Recurrence stuff below + post processing later */
    case FRType:
        if ( val == "Daily" )
            recur()->setType( ORecur::Daily );
        else if ( val == "Weekly" )
            recur()->setType( ORecur::Weekly);
        else if ( val == "MonthlyDay" )
            recur()->setType( ORecur::MonthlyDay );
        else if ( val == "MonthlyDate" )
            recur()->setType( ORecur::MonthlyDate );
        else if ( val == "Yearly" )
            recur()->setType( ORecur::Yearly );
        else
            recur()->setType( ORecur::NoRepeat );
        break;
    case FRWeekdays:
        recur()->setDays( val.toInt() );
        break;
    case FRPosition:
        recur()->setPosition( val.toInt() );
        break;
    case FRFreq:
        recur()->setFrequency( val.toInt() );
        break;
    case FRHasEndDate:
        recur()->setHasEndDate( val.toInt() );
        break;
    case FREndDate: {
        rp_end = (time_t) val.toLong();
        break;
    }
    default:
+        ev.setCustomField( attr, val );
        break;
    }
 }
+// from PalmtopRecord... GPL ### FIXME
+namespace {
+QString customToXml(const QMap<QString, QString>& customMap )
+{
+    //qWarning(QString("writing custom %1").arg(customMap.count()));
+    QString buf(" ");
+    for ( QMap<QString, QString>::ConstIterator cit = customMap.begin();
+            cit != customMap.end(); ++cit) {
+        // qWarning(".ITEM.");
+        buf += cit.key();
+        buf += "=\"";
+        buf += Qtopia::escapeString(cit.data());
+        buf += "\" ";
+    }
+    return buf;
+}
+}
 QString OTodoAccessXML::toString( const OTodo& ev )const {
    QString str;
    str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" ";
    str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" ";
    str += "Priority=\"" + QString::number( ev.priority() ) + "\" ";
    str += "Progress=\"" + QString::number(ev.progress() ) + "\" ";
    str += "Categories=\"" + toString( ev.categories() ) + "\" ";
    str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" ";
    str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" ";
    if ( ev.hasDueDate() ) {
        str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" ";
        str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" ";
        str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
    }
 //    qWarning( "Uid %d",  ev.uid() );
    str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 // append the extra options
    /* FIXME Qtopia::Record this is currently not
     * possible you can set custom fields
     * but don' iterate over the list
     * I may do #define private protected
     * for this case - cough  --zecke
     */
    /*
    QMap<QString, QString> extras = ev.extras();
    QMap<QString, QString>::Iterator extIt;
    for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
        str += extIt.key() + "=\"" +  extIt.data() + "\" ";
@@ -552,64 +574,65 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
        OPimNotifyManager manager = ev.notifiers();
        OPimNotifyManager::Alarms alarms = manager.alarms();
        if (!alarms.isEmpty() ) {
            QStringList als;
            OPimNotifyManager::Alarms::Iterator it = alarms.begin();
            for ( ; it != alarms.end(); ++it ) {
                /* only if time is valid */
                if ( (*it).dateTime().isValid() ) {
                    als << OConversion::dateTimeToString( (*it).dateTime() )
                        + ":" + QString::number( (*it).duration() )
                        + ":" + QString::number( (*it).sound() )
                        + ":";
                }
            }
            // now write the list
            qWarning("als: %s", als.join("____________").latin1() );
            str += "Alarms=\""+als.join(";") +"\" ";
        }
        /*
         * now the same for reminders but more easy. We just save the uid of the OEvent.
         */
        OPimNotifyManager::Reminders reminders = manager.reminders();
        if (!reminders.isEmpty() ) {
            OPimNotifyManager::Reminders::Iterator it = reminders.begin();
            QStringList records;
            for ( ; it != reminders.end(); ++it ) {
                records << QString::number( (*it).recordUid() );
            }
            str += "Reminders=\""+ records.join(";") +"\" ";
        }
    }
+    str += customToXml( ev.toExtraMap() );
    return str;
 }
 QString OTodoAccessXML::toString( const QArray<int>& ints ) const {
    return Qtopia::Record::idsToString( ints );
 }
 /* internal class for sorting
 *
 * Inspired by todoxmlio.cpp from TT
 */
 struct OTodoXMLContainer {
    OTodo todo;
 };
 namespace {
    inline QString string( const OTodo& todo) {
        return  todo.summary().isEmpty() ?
            todo.description().left(20 ) :
            todo.summary();
    }
    inline int completed( const OTodo& todo1, const OTodo& todo2) {
        int ret = 0;
        if ( todo1.isCompleted() ) ret++;
        if ( todo2.isCompleted() ) ret--;
        return ret;
    }
    inline int priority( const OTodo& t1, const OTodo& t2) {
        return ( t1.priority() - t2.priority() );
    }
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 2b62f0d..3d15354 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -468,67 +468,89 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
    /* Recurrence stuff below + post processing later */
    case FRType:
        if ( val == "Daily" )
            recur()->setType( ORecur::Daily );
        else if ( val == "Weekly" )
            recur()->setType( ORecur::Weekly);
        else if ( val == "MonthlyDay" )
            recur()->setType( ORecur::MonthlyDay );
        else if ( val == "MonthlyDate" )
            recur()->setType( ORecur::MonthlyDate );
        else if ( val == "Yearly" )
            recur()->setType( ORecur::Yearly );
        else
            recur()->setType( ORecur::NoRepeat );
        break;
    case FRWeekdays:
        recur()->setDays( val.toInt() );
        break;
    case FRPosition:
        recur()->setPosition( val.toInt() );
        break;
    case FRFreq:
        recur()->setFrequency( val.toInt() );
        break;
    case FRHasEndDate:
        recur()->setHasEndDate( val.toInt() );
        break;
    case FREndDate: {
        rp_end = (time_t) val.toLong();
        break;
    }
    default:
+        ev.setCustomField( attr, val );
        break;
    }
 }
+// from PalmtopRecord... GPL ### FIXME
+namespace {
+QString customToXml(const QMap<QString, QString>& customMap )
+{
+    //qWarning(QString("writing custom %1").arg(customMap.count()));
+    QString buf(" ");
+    for ( QMap<QString, QString>::ConstIterator cit = customMap.begin();
+            cit != customMap.end(); ++cit) {
+        // qWarning(".ITEM.");
+        buf += cit.key();
+        buf += "=\"";
+        buf += Qtopia::escapeString(cit.data());
+        buf += "\" ";
+    }
+    return buf;
+}
+}
 QString OTodoAccessXML::toString( const OTodo& ev )const {
    QString str;
    str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" ";
    str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" ";
    str += "Priority=\"" + QString::number( ev.priority() ) + "\" ";
    str += "Progress=\"" + QString::number(ev.progress() ) + "\" ";
    str += "Categories=\"" + toString( ev.categories() ) + "\" ";
    str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" ";
    str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" ";
    if ( ev.hasDueDate() ) {
        str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" ";
        str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" ";
        str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" ";
    }
 //    qWarning( "Uid %d",  ev.uid() );
    str += "Uid=\"" + QString::number( ev.uid() ) + "\" ";
 // append the extra options
    /* FIXME Qtopia::Record this is currently not
     * possible you can set custom fields
     * but don' iterate over the list
     * I may do #define private protected
     * for this case - cough  --zecke
     */
    /*
    QMap<QString, QString> extras = ev.extras();
    QMap<QString, QString>::Iterator extIt;
    for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
        str += extIt.key() + "=\"" +  extIt.data() + "\" ";
@@ -552,64 +574,65 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
        OPimNotifyManager manager = ev.notifiers();
        OPimNotifyManager::Alarms alarms = manager.alarms();
        if (!alarms.isEmpty() ) {
            QStringList als;
            OPimNotifyManager::Alarms::Iterator it = alarms.begin();
            for ( ; it != alarms.end(); ++it ) {
                /* only if time is valid */
                if ( (*it).dateTime().isValid() ) {
                    als << OConversion::dateTimeToString( (*it).dateTime() )
                        + ":" + QString::number( (*it).duration() )
                        + ":" + QString::number( (*it).sound() )
                        + ":";
                }
            }
            // now write the list
            qWarning("als: %s", als.join("____________").latin1() );
            str += "Alarms=\""+als.join(";") +"\" ";
        }
        /*
         * now the same for reminders but more easy. We just save the uid of the OEvent.
         */
        OPimNotifyManager::Reminders reminders = manager.reminders();
        if (!reminders.isEmpty() ) {
            OPimNotifyManager::Reminders::Iterator it = reminders.begin();
            QStringList records;
            for ( ; it != reminders.end(); ++it ) {
                records << QString::number( (*it).recordUid() );
            }
            str += "Reminders=\""+ records.join(";") +"\" ";
        }
    }
+    str += customToXml( ev.toExtraMap() );
    return str;
 }
 QString OTodoAccessXML::toString( const QArray<int>& ints ) const {
    return Qtopia::Record::idsToString( ints );
 }
 /* internal class for sorting
 *
 * Inspired by todoxmlio.cpp from TT
 */
 struct OTodoXMLContainer {
    OTodo todo;
 };
 namespace {
    inline QString string( const OTodo& todo) {
        return  todo.summary().isEmpty() ?
            todo.description().left(20 ) :
            todo.summary();
    }
    inline int completed( const OTodo& todo1, const OTodo& todo2) {
        int ret = 0;
        if ( todo1.isCompleted() ) ret++;
        if ( todo2.isCompleted() ) ret--;
        return ret;
    }
    inline int priority( const OTodo& t1, const OTodo& t2) {
        return ( t1.priority() - t2.priority() );
    }
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index 0c9734d..2365748 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -145,32 +145,38 @@ bool OPimRecord::saveToStream( QDataStream& stream )const {
        flush( (*it).partner( OPimXRef::One),  stream  );
        flush( (*it).partner( OPimXRef::Two),  stream  );
    }
    return true;
 }
 void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const{
    str << par.service();
    str << par.uid();
    str << par.field();
 }
 OPimXRefPartner OPimRecord::partner( QDataStream& stream ) {
    OPimXRefPartner par;
    QString str;
    int i;
    stream >> str;
    par.setService( str );
    stream >> i;
    par.setUid( i );
    stream >> i ;
    par.setField( i );
    return par;
 }
 void OPimRecord::setLastHitField( int lastHit )const {
    m_lastHit = lastHit;
 }
 int OPimRecord::lastHitField()const{
    return m_lastHit;
 }
+QMap<QString, QString> OPimRecord::toExtraMap()const {
+    return customMap;
+}
+void OPimRecord::setExtraMap( const QMap<QString, QString>& map) {
+    customMap = map;
+}
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index 494c78e..563b19c 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -1,41 +1,46 @@
 #ifndef OPIE_PIM_RECORD_H
 #define OPIE_PIM_RECORD_H
 #include <qdatastream.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
+/*
+ * we need to get customMap which is private...
+ */
+#define private protected
 #include <qpe/palmtoprecord.h>
+#undef private
 #include <opie/opimxrefmanager.h>
 /**
 * 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
     */
    OPimRecord( const OPimRecord& rec );
    /**
     * copy operator
     */
    OPimRecord &operator=( const OPimRecord& );
    /**
     * category names resolved
     */
    QStringList categoryNames( const QString& appname )const;
@@ -65,65 +70,66 @@ public:
    /**
     * a small one line summary
     */
    virtual QString toShortText()const = 0;
    /**
     * the name of the Record
     */
    virtual QString type()const = 0;
    /**
     * matches the Records the regular expression?
     */
    virtual bool match( const QString &regexp ) const
        {setLastHitField( -1 );
            return Qtopia::Record::match(QRegExp(regexp));};
    /**
     * if implemented this function returns which item has been
     * last hit by the match() function.
     * or -1 if not implemented or no hit has occured
     */
    int lastHitField()const;
    /**
     * converts the internal structure to a map
     */
    virtual QMap<int, QString> toMap()const = 0;
    /**
     * key value representation of extra items
     */
-    virtual QMap<QString, QString> toExtraMap()const = 0;
+    QMap<QString, QString> toExtraMap()const;
+    void setExtraMap( const QMap<QString, QString>& );
    /**
     * the name for a recordField
     */
    virtual QString recordField(int)const = 0;
    /**
     * returns a reference of the
     * Cross Reference Manager
     * Partner 'One' is THIS PIM RECORD!
     * 'Two' is the Partner where we link to
     */
    OPimXRefManager& xrefmanager();
    /**
     * set the uid
     */
    virtual void setUid( int uid );
    /*
     * used inside the Templates for casting
     * REIMPLEMENT in your ....
     */
    static int rtti();
    /**
     * some marshalling and de marshalling code
     * saves the OPimRecord
     * to and from a DataStream
     */
    virtual bool loadFromStream(QDataStream& );
    virtual bool saveToStream( QDataStream& stream )const;
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index a2fb68c..be4ce0a 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -412,65 +412,65 @@ OContact::~OContact()
  Sets the uid for this record to \a id.
 */
 /*! \enum OContact::journal_action
  \internal
 */
 /*!
  \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
    QMap<int, QString> map = mMap;
    QString cats = idsToString( categories() );
    if ( !cats.isEmpty() )
        map.insert( Qtopia::AddressCategory, cats );
    return map;
 }
 /*!
  Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
    QString str;
    bool marker = false;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
        text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>";
-    
    if ( !(value = jobTitle()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
        text += Qtopia::escapeString(comp) + "<br>";
    text += "<hr><br>";
    // defailt email
    QString defEmail = defaultEmail();
    if ( !defEmail.isEmpty() )
        text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>"
                + Qtopia::escapeString(defEmail) + "<br>";
    text += "<br>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
        marker = true;
    }
@@ -953,71 +953,65 @@ void OContact::setChildren( const QString &str )
 /*!
  \overload
  Returns TRUE if the contact matches the regular expression \a regexp.
  Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
    setLastHitField( -1 );
    bool match;
    match = false;
    QMap<int, QString>::ConstIterator it;
    for ( it = mMap.begin(); it != mMap.end(); ++it ) {
        if ( (*it).find( r ) > -1 ) {
            setLastHitField( it.key() );
            match = true;
            break;
        }
    }
    return match;
 }
 QString OContact::toShortText() const
 {
        return ( fullName() );
 }
 QString OContact::type() const
 {
        return QString::fromLatin1( "OContact" );
 }
-// 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 !
 // 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. If date is null
  the current stored date will be removed.
 */
 void OContact::setBirthday( const QDate &v )
 {
        if ( v.isNull() ){
                qWarning( "Remove Birthday");
                replace( Qtopia::Birthday, QString::null );
                return;
        }
        if ( v.isValid() )
                replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 }
 /*! \fn void OContact::setAnniversary( const QDate &date )
  Sets the anniversary of the contact to \a date. If date is
  null, the current stored date will be removed.
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index e4f5d92..7bcf944 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -207,110 +207,110 @@ 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& re )const {
    if ( re.match( data->description ) != -1 ){
        setLastHitField( Qtopia::DatebookDescription );
        return true;
    }
    if ( re.match( data->note ) != -1 ){
        setLastHitField( Qtopia::Note );
        return true;
    }
    if ( re.match( data->location ) != -1 ){
        setLastHitField( Qtopia::Location );
        return true;
    }
    if ( re.match( data->start.toString() ) != -1 ){
        setLastHitField( Qtopia::StartDateTime );
        return true;
    }
    if ( re.match( data->end.toString() ) != -1 ){
        setLastHitField( Qtopia::EndDateTime );
        return true;
    }
    return false;
 }
 QString OEvent::toRichText()const {
    QString text, value;
-    
    // description
    text += "<b><h3><img src=\"datebook/DateBook\">";
    if ( !description().isEmpty() ) {
        text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
    }
    text += "</h3></b><br><hr><br>";
-    
    // location
    if ( !(value = location()).isEmpty() ) {
        text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
        text += Qtopia::escapeString(value) + "<br>";
    }
    // all day event
    if ( isAllDay() ) {
        text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
    }
    // multiple day event
    else if ( isMultipleDay () ) {
        text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
    }
    // start & end times
    else {
        // start time
        if ( startDateTime().isValid() ) {
            text += "<b>" + QObject::tr( "Start:") + "</b> ";
            text += Qtopia::escapeString(startDateTime().toString() ).
                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
        }
        // end time
        if ( endDateTime().isValid() ) {
            text += "<b>" + QObject::tr( "End:") + "</b> ";
            text += Qtopia::escapeString(endDateTime().toString() ).
                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
        }
    }
-    
    // categories
    if ( categoryNames("Calendar").count() ){
            text += "<b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames("Calendar").join(", ");
            text += "<br>";
    }
-    
    //notes
    if ( !note().isEmpty() ) {
        text += "<b>" + QObject::tr( "Note:") + "</b><br>";
        text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
    }
    return text;
 }
 QString OEvent::toShortText()const {
    QString text;
    text += QString::number( startDateTime().date().day() );
    text += ".";
    text += QString::number( startDateTime().date().month() );
    text += ".";
    text += QString::number( startDateTime().date().year() );
    text += " ";
    text += QString::number( startDateTime().time().hour() );
    text += ":";
    text += QString::number( startDateTime().time().minute() );
    text += " - ";
    text += description();
    return text;
 }
 QString OEvent::type()const {
    return QString::fromLatin1("OEvent");
 }
 QString OEvent::recordField( int /*id */ )const {
    return QString::null;
 }
 int OEvent::rtti() {
    return OPimResolver::DateBook;
@@ -331,67 +331,64 @@ void OEvent::changeOrModify() {
        if (data->manager )
            d2->manager = new OPimNotifyManager( *data->manager );
        if ( data->recur )
            d2->recur = new ORecur( *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;
        if ( data->child ) {
            d2->child = new QArray<int>( *data->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;
diff --git a/libopie2/opiepim/oevent.h b/libopie2/opiepim/oevent.h
index b696d81..30f442e 100644
--- a/libopie2/opiepim/oevent.h
+++ b/libopie2/opiepim/oevent.h
@@ -103,65 +103,64 @@ public:
    /** in current timezone */
    QDateTime endDateTime()const;
    QDateTime endDateTimeInZone()const;
    bool isMultipleDay()const;
    bool isAllDay()const;
    void setAllDay( bool isAllDay );
    /* pin this event to a timezone! FIXME */
    void setTimeZone( const QString& timeZone );
    QString timeZone()const;
    virtual bool match( const QRegExp& )const;
    /** For exception to recurrence here is a list of children...  */
    QArray<int> children()const;
    void setChildren( const QArray<int>& );
    void addChild( int uid );
    void removeChild( int uid );
    /** return the parent OEvent */
    int parent()const;
    void setParent( int uid );
    /* needed reimp */
    QString toRichText()const;
    QString toShortText()const;
    QString type()const;
    QMap<int, QString> toMap()const;
-    QMap<QString, QString> toExtraMap()const;
    QString recordField(int )const;
    static int rtti();
    bool loadFromStream( QDataStream& );
    bool saveToStream( QDataStream& )const;
 /*    bool operator==( const OEvent& );
    bool operator!=( const OEvent& );
    bool operator<( const OEvent& );
    bool operator<=( const OEvent& );
    bool operator>( const OEvent& );
    bool operator>=(const OEvent& );
 */
 private:
    inline void changeOrModify();
    void deref();
    struct Data;
    Data* data;
    class Private;
    Private* priv;
 };
 /**
 * AN Event can span through multiple days. We split up a multiday eve
 */
 class OEffectiveEvent {
 public:
    typedef QValueList<OEffectiveEvent> ValueList;
    enum Position { MidWay, Start, End, StartEnd };
        // If we calculate the effective event of a multi-day event
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index c84eeeb..38b93f7 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -250,112 +250,112 @@ void OTodo::setMaintainer( const OPimMaintainer& pim ) {
        (*data->maintainer) = pim;
    else
        data->maintainer = new OPimMaintainer( pim );
 }
 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
 */
 QString OTodo::toRichText() const
 {
  QString text;
  QStringList catlist;
  // summary
  text += "<b><h3><img src=\"todo/TodoList\">";
  if ( !summary().isEmpty() ) {
      text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
  }
  text += "</h3></b><br><hr><br>";
-    
  // description
  if( !description().isEmpty() ){
    text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ;
  }
  // priority
  int priorityval = priority();
  text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
          QString::number( priorityval ) + "\">";
 //  text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" +
 //          QString::number( priority() ) + "\"><br>";
  switch ( priorityval )
  {
    case 1 : text += QObject::tr( "Very high" );
        break;
    case 2 : text += QObject::tr( "High" );
        break;
    case 3 : text += QObject::tr( "Normal" );
        break;
    case 4 : text += QObject::tr( "Low" );
        break;
    case 5 : text += QObject::tr( "Very low" );
        break;
  };
  text += "<br>";
-    
  // progress
  text += "<b>" + QObject::tr( "Progress:") + " </b>"
          + QString::number( progress() ) + " %<br>";
-          
  // due date
  if (hasDueDate() ){
    QDate dd = dueDate();
    int off = QDate::currentDate().daysTo( dd );
-    
    text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\"";
    if ( off < 0 )
      text += "#FF0000";
    else if ( off == 0 )
      text += "#FFFF00";
    else if ( off > 0 )
      text += "#00FF00";
    text += "\">" + dd.toString() + "</font><br>";
  }
-  
  // categories
  text += "<b>" + QObject::tr( "Category:") + "</b> ";
  text += categoryNames( "Todo List" ).join(", ");
  text += "<br>";
  return text;
 }
 bool OTodo::hasNotifiers()const {
    if (!data->notifiers) return false;
    return !data->notifiers->isEmpty();
 }
 OPimNotifyManager& OTodo::notifiers() {
    if (!data->notifiers )
        data->notifiers = new OPimNotifyManager;
    return (*data->notifiers);
 }
 const OPimNotifyManager& OTodo::notifiers()const{
    if (!data->notifiers )
        data->notifiers = new OPimNotifyManager;
    return (*data->notifiers);
 }
 bool OTodo::operator<( const OTodo &toDoEvent )const{
    if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
    if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
    if( hasDueDate() && toDoEvent.hasDueDate() ){
        if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
            return priority() < toDoEvent.priority();
        }else{
            return dueDate() < toDoEvent.dueDate();
        }
@@ -431,67 +431,64 @@ OTodo &OTodo::operator=(const OTodo &item )
    OPimRecord::operator=( item );
    //qWarning("operator= ref ");
    item.data->ref();
    deref();
    data = item.data;
    return *this;
 }
 QMap<int, QString> OTodo::toMap() const {
    QMap<int, QString> map;
    map.insert( Uid, QString::number( uid() ) );
    map.insert( Category,  idsToString( categories() ) );
    map.insert( HasDate, QString::number( data->hasDate ) );
    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() );
    /* FIXME!!!   map.insert( State,  );
    map.insert( Recurrence, );
    map.insert( Reminders, );
    map.
    */
    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");
        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;
    if (src->state )
        dest->state = new OPimState( *src->state );
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index 4d5ee36..f9a345a 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -164,65 +164,64 @@ public:
    /**
     * A small summary of the todo
     */
    QString summary() const;
    /**
     * @reimplemented
     * Return this todoevent in a RichText formatted QString
     */
    QString toRichText() const;
    bool hasNotifiers()const;
    /*
     * FIXME check if the sharing is still fine!! -zecke
     * ### CHECK If API is fine
     */
    /**
     * return a reference to our notifiers...
     */
    OPimNotifyManager &notifiers();
    /**
     *
     */
    const OPimNotifyManager &notifiers()const;
    /**
     * reimplementations
     */
    QString type()const;
    QString toShortText()const;
-    QMap<QString, QString> toExtraMap()const;
    QString recordField(int id )const;
    /**
     * toMap puts all data into the map. int relates
     * to ToDoEvent RecordFields enum
     */
    QMap<int, QString> toMap()const;
    /**
     * Set if this Todo is completed
     */
    void setCompleted(bool completed );
    /**
     * set if this todo got an end data
     */
    void setHasDueDate( bool hasDate );
    // FIXME we do not have these for start, completed
    // cause we'll use the isNull() of QDate for figuring
    // out if it's has a date...
    // decide what to do here? -zecke
    /**
     * Set the priority of the Todo
     */
    void setPriority(int priority );
    /**
     * Set the progress.
     */
    void setProgress( ushort progress );