Rename KLocale to enhance compatibility with KDE4

5 files changed, 11 insertions, 11 deletions

diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 61e131b2f..6c9615185 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -3028,7 +3028,7 @@ void ComposerPage::PhrasesTab::slotAddNewLanguage( const TQString& lang )
 {
   mPhraseLanguageCombo->setCurrentItem(
     mPhraseLanguageCombo->insertLanguage( lang ) );
-  KLocale locale("kmail");
+  TDELocale locale("kmail");
   locale.setLanguage( lang );
   mLanguageList.append(
      LanguageItem( lang,
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 1bf75f097..a762a7dbb 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -144,7 +144,7 @@ namespace KMail {
     TQString dateString;
     if( printing ) {
       TQDateTime dateTime;
-      KLocale * locale = TDEGlobal::locale();
+      TDELocale * locale = TDEGlobal::locale();
       dateTime.setTime_t( message->date() );
       dateString = locale->formatDateTime( dateTime );
     } else {
@@ -243,7 +243,7 @@ namespace KMail {
     TQString dateString;
     if( printing ) {
       TQDateTime dateTime;
-      KLocale* locale = TDEGlobal::locale();
+      TDELocale* locale = TDEGlobal::locale();
       dateTime.setTime_t( message->date() );
       dateString = locale->formatDateTime( dateTime );
     }
@@ -448,7 +448,7 @@ namespace KMail {
     TQString dateString;
     if( printing ) {
       TQDateTime dateTime;
-      KLocale* locale = TDEGlobal::locale();
+      TDELocale* locale = TDEGlobal::locale();
       dateTime.setTime_t( message->date() );
       dateString = locale->formatDateTime( dateTime );
     }
@@ -914,7 +914,7 @@ namespace KMail {
 	TQString dateString;
 	if( printing ) {
 	    TQDateTime dateTime;
-	    KLocale * locale = TDEGlobal::locale();
+	    TDELocale * locale = TDEGlobal::locale();
 	    dateTime.setTime_t( message->date() );
 	    dateString = locale->formatDateTime( dateTime );
 	} else {
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index fe145b827..636da6d37 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -2821,7 +2821,7 @@ void KMComposeWin::slotAttachFileResult(TDEIO::Job *job)
     partCharset = TQCString( ( *it ).url.fileEncoding().latin1() );
   } else {
     EncodingDetector ed;
-    KLocale *loc = TDEGlobal::locale();
+    TDELocale *loc = TDEGlobal::locale();
     ed.setAutoDetectLanguage( EncodingDetector::scriptForLanguageCode ( loc->language() ) );
     ed.analyze( (*it).data );
     partCharset = ed.encoding();
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 43346fbcf..2473c8712 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -250,7 +250,7 @@ void insertLibraryCataloguesAndIcons() {
     "libkmime"
   };
 
-  KLocale * l = TDEGlobal::locale();
+  TDELocale * l = TDEGlobal::locale();
   KIconLoader * il = TDEGlobal::iconLoader();
   for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) {
     l->insertCatalogue( catalogues[i] );
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 9f9a80cd2..2ff9f56a9 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -694,7 +694,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         kdDebug() << "Command: DATEEN" << endl;
         i += strlen( "DATEEN" );
         TQDateTime date = TQDateTime::currentDateTime();
-        KLocale locale( "C" );
+        TDELocale locale( "C" );
         TQString str = locale.formatDate( date.date(), false );
         body.append( str );
 
@@ -723,7 +723,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         kdDebug() << "Command: TIMELONGEN" << endl;
         i += strlen( "TIMELONGEN" );
         TQDateTime date = TQDateTime::currentDateTime();
-        KLocale locale( "C");
+        TDELocale locale( "C");
         TQString str = locale.formatTime( date.time(), true );
         body.append( str );
 
@@ -747,7 +747,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          KLocale locale( "C");
+          TDELocale locale( "C");
           TQString str = locale.formatDate( date.date(), false );
           body.append( str );
         }
@@ -788,7 +788,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
         if ( mOrigMsg ) {
           TQDateTime date;
           date.setTime_t( mOrigMsg->date() );
-          KLocale locale( "C");
+          TDELocale locale( "C");
           TQString str = locale.formatTime( date.time(), true );
           body.append( str );
         }