author | zautrix <zautrix> | 2005-03-21 14:42:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-21 14:42:01 (UTC) |
commit | 6e5a0c6cff04fff115e63b62537c5274dc7a5564 (patch) (unidiff) | |
tree | 5d40aadc33768fa31036aefdf965462248358361 /korganizer | |
parent | 3bd97904e69bf586122ad82d279c37db0861eefb (diff) | |
download | kdepimpi-6e5a0c6cff04fff115e63b62537c5274dc7a5564.zip kdepimpi-6e5a0c6cff04fff115e63b62537c5274dc7a5564.tar.gz kdepimpi-6e5a0c6cff04fff115e63b62537c5274dc7a5564.tar.bz2 |
fix
-rw-r--r-- | korganizer/kodaymatrix.cpp | 5 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 493382d..a776cb6 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -194,23 +194,24 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
194 | } | 194 | } |
195 | } | 195 | } |
196 | if ( !event->location().isEmpty() ) | 196 | if ( !event->location().isEmpty() ) |
197 | mToolTipText += " (" + event->location() + ")"; | 197 | mToolTipText += " (" + event->location() + ")"; |
198 | #if QT_VERSION >= 0x030000 | 198 | #if QT_VERSION >= 0x030000 |
199 | mToolTipText.replace( '<' , "<" ); | 199 | mToolTipText.replace( '<' , "<" ); |
200 | mToolTipText.replace( '>' , ">" ); | 200 | mToolTipText.replace( '>' , ">" ); |
201 | #else | 201 | #else |
202 | if ( mToolTipText.find ('<') > 0 ) { | 202 | if ( mToolTipText.find ('<') >= 0 ) { |
203 | mToolTipText.replace( QRegExp("<") , "<" ); | 203 | mToolTipText.replace( QRegExp("<") , "<" ); |
204 | } | 204 | } |
205 | if ( mToolTipText.find ('>') > 0 ) { | 205 | if ( mToolTipText.find ('>') >= 0 ) { |
206 | mToolTipText.replace( QRegExp(">") , ">" ); | 206 | mToolTipText.replace( QRegExp(">") , ">" ); |
207 | } | 207 | } |
208 | #endif | 208 | #endif |
209 | //qDebug("TTT: %s ", mToolTipText.latin1()); | ||
209 | mToolTip.append( mToolTipText ); | 210 | mToolTip.append( mToolTipText ); |
210 | } | 211 | } |
211 | mToolTip.sort(); | 212 | mToolTip.sort(); |
212 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | 213 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); |
213 | } | 214 | } |
214 | void KODayMatrix::setCalendar( Calendar *cal ) | 215 | void KODayMatrix::setCalendar( Calendar *cal ) |
215 | { | 216 | { |
216 | mCalendar = cal; | 217 | mCalendar = cal; |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 135ca73..1508638 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -693,20 +693,20 @@ void KOEventViewer::addText(QString text) | |||
693 | setText(mText); | 693 | setText(mText); |
694 | } | 694 | } |
695 | QString KOEventViewer::deTag(QString text) | 695 | QString KOEventViewer::deTag(QString text) |
696 | { | 696 | { |
697 | #if QT_VERSION >= 0x030000 | 697 | #if QT_VERSION >= 0x030000 |
698 | text.replace( '<' , "<" ); | 698 | text.replace( '<' , "<" ); |
699 | text.replace( '>' , ">" ); | 699 | text.replace( '>' , ">" ); |
700 | #else | 700 | #else |
701 | if ( text.find ('<') > 0 ) { | 701 | if ( text.find ('<') >= 0 ) { |
702 | text.replace( QRegExp("<") , "<" ); | 702 | text.replace( QRegExp("<") , "<" ); |
703 | } | 703 | } |
704 | if ( text.find ('>') > 0 ) { | 704 | if ( text.find ('>') >= 0 ) { |
705 | text.replace( QRegExp(">") , ">" ); | 705 | text.replace( QRegExp(">") , ">" ); |
706 | } | 706 | } |
707 | #endif | 707 | #endif |
708 | return text; | 708 | return text; |
709 | } | 709 | } |
710 | void KOEventViewer::keyPressEvent ( QKeyEvent * e ) | 710 | void KOEventViewer::keyPressEvent ( QKeyEvent * e ) |
711 | { | 711 | { |
712 | switch ( e->key() ) { | 712 | switch ( e->key() ) { |