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 --- tdeio/kssl/ksslutils.h | 4 ++-- tdeio/misc/tdemailservice.cpp | 2 +- tdeio/misc/tdesendbugmail/main.cpp | 2 +- tdeio/misc/tdetelnetservice.cpp | 2 +- tdeio/misc/uiserver.cpp | 2 +- tdeio/tdefile/tests/kcustommenueditortest.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tdeio') diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h index 4c087374f..58a817e83 100644 --- a/tdeio/kssl/ksslutils.h +++ b/tdeio/kssl/ksslutils.h @@ -41,7 +41,7 @@ class TQDateTime; #ifdef KSSL_HAVE_SSL // This functionality is missing in OpenSSL /** - * Convert an ASN1 UTCTIME value to a string. Uses KLocale settings. + * Convert an ASN1 UTCTIME value to a string. Uses TDELocale settings. * * @param tm the OpenSSL ASN1_UTCTIME pointer * @@ -51,7 +51,7 @@ class TQDateTime; KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm); /** - * Convert an ASN1 UTCTIME value to a TQDateTime. Uses KLocale settings. + * Convert an ASN1 UTCTIME value to a TQDateTime. Uses TDELocale settings. * * @param tm the OpenSSL ASN1_UTCTIME pointer * @param isGmt set to 1 if the date is set to GMT diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp index 3f9b04feb..d1d6bb939 100644 --- a/tdeio/misc/tdemailservice.cpp +++ b/tdeio/misc/tdemailservice.cpp @@ -28,7 +28,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDECmdLineArgs::init( argc, argv, "tdemailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index 162e6ad5c..7df3a344a 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -58,7 +58,7 @@ void BugMailer::slotSend() { int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEAboutData d("tdesendbugmail", I18N_NOOP("KSendBugMail"), "1.0", I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"), TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow"); diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp index 655a5b32a..a814b8e52 100644 --- a/tdeio/misc/tdetelnetservice.cpp +++ b/tdeio/misc/tdetelnetservice.cpp @@ -37,7 +37,7 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDECmdLineArgs::init(argc, argv, "tdetelnetservice", I18N_NOOP("telnet service"), I18N_NOOP("telnet protocol handler"), "unknown"); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index 6ba92a6a2..8a9c7f21e 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -1377,7 +1377,7 @@ UIServer* UIServer::createInstance() extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); // GS 5/2001 - I changed the name to "TDE" to make it look better // in the titles of dialogs which are displayed. TDEAboutData aboutdata("tdeio_uiserver", I18N_NOOP("TDE"), diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp index df2c692f6..40a34b203 100644 --- a/tdeio/tdefile/tests/kcustommenueditortest.cpp +++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp @@ -5,7 +5,7 @@ int main(int argc, char** argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEApplication app(argc, argv, "KCustomMenuEditorTest"); KCustomMenuEditor editor(0); TDEConfig *cfg = new TDEConfig("kdesktop_custom_menu2"); -- cgit v1.2.1