summaryrefslogtreecommitdiffstats
path: root/kmail/templateparser.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kmail/templateparser.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/templateparser.cpp')
-rw-r--r--kmail/templateparser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 79df85094..26355ac5b 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ TQDateTime date = TQDateTime::tqcurrentDateTime();
TQString str = KGlobal::locale()->formatTime( date.time(), false );
body.append( str );
@@ -963,7 +963,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
// Converting to a string here, since DwMediaType does not have a HasParameter() function
TQString ctStr = ct.AsString().c_str();
- if ( !ctStr.lower().contains( "name=" ) && !ctStr.lower().contains( "filename=" ) ) {
+ if ( !ctStr.lower().tqcontains( "name=" ) && !ctStr.lower().tqcontains( "filename=" ) ) {
DwParameter *nameParameter = new DwParameter;
nameParameter->SetAttribute( "name" );
nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(