summaryrefslogtreecommitdiffstats
path: root/kmail/templateparser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/templateparser.cpp')
-rw-r--r--kmail/templateparser.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 8dce59d4e..2feebf4e1 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -261,7 +261,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Cannot insert content from file %1: %2" ).
- tqarg( path ).tqarg( file.errorString() ) );
+ arg( path ).arg( file.errorString() ) );
}
} else if ( cmd.startsWith( "SYSTEM=" ) ) {
@@ -294,7 +294,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Cannot insert content from file %1: %2").
- tqarg( path ).tqarg(file.errorString() ));
+ arg( path ).arg(file.errorString() ));
}
} else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
@@ -396,7 +396,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
kdDebug() << "Command: OTEXTSIZE" << endl;
i += strlen( "OTEXTSIZE" );
if ( mOrigMsg ) {
- TQString str = TQString( "%1" ).tqarg( mOrigMsg->body().length() );
+ TQString str = TQString( "%1" ).arg( mOrigMsg->body().length() );
body.append( str );
}
@@ -693,7 +693,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( cmd.startsWith( "DATEEN" ) ) {
kdDebug() << "Command: DATEEN" << endl;
i += strlen( "DATEEN" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
KLocale locale( "C" );
TQString str = locale.formatDate( date.date(), false );
body.append( str );
@@ -701,28 +701,28 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( cmd.startsWith( "DATESHORT" ) ) {
kdDebug() << "Command: DATESHORT" << endl;
i += strlen( "DATESHORT" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
TQString str = KGlobal::locale()->formatDate( date.date(), true );
body.append( str );
} else if ( cmd.startsWith( "DATE" ) ) {
kdDebug() << "Command: DATE" << endl;
i += strlen( "DATE" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
TQString str = KGlobal::locale()->formatDate( date.date(), false );
body.append( str );
} else if ( cmd.startsWith( "DOW" ) ) {
kdDebug() << "Command: DOW" << endl;
i += strlen( "DOW" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false );
body.append( str );
} else if ( cmd.startsWith( "TIMELONGEN" ) ) {
kdDebug() << "Command: TIMELONGEN" << endl;
i += strlen( "TIMELONGEN" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
KLocale locale( "C");
TQString str = locale.formatTime( date.time(), true );
body.append( str );
@@ -730,14 +730,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( cmd.startsWith( "TIMELONG" ) ) {
kdDebug() << "Command: TIMELONG" << endl;
i += strlen( "TIMELONG" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
TQString str = KGlobal::locale()->formatTime( date.time(), true );
body.append( str );
} else if ( cmd.startsWith( "TIME" ) ) {
kdDebug() << "Command: TIME" << endl;
i += strlen( "TIME" );
- TQDateTime date = TQDateTime::tqcurrentDateTime();
+ TQDateTime date = TQDateTime::currentDateTime();
TQString str = KGlobal::locale()->formatTime( date.time(), false );
body.append( str );
@@ -967,7 +967,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
DwParameter *nameParameter = new DwParameter;
nameParameter->SetAttribute( "name" );
nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(
- i18n( "Attachment %1" ).tqarg( attachmentNumber ) ) ) );
+ i18n( "Attachment %1" ).arg( attachmentNumber ) ) ) );
ct.AddParameter( nameParameter );
}
}
@@ -1059,7 +1059,7 @@ TQString TemplateParser::findTemplate()
TQString iid;
if ( mIdentity ) {
- iid = TQString("IDENTITY_%1").tqarg( mIdentity ); // templates ID for that identity
+ iid = TQString("IDENTITY_%1").arg( mIdentity ); // templates ID for that identity
}
else {
iid = "IDENTITY_NO_IDENTITY"; // templates ID for no identity
@@ -1148,11 +1148,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mPipeErr.isEmpty() ) {
KMessageBox::error( 0,
i18n( "Pipe command exit with status %1: %2").
- tqarg( mPipeRc ).tqarg( cmd ) );
+ arg( mPipeRc ).arg( cmd ) );
} else {
KMessageBox::detailedError( 0,
i18n( "Pipe command exit with status %1: %2" ).
- tqarg( mPipeRc ).tqarg( cmd ), mPipeErr );
+ arg( mPipeRc ).arg( cmd ), mPipeErr );
}
}
@@ -1163,11 +1163,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mPipeErr.isEmpty() ) {
KMessageBox::error( 0,
i18n( "Pipe command killed by signal %1: %2" ).
- tqarg( -(mPipeRc) ).tqarg( cmd ) );
+ arg( -(mPipeRc) ).arg( cmd ) );
} else {
KMessageBox::detailedError( 0,
i18n( "Pipe command killed by signal %1: %2" ).
- tqarg( -(mPipeRc) ).tqarg( cmd ), mPipeErr );
+ arg( -(mPipeRc) ).arg( cmd ), mPipeErr );
}
}
}
@@ -1179,7 +1179,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Pipe command did not finish within %1 seconds: %2" ).
- tqarg( PipeTimeout ).tqarg( cmd ) );
+ arg( PipeTimeout ).arg( cmd ) );
}
}
@@ -1190,11 +1190,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mDebug ) {
if ( mPipeErr.isEmpty() ) {
KMessageBox::error( 0,
- i18n( "Cannot write to process stdin: %1" ).tqarg( cmd ) );
+ i18n( "Cannot write to process stdin: %1" ).arg( cmd ) );
} else {
KMessageBox::detailedError( 0,
i18n( "Cannot write to process stdin: %1" ).
- tqarg( cmd ), mPipeErr );
+ arg( cmd ), mPipeErr );
}
}
}
@@ -1202,7 +1202,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
} else if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Cannot start pipe command from template: %1" ).
- tqarg( cmd ) );
+ arg( cmd ) );
}
return mPipeOut;