author | tille <tille> | 2003-05-10 16:48:06 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-10 16:48:06 (UTC) |
commit | 2a37284ab7ea4a29b6e55a84445ad5b2e3d6739b (patch) (unidiff) | |
tree | 106fbe5d77b51b93662400360a7f50905be9f407 | |
parent | e4cde5a1da5271b8bc4919afedaf9cb47e346409 (diff) | |
download | opie-2a37284ab7ea4a29b6e55a84445ad5b2e3d6739b.zip opie-2a37284ab7ea4a29b6e55a84445ad5b2e3d6739b.tar.gz opie-2a37284ab7ea4a29b6e55a84445ad5b2e3d6739b.tar.bz2 |
QString::contains( QRegExp ) does not use the settings of QRegExp
(QT feature or bug?)
lets use QRegExp::match( QString ) instead
-rw-r--r-- | libopie/pim/oevent.cpp | 10 | ||||
-rw-r--r-- | libopie2/opiepim/oevent.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp index b731c8a..cda12f9 100644 --- a/libopie/pim/oevent.cpp +++ b/libopie/pim/oevent.cpp | |||
@@ -209,21 +209,21 @@ void OEvent::setTimeZone( const QString& tz ) { | |||
209 | } | 209 | } |
210 | QString OEvent::timeZone()const { | 210 | QString OEvent::timeZone()const { |
211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); | 211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); |
212 | return data->timezone; | 212 | return data->timezone; |
213 | } | 213 | } |
214 | bool OEvent::match( const QRegExp& re )const { | 214 | bool OEvent::match( const QRegExp& re )const { |
215 | if (data->description.contains( re ) ) | 215 | if ( re.match( data->description ) != -1 ) |
216 | return true; | 216 | return true; |
217 | if ( data->note.contains( re ) ) | 217 | if ( re.match( data->note ) != -1 ) |
218 | return true; | 218 | return true; |
219 | if ( data->location.contains( re ) ) | 219 | if ( re.match( data->location ) != -1 ) |
220 | return true; | 220 | return true; |
221 | if ( data->start.toString().contains( re ) ) | 221 | if ( re.match( data->start.toString() ) != -1 ) |
222 | return true; | 222 | return true; |
223 | if ( data->end.toString().contains( re ) ) | 223 | if ( re.match( data->end.toString() ) != -1 ) |
224 | return true; | 224 | return true; |
225 | return false; | 225 | return false; |
226 | } | 226 | } |
227 | QString OEvent::toRichText()const { | 227 | QString OEvent::toRichText()const { |
228 | QString text; | 228 | QString text; |
229 | if ( !description().isEmpty() ) { | 229 | if ( !description().isEmpty() ) { |
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp index b731c8a..cda12f9 100644 --- a/libopie2/opiepim/oevent.cpp +++ b/libopie2/opiepim/oevent.cpp | |||
@@ -209,21 +209,21 @@ void OEvent::setTimeZone( const QString& tz ) { | |||
209 | } | 209 | } |
210 | QString OEvent::timeZone()const { | 210 | QString OEvent::timeZone()const { |
211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); | 211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); |
212 | return data->timezone; | 212 | return data->timezone; |
213 | } | 213 | } |
214 | bool OEvent::match( const QRegExp& re )const { | 214 | bool OEvent::match( const QRegExp& re )const { |
215 | if (data->description.contains( re ) ) | 215 | if ( re.match( data->description ) != -1 ) |
216 | return true; | 216 | return true; |
217 | if ( data->note.contains( re ) ) | 217 | if ( re.match( data->note ) != -1 ) |
218 | return true; | 218 | return true; |
219 | if ( data->location.contains( re ) ) | 219 | if ( re.match( data->location ) != -1 ) |
220 | return true; | 220 | return true; |
221 | if ( data->start.toString().contains( re ) ) | 221 | if ( re.match( data->start.toString() ) != -1 ) |
222 | return true; | 222 | return true; |
223 | if ( data->end.toString().contains( re ) ) | 223 | if ( re.match( data->end.toString() ) != -1 ) |
224 | return true; | 224 | return true; |
225 | return false; | 225 | return false; |
226 | } | 226 | } |
227 | QString OEvent::toRichText()const { | 227 | QString OEvent::toRichText()const { |
228 | QString text; | 228 | QString text; |
229 | if ( !description().isEmpty() ) { | 229 | if ( !description().isEmpty() ) { |