diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:31 -0600 |
| commit | c5528d18d7870d01c4d8f1b8398db31f68bd7b41 (patch) | |
| tree | 2355f0cceb7570f22465bd51b74b8e99f43d27ae | |
| parent | 1bbdd977a4b138178fefe6268817db91715481f9 (diff) | |
| download | ktorrent-c5528d18d7870d01c4d8f1b8398db31f68bd7b41.tar.gz ktorrent-c5528d18d7870d01c4d8f1b8398db31f68bd7b41.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | apps/ktorrent/ktorrentapp.cpp | 2 | ||||
| -rw-r--r-- | apps/ktorrent/main.cpp | 4 | ||||
| -rw-r--r-- | apps/ktupnptest/main.cpp | 4 | ||||
| -rw-r--r-- | plugins/rssfeed/rss/testlibrss.cpp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp index 5353116..44f8e1c 100644 --- a/apps/ktorrent/ktorrentapp.cpp +++ b/apps/ktorrent/ktorrentapp.cpp @@ -45,7 +45,7 @@ int KTorrentApp::newInstance() if (!dcopClient()->isRegistered() ) dcopClient()->registerAs(name(), false); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bt::Globals::instance().setDebugMode(args->isSet("debug")); TQString data_dir = KGlobal::dirs()->saveLocation("data","ktorrent"); diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp index 0bcd5f3..5492f82 100644 --- a/apps/ktorrent/main.cpp +++ b/apps/ktorrent/main.cpp @@ -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("caruccio",I18N_NOOP("Patch to load torrents silently from the command line"),"mateus@caruccio.com"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KTorrentApp::addCmdLineOptions(); if (!KTorrentApp::start()) diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp index 73ceace..65fa4d8 100644 --- a/apps/ktupnptest/main.cpp +++ b/apps/ktupnptest/main.cpp @@ -51,8 +51,8 @@ int main(int argc,char** argv) KAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description, KAboutData::License_GPL, "(C) 2005 Joris Guisson", 0, "http://ktorrent.org/"); - KCmdLineArgs::init(argc, argv,&about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv,&about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; Globals::instance().initLog(kt::DataDir() + "ktupnptest.log"); UPnPTestApp* mwnd = new UPnPTestApp(); diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp index 7d88c3d..f66a53d 100644 --- a/plugins/rssfeed/rss/testlibrss.cpp +++ b/plugins/rssfeed/rss/testlibrss.cpp @@ -59,11 +59,11 @@ 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 ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) args->usage(); Tester tester; |