diff options
Diffstat (limited to 'plugins/kmail/bodypartformatter/text_calendar.cpp')
| -rw-r--r-- | plugins/kmail/bodypartformatter/text_calendar.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 6a8e01996..ec585dcc1 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -78,7 +78,7 @@ #include <tqurl.h> #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tdepimmacros.h> @@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter } }; -static TQString directoryFortqStatus( Attendee::PartStat status ) +static TQString directoryForStatus( Attendee::PartStat status ) { TQString dir; switch ( status ) { @@ -344,16 +344,16 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler TQString subject; switch ( type ) { case Answer: - subject = i18n( "Answer: %1" ).tqarg( summary ); + subject = i18n( "Answer: %1" ).arg( summary ); break; case Delegation: - subject = i18n( "Delegated: %1" ).tqarg( summary ); + subject = i18n( "Delegated: %1" ).arg( summary ); break; case Forward: - subject = i18n( "Forwarded: %1" ).tqarg( summary ); + subject = i18n( "Forwarded: %1" ).arg( summary ); break; case DeclineCounter: - subject = i18n( "Declined Counter Proposal: %1" ).tqarg( summary ); + subject = i18n( "Declined Counter Proposal: %1" ).arg( summary ); break; } @@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler TQString recv = to; if ( recv.isEmpty() ) recv = incidence->organizer().fullName(); - TQString statusString = directoryFortqStatus( status ); //it happens to return the right strings + TQString statusString = directoryForStatus( status ); //it happens to return the right strings return callback.mailICal( recv, msg, subject, statusString, type != Forward ); } @@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler bool cancelPastInvites( Incidence *incidence, const TQString &path ) const { TQString warnStr; - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); TQDate today = now.date(); Event * const event = dynamic_cast<Event *>( incidence ); Todo * const todo = dynamic_cast<Todo *>( incidence ); @@ -434,13 +434,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler Q_ASSERT( event ); if ( !event->doesFloat() ) { if ( event->dtEnd() < now ) { - warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() ); } else if ( event->dtStart() <= now && now <= event->dtEnd() ) { - warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" is currently in-progress." ).arg( event->summary() ); } } else { if ( event->dtEnd().date() < today ) { - warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() ); + warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() ); } else if ( event->dtStart().date() <= today && today <= event->dtEnd().date() ) { warnStr = i18n( "\"%1\", happening all day today, is currently in-progress." ). arg( event->summary() ); @@ -451,19 +451,19 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( !todo->doesFloat() ) { if ( todo->hasDueDate() ) { if ( todo->dtDue() < now ) { - warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() ); } else if ( todo->hasStartDate() && todo->dtStart() <= now && now <= todo->dtDue() ) { - warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is currently in-progress." ).arg( todo->summary() ); } } else if ( todo->hasStartDate() ) { if ( todo->dtStart() < now ) { - warnStr = i18n( "\"%1\" has already started." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" has already started." ).arg( todo->summary() ); } } } else { if ( todo->hasDueDate() ) { if ( todo->dtDue().date() < today) { - warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() ); + warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() ); } else if ( todo->hasStartDate() && todo->dtStart().date() <= today && today <= todo->dtDue().date() ) { warnStr = i18n( "\"%1\", happening all-day today, is currently in-progress." ). @@ -526,12 +526,12 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } else if ( path.startsWith( "ATTACH:" ) ) { return false; } else { - queryStr = i18n( "%1?" ).tqarg( path ); + queryStr = i18n( "%1?" ).arg( path ); } if ( KMessageBox::warningYesNo( 0, - i18n( "%1\n%2" ).tqarg( warnStr ).tqarg( queryStr ) ) == KMessageBox::No ) { + i18n( "%1\n%2" ).arg( warnStr ).arg( queryStr ) ) == KMessageBox::No ) { return true; } } @@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } // First, save it for KOrganizer to handle - TQString dir = directoryFortqStatus( status ); + TQString dir = directoryForStatus( status ); if ( dir.isEmpty() ) return true; // unknown status if ( status != Attendee::Delegated ) // we do that below for delegated incidences @@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( status == Attendee::Delegated ) { incidence = icalToString( iCal ); myself = findMyself( incidence, receiver ); - myself->setqStatus( status ); + myself->seStatus( status ); myself->setDelegate( delegateString ); TQString name, email; KPIM::getNameAndMail( delegateString, name, email ); @@ -820,7 +820,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler case KMessageBox::No: // means "send email" summary = incidence->summary(); if ( !summary.isEmpty() ) { - summary = i18n( "Re: %1" ).tqarg( summary ); + summary = i18n( "Re: %1" ).arg( summary ); } KApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary ); |