Diffstat (limited to 'korganizer/koeventviewer.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | korganizer/koeventviewer.cpp | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 44da058..135ca73 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -246,3 +246,3 @@ void KOEventViewer::appendEvent(Event *event, int mode ) if ( mode == 0 ) { - addTag("h2",event->summary()); + addTag("h2",deTag(event->summary())); } @@ -257,5 +257,5 @@ void KOEventViewer::appendEvent(Event *event, int mode ) if ( mode == 1 ) { - addTag("h2",i18n( "Local: " ) +event->summary()); + addTag("h2",i18n( "Local: " ) +deTag(event->summary())); } else { - addTag("h2",i18n( "Remote: " ) +event->summary()); + addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); } @@ -275,3 +275,3 @@ void KOEventViewer::appendEvent(Event *event, int mode ) addTag("b",i18n("Location: ")); - mText.append(event->location()+"<br>"); + mText.append(deTag(event->location())+"<br>"); mMailSubject += i18n(" at ") + event->location(); @@ -346,3 +346,3 @@ void KOEventViewer::appendEvent(Event *event, int mode ) addTag("p",i18n("<b>Details: </b>")); - addTag("p",event->description()); + addTag("p",deTag(event->description())); } @@ -376,3 +376,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) if (mode == 0 ) - addTag("h2",event->summary()); + addTag("h2",deTag(event->summary())); else { @@ -385,5 +385,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) if ( mode == 1 ) { - addTag("h2",i18n( "Local: " ) +event->summary()); + addTag("h2",i18n( "Local: " ) +deTag(event->summary())); } else { - addTag("h2",i18n( "Remote: " ) +event->summary()); + addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); } @@ -414,3 +414,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) addTag("b",i18n("Location: ")); - mText.append(event->location()+"<br>"); + mText.append(deTag(event->location())+"<br>"); mMailSubject += i18n(" at ") + event->location(); @@ -436,3 +436,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) addTag("p",i18n("<b>Details: </b>")); - addTag("p",event->description()); + addTag("p",deTag(event->description())); } @@ -449,3 +449,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) addTag("b",i18n("Parent todo:<br>")); - mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); + mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); } @@ -456,3 +456,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) for (to=Relations.first();to;to=Relations.next()) { - mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); + mText.append( deTag(to->summary())+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); @@ -625,3 +625,3 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) if (!jour->description().isEmpty()) { - addTag("p",jour->description()); + addTag("p",deTag(jour->description())); } @@ -641,3 +641,2 @@ void KOEventViewer::setSyncMode( bool b ) - void KOEventViewer::setTodo(Todo *event, bool clearV ) @@ -695,2 +694,17 @@ void KOEventViewer::addText(QString text) } +QString KOEventViewer::deTag(QString text) +{ +#if QT_VERSION >= 0x030000 + text.replace( '<' , "<" ); + text.replace( '>' , ">" ); +#else + if ( text.find ('<') > 0 ) { + text.replace( QRegExp("<") , "<" ); + } + if ( text.find ('>') > 0 ) { + text.replace( QRegExp(">") , ">" ); + } +#endif + return text; +} void KOEventViewer::keyPressEvent ( QKeyEvent * e ) |