From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 lib/kotext/KoAutoFormat.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/kotext/KoAutoFormat.cpp')

diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index b6268a760..b3d0c7aa6 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -30,11 +30,11 @@
 
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcommand.h>
 //#include <KoTextFormat.h>
 #include <kcompletion.h>
@@ -169,7 +169,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti
     TDELocale klocale(m_doc->instance()->instanceName());
     for (int i = 1; i <=7; i++)
     {
-        m_cacheNameOfDays.append(klocale.calendar()->weekDayName( i ).lower());
+        m_cacheNameOfDays.append(tdelocale.calendar()->weekDayName( i ).lower());
     }
 }
 
@@ -392,7 +392,7 @@ void KoAutoFormat::readAutoCorrectConfig()
 {
     Q_ASSERT( m_entries.isEmpty() ); // readConfig is only called once...
     TDELocale klocale(m_doc->instance()->instanceName());
-    TQString kdelang = klocale.languageList().front();
+    TQString kdelang = tdelocale.languageList().front();
     kdelang.remove( TQRegExp( "@.*" ) );
     kdDebug(32500) << "KoAutoFormat: m_autoFormatLanguage=" << m_autoFormatLanguage << " kdelang=" << kdelang << endl;
     TQString fname;
@@ -620,7 +620,7 @@ void KoAutoFormat::saveConfig()
 
     TDEConfigGroupSaver cgs( config, "AutoFormat" );
     config->writeEntry( "ConvertUpperCase", m_convertUpperCase );
-    config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage);
+    config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? tdelocale.languageList().front() : m_autoFormatLanguage);
 
     config->writeEntry( "ConvertUpperUpper", m_convertUpperUpper );
     config->writeEntry( "includeTwoLetterException", m_includeTwoUpperLetterException );
@@ -733,7 +733,7 @@ void KoAutoFormat::saveConfig()
     begin.appendChild(simpleQuote);
     TQFile f;
     if ( m_autoFormatLanguage.isEmpty())
-        f.setName(locateLocal("data", "koffice/autocorrect/"+klocale.languageList().front() + ".xml",m_doc->instance()));
+        f.setName(locateLocal("data", "koffice/autocorrect/"+tdelocale.languageList().front() + ".xml",m_doc->instance()));
     else
         f.setName(locateLocal("data", "koffice/autocorrect/"+m_autoFormatLanguage + ".xml",m_doc->instance()));
     if(!f.open(IO_WriteOnly)) {
-- 
cgit v1.2.3