summaryrefslogtreecommitdiffstats
path: root/libkcal/incidenceformatter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal/incidenceformatter.cpp')
-rw-r--r--libkcal/incidenceformatter.cpp406
1 files changed, 203 insertions, 203 deletions
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index 49c3967aa..d51de5839 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -52,7 +52,7 @@
#include <kmimetype.h>
#include <tqbuffer.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqdatetime.h>
#include <tqregexp.h>
@@ -248,10 +248,10 @@ static TQString displayViewFormatAttendeeRoleList( Incidence *incidence, Attende
}
tmpStr += displayViewLinkPerson( a->email(), a->name(), a->uid() );
if ( !a->delegator().isEmpty() ) {
- tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() );
+ tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() );
}
if ( !a->delegate().isEmpty() ) {
- tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() );
+ tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() );
}
tmpStr += "<br>";
}
@@ -359,7 +359,7 @@ static TQString displayViewFormatCategories( Incidence *incidence )
static TQString displayViewFormatCreationDate( Incidence *incidence )
{
return i18n( "Creation date: %1" ).
- tqarg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) );
+ arg( IncidenceFormatter::dateTimeToString( incidence->created(), false, true ) );
}
static TQString displayViewFormatBirthday( Event *event )
@@ -502,14 +502,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event,
tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>";
tmpStr += "<td>" +
i18n("<beginDate> - <endDate>","%1 - %2").
- tqarg( IncidenceFormatter::dateToString( startDt, false ) ).
- tqarg( IncidenceFormatter::dateToString( endDt, false ) ) +
+ arg( IncidenceFormatter::dateToString( startDt, false ) ).
+ arg( IncidenceFormatter::dateToString( endDt, false ) ) +
"</td>";
} else {
tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>";
tmpStr += "<td>" +
i18n("date as string","%1").
- tqarg( IncidenceFormatter::dateToString( startDt, false ) ) +
+ arg( IncidenceFormatter::dateToString( startDt, false ) ) +
"</td>";
}
} else {
@@ -517,14 +517,14 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event,
tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>";
tmpStr += "<td>" +
i18n("<beginDate> - <endDate>","%1 - %2").
- tqarg( IncidenceFormatter::dateToString( startDt, false ) ).
- tqarg( IncidenceFormatter::dateToString( endDt, false ) ) +
+ arg( IncidenceFormatter::dateToString( startDt, false ) ).
+ arg( IncidenceFormatter::dateToString( endDt, false ) ) +
"</td>";
} else {
tmpStr += "<td><b>" + i18n( "Date:" ) + "</b></td>";
tmpStr += "<td>" +
i18n("date as string","%1").
- tqarg( IncidenceFormatter::dateToString( startDt, false ) ) +
+ arg( IncidenceFormatter::dateToString( startDt, false ) ) +
"</td>";
tmpStr += "</tr><tr>";
@@ -532,8 +532,8 @@ static TQString displayViewFormatEvent( Calendar *calendar, Event *event,
if ( event->hasEndDate() && startDt != endDt ) {
tmpStr += "<td>" +
i18n("<beginTime> - <endTime>","%1 - %2").
- tqarg( IncidenceFormatter::timeToString( startDt, true ) ).
- tqarg( IncidenceFormatter::timeToString( endDt, true ) ) +
+ arg( IncidenceFormatter::timeToString( startDt, true ) ).
+ arg( IncidenceFormatter::timeToString( endDt, true ) ) +
"</td>";
} else {
tmpStr += "<td>" +
@@ -750,7 +750,7 @@ static TQString displayViewFormatTodo( Calendar *calendar, Todo *todo,
} else {
tmpStr += "<td><b>" + i18n( "Percent Done:" ) + "</b></td>";
tmpStr += "<td>";
- tmpStr += i18n( "%1%" ).tqarg( todo->percentComplete() );
+ tmpStr += i18n( "%1%" ).arg( todo->percentComplete() );
}
tmpStr += "</td>";
tmpStr += "</tr>";
@@ -833,11 +833,11 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb
TQString tmpStr = htmlAddTag( "h2",
htmlAddTag( "b",
i18n("Free/Busy information for %1").
- tqarg( fb->organizer().fullName() ) ) );
+ arg( fb->organizer().fullName() ) ) );
tmpStr += htmlAddTag( "h4", i18n("Busy times in date range %1 - %2:").
- tqarg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ).
- tqarg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) );
+ arg( IncidenceFormatter::dateToString( fb->dtStart(), true ) ).
+ arg( IncidenceFormatter::dateToString( fb->dtEnd(), true ) ) );
TQValueList<Period> periods = fb->busyPeriods();
@@ -860,19 +860,19 @@ static TQString displayViewFormatFreeBusy( Calendar * /*calendar*/, FreeBusy *fb
cont += i18n("1 second", "%n seconds", dur);
}
text += i18n("startDate for duration", "%1 for %2").
- tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ).
- tqarg( cont );
+ arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ).
+ arg( cont );
text += "<br>";
} else {
if ( per.start().date() == per.end().date() ) {
text += i18n("date, fromTime - toTime ", "%1, %2 - %3").
- tqarg( IncidenceFormatter::dateToString( per.start().date(), true ) ).
- tqarg( IncidenceFormatter::timeToString( per.start(), true ) ).
- tqarg( IncidenceFormatter::timeToString( per.end(), true ) );
+ arg( IncidenceFormatter::dateToString( per.start().date(), true ) ).
+ arg( IncidenceFormatter::timeToString( per.start(), true ) ).
+ arg( IncidenceFormatter::timeToString( per.end(), true ) );
} else {
text += i18n("fromDateTime - toDateTime", "%1 - %2").
- tqarg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ).
- tqarg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) );
+ arg( IncidenceFormatter::dateTimeToString( per.start(), false, true ) ).
+ arg( IncidenceFormatter::dateTimeToString( per.end(), false, true ) );
}
text += "<br>";
}
@@ -969,11 +969,11 @@ static TQString eventStartTimeStr( Event *event )
TQString tmp;
if ( !event->doesFloat() ) {
tmp = i18n( "%1: Start Date, %2: Start Time", "%1 %2" ).
- tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ),
+ arg( IncidenceFormatter::dateToString( event->dtStart(), true ),
IncidenceFormatter::timeToString( event->dtStart(), true ) );
} else {
tmp = i18n( "%1: Start Date", "%1 (all day)" ).
- tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) );
+ arg( IncidenceFormatter::dateToString( event->dtStart(), true ) );
}
return tmp;
}
@@ -984,11 +984,11 @@ static TQString eventEndTimeStr( Event *event )
if ( event->hasEndDate() && event->dtEnd().isValid() ) {
if ( !event->doesFloat() ) {
tmp = i18n( "%1: End Date, %2: End Time", "%1 %2" ).
- tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ),
+ arg( IncidenceFormatter::dateToString( event->dtEnd(), true ),
IncidenceFormatter::timeToString( event->dtEnd(), true ) );
} else {
tmp = i18n( "%1: End Date", "%1 (all day)" ).
- tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) );
+ arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) );
}
}
return tmp;
@@ -1106,13 +1106,13 @@ static TQString rsvpRequestedStr( bool rsvpRequested, const TQString &role )
if ( role.isEmpty() ) {
return i18n( "Your response is requested" );
} else {
- return i18n( "Your response as <b>%1</b> is requested" ).tqarg( role );
+ return i18n( "Your response as <b>%1</b> is requested" ).arg( role );
}
} else {
if ( role.isEmpty() ) {
return i18n( "No response is necessary" );
} else {
- return i18n( "No response as <b>%1</b> is necessary" ).tqarg( role );
+ return i18n( "No response as <b>%1</b> is necessary" ).arg( role );
}
}
}
@@ -1124,7 +1124,7 @@ static TQString myStatusStr( Incidence *incidence )
if ( a &&
a->status() != Attendee::NeedsAction && a->status() != Attendee::Delegated ) {
ret = i18n( "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)" ).
- tqarg( Attendee::statusName( a->status() ) );
+ arg( Attendee::statusName( a->status() ) );
}
return ret;
}
@@ -1302,7 +1302,7 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode )
}
TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
- TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir);
+ TQString html = TQString("<div dir=\"%1\">\n").arg(dir);
html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n";
@@ -1413,7 +1413,7 @@ static TQString invitationDetailsTodo( Todo *todo, bool noHtmlMode )
}
TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
- TQString html = TQString("<div dir=\"%1\">\n").tqarg(dir);
+ TQString html = TQString("<div dir=\"%1\">\n").arg(dir);
html += "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\">\n";
// Invitation summary & location rows
@@ -1511,19 +1511,19 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ )
cont += i18n("1 second", "%n seconds", dur);
}
html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2")
- .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) )
- .tqarg(cont) );
+ .arg( KGlobal::locale()->formatDateTime( per.start(), false ) )
+ .arg(cont) );
} else {
TQString cont;
if ( per.start().date() == per.end().date() ) {
cont = i18n("date, fromTime - toTime ", "%1, %2 - %3")
- .tqarg( KGlobal::locale()->formatDate( per.start().date() ) )
- .tqarg( KGlobal::locale()->formatTime( per.start().time() ) )
- .tqarg( KGlobal::locale()->formatTime( per.end().time() ) );
+ .arg( KGlobal::locale()->formatDate( per.start().date() ) )
+ .arg( KGlobal::locale()->formatTime( per.start().time() ) )
+ .arg( KGlobal::locale()->formatTime( per.end().time() ) );
} else {
cont = i18n("fromDateTime - toDateTime", "%1 - %2")
- .tqarg( KGlobal::locale()->formatDateTime( per.start(), false ) )
- .tqarg( KGlobal::locale()->formatDateTime( per.end(), false ) );
+ .arg( KGlobal::locale()->formatDateTime( per.start(), false ) )
+ .arg( KGlobal::locale()->formatDateTime( per.end(), false ) );
}
html += invitationRow( TQString(), cont );
@@ -1565,7 +1565,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
case Scheduler::Request:
if ( existingIncidence && event->revision() > 0 ) {
return i18n( "This invitation has been updated by the organizer %1" ).
- tqarg( event->organizer().fullName() );
+ arg( event->organizer().fullName() );
}
if ( iamOrganizer( event ) ) {
return i18n( "I created this invitation" );
@@ -1578,17 +1578,17 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
}
if ( senderIsOrganizer( event, sender ) ) {
if ( !orgStr.isEmpty() ) {
- return i18n( "You received an invitation from %1" ).tqarg( orgStr );
+ return i18n( "You received an invitation from %1" ).arg( orgStr );
} else {
return i18n( "You received an invitation" );
}
} else {
if ( !orgStr.isEmpty() ) {
return i18n( "You received an invitation from %1 as a representative of %2" ).
- tqarg( sender, orgStr );
+ arg( sender, orgStr );
} else {
return i18n( "You received an invitation from %1 as the organizer's representative" ).
- tqarg( sender );
+ arg( sender );
}
}
}
@@ -1602,7 +1602,7 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
{
if ( replyMeansCounter( event ) ) {
return i18n( "%1 makes this counter proposal" ).
- tqarg( firstAttendeeName( event, i18n( "Sender" ) ) );
+ arg( firstAttendeeName( event, i18n( "Sender" ) ) );
}
Attendee::List attendees = event->attendees();
@@ -1625,36 +1625,36 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
switch( attendee->status() ) {
case Attendee::NeedsAction:
- return i18n( "%1 indicates this invitation still needs some action" ).tqarg( attendeeName );
+ return i18n( "%1 indicates this invitation still needs some action" ).arg( attendeeName );
case Attendee::Accepted:
if ( event->revision() > 0 ) {
if ( !sender.isEmpty() ) {
- return i18n( "This invitation has been updated by attendee %1" ).tqarg( sender );
+ return i18n( "This invitation has been updated by attendee %1" ).arg( sender );
} else {
return i18n( "This invitation has been updated by an attendee" );
}
} else {
if ( delegatorName.isEmpty() ) {
- return i18n( "%1 accepts this invitation" ).tqarg( attendeeName );
+ return i18n( "%1 accepts this invitation" ).arg( attendeeName );
} else {
return i18n( "%1 accepts this invitation on behalf of %2" ).
- tqarg( attendeeName ).tqarg( delegatorName );
+ arg( attendeeName ).arg( delegatorName );
}
}
case Attendee::Tentative:
if ( delegatorName.isEmpty() ) {
return i18n( "%1 tentatively accepts this invitation" ).
- tqarg( attendeeName );
+ arg( attendeeName );
} else {
return i18n( "%1 tentatively accepts this invitation on behalf of %2" ).
- tqarg( attendeeName ).tqarg( delegatorName );
+ arg( attendeeName ).arg( delegatorName );
}
case Attendee::Declined:
if ( delegatorName.isEmpty() ) {
- return i18n( "%1 declines this invitation" ).tqarg( attendeeName );
+ return i18n( "%1 declines this invitation" ).arg( attendeeName );
} else {
return i18n( "%1 declines this invitation on behalf of %2" ).
- tqarg( attendeeName ).tqarg( delegatorName );
+ arg( attendeeName ).arg( delegatorName );
}
case Attendee::Delegated: {
TQString delegate, dummy;
@@ -1664,16 +1664,16 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
}
if ( !delegate.isEmpty() ) {
return i18n( "%1 has delegated this invitation to %2" ).
- tqarg( attendeeName ) .tqarg( delegate );
+ arg( attendeeName ) .arg( delegate );
} else {
- return i18n( "%1 has delegated this invitation" ).tqarg( attendeeName );
+ return i18n( "%1 has delegated this invitation" ).arg( attendeeName );
}
}
case Attendee::Completed:
return i18n( "This invitation is now completed" );
case Attendee::InProcess:
return i18n( "%1 is still processing the invitation" ).
- tqarg( attendeeName );
+ arg( attendeeName );
default:
return i18n( "Unknown response to this invitation" );
}
@@ -1682,15 +1682,15 @@ static TQString invitationHeaderEvent( Event *event, Incidence *existingIncidenc
case Scheduler::Counter:
return i18n( "%1 makes this counter proposal" ).
- tqarg( firstAttendeeName( event, i18n( "Sender" ) ) );
+ arg( firstAttendeeName( event, i18n( "Sender" ) ) );
case Scheduler::Declinecounter:
return i18n( "%1 declines the counter proposal" ).
- tqarg( firstAttendeeName( event, i18n( "Sender" ) ) );
+ arg( firstAttendeeName( event, i18n( "Sender" ) ) );
case Scheduler::NoMethod:
return i18n("Error: iMIP message with unknown method: '%1'").
- tqarg( msg->method() );
+ arg( msg->method() );
}
return TQString();
}
@@ -1708,7 +1708,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
case Scheduler::Request:
if ( existingIncidence && todo->revision() > 0 ) {
return i18n( "This task has been updated by the organizer %1" ).
- tqarg( todo->organizer().fullName() );
+ arg( todo->organizer().fullName() );
} else {
if ( iamOrganizer( todo ) ) {
return i18n( "I created this task" );
@@ -1721,17 +1721,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
}
if ( senderIsOrganizer( todo, sender ) ) {
if ( !orgStr.isEmpty() ) {
- return i18n( "You have been assigned this task by %1" ).tqarg( orgStr );
+ return i18n( "You have been assigned this task by %1" ).arg( orgStr );
} else {
return i18n( "You have been assigned this task" );
}
} else {
if ( !orgStr.isEmpty() ) {
return i18n( "You have been assigned this task by %1 as a representative of %2" ).
- tqarg( sender, orgStr );
+ arg( sender, orgStr );
} else {
return i18n( "You have been assigned this task by %1 as the organizer's representative" ).
- tqarg( sender );
+ arg( sender );
}
}
}
@@ -1746,7 +1746,7 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
{
if ( replyMeansCounter( todo ) ) {
return i18n( "%1 makes this counter proposal" ).
- tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) );
+ arg( firstAttendeeName( todo, i18n( "Sender" ) ) );
}
Attendee::List attendees = todo->attendees();
@@ -1769,14 +1769,14 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
switch( attendee->status() ) {
case Attendee::NeedsAction:
- return i18n( "%1 indicates this task assignment still needs some action" ).tqarg( attendeeName );
+ return i18n( "%1 indicates this task assignment still needs some action" ).arg( attendeeName );
case Attendee::Accepted:
if ( todo->revision() > 0 ) {
if ( !sender.isEmpty() ) {
if ( todo->isCompleted() ) {
- return i18n( "This task has been completed by assignee %1" ).tqarg( sender );
+ return i18n( "This task has been completed by assignee %1" ).arg( sender );
} else {
- return i18n( "This task has been updated by assignee %1" ).tqarg( sender );
+ return i18n( "This task has been updated by assignee %1" ).arg( sender );
}
} else {
if ( todo->isCompleted() ) {
@@ -1787,26 +1787,26 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
}
} else {
if ( delegatorName.isEmpty() ) {
- return i18n( "%1 accepts this task" ).tqarg( attendeeName );
+ return i18n( "%1 accepts this task" ).arg( attendeeName );
} else {
return i18n( "%1 accepts this task on behalf of %2" ).
- tqarg( attendeeName ).tqarg( delegatorName );
+ arg( attendeeName ).arg( delegatorName );
}
}
case Attendee::Tentative:
if ( delegatorName.isEmpty() ) {
return i18n( "%1 tentatively accepts this task" ).
- tqarg( attendeeName );
+ arg( attendeeName );
} else {
return i18n( "%1 tentatively accepts this task on behalf of %2" ).
- tqarg( attendeeName ).tqarg( delegatorName );
+ arg( attendeeName ).arg( delegatorName );
}
case Attendee::Declined:
if ( delegatorName.isEmpty() ) {
- return i18n( "%1 declines this task" ).tqarg( attendeeName );
+ return i18n( "%1 declines this task" ).arg( attendeeName );
} else {
return i18n( "%1 declines this task on behalf of %2" ).
- tqarg( attendeeName ).tqarg( delegatorName );
+ arg( attendeeName ).arg( delegatorName );
}
case Attendee::Delegated: {
TQString delegate, dummy;
@@ -1816,17 +1816,17 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
}
if ( !delegate.isEmpty() ) {
return i18n( "%1 has delegated this request for the task to %2" ).
- tqarg( attendeeName ).tqarg( delegate );
+ arg( attendeeName ).arg( delegate );
} else {
return i18n( "%1 has delegated this request for the task" ).
- tqarg( attendeeName );
+ arg( attendeeName );
}
}
case Attendee::Completed:
return i18n( "The request for this task is now completed" );
case Attendee::InProcess:
return i18n( "%1 is still processing the task" ).
- tqarg( attendeeName );
+ arg( attendeeName );
default:
return i18n( "Unknown response to this task" );
}
@@ -1835,15 +1835,15 @@ static TQString invitationHeaderTodo( Todo *todo, Incidence *existingIncidence,
case Scheduler::Counter:
return i18n( "%1 makes this counter proposal" ).
- tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) );
+ arg( firstAttendeeName( todo, i18n( "Sender" ) ) );
case Scheduler::Declinecounter:
return i18n( "%1 declines the counter proposal" ).
- tqarg( firstAttendeeName( todo, i18n( "Sender" ) ) );
+ arg( firstAttendeeName( todo, i18n( "Sender" ) ) );
case Scheduler::NoMethod:
return i18n( "Error: iMIP message with unknown method: '%1'" ).
- tqarg( msg->method() );
+ arg( msg->method() );
}
return TQString();
}
@@ -1908,7 +1908,7 @@ static TQString invitationHeaderJournal( Journal *journal, ScheduleMessage *msg
return i18n( "Sender declines the counter proposal" );
case Scheduler::NoMethod:
return i18n("Error: iMIP message with unknown method: '%1'").
- tqarg( msg->method() );
+ arg( msg->method() );
}
return TQString();
}
@@ -1933,7 +1933,7 @@ static TQString invitationHeaderFreeBusy( FreeBusy *fb, ScheduleMessage *msg )
case Scheduler::NoMethod:
default:
return i18n("Error: Free/Busy iMIP message with unknown method: '%1'").
- tqarg( msg->method() );
+ arg( msg->method() );
}
}
@@ -1967,10 +1967,10 @@ static TQString invitationAttendees( Incidence *incidence )
tmpStr += "<td>";
tmpStr += invitationPerson( a->email(), a->name(), TQString() );
if ( !a->delegator().isEmpty() ) {
- tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() );
+ tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() );
}
if ( !a->delegate().isEmpty() ) {
- tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() );
+ tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() );
}
tmpStr += "</td>";
tmpStr += "<td>" + a->statusStr() + "</td>";
@@ -2156,10 +2156,10 @@ class IncidenceFormatter::IncidenceCompareVisitor
return;
if ( oldEvent->dtStart() != newEvent->dtStart() || oldEvent->doesFloat() != newEvent->doesFloat() )
mChanges += i18n( "The invitation starting time has been changed from %1 to %2" )
- .tqarg( eventStartTimeStr( oldEvent ) ).tqarg( eventStartTimeStr( newEvent ) );
+ .arg( eventStartTimeStr( oldEvent ) ).arg( eventStartTimeStr( newEvent ) );
if ( oldEvent->dtEnd() != newEvent->dtEnd() || oldEvent->doesFloat() != newEvent->doesFloat() )
mChanges += i18n( "The invitation ending time has been changed from %1 to %2" )
- .tqarg( eventEndTimeStr( oldEvent ) ).tqarg( eventEndTimeStr( newEvent ) );
+ .arg( eventEndTimeStr( oldEvent ) ).arg( eventEndTimeStr( newEvent ) );
}
void compareTodos( Todo *newTodo, Todo *oldTodo )
@@ -2175,10 +2175,10 @@ class IncidenceFormatter::IncidenceCompareVisitor
mChanges += i18n( "The task is no longer completed" );
}
if ( oldTodo->percentComplete() != newTodo->percentComplete() ) {
- const TQString oldPer = i18n( "%1%" ).tqarg( oldTodo->percentComplete() );
- const TQString newPer = i18n( "%1%" ).tqarg( newTodo->percentComplete() );
+ const TQString oldPer = i18n( "%1%" ).arg( oldTodo->percentComplete() );
+ const TQString newPer = i18n( "%1%" ).arg( newTodo->percentComplete() );
mChanges += i18n( "The task completed percentage has changed from %1 to %2" ).
- tqarg( oldPer, newPer );
+ arg( oldPer, newPer );
}
if ( !oldTodo->hasStartDate() && newTodo->hasStartDate() ) {
@@ -2190,7 +2190,7 @@ class IncidenceFormatter::IncidenceCompareVisitor
if ( oldTodo->hasStartDate() && newTodo->hasStartDate() &&
oldTodo->dtStart() != newTodo->dtStart() ) {
mChanges += i18n( "The task starting time has been changed from %1 to %2" ).
- tqarg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ),
+ arg( dateTimeToString( oldTodo->dtStart(), oldTodo->doesFloat(), false ),
dateTimeToString( newTodo->dtStart(), newTodo->doesFloat(), false ) );
}
@@ -2203,7 +2203,7 @@ class IncidenceFormatter::IncidenceCompareVisitor
if ( oldTodo->hasDueDate() && newTodo->hasDueDate() &&
oldTodo->dtDue() != newTodo->dtDue() ) {
mChanges += i18n( "The task due time has been changed from %1 to %2" ).
- tqarg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ),
+ arg( dateTimeToString( oldTodo->dtDue(), oldTodo->doesFloat(), false ),
dateTimeToString( newTodo->dtDue(), newTodo->doesFloat(), false ) );
}
}
@@ -2213,22 +2213,22 @@ class IncidenceFormatter::IncidenceCompareVisitor
if ( !oldInc || !newInc )
return;
if ( oldInc->summary() != newInc->summary() )
- mChanges += i18n( "The summary has been changed to: \"%1\"" ).tqarg( newInc->summary() );
+ mChanges += i18n( "The summary has been changed to: \"%1\"" ).arg( newInc->summary() );
if ( oldInc->location() != newInc->location() )
- mChanges += i18n( "The location has been changed to: \"%1\"" ).tqarg( newInc->location() );
+ mChanges += i18n( "The location has been changed to: \"%1\"" ).arg( newInc->location() );
if ( oldInc->description() != newInc->description() )
- mChanges += i18n( "The description has been changed to: \"%1\"" ).tqarg( newInc->description() );
+ mChanges += i18n( "The description has been changed to: \"%1\"" ).arg( newInc->description() );
Attendee::List oldAttendees = oldInc->attendees();
Attendee::List newAttendees = newInc->attendees();
for ( Attendee::List::ConstIterator it = newAttendees.constBegin();
it != newAttendees.constEnd(); ++it ) {
Attendee *oldAtt = oldInc->attendeeByMail( (*it)->email() );
if ( !oldAtt ) {
- mChanges += i18n( "Attendee %1 has been added" ).tqarg( (*it)->fullName() );
+ mChanges += i18n( "Attendee %1 has been added" ).arg( (*it)->fullName() );
} else {
if ( oldAtt->status() != (*it)->status() )
mChanges += i18n( "The status of attendee %1 has been changed to: %2" ).
- tqarg( (*it)->fullName() ).tqarg( (*it)->statusStr() );
+ arg( (*it)->fullName() ).arg( (*it)->statusStr() );
}
}
if ( method == Scheduler::Request ) {
@@ -2237,7 +2237,7 @@ class IncidenceFormatter::IncidenceCompareVisitor
if ( (*it)->email() != oldInc->organizer().email() ) {
Attendee *newAtt = newInc->attendeeByMail( (*it)->email() );
if ( !newAtt ) {
- mChanges += i18n( "Attendee %1 has been removed" ).tqarg( (*it)->fullName() );
+ mChanges += i18n( "Attendee %1 has been removed" ).arg( (*it)->fullName() );
}
}
}
@@ -2255,12 +2255,12 @@ TQString InvitationFormatterHelper::makeLink( const TQString &id, const TQString
{
if ( !id.startsWith( "ATTACH:" ) ) {
TQString res = TQString( "<a href=\"%1\"><b>%2</b></a>" ).
- tqarg( generateLinkURL( id ), text );
+ arg( generateLinkURL( id ), text );
return res;
} else {
// draw the attachment links in non-bold face
TQString res = TQString( "<a href=\"%1\">%2</a>" ).
- tqarg( generateLinkURL( id ), text );
+ arg( generateLinkURL( id ), text );
return res;
}
}
@@ -2426,12 +2426,12 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
// First make the text of the message
TQString html;
- TQString tableStyle = TQString::tqfromLatin1(
+ TQString tableStyle = TQString::fromLatin1(
"style=\"border: solid 1px; margin: 0em;\"" );
- TQString tableHead = TQString::tqfromLatin1(
+ TQString tableHead = TQString::fromLatin1(
"<div align=\"center\">"
"<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>"
- "<tr><td>").tqarg(tableStyle);
+ "<tr><td>").arg(tableStyle);
html += tableHead;
InvitationHeaderVisitor headerVisitor;
@@ -2459,7 +2459,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
if ( compareVisitor.act( incBase, existingIncidence, msg->method() ) ) {
html += "<p align=\"left\">";
if ( !sender.isEmpty() ) {
- html += i18n( "The following changes have been made by %1:" ).tqarg( sender );
+ html += i18n( "The following changes have been made by %1:" ).arg( sender );
} else {
html += i18n( "The following changes have been made by an attendee:" );
}
@@ -2514,10 +2514,10 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
if ( rsvpRec && inc ) {
if ( inc->revision() == 0 ) {
html += i18n( "Your <b>%1</b> response has already been recorded" ).
- tqarg( ea->statusStr() );
+ arg( ea->statusStr() );
} else {
html += i18n( "Your status for this invitation is <b>%1</b>" ).
- tqarg( ea->statusStr() );
+ arg( ea->statusStr() );
}
rsvpReq = false;
} else if ( msg->method() == Scheduler::Cancel ) {
@@ -2627,7 +2627,7 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
if ( ea && ( ea->status() != Attendee::NeedsAction ) && ( ea->status() == a->status() ) ) {
if ( inc && inc->revision() > 0 ) {
html += "<br><u><i>";
- html += i18n( "The response has been recorded [%1]" ).tqarg( ea->statusStr() );
+ html += i18n( "The response has been recorded [%1]" ).arg( ea->statusStr() );
html += "</i></u>";
}
} else {
@@ -2831,7 +2831,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
KTNEFParser parser;
TQBuffer buf( tnef );
- CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) );
+ CalendarLocal cal ( TQString::fromLatin1( "UTC" ) );
KABC::Addressee addressee;
KABC::VCardConverter cardConv;
ICalFormat calFormat;
@@ -2926,13 +2926,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
Attendee *attendee = new Attendee( s, s, true );
if( bIsReply ) {
if( bCompatMethodAccepted )
- attendee->setqStatus( Attendee::Accepted );
+ attendee->seStatus( Attendee::Accepted );
if( bCompatMethodDeclined )
- attendee->setqStatus( Attendee::Declined );
+ attendee->seStatus( Attendee::Declined );
if( bCompatMethodAcceptedCond )
- attendee->setqStatus(Attendee::Tentative);
+ attendee->seStatus(Attendee::Tentative);
} else {
- attendee->setqStatus( Attendee::NeedsAction );
+ attendee->seStatus( Attendee::NeedsAction );
attendee->setRole( Attendee::ReqParticipant );
}
event->addAttendee(attendee);
@@ -2947,13 +2947,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
true );
if( bIsReply ) {
if( bCompatMethodAccepted )
- attendee->setqStatus( Attendee::Accepted );
+ attendee->seStatus( Attendee::Accepted );
if( bCompatMethodAcceptedCond )
- attendee->setqStatus( Attendee::Declined );
+ attendee->seStatus( Attendee::Declined );
if( bCompatMethodDeclined )
- attendee->setqStatus( Attendee::Tentative );
+ attendee->seStatus( Attendee::Tentative );
} else {
- attendee->setqStatus(Attendee::NeedsAction);
+ attendee->seStatus(Attendee::NeedsAction);
attendee->setRole(Attendee::ReqParticipant);
}
event->addAttendee(attendee);
@@ -2990,7 +2990,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
// Outlook - we ignore it for now.
s = tnefMsg->findProp( 0x8202 ).replace( TQChar( '-' ), TQString() )
.replace( TQChar( ':' ), TQString() );
- // ### libkcal always uses tqcurrentDateTime()
+ // ### libkcal always uses currentDateTime()
// event->setDtStamp(TQDateTime::fromString(s));
s = tnefMsg->findNamedProp( "Keywords" );
@@ -3218,20 +3218,20 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const
tmp = "<br>" + i18n("Event start", "<i>From:</i>&nbsp;%1");
if (event->doesFloat())
- ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
else
- ret += tmp.tqarg( IncidenceFormatter::dateToString( startDt ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).replace(" ", "&nbsp;") );
tmp = "<br>" + i18n("Event end","<i>To:</i>&nbsp;%1");
if (event->doesFloat())
- ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", "&nbsp;") );
else
- ret += tmp.tqarg( IncidenceFormatter::dateToString( endDt ).replace(" ", "&nbsp;") );
+ ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).replace(" ", "&nbsp;") );
} else {
ret += "<br>"+i18n("<i>Date:</i>&nbsp;%1").
- tqarg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
+ arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
if ( !event->doesFloat() ) {
const TQString dtStartTime =
IncidenceFormatter::timeToString( startDt, true ).replace( " ", "&nbsp;" );
@@ -3240,11 +3240,11 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const
if ( dtStartTime == dtEndTime ) { // to prevent 'Time: 17:00 - 17:00'
tmp = "<br>" + i18n("time for event, &nbsp; to prevent ugly line breaks",
"<i>Time:</i>&nbsp;%1").
- tqarg( dtStartTime );
+ arg( dtStartTime );
} else {
tmp = "<br>" + i18n("time range for event, &nbsp; to prevent ugly line breaks",
"<i>Time:</i>&nbsp;%1&nbsp;-&nbsp;%2").
- tqarg( dtStartTime, dtEndTime );
+ arg( dtStartTime, dtEndTime );
}
ret += tmp;
}
@@ -3267,7 +3267,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
}
ret += "<br>" +
i18n("<i>Start:</i>&nbsp;%1").
- tqarg( IncidenceFormatter::dateTimeToString( startDt, floats, false ).
+ arg( IncidenceFormatter::dateTimeToString( startDt, floats, false ).
replace( " ", "&nbsp;" ) );
}
@@ -3282,7 +3282,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
}
ret += "<br>" +
i18n("<i>Due:</i>&nbsp;%1").
- tqarg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ).
+ arg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ).
replace( " ", "&nbsp;" ) );
}
@@ -3300,7 +3300,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
ret += todo->completedStr().replace( " ", "&nbsp;" );
} else {
ret += "<i>" + i18n( "Percent Done:" ) + "</i>" + "&nbsp;";
- ret += i18n( "%1%" ).tqarg( todo->percentComplete() );
+ ret += i18n( "%1%" ).arg( todo->percentComplete() );
}
return ret;
@@ -3312,7 +3312,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal )
if (journal->dtStart().isValid() ) {
ret += "<br>" +
i18n("<i>Date:</i>&nbsp;%1").
- tqarg( IncidenceFormatter::dateToString( journal->dtStart(), false ) );
+ arg( IncidenceFormatter::dateToString( journal->dtStart(), false ) );
}
return ret;
}
@@ -3320,9 +3320,9 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal )
TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( FreeBusy *fb )
{
TQString tmp( "<br>" + i18n("<i>Period start:</i>&nbsp;%1") );
- TQString ret = tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtStart() ) );
+ TQString ret = tmp.arg( KGlobal::locale()->formatDateTime( fb->dtStart() ) );
tmp = "<br>" + i18n("<i>Period start:</i>&nbsp;%1");
- ret += tmp.tqarg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) );
+ ret += tmp.arg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) );
return ret;
}
@@ -3349,7 +3349,7 @@ bool IncidenceFormatter::ToolTipVisitor::visit( Journal *journal )
bool IncidenceFormatter::ToolTipVisitor::visit( FreeBusy *fb )
{
mResult = "<qt><b>" + i18n("Free/Busy information for %1")
- .tqarg(fb->organizer().fullName()) + "</b>";
+ .arg(fb->organizer().fullName()) + "</b>";
mResult += dateRangeText( fb );
mResult += "</qt>";
return !mResult.isEmpty();
@@ -3405,10 +3405,10 @@ static TQString tooltipFormatAttendeeRoleList( Incidence *incidence, Attendee::R
}
tmpStr += tooltipPerson( a->email(), a->name() );
if ( !a->delegator().isEmpty() ) {
- tmpStr += i18n(" (delegated by %1)" ).tqarg( a->delegator() );
+ tmpStr += i18n(" (delegated by %1)" ).arg( a->delegator() );
}
if ( !a->delegate().isEmpty() ) {
- tmpStr += i18n(" (delegated to %1)" ).tqarg( a->delegate() );
+ tmpStr += i18n(" (delegated to %1)" ).arg( a->delegate() );
}
tmpStr += sep;
i++;
@@ -3588,13 +3588,13 @@ static TQString mailBodyIncidence( Incidence *incidence )
{
TQString body;
if ( !incidence->summary().isEmpty() ) {
- body += i18n("Summary: %1\n").tqarg( incidence->summary() );
+ body += i18n("Summary: %1\n").arg( incidence->summary() );
}
if ( !incidence->organizer().isEmpty() ) {
- body += i18n("Organizer: %1\n").tqarg( incidence->organizer().fullName() );
+ body += i18n("Organizer: %1\n").arg( incidence->organizer().fullName() );
}
if ( !incidence->location().isEmpty() ) {
- body += i18n("Location: %1\n").tqarg( incidence->location() );
+ body += i18n("Location: %1\n").arg( incidence->location() );
}
return body;
}
@@ -3608,26 +3608,26 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event )
mResult = mailBodyIncidence( event );
mResult += i18n("Start Date: %1\n").
- tqarg( IncidenceFormatter::dateToString( event->dtStart(), true ) );
+ arg( IncidenceFormatter::dateToString( event->dtStart(), true ) );
if ( !event->doesFloat() ) {
mResult += i18n("Start Time: %1\n").
- tqarg( IncidenceFormatter::timeToString( event->dtStart(), true ) );
+ arg( IncidenceFormatter::timeToString( event->dtStart(), true ) );
}
if ( event->dtStart() != event->dtEnd() ) {
mResult += i18n("End Date: %1\n").
- tqarg( IncidenceFormatter::dateToString( event->dtEnd(), true ) );
+ arg( IncidenceFormatter::dateToString( event->dtEnd(), true ) );
}
if ( !event->doesFloat() ) {
mResult += i18n("End Time: %1\n").
- tqarg( IncidenceFormatter::timeToString( event->dtEnd(), true ) );
+ arg( IncidenceFormatter::timeToString( event->dtEnd(), true ) );
}
if ( event->doesRecur() ) {
Recurrence *recur = event->recurrence();
// TODO: Merge these two to one of the form "Recurs every 3 days"
mResult += i18n("Recurs: %1\n")
- .tqarg( recurrence[ recur->recurrenceType() ] );
+ .arg( recurrence[ recur->recurrenceType() ] );
mResult += i18n("Frequency: %1\n")
- .tqarg( event->recurrence()->frequency() );
+ .arg( event->recurrence()->frequency() );
if ( recur->duration() > 0 ) {
mResult += i18n ("Repeats once", "Repeats %n times", recur->duration());
@@ -3641,7 +3641,7 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event )
} else {
endstr = KGlobal::locale()->formatDateTime( recur->endDateTime() );
}
- mResult += i18n("Repeat until: %1\n").tqarg( endstr );
+ mResult += i18n("Repeat until: %1\n").arg( endstr );
} else {
mResult += i18n("Repeats forever\n");
}
@@ -3652,13 +3652,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event )
mResult += i18n("This recurring meeting has been cancelled on the following days:\n");
DateList::ConstIterator ex_iter;
for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) {
- mResult += i18n(" %1\n").tqarg( KGlobal::locale()->formatDate(* ex_iter ) );
+ mResult += i18n(" %1\n").arg( KGlobal::locale()->formatDate(* ex_iter ) );
}
}
}
TQString details = event->description();
if ( !details.isEmpty() ) {
- mResult += i18n("Details:\n%1\n").tqarg( details );
+ mResult += i18n("Details:\n%1\n").arg( details );
}
return !mResult.isEmpty();
}
@@ -3669,23 +3669,23 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Todo *todo )
if ( todo->hasStartDate() ) {
mResult += i18n("Start Date: %1\n").
- tqarg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) );
+ arg( IncidenceFormatter::dateToString( todo->dtStart( false ), true ) );
if ( !todo->doesFloat() ) {
mResult += i18n("Start Time: %1\n").
- tqarg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) );
+ arg( IncidenceFormatter::timeToString( todo->dtStart( false ),true ) );
}
}
if ( todo->hasDueDate() ) {
mResult += i18n("Due Date: %1\n").
- tqarg( IncidenceFormatter::dateToString( todo->dtDue(), true ) );
+ arg( IncidenceFormatter::dateToString( todo->dtDue(), true ) );
if ( !todo->doesFloat() ) {
mResult += i18n("Due Time: %1\n").
- tqarg( IncidenceFormatter::timeToString( todo->dtDue(), true ) );
+ arg( IncidenceFormatter::timeToString( todo->dtDue(), true ) );
}
}
TQString details = todo->description();
if ( !details.isEmpty() ) {
- mResult += i18n("Details:\n%1\n").tqarg( details );
+ mResult += i18n("Details:\n%1\n").arg( details );
}
return !mResult.isEmpty();
}
@@ -3694,13 +3694,13 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Journal *journal )
{
mResult = mailBodyIncidence( journal );
mResult += i18n("Date: %1\n").
- tqarg( IncidenceFormatter::dateToString( journal->dtStart(), true ) );
+ arg( IncidenceFormatter::dateToString( journal->dtStart(), true ) );
if ( !journal->doesFloat() ) {
mResult += i18n("Time: %1\n").
- tqarg( IncidenceFormatter::timeToString( journal->dtStart(), true ) );
+ arg( IncidenceFormatter::timeToString( journal->dtStart(), true ) );
}
if ( !journal->description().isEmpty() )
- mResult += i18n("Text of the journal:\n%1\n").tqarg( journal->description() );
+ mResult += i18n("Text of the journal:\n%1\n").arg( journal->description() );
return !mResult.isEmpty();
}
@@ -3813,9 +3813,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
case Recurrence::rMinutely:
recurStr = i18n( "Recurs every minute", "Recurs every %n minutes", recur->frequency() );
if ( recur->duration() != -1 ) {
- txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) );
+ txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
@@ -3824,9 +3824,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
case Recurrence::rHourly:
recurStr = i18n( "Recurs hourly", "Recurs every %n hours", recur->frequency() );
if ( recur->duration() != -1 ) {
- txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) );
+ txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
@@ -3836,9 +3836,9 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
recurStr = i18n( "Recurs daily", "Recurs every %n days", recur->frequency() );
if ( recur->duration() != -1 ) {
- txt = i18n( "%1 until %2" ).tqarg( recurStr ).tqarg( recurEnd( incidence ) );
+ txt = i18n( "%1 until %2" ).arg( recurStr ).arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
@@ -3863,13 +3863,13 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
}
if ( recur->duration() != -1 ) {
txt = i18n( "%1 on %2 until %3" ).
- tqarg( recurStr ).tqarg( dayNames ).tqarg( recurEnd( incidence ) );
+ arg( recurStr ).arg( dayNames ).arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
- txt = i18n( "%1 on %2" ).tqarg( recurStr ).tqarg( dayNames );
+ txt = i18n( "%1 on %2" ).arg( recurStr ).arg( dayNames );
return txt;
}
case Recurrence::rMonthlyPos:
@@ -3880,19 +3880,19 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
KCal::RecurrenceRule::WDayPos rule = recur->monthPositions()[0];
if ( recur->duration() != -1 ) {
txt = i18n( "%1 on the %2 %3 until %4" ).
- tqarg( recurStr ).
- tqarg( dayList[rule.pos() + 31] ).
- tqarg( calSys->weekDayName( rule.day(), false ) ).
- tqarg( recurEnd( incidence ) );
+ arg( recurStr ).
+ arg( dayList[rule.pos() + 31] ).
+ arg( calSys->weekDayName( rule.day(), false ) ).
+ arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
txt = i18n( "%1 on the %2 %3" ).
- tqarg( recurStr ).
- tqarg( dayList[rule.pos() + 31] ).
- tqarg( calSys->weekDayName( rule.day(), false ) );
+ arg( recurStr ).
+ arg( dayList[rule.pos() + 31] ).
+ arg( calSys->weekDayName( rule.day(), false ) );
return txt;
} else {
return recurStr;
@@ -3907,15 +3907,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
int days = recur->monthDays()[0];
if ( recur->duration() != -1 ) {
txt = i18n( "%1 on the %2 day until %3" ).
- tqarg( recurStr ).
- tqarg( dayList[days + 31] ).
- tqarg( recurEnd( incidence ) );
+ arg( recurStr ).
+ arg( dayList[days + 31] ).
+ arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
- txt = i18n( "%1 on the %2 day" ).tqarg( recurStr ).tqarg( dayList[days + 31] );
+ txt = i18n( "%1 on the %2 day" ).arg( recurStr ).arg( dayList[days + 31] );
return txt;
} else {
return recurStr;
@@ -3929,33 +3929,33 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
if ( recur->duration() != -1 ) {
if ( !recur->yearDates().isEmpty() ) {
txt = i18n( "%1 on %2 %3 until %4" ).
- tqarg( recurStr ).
- tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ).
- tqarg( dayList[ recur->yearDates()[0] + 31 ] ).
- tqarg( recurEnd( incidence ) );
+ arg( recurStr ).
+ arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ).
+ arg( dayList[ recur->yearDates()[0] + 31 ] ).
+ arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
}
if ( !recur->yearDates().isEmpty() ) {
txt = i18n( "%1 on %2 %3" ).
- tqarg( recurStr ).
- tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ).
- tqarg( dayList[ recur->yearDates()[0] + 31 ] );
+ arg( recurStr ).
+ arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ).
+ arg( dayList[ recur->yearDates()[0] + 31 ] );
return txt;
} else {
if ( !recur->yearMonths().isEmpty() ) {
txt = i18n( "Recurs yearly on %1 %2" ).
- tqarg( calSys->monthName( recur->yearMonths()[0],
+ arg( calSys->monthName( recur->yearMonths()[0],
recur->startDate().year() ) ).
- tqarg( dayList[ recur->startDate().day() + 31 ] );
+ arg( dayList[ recur->startDate().day() + 31 ] );
} else {
txt = i18n( "Recurs yearly on %1 %2" ).
- tqarg( calSys->monthName( recur->startDate().month(),
+ arg( calSys->monthName( recur->startDate().month(),
recur->startDate().year() ) ).
- tqarg( dayList[ recur->startDate().day() + 31 ] );
+ arg( dayList[ recur->startDate().day() + 31 ] );
}
return txt;
}
@@ -3967,15 +3967,15 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
if ( !recur->yearDays().isEmpty() ) {
if ( recur->duration() != -1 ) {
txt = i18n( "%1 on day %2 until %3" ).
- tqarg( recurStr ).
- tqarg( recur->yearDays()[0] ).
- tqarg( recurEnd( incidence ) );
+ arg( recurStr ).
+ arg( recur->yearDays()[0] ).
+ arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
- txt = i18n( "%1 on day %2" ).tqarg( recurStr ).tqarg( recur->yearDays()[0] );
+ txt = i18n( "%1 on day %2" ).arg( recurStr ).arg( recur->yearDays()[0] );
return txt;
} else {
return recurStr;
@@ -3989,21 +3989,21 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence )
KCal::RecurrenceRule::WDayPos rule = recur->yearPositions()[0];
if ( recur->duration() != -1 ) {
txt = i18n( "%1 on the %2 %3 of %4 until %5" ).
- tqarg( recurStr ).
- tqarg( dayList[rule.pos() + 31] ).
- tqarg( calSys->weekDayName( rule.day(), false ) ).
- tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ).
- tqarg( recurEnd( incidence ) );
+ arg( recurStr ).
+ arg( dayList[rule.pos() + 31] ).
+ arg( calSys->weekDayName( rule.day(), false ) ).
+ arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) ).
+ arg( recurEnd( incidence ) );
if ( recur->duration() > 0 ) {
- txt += i18n( " (%1 occurrences)" ).tqarg( recur->duration() );
+ txt += i18n( " (%1 occurrences)" ).arg( recur->duration() );
}
return txt;
}
txt = i18n( "%1 on the %2 %3 of %4" ).
- tqarg( recurStr ).
- tqarg( dayList[rule.pos() + 31] ).
- tqarg( calSys->weekDayName( rule.day(), false ) ).
- tqarg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) );
+ arg( recurStr ).
+ arg( dayList[rule.pos() + 31] ).
+ arg( calSys->weekDayName( rule.day(), false ) ).
+ arg( calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) );
return txt;
} else {
return recurStr;
@@ -4184,18 +4184,18 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool
}
if ( offset == 0 ) {
if ( !atStr.isEmpty() ) {
- remStr = i18n( "reminder occurs at datetime", "at %1" ).tqarg( atStr );
+ remStr = i18n( "reminder occurs at datetime", "at %1" ).arg( atStr );
}
} else {
- remStr = offsetStr.tqarg( secs2Duration( offset ) );
+ remStr = offsetStr.arg( secs2Duration( offset ) );
}
if ( alarm->repeatCount() > 0 ) {
TQString countStr = i18n( "repeats once", "repeats %n times", alarm->repeatCount() );
TQString intervalStr = i18n( "interval is N days/hours/minutes", "interval is %1" ).
- tqarg( secs2Duration( alarm->snoozeTime().asSeconds() ) );
+ arg( secs2Duration( alarm->snoozeTime().asSeconds() ) );
TQString repeatStr = i18n( "(repeat string, interval string)", "(%1, %2)" ).
- tqarg( countStr, intervalStr );
+ arg( countStr, intervalStr );
remStr = remStr + ' ' + repeatStr;
}