Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

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();
 

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 );
 

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;

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

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, "ian@monroe.nu");
     about.addAuthor( "Ian Monroe", 0, "ian@monroe.nu" );
-    KCmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::init( argc, argv, &about );
     KApplication app;
     EqDialog *mainWin = new EqDialog();
 //     mainWin = new EqualizerGraph(0,"equalizerdialog");