From 50d6569cdef5f0aac099f5d01864bd0e14f82ae3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:46 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kopete/kopete/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 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kopete') diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 6dee7e6a..7e6e3132 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -184,7 +184,7 @@ void ChatWindowStyleRendering_Test::allTests() setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); KApplication::disableAutoDcopRegistration(); - //KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); + //TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); KApplication app; chatPart = new ChatMessagePart(d->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); -- cgit v1.2.1