-rw-r--r-- | libopie/pim/ocontact.cpp | 1 | ||||
-rw-r--r-- | libopie/pim/ocontact.h | 4 | ||||
-rw-r--r-- | libopie/pim/opimrecord.cpp | 8 | ||||
-rw-r--r-- | libopie/pim/opimrecord.h | 13 |
4 files changed, 21 insertions, 5 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 | |||
@@ -955,2 +955,3 @@ bool OContact::match( const QRegExp &r ) const | |||
955 | { | 955 | { |
956 | setLastHitField( -1 ); | ||
956 | bool match; | 957 | bool match; |
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 | |||
@@ -216,6 +216,2 @@ public: | |||
216 | static int rtti(); | 216 | static int rtti(); |
217 | int lastHitField() const {return m_lastHitField;}; | ||
218 | protected: | ||
219 | mutable int m_lastHitField; | ||
220 | void setLastHitField(int i) const { m_lastHitField = i; }; | ||
221 | 217 | ||
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 | |||
@@ -13,2 +13,3 @@ OPimRecord::OPimRecord( int uid ) | |||
13 | 13 | ||
14 | m_lastHit = -1; | ||
14 | setUid( uid ); | 15 | setUid( uid ); |
@@ -26,2 +27,3 @@ OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | |||
26 | m_xrefman = rec.m_xrefman; | 27 | m_xrefman = rec.m_xrefman; |
28 | m_lastHit = rec.m_lastHit; | ||
27 | 29 | ||
@@ -166 +168,7 @@ OPimXRefPartner OPimRecord::partner( QDataStream& stream ) { | |||
166 | } | 168 | } |
169 | void OPimRecord::setLastHitField( int lastHit )const { | ||
170 | m_lastHit = lastHit; | ||
171 | } | ||
172 | int OPimRecord::lastHitField()const{ | ||
173 | return m_lastHit; | ||
174 | } | ||
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 | |||
@@ -78,3 +78,11 @@ public: | |||
78 | virtual bool match( const QString ®exp ) const | 78 | virtual bool match( const QString ®exp ) const |
79 | {return Qtopia::Record::match(QRegExp(regexp));}; | 79 | {setLastHitField( -1 ); |
80 | return Qtopia::Record::match(QRegExp(regexp));}; | ||
81 | |||
82 | /** | ||
83 | * if implemented this function returns which item has been | ||
84 | * last hit by the match() function. | ||
85 | * or -1 if not implemented or no hit has occured | ||
86 | */ | ||
87 | int lastHitField()const; | ||
80 | 88 | ||
@@ -123,2 +131,5 @@ public: | |||
123 | protected: | 131 | protected: |
132 | // need to be const cause it is called from const methods | ||
133 | mutable int m_lastHit; | ||
134 | void setLastHitField( int lastHit )const; | ||
124 | Qtopia::UidGen &uidGen(); | 135 | Qtopia::UidGen &uidGen(); |