Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

114 files changed, 384 insertions, 384 deletions

diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 286c7f30a..2a9b9766f 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -20,7 +20,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <LI><A HREF="#general">Global changes</A></LI>
 <LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
 <LI><A HREF="#KApplication">KApplication</A></LI>
-<LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
+<LI><A HREF="#TDECmdLineArgs">TDECmdLineArgs</A></LI>
 <LI><A HREF="#KLocale">KLocale</A></LI>
 <LI><A HREF="#KGlobal">KGlobal: access to KDE global objects.</A></LI>
 <LI><A HREF="#KIconLoader">KIconLoader</A></LI>
@@ -148,14 +148,14 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 
   The KApplication constructor has changed. Command line arguments and
   program name should no longer be passed to KApplication but to 
-  KCmdLineArgs. KCmdLineArgs performs command line parsing and a command
+  TDECmdLineArgs. TDECmdLineArgs performs command line parsing and a command
   line help. See below for more info.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KCmdLineArgs">KCmdLineArgs</A></H3>
+<H3><A NAME="TDECmdLineArgs">TDECmdLineArgs</A></H3>
 
-  KCmdLineArgs is a new class that handles command line parsing and
+  TDECmdLineArgs is a new class that handles command line parsing and
   command line help. It is now required that your application
   specifies at least:<P>
   <UL>
@@ -165,13 +165,13 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 	<LI>All command line options that it supports.
   </UL>
  
-  KCmdLineArgs itself will add the command line options supported by Qt 
+  TDECmdLineArgs itself will add the command line options supported by Qt 
   and KApplication.<P>
 
   You can also use the KAboutData class to specify name, description and 
   version.<P>
 
-  In return for this information you can query KCmdLineArgs whether an 
+  In return for this information you can query TDECmdLineArgs whether an 
   certain option was specified on the command line and your application 
   now automatically supports --help and --version. It aborts with a
   useful error message when the command line contains a syntax error.
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 5382e2095..dfc1265cc 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -57,11 +57,11 @@ int main(int argc, char **argv)
 {
 	KAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
 							  
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options); 	
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options); 	
 	KApplication app;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	KURL url;
 	
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index b5403ce0d..91d1d9db4 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -22,15 +22,15 @@ int main(int argc, char **argv)
 {
 	KAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
 							  
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions(options); 	
+	TDECmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options); 	
 	KApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
 	KIOInputStream stream;
 	StdoutWriter writer;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	if(args->count())
 	{
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index fd5f1e129..16465cb8d 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -90,8 +90,8 @@ int main(int argc, char **argv)
 {
 	KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
 							  
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions(options); 	
+	TDECmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options); 	
 	KApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 #endif
 	KIOTestSlow writer;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	if(args->count())
 	{
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index 2ba71b64c..b95f97de5 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
                          KAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
     aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutdata);
+    TDECmdLineArgs::init(argc, argv, &aboutdata);
     KUniqueApplication::addCmdLineOptions();
 
     if(!KUniqueApplication::start())
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index c6bba7115..e6a234fba 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -113,7 +113,7 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de");
     aboutdata.addAuthor("Charles Samuels",I18N_NOOP("Previous Maintainer"),"charles@kde.org");
 
-    KCmdLineArgs::init( argc, argv, &aboutdata );
+    TDECmdLineArgs::init( argc, argv, &aboutdata );
     KUniqueApplication::addCmdLineOptions();
 
 
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index c82acfa32..1df46ec05 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -58,11 +58,11 @@ KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
 int main(int argc, char **argv) {
 	aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");
 	KGlobal::locale()->setMainCatalogue("tdelibs");
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	KApplication app;
 	
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	TQString msg;
 
 	// must be at least one argument
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index 0c9513305..d0f73aa4e 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
 	if ( argc < 2 ) { tqWarning("Usage: driver <appid>"); return 1; }
 	const char* appname = strdup( argv[ 1 ] );
 	argv[ 1 ] = 0; // sue me
-	KCmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
+	TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
 	KApplication app;
 	app.dcopClient()->attach(  );
 	app.dcopClient()->registerAs( "TestAppDriver" );
diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp
index 7f5114071..cd62a59c0 100644
--- a/dcop/tests/test.cpp
+++ b/dcop/tests/test.cpp
@@ -31,7 +31,7 @@ int main(int argc, char** argv)
 		batch();
 		return 0;
 	}
-	KCmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
+	TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
 	KApplication app;
 	if(!app.dcopClient()->attach(  ))
 		return 1;
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index dbf60616b..0b32eec8e 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -34,7 +34,7 @@ Win::Win()
 int main( int argc, char** argv )
 {
     KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
-    KCmdLineArgs::init( argc, argv, about );
+    TDECmdLineArgs::init( argc, argv, about );
     KApplication a;
     Win* win = new Win();
     win->show();
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 9d8ea75ee..20d7305b8 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -435,12 +435,12 @@ int main( int argc, char **argv )
   KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool override = false;
 
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index e64bafef8..110972b31 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -18,7 +18,7 @@ using namespace KABC;
 int main(int argc,char **argv)
 {
   KAboutData aboutData("bigread","BigReadKabc","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app( false, false );
   
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 0dd6a7a05..6a5296f91 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -15,7 +15,7 @@ using namespace KABC;
 int main(int argc,char **argv)
 {
   KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app( false, false );
 
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index b57724c15..d0a0501b3 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -38,7 +38,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
   aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
 
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp
index d05c3af24..cc91d29b1 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/kabc/tests/testaddressee.cpp
@@ -23,11 +23,11 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testaddressee","TestAddressee","0.1");
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
   KApplication app;
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
   kdDebug() << "Creating a" << endl;
   Addressee a;
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index e7cc123f1..99cd1f3ab 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -20,11 +20,11 @@ static const KCmdLineOptions options[] =
 int main(int /*argc*/,char /* **argv*/)
 {
 /*  KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
   KApplication app;
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); */
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */
 
   kdDebug() << "Creating addressees" << endl;
   Addressee a, b, c, d, e, f;
diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp
index 19b2e8306..9f70a0eec 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/kabc/tests/testaddressfmt.cpp
@@ -20,8 +20,8 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
   KApplication app;
 
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index 0dea6f742..f74af6089 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -12,7 +12,7 @@ int main( int argc,char **argv )
 {
   KAboutData aboutData( "testaddresslineedit",
                         I18N_NOOP( "Test Address LineEdit" ), "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp
index f94397a62..1c5454630 100644
--- a/kabc/tests/testdb.cpp
+++ b/kabc/tests/testdb.cpp
@@ -13,7 +13,7 @@ using namespace KABC;
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testdb","TestKabcDB","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
 //  KApplication app( false, false );
   KApplication app;
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index abf551ace..4323db30d 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -23,12 +23,12 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("list")) {
     TQString name = args->getOption("list");
     
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index c5d2d12e4..04a589eef 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -21,7 +21,7 @@ using namespace KABC;
 int main(int argc,char **argv)
 {
     KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
 
     KApplication app( false, false );
     AddressBook *ab = StdAddressBook::self();
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index 3c9a23792..322bb1ca9 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("multiple")) {
     Addressee::List al = AddresseeDialog::getAddressees( 0 );
     Addressee::List::ConstIterator it;
diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp
index 2fa6a1c72..456bb64e3 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/kabc/tests/testldapclient.cpp
@@ -30,7 +30,7 @@
 int main(int argc, char *argv[])
 {
   KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
+  TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
   KApplication app;
 
   TestLDAPClient test;
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 4674606e0..5c52e98ee 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -166,14 +166,14 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   TQString identifier;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if ( args->count() == 1 ) {
     identifier = args->arg( 0 );
   } else if ( args->count() != 0 ) {
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index f9b8944d7..082ca480d 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -9,7 +9,7 @@
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
   
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 7dd8692fc..d3eada6c6 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -47,12 +47,12 @@ int main( int argc, char **argv )
   KAboutData aboutData( "testread", "vCard test reader", "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app( false, false );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() != 1 ) {
     std::cerr << "Missing argument" << std::endl;
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index f6e894f4b..d9d92e5aa 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -37,7 +37,7 @@ int main( int argc, char **argv )
 {
   KAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app( false, false );
   
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index de89e0996..4292c3ad4 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -410,11 +410,11 @@ int main(int argc, char *argv[])
 
 //     signal( SIGALRM, signal_handler );
 
-    KCmdLineArgs::init(argc, argv, "testregression", "TestRegression",
+    TDECmdLineArgs::init(argc, argv, "testregression", "TestRegression",
                        "Regression tester for kate", "1.0");
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs( );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
 
     TQCString baseDir = args->getOption("base");
     TQCString baseDirConfigFile(::getenv("HOME") + TQCString(BASE_DIR_CONFIG));
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
                "\techo \"<root-path>\" > %s\n"
                "You may override the location by specifying the root explicitly on the\n"
                "command line with option -b\n"
-               "", KCmdLineArgs::appName(),
+               "", TDECmdLineArgs::appName(),
                (const char *)baseDirConfigFile,
                (const char *)baseDirConfigFile);
 	::exit( 1 );
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 902b2397f..4453cac0d 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -213,11 +213,11 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
     
     KGlobal::locale()->setMainCatalogue("kcmshell");
 
-    KCmdLineArgs::init(_argc, _argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+    TDECmdLineArgs::init(_argc, _argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KCMShell app;
 
-    const KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    const TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     const TQCString lang = args->getOption("lang");
     if( !lang.isNull() )
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index 2e7b58238..b324e53f7 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -116,7 +116,7 @@ KonfUpdate::KonfUpdate()
    config = new KConfig("kconf_updaterc");
 
    TQStringList updateFiles;
-   KCmdLineArgs *args=KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs();
    
    debug = args->isSet("debug");
 
@@ -139,7 +139,7 @@ KonfUpdate::KonfUpdate()
       {
          KURL url = args->url(i);
          if (!url.isLocalFile())
-            KCmdLineArgs::usage(i18n("Only local files are supported."));
+            TDECmdLineArgs::usage(i18n("Only local files are supported."));
          updateFiles.append(url.path());
       }
    }
@@ -948,8 +948,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
    aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &aboutData);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &aboutData);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
    KInstance instance(&aboutData);
 
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index f111b3762..ec5139d86 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -724,9 +724,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    d.addAuthor("David Faure", I18N_NOOP("Author"), "faure@kde.org");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    bGlobalDatabase = args->isSet("global");
    bMenuTest = args->isSet("menutest");
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 0362e10e9..81887a695 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -118,8 +118,8 @@ int main(int argc, char **argv)
                 KAboutData::License_GPL, "(c) 2003 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
 //   KApplication k(false, false);
    KApplication k(false);
@@ -128,9 +128,9 @@ int main(int argc, char **argv)
    // this program is in tdelibs so it uses tdelibs as catalog
    KLocale::setMainCatalogue("tdelibs");
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 1)
-      KCmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'"));
+      TDECmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'"));
 
    utf8 = args->isSet("utf8");
 
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
    bHighlight = args->isSet("highlight");
 
    if (!bPrintMenuId && !bPrintMenuName && !bHighlight)
-      KCmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight"));
+      TDECmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight"));
 
    if (args->isSet("cache-update"))
    {
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 4b891d48a..40e1983f7 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -878,11 +878,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 
      KApplication::installSigpipeHandler();
 
-     KCmdLineArgs::init(argc, argv, &aboutData);
+     TDECmdLineArgs::init(argc, argv, &aboutData);
 
      KUniqueApplication::addCmdLineOptions();
 
-     KCmdLineArgs::addCmdLineOptions( options );
+     TDECmdLineArgs::addCmdLineOptions( options );
 
      // this program is in tdelibs so it uses tdelibs as catalog
      KLocale::setMainCatalogue("tdelibs");
@@ -891,7 +891,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      putenv(strdup("SESSION_MANAGER="));
 
      // Parse command line before checking DCOP
-     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
      // Check DCOP communication.
      {
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index d8c568869..60c7ba8f5 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -65,7 +65,7 @@ protected:
 
 KHostName::KHostName()
 {
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 2)
       args->usage();
    oldName = args->arg(0);
@@ -371,8 +371,8 @@ int main(int argc, char **argv)
                 KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
    KInstance k(&d);
 
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index 94a5bdde6..8c5577354 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -128,9 +128,9 @@ int main( int argc, char **argv ) {
 
     KAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, KAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
     about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
-    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() < 1 ) {
         args->usage();
         return ( 1 );
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 1600e628f..8f9b94350 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -95,15 +95,15 @@ int main(int argc, char **argv) {
 	"$Revision$",
 	I18N_NOOP("TDE Translator for XML"));
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KLocale::setMainCatalogue("kio_help");
     KInstance ins("meinproc");
     KGlobal::locale();
 
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() != 1 ) {
         args->usage();
         return ( 1 );
diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/khtml/java/tests/testkjavaappletserver.cpp
index 2045f7512..cb85550e6 100644
--- a/khtml/java/tests/testkjavaappletserver.cpp
+++ b/khtml/java/tests/testkjavaappletserver.cpp
@@ -17,9 +17,9 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KCmdLineArgs::init( argc, argv, "testKJASSever", "testKJASServer", "test program", "0.0" );
+    TDECmdLineArgs::init( argc, argv, "testKJASSever", "testKJASServer", "test program", "0.0" );
 
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 069ade04f..860d54718 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -449,16 +449,16 @@ int main(int argc, char *argv[])
     // workaround various Qt crashes by always enforcing a TrueColor visual
     TQApplication::setColorSpec( TQApplication::ManyColor );
 
-    KCmdLineArgs::init(argc, argv, "testregression", "TestRegression",
+    TDECmdLineArgs::init(argc, argv, "testregression", "TestRegression",
                        "Regression tester for khtml", "1.0");
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs( );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
 
     TQCString baseDir = args->getOption("base");
 
     if ( args->count() < 1 && baseDir.isEmpty() ) {
-	KCmdLineArgs::usage();
+	TDECmdLineArgs::usage();
 	::exit( 1 );
     }
 
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index 7765cee8a..a5ffcae26 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -37,14 +37,14 @@ static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLas
 int main(int argc, char *argv[])
 {
 
-    KCmdLineArgs::init(argc, argv, "testkhtml", "Testkhtml",
+    TDECmdLineArgs::init(argc, argv, "testkhtml", "Testkhtml",
             "a basic web browser using the KHTML library", "1.0");
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
     KApplication a;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs( );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
     if ( args->count() == 0 ) {
-	KCmdLineArgs::usage();
+	TDECmdLineArgs::usage();
 	::exit( 1 );
     }
 
diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp
index 0842bc2c2..b53b06be0 100644
--- a/kinit/klauncher_main.cpp
+++ b/kinit/klauncher_main.cpp
@@ -62,11 +62,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
 
    TQCString cname = KApplication::launcher();
    char *name = cname.data();
-   KCmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.",
+   TDECmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.",
                        "v1.0");
 
    KLauncher::addCmdLineOptions();
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
    // WABA: Make sure not to enable session management.
    putenv(strdup("SESSION_MANAGER="));
@@ -74,7 +74,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
    // Allow the locale to initialize properly
    KLocale::setMainCatalogue("tdelibs");
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
    int maxTry = 3;
    while(true)
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 1d364e9b7..1decc462e 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -2322,7 +2322,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir,
         }
         else
         {
-            ret = KCmdLineArgs::makeURL( TQFile::encodeName(startDir) );
+            ret = TDECmdLineArgs::makeURL( TQFile::encodeName(startDir) );
             // If we won't be able to list it (e.g. http), then use default
             if ( !KProtocolInfo::supportsListing( ret ) )
                 useDefaultStartDir = true;
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 63f1164dd..772c27f73 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -68,9 +68,9 @@ KIOExec::KIOExec()
     jobList = new TQPtrList<KIO::Job>;
     jobList->setAutoDelete( false ); // jobs autodelete themselves
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if (args->count() < 1)
-        KCmdLineArgs::usage(i18n("'command' expected.\n"));
+        TDECmdLineArgs::usage(i18n("'command' expected.\n"));
 
     tempfiles = args->isSet("tempfiles");
     if ( args->isSet( "suggestedfilename" ) )
@@ -280,8 +280,8 @@ int main( int argc, char **argv )
     aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");
     aboutData.addAuthor("Oswald Buddenhagen",0, "ossi@kde.org");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index 396a8dcdf..ac9954563 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -280,7 +280,7 @@ static void printSupportedMimeTypes()
 }
 
 // caller needs to delete the returned list!
-static KFileItemList * fileItemList( const KCmdLineArgs *args )
+static KFileItemList * fileItemList( const TDECmdLineArgs *args )
 {
     KFileItemList * items = new KFileItemList();
     items->setAutoDelete( true );
@@ -291,14 +291,14 @@ static KFileItemList * fileItemList( const KCmdLineArgs *args )
     return items;
 }
 
-static void showPropertiesDialog( const KCmdLineArgs *args )
+static void showPropertiesDialog( const TDECmdLineArgs *args )
 {
     KFileItemList *items = fileItemList( args );
     new KPropertiesDialog( *items, 0L, "props dialog", true );
     delete items;
 }
 
-static void printMimeTypes( const KCmdLineArgs *args )
+static void printMimeTypes( const TDECmdLineArgs *args )
 {
     for ( int i = 0; i < args->count(); i++ )
     {
@@ -318,7 +318,7 @@ static void printList( const TQStringList& list )
 }
 
 static void processMetaDataOptions( const TQPtrList<FileProps> propList,
-                                    KCmdLineArgs *args )
+                                    TDECmdLineArgs *args )
 {
 // kfile --mimetype --supportedMimetypes --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
 // "key" may be a list of keys, separated by commas
@@ -416,11 +416,11 @@ int main( int argc, char **argv )
     about.addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org",
 		     "http://devel-home.kde.org/~pfeiffer/" );
 
-    KCmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::init( argc, argv, &about );
 
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     bool useGUI = args->isSet( "dialog" );
 
     KApplication app( useGUI, useGUI );
@@ -435,7 +435,7 @@ int main( int argc, char **argv )
 
     int files = args->count();
     if ( files == 0 )
-        KCmdLineArgs::usage( i18n("No files specified") ); // exit()s
+        TDECmdLineArgs::usage( i18n("No files specified") ); // exit()s
 
     if ( args->isSet( "dialog" ) )
     {
diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp
index 4413911a8..a9f59ca36 100644
--- a/kio/misc/kmailservice.cpp
+++ b/kio/misc/kmailservice.cpp
@@ -29,12 +29,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
     KLocale::setMainCatalogue("tdelibs");
-    KCmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication a( false, false );
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if ( args->count() != 1 )
         return 1;
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index fbcaec7b6..1f900426f 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -64,9 +64,9 @@ int main(int argc, char **argv) {
                  KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
     d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
 
-    KCmdLineArgs::init(argc, argv, &d);
-    KCmdLineArgs::addCmdLineOptions(options);
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init(argc, argv, &d);
+    TDECmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     KApplication a(false, false);
 
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index 4b21ef799..d0f93aaf1 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -38,13 +38,13 @@ static const KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
 	KLocale::setMainCatalogue("tdelibs");
-	KCmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"),
+	TDECmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"),
 			   I18N_NOOP("telnet protocol handler"), "unknown");
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::addCmdLineOptions(options);
 
 	KApplication app;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	
 	if (args->count() != 1)
 		return 1;
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 32130c159..919676fc4 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -1387,8 +1387,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
     aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
     aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk");
 
-    KCmdLineArgs::init( argc, argv, &aboutdata );
-    // KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutdata );
+    // TDECmdLineArgs::addCmdLineOptions( options );
     KUniqueApplication::addCmdLineOptions();
 
     if (!KUniqueApplication::start())
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 463c464d3..34fe93677 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -65,7 +65,7 @@ static bool check(const TQString& txt, TQString a, TQString b)
 int main(int argc, char *argv[])
 {
     KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0);
+    TDECmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0);
     KApplication app;
 
     JobTest test;
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index e97f7c110..b4bfc9f07 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -68,7 +68,7 @@ static bool check(const TQString& txt, T a, T b)
 int main(int argc, char *argv[])
 {
     KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0);
+    TDECmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0);
     KApplication app;
 
     KACLTest test;
diff --git a/kio/tests/kdirwatchtest.cpp b/kio/tests/kdirwatchtest.cpp
index 48bc59a14..20676ee49 100644
--- a/kio/tests/kdirwatchtest.cpp
+++ b/kio/tests/kdirwatchtest.cpp
@@ -25,13 +25,13 @@ static const KCmdLineOptions options[] =
 
 int main (int argc, char **argv)
 {
-  KCmdLineArgs::init(argc, argv, "KDirWatchTest",
+  TDECmdLineArgs::init(argc, argv, "KDirWatchTest",
 		     "Test for KDirWatch", "1.0");
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KApplication::addCmdLineOptions();
 
   KApplication a;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   myTest testObject;
 
diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp
index 852a06453..95b0cf61a 100644
--- a/kio/tests/kionetrctest.cpp
+++ b/kio/tests/kionetrctest.cpp
@@ -44,9 +44,9 @@ int main(int argc, char **argv)
         KCmdLineLastOption
     };
 
-    KCmdLineArgs::init( argc, argv, "kionetrctest", description, version );
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init( argc, argv, "kionetrctest", description, version );
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
     KApplication app;
 
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index 2e8894108..f1dd1a9b0 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -9,7 +9,7 @@
 int main ( int argc, char** argv )
 {
     KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
     KApplication app;
 
     TQString usr, pass, comment, label;
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index 0db23457d..2e7e398e4 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -494,11 +494,11 @@ static KCmdLineOptions options[] =
 };
 
 int main(int argc, char **argv) {
-  KCmdLineArgs::init( argc, argv, "kioslavetest", description, version );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, "kioslavetest", description, version );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   TQString src = args->getOption("src");
   TQString dest = args->getOption("dest");
@@ -529,7 +529,7 @@ int main(int argc, char **argv) {
     op = KioslaveTest::Shred;
   } else if ( tmps == "mkdir") {
     op = KioslaveTest::Mkdir;
-  } else KCmdLineArgs::usage("unknown operation");
+  } else TDECmdLineArgs::usage("unknown operation");
 
   tmps = args->getOption("progress");
   if ( tmps == "none") {
@@ -538,7 +538,7 @@ int main(int argc, char **argv) {
     pr = KioslaveTest::ProgressDefault;
   } else if ( tmps == "status") {
     pr = KioslaveTest::ProgressStatus;
-  } else KCmdLineArgs::usage("unknown progress mode");
+  } else TDECmdLineArgs::usage("unknown progress mode");
 
   args->clear(); // Free up memory
 
diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp
index 248407f95..bde2ff5ff 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/kio/tests/kmimefromext.cpp
@@ -31,13 +31,13 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  KCmdLineArgs::init( argc, argv, "kmimefromext", "A mimetype testing tool, gives the mimetype for a given filename", "0.0" );
+  TDECmdLineArgs::init( argc, argv, "kmimefromext", "A mimetype testing tool, gives the mimetype for a given filename", "0.0" );
 
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQString fileName = args->arg( 0 );
 
   // The "true" here means only the filename will be looked at.
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 5f9e6ae3b..5d01384f6 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -14,14 +14,14 @@ static KCmdLineOptions options[] =
 int main ( int argc, char** argv )
 {
     KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() < 1 )
-        KCmdLineArgs::usage();
+        TDECmdLineArgs::usage();
     KURL u = args->url( 0 );
 
     // This is the test for the KPropertiesDialog constructor that is now
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index b0fe392f2..e8fd7850d 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -29,7 +29,7 @@ int main(int argc, char **argv) {
     KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
                         "1.0");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
     KApplication app;
 
     KURL url;
diff --git a/kio/tests/ktradertest.cpp b/kio/tests/ktradertest.cpp
index 34ce8e3bc..d2ceb4c00 100644
--- a/kio/tests/ktradertest.cpp
+++ b/kio/tests/ktradertest.cpp
@@ -33,16 +33,16 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "ktradertest", "KTradertest", "A KTrader testing tool", "0.0" );
+  TDECmdLineArgs::init( argc, argv, "ktradertest", "KTradertest", "A KTrader testing tool", "0.0" );
 
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app( false, false ); // no GUI
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() < 1 )
-      KCmdLineArgs::usage();
+      TDECmdLineArgs::usage();
 
   TQString query = TQString::fromLocal8Bit( args->arg( 0 ) );
 
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 7f448c541..6eb661c70 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -159,14 +159,14 @@ int main(int argc, char **argv)
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KAboutData aboutData(appName, programName, version, description);
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
     app.disableAutoDcopRegistration();
 
     // Allow testing of the search engine using both delimiters...
-    char delimiter = KCmdLineArgs::parsedArgs()->isSet("s") ? ' ' : ':';
+    char delimiter = TDECmdLineArgs::parsedArgs()->isSet("s") ? ' ' : ':';
 
     // Many tests check the "default search engine" feature.
     // There is no default search engine by default (since it was annoying when making typos),
diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp
index cd1919def..d777fe0df 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/kio/tests/kurlcompletiontest.cpp
@@ -165,7 +165,7 @@ void KURLCompletionTest::testLocalURL()
 int main( int argc, char **argv )
 {
     KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0);
+    TDECmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0);
     KApplication app;
 
     {
diff --git a/kio/tests/metatest.cpp b/kio/tests/metatest.cpp
index 54b87b6a0..f450c46c1 100644
--- a/kio/tests/metatest.cpp
+++ b/kio/tests/metatest.cpp
@@ -181,17 +181,17 @@ void removeGroup(KFileMetaInfo& info, TQString group)
 int main( int argc, char **argv )
 {
     // Initialize command line args
-    KCmdLineArgs::init(argc, argv, "kfilemetatest", "testing kfilmetainfo", "X");
+    TDECmdLineArgs::init(argc, argv, "kfilemetatest", "testing kfilmetainfo", "X");
 
     // Tell which options are supported
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
     KApplication::addCmdLineOptions();
     
     KApplication app;
 
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
     TQCString ov;
     ov = args->getOption("mimetypeinfo");
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index d8ddae20a..77cf13764 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -65,13 +65,13 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv) {
 
-    KCmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" );
+    TDECmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" );
 
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     KURL url;
     if ( args->count() == 1 )
diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp
index fcf58b683..a94ce3206 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/kioslave/http/http_cache_cleaner.cpp
@@ -190,13 +190,13 @@ void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQStri
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
    KLocale::setMainCatalogue("tdelibs");
-   KCmdLineArgs::init( argc, argv, appName,
+   TDECmdLineArgs::init( argc, argv, appName,
 		       I18N_NOOP("TDE HTTP cache maintenance tool"),
 		       description, version, true);
 
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
    bool deleteAll = args->isSet("clear-all");
 
diff --git a/kioslave/http/kcookiejar/main.cpp b/kioslave/http/kcookiejar/main.cpp
index 67177823b..87cefe3bb 100644
--- a/kioslave/http/kcookiejar/main.cpp
+++ b/kioslave/http/kcookiejar/main.cpp
@@ -43,16 +43,16 @@ static const KCmdLineOptions options[] =
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
    KLocale::setMainCatalogue("tdelibs");
-   KCmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
+   TDECmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
 		      description, version);
 
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
    KInstance a("kcookiejar");
    
    kapp->dcopClient()->attach();
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    TQCString replyType;
    TQByteArray replyData;
    if (args->isSet("remove-all"))
diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
index a150fc420..d457ae5c0 100644
--- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -250,15 +250,15 @@ int main(int argc, char *argv[])
    nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());
 
    KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
-   KCmdLineArgs::init( argc, argv, &about);
+   TDECmdLineArgs::init( argc, argv, &about);
 
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
    KInstance a("kcookietest");
    
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 1)
-      KCmdLineArgs::usage();
+      TDECmdLineArgs::usage();
 
    jar = new KCookieJar;
 
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index 90596da3d..709460862 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -79,7 +79,7 @@ void GhnsWidget::downloadWallpapers()
 int main(int argc,char **argv)
 {
   KAboutData aboutData("ghns","Get Hot New Stuff","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/khotnewstuff.cpp
index e479bd3b3..cf68255a3 100644
--- a/knewstuff/khotnewstuff.cpp
+++ b/knewstuff/khotnewstuff.cpp
@@ -36,11 +36,11 @@ static const KCmdLineOptions op[] =
 int main(int argc, char **argv)
 {
 	KAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
-	KCmdLineArgs *args;
+	TDECmdLineArgs *args;
 
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(op);
-	args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(op);
+	args = TDECmdLineArgs::parsedArgs();
 
 	KApplication i;
 
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index b0c380c68..451be8b43 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -108,7 +108,7 @@ void MyWidget::upload()
 int main(int argc,char **argv)
 {
   KAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
diff --git a/kparts/tests/ghostview.cpp b/kparts/tests/ghostview.cpp
index a1ace7720..d7cf9d102 100644
--- a/kparts/tests/ghostview.cpp
+++ b/kparts/tests/ghostview.cpp
@@ -101,10 +101,10 @@ static const char description[] = "This is a test shell for the kghostview part.
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init(argc, argv, "ghostviewtest", description, version);
-  KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+  TDECmdLineArgs::init(argc, argv, "ghostviewtest", description, version);
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
   KApplication app;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   Shell *shell = new Shell;
   if ( args->count() == 1 )
   {
diff --git a/kresources/testresources.cpp b/kresources/testresources.cpp
index 257f58ca1..452d9cf27 100644
--- a/kresources/testresources.cpp
+++ b/kresources/testresources.cpp
@@ -30,7 +30,7 @@ class TestSubResource : public TestResource
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "testresources", "Kresource Test", "0" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index b9ab927cc..22986730f 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -37,7 +37,7 @@ static const char ver[] = "0.9.1";
 
 int main(int argc, char **argv)
 {
-    KCmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
+    TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
     KApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
 
     KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
diff --git a/kunittest/modrunner.cpp b/kunittest/modrunner.cpp
index cb633189d..c7e545acd 100644
--- a/kunittest/modrunner.cpp
+++ b/kunittest/modrunner.cpp
@@ -54,9 +54,9 @@ int main( int argc, char **argv )
                      KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
                      "Jeroen.Wijnhout@kdemail.net");
 
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     KUnitTest::Runner::loadModules(args->getOption("folder"), args->getOption("query"));
     KUnitTest::Runner::setDebugCapturingEnabled(args->isSet("enable-dbgcap"));
diff --git a/kunittest/tester.h b/kunittest/tester.h
index 061f319b3..5e47f7ccb 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -150,8 +150,8 @@ SampleTest - 1 test passed, 1 test failed
  *     KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
  *                     KAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider");
  *
- *     KCmdLineArgs::init(argc, argv, &about);
- *     KCmdLineArgs::addCmdLineOptions( options );
+ *     TDECmdLineArgs::init(argc, argv, &about);
+ *     TDECmdLineArgs::addCmdLineOptions( options );
  *     KApplication app;
  *
  *     KUnitTest::RunnerGUI runner(0);
diff --git a/kutils/tests/kfindtest.cpp b/kutils/tests/kfindtest.cpp
index 1652eb625..29710c070 100644
--- a/kutils/tests/kfindtest.cpp
+++ b/kutils/tests/kfindtest.cpp
@@ -123,7 +123,7 @@ void KFindTest::slotHighlight(int id, int index, int matchedLength)
 
 int main(int argc, char **argv)
 {
-	KCmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
+	TDECmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
 	KApplication app;
 
 	TQString text = "This file is part of the KDE project.\n"
diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp
index 0a33be94b..d7d6d6e6e 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/kutils/tests/kreplacetest.cpp
@@ -252,7 +252,7 @@ static void testReplacementHistory()
 
 int main( int argc, char **argv )
 {
-    KCmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
+    TDECmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
     KApplication app;
 
     testReplacementHistory(); // #130831
diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp
index 072fb55f8..d25a74395 100644
--- a/kwallet/tests/kwalletasync.cpp
+++ b/kwallet/tests/kwalletasync.cpp
@@ -44,7 +44,7 @@ void WalletReceiver::walletOpened( bool got )
 int main( int argc, char *argv[] )
 {
 	KAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
 	KApplication app( "kwalletasync" );
 
 	// register with DCOP
diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp
index 75d303419..38197691a 100644
--- a/kwallet/tests/kwalletboth.cpp
+++ b/kwallet/tests/kwalletboth.cpp
@@ -66,7 +66,7 @@ void WalletReceiver::walletOpened( bool got )
 int main( int argc, char *argv[] )
 {
 	KAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
 	KApplication app( "kwalletboth" );
 
 	// register with DCOP
diff --git a/kwallet/tests/kwalletsync.cpp b/kwallet/tests/kwalletsync.cpp
index 3625a5cb6..541f593c0 100644
--- a/kwallet/tests/kwalletsync.cpp
+++ b/kwallet/tests/kwalletsync.cpp
@@ -24,7 +24,7 @@ void openWallet()
 int main( int argc, char *argv[] )
 {
 	KAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
 	KApplication app( "kwalletsync" );
 
 	// register with DCOP
diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp
index 0ff7c0a1b..da5b2a2df 100644
--- a/libkscreensaver/main.cpp
+++ b/libkscreensaver/main.cpp
@@ -94,9 +94,9 @@ typedef WId Window;
 KDE_EXPORT int main(int argc, char *argv[])
 {
     KLocale::setMainCatalogue("libkscreensaver");
-    KCmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
+    TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
 
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
     KApplication app;
 
@@ -108,7 +108,7 @@ KDE_EXPORT int main(int argc, char *argv[])
     Window saveWin = 0;
     KScreenSaver *target;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("setup"))
     {
diff --git a/tdecore/kaboutdata.h b/tdecore/kaboutdata.h
index 525ed3c92..9fe8d8593 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/kaboutdata.h
@@ -48,7 +48,7 @@ class KAboutDataPrivate;
  *   about.addAuthor("Joe Developer", I18N_NOOP("developer"), "joe@host.com", 0);
  *   about.addCredit("Joe User", I18N_NOOP("A lot of bug reports"),
  *                   "joe.user@host.org", 0);
- *   KCmdLineArgs::init(argc, argv, &about);
+ *   TDECmdLineArgs::init(argc, argv, &about);
  * \endcode
  */
 class TDECORE_EXPORT KAboutPerson
@@ -173,7 +173,7 @@ private:
  *
  * Currently, the values set here are shown by the "About" box
  * (see KAboutDialog), used by the bug report dialog (see KBugReport),
- * and by the help shown on command line (see KCmdLineArgs).
+ * and by the help shown on command line (see TDECmdLineArgs).
  *
  * @short Holds information needed by the "About" box and other
  * classes.
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 87c5ffb2f..dd804107a 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -640,16 +640,16 @@ KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
     setName(rAppName);
 
     installSigpipeHandler();
-    KCmdLineArgs::initIgnore(argc, argv, rAppName.data());
+    TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
     parseCommandLine( );
     init(GUIenabled);
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
 KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
-//  TQApplication( *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
-  TQApplication( *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(), GUIenabled ),	// We need to be able to run command line apps
-  KInstance( KCmdLineArgs::about),
+//  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
+  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ),	// We need to be able to run command line apps
+  KInstance( TDECmdLineArgs::about),
 #ifdef Q_WS_X11
   display(0L),
   argb_visual(false),
@@ -672,9 +672,9 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
 
 #ifdef Q_WS_X11
 KApplication::KApplication( Display *dpy, bool allowStyles ) :
-  TQApplication( dpy, *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ),
-  KInstance( KCmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  KInstance( TDECmdLineArgs::about), display(0L), d (new KApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -688,9 +688,9 @@ KApplication::KApplication( Display *dpy, bool allowStyles ) :
 }
 
 KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
-  TQApplication( dpy, *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( KCmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  KInstance( TDECmdLineArgs::about), display(0L), d (new KApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -706,9 +706,9 @@ KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual,
 
 KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
 		            bool allowStyles ) :
-  TQApplication( dpy, *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( KCmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  KInstance( TDECmdLineArgs::about), display(0L), d (new KApplicationPrivate)
 {
     if ((visual) && (colormap))
         getX11RGBAInformation(dpy);
@@ -725,7 +725,7 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap
 
 KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
 		            bool allowStyles, KInstance * _instance ) :
-  TQApplication( dpy, *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
   KInstance( _instance ), display(0L), d (new KApplicationPrivate)
 {
@@ -744,7 +744,7 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap
 #endif
 
 KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) :
-  TQApplication( *KCmdLineArgs::tqt_argc(), *KCmdLineArgs::tqt_argv(),
+  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 GUIenabled ),
   KInstance( _instance ),
 #ifdef Q_WS_X11
@@ -786,7 +786,7 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const TQCSt
     setName(rAppName);
 
     installSigpipeHandler();
-    KCmdLineArgs::initIgnore(argc, argv, rAppName.data());
+    TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
     parseCommandLine( );
     init(GUIenabled);
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
@@ -977,7 +977,7 @@ void KApplication::init(bool GUIenabled)
 
 #ifdef Q_WS_MACX
   if (GUIenabled) {
-      TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( KCmdLineArgs::appName(),
+      TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(),
               KIcon::NoGroup, KIcon::SizeLarge, KIcon::DefaultState, 0L, false );
       if (!pixmap.isNull()) {
           TQImage i = pixmap.convertToImage().convertDepth(32).smoothScale(40, 40);
@@ -1063,7 +1063,7 @@ DCOPClient *KApplication::dcopClient()
     return s_DCOPClient;
 
   s_DCOPClient = new DCOPClient();
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs("tde");
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tde");
   if (args && args->isSet("dcopserver"))
   {
     s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
@@ -1562,13 +1562,13 @@ static const KCmdLineOptions kde_options[] =
 void
 KApplication::addCmdLineOptions()
 {
-   KCmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt");
-   KCmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde");
+   TDECmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt");
+   TDECmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde");
 }
 
 void KApplication::parseCommandLine( )
 {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs("tde");
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tde");
 
     if ( !args ) return;
 
@@ -1823,7 +1823,7 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool
 	}
 	else {
 		// See if compositing has been enabled
-		KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+		TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
 		char *displayname = 0;
 		if ( qtargs->isSet("display"))
 			displayname = qtargs->getOption( "display" ).data();
@@ -1896,7 +1896,7 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool
 }
 
 Display* KApplication::openX11RGBADisplay() {
-	KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+	TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
 	char *display = 0;
 	if ( qtargs->isSet("display"))
 		display = qtargs->getOption( "display" ).data();
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index 2da1e0b82..6793c9510 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -111,7 +111,7 @@ public:
 
   /**
    * This constructor takes aboutData and command line
-   *  arguments from KCmdLineArgs.
+   *  arguments from TDECmdLineArgs.
    *
    * If ARGB (transparent) widgets are to be used in your application,
    * please use
@@ -234,7 +234,7 @@ public:
 #endif
 
   /**
-   * @deprecated do not use it at all, it will make your application crash, use KCmdLineArgs
+   * @deprecated do not use it at all, it will make your application crash, use TDECmdLineArgs
    *
    * Constructor. Parses command-line arguments.
    *
@@ -256,12 +256,12 @@ public:
    * no styles either.
    */
   // REMOVE FOR KDE 4.0 - using it only gives crashing applications because
-  // KCmdLineArgs::init isn't called
+  // TDECmdLineArgs::init isn't called
  KApplication(int& argc, char** argv,
               const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true) KDE_DEPRECATED;
 
   /**
-    * Add Qt and KDE command line options to KCmdLineArgs.
+    * Add Qt and KDE command line options to TDECmdLineArgs.
     */
   static void addCmdLineOptions();
 
@@ -1315,7 +1315,7 @@ private:
 
   void init( bool GUIenabled );
 
-  void parseCommandLine( ); // Handle KDE arguments (Using KCmdLineArgs)
+  void parseCommandLine( ); // Handle KDE arguments (Using TDECmdLineArgs)
 
   void read_app_startup_id();
 
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index 75eb9d633..6550f9144 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -54,7 +54,7 @@
 #endif
 
 template class TQAsciiDict<TQCString>;
-template class TQPtrList<KCmdLineArgs>;
+template class TQPtrList<TDECmdLineArgs>;
 
 class KCmdLineParsedOptions : public TQAsciiDict<TQCString>
 {
@@ -104,27 +104,27 @@ public:
 };
 
 
-class KCmdLineArgsList: public TQPtrList<KCmdLineArgs>
+class TDECmdLineArgsList: public TQPtrList<TDECmdLineArgs>
 {
 public:
-   KCmdLineArgsList() { }
+   TDECmdLineArgsList() { }
 };
 
-KCmdLineArgsList *KCmdLineArgs::argsList = 0;
-int KCmdLineArgs::argc = 0;
-char **KCmdLineArgs::argv = 0;
-char *KCmdLineArgs::mCwd = 0;
+TDECmdLineArgsList *TDECmdLineArgs::argsList = 0;
+int TDECmdLineArgs::argc = 0;
+char **TDECmdLineArgs::argv = 0;
+char *TDECmdLineArgs::mCwd = 0;
 static KStaticDeleter <char> mCwdd;
-const KAboutData *KCmdLineArgs::about = 0;
-bool KCmdLineArgs::parsed = false;
-bool KCmdLineArgs::ignoreUnknown = false;
+const KAboutData *TDECmdLineArgs::about = 0;
+bool TDECmdLineArgs::parsed = false;
+bool TDECmdLineArgs::ignoreUnknown = false;
 
 //
 // Static functions
 //
 
 void
-KCmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName,
+TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName,
                    const char *_description, const char *_version, bool noKApp)
 {
    init(_argc, _argv,
@@ -133,7 +133,7 @@ KCmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* pr
 }
 
 void
-KCmdLineArgs::init(int _argc, char **_argv, const char *_appname,
+TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
                    const char *_description, const char *_version, bool noKApp)
 {
    init(_argc, _argv,
@@ -142,7 +142,7 @@ KCmdLineArgs::init(int _argc, char **_argv, const char *_appname,
 }
 
 void
-KCmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
+TDECmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
 {
    init(_argc, _argv,
         new KAboutData(_appname, _appname, "unknown", "TDE Application", false));
@@ -150,7 +150,7 @@ KCmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
 }
 
 void
-KCmdLineArgs::init(const KAboutData* ab)
+TDECmdLineArgs::init(const KAboutData* ab)
 {
    char **_argv = (char **) malloc(sizeof(char *));
    _argv[0] = (char *) ab->appName();
@@ -159,14 +159,14 @@ KCmdLineArgs::init(const KAboutData* ab)
 
 
 void
-KCmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKApp)
+TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKApp)
 {
    argc = _argc;
    argv = _argv;
 
    if (!argv)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
       fprintf(stderr, "Passing null-pointer to 'argv' is not allowed.\n\n");
 
       assert( 0 );
@@ -191,30 +191,30 @@ KCmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKAp
       KApplication::addCmdLineOptions();
 }
 
-TQString KCmdLineArgs::cwd()
+TQString TDECmdLineArgs::cwd()
 {
    return TQFile::decodeName(TQCString(mCwd));
 }
 
-const char * KCmdLineArgs::appName()
+const char * TDECmdLineArgs::appName()
 {
    if (!argc) return 0;
    return argv[0];
 }
 
 void
-KCmdLineArgs::addCmdLineOptions( const KCmdLineOptions *options, const char *name,
+TDECmdLineArgs::addCmdLineOptions( const KCmdLineOptions *options, const char *name,
          const char *id, const char *afterId)
 {
    if (!argsList)
-      argsList = new KCmdLineArgsList();
+      argsList = new TDECmdLineArgsList();
 
    int pos = argsList->count();
 
    if (pos && id && argsList->last() && !argsList->last()->name)
       pos--;
 
-   KCmdLineArgs *args;
+   TDECmdLineArgs *args;
    int i = 0;
    for(args = argsList->first(); args; args = argsList->next(), i++)
    {
@@ -230,12 +230,12 @@ KCmdLineArgs::addCmdLineOptions( const KCmdLineOptions *options, const char *nam
 
    assert( parsed == false ); // You must add _ALL_ cmd line options
                               // before accessing the arguments!
-   args = new KCmdLineArgs(options, name, id);
+   args = new TDECmdLineArgs(options, name, id);
    argsList->insert(pos, args);
 }
 
 void
-KCmdLineArgs::saveAppArgs( TQDataStream &ds)
+TDECmdLineArgs::saveAppArgs( TQDataStream &ds)
 {
    if (!parsed)
       parseAllArgs();
@@ -252,7 +252,7 @@ KCmdLineArgs::saveAppArgs( TQDataStream &ds)
 
    if (!count) return;
 
-   KCmdLineArgs *args;
+   TDECmdLineArgs *args;
    for(args = argsList->first(); args; args = argsList->next())
    {
       ds << TQCString(args->id);
@@ -261,7 +261,7 @@ KCmdLineArgs::saveAppArgs( TQDataStream &ds)
 }
 
 void
-KCmdLineArgs::loadAppArgs( TQDataStream &ds)
+TDECmdLineArgs::loadAppArgs( TQDataStream &ds)
 {
    parsed = true; // don't reparse argc/argv!
 
@@ -269,7 +269,7 @@ KCmdLineArgs::loadAppArgs( TQDataStream &ds)
    removeArgs("qt");
    removeArgs("tde");
 
-   KCmdLineArgs *args;
+   TDECmdLineArgs *args;
    if ( argsList ) {
       for(args = argsList->first(); args; args = argsList->next())
       {
@@ -307,9 +307,9 @@ KCmdLineArgs::loadAppArgs( TQDataStream &ds)
    parsed = true;
 }
 
-KCmdLineArgs *KCmdLineArgs::parsedArgs(const char *id)
+TDECmdLineArgs *TDECmdLineArgs::parsedArgs(const char *id)
 {
-   KCmdLineArgs *args = argsList ? argsList->first() : 0;
+   TDECmdLineArgs *args = argsList ? argsList->first() : 0;
    while(args)
    {
       if ((id && ::qstrcmp(args->id, id) == 0) || (!id && !args->id))
@@ -324,9 +324,9 @@ KCmdLineArgs *KCmdLineArgs::parsedArgs(const char *id)
    return args;
 }
 
-void KCmdLineArgs::removeArgs(const char *id)
+void TDECmdLineArgs::removeArgs(const char *id)
 {
-   KCmdLineArgs *args = argsList ? argsList->first() : 0;
+   TDECmdLineArgs *args = argsList ? argsList->first() : 0;
    while(args)
    {
       if (args->id && id && ::qstrcmp(args->id, id) == 0)
@@ -426,9 +426,9 @@ findOption(const KCmdLineOptions *options, TQCString &opt,
 
 
 void
-KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
+TDECmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
 {
-   KCmdLineArgs *args = argsList->first();
+   TDECmdLineArgs *args = argsList->first();
    const char *opt_name;
    const char *def;
    TQCString argument;
@@ -534,19 +534,19 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled,
 }
 
 void
-KCmdLineArgs::printQ(const TQString &msg)
+TDECmdLineArgs::printQ(const TQString &msg)
 {
    TQCString localMsg = msg.local8Bit();
    fprintf(stdout, "%s", localMsg.data());
 }
 
 void
-KCmdLineArgs::parseAllArgs()
+TDECmdLineArgs::parseAllArgs()
 {
    bool allowArgs = false;
    bool inOptions = true;
    bool everythingAfterArgIsArgs = false;
-   KCmdLineArgs *appOptions = argsList->last();
+   TDECmdLineArgs *appOptions = argsList->last();
    if (!appOptions->id)
    {
      const KCmdLineOptions *option = appOptions->options;
@@ -676,7 +676,7 @@ KCmdLineArgs::parseAllArgs()
  * Return argc
  */
 int *
-KCmdLineArgs::tqt_argc()
+TDECmdLineArgs::tqt_argc()
 {
    if (!argsList)
       KApplication::addCmdLineOptions(); // Lazy bastards!
@@ -685,12 +685,12 @@ KCmdLineArgs::tqt_argc()
    if( tqt_argc != -1 )
       return &tqt_argc;
 
-   KCmdLineArgs *args = parsedArgs("qt");
+   TDECmdLineArgs *args = parsedArgs("qt");
    assert(args); // No qt options have been added!
    if (!argv)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
-      fprintf(stderr, "Application has not called KCmdLineArgs::init(...).\n\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
+      fprintf(stderr, "Application has not called TDECmdLineArgs::init(...).\n\n");
 
       assert( 0 );
       exit(255);
@@ -707,7 +707,7 @@ KCmdLineArgs::tqt_argc()
  * Return argv
  */
 char ***
-KCmdLineArgs::tqt_argv()
+TDECmdLineArgs::tqt_argv()
 {
    if (!argsList)
       KApplication::addCmdLineOptions(); // Lazy bastards!
@@ -716,12 +716,12 @@ KCmdLineArgs::tqt_argv()
    if( tqt_argv != NULL )
       return &tqt_argv;
 
-   KCmdLineArgs *args = parsedArgs("qt");
+   TDECmdLineArgs *args = parsedArgs("qt");
    assert(args); // No qt options have been added!
    if (!argv)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
-      fprintf(stderr, "Application has not called KCmdLineArgs::init(...).\n\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
+      fprintf(stderr, "Application has not called TDECmdLineArgs::init(...).\n\n");
 
       assert( 0 );
       exit(255);
@@ -740,7 +740,7 @@ KCmdLineArgs::tqt_argv()
 }
 
 void
-KCmdLineArgs::enable_i18n()
+TDECmdLineArgs::enable_i18n()
 {
     // called twice or too late
     if (KGlobal::_locale)
@@ -754,7 +754,7 @@ KCmdLineArgs::enable_i18n()
 }
 
 void
-KCmdLineArgs::usage(const TQString &error)
+TDECmdLineArgs::usage(const TQString &error)
 {
     assert(KGlobal::_locale);
     TQCString localError = error.local8Bit();
@@ -769,7 +769,7 @@ KCmdLineArgs::usage(const TQString &error)
 }
 
 void
-KCmdLineArgs::usage(const char *id)
+TDECmdLineArgs::usage(const char *id)
 {
    enable_i18n();
    assert(argsList != 0); // It's an error to call usage(...) without
@@ -781,7 +781,7 @@ KCmdLineArgs::usage(const char *id)
    TQString tmp;
    TQString usage;
 
-   KCmdLineArgs *args = argsList->last();
+   TDECmdLineArgs *args = argsList->last();
 
    if (!(args->id) && (args->options) &&
        (args->options->name) && (args->options->name[0] != '+'))
@@ -798,7 +798,7 @@ KCmdLineArgs::usage(const char *id)
       args = argsList->prev();
    }
 
-   KCmdLineArgs *appOptions = argsList->last();
+   TDECmdLineArgs *appOptions = argsList->last();
    if (!appOptions->id)
    {
      const KCmdLineOptions *option = appOptions->options;
@@ -986,7 +986,7 @@ KCmdLineArgs::usage(const char *id)
  *
  *  The given arguments are assumed to be constants.
  */
-KCmdLineArgs::KCmdLineArgs( const KCmdLineOptions *_options,
+TDECmdLineArgs::TDECmdLineArgs( const KCmdLineOptions *_options,
                             const char *_name, const char *_id)
   : options(_options), name(_name), id(_id)
 {
@@ -998,7 +998,7 @@ KCmdLineArgs::KCmdLineArgs( const KCmdLineOptions *_options,
 /**
  *  Destructor.
  */
-KCmdLineArgs::~KCmdLineArgs()
+TDECmdLineArgs::~TDECmdLineArgs()
 {
   delete parsedOptionList;
   delete parsedArgList;
@@ -1007,7 +1007,7 @@ KCmdLineArgs::~KCmdLineArgs()
 }
 
 void
-KCmdLineArgs::clear()
+TDECmdLineArgs::clear()
 {
    delete parsedArgList;
    parsedArgList = 0;
@@ -1016,7 +1016,7 @@ KCmdLineArgs::clear()
 }
 
 void
-KCmdLineArgs::reset()
+TDECmdLineArgs::reset()
 {
    if ( argsList ) {
       argsList->setAutoDelete( true );
@@ -1028,7 +1028,7 @@ KCmdLineArgs::reset()
 }
 
 void
-KCmdLineArgs::save( TQDataStream &ds) const
+TDECmdLineArgs::save( TQDataStream &ds) const
 {
    uint count = 0;
    if (parsedOptionList)
@@ -1043,7 +1043,7 @@ KCmdLineArgs::save( TQDataStream &ds) const
 }
 
 void
-KCmdLineArgs::load( TQDataStream &ds)
+TDECmdLineArgs::load( TQDataStream &ds)
 {
    if (!parsedOptionList) parsedOptionList = new KCmdLineParsedOptions;
    if (!parsedArgList) parsedArgList = new KCmdLineParsedArgs;
@@ -1064,7 +1064,7 @@ KCmdLineArgs::load( TQDataStream &ds)
 }
 
 void
-KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
+TDECmdLineArgs::setOption(const TQCString &opt, bool enabled)
 {
    if (isQt)
    {
@@ -1087,7 +1087,7 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
 }
 
 void
-KCmdLineArgs::setOption(const TQCString &opt, const char *value)
+TDECmdLineArgs::setOption(const TQCString &opt, const char *value)
 {
    if (isQt)
    {
@@ -1114,7 +1114,7 @@ KCmdLineArgs::setOption(const TQCString &opt, const char *value)
 }
 
 TQCString
-KCmdLineArgs::getOption(const char *_opt) const
+TDECmdLineArgs::getOption(const char *_opt) const
 {
    TQCString *value = 0;
    if (parsedOptionList)
@@ -1134,7 +1134,7 @@ KCmdLineArgs::getOption(const char *_opt) const
 
    if (result != 3)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
       fprintf(stderr, "Application requests for getOption(\"%s\") but the \"%s\" option\n",
                       _opt, _opt);
       fprintf(stderr, "has never been specified via addCmdLineOptions( ... )\n\n");
@@ -1146,7 +1146,7 @@ KCmdLineArgs::getOption(const char *_opt) const
 }
 
 QCStringList
-KCmdLineArgs::getOptionList(const char *_opt) const
+TDECmdLineArgs::getOptionList(const char *_opt) const
 {
    QCStringList result;
    if (!parsedOptionList)
@@ -1176,7 +1176,7 @@ KCmdLineArgs::getOptionList(const char *_opt) const
 }
 
 bool
-KCmdLineArgs::isSet(const char *_opt) const
+TDECmdLineArgs::isSet(const char *_opt) const
 {
    // Look up the default.
    const char *opt_name;
@@ -1187,7 +1187,7 @@ KCmdLineArgs::isSet(const char *_opt) const
 
    if (result == 0)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
       fprintf(stderr, "Application requests for isSet(\"%s\") but the \"%s\" option\n",
                       _opt, _opt);
       fprintf(stderr, "has never been specified via addCmdLineOptions( ... )\n\n");
@@ -1219,7 +1219,7 @@ KCmdLineArgs::isSet(const char *_opt) const
 }
 
 int
-KCmdLineArgs::count() const
+TDECmdLineArgs::count() const
 {
    if (!parsedArgList)
       return 0;
@@ -1227,11 +1227,11 @@ KCmdLineArgs::count() const
 }
 
 const char *
-KCmdLineArgs::arg(int n) const
+TDECmdLineArgs::arg(int n) const
 {
    if (!parsedArgList || (n >= (int) parsedArgList->count()))
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs): Argument out of bounds\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs): Argument out of bounds\n");
       fprintf(stderr, "Application requests for arg(%d) without checking count() first.\n",
                       n);
 
@@ -1243,12 +1243,12 @@ KCmdLineArgs::arg(int n) const
 }
 
 KURL
-KCmdLineArgs::url(int n) const
+TDECmdLineArgs::url(int n) const
 {
    return makeURL( arg(n) );
 }
 
-KURL KCmdLineArgs::makeURL(const char *_urlArg)
+KURL TDECmdLineArgs::makeURL(const char *_urlArg)
 {
    const TQString urlArg = TQFile::decodeName(_urlArg);
    TQFileInfo fileInfo(urlArg);
@@ -1269,7 +1269,7 @@ KURL KCmdLineArgs::makeURL(const char *_urlArg)
 }
 
 void
-KCmdLineArgs::addArgument(const char *argument)
+TDECmdLineArgs::addArgument(const char *argument)
 {
    if (!parsedArgList)
       parsedArgList = new KCmdLineParsedArgs;
@@ -1284,14 +1284,14 @@ static const KCmdLineOptions kde_tempfile_option[] =
 };
 
 void
-KCmdLineArgs::addTempFileOption()
+TDECmdLineArgs::addTempFileOption()
 {
-    KCmdLineArgs::addCmdLineOptions( kde_tempfile_option, "TDE-tempfile", "tde-tempfile" );
+    TDECmdLineArgs::addCmdLineOptions( kde_tempfile_option, "TDE-tempfile", "tde-tempfile" );
 }
 
-bool KCmdLineArgs::isTempFileSet()
+bool TDECmdLineArgs::isTempFileSet()
 {
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs( "tde-tempfile" );
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs( "tde-tempfile" );
     if ( args )
         return args->isSet( "tempfile" );
     return false;
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index 7b6a33e2e..0b89fd3bb 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -31,11 +31,11 @@ typedef TQValueList<TQCString> QCStringList;
 /**
  * @short Structure that holds command line options.
  *
- * This class is intended to be used with the KCmdLineArgs class, which
+ * This class is intended to be used with the TDECmdLineArgs class, which
  * provides convenient and powerful command line argument parsing and
  * handling functionality.
  *
- * @see KCmdLineArgs for additional usage information
+ * @see TDECmdLineArgs for additional usage information
  */
 struct TDECORE_EXPORT KCmdLineOptions
 {
@@ -49,7 +49,7 @@ struct TDECORE_EXPORT KCmdLineOptions
     * <i>myapp --nofoo</i> is called:
     *
     * \code
-    * KCmdLineArgs::parsedArgs()->isSet("foo"); // false
+    * TDECmdLineArgs::parsedArgs()->isSet("foo"); // false
     * \endcode
     */
    const char *name;
@@ -67,34 +67,34 @@ struct TDECORE_EXPORT KCmdLineOptions
 
 #define KCmdLineLastOption { 0, 0, 0 }
 
-class KCmdLineArgsList;
+class TDECmdLineArgsList;
 class KApplication;
 class KUniqueApplication;
 class KCmdLineParsedOptions;
 class KCmdLineParsedArgs;
 class KAboutData;
-class KCmdLineArgsPrivate;
+class TDECmdLineArgsPrivate;
 
 /**
  *  @short A class for command-line argument handling.
  *
- *  KCmdLineArgs provides simple access to the command-line arguments
+ *  TDECmdLineArgs provides simple access to the command-line arguments
  *  for an application. It takes into account Qt-specific options,
  *  KDE-specific options and application specific options.
  *
  *  This class is used in %main() via the static method
  *  init().
  *
- *  A typical %KDE application using %KCmdLineArgs should look like this:
+ *  A typical %KDE application using %TDECmdLineArgs should look like this:
  *
  *  \code
  *  int main(int argc, char *argv[])
  *  {
  *     // Initialize command line args
- *     KCmdLineArgs::init(argc, argv, appName, programName, description, version);
+ *     TDECmdLineArgs::init(argc, argv, appName, programName, description, version);
  *
  *     // Tell which options are supported
- *     KCmdLineArgs::addCmdLineOptions( options );
+ *     TDECmdLineArgs::addCmdLineOptions( options );
  *
  *     // Add options from other components
  *     KUniqueApplication::addCmdLineOptions();
@@ -111,7 +111,7 @@ class KCmdLineArgsPrivate;
  *     // necessary.
  *     // A KUniqueApplication might want to handle it in newInstance().
  *
- *     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ *     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
  *
  *     // A binary option (on / off)
  *     if (args->isSet("some-option"))
@@ -165,7 +165,7 @@ class KCmdLineArgsPrivate;
  *  \endcode
  *
  *  The I18N_NOOP macro is used to indicate that these strings should be
- *  marked for translation. The actual translation is done by KCmdLineArgs.
+ *  marked for translation. The actual translation is done by TDECmdLineArgs.
  *  You can't use i18n() here because we are setting up a static data
  *  structure and can't do translations at compile time.
  *
@@ -219,11 +219,11 @@ class KCmdLineArgsPrivate;
  *  @author Waldo Bastian
  *  @version 0.0.4
  */
-class TDECORE_EXPORT KCmdLineArgs
+class TDECORE_EXPORT TDECmdLineArgs
 {
   friend class KApplication;
   friend class KUniqueApplication;
-  friend class TQPtrList<KCmdLineArgs>;
+  friend class TQPtrList<TDECmdLineArgs>;
 public:
   // Static functions:
 
@@ -321,8 +321,8 @@ public:
    *     true. If required, you must check yourself the number of arguments
    *     specified by the user:
    *     \code
-   *       KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-   *       if (args->count() == 0) KCmdLineArgs::usage(i18n("No file specified!"));
+   *       TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
+   *       if (args->count() == 0) TDECmdLineArgs::usage(i18n("No file specified!"));
    *     \endcode
    *
    * In BNF:
@@ -367,7 +367,7 @@ public:
    *
    * @param id The name of the options you are interested in, can be 0.
    */
-  static KCmdLineArgs *parsedArgs(const char *id=0);
+  static TDECmdLineArgs *parsedArgs(const char *id=0);
 
   /**
    * Get the CWD (Current Working Directory) associated with the
@@ -501,14 +501,14 @@ public:
 
   /**
    * Used by url().
-   * Made public for apps that don't use KCmdLineArgs
+   * Made public for apps that don't use TDECmdLineArgs
    * @param urlArg the argument
    * @return the url.
    */
   static KURL makeURL( const char * urlArg );
 
   /**
-   * Made public for apps that don't use KCmdLineArgs
+   * Made public for apps that don't use TDECmdLineArgs
    * To be done before makeURL, to set the current working
    * directory in case makeURL needs it.
    * @param cwd the new working directory
@@ -553,7 +553,7 @@ protected:
    * @internal
    *  Constructor.
    */
-  KCmdLineArgs( const KCmdLineOptions *_options, const char *_name,
+  TDECmdLineArgs( const KCmdLineOptions *_options, const char *_name,
                 const char *_id);
 
   /**
@@ -563,7 +563,7 @@ protected:
    *
    *  Destructor.
    */
-  ~KCmdLineArgs();
+  ~TDECmdLineArgs();
 
 private:
   /**
@@ -659,7 +659,7 @@ private:
    * @param appname The untranslated name of your application. This should
    *                match with @p argv[0].
    *
-   * This function makes KCmdLineArgs ignore all unknown options as well as
+   * This function makes TDECmdLineArgs ignore all unknown options as well as
    * all arguments.
    */
   static void initIgnore(int _argc, char **_argv, const char *_appname);
@@ -673,7 +673,7 @@ private:
   KCmdLineParsedArgs *parsedArgList;
   bool isQt;
 
-  static KCmdLineArgsList *argsList; // All options.
+  static TDECmdLineArgsList *argsList; // All options.
   static const KAboutData *about;
 
   static int argc; // The original argc
@@ -683,7 +683,7 @@ private:
   static char *mCwd; // Current working directory. Important for KUnqiueApp!
   static bool parseArgs;
 
-  KCmdLineArgsPrivate *d;
+  TDECmdLineArgsPrivate *d;
 };
 
 #endif
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp
index 2c4e4d442..494f997f2 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/kconfig_compiler/example/autoexample.cpp
@@ -41,7 +41,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/kconfig_compiler/example/example.cpp
index 146d2460f..b1afe7973 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/kconfig_compiler/example/example.cpp
@@ -35,7 +35,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp
index 55a3c7f34..e0b6422a4 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -962,12 +962,12 @@ int main( int argc, char **argv )
   aboutData.addCredit( "Duncan Mac-Vicar P.", "dpointer support",
       "duncan@kde.org", "http://www.mac-vicar.com/~duncan" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KInstance app( &aboutData );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() < 2 ) {
     kdError() << "Too few arguments." << endl;
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index 8b9b4804e..e7d259628 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -46,8 +46,8 @@ int main(int argc, char **argv)
     KAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
 		     KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
     about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
 
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 5d1dbdce0..56e2e0106 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -60,7 +60,7 @@ class TDECORE_EXPORT KInstance
      *  You have to destroy both, since the instance doesn't own the about data.
      *  Don't build a KAboutData on the stack in this case !
      *  Building a KAboutData on the stack is only ok for usage with
-     *  KCmdLineArgs and KApplication (not destroyed until the app exits).
+     *  TDECmdLineArgs and KApplication (not destroyed until the app exits).
      *  @param aboutData data about this instance (see KAboutData)
      */
     KInstance( const KAboutData * aboutData );
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index bc2175d0d..15f3909b8 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -125,7 +125,7 @@ static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat
   hostname[0] = 0;
   gethostname(hostname, 255);
   hostname[255] = 0;
-  TQCString instanceName = KCmdLineArgs::appName();
+  TQCString instanceName = TDECmdLineArgs::appName();
 
   (*(uniqueFile.textStream())) << TQString::number(getpid()) << endl
       << instanceName << endl
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 5f7087313..271264e95 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -86,7 +86,7 @@ public:
 void
 KUniqueApplication::addCmdLineOptions()
 {
-  KCmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "tde" );
+  TDECmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "tde" );
 }
 
 bool
@@ -99,12 +99,12 @@ KUniqueApplication::start()
 #ifdef Q_WS_WIN
   s_nofork = true;
 #else
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kuniqueapp");
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("kuniqueapp");
   s_nofork = !args->isSet("fork");
   delete args;
 #endif
 
-  TQCString appName = KCmdLineArgs::about->appName();
+  TQCString appName = TDECmdLineArgs::about->appName();
 
   if (s_nofork)
   {
@@ -285,14 +285,14 @@ KUniqueApplication::start()
      TQByteArray data, reply;
      TQDataStream ds(data, IO_WriteOnly);
 
-     KCmdLineArgs::saveAppArgs(ds);
+     TDECmdLineArgs::saveAppArgs(ds);
      ds << new_asn_id;
 
      dc->setPriorityCall(true);
      TQCString replyType;
-     if (!dc->call(appName, KCmdLineArgs::about->appName(), "newInstance()", data, replyType, reply))
+     if (!dc->call(appName, TDECmdLineArgs::about->appName(), "newInstance()", data, replyType, reply))
      {
-        kdError() << "Communication problem with " << KCmdLineArgs::about->appName() << ", it probably crashed." << endl;
+        kdError() << "Communication problem with " << TDECmdLineArgs::about->appName() << ", it probably crashed." << endl;
         delete dc;	// Clean up DCOP commmunication
         ::exit(255);
      }
@@ -316,7 +316,7 @@ KUniqueApplication::start()
 
 KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique)
   : KApplication( allowStyles, GUIenabled, initHack( configUnique )),
-    DCOPObject(KCmdLineArgs::about->appName())
+    DCOPObject(TDECmdLineArgs::about->appName())
 {
   d = new KUniqueApplicationPrivate;
   d->processingRequest = false;
@@ -332,7 +332,7 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
 KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
 		Qt::HANDLE colormap, bool allowStyles, bool configUnique)
   : KApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
-    DCOPObject(KCmdLineArgs::about->appName())
+    DCOPObject(TDECmdLineArgs::about->appName())
 {
   d = new KUniqueApplicationPrivate;
   d->processingRequest = false;
@@ -353,7 +353,7 @@ KUniqueApplication::~KUniqueApplication()
 // this gets called before even entering TQApplication::TQApplication()
 KInstance* KUniqueApplication::initHack( bool configUnique )
 {
-  KInstance* inst = new KInstance( KCmdLineArgs::about );
+  KInstance* inst = new KInstance( TDECmdLineArgs::about );
   if (configUnique)
   {
     KConfigGroupSaver saver( inst->config(), "KDE" );
@@ -433,7 +433,7 @@ KUniqueApplication::processDelayed()
      if (request->fun == "newInstance()") {
        dcopClient()->setPriorityCall(false);
        TQDataStream ds(request->data, IO_ReadOnly);
-       KCmdLineArgs::loadAppArgs(ds);
+       TDECmdLineArgs::loadAppArgs(ds);
        if( !ds.atEnd()) // backwards compatibility
        {
            TQCString asn_id;
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index b4ad50129..e9dca8d99 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -39,7 +39,7 @@ class KUniqueApplicationPrivate;
  * see kapplication.h
  *
  * If your application is used to open files, it should also support the --tempfile
- * option (see KCmdLineArgs::addTempFileOption()), to delete tempfiles after use.
+ * option (see TDECmdLineArgs::addTempFileOption()), to delete tempfiles after use.
  * Add X-TDE-HasTempFileOption=true to the .desktop file to indicate this.
  *
  * @see KApplication DCOPObject
@@ -50,7 +50,7 @@ class TDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
   Q_OBJECT
 public:
   /**
-   * Constructor. Takes command line arguments from KCmdLineArgs
+   * Constructor. Takes command line arguments from TDECmdLineArgs
    *
    * @param allowStyles Set to false to disable the loading on plugin based
    * styles. This is only useful to applications that do not display a GUI
@@ -70,7 +70,7 @@ public:
 
 #ifdef Q_WS_X11
   /**
-   * Constructor. Takes command line arguments from KCmdLineArgs
+   * Constructor. Takes command line arguments from TDECmdLineArgs
    *
    * @param display Will be passed to Qt as the X display. The display
    * must be valid and already opened.
@@ -114,8 +114,8 @@ public:
    * \code
    * int main(int argc, char **argv) {
    *    KAboutData about("myappname", "myAppName", .....);
-   *    KCmdLineArgs::init(argc, argv, &about);
-   *    KCmdLineArgs::addCmdLineOptions( myCmdOptions );
+   *    TDECmdLineArgs::init(argc, argv, &about);
+   *    TDECmdLineArgs::addCmdLineOptions( myCmdOptions );
    *    KUniqueApplication::addCmdLineOptions();
    *
    *    if (!KUniqueApplication::start()) {
@@ -162,7 +162,7 @@ public:
    * application asking for a new window to be created, possibly with
    * some data already loaded based on the arguments received.
    *
-   * Command line arguments have been passed to KCmdLineArgs before this
+   * Command line arguments have been passed to TDECmdLineArgs before this
    * function is called and can be checked in the usual way.
    *
    * The default implementation ensures the mainwindow of the already
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 0afbd9422..58c6407d8 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -115,9 +115,9 @@ int main(int argc, char **argv)
 {
     KLocale::setMainCatalogue("tdelibs");
     KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
-    KCmdLineArgs::init( argc, argv, &about);
+    TDECmdLineArgs::init( argc, argv, &about);
 
-    KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
     KInstance a("tde-config");
     a.setConfigReadOnly(TRUE);
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
     (void)KGlobal::config();
 
     // Get application specific arguments
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     _expandvars = args->isSet("expandvars");
 
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index c988b000e..10a904e3f 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -115,9 +115,9 @@ int main(int argc, char **argv)
 {
     KLocale::setMainCatalogue("tdelibs");
     KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
-    KCmdLineArgs::init( argc, argv, &about);
+    TDECmdLineArgs::init( argc, argv, &about);
 
-    KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
     KInstance a("tde-config");
     a.setConfigReadOnly(TRUE);
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
     (void)KGlobal::config();
 
     // Get application specific arguments
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     _expandvars = args->isSet("expandvars");
 
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 7e3b47f43..11227517d 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -29,7 +29,7 @@ int
 main(int argc, char *argv[])
 {
    KAboutData about("kapptest", "kapptest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDECmdLineArgs::init(argc, argv, &about);
 
    KApplication a;
 
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 51a40b892..85f464c9e 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -39,10 +39,10 @@ int main(int argc, char **argv) {
   	aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.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.
 
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	KApplication app(false, false);
 
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index 299196810..4aa05a48b 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -25,16 +25,16 @@ int
 main(int argc, char *argv[])
 {
    KLocale::setMainCatalogue("tdelibs");
-   KCmdLineArgs::init( argc, argv, "testapp", description, version);
+   TDECmdLineArgs::init( argc, argv, "testapp", description, version);
 
-   KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+   TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
    // MyWidget::addCmdLineOptions();
 
    KApplication k( false, false /*true, true*/ );
 
    // Get application specific arguments
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); 
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); 
    // Check if an option is set
    if (args->isSet("test"))
    {
@@ -79,7 +79,7 @@ main(int argc, char *argv[])
 int
 main(int argc, char *argv[])
 {
-   KCmdLineArgs::init( argc, argv, "testapp", description, version);
+   TDECmdLineArgs::init( argc, argv, "testapp", description, version);
 
    KApplication k( true, true );
 
diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp
index d03be209e..8904354c5 100644
--- a/tdecore/tests/kglobaltest.cpp
+++ b/tdecore/tests/kglobaltest.cpp
@@ -54,7 +54,7 @@ void testkasciistricmp()
 int main(int argc, char *argv[])
 {
   KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, "kglobaltest", 0, 0, 0, 0 );
+  TDECmdLineArgs::init( argc, argv, "kglobaltest", 0, 0, 0, 0 );
   KApplication app( false, false );
 
   testkasciistricmp();
diff --git a/tdecore/tests/kmacroexpandertest.cpp b/tdecore/tests/kmacroexpandertest.cpp
index 0c41a309b..11fb4fd8b 100644
--- a/tdecore/tests/kmacroexpandertest.cpp
+++ b/tdecore/tests/kmacroexpandertest.cpp
@@ -51,7 +51,7 @@ protected:
 
 int main(int argc, char *argv[])
 {
-  KCmdLineArgs::init(argc, argv, ":", "", "", "");
+  TDECmdLineArgs::init(argc, argv, ":", "", "", "");
   KApplication app(false,false);
   TQString s, s2;
 
diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp
index e74d6f4b4..a6ce6431d 100644
--- a/tdecore/tests/kmdcodectest.cpp
+++ b/tdecore/tests/kmdcodectest.cpp
@@ -334,9 +334,9 @@ int main (int argc, char *argv[])
         KCmdLineLastOption
     };
 
-    KCmdLineArgs::init( argc, argv, "kmdcodectest", description, version );
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init( argc, argv, "kmdcodectest", description, version );
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
 
     KApplication app;
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index 1c2272c11..ca5afe0eb 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -411,7 +411,7 @@ int TestApp::newInstance(TQValueList<TQCString> /*params*/)
 int main(int argc, char **argv)
 {
   KAboutData about("socktest2", "SockTest", "1.0");
-  KCmdLineArgs::init(argc, argv, &about);
+  TDECmdLineArgs::init(argc, argv, &about);
   KUniqueApplication::addCmdLineOptions();
 
   /*  TestApp a;
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index fe33ec771..62fc74905 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -58,7 +58,7 @@ int
 main(int argc, char *argv[])
 {
    KAboutData about("socktest", "SockTest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDECmdLineArgs::init(argc, argv, &about);
    KApplication::addCmdLineOptions();
 
    KApplication app;
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index b1d700c8b..f696711a5 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -44,7 +44,7 @@ int
 main(int argc, char *argv[])
 {
    KAboutData about("kuniqueapptest", "kuniqueapptest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDECmdLineArgs::init(argc, argv, &about);
    KUniqueApplication::addCmdLineOptions();
 
    if (!TestApp::start())
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 563eb8937..ddfbc8f7a 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -82,7 +82,7 @@ void testAdjustPath()
 int main(int argc, char *argv[])
 {
   KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
+  TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
   KApplication app( false, false );
 
   KURL::List lst;
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index 93e6716ef..cf9717499 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -28,7 +28,7 @@ int
 main(int argc, char *argv[])
 {
    KAboutData about("kapptest", "kapptest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDECmdLineArgs::init(argc, argv, &about);
 
    KApplication a;
 
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index c9e933c51..97c545e1e 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -1,5 +1,5 @@
 /*
- testqtargs -- is there really a bug in KCmdLineArgs or am I on crack?
+ testqtargs -- is there really a bug in TDECmdLineArgs or am I on crack?
 
   I used the following compile options:
 
@@ -64,10 +64,10 @@ int main(int argc, char *argv[])
     "1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL,
     "", "", "", "");
 
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
-  KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+  TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
   for (int i = 0; i < qtargs->count(); i++)
   {
     tqDebug("qt arg[%d] = %s", i, qtargs->arg(i));
@@ -75,8 +75,8 @@ int main(int argc, char *argv[])
 
   KApplication app;
 
-  KCmdLineArgs *kdeargs = KCmdLineArgs::parsedArgs("tde");
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *kdeargs = TDECmdLineArgs::parsedArgs("tde");
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   // An arg set by Qt
   if(qtargs->isSet("background"))
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index a3ba789c5..cbf090676 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -538,7 +538,7 @@ int main_console(int argc, char **argv)
 			printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]);
 			KApplication::disableAutoDcopRegistration();
 			KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
-			KCmdLineArgs::init(&aboutd);
+			TDECmdLineArgs::init(&aboutd);
 			KApplication app(false, false);
 
 			TQStringList rds = KGlobal::dirs()->resourceDirs("icon");
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index f3c317afd..5be5e9330 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -32,12 +32,12 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-	KCmdLineArgs::init(argc,argv,"cupsdconf",
+	TDECmdLineArgs::init(argc,argv,"cupsdconf",
 			   I18N_NOOP("A CUPS configuration tool"),
 			   I18N_NOOP("A CUPS configuration tool"),"0.0.1");
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	KApplication	app;
-	KCmdLineArgs	*args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 
 	KURL	configfile;
 	if (args->count() > 0)
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 106e19e57..26a0d8e96 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -14,15 +14,15 @@ static KCmdLineOptions options[] =
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-	KCmdLineArgs::init(argc, argv, "kaddprinterwizard",
+	TDECmdLineArgs::init(argc, argv, "kaddprinterwizard",
 			I18N_NOOP("Start the add printer wizard"),
 			"0.1");
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	
 	KGlobal::locale()->setMainCatalogue("tdelibs");
 
 	KApplication app;
-	KCmdLineArgs	*args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 	bool	doConfig = args->isSet("tdeconfig");
 	bool	doSrvConfig = args->isSet("serverconfig");
 
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index cff575dad..419ad3c81 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -35,7 +35,7 @@ class KBugReportPrivate;
  * (program name, version, bug-report address, etc.)
  * comes from the KAboutData class.
  * Make sure you create an instance of KAboutData and pass it
- * to KCmdLineArgs.
+ * to TDECmdLineArgs.
  *
  * @author David Faure <faure@kde.org>
  */
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index c6302a3cc..c13d87b27 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -185,7 +185,7 @@ void KDETrayProxy::withdrawWindow( Window w )
 #include <kcmdlineargs.h>
 int main( int argc, char* argv[] )
     {
-    KCmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
+    TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
     KApplication app( false ); // no styles
     app.disableSessionManagement();
     KDETrayProxy proxy;
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 3508982fa..409476c20 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -119,7 +119,7 @@ void KLineEditTest::slotHide()
 int main ( int argc, char **argv)
 {
     KAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
     KApplication::addCmdLineOptions();
     
     KApplication a;    
diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp
index c698c66f2..41dfd0a57 100644
--- a/tdeui/tests/kpixmapregionselectordialogtest.cpp
+++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp
@@ -13,11 +13,11 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char**argv)
 {
-  KCmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0");
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0");
+  TDECmdLineArgs::addCmdLineOptions( options );
   KApplication app("test");
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->count()!=1)
   {
     std::cout << "Usage: kpixmapregionselectordialogtest <imageFile>" << std::endl;
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 32ed5c89f..0fd72851b 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -354,7 +354,7 @@ void Test::toggleLabels(bool state)
 
 int main(int argc, char** argv )
 {
-    KCmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0");
+    TDECmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0");
     KApplication app(argc, argv);
     Test *t = new Test();
 
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 02b47c2d8..b967987bf 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -502,7 +502,7 @@ void testWindow::slotMakeItem3Current()
 int main( int argc, char *argv[] )
 {
     int i;
-    KCmdLineArgs::init(argc, argv, "KWindowTest", "description", "version");
+    TDECmdLineArgs::init(argc, argv, "KWindowTest", "description", "version");
 
     KApplication *myApp = new KApplication();
     testWindow *test = new testWindow;