lastHitField impl

4 files changed, 46 insertions, 18 deletions

diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index cda12f9..2b138c0 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -87,266 +87,276 @@ OEvent& OEvent::operator=( const OEvent& ev) {
 
     OPimRecord::operator=( ev );
     ev.data->ref();
     deref();
     data = ev.data;
 
 
     return *this;
 }
 QString OEvent::description()const {
     return data->description;
 }
 void OEvent::setDescription( const QString& description ) {
     changeOrModify();
     data->description = description;
 }
 void OEvent::setLocation( const QString& loc ) {
     changeOrModify();
     data->location = loc;
 }
 QString OEvent::location()const {
     return data->location;
 }
 OPimNotifyManager &OEvent::notifiers()const {
     // I hope we can skip the changeOrModify here
     // the notifier should take care of it
     // and OPimNotify is shared too
     if (!data->manager )
         data->manager = new OPimNotifyManager;
 
     return *data->manager;
 }
 bool OEvent::hasNotifiers()const {
     if (!data->manager )
         return false;
     if (data->manager->reminders().isEmpty() &&
         data->manager->alarms().isEmpty() )
         return false;
 
     return true;
 }
 ORecur OEvent::recurrence()const {
     if (!data->recur)
         data->recur = new ORecur;
 
     return *data->recur;
 }
 void OEvent::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 bool OEvent::hasRecurrence()const {
     if (!data->recur ) return false;
     return data->recur->doesRecur();
 }
 QString OEvent::note()const {
     return data->note;
 }
 void OEvent::setNote( const QString& note ) {
     changeOrModify();
     data->note = note;
 }
 QDateTime OEvent::createdDateTime()const {
     return data->created;
 }
 void OEvent::setCreatedDateTime( const QDateTime& time ) {
     changeOrModify();
     data->created = time;
 }
 QDateTime OEvent::startDateTime()const {
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(0, 0, 0 ) );
     return data->start;
 }
 QDateTime OEvent::startDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->start, OTimeZone::current() );
 }
 void OEvent::setStartDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->start = dt;
 }
 QDateTime OEvent::endDateTime()const {
     /*
      * if all Day event the end time needs
      * to be on the same day as the start
      */
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(23, 59, 59 ) );
     return data->end;
 }
 QDateTime OEvent::endDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->end, OTimeZone::current() );
 }
 void OEvent::setEndDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->end =    dt;
 }
 bool OEvent::isMultipleDay()const {
     return data->end.date().day() - data->start.date().day();
 }
 bool OEvent::isAllDay()const {
     return data->isAllDay;
 }
 void OEvent::setAllDay( bool allDay ) {
     changeOrModify();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
 void OEvent::setTimeZone( const QString& tz ) {
     changeOrModify();
     data->timezone = tz;
 }
 QString OEvent::timeZone()const {
     if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
 bool OEvent::match( const QRegExp& re )const {
-    if ( re.match( data->description ) != -1 )
+    if ( re.match( data->description ) != -1 ){
+        setLastHitField( DatebookDescription );
         return true;
-    if ( re.match( data->note ) != -1 )
+    }
+    if ( re.match( data->note ) != -1 ){
+        setLastHitField( Note );
         return true;
-    if ( re.match( data->location ) != -1 )
+    }
+    if ( re.match( data->location ) != -1 ){
+        setLastHitField( Location );
         return true;
-    if ( re.match( data->start.toString() ) != -1 )
+    }
+    if ( re.match( data->start.toString() ) != -1 ){
+        setLastHitField( StartDateTime );
         return true;
-    if ( re.match( data->end.toString() ) != -1 )
+    }
+    if ( re.match( data->end.toString() ) != -1 ){
+        setLastHitField( EndDateTime );
         return true;
+    }
     return false;
 }
 QString OEvent::toRichText()const {
     QString text;
     if ( !description().isEmpty() ) {
         text += "<b>" + QObject::tr( "Description:") + "</b><br>";
         text += Qtopia::escapeString(description() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( startDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "Start:") + "</b> ";
         text += Qtopia::escapeString(startDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( endDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "End:") + "</b> ";
         text += Qtopia::escapeString(endDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     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;
 }
 bool OEvent::loadFromStream( QDataStream& ) {
     return true;
 }
 bool OEvent::saveToStream( QDataStream& )const {
     return true;
 }
 void OEvent::changeOrModify() {
     if ( data->count != 1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         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;
     }
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index a29d88e..e087a00 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -1,242 +1,246 @@
 
 #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 "opimmaintainer.h"
 #include "opimnotifymanager.h"
 #include "opimresolver.h"
 
 #include "otodo.h"
 
 
 struct OTodo::OTodoData : public QShared {
     OTodoData() : QShared() {
         recur = 0;
         state = 0;
         maintainer = 0;
         notifiers = 0;
     };
 
     QDate date;
     bool isCompleted:1;
     bool hasDate:1;
     int priority;
     QString desc;
     QString sum;
     QMap<QString, QString> extra;
     ushort prog;
     OPimState *state;
     ORecur *recur;
     OPimMaintainer *maintainer;
     QDate start;
     QDate completed;
     OPimNotifyManager *notifiers;
 };
 
 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;
     }
 }
 OTodo::OTodo(bool completed, int priority,
                      const QArray<int> &category,
                      const QString& summary,
                      const QString &description,
                      ushort progress,
                      bool hasDate, QDate date, int uid )
     : OPimRecord(  uid )
 {
 //    qWarning("OTodoData " + summary);
     setCategories( category );
 
     data = new OTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace(description );
 }
 OTodo::OTodo(bool completed, int priority,
                      const QStringList &category,
                      const QString& summary,
                      const QString &description,
                      ushort progress,
                      bool hasDate, QDate date, int uid )
     : OPimRecord(  uid )
 {
 //    qWarning("OTodoData" + summary);
     setCategories( idsFromString( category.join(";") ) );
 
     data = new OTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace(description );
 }
 bool OTodo::match( const QRegExp &regExp )const
 {
   if( QString::number( data->priority ).find( regExp ) != -1 ){
-    return true;
+      setLastHitField( Priority );
+      return true;
   }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){
-    return true;
+      setLastHitField( HasDate );
+      return true;
   }else if(data->desc.find( regExp ) != -1 ){
-    return true;
+        setLastHitField( Description );
+        return true;
   }else if(data->sum.find( regExp ) != -1 ) {
-    return true;
+        setLastHitField( Summary );
+        return true;
   }
   return false;
 }
 bool OTodo::isCompleted() const
 {
     return data->isCompleted;
 }
 bool OTodo::hasDueDate() const
 {
     return data->hasDate;
 }
 bool OTodo::hasStartDate()const {
     return data->start.isValid();
 }
 bool OTodo::hasCompletedDate()const {
     return data->completed.isValid();
 }
 int OTodo::priority()const
 {
     return data->priority;
 }
 QString OTodo::summary() const
 {
     return data->sum;
 }
 ushort OTodo::progress() const
 {
     return data->prog;
 }
 QDate OTodo::dueDate()const
 {
     return data->date;
 }
 QDate OTodo::startDate()const {
     return data->start;
 }
 QDate OTodo::completedDate()const {
     return data->completed;
 }
 QString OTodo::description()const
 {
     return data->desc;
 }
 bool OTodo::hasState() const{
     if (!data->state ) return false;
     return ( data->state->state() != OPimState::Undefined );
 }
 OPimState OTodo::state()const {
     if (!data->state ) {
         OPimState state;
         return state;
     }
 
     return (*data->state);
 }
 bool OTodo::hasRecurrence()const {
     if (!data->recur) return false;
     return data->recur->doesRecur();
 }
 ORecur OTodo::recurrence()const {
     if (!data->recur) return ORecur();
 
     return (*data->recur);
 }
 bool OTodo::hasMaintainer()const {
     if (!data->maintainer) return false;
 
     return (data->maintainer->mode() != OPimMaintainer::Undefined );
 }
 OPimMaintainer OTodo::maintainer()const {
     if (!data->maintainer) return OPimMaintainer();
 
     return (*data->maintainer);
 }
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 void OTodo::setDescription(const QString &desc )
 {
 //    qWarning( "desc " + desc );
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void OTodo::setSummary( const QString& sum )
 {
     changeOrModify();
     data->sum = sum;
 }
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 void OTodo::setDueDate( const QDate& date )
 {
     changeOrModify();
     data->date = date;
 }
 void OTodo::setStartDate( const QDate& date ) {
     changeOrModify();
     data->start = date;
 }
 void OTodo::setCompletedDate( const QDate& date ) {
     changeOrModify();
     data->completed = date;
 }
 void OTodo::setState( const OPimState& state ) {
     changeOrModify();
     if (data->state )
         (*data->state) = state;
     else
         data->state = new OPimState( state );
 }
 void OTodo::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 void OTodo::setMaintainer( const OPimMaintainer& pim ) {
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index cda12f9..2b138c0 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -87,266 +87,276 @@ OEvent& OEvent::operator=( const OEvent& ev) {
 
     OPimRecord::operator=( ev );
     ev.data->ref();
     deref();
     data = ev.data;
 
 
     return *this;
 }
 QString OEvent::description()const {
     return data->description;
 }
 void OEvent::setDescription( const QString& description ) {
     changeOrModify();
     data->description = description;
 }
 void OEvent::setLocation( const QString& loc ) {
     changeOrModify();
     data->location = loc;
 }
 QString OEvent::location()const {
     return data->location;
 }
 OPimNotifyManager &OEvent::notifiers()const {
     // I hope we can skip the changeOrModify here
     // the notifier should take care of it
     // and OPimNotify is shared too
     if (!data->manager )
         data->manager = new OPimNotifyManager;
 
     return *data->manager;
 }
 bool OEvent::hasNotifiers()const {
     if (!data->manager )
         return false;
     if (data->manager->reminders().isEmpty() &&
         data->manager->alarms().isEmpty() )
         return false;
 
     return true;
 }
 ORecur OEvent::recurrence()const {
     if (!data->recur)
         data->recur = new ORecur;
 
     return *data->recur;
 }
 void OEvent::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 bool OEvent::hasRecurrence()const {
     if (!data->recur ) return false;
     return data->recur->doesRecur();
 }
 QString OEvent::note()const {
     return data->note;
 }
 void OEvent::setNote( const QString& note ) {
     changeOrModify();
     data->note = note;
 }
 QDateTime OEvent::createdDateTime()const {
     return data->created;
 }
 void OEvent::setCreatedDateTime( const QDateTime& time ) {
     changeOrModify();
     data->created = time;
 }
 QDateTime OEvent::startDateTime()const {
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(0, 0, 0 ) );
     return data->start;
 }
 QDateTime OEvent::startDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->start, OTimeZone::current() );
 }
 void OEvent::setStartDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->start = dt;
 }
 QDateTime OEvent::endDateTime()const {
     /*
      * if all Day event the end time needs
      * to be on the same day as the start
      */
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(23, 59, 59 ) );
     return data->end;
 }
 QDateTime OEvent::endDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->end, OTimeZone::current() );
 }
 void OEvent::setEndDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->end =    dt;
 }
 bool OEvent::isMultipleDay()const {
     return data->end.date().day() - data->start.date().day();
 }
 bool OEvent::isAllDay()const {
     return data->isAllDay;
 }
 void OEvent::setAllDay( bool allDay ) {
     changeOrModify();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
 void OEvent::setTimeZone( const QString& tz ) {
     changeOrModify();
     data->timezone = tz;
 }
 QString OEvent::timeZone()const {
     if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
 bool OEvent::match( const QRegExp& re )const {
-    if ( re.match( data->description ) != -1 )
+    if ( re.match( data->description ) != -1 ){
+        setLastHitField( DatebookDescription );
         return true;
-    if ( re.match( data->note ) != -1 )
+    }
+    if ( re.match( data->note ) != -1 ){
+        setLastHitField( Note );
         return true;
-    if ( re.match( data->location ) != -1 )
+    }
+    if ( re.match( data->location ) != -1 ){
+        setLastHitField( Location );
         return true;
-    if ( re.match( data->start.toString() ) != -1 )
+    }
+    if ( re.match( data->start.toString() ) != -1 ){
+        setLastHitField( StartDateTime );
         return true;
-    if ( re.match( data->end.toString() ) != -1 )
+    }
+    if ( re.match( data->end.toString() ) != -1 ){
+        setLastHitField( EndDateTime );
         return true;
+    }
     return false;
 }
 QString OEvent::toRichText()const {
     QString text;
     if ( !description().isEmpty() ) {
         text += "<b>" + QObject::tr( "Description:") + "</b><br>";
         text += Qtopia::escapeString(description() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( startDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "Start:") + "</b> ";
         text += Qtopia::escapeString(startDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( endDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "End:") + "</b> ";
         text += Qtopia::escapeString(endDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     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;
 }
 bool OEvent::loadFromStream( QDataStream& ) {
     return true;
 }
 bool OEvent::saveToStream( QDataStream& )const {
     return true;
 }
 void OEvent::changeOrModify() {
     if ( data->count != 1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         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;
     }
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index a29d88e..e087a00 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -1,242 +1,246 @@
 
 #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 "opimmaintainer.h"
 #include "opimnotifymanager.h"
 #include "opimresolver.h"
 
 #include "otodo.h"
 
 
 struct OTodo::OTodoData : public QShared {
     OTodoData() : QShared() {
         recur = 0;
         state = 0;
         maintainer = 0;
         notifiers = 0;
     };
 
     QDate date;
     bool isCompleted:1;
     bool hasDate:1;
     int priority;
     QString desc;
     QString sum;
     QMap<QString, QString> extra;
     ushort prog;
     OPimState *state;
     ORecur *recur;
     OPimMaintainer *maintainer;
     QDate start;
     QDate completed;
     OPimNotifyManager *notifiers;
 };
 
 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;
     }
 }
 OTodo::OTodo(bool completed, int priority,
                      const QArray<int> &category,
                      const QString& summary,
                      const QString &description,
                      ushort progress,
                      bool hasDate, QDate date, int uid )
     : OPimRecord(  uid )
 {
 //    qWarning("OTodoData " + summary);
     setCategories( category );
 
     data = new OTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace(description );
 }
 OTodo::OTodo(bool completed, int priority,
                      const QStringList &category,
                      const QString& summary,
                      const QString &description,
                      ushort progress,
                      bool hasDate, QDate date, int uid )
     : OPimRecord(  uid )
 {
 //    qWarning("OTodoData" + summary);
     setCategories( idsFromString( category.join(";") ) );
 
     data = new OTodoData;
 
     data->date = date;
     data->isCompleted = completed;
     data->hasDate = hasDate;
     data->priority = priority;
     data->sum = summary;
     data->prog = progress;
     data->desc = Qtopia::simplifyMultiLineSpace(description );
 }
 bool OTodo::match( const QRegExp &regExp )const
 {
   if( QString::number( data->priority ).find( regExp ) != -1 ){
-    return true;
+      setLastHitField( Priority );
+      return true;
   }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){
-    return true;
+      setLastHitField( HasDate );
+      return true;
   }else if(data->desc.find( regExp ) != -1 ){
-    return true;
+        setLastHitField( Description );
+        return true;
   }else if(data->sum.find( regExp ) != -1 ) {
-    return true;
+        setLastHitField( Summary );
+        return true;
   }
   return false;
 }
 bool OTodo::isCompleted() const
 {
     return data->isCompleted;
 }
 bool OTodo::hasDueDate() const
 {
     return data->hasDate;
 }
 bool OTodo::hasStartDate()const {
     return data->start.isValid();
 }
 bool OTodo::hasCompletedDate()const {
     return data->completed.isValid();
 }
 int OTodo::priority()const
 {
     return data->priority;
 }
 QString OTodo::summary() const
 {
     return data->sum;
 }
 ushort OTodo::progress() const
 {
     return data->prog;
 }
 QDate OTodo::dueDate()const
 {
     return data->date;
 }
 QDate OTodo::startDate()const {
     return data->start;
 }
 QDate OTodo::completedDate()const {
     return data->completed;
 }
 QString OTodo::description()const
 {
     return data->desc;
 }
 bool OTodo::hasState() const{
     if (!data->state ) return false;
     return ( data->state->state() != OPimState::Undefined );
 }
 OPimState OTodo::state()const {
     if (!data->state ) {
         OPimState state;
         return state;
     }
 
     return (*data->state);
 }
 bool OTodo::hasRecurrence()const {
     if (!data->recur) return false;
     return data->recur->doesRecur();
 }
 ORecur OTodo::recurrence()const {
     if (!data->recur) return ORecur();
 
     return (*data->recur);
 }
 bool OTodo::hasMaintainer()const {
     if (!data->maintainer) return false;
 
     return (data->maintainer->mode() != OPimMaintainer::Undefined );
 }
 OPimMaintainer OTodo::maintainer()const {
     if (!data->maintainer) return OPimMaintainer();
 
     return (*data->maintainer);
 }
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 void OTodo::setDescription(const QString &desc )
 {
 //    qWarning( "desc " + desc );
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void OTodo::setSummary( const QString& sum )
 {
     changeOrModify();
     data->sum = sum;
 }
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 void OTodo::setDueDate( const QDate& date )
 {
     changeOrModify();
     data->date = date;
 }
 void OTodo::setStartDate( const QDate& date ) {
     changeOrModify();
     data->start = date;
 }
 void OTodo::setCompletedDate( const QDate& date ) {
     changeOrModify();
     data->completed = date;
 }
 void OTodo::setState( const OPimState& state ) {
     changeOrModify();
     if (data->state )
         (*data->state) = state;
     else
         data->state = new OPimState( state );
 }
 void OTodo::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 void OTodo::setMaintainer( const OPimMaintainer& pim ) {