diff --git a/conduits/docconduit/kpalmdoc.cpp b/conduits/docconduit/kpalmdoc.cpp
index 55956cf..e2924a4 100644
--- a/conduits/docconduit/kpalmdoc.cpp
+++ b/conduits/docconduit/kpalmdoc.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 	about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"),
 		"groot@kde.org", "http://www.kpilot.org/");
 
-	KCmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::init(argc, argv, &about);
 	KApplication::addCmdLineOptions();
 
 	KApplication app;
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index 53b1345..ec78850 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -1047,10 +1047,10 @@ int main(int argc, char **argv)
 	about.addCredit("Bertjan Broeksema",
 		I18N_NOOP("VCalconduit state machine, CMake"));
 
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(kpilotoptions, "kpilot");
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(kpilotoptions, "kpilot");
 	KUniqueApplication::addCmdLineOptions();
-	KCmdLineArgs *p = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs();
 
 #ifdef DEBUG
 	KPilotConfig::getDebugLevel(p);
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index ec7bd80..513beec 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -93,7 +93,7 @@
 	return defaultDBPath;
 }
 
-/* static */ int KPilotConfig::getDebugLevel(KCmdLineArgs *p)
+/* static */ int KPilotConfig::getDebugLevel(TDECmdLineArgs *p)
 {
 	FUNCTIONSETUP;
 
diff --git a/kpilot/kpilotConfig.h b/kpilot/kpilotConfig.h
index bc15c0a..1827953 100644
--- a/kpilot/kpilotConfig.h
+++ b/kpilot/kpilotConfig.h
@@ -33,7 +33,7 @@
 
 #include "kpilotSettings.h"
 
-class KCmdLineArgs;
+class TDECmdLineArgs;
 
 
 class KPilotConfig
@@ -110,7 +110,7 @@ public:
 	* Deal with --debug options.
 	* @ret resulting debug level
 	*/
-	static int getDebugLevel(KCmdLineArgs *p);
+	static int getDebugLevel(TDECmdLineArgs *p);
 
 	/**
 	* Returns the user's preference for the system-wide
diff --git a/kpilot/main-test.cc b/kpilot/main-test.cc
index f9c9fe8..4f0aa1f 100644
--- a/kpilot/main-test.cc
+++ b/kpilot/main-test.cc
@@ -156,7 +156,7 @@ void connectStack( KPilotLink *l, ActionQueue *a, bool loop = false )
 
 
 
-int exec(const TQString &device, const TQString &what, KCmdLineArgs *p)
+int exec(const TQString &device, const TQString &what, TDECmdLineArgs *p)
 {
 	FUNCTIONSETUP;
 
@@ -181,7 +181,7 @@ int exec(const TQString &device, const TQString &what, KCmdLineArgs *p)
 	return kapp->exec();
 }
 
-int backup(const TQString &device, const TQString &what, KCmdLineArgs *p)
+int backup(const TQString &device, const TQString &what, TDECmdLineArgs *p)
 {
 	FUNCTIONSETUP;
 	KPilotLink *link = createLink( p->isSet("local") );
@@ -196,7 +196,7 @@ int backup(const TQString &device, const TQString &what, KCmdLineArgs *p)
 	return kapp->exec();
 }
 
-int restore(const TQString &device, const TQString &what, KCmdLineArgs *p)
+int restore(const TQString &device, const TQString &what, TDECmdLineArgs *p)
 {
 	FUNCTIONSETUP;
 	KPilotLink *link = createLink( p->isSet("local") );
@@ -211,7 +211,7 @@ int restore(const TQString &device, const TQString &what, KCmdLineArgs *p)
 	return kapp->exec();
 }
 
-int listDB(const TQString &device, KCmdLineArgs *p)
+int listDB(const TQString &device, TDECmdLineArgs *p)
 {
 	FUNCTIONSETUP;
 	KPilotLink *link = createLink( p->isSet("local") );
@@ -224,7 +224,7 @@ int listDB(const TQString &device, KCmdLineArgs *p)
 	return kapp->exec();
 }
 
-int check( const TQString &device, const TQString &what, KCmdLineArgs *p )
+int check( const TQString &device, const TQString &what, TDECmdLineArgs *p )
 {
 	FUNCTIONSETUP;
 
@@ -352,15 +352,15 @@ int main(int argc, char **argv)
 		I18N_NOOP("KPilot Maintainer"),
 		"groot@kde.org", "http://www.kpilot.org/");
 
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(generalOptions,
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(generalOptions,
 		I18N_NOOP("General"));
-	KCmdLineArgs::addCmdLineOptions(conduitOptions,
+	TDECmdLineArgs::addCmdLineOptions(conduitOptions,
 		I18N_NOOP("Conduit Actions"),"conduit");
 
 	KApplication::addCmdLineOptions();
 
-	KCmdLineArgs *p = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs();
 
 	bool needGUI = false;
 
@@ -387,7 +387,7 @@ int main(int argc, char **argv)
 	if ( p->isSet("check") )
 	{
 		return check( device, p->getOption("check"),
-			KCmdLineArgs::parsedArgs("conduit") );
+			TDECmdLineArgs::parsedArgs("conduit") );
 	}
 
 	if ( p->isSet("show") )
@@ -398,25 +398,25 @@ int main(int argc, char **argv)
 	if ( p->isSet("exec") )
 	{
 		return exec( device, p->getOption("exec"),
-			KCmdLineArgs::parsedArgs("conduit") );
+			TDECmdLineArgs::parsedArgs("conduit") );
 	}
 
 	if ( p->isSet("list") )
 	{
 		return listDB( device,
-			KCmdLineArgs::parsedArgs("conduit") );
+			TDECmdLineArgs::parsedArgs("conduit") );
 	}
 
 	if ( p->isSet("backup") )
 	{
 		return backup( device, p->getOption("backup"),
-			KCmdLineArgs::parsedArgs("conduit") );
+			TDECmdLineArgs::parsedArgs("conduit") );
 	}
 
 	if ( p->isSet("restore") )
 	{
 		return restore( device, p->getOption("restore"),
-			KCmdLineArgs::parsedArgs("conduit") );
+			TDECmdLineArgs::parsedArgs("conduit") );
 	}
 
 
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index 590d84d..a418534 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -1328,10 +1328,10 @@ int main(int argc, char **argv)
 	aboutData = &about;
 
 
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(daemonoptions,"kpilotconfig");
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(daemonoptions,"kpilotconfig");
 	KUniqueApplication::addCmdLineOptions();
-	KCmdLineArgs *p = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs();
 
 #ifdef DEBUG
 	KPilotConfig::getDebugLevel(p);
diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc
index d4cf8c5..24c57c5 100644
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@@ -61,12 +61,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("exportdatebook","Emport Date Book","0.1");
-	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();
 
 	debug_level= (args->isSet("verbose")) ? 4 : 0;
 
diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc
index 61cc513..f39e76c 100644
--- a/tests/importaddresses.cc
+++ b/tests/importaddresses.cc
@@ -56,13 +56,13 @@ static const KCmdLineOptions options[] =
 int main(int argc, char **argv)
 {
 	KAboutData aboutData("importaddresses","Import Address Book","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::addCmdLineOptions( options );
 
 	//  KApplication app( false, false );
 	KApplication app;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 #ifdef DEBUG
 	debug_level= (args->isSet("verbose")) ? 4 : 0;
diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc
index ebbb701..2880e06 100644
--- a/tests/importdatebook.cc
+++ b/tests/importdatebook.cc
@@ -58,12 +58,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("importdatebook","Import Date Book","0.1");
-	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();
 
 	debug_level= (args->isSet("verbose")) ? 4 : 0;
 
diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc
index 898eb8c..916588e 100644
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@@ -54,12 +54,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1");
-	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();
 
 	int debug_level= (args->isSet("verbose")) ? 4 : 0;
 
diff --git a/tests/testaddress.cc b/tests/testaddress.cc
index 9f9f44e..36ed56d 100644
--- a/tests/testaddress.cc
+++ b/tests/testaddress.cc
@@ -52,12 +52,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("testaddress","Test Addresses","0.1");
-	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();
 
 #ifdef DEBUG
 	debug_level= (args->isSet("verbose")) ? 4 : 0;
diff --git a/tests/testcategories.cc b/tests/testcategories.cc
index aefb8b9..9d09c8e 100644
--- a/tests/testcategories.cc
+++ b/tests/testcategories.cc
@@ -157,12 +157,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("testcategories","Test Categories","0.1");
-	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();
 
 #ifdef DEBUG
 	debug_level= (args->isSet("verbose")) ? 4 : 0;
diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc
index 02b43c6..36dce8f 100644
--- a/tests/testdatabase.cc
+++ b/tests/testdatabase.cc
@@ -256,12 +256,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("testdatabase","Test Databases","0.1");
-	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();
 
 	Q_UNUSED(args)
 
diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc
index 5cc0b7d..137dd5f 100644
--- a/tests/testdatebook.cc
+++ b/tests/testdatebook.cc
@@ -52,12 +52,12 @@ int main(int argc, char **argv)
 	KApplication::disableAutoDcopRegistration();
 
 	KAboutData aboutData("testdatebook","Test Date Book","0.1");
-	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();
 
 #ifdef DEBUG
 	debug_level= (args->isSet("verbose")) ? 4 : 0;
diff --git a/tests/testidmapper.cc b/tests/testidmapper.cc
index 8d60afc..f25e6db 100644
--- a/tests/testidmapper.cc
+++ b/tests/testidmapper.cc
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
 {
 	KApplication::disableAutoDcopRegistration();
 	KAboutData aboutData("testidmapper","Test IDMapper","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::init(argc,argv,&aboutData);
 
 	KApplication app( false, false );