diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp
index e6373429..06f9b21d 100644
--- a/blinken/src/main.cpp
+++ b/blinken/src/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
 	about.addAuthor("Albert Astals Cid", I18N_NOOP("Coding"), "tsdgeos@terra.es");
 	about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and Sounds"), "danny@dannyallen.co.uk");
 	about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com");
-	KCmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::init(argc, argv, &about);
 	KApplication app;
 	app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
 	
diff --git a/kalzium/src/main.cpp b/kalzium/src/main.cpp
index 3ea452df..6a8f0920 100644
--- a/kalzium/src/main.cpp
+++ b/kalzium/src/main.cpp
@@ -65,8 +65,8 @@ int main(int argc, char **argv)
     about.addCredit( "Brian Beck", I18N_NOOP( "The orbits-icon" ));
     about.addCredit( "Lee Olson", I18N_NOOP( "Several icons in the information dialog" ));
     about.addCredit( "Inge Wallin", I18N_NOOP( "Code cleaning, the molecule parser and a lot of smaller improvements" ));
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     Kalzium *mainWin = 0;
 
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         /// @todo do something with the command line args here
 
diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp
index 5ecbb800..71452cdf 100644
--- a/kanagram/src/main.cpp
+++ b/kanagram/src/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	about.addAuthor("Joshua Keel", I18N_NOOP("Coding"), "joshuakeel@gmail.com");
 	about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and many Vocabularies"), "danny@dannyallen.co.uk");
 	about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com");
-	KCmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::init(argc, argv, &about);
 	KApplication app;
 	app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()));
 	
diff --git a/kbruch/src/kbruch.cpp b/kbruch/src/kbruch.cpp
index 50e71843..769b771b 100644
--- a/kbruch/src/kbruch.cpp
+++ b/kbruch/src/kbruch.cpp
@@ -44,7 +44,7 @@ int main(int argc, char * argv[])
     	"(c) 2002-2005, Sebastian Stein", 0, "http://edu.kde.org/kbruch/",
 		"seb.kde@hpfsc.de");
 	aboutData.addAuthor("Sebastian Stein",0, "seb.kde@hpfsc.de");
- 	KCmdLineArgs::init( argc, argv, &aboutData );
+ 	TDECmdLineArgs::init( argc, argv, &aboutData );
 
 	KApplication kbruch;
 
diff --git a/keduca/keduca/main.cpp b/keduca/keduca/main.cpp
index ec7f8063..fdffd318 100644
--- a/keduca/keduca/main.cpp
+++ b/keduca/keduca/main.cpp
@@ -43,11 +43,11 @@ int main(int argc, char *argv[])
 
     aboutData.addCredit("Nenad Grujicic", I18N_NOOP("Icons"), "mengele@linuxo.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.
 
     KApplication a;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     
     // start as KEduca TestMaster
     Keduca *keducaTestMaster = new Keduca();
diff --git a/keduca/keducabuilder/main.cpp b/keduca/keducabuilder/main.cpp
index 00032f08..5fc0d052 100644
--- a/keduca/keducabuilder/main.cpp
+++ b/keduca/keducabuilder/main.cpp
@@ -41,11 +41,11 @@ int main(int argc, char *argv[])
     aboutData.addAuthor("Klas Kalass",I18N_NOOP("Maintainer 2002-2004"), "klas@kde.org");
     aboutData.addAuthor("Anne-Marie Mahfouf",I18N_NOOP("Various fixes and cleanups"), "annma@kde.org");
     aboutData.addCredit("Nenad Grujicic", I18N_NOOP("Icons"), "mengele@linuxo.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.
 
     KApplication a;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // start as KEduca Builder
     KEducaBuilder *keducaEditor = new KEducaBuilder();
diff --git a/kgeography/src/main.cpp b/kgeography/src/main.cpp
index e7b9d6ab..4597ad2f 100644
--- a/kgeography/src/main.cpp
+++ b/kgeography/src/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
 	about.addCredit("Maurizio Paolini", I18N_NOOP("Map contributor"));
 	about.addCredit("Yann Verley", I18N_NOOP("Contributed some maps and map generation tools"), "yann.verley@free.fr");
 	about.addCredit(I18N_NOOP("Sodipodi flags collection"), I18N_NOOP("Got some flags from it"), 0, "http://www.sodipodi.com/index.php3?section=clipart/flags");
-	KCmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::init(argc, argv, &about);
 	KApplication app;
 
 	app.setTopWidget(new kgeography());
diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp
index 87f220aa..18dcd2ed 100644
--- a/khangman/khangman/main.cpp
+++ b/khangman/khangman/main.cpp
@@ -110,8 +110,8 @@ int main(int argc, char **argv)
                              I18N_NOOP("Code for generating icons for the characters toolbar"), "peter.hedlund@kdemail.net");
     aboutData.addCredit("Inge Wallin",
                              I18N_NOOP("Code cleaning"), "inge@lysator.liu.se");
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     KHangMan *mainWin = 0;
 
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
             else
             {
                 // no session.. just start up normally
-                KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+                TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         
                 /// @todo do something with the command line args here
         
diff --git a/kig/kig/main.cpp b/kig/kig/main.cpp
index 577ebda1..8924a07d 100644
--- a/kig/kig/main.cpp
+++ b/kig/kig/main.cpp
@@ -45,7 +45,7 @@ class KigApplication
 public:
   KigApplication( bool gui = true );
   int newInstance();
-  void handleArgs( KCmdLineArgs* args );
+  void handleArgs( TDECmdLineArgs* args );
 };
 
 KigApplication::KigApplication( bool gui )
@@ -63,13 +63,13 @@ int KigApplication::newInstance()
   }
   first = false;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   handleArgs(args);
   args->clear();
   return 0;
 }
 
-void KigApplication::handleArgs( KCmdLineArgs* args )
+void KigApplication::handleArgs( TDECmdLineArgs* args )
 {
   if ( args->count() == 0 )
   {
@@ -105,11 +105,11 @@ int main(int argc, char **argv)
 {
   KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
 
-  KCmdLineArgs::init(argc, argv, about);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init(argc, argv, about);
+  TDECmdLineArgs::addCmdLineOptions( options );
   KigApplication::addCmdLineOptions();
 
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
   if ( args->isSet( "convert-to-native" ) )
   {
     TQCString outfile = args->getOption( "outfile" );
diff --git a/kiten/main.cpp b/kiten/main.cpp
index 1c920e16..378545f4 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
 	aboutData.addAuthor("Neil Stevens", I18N_NOOP("Code simplification, UI suggestions."), "neil@qualityassistant.com");
 	aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");
 	aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to KConfig XT, bug fixing"), "paul.temple@gmx.net");
-	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 a;
 //	a.installKDEPropertyMap();
diff --git a/klatin/klatin/main.cpp b/klatin/klatin/main.cpp
index 8de40ff0..9df9afa3 100644
--- a/klatin/klatin/main.cpp
+++ b/klatin/klatin/main.cpp
@@ -44,8 +44,8 @@ int main(int argc, char *argv[])
 	aboutData.addCredit("Pino Toscano",I18N_NOOP("Bug fixes and code improvement, Italian Vocabulary Data Translation"), "toscano.pino@tiscali.it");
 	aboutData.addCredit("Mikolaj Machowski",I18N_NOOP("Polish Vocabulary Data Translation"), "mikmach@wp.pl");
 
-	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 a;
 	
diff --git a/klettres/klettres/main.cpp b/klettres/klettres/main.cpp
index cb9a2368..d4ec18fa 100644
--- a/klettres/klettres/main.cpp
+++ b/klettres/klettres/main.cpp
@@ -90,8 +90,8 @@ int main(int argc, char **argv)
                     I18N_NOOP("Kids and grown-up SVG icons"), "danny AT dannyallen.co.uk");
     about.addCredit("Michael Goettsche",
                     I18N_NOOP("Timer setting widgets"), "michael.goettsche AT kdemail.net");
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
     // see if we are starting with session management
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
         else
         {
             // no session.. just start up normally
-            KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+            TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
             if (args->count() == 0)
             {
                 KLettres *widget = new KLettres;
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index 5eb17971..1f33bb66 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -40,7 +40,7 @@
 #include "MainDlg.h"
 #include "kmplotprogress.h"
 
-KmPlot::KmPlot( KCmdLineArgs* args)
+KmPlot::KmPlot( TDECmdLineArgs* args)
 		: DCOPObject( "KmPlotShell" ), KParts::MainWindow( 0L, "KmPlot" )
 {
 	// set the shell's ui resource file
diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h
index 2e01f142..c8ebad71 100644
--- a/kmplot/kmplot/kmplot.h
+++ b/kmplot/kmplot/kmplot.h
@@ -54,7 +54,7 @@ public:
 	/**
 	 * Default Constructor
 	 */
-	KmPlot( KCmdLineArgs* args);
+	KmPlot( TDECmdLineArgs* args);
 
 	/**
 	 * Default Destructor
diff --git a/kmplot/kmplot/main.cpp b/kmplot/kmplot/main.cpp
index b9d40a5a..60d8c239 100644
--- a/kmplot/kmplot/main.cpp
+++ b/kmplot/kmplot/main.cpp
@@ -69,11 +69,11 @@ int main( int argc, char **argv )
 	aboutData.addCredit( "David Vignoni", I18N_NOOP( "svg icon" ), "david80v@tin.it" );
 	aboutData.addCredit( "Albert Astals Cid", I18N_NOOP( "command line options, MIME type" ), "tsdgeos@terra.es" );
 
-	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 ka;
-	KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 	KmPlot *w = new KmPlot( args );
 	w->show();
 	ka.setMainWidget( w );
diff --git a/kpercentage/kpercentage/main.cpp b/kpercentage/kpercentage/main.cpp
index b52bd324..10b11c3f 100644
--- a/kpercentage/kpercentage/main.cpp
+++ b/kpercentage/kpercentage/main.cpp
@@ -54,8 +54,8 @@ int main( int argc, char *argv[] )
     aboutData.addCredit( "Primoz Anzur", I18N_NOOP( "Cleaning and bugfixing code" ), "zerokode@gmx.net" );
     aboutData.addCredit("David Vignoni", I18N_NOOP("SVG icon"), "david80v@tin.it");
 
-    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 a;
     KPercentage *kpercentage = new KPercentage( "kpercentage" );
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index 2e28e0ea..d37f2355 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -61,9 +61,9 @@ int main(int argc, char *argv[])
 	aboutData.addAuthor("Jasem Mutlaq", 0, "mutlaqja@ikarustech.com", 0 );
 	aboutData.addAuthor("Carsten Niehaus", 0, "cniehaus@gmx.de", 0);
 	aboutData.addAuthor("Mark Hollomon", 0, "mhh@mindspring.com", 0);
-	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 a;
 
diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp
index 6fc244ba..53d0f41a 100644
--- a/ktouch/src/main.cpp
+++ b/ktouch/src/main.cpp
@@ -42,8 +42,8 @@ int main(int argc, char **argv)
     about.addCredit( "David Vignoni", I18N_NOOP("Creator of the SVG icon"), "david80v@tin.it");
     about.addCredit( "Anne-Marie Mahfouf", I18N_NOOP("Lots of patches, fixes, updates"), "annma@kde.org");
     about.addCredit( "All the creators of training and keyboard files", 0, 0);
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     KTouch *mainWin = 0;
 
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         // TODO: check the command line for a training file and set this as the new to open training file
 
         /* TODO: turn splash screen on in release
diff --git a/kturtle/src/main.cpp b/kturtle/src/main.cpp
index d9bf7eab..d5810c6b 100644
--- a/kturtle/src/main.cpp
+++ b/kturtle/src/main.cpp
@@ -87,8 +87,8 @@ int main(int argc, char **argv)
 	about.addCredit("Albert Astals Cid",
 	      I18N_NOOP("Parser Cyrillic support"),
 	                "astals11 # terra.es");
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions( options );
 	KApplication app;
 	MainWindow *mainwindow = 0;
 
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
 	else
 	{
 		// no session... just start up normally
-		KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		/// @todo do something with the command line args here
 
diff --git a/kverbos/kverbos/main.cpp b/kverbos/kverbos/main.cpp
index 297e3756..fd82b647 100644
--- a/kverbos/kverbos/main.cpp
+++ b/kverbos/kverbos/main.cpp
@@ -40,8 +40,8 @@ int main(int argc, char *argv[])
 		"(c) 2001, Arnold Kraschinski", 0, 0, "arnold.k67@gmx.de");
 	aboutData.addAuthor("Arnold Kraschinski",0, "arnold.k67@gmx.de");
 	aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");
-	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;
 
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 		KVerbosApp *kverbos = new KVerbosApp();
 		kverbos->show();
 
-		KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		if (args->count())
 		{
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 9eb124cd..9d4519f8 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -92,8 +92,8 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
   aboutData.addCredit(I18N_NOOP("KDE Team"),
                       I18N_NOOP("Many small enhancements"));
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KApplication app;
 
   kvoctrainApp *kva = 0;
@@ -108,7 +108,7 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
   }
   else
   {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     kva = new kvoctrainApp;
 
     if ( args && args->count() == 1 )
diff --git a/kwordquiz/src/main.cpp b/kwordquiz/src/main.cpp
index 8f6ad60e..7ec393e3 100644
--- a/kwordquiz/src/main.cpp
+++ b/kwordquiz/src/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Peter Hedlund", 0, "peter.hedlund@kdemail.net");
   aboutData.addCredit("Anne-Marie Mahfouf", I18N_NOOP("KDE Edutainment Maintainer"), "annma@kde.org", 0);
 
-  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;
 
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
     KWordQuizApp *kwordquiz = new KWordQuizApp();
     kwordquiz->show();
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if (args->count())
     {
diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp
index bcc68a1f..0b833a9a 100644
--- a/libtdeedu/extdate/main.cpp
+++ b/libtdeedu/extdate/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char *argv[] )
 	aboutData.addAuthor("Jason Harris", 0,
 				"jharris@30doradus.org", "http://www.30doradus.org");
 
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
 
 	KApplication a;
 	TestWidget *t = new TestWidget(0,0);