Rename a number of classes to enhance compatibility with KDE4

1 files changed, 12 insertions, 12 deletions

diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index e8b830af..44e5525b 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -468,7 +468,7 @@ EOF
 	
 	$kmainwindowExtras = <<EOF;	
 	/**
- 		List of members of KMainWindow class.
+ 		List of members of TDEMainWindow class.
 	*/
 //	public native ArrayList memberList();
 	
@@ -478,8 +478,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) {
@@ -562,7 +562,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*\*/
@@ -865,11 +865,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')
@@ -1320,7 +1320,7 @@ sub writeClassDoc
 		print CLASS $quridragExtras;
 	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
-	} elsif ( $className eq 'KMainWindow' ) {
+	} elsif ( $className eq 'TDEMainWindow' ) {
 		print CLASS $kmainwindowExtras;
 	}
 	
@@ -1892,13 +1892,13 @@ 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";
 		} elsif ( $name eq 'palette' and $javaClassName eq 'KPaletteTable' ) {
 			$name = "paletteName";
-		} 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";