diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 08:19:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 08:19:44 -0600 |
| commit | 6dea9442526e5ebacf313ad387c7dff4b87a53bf (patch) | |
| tree | d400e34cbe644bd98c7f0d08e2e83b43597dd3ee /libkmime | |
| parent | 339bb51ad3721e188a57c529828a55400213ff70 (diff) | |
| download | tdepim-6dea9442526e5ebacf313ad387c7dff4b87a53bf.tar.gz tdepim-6dea9442526e5ebacf313ad387c7dff4b87a53bf.zip | |
Rename KLocale to enhance compatibility with KDE4
Diffstat (limited to 'libkmime')
| -rw-r--r-- | libkmime/kmime_util.cpp | 6 | ||||
| -rw-r--r-- | libkmime/kmime_util.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 601401814..38f282752 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -636,7 +636,7 @@ DateFormatter::qdateToTimeT(const TQDateTime& dt) const TQString DateFormatter::fancy(time_t otime) const { - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); if ( otime <= 0 ) return i18n( "unknown" ); @@ -691,13 +691,13 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs, { TQDateTime tmp; TQString ret; - KLocale *locale = TDEGlobal::locale(); + TDELocale *locale = TDEGlobal::locale(); tmp.setTime_t( otime ); if ( !localeLanguage.isEmpty() ) { - locale=new KLocale(localeLanguage); + locale=new TDELocale(localeLanguage); locale->setLanguage(localeLanguage); locale->setCountry(localeLanguage); ret = locale->formatDateTime( tmp, shortFormat, includeSecs ); diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h index 34f8bd5d7..4619446a4 100644 --- a/libkmime/kmime_util.h +++ b/libkmime/kmime_util.h @@ -223,8 +223,8 @@ namespace KMime { * set format. * @param otime time to format * @param lang used <em>only</em> by the Localized format, sets the used language - * @param shortFormat used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime - * @param includeSecs used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime + * @param shortFormat used <em>only</em> by the Localized format, is passed to TDELocale::formatDateTime + * @param includeSecs used <em>only</em> by the Localized format, is passed to TDELocale::formatDateTime */ TQString dateString(time_t otime, const TQString& lang = TQString(), bool shortFormat = true, bool includeSecs=false) const; @@ -263,8 +263,8 @@ namespace KMime { * @param time time to format * @param data is either the format when FormatType is Custom, or language * when FormatType is Localized - * @param shortFormat used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime - * @param includeSecs used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime + * @param shortFormat used <em>only</em> by the Localized format, is passed to TDELocale::formatDateTime + * @param includeSecs used <em>only</em> by the Localized format, is passed to TDELocale::formatDateTime */ static TQString formatDate( DateFormatter::FormatType t, time_t time, const TQString& data = TQString(), @@ -275,8 +275,8 @@ namespace KMime { * @param t specifies the FormatType to use * @param data is either the format when FormatType is Custom, or language * when FormatType is Localized - * @param shortFormat used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime - * @param includeSecs used <em>only</em> by the Localized format, is passed to KLocale::formatDateTime + * @param shortFormat used <em>only</em> by the Localized format, is passed to TDELocale::formatDateTime + * @param includeSecs used <em>only</em> by the Localized format, is passed to TDELocale::formatDateTime */ static TQString formatCurrentDate( DateFormatter::FormatType t, const TQString& data = TQString(), |