From 59d153016be1e09cb31cdb18bef0a649acfc6292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:17:52 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- tdecore/kglobal.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/kglobal.cpp') diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp index 7b492b5a8..9d39c0d6c 100644 --- a/tdecore/kglobal.cpp +++ b/tdecore/kglobal.cpp @@ -101,7 +101,7 @@ TDEInstance *TDEGlobal::instance() return _instance; } -KLocale *TDEGlobal::locale() +TDELocale *TDEGlobal::locale() { if( _locale == 0 ) { if (!_instance) @@ -109,7 +109,7 @@ KLocale *TDEGlobal::locale() kglobal_init(); // will set _locale if it works - otherwise 0 is returned - KLocale::initInstance(); + TDELocale::initInstance(); if( _instance->aboutData()) _instance->aboutData()->translateInternalProgramName(); } @@ -217,7 +217,7 @@ TDEGlobal::deleteStaticDeleters() KStringDict *TDEGlobal::_stringDict = 0; TDEInstance *TDEGlobal::_instance = 0; TDEInstance *TDEGlobal::_activeInstance = 0; -KLocale *TDEGlobal::_locale = 0; +TDELocale *TDEGlobal::_locale = 0; KCharsets *TDEGlobal::_charsets = 0; KStaticDeleterList *TDEGlobal::_staticDeleters = 0; -- cgit v1.2.1