author | zecke <zecke> | 2003-05-14 14:41:47 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-05-14 14:41:47 (UTC) |
commit | cc794c5ba028bbf07fa280ed49bd0b8cfb745bd7 (patch) (unidiff) | |
tree | a5496cd003388591cc4a5e323bb5c99646919b92 /libopie | |
parent | 3c4a67b8b8d3fb554c5259f9f5ca35c5c826b13c (diff) | |
download | opie-cc794c5ba028bbf07fa280ed49bd0b8cfb745bd7.zip opie-cc794c5ba028bbf07fa280ed49bd0b8cfb745bd7.tar.gz opie-cc794c5ba028bbf07fa280ed49bd0b8cfb745bd7.tar.bz2 |
move lastHitField stuff into OPIMRecord
-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 | |||
@@ -953,6 +953,7 @@ void OContact::setChildren( const QString &str ) | |||
953 | */ | 953 | */ |
954 | bool OContact::match( const QRegExp &r ) const | 954 | bool OContact::match( const QRegExp &r ) const |
955 | { | 955 | { |
956 | setLastHitField( -1 ); | ||
956 | bool match; | 957 | bool match; |
957 | match = false; | 958 | match = false; |
958 | QMap<int, QString>::ConstIterator it; | 959 | QMap<int, QString>::ConstIterator it; |
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 | |||
@@ -214,10 +214,6 @@ public: | |||
214 | void setEmails( const QString &v ); | 214 | void setEmails( const QString &v ); |
215 | QString emails() const { return find( Qtopia::Emails ); } | 215 | QString emails() const { return find( Qtopia::Emails ); } |
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 | ||
222 | private: | 218 | private: |
223 | // The XML-Backend needs some access to the private functions | 219 | // The XML-Backend needs some access to the private functions |
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 | |||
@@ -11,6 +11,7 @@ Qtopia::UidGen OPimRecord::m_uidGen( Qtopia::UidGen::Qtopia ); | |||
11 | OPimRecord::OPimRecord( int uid ) | 11 | OPimRecord::OPimRecord( int uid ) |
12 | : Qtopia::Record() { | 12 | : Qtopia::Record() { |
13 | 13 | ||
14 | m_lastHit = -1; | ||
14 | setUid( uid ); | 15 | setUid( uid ); |
15 | } | 16 | } |
16 | OPimRecord::~OPimRecord() { | 17 | OPimRecord::~OPimRecord() { |
@@ -24,6 +25,7 @@ OPimRecord::OPimRecord( const OPimRecord& rec ) | |||
24 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { | 25 | OPimRecord &OPimRecord::operator=( const OPimRecord& rec) { |
25 | Qtopia::Record::operator=( rec ); | 26 | Qtopia::Record::operator=( rec ); |
26 | m_xrefman = rec.m_xrefman; | 27 | m_xrefman = rec.m_xrefman; |
28 | m_lastHit = rec.m_lastHit; | ||
27 | 29 | ||
28 | return *this; | 30 | return *this; |
29 | } | 31 | } |
@@ -164,3 +166,9 @@ OPimXRefPartner OPimRecord::partner( QDataStream& stream ) { | |||
164 | 166 | ||
165 | return par; | 167 | return par; |
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 | |||
@@ -76,7 +76,15 @@ public: | |||
76 | * matches the Records the regular expression? | 76 | * matches the Records the regular expression? |
77 | */ | 77 | */ |
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 | ||
81 | /** | 89 | /** |
82 | * converts the internal structure to a map | 90 | * converts the internal structure to a map |
@@ -121,6 +129,9 @@ public: | |||
121 | virtual bool saveToStream( QDataStream& stream )const; | 129 | virtual bool saveToStream( QDataStream& stream )const; |
122 | 130 | ||
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(); |
125 | // QString crossToString()const; | 136 | // QString crossToString()const; |
126 | 137 | ||