From 35073c91a5e9a834c2bf06fc0a227116c657d855 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 08:00:24 -0600
Subject: [PATCH] Rename KLocale to enhance compatibility with KDE4

---
 ChangeLog                               | 10 +++++-----
 digikam/tdeioslave/digikamalbums.cpp    |  2 +-
 digikam/tdeioslave/digikamdates.cpp     |  2 +-
 digikam/tdeioslave/digikamsearch.cpp    |  2 +-
 digikam/tdeioslave/digikamtags.cpp      |  2 +-
 digikam/tdeioslave/digikamthumbnail.cpp |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1aabfee..592084b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17419,7 +17419,7 @@ v0.9.2-beta1 - 2007-05-04
 	  trunk/extragear/office/datakiosk/src/dateedit.cpp,
 	  trunk/extragear/utils/kedit/kedit.cpp,
 	  trunk/extragear/utils/krecipes/src/widgets/kdateedit.cpp: Revert
-	  KLocale::formatDate(), formatDateTime() commit for KDE3 modules
+	  TDELocale::formatDate(), formatDateTime() commit for KDE3 modules
 
 2007-04-10 19:50  cgilles
 
@@ -17436,13 +17436,13 @@ v0.9.2-beta1 - 2007-05-04
 	  trunk/extragear/graphics/digikam/libs/thumbbar/thumbbar.cpp,
 	  trunk/extragear/graphics/digikam/utilities/slideshow/slideshow.cpp:
 	  Fixed the previous broken commit so that it compiles
-	  (changed KLocale::ShortDate to ShortFormat which has the
+	  (changed TDELocale::ShortDate to ShortFormat which has the
 	  advantage that it exists :) )
 
 2007-04-10 19:10  djarvie
 
 	* trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiestab.cpp:
-	  Missed a KLocale::formatDateTime() conversion
+	  Missed a TDELocale::formatDateTime() conversion
 
 2007-04-10 19:03  djarvie
 
@@ -17468,8 +17468,8 @@ v0.9.2-beta1 - 2007-05-04
 	  trunk/extragear/office/kile/kile/quickdocumentdialog.cpp,
 	  trunk/extragear/utils/kedit/kedit.cpp,
 	  trunk/extragear/utils/krecipes/src/widgets/kdateedit.cpp: Add
-	  fancy date option to KLocale::formatDate(),
-	  KLocale::formatDateTime()
+	  fancy date option to TDELocale::formatDate(),
+	  TDELocale::formatDateTime()
 
 2007-04-10 14:40  cgilles
 
diff --git a/digikam/tdeioslave/digikamalbums.cpp b/digikam/tdeioslave/digikamalbums.cpp
index 724c255..17724ee 100644
--- a/digikam/tdeioslave/digikamalbums.cpp
+++ b/digikam/tdeioslave/digikamalbums.cpp
@@ -1951,7 +1951,7 @@ extern "C"
 {
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
-        KLocale::setMainCatalogue("digikam");
+        TDELocale::setMainCatalogue("digikam");
         TDEInstance instance( "tdeio_digikamalbums" );
         TDEGlobal::locale();
 
diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp
index 792a1d5..6cd7b89 100644
--- a/digikam/tdeioslave/digikamdates.cpp
+++ b/digikam/tdeioslave/digikamdates.cpp
@@ -294,7 +294,7 @@ extern "C"
 {
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
-        KLocale::setMainCatalogue("digikam");
+        TDELocale::setMainCatalogue("digikam");
         TDEInstance instance( "tdeio_digikamdates" );
         TDEGlobal::locale();
 
diff --git a/digikam/tdeioslave/digikamsearch.cpp b/digikam/tdeioslave/digikamsearch.cpp
index 80ad926..462f5d1 100644
--- a/digikam/tdeioslave/digikamsearch.cpp
+++ b/digikam/tdeioslave/digikamsearch.cpp
@@ -674,7 +674,7 @@ extern "C"
 {
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
-        KLocale::setMainCatalogue("digikam");
+        TDELocale::setMainCatalogue("digikam");
         TDEInstance instance( "tdeio_digikamsearch" );
         TDEGlobal::locale();
 
diff --git a/digikam/tdeioslave/digikamtags.cpp b/digikam/tdeioslave/digikamtags.cpp
index ed841c0..4163dc6 100644
--- a/digikam/tdeioslave/digikamtags.cpp
+++ b/digikam/tdeioslave/digikamtags.cpp
@@ -303,7 +303,7 @@ extern "C"
 {
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
-        KLocale::setMainCatalogue("digikam");
+        TDELocale::setMainCatalogue("digikam");
         TDEInstance instance( "tdeio_digikamtags" );
         ( void ) TDEGlobal::locale();
 
diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp
index fb1fc60..c78b362 100644
--- a/digikam/tdeioslave/digikamthumbnail.cpp
+++ b/digikam/tdeioslave/digikamthumbnail.cpp
@@ -614,7 +614,7 @@ extern "C"
 {
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
-        KLocale::setMainCatalogue("digikam");
+        TDELocale::setMainCatalogue("digikam");
         TDEInstance instance( "tdeio_digikamthumbnail" );
         ( void ) TDEGlobal::locale();