get the field where the hit was

4 files changed, 10 insertions, 2 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index a38b62b..aeb69ee 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -949,24 +949,25 @@ 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
 {
     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() );
 }
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 0e6cbd2..f79f0f3 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -205,25 +205,28 @@ public:
 
     QString toShortText()const;
     QString OContact::type()const;
     QMap<QString,QString> OContact::toExtraMap() const;
     class QString OContact::recordField(int) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
     // the emails should be seperated by a comma
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
     static int rtti();
-
+    int lastHitField() const {return m_lastHitField;};
+protected:
+    mutable int m_lastHitField;
+    void setLastHitField(int i) const { m_lastHitField = i; };
 
 private:
     // The XML-Backend needs some access to the private functions
     friend class OContactAccessBackend_XML;
 
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
     static QStringList fields();
 
     void save( QString &buf ) const;
 
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index a38b62b..aeb69ee 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -949,24 +949,25 @@ 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
 {
     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() );
 }
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index 0e6cbd2..f79f0f3 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -205,25 +205,28 @@ public:
 
     QString toShortText()const;
     QString OContact::type()const;
     QMap<QString,QString> OContact::toExtraMap() const;
     class QString OContact::recordField(int) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
     // the emails should be seperated by a comma
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
     static int rtti();
-
+    int lastHitField() const {return m_lastHitField;};
+protected:
+    mutable int m_lastHitField;
+    void setLastHitField(int i) const { m_lastHitField = i; };
 
 private:
     // The XML-Backend needs some access to the private functions
     friend class OContactAccessBackend_XML;
 
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
     static QStringList fields();
 
     void save( QString &buf ) const;