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 --- twin/clients/kwmtheme/cli_installer/main.cpp | 6 +++--- twin/kcmtwin/twinrules/main.cpp | 8 ++++---- twin/killer/killer.cpp | 8 ++++---- twin/main.cpp | 6 +++--- twin/resumer/resumer.cpp | 6 +++--- twin/tools/decobenchmark/main.cpp | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'twin') diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index c67a2d227..c9bb6133c 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -39,10 +39,10 @@ void copy(const TQString &src, const TQString &dest) int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1"); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1"); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app(argc, argv); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(!args->count()){ kdWarning() << "You need to specify the path to a theme config file!" << endl; return(1); diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index 30cce3ffa..c29dacdaa 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -276,18 +276,18 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) { KLocale::setMainCatalogue( "kcmtwinrules" ); - KCmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ), + TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ), I18N_NOOP( "TWin helper utility" ), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool whole_app = args->isSet( "whole-app" ); args->clear(); if( !id_ok || id == None ) { - KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); + TDECmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); return 1; } return KWinInternal::edit( id, whole_app ); diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp index 18fbac02b..46969da7f 100644 --- a/twin/killer/killer.cpp +++ b/twin/killer/killer.cpp @@ -46,11 +46,11 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { KLocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file - KCmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ), + TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ), I18N_NOOP( "TWin helper utility" ), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString hostname = args->getOption( "hostname" ); bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); @@ -64,7 +64,7 @@ int main( int argc, char* argv[] ) if( !pid_ok || pid == 0 || !id_ok || id == None || !time_ok || timestamp == CurrentTime || hostname.isEmpty() || caption.isEmpty() || appname.isEmpty()) { - KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); + TDECmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); return 1; } TQString question = i18n( diff --git a/twin/main.cpp b/twin/main.cpp index 316892257..df2470c3e 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -88,7 +88,7 @@ Application::Application( ) // I'm special... setQuitOnLastWindowClosed(false); #endif // USE_QT4 - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if (!config()->isImmutable() && args->isSet("lock")) { config()->setReadOnly(true); @@ -317,8 +317,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) aboutData.addAuthor("Daniel M. Duley",0, "mosfet@kde.org"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "l.lunak@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( args ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( args ); if (signal(SIGTERM, KWinInternal::sighandler) == SIG_IGN) signal(SIGTERM, SIG_IGN); diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp index e2ee0d55b..0b9c199cd 100644 --- a/twin/resumer/resumer.cpp +++ b/twin/resumer/resumer.cpp @@ -45,11 +45,11 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { KLocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file - KCmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ), + TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ), I18N_NOOP( "TWin helper utility" ), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString hostname = args->getOption( "hostname" ); bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index d89f773d0..2537d9f6b 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -102,13 +102,13 @@ int main(int argc, char** argv) TQString style = "keramik"; // KApplication app(argc, argv); KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 3) - KCmdLineArgs::usage("Wrong number of arguments!"); + TDECmdLineArgs::usage("Wrong number of arguments!"); TQString library = TQString(args->arg(0) ); TQString t = TQString(args->arg(1) ); @@ -126,7 +126,7 @@ int main(int argc, char** argv) else if (t == "recreation") test = RecreationTest; else - KCmdLineArgs::usage("Specify a valid test!"); + TDECmdLineArgs::usage("Specify a valid test!"); DecoBenchApplication app(library, test, count); -- cgit v1.2.1