diff options
author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:24 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:24 -0600 |
commit | 6af316310b09b2b54606556f5ae0b7e96be845f9 (patch) | |
tree | ca9c2a5879c466669cb1517cd9366bcf0b3af846 | |
parent | e824a071d98b81e16331c499ed654c9d2f2a04d5 (diff) | |
download | amarok-6af316310b09b2b54606556f5ae0b7e96be845f9.tar.gz amarok-6af316310b09b2b54606556f5ae0b7e96be845f9.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r-- | amarok/src/amarokcore/amarokdcophandler.cpp | 2 | ||||
-rw-r--r-- | amarok/src/app.cpp | 12 | ||||
-rw-r--r-- | amarok/src/collectionscanner/main.cpp | 8 | ||||
-rw-r--r-- | amarok/src/loader/loader.cpp | 2 | ||||
-rw-r--r-- | amarok/src/scripts/graphequalizer/main.cpp | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp index a5508eda..d468a20d 100644 --- a/amarok/src/amarokcore/amarokdcophandler.cpp +++ b/amarok/src/amarokcore/amarokdcophandler.cpp @@ -539,7 +539,7 @@ namespace Amarok // required, loader doesn't add it argv[0] = tqstrdup( "amarokapp" ); - // re-initialize KCmdLineArgs with the new arguments + // re-initialize TDECmdLineArgs with the new arguments App::initCliArgs( argc, argv ); App::handleCliArgs(); diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index a46f1896..f9354b87 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -279,13 +279,13 @@ namespace void App::handleCliArgs() //static { static char cwd[PATH_MAX]; - KCmdLineArgs* const args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs(); if ( args->isSet( "cwd" ) ) { strncpy(cwd, args->getOption( "cwd" ), sizeof(cwd) ); cwd[sizeof(cwd)-1] = '\0'; - KCmdLineArgs::setCwd( cwd ); + TDECmdLineArgs::setCwd( cwd ); } bool haveArgs = false; @@ -421,9 +421,9 @@ void App::initCliArgs( int argc, char *argv[] ) //static { 0, 0, 0 } }; - KCmdLineArgs::reset(); - KCmdLineArgs::init( argc, argv, &::aboutData ); //calls KApplication::addCmdLineOptions() - KCmdLineArgs::addCmdLineOptions( options ); //add our own options + TDECmdLineArgs::reset(); + TDECmdLineArgs::init( argc, argv, &::aboutData ); //calls KApplication::addCmdLineOptions() + TDECmdLineArgs::addCmdLineOptions( options ); //add our own options } @@ -759,7 +759,7 @@ void App::continueInit() { DEBUG_BLOCK - const KCmdLineArgs* const args = KCmdLineArgs::parsedArgs(); + const TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs(); bool restoreSession = args->count() == 0 || args->isSet( "append" ) || args->isSet( "enqueue" ) || Amarok::config()->readBoolEntry( "AppendAsDefault", false ); diff --git a/amarok/src/collectionscanner/main.cpp b/amarok/src/collectionscanner/main.cpp index 09aca4ed..f2b90524 100644 --- a/amarok/src/collectionscanner/main.cpp +++ b/amarok/src/collectionscanner/main.cpp @@ -52,11 +52,11 @@ int main( int argc, char *argv[] ) }; - KCmdLineArgs::reset(); - KCmdLineArgs::init( argc, argv, &about ); //calls KApplication::addCmdLineOptions() - KCmdLineArgs::addCmdLineOptions( options ); //add our own options + TDECmdLineArgs::reset(); + TDECmdLineArgs::init( argc, argv, &about ); //calls KApplication::addCmdLineOptions() + TDECmdLineArgs::addCmdLineOptions( options ); //add our own options - const KCmdLineArgs* const args = KCmdLineArgs::parsedArgs(); + const TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs(); // Parse list of folder arguments TQStringList folders; diff --git a/amarok/src/loader/loader.cpp b/amarok/src/loader/loader.cpp index 92cf78b1..e0e248c9 100644 --- a/amarok/src/loader/loader.cpp +++ b/amarok/src/loader/loader.cpp @@ -67,7 +67,7 @@ main( int argc, char *argv[] ) foreach( longs ) if( arg == *it ) { // this argument cannot be passed to the running amarokapp - // or KCmdLineArgs would exit the application + // or TDECmdLineArgs would exit the application TQProcess proc( TQString("amarokapp") ); proc.setCommunication( 0 ); //show everything diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp index 05c00232..4f5fcb3b 100644 --- a/amarok/src/scripts/graphequalizer/main.cpp +++ b/amarok/src/scripts/graphequalizer/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char **argv) KAboutData about("Graph Equalizer", I18N_NOOP("Graph Equalizer"), version, description, KAboutData::License_GPL, "(C) 2005 Ian Monroe", 0, 0, "[email protected]"); about.addAuthor( "Ian Monroe", 0, "[email protected]" ); - KCmdLineArgs::init( argc, argv, &about ); + TDECmdLineArgs::init( argc, argv, &about ); KApplication app; EqDialog *mainWin = new EqDialog(); // mainWin = new EqualizerGraph(0,"equalizerdialog"); |