1 files changed, 22 insertions, 22 deletions

diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 310460230..9f9a80cd2 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -702,21 +702,21 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         kdDebug() << "Command: DATESHORT" << endl;
         i += strlen( "DATESHORT" );
         TQDateTime date = TQDateTime::currentDateTime();
-        TQString str = KGlobal::locale()->formatDate( date.date(), true );
+        TQString str = TDEGlobal::locale()->formatDate( date.date(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "DATE" ) ) {
         kdDebug() << "Command: DATE" << endl;
         i += strlen( "DATE" );
         TQDateTime date = TQDateTime::currentDateTime();
-        TQString str = KGlobal::locale()->formatDate( date.date(), false );
+        TQString str = TDEGlobal::locale()->formatDate( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "DOW" ) ) {
         kdDebug() << "Command: DOW" << endl;
         i += strlen( "DOW" );
         TQDateTime date = TQDateTime::currentDateTime();
-        TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false );
+        TQString str = TDEGlobal::locale()->calendar()->weekDayName( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIMELONGEN" ) ) {
@@ -731,14 +731,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         kdDebug() << "Command: TIMELONG" << endl;
         i += strlen( "TIMELONG" );
         TQDateTime date = TQDateTime::currentDateTime();
-        TQString str = KGlobal::locale()->formatTime( date.time(), true );
+        TQString str = TDEGlobal::locale()->formatTime( date.time(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIME" ) ) {
         kdDebug() << "Command: TIME" << endl;
         i += strlen( "TIME" );
         TQDateTime date = TQDateTime::currentDateTime();
-        TQString str = KGlobal::locale()->formatTime( date.time(), false );
+        TQString str = TDEGlobal::locale()->formatTime( date.time(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "ODATEEN" ) ) {
@@ -758,7 +758,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          TQString str = KGlobal::locale()->formatDate( date.date(), true );
+          TQString str = TDEGlobal::locale()->formatDate( date.date(), true );
           body.append( str );
         }
 
@@ -768,7 +768,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          TQString str = KGlobal::locale()->formatDate( date.date(), false );
+          TQString str = TDEGlobal::locale()->formatDate( date.date(), false );
           body.append( str );
         }
 
@@ -778,7 +778,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false );
+          TQString str = TDEGlobal::locale()->calendar()->weekDayName( date.date(), false );
           body.append( str );
         }
 
@@ -799,7 +799,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          TQString str = KGlobal::locale()->formatTime( date.time(), true );
+          TQString str = TDEGlobal::locale()->formatTime( date.time(), true );
           body.append( str );
         }
 
@@ -809,7 +809,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          TQString str = KGlobal::locale()->formatTime( date.time(), false );
+          TQString str = TDEGlobal::locale()->formatTime( date.time(), false );
           body.append( str );
         }
 
@@ -1118,21 +1118,21 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
   mPipeErr = "";
   mPipeRc = 0;
 
-  KProcess proc;
+  TDEProcess proc;
   TQCString data = buf.local8Bit();
 
   // kdDebug() << "Command data: " << data << endl;
 
   proc << KShell::splitArgs( cmd, KShell::TildeExpand );
   proc.setUseShell( true );
-  connect( &proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
-           this, TQT_SLOT( onReceivedStdout( KProcess *, char *, int ) ) );
-  connect( &proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
-           this, TQT_SLOT( onReceivedStderr( KProcess *, char *, int ) ) );
-  connect( &proc, TQT_SIGNAL( wroteStdin( KProcess * ) ),
-           this, TQT_SLOT( onWroteStdin( KProcess * ) ) );
+  connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+           this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) );
+  connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+           this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) );
+  connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
+           this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) );
 
-  if ( proc.start( KProcess::NotifyOnExit, KProcess::All ) ) {
+  if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
 
     bool pipe_filled = proc.writeStdin( data, data.length() );
     if ( pipe_filled ) {
@@ -1208,25 +1208,25 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
   return mPipeOut;
 }
 
-void TemplateParser::onProcessExited( KProcess *proc )
+void TemplateParser::onProcessExited( TDEProcess *proc )
 {
   Q_UNUSED( proc );
   // do nothing for now
 }
 
-void TemplateParser::onReceivedStdout( KProcess *proc, char *buffer, int buflen )
+void TemplateParser::onReceivedStdout( TDEProcess *proc, char *buffer, int buflen )
 {
   Q_UNUSED( proc );
   mPipeOut += TQString::fromLocal8Bit( buffer, buflen );
 }
 
-void TemplateParser::onReceivedStderr( KProcess *proc, char *buffer, int buflen )
+void TemplateParser::onReceivedStderr( TDEProcess *proc, char *buffer, int buflen )
 {
   Q_UNUSED( proc );
   mPipeErr += TQString::fromLocal8Bit( buffer, buflen );
 }
 
-void TemplateParser::onWroteStdin( KProcess *proc )
+void TemplateParser::onWroteStdin( TDEProcess *proc )
 {
   proc->closeStdin();
 }