8 files changed, 44 insertions, 12 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index aeb69ee..a7ca975 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -908,96 +908,97 @@ QStringList OContact::fields()
 
     list.append( "HomeStreet" );
     list.append( "HomeCity" );
     list.append( "HomeState" );
     list.append( "HomeZip" );
     list.append( "HomeCountry" );
     list.append( "HomeWebPage" );
 
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
     list.append( "Children" );
 
     list.append( "Notes" );
     list.append( "Groups" );
 
     return list;
 }
 
 
 /*!
   Sets the list of email address for contact to those contained in \a str.
   Email address should be separated by ';'s.
 */
 void OContact::setEmails( const QString &str )
 {
     replace( Qtopia::Emails, str );
     if ( str.isEmpty() )
         setDefaultEmail( QString::null );
 }
 
 /*!
   Sets the list of children for the contact to those contained in \a str.
 */
 void OContact::setChildren( const QString &str )
 {
     replace( Qtopia::Children, str );
 }
 
 /*!
   \overload
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
+    setLastHitField( -1 );
     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() );
 }
 QString OContact::type() const
 {
 	return QString::fromLatin1( "OContact" );
 }
 
 // Definition is missing ! (se)
 QMap<QString,QString> OContact::toExtraMap() const
 {
 	qWarning ("Function not implemented: OContact::toExtraMap()");
 	QMap <QString,QString> useless;
 	return useless;
 }
 
 class QString OContact::recordField( int pos ) const
 {
 	QStringList SLFIELDS = fields(); // ?? why this ? (se)
 	return SLFIELDS[pos];
 }
 
 // In future releases, we should store birthday and anniversary
 // internally as QDate instead of QString !
 // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se)
 
 /*! \fn void OContact::setBirthday( const QDate& date )
   Sets the birthday for the contact to \a date. If date is null
   the current stored date will be removed.
 */
 void OContact::setBirthday( const QDate &v )
 {
 	if ( v.isNull() ){
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index f79f0f3..dd2de17 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -169,76 +169,72 @@ public:
     QString businessPager() const { return find( Qtopia::BusinessPager ); }
     QString profession() const { return find( Qtopia::Profession ); }
     QString assistant() const { return find( Qtopia::Assistant ); }
     QString manager() const { return find( Qtopia::Manager ); }
      /** Multi line string containing all non-empty address info in the form
     * Street
     * City, State Zip
     * Country
     */
     QString displayBusinessAddress() const;
 
     //personal
     QString spouse() const { return find( Qtopia::Spouse ); }
     QString gender() const { return find( Qtopia::Gender ); }
     QDate birthday() const;
     QDate anniversary() const;
     QString nickname() const { return find( Qtopia::Nickname ); }
     QString children() const { return find( Qtopia::Children ); }
     QStringList childrenList() const;
 
     // other
     QString notes() const { return find( Qtopia::Notes ); }
     QString groups() const { return find( Qtopia::Groups ); }
     QStringList groupList() const;
 
 //     // custom
 //     const QString &customField( const QString &key )
 //         { return find( Custom- + key ); }
 
 
     QString toRichText() const;
     QMap<int, QString> toMap() const;
     QString field( int key ) const { return find( key ); }
 
 
     void setUid( int i );
 
     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;
 
     QString displayAddress( const QString &street,
 			    const QString &city,
 			    const QString &state,
 			    const QString &zip,
 			    const QString &country ) const;
 
     QMap<int, QString> mMap;
     ContactPrivate *d;
 };
 
 
 #endif
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index d45417a..9510357 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -1,74 +1,76 @@
 #include <qarray.h>
 
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 #include "opimrecord.h"
 
 Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia );
 
 
 OPimRecord::OPimRecord( int uid )
     : Qtopia::Record() {
 
+    m_lastHit = -1;
     setUid( uid );
 }
 OPimRecord::~OPimRecord() {
 }
 OPimRecord::OPimRecord( const OPimRecord& rec )
     : Qtopia::Record( rec )
 {
     (*this) = rec;
 }
 
 OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
     Qtopia::Record::operator=( rec );
     m_xrefman = rec.m_xrefman;
+    m_lastHit = rec.m_lastHit;
 
     return  *this;
 }
 /*
  * category names
  */
 QStringList OPimRecord::categoryNames( const QString& appname ) const {
     QStringList list;
     QArray<int> cats = categories();
     Categories catDB;
     catDB.load( categoryFileName() );
 
     for (uint i = 0; i < cats.count(); i++ ) {
         list << catDB.label( appname, cats[i] );
     }
 
     return list;
 }
 void OPimRecord::setCategoryNames( const QStringList& ) {
 
 }
 void OPimRecord::addCategoryName( const QString& ) {
     Categories catDB;
     catDB.load( categoryFileName() );
 
 
 }
 bool OPimRecord::isEmpty()const {
     return ( uid() == 0 );
 }
 /*QString OPimRecord::crossToString()const {
     QString str;
     QMap<QString, QArray<int> >::ConstIterator it;
     for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
         QArray<int> id = it.data();
         for ( uint i = 0; i < id.size(); ++i ) {
             str += it.key() + "," + QString::number( i ) + ";";
         }
     }
     str = str.remove( str.length()-1, 1); // strip the ;
     //qWarning("IDS " + str );
 
     return str;
     }*/
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid ) {
     if ( uid == 1)
         uid = uidGen().generate();
@@ -119,48 +121,54 @@ bool OPimRecord::loadFromStream( QDataStream& stream ) {
     }
 
     return true;
 }
 bool OPimRecord::saveToStream( QDataStream& stream )const {
     /** UIDs */
 
     stream << uid();
 
     /** Categories  */
     stream << categories().count();
     for ( uint i = 0; i < categories().count(); i++ ) {
         stream << categories()[i];
     }
 
     /*
      * first the XRef count
      * then the xrefs
      */
     stream << m_xrefman.list().count();
     for ( OPimXRef::ValueList::ConstIterator it = m_xrefman.list().begin();
           it != m_xrefman.list().end(); ++it ) {
         flush( (*it).partner( OPimXRef::One),  stream  );
         flush( (*it).partner( OPimXRef::Two),  stream  );
     }
     return true;
 }
 void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const{
     str << par.service();
     str << par.uid();
     str << par.field();
 }
 OPimXRefPartner OPimRecord::partner( QDataStream& stream ) {
     OPimXRefPartner par;
     QString str;
     int i;
 
     stream >> str;
     par.setService( str );
 
     stream >> i;
     par.setUid( i );
 
     stream >> i ;
     par.setField( i );
 
     return par;
 }
+void OPimRecord::setLastHitField( int lastHit )const {
+    m_lastHit = lastHit;
+}
+int OPimRecord::lastHitField()const{
+    return m_lastHit;
+}
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h
index 6e7c0da..494c78e 100644
--- a/libopie/pim/opimrecord.h
+++ b/libopie/pim/opimrecord.h
@@ -30,111 +30,122 @@ public:
      */
     OPimRecord( const OPimRecord& rec );
 
     /**
      * copy operator
      */
     OPimRecord &operator=( const OPimRecord& );
 
     /**
      * category names resolved
      */
     QStringList categoryNames( const QString& appname )const;
 
     /**
      * set category names they will be resolved
      */
     void setCategoryNames( const QStringList& );
 
     /**
      * addCategoryName adds a name
      * to the internal category list
      */
     void addCategoryName( const QString& );
 
     /**
      * if a Record isEmpty
      * it's empty if it's 0
      */
     virtual bool isEmpty()const;
 
     /**
      * toRichText summary
      */
     virtual QString toRichText()const = 0;
 
     /**
      * a small one line summary
      */
     virtual QString toShortText()const = 0;
 
     /**
      * the name of the Record
      */
     virtual QString type()const = 0;
 
     /**
      * matches the Records the regular expression?
      */
-    virtual bool match( const QString &regexp ) const 
-	{return Qtopia::Record::match(QRegExp(regexp));};
+    virtual bool match( const QString &regexp ) const
+	{setLastHitField( -1 );
+            return Qtopia::Record::match(QRegExp(regexp));};
+
+    /**
+     * if implemented this function returns which item has been
+     * last hit by the match() function.
+     * or -1 if not implemented or no hit has occured
+     */
+    int lastHitField()const;
 
     /**
      * converts the internal structure to a map
      */
     virtual QMap<int, QString> toMap()const = 0;
 
     /**
      * key value representation of extra items
      */
     virtual QMap<QString, QString> toExtraMap()const = 0;
 
     /**
      * the name for a recordField
      */
     virtual QString recordField(int)const = 0;
 
     /**
      * returns a reference of the
      * Cross Reference Manager
      * Partner 'One' is THIS PIM RECORD!
      * 'Two' is the Partner where we link to
      */
     OPimXRefManager& xrefmanager();
 
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
     /*
      * used inside the Templates for casting
      * REIMPLEMENT in your ....
      */
     static int rtti();
 
     /**
      * some marshalling and de marshalling code
      * saves the OPimRecord
      * to and from a DataStream
      */
     virtual bool loadFromStream(QDataStream& );
     virtual bool saveToStream( QDataStream& stream )const;
 
 protected:
+    // need to be const cause it is called from const methods
+    mutable int m_lastHit;
+    void setLastHitField( int lastHit )const;
     Qtopia::UidGen &uidGen();
 //    QString crossToString()const;
 
 private:
     class OPimRecordPrivate;
     OPimRecordPrivate *d;
     OPimXRefManager m_xrefman;
     static Qtopia::UidGen m_uidGen;
 
 private:
     void flush( const OPimXRefPartner&, QDataStream& stream )const;
     OPimXRefPartner partner( QDataStream& );
 };
 
 
 
 #endif
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index d45417a..9510357 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -1,74 +1,76 @@
 #include <qarray.h>
 
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
 
 #include "opimrecord.h"
 
 Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia );
 
 
 OPimRecord::OPimRecord( int uid )
     : Qtopia::Record() {
 
+    m_lastHit = -1;
     setUid( uid );
 }
 OPimRecord::~OPimRecord() {
 }
 OPimRecord::OPimRecord( const OPimRecord& rec )
     : Qtopia::Record( rec )
 {
     (*this) = rec;
 }
 
 OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
     Qtopia::Record::operator=( rec );
     m_xrefman = rec.m_xrefman;
+    m_lastHit = rec.m_lastHit;
 
     return  *this;
 }
 /*
  * category names
  */
 QStringList OPimRecord::categoryNames( const QString& appname ) const {
     QStringList list;
     QArray<int> cats = categories();
     Categories catDB;
     catDB.load( categoryFileName() );
 
     for (uint i = 0; i < cats.count(); i++ ) {
         list << catDB.label( appname, cats[i] );
     }
 
     return list;
 }
 void OPimRecord::setCategoryNames( const QStringList& ) {
 
 }
 void OPimRecord::addCategoryName( const QString& ) {
     Categories catDB;
     catDB.load( categoryFileName() );
 
 
 }
 bool OPimRecord::isEmpty()const {
     return ( uid() == 0 );
 }
 /*QString OPimRecord::crossToString()const {
     QString str;
     QMap<QString, QArray<int> >::ConstIterator it;
     for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
         QArray<int> id = it.data();
         for ( uint i = 0; i < id.size(); ++i ) {
             str += it.key() + "," + QString::number( i ) + ";";
         }
     }
     str = str.remove( str.length()-1, 1); // strip the ;
     //qWarning("IDS " + str );
 
     return str;
     }*/
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid ) {
     if ( uid == 1)
         uid = uidGen().generate();
@@ -119,48 +121,54 @@ bool OPimRecord::loadFromStream( QDataStream& stream ) {
     }
 
     return true;
 }
 bool OPimRecord::saveToStream( QDataStream& stream )const {
     /** UIDs */
 
     stream << uid();
 
     /** Categories  */
     stream << categories().count();
     for ( uint i = 0; i < categories().count(); i++ ) {
         stream << categories()[i];
     }
 
     /*
      * first the XRef count
      * then the xrefs
      */
     stream << m_xrefman.list().count();
     for ( OPimXRef::ValueList::ConstIterator it = m_xrefman.list().begin();
           it != m_xrefman.list().end(); ++it ) {
         flush( (*it).partner( OPimXRef::One),  stream  );
         flush( (*it).partner( OPimXRef::Two),  stream  );
     }
     return true;
 }
 void OPimRecord::flush( const OPimXRefPartner& par, QDataStream& str ) const{
     str << par.service();
     str << par.uid();
     str << par.field();
 }
 OPimXRefPartner OPimRecord::partner( QDataStream& stream ) {
     OPimXRefPartner par;
     QString str;
     int i;
 
     stream >> str;
     par.setService( str );
 
     stream >> i;
     par.setUid( i );
 
     stream >> i ;
     par.setField( i );
 
     return par;
 }
+void OPimRecord::setLastHitField( int lastHit )const {
+    m_lastHit = lastHit;
+}
+int OPimRecord::lastHitField()const{
+    return m_lastHit;
+}
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index 6e7c0da..494c78e 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -30,111 +30,122 @@ public:
      */
     OPimRecord( const OPimRecord& rec );
 
     /**
      * copy operator
      */
     OPimRecord &operator=( const OPimRecord& );
 
     /**
      * category names resolved
      */
     QStringList categoryNames( const QString& appname )const;
 
     /**
      * set category names they will be resolved
      */
     void setCategoryNames( const QStringList& );
 
     /**
      * addCategoryName adds a name
      * to the internal category list
      */
     void addCategoryName( const QString& );
 
     /**
      * if a Record isEmpty
      * it's empty if it's 0
      */
     virtual bool isEmpty()const;
 
     /**
      * toRichText summary
      */
     virtual QString toRichText()const = 0;
 
     /**
      * a small one line summary
      */
     virtual QString toShortText()const = 0;
 
     /**
      * the name of the Record
      */
     virtual QString type()const = 0;
 
     /**
      * matches the Records the regular expression?
      */
-    virtual bool match( const QString &regexp ) const 
-	{return Qtopia::Record::match(QRegExp(regexp));};
+    virtual bool match( const QString &regexp ) const
+	{setLastHitField( -1 );
+            return Qtopia::Record::match(QRegExp(regexp));};
+
+    /**
+     * if implemented this function returns which item has been
+     * last hit by the match() function.
+     * or -1 if not implemented or no hit has occured
+     */
+    int lastHitField()const;
 
     /**
      * converts the internal structure to a map
      */
     virtual QMap<int, QString> toMap()const = 0;
 
     /**
      * key value representation of extra items
      */
     virtual QMap<QString, QString> toExtraMap()const = 0;
 
     /**
      * the name for a recordField
      */
     virtual QString recordField(int)const = 0;
 
     /**
      * returns a reference of the
      * Cross Reference Manager
      * Partner 'One' is THIS PIM RECORD!
      * 'Two' is the Partner where we link to
      */
     OPimXRefManager& xrefmanager();
 
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
     /*
      * used inside the Templates for casting
      * REIMPLEMENT in your ....
      */
     static int rtti();
 
     /**
      * some marshalling and de marshalling code
      * saves the OPimRecord
      * to and from a DataStream
      */
     virtual bool loadFromStream(QDataStream& );
     virtual bool saveToStream( QDataStream& stream )const;
 
 protected:
+    // need to be const cause it is called from const methods
+    mutable int m_lastHit;
+    void setLastHitField( int lastHit )const;
     Qtopia::UidGen &uidGen();
 //    QString crossToString()const;
 
 private:
     class OPimRecordPrivate;
     OPimRecordPrivate *d;
     OPimXRefManager m_xrefman;
     static Qtopia::UidGen m_uidGen;
 
 private:
     void flush( const OPimXRefPartner&, QDataStream& stream )const;
     OPimXRefPartner partner( QDataStream& );
 };
 
 
 
 #endif
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index aeb69ee..a7ca975 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -908,96 +908,97 @@ QStringList OContact::fields()
 
     list.append( "HomeStreet" );
     list.append( "HomeCity" );
     list.append( "HomeState" );
     list.append( "HomeZip" );
     list.append( "HomeCountry" );
     list.append( "HomeWebPage" );
 
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
     list.append( "Children" );
 
     list.append( "Notes" );
     list.append( "Groups" );
 
     return list;
 }
 
 
 /*!
   Sets the list of email address for contact to those contained in \a str.
   Email address should be separated by ';'s.
 */
 void OContact::setEmails( const QString &str )
 {
     replace( Qtopia::Emails, str );
     if ( str.isEmpty() )
         setDefaultEmail( QString::null );
 }
 
 /*!
   Sets the list of children for the contact to those contained in \a str.
 */
 void OContact::setChildren( const QString &str )
 {
     replace( Qtopia::Children, str );
 }
 
 /*!
   \overload
   Returns TRUE if the contact matches the regular expression \a regexp.
   Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
+    setLastHitField( -1 );
     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() );
 }
 QString OContact::type() const
 {
 	return QString::fromLatin1( "OContact" );
 }
 
 // Definition is missing ! (se)
 QMap<QString,QString> OContact::toExtraMap() const
 {
 	qWarning ("Function not implemented: OContact::toExtraMap()");
 	QMap <QString,QString> useless;
 	return useless;
 }
 
 class QString OContact::recordField( int pos ) const
 {
 	QStringList SLFIELDS = fields(); // ?? why this ? (se)
 	return SLFIELDS[pos];
 }
 
 // In future releases, we should store birthday and anniversary
 // internally as QDate instead of QString !
 // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se)
 
 /*! \fn void OContact::setBirthday( const QDate& date )
   Sets the birthday for the contact to \a date. If date is null
   the current stored date will be removed.
 */
 void OContact::setBirthday( const QDate &v )
 {
 	if ( v.isNull() ){
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index f79f0f3..dd2de17 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -169,76 +169,72 @@ public:
     QString businessPager() const { return find( Qtopia::BusinessPager ); }
     QString profession() const { return find( Qtopia::Profession ); }
     QString assistant() const { return find( Qtopia::Assistant ); }
     QString manager() const { return find( Qtopia::Manager ); }
      /** Multi line string containing all non-empty address info in the form
     * Street
     * City, State Zip
     * Country
     */
     QString displayBusinessAddress() const;
 
     //personal
     QString spouse() const { return find( Qtopia::Spouse ); }
     QString gender() const { return find( Qtopia::Gender ); }
     QDate birthday() const;
     QDate anniversary() const;
     QString nickname() const { return find( Qtopia::Nickname ); }
     QString children() const { return find( Qtopia::Children ); }
     QStringList childrenList() const;
 
     // other
     QString notes() const { return find( Qtopia::Notes ); }
     QString groups() const { return find( Qtopia::Groups ); }
     QStringList groupList() const;
 
 //     // custom
 //     const QString &customField( const QString &key )
 //         { return find( Custom- + key ); }
 
 
     QString toRichText() const;
     QMap<int, QString> toMap() const;
     QString field( int key ) const { return find( key ); }
 
 
     void setUid( int i );
 
     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;
 
     QString displayAddress( const QString &street,
 			    const QString &city,
 			    const QString &state,
 			    const QString &zip,
 			    const QString &country ) const;
 
     QMap<int, QString> mMap;
     ContactPrivate *d;
 };
 
 
 #endif