diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp
index a2427285..72ec0930 100644
--- a/kcoloredit/kcolorchooser.cpp
+++ b/kcoloredit/kcolorchooser.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 		version, description, KAboutData::License_BSD,
 		"(c) 2000, Waldo Bastian");
   aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
   
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
   dlg.show();
   app.exec();
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   const  TQColor c = dlg.color();
   if ( args->isSet("print") && c.isValid() ) {
       std::cout << TQString(c.name()).utf8().data() << std::endl;
diff --git a/kcoloredit/main.cpp b/kcoloredit/main.cpp
index fcc2ac66..d0d4893e 100644
--- a/kcoloredit/main.cpp
+++ b/kcoloredit/main.cpp
@@ -43,8 +43,8 @@ int main(int argc, char *argv[])
 	aboutData.addAuthor("Artur Rataj",0, "art@zeus.polsl.gliwice.pl");
     aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "Rewrote UI code "
         "to be KDE standards compliant" ), "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.
 
   KApplication app;
 
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     KColorEditApp *kcoloredit = new KColorEditApp();
     kcoloredit->show();
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		if (args->count())
 		{
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index af7bc928..c4bf0d78 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char** argv)
   about.addCredit ("Philipp Lehmann", I18N_NOOP("Testing and bug reporting."));
   about.addCredit ("Wilfried Huss", I18N_NOOP("Re-organisation of source code."));
 
-  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
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
   }
   else
   {
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("unique"))
     {
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index df0c8864..17adf629 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -1658,8 +1658,8 @@ int main (int argc, char **argv)
   aboutData.addCredit( "Helge Deller", I18N_NOOP( "Printing Rewrite, lots of code "
       "cleanups and fixes"), "deller@kde.org" );
 
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   MyApp a;
 
diff --git a/kfax/viewfax.cpp b/kfax/viewfax.cpp
index 26a98613..e0531352 100644
--- a/kfax/viewfax.cpp
+++ b/kfax/viewfax.cpp
@@ -165,7 +165,7 @@ int viewfaxmain()
     /* TODO Do I need to know this: */
     defaultpage.expander = g31expand;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("height"))
     {
@@ -234,7 +234,7 @@ int viewfaxmain()
     }
 
     if (defaultpage.expander == g4expand && defaultpage.height == 0) {
-	KCmdLineArgs::usage("--height value is required to interpret raw g4 faxes\n");
+	TDECmdLineArgs::usage("--height value is required to interpret raw g4 faxes\n");
     }
 
     firstpage = lastpage = thispage = helppage = auxpage =  0;
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 05692315..b324d90c 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -68,8 +68,8 @@ int main(int argc, char** argv)
                    I18N_NOOP("Fax file loading"),
                    "deller@gmx.de");
 
-  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
@@ -79,7 +79,7 @@ int main(int argc, char** argv)
   }
   else
   {
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("unique"))
     {
diff --git a/kghostview/displayoptions.cpp b/kghostview/displayoptions.cpp
index f2e0fa4b..6e4dddc7 100644
--- a/kghostview/displayoptions.cpp
+++ b/kghostview/displayoptions.cpp
@@ -41,7 +41,7 @@ namespace {
 	const size_t numberOfMagnifications = ( sizeof( allowedMagnifications ) / sizeof( allowedMagnifications[ 0 ] ) );
 }
 
-DisplayOptions DisplayOptions::parse( KCmdLineArgs* args )
+DisplayOptions DisplayOptions::parse( TDECmdLineArgs* args )
 {
 	DisplayOptions res;
 #define CHECK_ORIENTATION( tag, value ) \
diff --git a/kghostview/displayoptions.h b/kghostview/displayoptions.h
index 8ceaf56e..7767da48 100644
--- a/kghostview/displayoptions.h
+++ b/kghostview/displayoptions.h
@@ -21,7 +21,7 @@
 #include <tqvaluelist.h>
 #include "dscparse_adapter.h"
 #include <kdemacros.h>
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class KConfig;
 
 class KDE_EXPORT DisplayOptions 
@@ -67,7 +67,7 @@ class KDE_EXPORT DisplayOptions
 	/** 
 	 * Parses command line options.
 	 */
-	static DisplayOptions parse ( KCmdLineArgs * );
+	static DisplayOptions parse ( TDECmdLineArgs * );
 	/**
 	 * Transforms the object in a string representation.
 	 * Useful for storing in config files, for example.
diff --git a/kghostview/main.cpp b/kghostview/main.cpp
index 327a5be5..05e0f23b 100644
--- a/kghostview/main.cpp
+++ b/kghostview/main.cpp
@@ -45,10 +45,10 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char** argv )
 {
-    KCmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
     if( kapp->isRestored() )
 	RESTORE( KGVShell )
diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp
index 7c016af7..523a5615 100644
--- a/kiconedit/main.cpp
+++ b/kiconedit/main.cpp
@@ -54,8 +54,8 @@ int main(int argc, char **argv)
       "Lots of fixes and cleanup", "nhasan@nadmm.com" );
   aboutData.addCredit( "Adrian Page", I18N_NOOP("Bug fixes and GUI tidy up"),
       "Adrian.Page@tesco.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;
 
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
   }
   else
   {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     for(int i = 0; i < args->count(); i++)
     {
         KIconEdit *ki = new KIconEdit(args->url(i), "kiconedit");
diff --git a/kolourpaint/kolourpaint.cpp b/kolourpaint/kolourpaint.cpp
index b82dca77..37a2032f 100644
--- a/kolourpaint/kolourpaint.cpp
+++ b/kolourpaint/kolourpaint.cpp
@@ -173,8 +173,8 @@ int main (int argc, char *argv [])
     aboutData.addCredit ("Michele");
 
 
-    KCmdLineArgs::init (argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions (cmdLineOptions);
+    TDECmdLineArgs::init (argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions (cmdLineOptions);
 
     KApplication app;
 
@@ -205,7 +205,7 @@ int main (int argc, char *argv [])
     else
     {
         kpMainWindow *mainWindow;
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs ();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs ();
 
         if (args->count () >= 1)
         {
diff --git a/kooka/main.cpp b/kooka/main.cpp
index c6c53449..7ba88610 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -81,15 +81,15 @@ int main( int argc, char *argv[] )
    about.addAuthor( "Mat Colton", I18N_NOOP("graphics, web"), "mat@colton.de" );
    about.setLicenseText( license );
 
-   KCmdLineArgs::init(argc, argv, &about);
-   KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+   TDECmdLineArgs::init(argc, argv, &about);
+   TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
    KApplication app;
    KGlobal::locale()->insertCatalogue("libkscan");
    KImageIO::registerFormats();
    KIconLoader *loader = KGlobal::iconLoader();
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    TQCString  devToUse = args->getOption( "d" );
    if( args->isSet("g") )
    {
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp
index 20aa3eee..6c3a351c 100644
--- a/kpdf/shell/main.cpp
+++ b/kpdf/shell/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char** argv)
     about.addCredit("Derek Noonburg", I18N_NOOP("Xpdf author"), 0, "http://www.foolabs.com/xpdf/");
     about.addCredit("Marco Martin", I18N_NOOP("Icon"), 0, "m4rt@libero.it");
 
-    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
@@ -58,7 +58,7 @@ int main(int argc, char** argv)
         RESTORE(KPDF::Shell);
     } else {
         // no session.. just start up normally
-        KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
         if (args->count() == 0)
         {
diff --git a/kpovmodeler/main.cpp b/kpovmodeler/main.cpp
index 8bdabf8e..c5aed527 100644
--- a/kpovmodeler/main.cpp
+++ b/kpovmodeler/main.cpp
@@ -39,12 +39,12 @@ int main( int argc, char* argv[] )
 {
    PMShell* shell = 0;
 
-   KCmdLineArgs::init( argc, argv, PMFactory::aboutData( ) );
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::init( argc, argv, PMFactory::aboutData( ) );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
    KApplication app;
 
-   KCmdLineArgs* args = KCmdLineArgs::parsedArgs( );
+   TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs( );
 
    if( !args->isSet( "-opengl" ) )
       PMRenderManager::disableOpenGL( );
diff --git a/kruler/main.cpp b/kruler/main.cpp
index 196909a6..646e5383 100644
--- a/kruler/main.cpp
+++ b/kruler/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
 		homePageURL);
   aboutData.addAuthor("Till Krech",I18N_NOOP("Programming"), "till@snafu.de");
   aboutData.addCredit("Gunnstein Lye",I18N_NOOP("Initial port to KDE 2"), "gl@ez.no");
-  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/ksnapshot/main.cpp b/ksnapshot/main.cpp
index 84883a32..d503c0d5 100644
--- a/ksnapshot/main.cpp
+++ b/ksnapshot/main.cpp
@@ -51,9 +51,9 @@ int main(int argc, char **argv)
   aboutData.addCredit( "Nadeem Hasan", I18N_NOOP("Region Grabbing\nReworked GUI"),
       "nhasan@kde.org" );
 
-  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;
 
diff --git a/ksvg/test/external/printnodetest.cpp b/ksvg/test/external/printnodetest.cpp
index 1c2921f4..fa31c830 100644
--- a/ksvg/test/external/printnodetest.cpp
+++ b/ksvg/test/external/printnodetest.cpp
@@ -47,9 +47,9 @@ void Worker::slotParsingFinished(bool, const TQString &)
 int main(int argc, char **argv)
 {
 	KAboutData *about = new KAboutData("KSVG printNode test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG printNode test app"));
-	KCmdLineArgs::init(argc, argv, about);
-	KCmdLineArgs::addCmdLineOptions(options);
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs::init(argc, argv, about);
+	TDECmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	if(args->count() == 0)
 	{
 		args->usage();
diff --git a/ksvg/test/external/svgdisplay.cc b/ksvg/test/external/svgdisplay.cc
index 662fb542..a8b4797c 100644
--- a/ksvg/test/external/svgdisplay.cc
+++ b/ksvg/test/external/svgdisplay.cc
@@ -14,9 +14,9 @@ int main(int argc, char **argv)
 {
 
 	KAboutData *about = new KAboutData( "KSVG test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG standalone test app") );
-	KCmdLineArgs::init(argc, argv, about);
-	KCmdLineArgs::addCmdLineOptions( options );
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs::init(argc, argv, about);
+	TDECmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	if(args->count() == 0)
 	{
 		args->usage();
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 9c8bdf1e..86be3f7a 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -119,7 +119,7 @@ KuickShow::KuickShow( const char *name )
     bool isDir = false; // true if we get a directory on the commandline
 
     // parse commandline options
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // files to display
     // either a directory to display, an absolute path, a relative path, or a URL
diff --git a/kuickshow/src/main.cpp b/kuickshow/src/main.cpp
index 41fcbace..b1b5de44 100644
--- a/kuickshow/src/main.cpp
+++ b/kuickshow/src/main.cpp
@@ -49,8 +49,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     about.addCredit( "Rober Hamberger", 0, "rh474@bingo-ev.de" );
     about.addCredit( "Thorsten Scheuermann", 0, "uddn@rz.uni-karlsruhe.de" );
 
-    KCmdLineArgs::init( argc, argv, &about );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp
index 8501908b..74e1046e 100644
--- a/kview/kviewcanvas/test/main.cpp
+++ b/kview/kviewcanvas/test/main.cpp
@@ -19,15 +19,15 @@ int main(int argc, char **argv)
 {
     KAboutData about("kimageviewertest", I18N_NOOP("KImageViewerTest"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org");
     about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
 
     if (app.isRestored())
         RESTORE(KImageViewerTest)
     else
     {
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         if ( args->count() == 0 )
         {
diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp
index 95910126..64beafee 100644
--- a/kview/kviewviewer/test/main.cpp
+++ b/kview/kviewviewer/test/main.cpp
@@ -19,15 +19,15 @@ int main(int argc, char **argv)
 {
     KAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org");
     about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
 
     if (app.isRestored())
         RESTORE(Test)
     else
     {
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         if ( args->count() == 0 )
         {
diff --git a/kview/main.cpp b/kview/main.cpp
index 82e31fdc..c43f0ca3 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -40,15 +40,15 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
 	about.addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "kretz@kde.org" );
 	about.addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "taj@kde.org" );
 	about.addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
-	KCmdLineArgs::init( argc, argv, &about );
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::init( argc, argv, &about );
+	TDECmdLineArgs::addCmdLineOptions( options );
 	KApplication app;
 
 	if( app.isRestored() )
 		RESTORE( KView )
 	else
 	{
-		KCmdLineArgs * args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs();
 
 		KView * kview = new KView;
 		kview->show();
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index 1a858049..ec826196 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -62,8 +62,8 @@ int main(int argc, char **argv)
 		   I18N_NOOP("DCOP-Interface, major improvements"),
 		   "kebekus@kde.org");
 
-  KCmdLineArgs::init(argc, argv, &about);
-  KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+  TDECmdLineArgs::init(argc, argv, &about);
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
   KApplication app;
 
   // see if we are starting with session management
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
   }
   else
   {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("unique")){
       // With --unique, we need one argument.