From 58646ccdcdc8ee08b081edba54e1460ff3295166 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- noatun/app/main.cpp | 4 ++-- noatun/library/app.cpp | 2 +- noatun/library/noatun/playlist.h | 2 +- noatun/library/playlist.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'noatun') diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp index 86883461..3aae6274 100644 --- a/noatun/app/main.cpp +++ b/noatun/app/main.cpp @@ -37,8 +37,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) aboutData.addCredit("Bill Huey", I18N_NOOP("Special help with the equalizer")); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions(options); NoatunApp::addCmdLineOptions(); NoatunApp app; diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 9f28ec0f..42615a8b 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -377,7 +377,7 @@ KPopupMenu *NoatunApp::pluginMenu() int NoatunApp::newInstance() { // TODO, this should call playlist()->handleArguments(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool clear = clearOnOpen(); bool playme=true; diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index 2bc0f763..b80721a0 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -405,7 +405,7 @@ public: virtual bool listVisible() const =0; /** - * do the KCmdLineArgs stuff + * do the TDECmdLineArgs stuff **/ int handleArguments(); diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 7cc28337..1bc031d9 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -301,7 +301,7 @@ void Playlist::toggleList() int Playlist::handleArguments() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int i; bool play= napp->autoPlay(); -- cgit v1.2.1