From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kcmshell/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kcmshell') diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp index 7196c0e0a..2ef0ac781 100644 --- a/kcmshell/main.cpp +++ b/kcmshell/main.cpp @@ -211,7 +211,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); - KGlobal::locale()->setMainCatalogue("kcmshell"); + TDEGlobal::locale()->setMainCatalogue("kcmshell"); TDECmdLineArgs::init(_argc, _argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. @@ -221,7 +221,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) const TQCString lang = args->getOption("lang"); if( !lang.isNull() ) - KGlobal::locale()->setLanguage(lang); + TDEGlobal::locale()->setLanguage(lang); if (args->isSet("list")) { -- cgit v1.2.1