From 50d6569cdef5f0aac099f5d01864bd0e14f82ae3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:46 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- dcoprss/feedbrowser.cpp | 2 +- dcoprss/main.cpp | 4 ++-- kdict/application.cpp | 2 +- kdict/main.cpp | 4 ++-- kdnssd/ioslave/dnssd.cpp | 6 +++--- kget/main.cpp | 6 +++--- knewsticker/knewstickerstub/knewstickerstub.cpp | 6 +++--- .../chatwindow/tests/chatwindowstylerendering_test.cpp | 2 +- kopete/kopete/kopeteapplication.cpp | 6 +++--- kopete/kopete/main.cpp | 4 ++-- kopete/libkopete/tests/kopetemessage_test.cpp | 2 +- kopete/libkopete/tests/kopetepasswordtest_program.cpp | 6 +++--- kopete/libkopete/tests/kopetewallettest_program.cpp | 6 +++--- kopete/plugins/smpppdcs/unittest/main.cpp | 4 ++-- kppp/kpppwidget.cpp | 4 ++-- kppp/logview/main.cpp | 6 +++--- kppp/main.cpp | 6 +++--- kppp/modem.cpp | 2 +- kppp/modem.h | 4 ++-- krdc/main.cpp | 6 +++--- krfb/krfb/main.cpp | 6 +++--- ksirc/KSTicker/ksttest.cpp | 2 +- ksirc/ksirc.cpp | 6 +++--- ktalkd/ktalkdlg/ktalkdlg.cpp | 8 ++++---- librss/testlibrss.cpp | 2 +- wifi/main.cpp | 6 +++--- 26 files changed, 59 insertions(+), 59 deletions(-) diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index 1c6810c6..4a12dac5 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -133,7 +133,7 @@ int main( int argc, char **argv ) { KGlobal::locale()->setMainCatalogue( "dcoprss" ); KAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; FeedBrowserDlg *dlg = new FeedBrowserDlg( 0 ); app.setMainWidget( dlg ); diff --git a/dcoprss/main.cpp b/dcoprss/main.cpp index 7e60cac1..fde9a7b5 100644 --- a/dcoprss/main.cpp +++ b/dcoprss/main.cpp @@ -18,8 +18,8 @@ int main (int argc, char *argv[]) KAboutData::License_GPL, "(C) 2003, Ian Reinhart Geiser"); aboutdata.addAuthor("Ian Reinhart Geiser",I18N_NOOP("Developer"),"geiseri@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutdata ); - // KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutdata ); + // TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) diff --git a/kdict/application.cpp b/kdict/application.cpp index e2a2c2f6..6d5e5ada 100644 --- a/kdict/application.cpp +++ b/kdict/application.cpp @@ -36,7 +36,7 @@ int Application::newInstance() KUniqueApplication::newInstance(); // process parameters... - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); m_mainWindow->show(); diff --git a/kdict/main.cpp b/kdict/main.cpp index c644f6ec..17e6e6dd 100644 --- a/kdict/main.cpp +++ b/kdict/main.cpp @@ -43,8 +43,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char* argv[]) aboutData.addAuthor("Christian Gebauer",I18N_NOOP("Maintainer"),"gebauer@kde.org"); aboutData.addAuthor("Matthias Hoelzer",I18N_NOOP("Original Author"),"hoelzer@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( knoptions ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( knoptions ); KUniqueApplication::addCmdLineOptions(); if (!Application::start()) diff --git a/kdnssd/ioslave/dnssd.cpp b/kdnssd/ioslave/dnssd.cpp index 21be7de1..0f16008e 100644 --- a/kdnssd/ioslave/dnssd.cpp +++ b/kdnssd/ioslave/dnssd.cpp @@ -353,11 +353,11 @@ extern "C" { // KApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); - KCmdLineArgs::init(argc, argv, "kio_zeroconf", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kio_zeroconf", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::disableAutoDcopRegistration(); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); ZeroConfProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); slave.dispatchLoop(); return 0; diff --git a/kget/main.cpp b/kget/main.cpp index 589fb177..ffa891f1 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -135,7 +135,7 @@ public: sDebugIn <<"kmainwidget="<fakeChatSession, 0, 0); diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index a2c88990..ef8160c1 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -121,7 +121,7 @@ void KopeteApplication::slotLoadPlugins() KConfig *config = KGlobal::config(); // Parse command-line arguments - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool showConfigDialog = false; @@ -208,7 +208,7 @@ void KopeteApplication::slotLoadPlugins() void KopeteApplication::slotAllPluginsLoaded() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // --noconnect not specified? if ( args->isSet( "connect" ) && KopetePrefs::prefs()->autoConnect() ) @@ -293,7 +293,7 @@ int KopeteApplication::newInstance() void KopeteApplication::handleURLArgs() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // kdDebug(14000) << k_funcinfo << "called with " << args->count() << " arguments to handle." << endl; if ( args->count() > 0 ) diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp index 559fdbbb..eaa0ff68 100644 --- a/kopete/kopete/main.cpp +++ b/kopete/kopete/main.cpp @@ -96,8 +96,8 @@ int main( int argc, char *argv[] ) aboutData.setTranslator( I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"), I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails") ); - 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(); KopeteApplication kopete; diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index cfc08ee7..df675fa1 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -65,7 +65,7 @@ KopeteMessage_Test::KopeteMessage_Test() void KopeteMessage_Test::allTests() { KApplication::disableAutoDcopRegistration(); - //KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); + //TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); // At least Kopete::Message::asXML() seems to require that a TQApplication // is created. Running the console version doesn't create it, but the GUI diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp index ea298395..039f4a39 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp +++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp @@ -67,9 +67,9 @@ void PasswordRetriever::timer() int main( int argc, char *argv[] ) { KAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( opts ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( opts ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KApplication app( "kopetepasswordtest" ); diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index 84a7d252..49376651 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -62,12 +62,12 @@ void WalletReciever::timer() int main( int argc, char *argv[] ) { KAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption }; - KCmdLineArgs::addCmdLineOptions( opts ); + TDECmdLineArgs::addCmdLineOptions( opts ); KApplication app( "kopetewallettest" ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // must register with DCOP or async callbacks will fail _out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl; diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp index ec14489b..46739d0d 100644 --- a/kopete/plugins/smpppdcs/unittest/main.cpp +++ b/kopete/plugins/smpppdcs/unittest/main.cpp @@ -31,8 +31,8 @@ int main( int argc, char** argv ) { KAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description, KAboutData::License_BSD, "(C) 2006 Heiko Schäfer", 0, 0, "heiko@rangun.de"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; KUnitTest::Runner::registerTester("ClientTest", new ClientTest); diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 0009750b..3d1515f7 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -285,7 +285,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) move(desk.center().x()-width()/2, desk.center().y()-height()/2); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); m_strCmdlAccount = args->getOption("c"); m_strCmdlModem = args->getOption("m"); @@ -722,7 +722,7 @@ void KPPPWidget::beginConnect() { } #endif - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString device = ""; if (args->isSet("dev")) device = args->getOption("dev"); diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index f034c462..bd56c7fe 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -49,7 +49,7 @@ static KCmdLineOptions option[] = TopWidget::TopWidget() : KMainWindow(0, "") { // Check command line args for "-kppp" - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool kpppmode = args->isSet("kppp"); args->clear(); @@ -109,9 +109,9 @@ int main(int argc, char **argv) { aboutData.addAuthor("Bernd Wuebben",0, "wuebben@kde.org"); aboutData.addAuthor("Mario Weilguni",0, ""); aboutData.addAuthor("Harri Porten",0, "porten@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( option ); + TDECmdLineArgs::addCmdLineOptions( option ); KApplication a; diff --git a/kppp/main.cpp b/kppp/main.cpp index 753291ba..d922c4c5 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -207,8 +207,8 @@ int main( int argc, char **argv ) { aboutData.addAuthor("Bernd Wuebben", I18N_NOOP("Original author"), "wuebben@kde.org"); aboutData.addAuthor("Mario Weilguni",0, ""); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); @@ -222,7 +222,7 @@ int main( int argc, char **argv ) { kdDebug(5002) << "helperPid: " << (int) helperPid << endl; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool terminate_connection = args->isSet("k"); if (args->isSet("r")) diff --git a/kppp/modem.cpp b/kppp/modem.cpp index 4d31fe59..7b464cc9 100644 --- a/kppp/modem.cpp +++ b/kppp/modem.cpp @@ -53,7 +53,7 @@ Modem::Modem() : { assert(modem==0); modem = this; - args = KCmdLineArgs::parsedArgs(); + args = TDECmdLineArgs::parsedArgs(); } diff --git a/kppp/modem.h b/kppp/modem.h index 933ef4cf..9ec28b37 100644 --- a/kppp/modem.h +++ b/kppp/modem.h @@ -37,7 +37,7 @@ #include -class KCmdLineArgs; +class TDECmdLineArgs; void alarm_handler(int); @@ -78,7 +78,7 @@ private slots: private: void escape_to_command_mode(); - KCmdLineArgs *args; + TDECmdLineArgs *args; private: int modemfd; diff --git a/krdc/main.cpp b/krdc/main.cpp index e808b6fb..daf6d38d 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -92,8 +92,8 @@ int main(int argc, char *argv[]) I18N_NOOP("TightVNC encoding")); aboutData.addCredit("Tridia Corporation", I18N_NOOP("ZLib encoding")); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a; @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) bool localCursor = kapp->config()->readBoolEntry("alwaysShowLocalCursor", false); TQSize initialWindowSize; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("low-quality")) quality = QUALITY_LOW; diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp index 6c68272b..6d21ee36 100644 --- a/krfb/krfb/main.cpp +++ b/krfb/krfb/main.cpp @@ -98,13 +98,13 @@ int main(int argc, char *argv[]) "kovalid@yahoo.com"); aboutData.addCredit("Karl Vogel", I18N_NOOP("KDesktop background deactivation")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; Configuration *config; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString fdString; if (!args->isSet(ARG_KINETD)) { bool kinetdA, krfbA; diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 36ad249a..ab057cdd 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -68,7 +68,7 @@ int main(int argc, char **argv){ "2.0.0", "", KAboutData::License_Artistic, I18N_NOOP("(c) 1997-2002, Andrew Stanley-Jones")); aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication a(argc, argv); diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index 2025abc1..c8b72bcd 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -78,8 +78,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) aboutData.addAuthor("Daniel Molkentin",0, "molkentin@kde.org"); aboutData.addAuthor("Simon Hausmann",0, "hausmann@kde.org"); aboutData.addAuthor("Alyssa Mejawohld", I18N_NOOP("Icons Author"), "amejawohld@bellsouth.net"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) { @@ -108,7 +108,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) if( !opts.geometry.isEmpty() ) sc->setGeometry( opts.geometry ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQCString nickName = args->getOption( "nick" ); TQCString server = args->getOption( "server" ); diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index b82f12eb..03bd0670 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -74,8 +74,8 @@ static const char version[] = "v1.5.2"; int main (int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "ktalkdlg", description, version ); - KCmdLineArgs::addCmdLineOptions( option ); + TDECmdLineArgs::init(argc, argv, "ktalkdlg", description, version ); + TDECmdLineArgs::addCmdLineOptions( option ); KLocale::setMainCatalogue( "kcmktalkd" ); KApplication a; @@ -84,10 +84,10 @@ int main (int argc, char **argv) gettimeofday (&clock, &zone); struct tm *localclock = localtime ((const time_t *) &clock.tv_sec); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() == 0) - KCmdLineArgs::usage(i18n("'user@host' expected.")); + TDECmdLineArgs::usage(i18n("'user@host' expected.")); TQString s; s.sprintf ("%d:%02d", localclock->tm_hour, localclock->tm_min); diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp index 2cbbe913..5ef95531 100644 --- a/librss/testlibrss.cpp +++ b/librss/testlibrss.cpp @@ -29,7 +29,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) int main( int argc, char **argv ) { KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; Tester tester; diff --git a/wifi/main.cpp b/wifi/main.cpp index 1ece499e..cb8fc020 100644 --- a/wifi/main.cpp +++ b/wifi/main.cpp @@ -42,9 +42,9 @@ main (int argc, char *argv[]) aboutData.addAuthor ("Stefan Winter", I18N_NOOP("Original Author and Maintainer"), "swinter@kde.org"); aboutData.addCredit ("Helge Deller", I18N_NOOP("Lots of Fixes and Optimizations, added Session Management"), "deller@kde.org"); - KCmdLineArgs::init (argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions (options); // Add our own options. - KCmdLineArgs *args = KCmdLineArgs::parsedArgs (); + TDECmdLineArgs::init (argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions (options); // Add our own options. + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs (); args->clear (); KApplication app;