Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 1bbdd977a4
commit c5528d18d7

@ -45,7 +45,7 @@ int KTorrentApp::newInstance()
if (!dcopClient()->isRegistered() ) if (!dcopClient()->isRegistered() )
dcopClient()->registerAs(name(), false); dcopClient()->registerAs(name(), false);
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bt::Globals::instance().setDebugMode(args->isSet("debug")); bt::Globals::instance().setDebugMode(args->isSet("debug"));
TQString data_dir = KGlobal::dirs()->saveLocation("data","ktorrent"); TQString data_dir = KGlobal::dirs()->saveLocation("data","ktorrent");

@ -166,8 +166,8 @@ int main(int argc, char **argv)
about.addCredit("Markus Brueffer",I18N_NOOP("Patch to fix free diskspace calculation on FreeBSD"),"markus@brueffer.de"); about.addCredit("Markus Brueffer",I18N_NOOP("Patch to fix free diskspace calculation on FreeBSD"),"markus@brueffer.de");
about.addCredit("caruccio",I18N_NOOP("Patch to load torrents silently from the command line"),"mateus@caruccio.com"); about.addCredit("caruccio",I18N_NOOP("Patch to load torrents silently from the command line"),"mateus@caruccio.com");
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KTorrentApp::addCmdLineOptions(); KTorrentApp::addCmdLineOptions();
if (!KTorrentApp::start()) if (!KTorrentApp::start())

@ -51,8 +51,8 @@ int main(int argc,char** argv)
KAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description, KAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description,
KAboutData::License_GPL, "(C) 2005 Joris Guisson", 0, KAboutData::License_GPL, "(C) 2005 Joris Guisson", 0,
"http://ktorrent.org/"); "http://ktorrent.org/");
KCmdLineArgs::init(argc, argv,&about); TDECmdLineArgs::init(argc, argv,&about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
Globals::instance().initLog(kt::DataDir() + "ktupnptest.log"); Globals::instance().initLog(kt::DataDir() + "ktupnptest.log");
UPnPTestApp* mwnd = new UPnPTestApp(); UPnPTestApp* mwnd = new UPnPTestApp();

@ -59,11 +59,11 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 1 ) args->usage(); if ( args->count() != 1 ) args->usage();
Tester tester; Tester tester;

Loading…
Cancel
Save