| -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 @@ -199,41 +199,41 @@ bool OEvent::isAllDay()const { return data->isAllDay; } void OEvent::setAllDay( bool allDay ) { changeOrModify(); data->isAllDay = allDay; if (allDay ) data->timezone = "UTC"; } void OEvent::setTimeZone( const QString& tz ) { changeOrModify(); data->timezone = tz; } QString OEvent::timeZone()const { if (data->isAllDay ) return QString::fromLatin1("UTC"); return data->timezone; } bool OEvent::match( const QRegExp& re )const { - if (data->description.contains( re ) ) + if ( re.match( data->description ) != -1 ) return true; - if ( data->note.contains( re ) ) + if ( re.match( data->note ) != -1 ) return true; - if ( data->location.contains( re ) ) + if ( re.match( data->location ) != -1 ) return true; - if ( data->start.toString().contains( re ) ) + if ( re.match( data->start.toString() ) != -1 ) return true; - if ( data->end.toString().contains( re ) ) + if ( re.match( data->end.toString() ) != -1 ) return true; return false; } QString OEvent::toRichText()const { QString text; if ( !description().isEmpty() ) { text += "<b>" + QObject::tr( "Description:") + "</b><br>"; text += Qtopia::escapeString(description() ). replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; } if ( startDateTime().isValid() ) { text += "<b>" + QObject::tr( "Start:") + "</b> "; text += Qtopia::escapeString(startDateTime().toString() ). replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; } if ( endDateTime().isValid() ) { 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 @@ -199,41 +199,41 @@ bool OEvent::isAllDay()const { return data->isAllDay; } void OEvent::setAllDay( bool allDay ) { changeOrModify(); data->isAllDay = allDay; if (allDay ) data->timezone = "UTC"; } void OEvent::setTimeZone( const QString& tz ) { changeOrModify(); data->timezone = tz; } QString OEvent::timeZone()const { if (data->isAllDay ) return QString::fromLatin1("UTC"); return data->timezone; } bool OEvent::match( const QRegExp& re )const { - if (data->description.contains( re ) ) + if ( re.match( data->description ) != -1 ) return true; - if ( data->note.contains( re ) ) + if ( re.match( data->note ) != -1 ) return true; - if ( data->location.contains( re ) ) + if ( re.match( data->location ) != -1 ) return true; - if ( data->start.toString().contains( re ) ) + if ( re.match( data->start.toString() ) != -1 ) return true; - if ( data->end.toString().contains( re ) ) + if ( re.match( data->end.toString() ) != -1 ) return true; return false; } QString OEvent::toRichText()const { QString text; if ( !description().isEmpty() ) { text += "<b>" + QObject::tr( "Description:") + "</b><br>"; text += Qtopia::escapeString(description() ). replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; } if ( startDateTime().isValid() ) { text += "<b>" + QObject::tr( "Start:") + "</b> "; text += Qtopia::escapeString(startDateTime().toString() ). replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; } if ( endDateTime().isValid() ) { |