diff options
Diffstat (limited to 'kresources/kolab/kcal/resourcekolab.cpp')
| -rw-r--r-- | kresources/kolab/kcal/resourcekolab.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index 59f6a3558..da2cee412 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre addedIncidence = inc; } else if ( result == 0 ) { // take both addedIncidence = inc; - addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) ); + addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) ); addedIncidence->setUid( CalFormat::createUniqueId() ); localIncidence = local; } @@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s } text += "<font></b><br>"; if ( !incidence->summary().isEmpty() ) - text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>"; + text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>"; if ( !incidence->location().isEmpty() ) - text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() ); + text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() ); text += "<br>"; if ( !incidence->doesFloat() ) text += i18n( "<b>Start:</b> %1, %2" ) - .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); + .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() ); else - text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() ); + text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() ); text += "<br>"; if ( incidence->type() == "Event" ) { Event* event = static_cast<Event*>( incidence ); if ( event->hasEndDate() ) { if ( !event->doesFloat() ) { text += i18n( "<b>End:</b> %1, %2" ) - .arg( event->dtEndDateStr(), event->dtEndTimeStr() ); + .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() ); } else { - text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() ); + text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() ); } } text += "<br>"; @@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s /* Will be needed when kmail triggers a delete, so we don't delete the inocent * incidence that's sharing the uid with this one */ - mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid; + mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid; } } /* Add to the cache if the add didn't come from KOrganizer, in which case |