diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:45 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:45 -0600 |
commit | 58646ccdcdc8ee08b081edba54e1460ff3295166 (patch) | |
tree | f9234aed98aaaa0f7d88e7234505d34f0a8147a4 | |
parent | f22c05e92636f81736560df2b4bfa0953fbc82b2 (diff) | |
download | tdemultimedia-58646ccdcdc8ee08b081edba54e1460ff3295166.tar.gz tdemultimedia-58646ccdcdc8ee08b081edba54e1460ff3295166.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
31 files changed, 49 insertions, 49 deletions
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index 229f4f61..9e6cc8ac 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -932,15 +932,15 @@ int main(int argc, char **argv) aboutData.addCredit("Hans Meine", 0, "hans_meine@gmx.net"); aboutData.addCredit("Jeff Tranter", 0, "tranter@pobox.com"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); Arts::QIOManager iomanager; Arts::Dispatcher dispatcher(&iomanager); Arts::ObjectManager::the()->provideCapability("kdegui"); // check for one optional filename argument - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(args->count() > 1) { args->usage(""); } diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp index fef8b0b9..d1dda3ac 100644 --- a/arts/gui/kde/dbtest.cpp +++ b/arts/gui/kde/dbtest.cpp @@ -30,7 +30,7 @@ int main( int argc, char* argv[] ) { "0.1", "", KAboutData::License_GPL, "(c) 2002, Arnold Krille" ); aboutData.addAuthor( "Arnold Krille", I18N_NOOP( "Creator" ), "arnold@arnoldarts.de"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 9cff7f4e..3042f46e 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -195,7 +195,7 @@ int main(int argc, char **argv) { aboutData.addAuthor( "Stefan Westerfeld", I18N_NOOP( "Author and aRts maintainer" ), "stefan@space.twc.de" ); aboutData.addAuthor( "Arnold Krille", I18N_NOOP( "Some improvements" ), "arnold@arnoldarts.de" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app(argc, argv); diff --git a/juk/juk.cpp b/juk/juk.cpp index 60c09426..5c2e6db5 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -246,7 +246,7 @@ void JuK::setupGlobalAccels() void JuK::slotProcessArgs() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQStringList files; for(int i = 0; i < args->count(); i++) diff --git a/juk/main.cpp b/juk/main.cpp index fe8c168a..3aaa5556 100644 --- a/juk/main.cpp +++ b/juk/main.cpp @@ -70,8 +70,8 @@ int main(int argc, char *argv[]) aboutData.addCredit("Nathan Toone", nathan, "nathan@toonetown.com"); aboutData.addCredit("Pascal Klein", pascal, "4pascal@tpg.com.au"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication::addCmdLineOptions(); diff --git a/juk/tagguessertest.cpp b/juk/tagguessertest.cpp index adba59db..7f358343 100644 --- a/juk/tagguessertest.cpp +++ b/juk/tagguessertest.cpp @@ -65,7 +65,7 @@ void check( const TQString &filename, const TQString &title, int main( int argc, char **argv ) { KAboutData aboutData("tagguessertest", "tagguessertest", "0.1"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication app; check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3", "Block Rockin' Beats", "Chemical Brothers", "01", "Live" ); diff --git a/kaboodle/kaboodleapp.cpp b/kaboodle/kaboodleapp.cpp index 22de968a..e2872e6b 100644 --- a/kaboodle/kaboodleapp.cpp +++ b/kaboodle/kaboodleapp.cpp @@ -32,7 +32,7 @@ Kaboodle::KaboodleApp::KaboodleApp() { disableSessionManagement(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL openURL; if(args->count() > 0) { diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp index b3f4f84e..3353005c 100644 --- a/kaboodle/main.cpp +++ b/kaboodle/main.cpp @@ -44,11 +44,11 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, Kaboodle::KaboodleFactory::aboutData()); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, Kaboodle::KaboodleFactory::aboutData()); + TDECmdLineArgs::addCmdLineOptions(options); #ifndef NDEBUG - if(!KCmdLineArgs::parsedArgs()->isSet("qdebug")) + if(!TDECmdLineArgs::parsedArgs()->isSet("qdebug")) tqInstallMsgHandler(noMessageOutput); #endif diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp index 914f9e2f..05c4cffe 100644 --- a/kaudiocreator/main.cpp +++ b/kaudiocreator/main.cpp @@ -37,8 +37,8 @@ int main(int argc, char *argv[]){ aboutData.addAuthor("Benjamin Meyer", I18N_NOOP("Original author"), "ben+kaudiocreator@meyerhome.net", "http://www.icefox.net/"); // command line - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a(argc, argv); KAudioCreator *app = new KAudioCreator(0, "MainWindow"); @@ -47,7 +47,7 @@ int main(int argc, char *argv[]){ a.setMainWidget(app); - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if ( args->count()>0 ) app->setDevice( args->arg( 0 ) ); args->clear(); app->show(); diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index bd65d49d..ba1b8ada 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -80,13 +80,13 @@ int kdemain(int argc, char ** argv) // with the user putenv(strdup("SESSION_MANAGER=")); KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app(false, true); kdDebug(7117) << "Starting " << getpid() << endl; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); AudioCDProtocol slave(args->arg(0), args->arg(1), args->arg(2)); slave.dispatchLoop(); diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp index 0b02c608..df2e8320 100644 --- a/kmid/kmidframe.cpp +++ b/kmid/kmidframe.cpp @@ -221,7 +221,7 @@ kmidFrame::kmidFrame(const char *name) // connect( kmidclient, TQT_SIGNAL( channelView_Destroyed() ), // this, TQT_SLOT( channelViewDestroyed() ) ); - KCmdLineArgs * args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs(); if ( args->count() > 0 ) { diff --git a/kmid/main.cpp b/kmid/main.cpp index 45cd1fab..55596d3c 100644 --- a/kmid/main.cpp +++ b/kmid/main.cpp @@ -56,14 +56,14 @@ int main(int argc, char **argv) sigaction(SIGTERM, &act, NULL); */ - KCmdLineArgs::init(argc, argv, KMidFactory::aboutData() ); + TDECmdLineArgs::init(argc, argv, KMidFactory::aboutData() ); static KCmdLineOptions options[] = { { "+file", I18N_NOOP("File to open"), 0 }, KCmdLineLastOption }; - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index 17d9bd8c..97e1c6ed 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -55,9 +55,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData.addAuthor("Stefan Schimanski", 0, "1Stein@gmx.de"); - 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(); KApplication app( false, false ); // get maximum values diff --git a/kmix/main.cpp b/kmix/main.cpp index 7c304925..b1a3cab6 100644 --- a/kmix/main.cpp +++ b/kmix/main.cpp @@ -56,8 +56,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData.addAuthor("Jean Labrousse", I18N_NOOP("NAS port"), "jean.labrousse@alcatel.com" ); aboutData.addCredit("Nadeem Hasan", I18N_NOOP("Mute and volume preview, other fixes"), "nhasan@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. if (!KMixApp::start()) return 0; diff --git a/krec/main.cpp b/krec/main.cpp index 98ebddb6..bbbdc2a4 100644 --- a/krec/main.cpp +++ b/krec/main.cpp @@ -51,8 +51,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) aboutData.addCredit( "Matthias Kretz", I18N_NOOP( "Helped where he was asked" ), "kretz@kde.org" ); aboutData.addCredit( "Stefan Asserhaell", I18N_NOOP( "Made some minor improvements" ) ); aboutData.addCredit( "Stefan Asserhaell & Nikolas Zimmermann", I18N_NOOP( "They indirectly wrote the exports. At least I learned from their files and patches." ) ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; KRecord *w = new KRecord(); diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 2dcf4842..8f115ea0 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -1005,7 +1005,7 @@ void KSCD::discChanged(unsigned discId) //totaltimelabel->clear(); totaltimelabel->lower(); - if ((Prefs::autoplay() || KCmdLineArgs::parsedArgs()->isSet("start")) + if ((Prefs::autoplay() || TDECmdLineArgs::parsedArgs()->isSet("start")) && !m_cd->isPlaying()) { playClicked(); @@ -1618,11 +1618,11 @@ int main( int argc, char *argv[] ) aboutData.addCredit("Sven Lueppken", I18N_NOOP("UI Work")); aboutData.addCredit("freedb.org", I18N_NOOP("Special thanks to freedb.org for providing a free CDDB-like CD database"), 0, "http://freedb.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication::addCmdLineOptions(); - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if (!KUniqueApplication::start()) { fprintf(stderr, "kscd is already running\n"); diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp index 6a29b0d5..b452a1fb 100644 --- a/kscd/kscdmagic/main.cpp +++ b/kscd/kscdmagic/main.cpp @@ -195,7 +195,7 @@ main(int argc, char **argv) aboutData.addAuthor("Paul Harrison",0, "pfh@yoyo.cc.monash.edu.au"); aboutData.addAuthor("Dirk Försterling",0, "milliByte@gmx.net"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication magicApp; */ diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp index ff8c34bb..948411f3 100644 --- a/libkcddb/test/asynccddblookuptest.cpp +++ b/libkcddb/test/asynccddblookuptest.cpp @@ -101,7 +101,7 @@ AsyncCDDBLookupTest::slotFinished(CDDB::Result r) int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */, false /* No GUI */); diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp index 174525bb..13f83679 100644 --- a/libkcddb/test/asynchttplookuptest.cpp +++ b/libkcddb/test/asynchttplookuptest.cpp @@ -99,7 +99,7 @@ AsyncHTTPLookupTest::slotFinished(CDDB::Result r) int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */, false /* No GUI */); diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp index d0923b27..dc0d9fa7 100644 --- a/libkcddb/test/asynchttpsubmittest.cpp +++ b/libkcddb/test/asynchttpsubmittest.cpp @@ -68,7 +68,7 @@ AsyncHTTPSubmitTest::slotFinished(CDDB::Result r) int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */, false /* No GUI */); diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp index 89c0ad50..0c7293e6 100644 --- a/libkcddb/test/asyncsmtpsubmittest.cpp +++ b/libkcddb/test/asyncsmtpsubmittest.cpp @@ -69,7 +69,7 @@ AsyncSMTPSubmitTest::slotFinished(CDDB::Result r) int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */, false /* No GUI */); diff --git a/libkcddb/test/sitestest.cpp b/libkcddb/test/sitestest.cpp index 6188665d..8a729295 100644 --- a/libkcddb/test/sitestest.cpp +++ b/libkcddb/test/sitestest.cpp @@ -26,7 +26,7 @@ int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */); diff --git a/libkcddb/test/synccddblookuptest.cpp b/libkcddb/test/synccddblookuptest.cpp index 0b71e864..a92e7084 100644 --- a/libkcddb/test/synccddblookuptest.cpp +++ b/libkcddb/test/synccddblookuptest.cpp @@ -10,7 +10,7 @@ int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */, false /* No GUI */); diff --git a/libkcddb/test/synchttplookuptest.cpp b/libkcddb/test/synchttplookuptest.cpp index 8bc05c18..cd616a0c 100644 --- a/libkcddb/test/synchttplookuptest.cpp +++ b/libkcddb/test/synchttplookuptest.cpp @@ -9,7 +9,7 @@ int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */); diff --git a/libkcddb/test/synchttpsubmittest.cpp b/libkcddb/test/synchttpsubmittest.cpp index d6c17eaf..2b7b6d0c 100644 --- a/libkcddb/test/synchttpsubmittest.cpp +++ b/libkcddb/test/synchttpsubmittest.cpp @@ -28,7 +28,7 @@ int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */); diff --git a/libkcddb/test/syncsmtpsubmittest.cpp b/libkcddb/test/syncsmtpsubmittest.cpp index 4af365bb..a75e239e 100644 --- a/libkcddb/test/syncsmtpsubmittest.cpp +++ b/libkcddb/test/syncsmtpsubmittest.cpp @@ -28,7 +28,7 @@ int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app(false /* No styles */); diff --git a/libkcddb/test/utf8test.cpp b/libkcddb/test/utf8test.cpp index 05d8b83e..61f6827d 100644 --- a/libkcddb/test/utf8test.cpp +++ b/libkcddb/test/utf8test.cpp @@ -9,7 +9,7 @@ int main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); + TDECmdLineArgs::init(argc, argv, "libkcddb_test", "", "", ""); KApplication app; 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(); |