Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

10 files changed, 110 insertions, 110 deletions

diff --git a/dcoppython/test/dcopserver/main.cpp b/dcoppython/test/dcopserver/main.cpp
index dea6a30e..3a40016e 100644
--- a/dcoppython/test/dcopserver/main.cpp
+++ b/dcoppython/test/dcopserver/main.cpp
@@ -24,8 +24,8 @@ int main(int argc, char **argv)
     KAboutData about("kdedcoptest", I18N_NOOP("TDEDcopTest"), version, description,
                      KAboutData::License_GPL, "(C) 2003 Julian Rockey", 0, 0, "[email protected]");
     about.addAuthor( "Julian Rockey", 0, "[email protected]" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     KDEDcopTest *mainWin = 0;
 
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         // TODO: do something with the command line args here
 
diff --git a/kdejava/koala/kdejava/KCmdLineArgs.cpp b/kdejava/koala/kdejava/KCmdLineArgs.cpp
index e6b858c1..95b3f0ad 100644
--- a/kdejava/koala/kdejava/KCmdLineArgs.cpp
+++ b/kdejava/koala/kdejava/KCmdLineArgs.cpp
@@ -8,244 +8,244 @@
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
-#include <kdejava/KCmdLineArgs.h>
+#include <kdejava/TDECmdLineArgs.h>
 
-class KCmdLineArgsJBridge : public KCmdLineArgs
+class TDECmdLineArgsJBridge : public TDECmdLineArgs
 {
 public:
-	KCmdLineArgsJBridge(const KCmdLineOptions* arg1,const char* arg2,const char* arg3) : KCmdLineArgs(arg1,arg2,arg3) {};
+	TDECmdLineArgsJBridge(const KCmdLineOptions* arg1,const char* arg2,const char* arg3) : TDECmdLineArgs(arg1,arg2,arg3) {};
 };
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options)
+Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options)
 {
 	(void) cls;
-	KCmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options));
+	TDECmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options, jstring name)
+Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options, jstring name)
 {
 	(void) cls;
 static TQCString* _qstring_name = 0;
-	KCmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options), (const char*) QtSupport::toCharString(env, name, &_qstring_name));
+	TDECmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options), (const char*) QtSupport::toCharString(env, name, &_qstring_name));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options, jstring name, jstring id)
+Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options, jstring name, jstring id)
 {
 	(void) cls;
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_id = 0;
-	KCmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, id, &_qstring_id));
+	TDECmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, id, &_qstring_id));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options, jstring name, jstring id, jstring afterId)
+Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray options, jstring name, jstring id, jstring afterId)
 {
 	(void) cls;
 static TQCString* _qstring_name = 0;
 static TQCString* _qstring_id = 0;
 static TQCString* _qstring_afterId = 0;
-	KCmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, id, &_qstring_id), (const char*) QtSupport::toCharString(env, afterId, &_qstring_afterId));
+	TDECmdLineArgsJBridge::addCmdLineOptions((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, options), (const char*) QtSupport::toCharString(env, name, &_qstring_name), (const char*) QtSupport::toCharString(env, id, &_qstring_id), (const char*) QtSupport::toCharString(env, afterId, &_qstring_afterId));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_addTempFileOption(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_addTempFileOption(JNIEnv* env, jclass cls)
 {
 	(void) cls;
 	(void) env;
-	KCmdLineArgsJBridge::addTempFileOption();
+	TDECmdLineArgsJBridge::addTempFileOption();
 	return;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KCmdLineArgs_appName(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_appName(JNIEnv* env, jclass cls)
 {
 	const char* _qstring;
 	(void) cls;
-	_qstring = KCmdLineArgsJBridge::appName();
+	_qstring = TDECmdLineArgsJBridge::appName();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KCmdLineArgs_arg(JNIEnv* env, jobject obj, jint n)
+Java_org_kde_koala_TDECmdLineArgs_arg(JNIEnv* env, jobject obj, jint n)
 {
 	const char* _qstring;
-	_qstring = ((KCmdLineArgs*) QtSupport::getQt(env, obj))->arg((int) n);
+	_qstring = ((TDECmdLineArgs*) QtSupport::getQt(env, obj))->arg((int) n);
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_clear(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDECmdLineArgs_clear(JNIEnv* env, jobject obj)
 {
-	((KCmdLineArgs*) QtSupport::getQt(env, obj))->clear();
+	((TDECmdLineArgs*) QtSupport::getQt(env, obj))->clear();
 	return;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_koala_KCmdLineArgs_count(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDECmdLineArgs_count(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((KCmdLineArgs*) QtSupport::getQt(env, obj))->count();
+	jint xret = (jint) ((TDECmdLineArgs*) QtSupport::getQt(env, obj))->count();
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KCmdLineArgs_cwd(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_cwd(JNIEnv* env, jclass cls)
 {
 	TQString  _qstring;
 	(void) cls;
-	_qstring = KCmdLineArgsJBridge::cwd();
+	_qstring = TDECmdLineArgsJBridge::cwd();
 	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_enable_1i18n(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_enable_1i18n(JNIEnv* env, jclass cls)
 {
 	(void) cls;
 	(void) env;
-	KCmdLineArgsJBridge::enable_i18n();
+	TDECmdLineArgsJBridge::enable_i18n();
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KCmdLineArgs_getOptionList(JNIEnv* env, jobject obj, jstring option)
+Java_org_kde_koala_TDECmdLineArgs_getOptionList(JNIEnv* env, jobject obj, jstring option)
 {
 	QCStringList  _qlist;
 static TQCString* _qstring_option = 0;
-	_qlist = ((KCmdLineArgs*) QtSupport::getQt(env, obj))->getOptionList((const char*) QtSupport::toCharString(env, option, &_qstring_option));
+	_qlist = ((TDECmdLineArgs*) QtSupport::getQt(env, obj))->getOptionList((const char*) QtSupport::toCharString(env, option, &_qstring_option));
 	return (jobject) KDESupport::arrayWithQCStringList(env, (QCStringList*) &_qlist);
 }
 
 JNIEXPORT jstring JNICALL
-Java_org_kde_koala_KCmdLineArgs_getOption(JNIEnv* env, jobject obj, jstring option)
+Java_org_kde_koala_TDECmdLineArgs_getOption(JNIEnv* env, jobject obj, jstring option)
 {
 	TQCString  _qstring;
 static TQCString* _qstring_option = 0;
-	_qstring = ((KCmdLineArgs*) QtSupport::getQt(env, obj))->getOption((const char*) QtSupport::toCharString(env, option, &_qstring_option));
+	_qstring = ((TDECmdLineArgs*) QtSupport::getQt(env, obj))->getOption((const char*) QtSupport::toCharString(env, option, &_qstring_option));
 	return QtSupport::fromTQCString(env, &_qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_init__Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobject about)
+Java_org_kde_koala_TDECmdLineArgs_init__Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobject about)
 {
 	(void) cls;
-	KCmdLineArgsJBridge::init((const KAboutData*) QtSupport::getQt(env, about));
+	TDECmdLineArgsJBridge::init((const KAboutData*) QtSupport::getQt(env, about));
 	return;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KCmdLineArgs_isSet(JNIEnv* env, jobject obj, jstring option)
+Java_org_kde_koala_TDECmdLineArgs_isSet(JNIEnv* env, jobject obj, jstring option)
 {
 static TQCString* _qstring_option = 0;
-	jboolean xret = (jboolean) ((KCmdLineArgs*) QtSupport::getQt(env, obj))->isSet((const char*) QtSupport::toCharString(env, option, &_qstring_option));
+	jboolean xret = (jboolean) ((TDECmdLineArgs*) QtSupport::getQt(env, obj))->isSet((const char*) QtSupport::toCharString(env, option, &_qstring_option));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_KCmdLineArgs_isTempFileSet(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_isTempFileSet(JNIEnv* env, jclass cls)
 {
 	(void) cls;
 	(void) env;
-	jboolean xret = (jboolean) KCmdLineArgsJBridge::isTempFileSet();
+	jboolean xret = (jboolean) TDECmdLineArgsJBridge::isTempFileSet();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_loadAppArgs(JNIEnv* env, jclass cls, jobject arg1)
+Java_org_kde_koala_TDECmdLineArgs_loadAppArgs(JNIEnv* env, jclass cls, jobject arg1)
 {
 	(void) cls;
-	KCmdLineArgsJBridge::loadAppArgs((TQDataStream&)*(TQDataStream*) QtSupport::getQt(env, arg1));
+	TDECmdLineArgsJBridge::loadAppArgs((TQDataStream&)*(TQDataStream*) QtSupport::getQt(env, arg1));
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KCmdLineArgs_makeURL(JNIEnv* env, jclass cls, jstring urlArg)
+Java_org_kde_koala_TDECmdLineArgs_makeURL(JNIEnv* env, jclass cls, jstring urlArg)
 {
 	(void) cls;
 static TQCString* _qstring_urlArg = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new KURL(KCmdLineArgsJBridge::makeURL((const char*) QtSupport::toCharString(env, urlArg, &_qstring_urlArg))), "org.kde.koala.KURL", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new KURL(TDECmdLineArgsJBridge::makeURL((const char*) QtSupport::toCharString(env, urlArg, &_qstring_urlArg))), "org.kde.koala.KURL", TRUE);
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_newKCmdLineArgs(JNIEnv* env, jobject obj, jobjectArray _options, jstring _name, jstring _id)
+Java_org_kde_koala_TDECmdLineArgs_newTDECmdLineArgs(JNIEnv* env, jobject obj, jobjectArray _options, jstring _name, jstring _id)
 {
 static TQCString* _qstring__name = 0;
 static TQCString* _qstring__id = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new KCmdLineArgsJBridge((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, _options), (const char*) QtSupport::toCharString(env, _name, &_qstring__name), (const char*) QtSupport::toCharString(env, _id, &_qstring__id)));
+		QtSupport::setQt(env, obj, new TDECmdLineArgsJBridge((KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, _options), (const char*) QtSupport::toCharString(env, _name, &_qstring__name), (const char*) QtSupport::toCharString(env, _id, &_qstring__id)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KCmdLineArgs_parsedArgs__(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_parsedArgs__(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)KCmdLineArgsJBridge::parsedArgs(), "org.kde.koala.KCmdLineArgs");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)TDECmdLineArgsJBridge::parsedArgs(), "org.kde.koala.TDECmdLineArgs");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KCmdLineArgs_parsedArgs__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring id)
+Java_org_kde_koala_TDECmdLineArgs_parsedArgs__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring id)
 {
 	(void) cls;
 static TQCString* _qstring_id = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)KCmdLineArgsJBridge::parsedArgs((const char*) QtSupport::toCharString(env, id, &_qstring_id)), "org.kde.koala.KCmdLineArgs");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)TDECmdLineArgsJBridge::parsedArgs((const char*) QtSupport::toCharString(env, id, &_qstring_id)), "org.kde.koala.TDECmdLineArgs");
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_reset(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_reset(JNIEnv* env, jclass cls)
 {
 	(void) cls;
 	(void) env;
-	KCmdLineArgsJBridge::reset();
+	TDECmdLineArgsJBridge::reset();
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_setCwd(JNIEnv* env, jclass cls, jstring cwd)
+Java_org_kde_koala_TDECmdLineArgs_setCwd(JNIEnv* env, jclass cls, jstring cwd)
 {
 	(void) cls;
 static TQCString* _qstring_cwd = 0;
-	KCmdLineArgsJBridge::setCwd((char*) QtSupport::toCharString(env, cwd, &_qstring_cwd));
+	TDECmdLineArgsJBridge::setCwd((char*) QtSupport::toCharString(env, cwd, &_qstring_cwd));
 	return;
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KCmdLineArgs_url(JNIEnv* env, jobject obj, jint n)
+Java_org_kde_koala_TDECmdLineArgs_url(JNIEnv* env, jobject obj, jint n)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new KURL(((KCmdLineArgs*) QtSupport::getQt(env, obj))->url((int) n)), "org.kde.koala.KURL", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new KURL(((TDECmdLineArgs*) QtSupport::getQt(env, obj))->url((int) n)), "org.kde.koala.KURL", TRUE);
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_usage__(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDECmdLineArgs_usage__(JNIEnv* env, jclass cls)
 {
 	(void) cls;
 	(void) env;
-	KCmdLineArgsJBridge::usage();
+	TDECmdLineArgsJBridge::usage();
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_usage__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring id)
+Java_org_kde_koala_TDECmdLineArgs_usage__Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring id)
 {
 	(void) cls;
 static TQCString* _qstring_id = 0;
-	KCmdLineArgsJBridge::usage((const char*) QtSupport::toCharString(env, id, &_qstring_id));
+	TDECmdLineArgsJBridge::usage((const char*) QtSupport::toCharString(env, id, &_qstring_id));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version)
+Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version)
 {
 	(void) cls;
 static TQCString* _qstring__appname = 0;
@@ -253,12 +253,12 @@ static TQCString* _qstring_programName = 0;
 static TQCString* _qstring__description = 0;
 static TQCString* _qstring__version = 0;
 	int argc = (int) env->GetArrayLength(args);
-	KCmdLineArgsJBridge::init((int) argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version));
+	TDECmdLineArgsJBridge::init((int) argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noKApp)
+Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noKApp)
 {
 	(void) cls;
 static TQCString* _qstring__appname = 0;
@@ -266,25 +266,25 @@ static TQCString* _qstring_programName = 0;
 static TQCString* _qstring__description = 0;
 static TQCString* _qstring__version = 0;
 	int argc = (int) env->GetArrayLength(args);
-	KCmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version), (bool) noKApp);
+	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version), (bool) noKApp);
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
+Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
-	KCmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about));
+	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
+Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
-	KCmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
+	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
 	return;
 }
 
diff --git a/kdejava/koala/kdejava/KCmdLineArgs.h b/kdejava/koala/kdejava/KCmdLineArgs.h
index 06e080ae..bfd27e62 100644
--- a/kdejava/koala/kdejava/KCmdLineArgs.h
+++ b/kdejava/koala/kdejava/KCmdLineArgs.h
@@ -1,7 +1,7 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 
-#ifndef __org_kde_koala_KCmdLineArgs__
-#define __org_kde_koala_KCmdLineArgs__
+#ifndef __org_kde_koala_TDECmdLineArgs__
+#define __org_kde_koala_TDECmdLineArgs__
 
 #include <jni.h>
 
@@ -10,39 +10,39 @@ extern "C"
 {
 #endif
 
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KCmdLineArgs_getOption (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KCmdLineArgs_getOptionList (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KCmdLineArgs_isSet (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jint JNICALL Java_org_kde_koala_KCmdLineArgs_count (JNIEnv *env, jobject);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KCmdLineArgs_arg (JNIEnv *env, jobject, jint);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KCmdLineArgs_url (JNIEnv *env, jobject, jint);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_clear (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring, jstring, jboolean);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z (JNIEnv *env, jclass, jobjectArray, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jclass, jobjectArray, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init__Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KCmdLineArgs_parsedArgs__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KCmdLineArgs_parsedArgs__ (JNIEnv *env, jclass);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KCmdLineArgs_cwd (JNIEnv *env, jclass);
-extern JNIEXPORT jstring JNICALL Java_org_kde_koala_KCmdLineArgs_appName (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_usage__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_usage__ (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_enable_1i18n (JNIEnv *env, jclass);
-extern JNIEXPORT jobject JNICALL Java_org_kde_koala_KCmdLineArgs_makeURL (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_setCwd (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_reset (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_loadAppArgs (JNIEnv *env, jclass, jobject);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_addTempFileOption (JNIEnv *env, jclass);
-extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_KCmdLineArgs_isTempFileSet (JNIEnv *env, jclass);
-extern JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_newKCmdLineArgs (JNIEnv *env, jobject, jobjectArray, jstring, jstring);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDECmdLineArgs_getOption (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDECmdLineArgs_getOptionList (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDECmdLineArgs_isSet (JNIEnv *env, jobject, jstring);
+extern JNIEXPORT jint JNICALL Java_org_kde_koala_TDECmdLineArgs_count (JNIEnv *env, jobject);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDECmdLineArgs_arg (JNIEnv *env, jobject, jint);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDECmdLineArgs_url (JNIEnv *env, jobject, jint);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_clear (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring, jstring, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z (JNIEnv *env, jclass, jobjectArray, jobject, jboolean);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jclass, jobjectArray, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_init__Lorg_kde_koala_KAboutData_2 (JNIEnv *env, jclass, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addCmdLineOptions___3_3Ljava_lang_String_2 (JNIEnv *env, jclass, jobjectArray);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDECmdLineArgs_parsedArgs__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDECmdLineArgs_parsedArgs__ (JNIEnv *env, jclass);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDECmdLineArgs_cwd (JNIEnv *env, jclass);
+extern JNIEXPORT jstring JNICALL Java_org_kde_koala_TDECmdLineArgs_appName (JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_usage__Ljava_lang_String_2 (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_usage__ (JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_enable_1i18n (JNIEnv *env, jclass);
+extern JNIEXPORT jobject JNICALL Java_org_kde_koala_TDECmdLineArgs_makeURL (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_setCwd (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_reset (JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_loadAppArgs (JNIEnv *env, jclass, jobject);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_addTempFileOption (JNIEnv *env, jclass);
+extern JNIEXPORT jboolean JNICALL Java_org_kde_koala_TDECmdLineArgs_isTempFileSet (JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_org_kde_koala_TDECmdLineArgs_newTDECmdLineArgs (JNIEnv *env, jobject, jobjectArray, jstring, jstring);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __org_kde_koala_KCmdLineArgs__ */
+#endif /* __org_kde_koala_TDECmdLineArgs__ */
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp
index 6d22b412..d211b019 100644
--- a/kjsembed/cpptests/jsaccess/jsaccess.cpp
+++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp
@@ -38,7 +38,7 @@ int main( int argc, char **argv )
     KAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test For C++ access of variables and functions."), "0.1",
 		      I18N_NOOP("Test"),
 		      KAboutData::License_LGPL, I18N_NOOP("(c) 2004 Ian Reinhart Geiser") );
-    KCmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::init( argc, argv, &about );
     KApplication app;
 
     // Setup Interpreter
diff --git a/kjsembed/docs/embedding/simple-embed/main.cpp b/kjsembed/docs/embedding/simple-embed/main.cpp
index 719ca29f..8a3f75fe 100644
--- a/kjsembed/docs/embedding/simple-embed/main.cpp
+++ b/kjsembed/docs/embedding/simple-embed/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     KAboutData about("embedjs", I18N_NOOP("EmbedJS"), version, description,
                      KAboutData::License_LGPL, "(C) 2004 Ian Reinhart Geiser", 0, 0, "[email protected]");
     about.addAuthor( "Ian Reinhart Geiser", 0, "[email protected]" );
-    KCmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::init(argc, argv, &about);
     KApplication app;
 
     EmbedViewImp *view = new EmbedViewImp;
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 4b6604cf..220a1b50 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -88,9 +88,9 @@ int main( int argc, char **argv )
     about.addAuthor( "Richard Moore", 0, "[email protected]" );
     about.addAuthor( "Ian Reinhart Geiser", 0, "[email protected]" );
 
-    KCmdLineArgs::init( argc, argv, &about );
-    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     // Setup KApplication
     KApplication *app;
diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp
index 47065ab7..2b72a8cd 100644
--- a/kjsembed/testkjsembed.cpp
+++ b/kjsembed/testkjsembed.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
     KAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test"), "0.1",
 		      I18N_NOOP("Test"),
 		      KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2003 Richard Moore") );
-    KCmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::init( argc, argv, &about );
     KApplication app;
 
     // Setup Interpreter
diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp
index f97d6b1c..53c5f5da 100644
--- a/kjsembed/tests/testkjsembed.cpp
+++ b/kjsembed/tests/testkjsembed.cpp
@@ -36,7 +36,7 @@ int main( int argc, char **argv )
     KAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test"), "0.1",
 		      I18N_NOOP("Test"),
 		      KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2002 Richard Moore") );
-    KCmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::init( argc, argv, &about );
     KApplication app;
 
     // Setup Interpreter
diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
index a2f503ae..4512eeaf 100644
--- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
+++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
@@ -811,12 +811,12 @@ int main( int argc, char **argv )
   aboutData.addCredit( "Richard Dale", "Ruby port", 
       "[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() < 2 ) {
     kdError() << "Too few arguments." << endl;
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 2f6b5e7f..97f30f76 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -201,7 +201,7 @@ smokeruby_free(void * p)
 			|| tqstrcmp(className, "KNamedCommand") == 0
 			|| tqstrcmp(className, "KMacroCommand") == 0
 			|| tqstrcmp(className, "KAboutData") == 0
-			|| tqstrcmp(className, "KCmdLineArgs") == 0
+			|| tqstrcmp(className, "TDECmdLineArgs") == 0
 			|| tqstrcmp(className, "TQSqlCursor") == 0 )
 	{
 		// Don't delete instances of these classes for now