From 7c140ea1cb70b8a6ecb34454514dcf91d7bcd0c7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:41 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kmag/main.cpp | 6 +++--- kmousetool/kmousetool/main.cpp | 4 ++-- kmouth/main.cpp | 6 +++--- ksayit/src/main.cpp | 2 +- kttsd/filters/main.cpp | 6 +++--- kttsd/kttsd/main.cpp | 4 ++-- kttsd/kttsmgr/kttsmgr.cpp | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kmag/main.cpp b/kmag/main.cpp index 0cfb4b8..a543029 100644 --- a/kmag/main.cpp +++ b/kmag/main.cpp @@ -59,8 +59,8 @@ int main(int argc, char *argv[]) aboutData->addCredit("Claudiu Costin", I18N_NOOP("Some tips"), "claudiuc@work.ro", "http://www.ro.kde.org"); - KCmdLineArgs::init( argc, argv, aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) { kmagapp = new KmagApp(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); args->clear(); } diff --git a/kmousetool/kmousetool/main.cpp b/kmousetool/kmousetool/main.cpp index 6267d57..c0fe636 100644 --- a/kmousetool/kmousetool/main.cpp +++ b/kmousetool/kmousetool/main.cpp @@ -50,8 +50,8 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Jeff Roush", I18N_NOOP("Original author"), "jeff@mousetool.com", "http://www.mousetool.com"); aboutData.addCredit("Joe Betts"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) { diff --git a/kmouth/main.cpp b/kmouth/main.cpp index 0f9c875..ec7eb78 100644 --- a/kmouth/main.cpp +++ b/kmouth/main.cpp @@ -43,8 +43,8 @@ int main(int argc, char *argv[]) KMOUTH_VERSION, description, KAboutData::License_GPL, "(c) 2002/2003, Gunnar Schmi Dt", 0, "http://www.schmi-dt.de/kmouth/index.en.html", "kmouth@schmi-dt.de"); aboutData.addAuthor("Gunnar Schmi Dt",0, "kmouth@schmi-dt.de"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. aboutData.addCredit("Olaf Schmidt", I18N_NOOP("Tips, extended phrase books"), 0, 0); KApplication app; @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) kmouth->show(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count()) { diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp index 5312d80..921c3a1 100644 --- a/ksayit/src/main.cpp +++ b/ksayit/src/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) KSAYIT_VERSION, description, KAboutData::License_GPL, "(c) 1996 - 2005, Robert Vogl", 0, 0, "voglrobe@web.de"); aboutData.addAuthor("Robert Vogl",0, "voglrobe@web.de"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index f33d771..35cdb31 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -65,13 +65,13 @@ int main(int argc, char *argv[]) KAboutData::License_GPL, "(C) 2005, Gary Cramblitt "); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); - KCmdLineArgs::init( argc, argv, &aboutdata ); + TDECmdLineArgs::init( argc, argv, &aboutdata ); // Tell which options are supported - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin"); diff --git a/kttsd/kttsd/main.cpp b/kttsd/kttsd/main.cpp index 3c47df4..1a5bb7e 100644 --- a/kttsd/kttsd/main.cpp +++ b/kttsd/kttsd/main.cpp @@ -44,8 +44,8 @@ int main (int argc, char *argv[]){ aboutdata.addCredit("Jorge Luis Arzola", I18N_NOOP("Testing"), "arzolacub@hotmail.com"); aboutdata.addCredit("David Powell", I18N_NOOP("Testing"), "achiestdragon@gmail.com"); - KCmdLineArgs::init( argc, argv, &aboutdata ); - // KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutdata ); + // TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); if(!KUniqueApplication::start()){ diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 862a3db..e4ceb7c 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -66,9 +66,9 @@ int main (int argc, char *argv[]) aboutdata.addAuthor("Paul Giannaros", I18N_NOOP("Contributor"), "ceruleanblaze@gmail.com"); aboutdata.addCredit("Jorge Luis Arzola", I18N_NOOP("Testing"), "arzolacub@hotmail.com"); aboutdata.addCredit("David Powell", I18N_NOOP("Testing"), "achiestdragon@gmail.com"); - KCmdLineArgs::init( argc, argv, &aboutdata ); + TDECmdLineArgs::init( argc, argv, &aboutdata ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); @@ -102,7 +102,7 @@ int main (int argc, char *argv[]) showMainWindowOnStartup = config->readBoolEntry("ShowMainWindowOnStartup", true); // If --systray option specified, start minimized in system tray. - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("systray")) { embedInSysTray = true; @@ -192,7 +192,7 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent): connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected())); // If --autoexit option given, exit when speaking stops. - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("autoexit")) { connectDCOPSignal("kttsd", "KSpeech", -- cgit v1.2.3