Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 19 insertions, 19 deletions

diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 0b815c3d..ce821ba7 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -303,8 +303,8 @@ BEGIN
 	'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1,
 	'Java_org_kde_koala_KMainWindow_memberList' => 1,
 	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2' => 1,
-	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z' => 1,
+	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2' => 1,
+	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z' => 1,
 	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z' => 1,
 	'Java_org_kde_koala_Scheduler_connect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
 	'Java_org_kde_koala_Scheduler_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
@@ -1711,20 +1711,20 @@ static TQCString* _qstring__version = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_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_TDEAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
-	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about));
+	TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about));
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_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_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
-	TDECmdLineArgsJBridge::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 TDEAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
 	return;
 }
 
@@ -2568,8 +2568,8 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
 			|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
 			|| ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/)
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'charsets')
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'TDEInstance' and $m->{Access} =~ /protected/)
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt')
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative')
 			|| ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init')
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 242553c9..3375d111 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -874,8 +874,8 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
 			|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
 			|| ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/)
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'charsets')
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'TDEInstance' and $m->{Access} =~ /protected/)
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt')
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative')
 			|| ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init')
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 2733cd25..24cefd76 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -920,8 +920,8 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
 			|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
 			|| ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/)
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'charsets')
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'TDEInstance' and $m->{Access} =~ /protected/)
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt')
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative')
 			|| ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init')
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index f8b5543d..6a387c4f 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -569,8 +569,8 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
 			|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
 			|| ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets')
-			|| ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/)
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'charsets')
+			|| ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'TDEInstance' and $m->{Access} =~ /protected/)
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt')
 			|| ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative')
 			|| ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init')
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 4710bbdb..bdab95d9 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -41,7 +41,7 @@ BEGIN
 'TQXmlEntityResolver' => 'TQXmlEntityResolverInterface',
 'TQXmlLexicalHandler' => 'TQXmlLexicalHandlerInterface',
 'TQXmlDeclHandler' => 'TQXmlDeclHandlerInterface',
-'KInstance' => 'KInstanceInterface',
+'TDEInstance' => 'TDEInstanceInterface',
 'QwAbsSpriteFieldView' => 'QwAbsSpriteFieldViewInterface',
 'PartBase' => 'PartBaseInterface',
 'KCompletionBase' => 'KCompletionBaseInterface',
@@ -699,7 +699,7 @@ BEGIN
 'KAboutApplication*' => 'kde_KAboutApplication*',
 'KAboutContainer*'  =>  'kde_KAboutContainer*' ,
 'KAboutContributor*' => 'kde_KAboutContributor*',
-'KAboutData*'  =>  'kde_KAboutData*' ,
+'TDEAboutData*'  =>  'kde_TDEAboutData*' ,
 'KAboutDialog*' => 'kde_KAboutDialog*',
 'KAboutKDE*' => 'kde_KAboutKDE*',
 'KAboutPerson*' => 'kde_KAboutPerson*',
@@ -957,9 +957,9 @@ BEGIN
 'KImageEffect*' => 'kde_KImageEffect*',
 'KImageFilePreview*' => 'kde_KImageFilePreview*',
 'KImageIO*' => 'kde_KImageIO*',
-'KInstance&'  => 'kde_KInstance*' ,
-'KInstance'  => 'kde_KInstance*' ,
-'KInstance*'  => 'kde_KInstance*' ,
+'TDEInstance&'  => 'kde_TDEInstance*' ,
+'TDEInstance'  => 'kde_TDEInstance*' ,
+'TDEInstance*'  => 'kde_TDEInstance*' ,
 'KIntNumInput*' => 'kde_KIntNumInput*',
 'KIntSpinBox*' => 'kde_KIntSpinBox*',
 'KIntValidator*' => 'kde_KIntValidator*',