Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

94 files changed, 199 insertions, 199 deletions

diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 7d88c3d1f..f66a53d9b 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -59,11 +59,11 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
 int main( int argc, char **argv )
 {
 	KAboutData aboutData( "testlibrss", "testlibrss", "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->count() != 1 ) args->usage();
 
 	Tester tester;
diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp
index bfbb942f4..797188cc6 100644
--- a/akregator/src/main.cpp
+++ b/akregator/src/main.cpp
@@ -53,7 +53,7 @@ int Application::newInstance()
   {
     DCOPRef akr("akregator", "AkregatorIface");
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if ( !mMainWindow ) {
       mMainWindow = new Akregator::MainWindow();
@@ -88,8 +88,8 @@ int Application::newInstance()
 int main(int argc, char **argv)
 {
     Akregator::AboutData about;
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( Akregator::akregator_options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( Akregator::akregator_options );
     KUniqueApplication::addCmdLineOptions();
 
     Akregator::Application app;
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp
index cbd0dd178..e05345330 100644
--- a/certmanager/kwatchgnupg/main.cpp
+++ b/certmanager/kwatchgnupg/main.cpp
@@ -78,11 +78,11 @@ int main( int argc, char** argv )
 {
   AboutData aboutData;
 
-  KCmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
   static const KCmdLineOptions options[] = {
 	KCmdLineLastOption// End of options.
   };
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KWatchGnuPGApplication::addCmdLineOptions();
 
 #if 0
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index f3c27d0ce..8eb998915 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -43,7 +43,7 @@ using namespace std;
 int main( int argc, char** argv ) {
 
   KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app( false, false );
 
   Kleo::CryptoConfig * config = new QGpgMECryptoConfig();
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index c65afffc4..c1ac90b96 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -120,7 +120,7 @@ int main( int argc, char** argv ) {
     return 1;
   }
   KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
-  KCmdLineArgs::init( &aboutData );
+  TDECmdLineArgs::init( &aboutData );
   KApplication app;
 
   Kleo::GnuPGProcessBase gpg;
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index 95b8dcc97..ba07792f8 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -101,7 +101,7 @@ int main( int argc, char** argv ) {
     argc = 1; // hide from KDE
   }
   KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app;
 
   testSign();
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 7e3fa8876..a17404fa3 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -147,7 +147,7 @@ int main( int argc, char** argv ) {
     argc = 1; // hide from KDE
   }
   KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app;
 
   KeyGenerator * keygen = new KeyGenerator( 0, "KeyGenerator top-level" );
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 363ec26a9..1947d1d66 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -131,7 +131,7 @@ void CertListView::slotStart() {
 int main( int argc, char** argv ) {
 
   KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app;
 
   CertListView * clv = new CertListView( 0, "CertListView top-level" );
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index f4c574da5..1af2184a1 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -45,7 +45,7 @@
 
 int main( int argc, char ** argv ) {
   KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app;
 
   KGlobal::iconLoader()->addAppDir( "libkleopatra" );
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 4edd8c7f2..15eacfec7 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -54,7 +54,7 @@ int main( int argc, char **argv )
   setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1);
 
   KAboutData aboutData( "test_verify", "verify job test", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
   KApplication app( false, false );
 
   const TQString sigFileName = TDESRCDIR "/test.data.sig";
diff --git a/certmanager/main.cpp b/certmanager/main.cpp
index 85f989007..4db304c24 100644
--- a/certmanager/main.cpp
+++ b/certmanager/main.cpp
@@ -50,18 +50,18 @@ int main( int argc, char** argv )
 {
   AboutData aboutData;
 
-  KCmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
   static const KCmdLineOptions options[] = {
             { "external" , I18N_NOOP("Search for external certificates initially"), 0 },
             { "query " , I18N_NOOP("Initial query string"), 0 },
 	    { "import-certificate ", I18N_NOOP("Name of certificate file to import"), 0 },
 	    KCmdLineLastOption// End of options.
   };
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   KGlobal::locale()->insertCatalogue( "libkleopatra" );
   KGlobal::iconLoader()->addAppDir( "libkleopatra" );
diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index 737ca55a1..9f35c359b 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -9,7 +9,7 @@
 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;
 
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index 9ca34586d..4a406a393 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -44,12 +44,12 @@ static KCmdLineOptions k2moptions[] =
 int main( int argc, char **argv )
 {
   KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, appName, programName, description, version );
-  KCmdLineArgs::addCmdLineOptions( k2moptions );
+  TDECmdLineArgs::init( argc, argv, appName, programName, description, version );
+  TDECmdLineArgs::addCmdLineOptions( k2moptions );
 
   KApplication app( false, false );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   KABC2Mutt *object = new KABC2Mutt( 0 );
 
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index fa7143ee7..33dcd9156 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -75,12 +75,12 @@ int main( int argc, char **argv )
   KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
   aboutData.addAuthor( "Tobias Koenig", 0, "[email protected]" );
 
-  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->isSet( "disable-autostart" ) ) {
     kdDebug() << "Disable autostart." << endl;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 906c641ce..43f5e5bcd 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1566,7 +1566,7 @@ void KABCore::slotContactsUpdated()
 
 bool KABCore::handleCommandLine( KAddressBookIface* iface )
 {
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQCString addrStr = args->getOption( "addr" );
   TQCString uidStr = args->getOption( "uid" );
 
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index 3c57e61d2..0ff8da8c2 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -63,7 +63,7 @@ int KAddressBookApp::newInstance()
       mMainWin->restore( 1 );
     }
   } else {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if ( args->isSet( "editor-only" ) ) {
         if ( !mMainWin ) {
@@ -113,8 +113,8 @@ int main( int argc, char *argv[] )
 {
   KLocale::setMainCatalogue( "kaddressbook" );
 
-  KCmdLineArgs::init( argc, argv, KABCore::createAboutData() );
-  KCmdLineArgs::addCmdLineOptions( kaddressbook_options );
+  TDECmdLineArgs::init( argc, argv, KABCore::createAboutData() );
+  TDECmdLineArgs::addCmdLineOptions( kaddressbook_options );
   KUniqueApplication::addCmdLineOptions();
 
   if ( !KAddressBookApp::start() )
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 658919a63..3792a580f 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -262,7 +262,7 @@ int KAlarmApp::newInstance()
 	if (!firstInstance || !isRestored())
 	{
 		TQString usage;
-		KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
 		// Use a 'do' loop which is executed only once to allow easy error exits.
 		// Errors use 'break' to skip to the end of the function.
diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp
index 77f31e4f0..d4613b0bd 100644
--- a/kalarm/kalarmd/adapp.cpp
+++ b/kalarm/kalarmd/adapp.cpp
@@ -60,7 +60,7 @@ int AlarmDaemonApp::newInstance()
 		restored = true;       // make sure we restore only once
 	else
 	{
-		KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 		autostart = args->isSet("autostart");
 		args->clear();      // free up memory
 	}
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index c0a7792f1..282f368b4 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -47,8 +47,8 @@ int main(int argc, char** argv)
 	aboutData.addAuthor("Cornelius Schumacher", I18N_NOOP("Author"), "[email protected]");
 	aboutData.addAuthor("Preston Brown", I18N_NOOP("Original Author"), "[email protected]");
 
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	KUniqueApplication::addCmdLineOptions();
 	KStartupInfo::disableAutoAppStartedSending();
 
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index 8851df614..038a3ab75 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
 		"Copyright 2001-2007, David Jarvie", 0, "http://www.astrojar.org.uk/kalarm");
 	aboutData.addAuthor("David Jarvie", 0, "[email protected]");
 
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	KUniqueApplication::addCmdLineOptions();
 
 	if (!KAlarmApp::start())
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index d323379c9..b3f6aa82e 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -92,11 +92,11 @@ int main(int argc, char **argv)
                    "http://kandy.kde.org/");
   about.addAuthor( "Cornelius Schumacher", 0, "[email protected]" );
   about.addAuthor( "Heiko Falk", 0, "[email protected]" );
-  KCmdLineArgs::init(argc,argv,&about);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs::init(argc,argv,&about);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
   KApplication app;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   // register ourselves as a dcop client
   app.dcopClient()->registerAs(app.name(),false);
diff --git a/karm/main.cpp b/karm/main.cpp
index bc8183bb8..e8ebc7e1c 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -47,11 +47,11 @@ int main( int argc, char *argv[] )
   aboutData.addAuthor( "Tomas Pospisek",    0, "[email protected]" );
   aboutData.addAuthor( "Willi Richert",     0, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KApplication myApp;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   MainWindow *mainWindow;
   if ( args->count() > 0 ) 
@@ -68,7 +68,7 @@ int main( int argc, char *argv[] )
     }
     else
     {
-      icsfile = KCmdLineArgs::cwd() + "/" + icsfile;
+      icsfile = TDECmdLineArgs::cwd() + "/" + icsfile;
     }
     mainWindow = new MainWindow( icsfile );
   }
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 7a1d6ad53..6f9cd1834 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -138,7 +138,7 @@ int main( int argc, char *argv[] )
   // Copied from Till's test in libkcal.  Not sure what this is for.
   KApplication::disableAutoDcopRegistration();
 
-  KCmdLineArgs::init(argc,argv,"testresourcelocking", 0, 0, 0, 0);
+  TDECmdLineArgs::init(argc,argv,"testresourcelocking", 0, 0, 0, 0);
 
   KApplication app( false, false );
 
diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp
index e93ad26e7..95a25a8b6 100644
--- a/kitchensync/src/main.cpp
+++ b/kitchensync/src/main.cpp
@@ -36,8 +36,8 @@ int main( int argc, char **argv )
 {
   KAboutData *about = MainWidget::aboutData();
 
-  KCmdLineArgs::init( argc, argv, about );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, about );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
 
   KUniqueApplication::addCmdLineOptions();
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index 9887dc985..0e5b14d80 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -17,7 +17,7 @@ int main(int argc,char **argv)
 
   KAboutData aboutData( "testKMailDCOP",
    "Test for KMail DCOP interface", "0.0" );
-  KCmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
   KApplication app;
   app.dcopClient()->attach();
 
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 2e204ab5c..2bcf6c2ab 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -206,7 +206,7 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
   bool calledWithSession = false; // for ignoring '-session foo'
 
   // process args:
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (!args->getOption("subject").isNull())
   {
      subj = TQString::fromLocal8Bit(args->getOption("subject"));
diff --git a/kmail/main.cpp b/kmail/main.cpp
index ae2d5a06f..e76b303f6 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -73,8 +73,8 @@ int main(int argc, char *argv[])
 
   KMail::AboutData about;
 
-  KCmdLineArgs::init(argc, argv, &about);
-  KCmdLineArgs::addCmdLineOptions( kmail_options ); // Add kmail options
+  TDECmdLineArgs::init(argc, argv, &about);
+  TDECmdLineArgs::addCmdLineOptions( kmail_options ); // Add kmail options
   if (!KMailApplication::start())
      return 0;
 
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 5d8b02ee3..e347fe5cf 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -92,7 +92,7 @@ int main( int argc, char **argv )
 {
   KAboutData aboutData( "testrecipienteditor",
    "Test Recipient Editor", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp
index 87ab0c819..9121acfaa 100644
--- a/kmailcvt/main.cpp
+++ b/kmailcvt/main.cpp
@@ -38,8 +38,8 @@ int main(int argc, char *argv[])
   aboutData.addAuthor("Laurence Anderson", I18N_NOOP("New GUI & cleanups"), "[email protected]");
   aboutData.addCredit("Daniel Molkentin", I18N_NOOP("New GUI & cleanups"), "[email protected]");
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
   KApplication a;
   KMailCVT *kmailcvt = new KMailCVT();
diff --git a/kmobile/main.cpp b/kmobile/main.cpp
index d494baf9e..be36a08c9 100644
--- a/kmobile/main.cpp
+++ b/kmobile/main.cpp
@@ -40,14 +40,14 @@ int main(int argc, char **argv)
     KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
                      KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "[email protected]");
     about.addAuthor( "Helge Deller", 0, "[email protected]" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KUniqueApplication app;
 
     // register ourselves as a dcop client
     app.dcopClient()->registerAs(app.name(), false);
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // see if we are starting with session management
     if (app.isRestored())
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 701bee288..5b43de69d 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -2199,7 +2199,7 @@ void KNMainWidget::editArticle()
 bool KNMainWidget::handleCommandLine()
 {
   bool doneSomething = false;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->count()>0) {
     KURL url=args->url(0);    // we take only one URL
     openURL(url);
diff --git a/knode/main.cpp b/knode/main.cpp
index dd84d8f8c..e433b5439 100644
--- a/knode/main.cpp
+++ b/knode/main.cpp
@@ -29,8 +29,8 @@ int main(int argc, char* argv[])
 {
   AboutData aboutData;
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( knode_options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( knode_options );
   KUniqueApplication::addCmdLineOptions();
 
   if (!KNApplication::start())
diff --git a/knotes/main.cpp b/knotes/main.cpp
index 92de2630c..f1f78c5b3 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -117,7 +117,7 @@ int main( int argc, char* argv[] )
     aboutData.addCredit("Harri Porten", 0, "[email protected]");
     aboutData.addCredit("Espen Sand", 0, "[email protected]");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
 
     KUniqueApplication::addCmdLineOptions();
 
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 3dd7b5780..081bba5f1 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -121,7 +121,7 @@ void addPropertyVariable( TQString &out, const TQString &type,
 }
 
 // FIXME: Put addProperty in PropertyAdder class and add endReadAhead function.
-int addProperty( KCmdLineArgs *args )
+int addProperty( TDECmdLineArgs *args )
 {
   if ( args->count() != 3 ) {
     std::cerr << "Usage: kode --add-property <class> <proprerty-type> "
@@ -291,7 +291,7 @@ int addProperty( KCmdLineArgs *args )
   return 0;
 }
 
-int codify( KCmdLineArgs *args )
+int codify( TDECmdLineArgs *args )
 {
   if ( args->count() != 1 ) {
     std::cerr << "Usage: kode --codify <sourcecodefile>" << std::endl;
@@ -320,7 +320,7 @@ int codify( KCmdLineArgs *args )
   return 0;
 }
 
-int create( KCmdLineArgs *args )
+int create( TDECmdLineArgs *args )
 {
   KODE::Printer p;
   if ( args->isSet( "warning" ) ) p.setCreationWarning( true );
@@ -416,12 +416,12 @@ int create( KCmdLineArgs *args )
 
     code.clear();
     code += "KAboutData aboutData(\"test\",\"Test\",\"0.1\");";
-    code += "KCmdLineArgs::init(argc,argv,&aboutData);";
-    code += "KCmdLineArgs::addCmdLineOptions( options );";
+    code += "TDECmdLineArgs::init(argc,argv,&aboutData);";
+    code += "TDECmdLineArgs::addCmdLineOptions( options );";
     code += "";
     code += "KApplication app;";
     code += "";
-    code += "KCmdLineArgs *args = KCmdLineArgs::parsedArgs();";
+    code += "TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();";
     code += "";
     code += "Q_UNUSED( args );";
     main.setBody( code );
@@ -612,12 +612,12 @@ int main(int argc,char **argv)
   KAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" );
 
-  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( "create-class" ) || args->isSet( "create-dialog" ) ||
        args->isSet( "create-kioslave" ) || args->isSet( "create-main" ) ) {
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 2b7f3d679..155a10b01 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -43,10 +43,10 @@ int main( int argc, char **argv )
 
   aboutData.addAuthor( "Tobias Koenig", 0, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() == 0 ) {
     kdError() << "No WSDL file given." << endl;
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index f1bd1c378..697465902 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -49,10 +49,10 @@ int main( int argc, char **argv )
 
   aboutData.addAuthor( "Tobias Koenig", 0, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() < 1 || args->count() > 1 ) {
     tqDebug( "Invalid arguments, try --help." );
diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cc
index 5d874a904..19f6ba3f4 100644
--- a/kode/kwsdl/tests/google/main.cc
+++ b/kode/kwsdl/tests/google/main.cc
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", KAboutData::License_GPL );
   aboutData.addAuthor( "Tobias Koenig", 0, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app( false, false );
 
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index fbf25ec11..89be13aac 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -61,12 +61,12 @@ int main( int argc, char **argv )
   	I18N_NOOP("TDE XML Compiler") , KAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" );
 
-  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() < 1 ) {
     kdError() << "Too few arguments." << endl;
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 02aa5b6e2..60b45dde3 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -193,15 +193,15 @@ int main( int argc, char *argv[] )
     );
 
   //TODO: KDE 4.0, add the StdCmdLineArgs option to init()
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
   KApplication app(
     false, //do not allowstyles - disable the loading on plugin based styles
     false  //GUI is not enabled - disable all GUI stuff
     );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   // Default values for start date/time (today at 07:00)
   TQDate startdate = TQDate::currentDate();
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 2dfd1daef..38ae51b3b 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -96,12 +96,12 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
   if ( fun == "newInstance()" ) {
     replyType = "int";
 
-    KCmdLineArgs::reset(); // forget options defined by other "applications"
+    TDECmdLineArgs::reset(); // forget options defined by other "applications"
     loadCommandLineOptions(); // implemented by plugin
 
     // This bit is duplicated from KUniqueApplication::processDelayed()
     TQDataStream ds( data, IO_ReadOnly );
-    KCmdLineArgs::loadAppArgs( ds );
+    TDECmdLineArgs::loadAppArgs( ds );
     if ( !ds.atEnd() ) { // backwards compatibility
       TQCString asn_id;
       ds >> asn_id;
@@ -114,7 +114,7 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
     // OK, we're done, reload the initial kontact command line options,
     // so that "kontact --module foo" keeps working (#103775).
 
-    KCmdLineArgs::reset(); // forget options defined above
+    TDECmdLineArgs::reset(); // forget options defined above
     loadKontactCommandLineOptions();
 
   } else if ( fun == "load()" ) {
@@ -195,7 +195,7 @@ static KCmdLineOptions options[] =
 
 void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
 {
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
   KApplication::addCmdLineOptions();
 }
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 37b85be08..dae73e4b3 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -133,7 +133,7 @@ void Plugin::saveProperties( KConfig *config )
 
 void UniqueAppHandler::loadCommandLineOptions()
 {
-    KCmdLineArgs::addCmdLineOptions( akregator_options );
+    TDECmdLineArgs::addCmdLineOptions( akregator_options );
 }
 
 int UniqueAppHandler::newInstance()
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 88a975b70..eec792750 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -193,7 +193,7 @@ void KAddressbookPlugin::saveToProfile( const TQString& directory ) const
 
 void KABUniqueAppHandler::loadCommandLineOptions()
 {
-    KCmdLineArgs::addCmdLineOptions( kaddressbook_options );
+    TDECmdLineArgs::addCmdLineOptions( kaddressbook_options );
 }
 
 int KABUniqueAppHandler::newInstance()
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 266823ff7..30026936f 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -184,7 +184,7 @@ Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent )
 #include "../../../kmail/kmail_options.h"
 void KMailUniqueAppHandler::loadCommandLineOptions()
 {
-    KCmdLineArgs::addCmdLineOptions( kmail_options );
+    TDECmdLineArgs::addCmdLineOptions( kmail_options );
 }
 
 int KMailUniqueAppHandler::newInstance()
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 365e30d09..8046288f8 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -97,7 +97,7 @@ KParts::ReadOnlyPart* KNodePlugin::createPart()
 #include "../../../knode/knode_options.h"
 void KNodeUniqueAppHandler::loadCommandLineOptions()
 {
-    KCmdLineArgs::addCmdLineOptions( knode_options );
+    TDECmdLineArgs::addCmdLineOptions( knode_options );
 }
 
 int KNodeUniqueAppHandler::newInstance()
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index 3ece77c45..9a1f3fc49 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -30,7 +30,7 @@
 
 void KOrganizerUniqueAppHandler::loadCommandLineOptions()
 {
-  KCmdLineArgs::addCmdLineOptions( korganizer_options );
+  TDECmdLineArgs::addCmdLineOptions( korganizer_options );
 }
 
 int KOrganizerUniqueAppHandler::newInstance()
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 99fff1538..54a586226 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -98,7 +98,7 @@ static void listProfiles()
 
 int KontactApp::newInstance()
 {
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQString moduleName;
   if ( Kontact::Prefs::self()->forceStartupPlugin() ) {
     moduleName = Kontact::Prefs::self()->forcedStartupPlugin();
@@ -156,10 +156,10 @@ int main( int argc, char **argv )
   about.addAuthor( "Zack Rusin", 0, "[email protected]" );
   about.addAuthor( "Matthias Hoelzer-Kluepfel", I18N_NOOP("Original Author"), "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &about );
+  TDECmdLineArgs::init( argc, argv, &about );
   Kontact::UniqueAppHandler::loadKontactCommandLineOptions();
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if ( args->isSet( "list" ) ) {
     listPlugins();
     return 0;
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 10a791a95..52e47d57b 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -2094,7 +2094,7 @@ void ActionManager::saveToProfile( const TQString & path ) const
 
 bool ActionManager::handleCommandLine()
 {
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   KOrg::MainWindow *mainWindow = ActionManager::findInstance( KURL() );
 
   bool ret = true;
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index e20c42db1..eed2cd2cf 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -80,7 +80,7 @@ int KOrganizerApp::newInstance()
   }
   first = false;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   KOGlobals::self()->alarmClient()->startDaemon();
 
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 6df1f0e16..95a728ded 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -72,8 +72,8 @@ int main( int argc, char **argv )
   aboutData.addAuthor( "Reinhold Kainhofer", I18N_NOOP("Maintainer"),
                        "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
 
   if ( !MyApp::start() ) exit( 0 );
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index cd3f434f4..73d512d9a 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -37,7 +37,7 @@
 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;
 
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 84e4f2ef8..0763fdbb0 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -35,7 +35,7 @@
 int main(int argc,char **argv)
 {
   KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
   
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 991824385..3f3357752 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -39,8 +39,8 @@ int main ( int argc, char **argv )
 {
   KOrg::AboutData aboutData;
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( korganizer_options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( korganizer_options );
   KUniqueApplication::addCmdLineOptions();
 
   if ( !KOrganizerApp::start() ) return 0;
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 3b751b6ab..66d0f2aea 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -37,7 +37,7 @@
 int main(int argc,char **argv)
 {
   KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
diff --git a/korn/main.cpp b/korn/main.cpp
index b434c6f82..32eed7517 100644
--- a/korn/main.cpp
+++ b/korn/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 	aboutData.addAuthor("Preview by Heiner Eichmann",0, "[email protected]");
 	aboutData.addAuthor("Mart Kelder",0,"[email protected]");
 	
-	KCmdLineArgs::init( argc, argv, &aboutData );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
 	KUniqueApplication::addCmdLineOptions();
 	
 	if( !KUniqueApplication::start()  ) {
diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index f30ec2700..1ce299980 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -72,12 +72,12 @@ int main( int argc, char **argv )
   KAboutData aboutData( "benchmarkfeaturelist",
                         "Benchmark for feature list XML parser",
                         "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();
 
   if ( args->count() != 1 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index 08f6fdf0a..19e9a3fb2 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -71,12 +71,12 @@ int main( int argc, char **argv )
 {
   KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
                         "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();
 
   if ( args->count() != 1 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp
index caa56e5b5..036ed5e79 100644
--- a/kresources/groupwise/soap/soapdebug.cpp
+++ b/kresources/groupwise/soap/soapdebug.cpp
@@ -49,12 +49,12 @@ int main( int argc, char **argv )
   KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" );
 
-  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 user = args->getOption( "user" );
   TQString pass = args->getOption( "password" );
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index c5631f78c..208fd3523 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -51,11 +51,11 @@ int kdemain( int argc, char **argv )
   putenv( strdup( "SESSION_MANAGER=" ) );
   KApplication::disableAutoDcopRegistration();
 
-  KCmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, "kio_scalix", 0, 0, 0, 0 );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KApplication app( false, false );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   Scalix slave( args->arg( 0 ), args->arg( 1 ), args->arg( 2 ) );
   slave.dispatchLoop();
 
diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp
index d27399210..133da8ec7 100644
--- a/kresources/scalix/scalixadmin/main.cpp
+++ b/kresources/scalix/scalixadmin/main.cpp
@@ -37,8 +37,8 @@ int main( int argc, char **argv )
   KAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description,
                         KAboutData::License_GPL, "(c) 2007, Tobias Koenig" );
   aboutData.addAuthor( "Tobias Koenig",0, "[email protected]" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp
index 2884703d8..55011f2fe 100644
--- a/kresources/slox/testsloxaccounts.cpp
+++ b/kresources/slox/testsloxaccounts.cpp
@@ -38,12 +38,12 @@ int main(int argc,char **argv)
   KAboutData aboutData( "textsloxaccounts",
                         "SUSE LINUX Openexchange Server Configuration Wizard",
                         "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();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp
index 0ba04cc1b..27ad32a2d 100644
--- a/ktnef/gui/main.cpp
+++ b/ktnef/gui/main.cpp
@@ -40,8 +40,8 @@ int main(int argc, char *argv[])
     "1.0", description, KAboutData::License_GPL,
     "(c) 2000, Michael Goffioul");
   aboutData.addAuthor("Michael Goffioul",0, "[email protected]");
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
   KApplication::addCmdLineOptions();
 
   KApplication a;
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
   a.setMainWidget(tnef);
   tnef->show();
 
-  KCmdLineArgs	*args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
   if (args->count() > 0)
     tnef->loadFile(args->arg(0));
 
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index c7205ab86..4976764b1 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -162,7 +162,7 @@ static bool checkQuoteIfNecessary( const TQString& input, const TQString& expRes
 int main(int argc, char *argv[])
 {
   KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, "testemail", 0, 0, 0, 0 );
+  TDECmdLineArgs::init( argc, argv, "testemail", 0, 0, 0, 0 );
   KApplication app( false, false );
 
   // Empty input
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index 0e4b4352c..b1af7f8c2 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -53,12 +53,12 @@ int main(int argc,char **argv)
   KAboutData aboutData("convertqtopia",I18N_NOOP("TQtopia calendar file converter"),"0.1");
   aboutData.addAuthor("Cornelius Schumacher", 0, "[email protected]");
 
-  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 sourceTQtopia = false;
   bool sourceIcalendar = false;
@@ -72,16 +72,16 @@ int main(int argc,char **argv)
   }
 
   if ( sourceTQtopia && sourceIcalendar ) {
-    KCmdLineArgs::usage(
+    TDECmdLineArgs::usage(
         i18n("Please specify only one of the conversion options.") );
   }
   if ( !sourceTQtopia && !sourceIcalendar ) {
-    KCmdLineArgs::usage(
+    TDECmdLineArgs::usage(
         i18n("You have to specify one conversion option.") );
   }
 
   if ( args->count() != 1 ) {
-    KCmdLineArgs::usage( i18n("Error: No input file.") );
+    TDECmdLineArgs::usage( i18n("Error: No input file.") );
   }
 
   TQString inputFile = args->arg( 0 );
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 076f55cbf..1f53a450d 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -47,12 +47,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "readandwrite", "Read and Write Calendar", "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();
 
   if ( args->count() != 2 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index 7d781fc54..e6eb6973b 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -38,13 +38,13 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testcalendar","Test Calendar","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();
 
   Q_UNUSED( args );
 
diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp
index 5c5130450..65004d34f 100644
--- a/libkcal/tests/testcalselectdialog.cpp
+++ b/libkcal/tests/testcalselectdialog.cpp
@@ -27,7 +27,7 @@ using namespace KCal;
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "testcalselectdialog", 0,
+  TDECmdLineArgs::init( argc, argv, "testcalselectdialog", 0,
                       "KCalSelectDialogTest", "1.0",
                       "kcalselectedialog test app" );
   KApplication app;
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index 6e63faa98..e24baec54 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -40,13 +40,13 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testfields","Test calendar fields read/write","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();
 
   Q_UNUSED(args)
 
diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp
index 9f84cc28c..c6a5ef572 100644
--- a/libkcal/tests/testincidence.cpp
+++ b/libkcal/tests/testincidence.cpp
@@ -40,12 +40,12 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testincidence","Test Incidence","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();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index 4fc87b9ea..3d2216b7e 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -50,12 +50,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "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();
 
   if ( args->count() < 1 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index 6499abfc0..14d470cf3 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -50,12 +50,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "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();
 
   if ( args->count() < 1 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index 6499abfc0..14d470cf3 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -50,12 +50,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "testrecurrencenew", "Load recurrence rules with the new class and print out debug messages", "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();
 
   if ( args->count() < 1 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index e8e33e2b4..cd5edf76b 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -50,12 +50,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "testrecurson", "Tests all dates from 2002 to 2010 to test if the event recurs on each individual date. This is meant to test the Recurrence::recursOn method for errors.", "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();
 
   if ( args->count() < 1 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index bab2cf017..6fc8fc2a4 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -60,11 +60,11 @@ int main(int argc, char *argv[])
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0);
+    TDECmdLineArgs::addCmdLineOptions( options );
  
     KApplication app;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     TQString type = TQString();
     if ( args->getOption( "resource" ) )
       type = TQString::fromLocal8Bit( args->getOption( "resource" ) );
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index 7f8b61c09..16a15afaf 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -51,12 +51,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
   KAboutData aboutData("testvcalexport", "Part of LibKCal's test suite. Checks if export to vCalendar still works correctly.", "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();
 
   if ( args->count() != 2 ) {
     args->usage( "Wrong number of arguments." );
diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index 45617e6f6..85ce92ed7 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/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, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index 4f818e900..bb3bd3947 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -37,7 +37,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 4a33a2f13..2d394a228 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -39,12 +39,12 @@ static const KCmdLineOptions options[] =
 int main( int argc, char** argv )
 {
     KAboutData aboutData( "tests","Test","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();
     Q_UNUSED( args );
 
     TestFactory t;
diff --git a/libtdepim/komposer/core/tests/testkomposer.cpp b/libtdepim/komposer/core/tests/testkomposer.cpp
index b7997e8c3..31462a7e3 100644
--- a/libtdepim/komposer/core/tests/testkomposer.cpp
+++ b/libtdepim/komposer/core/tests/testkomposer.cpp
@@ -7,7 +7,7 @@
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
+  TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
   KApplication app;
 
   Komposer::Core *core = new Komposer::Core();
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index 0fcba16b9..a9b06171d 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -44,7 +44,7 @@ void TestManager::slotPluginLoaded( Plugin *plugin )
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
+  TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
   KApplication app;
 
   TestManager manager( &app );
diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp
index 62e95e100..c6cf91518 100644
--- a/libtdepim/komposer/test/test.cpp
+++ b/libtdepim/komposer/test/test.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
                     KAboutData::License_GPL, "(C) 2001-2003 The Kontact developers", 0, "http://kontact.kde.org", "[email protected]" );
   about.addAuthor( "Zack Rusin", 0, "[email protected]" );
 
-  KCmdLineArgs::init( argc, argv, &about );
+  TDECmdLineArgs::init( argc, argv, &about );
   KUniqueApplication app;
 
   // see if we are starting with session management
diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index 12eb3c6b1..201a1128d 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -30,7 +30,7 @@
 int main(int argc, char* argv[])
 {
   KAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index 6b910e4b9..7f1ae17d4 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -31,7 +31,7 @@
 int main( int argc, char **argv )
 {
   KAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 4da2bb823..97f8408ab 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -54,7 +54,7 @@ void DateEdit::dateChanged( const TQDate &date )
 int main(int argc,char **argv)
 {
   KAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
   KApplication app;
 
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index 99edc235c..ae27b0547 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0);
+    TDECmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0);
     KApplication app( false, false );
 
     TestDistrList test;
diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp
index 1204f8dc2..eea14019e 100644
--- a/libtdepim/tests/testkincidencechooser.cpp
+++ b/libtdepim/tests/testkincidencechooser.cpp
@@ -29,7 +29,7 @@ using namespace KPIM;
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "testkincidencechooser", 0,
+  TDECmdLineArgs::init( argc, argv, "testkincidencechooser", 0,
                       "KIncidenceChooserTest", "1.0",
                       "kincidencechooser test app" );
   KApplication app;
diff --git a/libtdepim/tests/testlinklocator.cpp b/libtdepim/tests/testlinklocator.cpp
index 548f61a9b..1744904dd 100644
--- a/libtdepim/tests/testlinklocator.cpp
+++ b/libtdepim/tests/testlinklocator.cpp
@@ -60,7 +60,7 @@ static bool checkGetEmailAddress( const TQString & input,
 int main(int argc, char *argv[])
 {
   KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, "testlinklocator", 0, 0, 0, 0 );
+  TDECmdLineArgs::init( argc, argv, "testlinklocator", 0, 0, 0, 0 );
   KApplication app( false, false );
 
   // empty input
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index d9c9d806c..236636995 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -84,12 +84,12 @@ static const KCmdLineOptions options[] =
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testwizard","Test KConfigWizard","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();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp
index e45624445..010a87edb 100644
--- a/wizards/egroupwaremain.cpp
+++ b/wizards/egroupwaremain.cpp
@@ -39,14 +39,14 @@ int main(int argc,char **argv)
   KAboutData aboutData( "egroupwarewizard",
                         "eGroupware Server Configuration Wizard",
                         "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp
index 34c4988ba..eb5393293 100644
--- a/wizards/exchangemain.cpp
+++ b/wizards/exchangemain.cpp
@@ -39,14 +39,14 @@ int main(int argc,char **argv)
   KAboutData aboutData( "exchangewizard",
                         I18N_NOOP( "Microsoft Exchange Server Configuration Wizard" ),
                         "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp
index 83a7cbf58..301972c64 100644
--- a/wizards/groupwisemain.cpp
+++ b/wizards/groupwisemain.cpp
@@ -40,14 +40,14 @@ int main(int argc,char **argv)
   KAboutData aboutData( "groupwisewizard",
                         I18N_NOOP( "Novell GroupWise Configuration Wizard" ),
                         "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp
index ecb6a6073..a09cb0053 100644
--- a/wizards/kolabmain.cpp
+++ b/wizards/kolabmain.cpp
@@ -39,14 +39,14 @@ int main(int argc,char **argv)
   KLocale::setMainCatalogue( "tdepimwizards" );
 
   KAboutData aboutData( "kolabwizard", I18N_NOOP( "Kolab Configuration Wizard" ), "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/wizards/main.cpp b/wizards/main.cpp
index e914a749c..811878c8e 100644
--- a/wizards/main.cpp
+++ b/wizards/main.cpp
@@ -18,14 +18,14 @@ int main( int argc, char **argv )
 
   KAboutData aboutData( "groupwarewizard",
                         I18N_NOOP( "TDE-PIM Groupware Configuration Wizard" ), "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   TQString serverType;
   if ( args->isSet( "serverType" ) )
diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp
index 89e40d3ab..7afbb7824 100644
--- a/wizards/scalixmain.cpp
+++ b/wizards/scalixmain.cpp
@@ -39,14 +39,14 @@ int main(int argc,char **argv)
   KLocale::setMainCatalogue( "tdepimwizards" );
 
   KAboutData aboutData( "scalixwizard", I18N_NOOP( "Scalix Configuration Wizard" ), "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;
diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp
index c17cced10..52fac9777 100644
--- a/wizards/sloxmain.cpp
+++ b/wizards/sloxmain.cpp
@@ -39,14 +39,14 @@ int main(int argc,char **argv)
   KAboutData aboutData( "sloxwizard",
                         I18N_NOOP( "SUSE LINUX Openexchange Server Configuration Wizard" ),
                         "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
   KApplication app;
 
   KGlobal::locale()->insertCatalogue( "libtdepim" );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool verbose = false;
   if ( args->isSet( "verbose" ) ) verbose = true;