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 /kscd | |
| parent | f22c05e92636f81736560df2b4bfa0953fbc82b2 (diff) | |
| download | tdemultimedia-58646ccdcdc8ee08b081edba54e1460ff3295166.tar.gz tdemultimedia-58646ccdcdc8ee08b081edba54e1460ff3295166.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/kscd.cpp | 8 | ||||
| -rw-r--r-- | kscd/kscdmagic/main.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
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; */ |