summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 08:00:24 -0600
committerTimothy Pearson <[email protected]>2013-02-01 08:00:24 -0600
commit35073c91a5e9a834c2bf06fc0a227116c657d855 (patch)
treeedb007ae4fc4b93acccfd2c8729563c3964ae24f
parent94df4ed57c2a56fbee06c9a8b70718aa19816f10 (diff)
downloaddigikam-35073c91a5e9a834c2bf06fc0a227116c657d855.tar.gz
digikam-35073c91a5e9a834c2bf06fc0a227116c657d855.zip
Rename KLocale to enhance compatibility with KDE4
-rw-r--r--ChangeLog10
-rw-r--r--digikam/tdeioslave/digikamalbums.cpp2
-rw-r--r--digikam/tdeioslave/digikamdates.cpp2
-rw-r--r--digikam/tdeioslave/digikamsearch.cpp2
-rw-r--r--digikam/tdeioslave/digikamtags.cpp2
-rw-r--r--digikam/tdeioslave/digikamthumbnail.cpp2
6 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 1aabfee5..592084bc 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 724c2550..17724eed 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 792a1d53..6cd7b894 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 80ad926d..462f5d11 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 ed841c09..4163dc6a 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 fb1fc601..c78b3629 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();