summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp5
-rw-r--r--korganizer/koeventviewer.cpp4
-rw-r--r--libkcal/kincidenceformatter.cpp4
3 files changed, 7 insertions, 6 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 493382d..a776cb6 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -190,31 +190,32 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
190 else { 190 else {
191 text = KGlobal::locale()->formatTime(event->dtStart().time()); 191 text = KGlobal::locale()->formatTime(event->dtStart().time());
192 text += " " + event->summary(); 192 text += " " + event->summary();
193 mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); 193 mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
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( '<' , "&lt;" ); 199 mToolTipText.replace( '<' , "&lt;" );
200 mToolTipText.replace( '>' , "&gt;" ); 200 mToolTipText.replace( '>' , "&gt;" );
201#else 201#else
202 if ( mToolTipText.find ('<') > 0 ) { 202 if ( mToolTipText.find ('<') >= 0 ) {
203 mToolTipText.replace( QRegExp("<") , "&lt;" ); 203 mToolTipText.replace( QRegExp("<") , "&lt;" );
204 } 204 }
205 if ( mToolTipText.find ('>') > 0 ) { 205 if ( mToolTipText.find ('>') >= 0 ) {
206 mToolTipText.replace( QRegExp(">") , "&gt;" ); 206 mToolTipText.replace( QRegExp(">") , "&gt;" );
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}
214void KODayMatrix::setCalendar( Calendar *cal ) 215void KODayMatrix::setCalendar( Calendar *cal )
215{ 216{
216 mCalendar = cal; 217 mCalendar = cal;
217 218
218 setAcceptDrops( mCalendar ); 219 setAcceptDrops( mCalendar );
219 220
220 updateEvents(); 221 updateEvents();
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 135ca73..1508638 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -689,28 +689,28 @@ void KOEventViewer::clearEvents(bool now)
689 689
690void KOEventViewer::addText(QString text) 690void KOEventViewer::addText(QString text)
691{ 691{
692 mText.append(text); 692 mText.append(text);
693 setText(mText); 693 setText(mText);
694} 694}
695QString KOEventViewer::deTag(QString text) 695QString KOEventViewer::deTag(QString text)
696{ 696{
697#if QT_VERSION >= 0x030000 697#if QT_VERSION >= 0x030000
698 text.replace( '<' , "&lt;" ); 698 text.replace( '<' , "&lt;" );
699 text.replace( '>' , "&gt;" ); 699 text.replace( '>' , "&gt;" );
700#else 700#else
701 if ( text.find ('<') > 0 ) { 701 if ( text.find ('<') >= 0 ) {
702 text.replace( QRegExp("<") , "&lt;" ); 702 text.replace( QRegExp("<") , "&lt;" );
703 } 703 }
704 if ( text.find ('>') > 0 ) { 704 if ( text.find ('>') >= 0 ) {
705 text.replace( QRegExp(">") , "&gt;" ); 705 text.replace( QRegExp(">") , "&gt;" );
706 } 706 }
707#endif 707#endif
708 return text; 708 return text;
709} 709}
710void KOEventViewer::keyPressEvent ( QKeyEvent * e ) 710void KOEventViewer::keyPressEvent ( QKeyEvent * e )
711{ 711{
712 switch ( e->key() ) { 712 switch ( e->key() ) {
713 case Qt::Key_Return: 713 case Qt::Key_Return:
714 case Qt::Key_Enter : 714 case Qt::Key_Enter :
715 e->ignore(); 715 e->ignore();
716 break; 716 break;
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 57a9ede..e506a96 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -373,21 +373,21 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
373void KIncidenceFormatter::formatReadOnly(Incidence *event) 373void KIncidenceFormatter::formatReadOnly(Incidence *event)
374{ 374{
375 if (event->isReadOnly()) { 375 if (event->isReadOnly()) {
376 addTag("p","<em>(" + i18n("read-only") + ")</em>"); 376 addTag("p","<em>(" + i18n("read-only") + ")</em>");
377 } 377 }
378} 378}
379QString KIncidenceFormatter::deTag(QString text) 379QString KIncidenceFormatter::deTag(QString text)
380{ 380{
381#if QT_VERSION >= 0x030000 381#if QT_VERSION >= 0x030000
382 text.replace( '<' , "&lt;" ); 382 text.replace( '<' , "&lt;" );
383 text.replace( '>' , "&gt;" ); 383 text.replace( '>' , "&gt;" );
384#else 384#else
385 if ( text.find ('<') > 0 ) { 385 if ( text.find ('<') >= 0 ) {
386 text.replace( QRegExp("<") , "&lt;" ); 386 text.replace( QRegExp("<") , "&lt;" );
387 } 387 }
388 if ( text.find ('>') > 0 ) { 388 if ( text.find ('>') >= 0 ) {
389 text.replace( QRegExp(">") , "&gt;" ); 389 text.replace( QRegExp(">") , "&gt;" );
390 } 390 }
391#endif 391#endif
392 return text; 392 return text;
393} 393}