toExtraMap is no more virtual

we save custom entries now

setExtraMap added as well

1 files changed, 5 insertions, 8 deletions

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
@@ -258,96 +258,96 @@ bool OTodo::isOverdue( )
     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{
@@ -439,51 +439,48 @@ OTodo &OTodo::operator=(const OTodo &item )
 
 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;