From 3ed7c09d22a5f310a97516f5bab6068e5688a813 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:12:07 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 kalyptus/kalyptusCxxToJNI.pm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'kalyptus/kalyptusCxxToJNI.pm')

diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 47f8266a..3878c84b 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -301,7 +301,7 @@ BEGIN
 	'Java_org_kde_qt_QUriDrag_decodeToUnicodeUris__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
 	'Java_org_kde_qt_QUriDrag_decodeLocalFiles__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
 	'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1,
-	'Java_org_kde_koala_KMainWindow_memberList' => 1,
+	'Java_org_kde_koala_TDEMainWindow_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_TDEAboutData_2' => 1,
 	'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z' => 1,
@@ -1651,7 +1651,7 @@ EOF
 	
 	$kmainwindowExtras = <<EOF;	
 	/**
- 		List of members of KMainWindow class.
+ 		List of members of TDEMainWindow class.
 	*/
 	public native ArrayList memberList();
 	
@@ -1661,8 +1661,8 @@ EOF
 		try {
 			savedClass = Class.forName(typeName);
 			int n = 1;
-			while (KMainWindow.canBeRestored(n)){
-				((KMainWindow) savedClass.newInstance()).restore(n);
+			while (TDEMainWindow.canBeRestored(n)){
+				((TDEMainWindow) savedClass.newInstance()).restore(n);
 				n++;
 			}
 		} catch(Exception e) {
@@ -1676,9 +1676,9 @@ EOF
 	
 	$kmainwindowjniExtras = <<EOF;
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_KMainWindow_memberList(JNIEnv* env, jobject obj)
+Java_org_kde_koala_TDEMainWindow_memberList(JNIEnv* env, jobject obj)
 {
-	return (jobject) KDESupport::arrayWithKMainWindowList(env, KMainWindow::memberList);
+	return (jobject) KDESupport::arrayWithTDEMainWindowList(env, TDEMainWindow::memberList);
 }
 
 EOF
@@ -1828,7 +1828,7 @@ sub cplusplusToJava
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KMainWindow\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_TDEMainWindow\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/
@@ -2559,11 +2559,11 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
 			|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
 			|| ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
-			|| ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'enable')
-			|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
-			|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'autoupdate')
-			|| ($classNode->{astNodeName} eq 'KAccel' and $name eq 'getAutoUpdate')
-			|| ($classNode->{astNodeName} eq 'KStdAccel' and $name eq 'insert')
+			|| ($classNode->{astNodeName} eq 'TDEToolBar' and $name eq 'enable')
+			|| ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
+			|| ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'autoupdate')
+			|| ($classNode->{astNodeName} eq 'TDEAccel' and $name eq 'getAutoUpdate')
+			|| ($classNode->{astNodeName} eq 'TDEStdAccel' and $name eq 'insert')
 			|| ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid')
 			|| ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
 			|| ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
@@ -3084,7 +3084,7 @@ sub writeClassDoc
 	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
 		$jniCode .= $kapplicationjniExtras;
-	} elsif ( $className eq 'KMainWindow' ) {
+	} elsif ( $className eq 'TDEMainWindow' ) {
 		print CLASS $kmainwindowExtras;
 		$jniCode .= $kmainwindowjniExtras;
 	}
@@ -3811,7 +3811,7 @@ sub generateMethod($$$$$$$$$)
 			$name = "iconId";
 		} elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) {
 			$name = "iconName";
-		} elsif ( $name eq 'iconText' and $javaClassName eq 'KToolBar' ) {
+		} elsif ( $name eq 'iconText' and $javaClassName eq 'TDEToolBar' ) {
 			$name = "iconTextId";
 		} elsif ( $name eq 'reset' and $javaClassName eq 'KExtendedSocket' ) {
 			$name = "resetSocket";
@@ -3819,7 +3819,7 @@ sub generateMethod($$$$$$$$$)
 			$name = "paletteName";
 		} elsif ( $name eq 'size' and $javaClassName eq 'KAnimWidget' ) {
 			$name = "iconSize";
-		} elsif ( $name eq 'size' and $javaClassName eq 'KFontCombo' ) {
+		} elsif ( $name eq 'size' and $javaClassName eq 'TDEFontCombo' ) {
 			$name = "pointSize";
 		} elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') {
 			$name = "iconName";
-- 
cgit v1.2.1