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
@@ -212,16 +212,26 @@ QString OEvent::timeZone()const {
     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 {
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
@@ -105,13 +105,17 @@ OTodo::OTodo(bool completed, int priority,
 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;
 }
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
@@ -212,16 +212,26 @@ QString OEvent::timeZone()const {
     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 {
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
@@ -105,13 +105,17 @@ OTodo::OTodo(bool completed, int priority,
 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;
 }