Rename KLocale to enhance compatibility with KDE4

4 files changed, 6 insertions, 6 deletions

diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index c657ee32..15e7b892 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -112,7 +112,7 @@ public:
     {
         m_confirmNonNativeSave[0] = true;
         m_confirmNonNativeSave[1] = true;
-        if ( TDEGlobal::locale()->measureSystem() == KLocale::Imperial ) {
+        if ( TDEGlobal::locale()->measureSystem() == TDELocale::Imperial ) {
             m_unit = KoUnit::U_INCH;
         } else {
             m_unit = KoUnit::U_CM;
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 40050232..78c39540 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -112,7 +112,7 @@ TQStringList KoGlobal::_listOfLanguages()
 void KoGlobal::createListOfLanguages()
 {
     TDEConfig config( "all_languages", true, false, "locale" );
-    // Note that we could also use KLocale::allLanguagesTwoAlpha
+    // Note that we could also use TDELocale::allLanguagesTwoAlpha
 
     TQMap<TQString, bool> seenLanguages;
     const TQStringList langlist = config.groupList();
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 3599c76a..0b9f26e7 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -98,7 +98,7 @@ TQString KoUnitDoubleBase::getVisibleText( double value ) const
 double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const
 {
     TQString str2( str );
-    /* KLocale::readNumber wants the thousand separator exactly at 1000.
+    /* TDELocale::readNumber wants the thousand separator exactly at 1000.
        But when editing, it might be anywhere. So we need to remove it. */
     const TQString sep( TDEGlobal::locale()->thousandsSeparator() );
     if ( !sep.isEmpty() )
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index b46973b3..1a3c5245 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -166,7 +166,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti
     loadListOfWordCompletion();
     m_listCompletion->setIgnoreCase( true );
     updateMaxWords();
-    KLocale klocale(m_doc->instance()->instanceName());
+    TDELocale klocale(m_doc->instance()->instanceName());
     for (int i = 1; i <=7; i++)
     {
         m_cacheNameOfDays.append(klocale.calendar()->weekDayName( i ).lower());
@@ -391,7 +391,7 @@ void KoAutoFormat::readConfig(bool force)
 void KoAutoFormat::readAutoCorrectConfig()
 {
     Q_ASSERT( m_entries.isEmpty() ); // readConfig is only called once...
-    KLocale klocale(m_doc->instance()->instanceName());
+    TDELocale klocale(m_doc->instance()->instanceName());
     TQString kdelang = klocale.languageList().front();
     kdelang.remove( TQRegExp( "@.*" ) );
     kdDebug(32500) << "KoAutoFormat: m_autoFormatLanguage=" << m_autoFormatLanguage << " kdelang=" << kdelang << endl;
@@ -616,7 +616,7 @@ void KoAutoFormat::loadEntry( const TQDomElement &nl, bool _allLanguages)
 void KoAutoFormat::saveConfig()
 {
     TDEConfig* config = KoGlobal::kofficeConfig();
-    KLocale klocale(m_doc->instance()->instanceName());
+    TDELocale klocale(m_doc->instance()->instanceName());
 
     TDEConfigGroupSaver cgs( config, "AutoFormat" );
     config->writeEntry( "ConvertUpperCase", m_convertUpperCase );