summaryrefslogtreecommitdiffstats
path: root/kmail/vacation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/vacation.cpp')
-rw-r--r--kmail/vacation.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index fbcf46c82..d3d374aea 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -469,21 +469,21 @@ namespace KMail {
}
addressesArgument += sl.join( ", " ) + " ] ";
}
- TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" );
+ TQString script = TQString::fromLatin1("require \"vacation\";\n\n" );
if ( !sendForSpam )
- script += TQString::tqfromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
+ script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
" { keep; stop; }\n" ); // FIXME?
if ( !domain.isEmpty() ) // FIXME
- script += TQString::tqfromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).tqarg( domain );
+ script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
script += "vacation ";
script += addressesArgument;
if ( notificationInterval > 0 )
- script += TQString::tqfromLatin1(":days %1 ").tqarg( notificationInterval );
- script += TQString::tqfromLatin1("text:\n");
+ script += TQString::fromLatin1(":days %1 ").arg( notificationInterval );
+ script += TQString::fromLatin1("text:\n");
script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
- script += TQString::tqfromLatin1( "\n.\n;\n" );
+ script += TQString::fromLatin1( "\n.\n;\n" );
return script;
}
@@ -573,7 +573,7 @@ namespace KMail {
"\n"
"Yours sincerely,\n"
"-- <enter your name and email address here>\n")
- .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
+ .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
}
int Vacation::defaultNotificationInterval() {