diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kcmshell | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcmshell')
| -rw-r--r-- | kcmshell/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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")) { |