From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:43 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kdesktop/kwebdesktop/kwebdesktop.cpp | 6 +++--- kdesktop/kxdglauncher.cpp | 6 +++--- kdesktop/lock/main.cc | 6 +++--- kdesktop/main.cc | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 020ac0ebf..111af852d 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -93,13 +93,13 @@ int main( int argc, char **argv ) "(c) 2000, David Faure " ); data.addAuthor( "David Faure", I18N_NOOP("developer and maintainer"), "faure@kde.org" ); - KCmdLineArgs::init( argc, argv, &data ); + TDECmdLineArgs::init( argc, argv, &data ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 3 && args->count() != 4 ) { args->usage(); diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 631843dec..68d1c1943 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -90,9 +90,9 @@ static KCmdLineOptions options[] = int main( int argc, char **argv) { - KCmdLineArgs::init( argc, argv, "kxdglauncher", I18N_NOOP("TDE XDG File Browser Launcher and Prompter"), I18N_NOOP("Prompts if directory does not exist, otherwise launches"), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, "kxdglauncher", I18N_NOOP("TDE XDG File Browser Launcher and Prompter"), I18N_NOOP("Prompts if directory does not exist, otherwise launches"), "1.0" ); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KApplication app; app.disableSessionManagement(); diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 5ac0a588a..88c28d11b 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -207,9 +207,9 @@ int main( int argc, char **argv ) { KLocale::setMainCatalogue("kdesktop"); - KCmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.1" ); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.1" ); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); putenv(strdup("SESSION_MANAGER=")); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index a4a972065..51eb7b2a3 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -181,8 +181,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) aboutData.addAuthor("Torben Weis", 0, "weis@kde.org"); aboutData.addAuthor("Matthias Ettrich", 0, "ettrich@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); if (!KUniqueApplication::start()) { fprintf(stderr, "kdesktop is already running!\n"); @@ -195,11 +195,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) r.send( "suspendStartup", TQCString( "kdesktop" )); delete cl; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); #ifdef COMPOSITE - KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt"); + TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt"); if ( args->isSet("bg-transparency")) { char *display = 0; -- cgit v1.2.3