| -rw-r--r-- | libopie2/opiepim/oevent.cpp | 20 | ||||
| -rw-r--r-- | libopie2/opiepim/otodo.cpp | 12 |
2 files changed, 23 insertions, 9 deletions
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 @@ -209,22 +209,32 @@ void OEvent::setTimeZone( const QString& 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>"; 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 @@ -102,19 +102,23 @@ OTodo::OTodo(bool completed, int priority, data->prog = progress; data->desc = Qtopia::simplifyMultiLineSpace(description ); } bool OTodo::match( const QRegExp ®Exp )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; |