Rename a number of classes to enhance compatibility with KDE4

6 files changed, 105 insertions, 105 deletions

diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog
index ce82234c..51595d3f 100644
--- a/kalyptus/ChangeLog
+++ b/kalyptus/ChangeLog
@@ -105,10 +105,10 @@
 
 	* Added patch from Michal Ceresna to fix code generation for TQImage.bits() and
 	  TQImage.colorTable()
-	* Fixed bug reported by Maik Schulz caused by unwanted KListViewItem copy constructor.
+	* Fixed bug reported by Maik Schulz caused by unwanted TDEListViewItem copy constructor.
 	  An 'enhancement' was added for KDE 3.2 - for any class which didn't have a copy 
 	  constructor, but which could still be copied, a copy constructor was generated.
-	  Unfortunately this had unforseen consequences, such as messing up KListView logic,
+	  Unfortunately this had unforseen consequences, such as messing up TDEListView logic,
 	  hence they're no longer generated.
 
 2004-05-27  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
@@ -141,7 +141,7 @@
 2004-05-20  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
 	* The java '-fjni' option now generates correct java code with Qt/E 2.3.4
-	* KMainWindow.toolBar() and KMainWindow.menuBar() rename ktoolBar() and
+	* TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename ktoolBar() and
 	  kmenuBar(). This is because java doesn't have covariant return types
 	  and the methods with the same names in TQMainWindow return a TQToolBar
 	  and TQMenuBar, rather than their KDE equivalent subclasses.
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";
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";
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 1c59aac1..f228af7b 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -558,7 +558,7 @@ sub cplusplusToCSharp
 				|| 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*\*/
@@ -911,11 +911,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')
@@ -1347,7 +1347,7 @@ sub writeClassDoc
 		print CLASS $quridragExtras;
 	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
-	} elsif ( $className eq 'KMainWindow' ) {
+	} elsif ( $className eq 'TDEMainWindow' ) {
 		print CLASS $kmainwindowExtras;
 	}
 	
@@ -1940,13 +1940,13 @@ sub generateMethod($$$$$$$)
 			$name = "iconId";
 		} elsif ( $name eq 'icon' and $csharpClassName eq 'KURLBarItemDialog' ) {
 			$name = "iconName";
-		} elsif ( $name eq 'iconText' and $csharpClassName eq 'KToolBar' ) {
+		} elsif ( $name eq 'iconText' and $csharpClassName eq 'TDEToolBar' ) {
 			$name = "iconTextId";
 		} elsif ( $name eq 'reset' and $csharpClassName eq 'KExtendedSocket' ) {
 			$name = "resetSocket";
 		} elsif ( $name eq 'palette' and $csharpClassName eq 'KPaletteTable' ) {
 			$name = "paletteName";
-		} elsif ( $name eq 'size' and $csharpClassName eq 'KFontCombo' ) {
+		} elsif ( $name eq 'size' and $csharpClassName eq 'TDEFontCombo' ) {
 			$name = "pointSize";
 		} elsif ($csharpSignature eq "icon()" and $csharpClassName eq 'KIconButton') {
 			$name = "iconName";
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index e6e9dab2..b35553b7 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -348,7 +348,7 @@ sub preParseClass
 	    ($className eq 'TQWSEvent' and $main::qt_embedded) ||
 	    ($className eq 'TQMetaObjectInit' and $main::qt_embedded) ||
 	    ($className eq 'TQKoi8Codec' and $main::qt_embedded) ||
-	    $className eq 'KAccelGen' ||
+	    $className eq 'TDEAccelGen' ||
 	    ($className eq 'TQAbstractUndoItem' and $main::qt4) ||
 	    ($className eq 'TQAbstractItemDelegate' and $main::qt4) ||
 	    ($className eq 'TQDebug' and $main::qt4) ||
@@ -560,11 +560,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')
@@ -1589,7 +1589,7 @@ sub generateEnumCast($)
 	# Hack - this shouldn't be needed here - deprecated enums
 	next if ($enum eq 'KStatusBar::BarStatus' 
 				or $enum eq 'KMdi::AddWindowFlags' 
-				or $enum eq 'KToolBar::BarStatus' 
+				or $enum eq 'TDEToolBar::BarStatus' 
 				or $enum eq 'KMimeType::Format:: compression : 4');
 	
 	my $type = findTypeEntry($enum);
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 7feca3ff..a38114b2 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -705,28 +705,28 @@ BEGIN
 'KAboutPerson*' => 'kde_KAboutPerson*',
 'KAboutTranslator*' => 'kde_KAboutTranslator*',
 'KAboutWidget*' => 'kde_KAboutWidget*',
-'KAccel*'  =>  'kde_KAccel*' ,
-'KAccelAction&' => 'kde_KAccelAction*',
-'KAccelAction*' => 'kde_KAccelAction*',
-'KAccelActions&' => 'kde_KAccelActions*',
-'KAccelActions*' => 'kde_KAccelActions*',
-'KAccelBase*' => 'kde_KAccelBase*',
-'KAccelGen*' => 'kde_KAccelGen*',
-'KAccelMenu*' => 'kde_KAccelMenu*',
-'KAccelSequence&' => 'kde_KAccelSequence*',
-'KAccelSequence' => 'kde_KAccelSequence*',
-'KAccelSequence*' => 'kde_KAccelSequence*',
-'KAccelShortcut&' => 'kde_KAccelShortcut*',
-'KAccelShortcut' => 'kde_KAccelShortcut*',
-'KAccelShortcut*' => 'kde_KAccelShortcut*',
-'KAccelShortcuts&' => 'kde_KAccelShortcuts*',
-'KAccelShortcuts*' => 'kde_KAccelShortcuts*',
-'KAction*'  =>  'kde_KAction*' ,
-'KActionCollection&'  => 'kde_KActionCollection*' ,
-'KActionCollection'  => 'kde_KActionCollection*' ,
-'KActionCollection*'  => 'kde_KActionCollection*' ,
-'KActionMenu*' => 'kde_KActionMenu*',
-'KActionSeparator*' => 'kde_KActionSeparator*',
+'TDEAccel*'  =>  'kde_TDEAccel*' ,
+'TDEAccelAction&' => 'kde_TDEAccelAction*',
+'TDEAccelAction*' => 'kde_TDEAccelAction*',
+'TDEAccelActions&' => 'kde_TDEAccelActions*',
+'TDEAccelActions*' => 'kde_TDEAccelActions*',
+'TDEAccelBase*' => 'kde_TDEAccelBase*',
+'TDEAccelGen*' => 'kde_TDEAccelGen*',
+'TDEAccelMenu*' => 'kde_TDEAccelMenu*',
+'TDEAccelSequence&' => 'kde_TDEAccelSequence*',
+'TDEAccelSequence' => 'kde_TDEAccelSequence*',
+'TDEAccelSequence*' => 'kde_TDEAccelSequence*',
+'TDEAccelShortcut&' => 'kde_TDEAccelShortcut*',
+'TDEAccelShortcut' => 'kde_TDEAccelShortcut*',
+'TDEAccelShortcut*' => 'kde_TDEAccelShortcut*',
+'TDEAccelShortcuts&' => 'kde_TDEAccelShortcuts*',
+'TDEAccelShortcuts*' => 'kde_TDEAccelShortcuts*',
+'TDEAction*'  =>  'kde_TDEAction*' ,
+'TDEActionCollection&'  => 'kde_TDEActionCollection*' ,
+'TDEActionCollection'  => 'kde_TDEActionCollection*' ,
+'TDEActionCollection*'  => 'kde_TDEActionCollection*' ,
+'TDEActionMenu*' => 'kde_TDEActionMenu*',
+'TDEActionSeparator*' => 'kde_TDEActionSeparator*',
 'KAddressInfo*' => 'kde_KAddressInfo*',
 'KAlphaPainter*' => 'kde_KAlphaPainter*',
 'KAnimWidget*'  =>  'kde_KAnimWidget*' ,
@@ -906,11 +906,11 @@ BEGIN
 'KFloatWatchProxy' => 'kde_KFloatWatchProxy*',
 'KFloatWatchProxy*' => 'kde_KFloatWatchProxy*',
 'KFolderType*' => 'kde_KFolderType*',
-'KFontAction*' => 'kde_KFontAction*',
-'KFontChooser*' => 'kde_KFontChooser*',
-'KFontCombo*' => 'kde_KFontCombo*',
-'KFontDialog*' => 'kde_KFontDialog*',
-'KFontSizeAction*' => 'kde_KFontSizeAction*',
+'TDEFontAction*' => 'kde_TDEFontAction*',
+'TDEFontChooser*' => 'kde_TDEFontChooser*',
+'TDEFontCombo*' => 'kde_TDEFontCombo*',
+'TDEFontDialog*' => 'kde_TDEFontDialog*',
+'TDEFontSizeAction*' => 'kde_TDEFontSizeAction*',
 'KGenericFactory*' => 'kde_KGenericFactory*',
 'KGenericFactoryBase*' => 'kde_KGenericFactoryBase*',
 'TDEGlobal*' => 'kde_TDEGlobal*',
@@ -990,9 +990,9 @@ BEGIN
 'KLibLoader*'  =>  'kde_KLibLoader*' ,
 'KLineEdit*'  =>  'kde_KLineEdit*' ,
 'KLineEditDlg*' => 'kde_KLineEditDlg*',
-'KListBox*' => 'kde_KListBox*',
-'KListView*'  => 'kde_KListView*' ,
-'KListViewItem*' => 'kde_KListViewItem*',
+'TDEListBox*' => 'kde_TDEListBox*',
+'TDEListView*'  => 'kde_TDEListView*' ,
+'TDEListViewItem*' => 'kde_TDEListViewItem*',
 'TDELocale&'  => 'kde_TDELocale*' ,
 'TDELocale*'  => 'kde_TDELocale*' ,
 'KMJobViewer*' => 'kde_KMJobViewer*',
@@ -1003,8 +1003,8 @@ BEGIN
 'KMPrinter*' => 'kde_KMPrinter*',
 'KMPrinterList*' => 'kde_KMPrinterList*',
 'KMPrinterPage*' => 'kde_KMPrinterPage*',
-'KMainWindow*' => 'kde_KMainWindow*',
-'KMainWindowInterface*' => 'kde_KMainWindowInterface*',
+'TDEMainWindow*' => 'kde_TDEMainWindow*',
+'TDEMainWindowInterface*' => 'kde_TDEMainWindowInterface*',
 'KMenuBar*'  => 'kde_KMenuBar*' ,
 'KMessageBox*' => 'kde_KMessageBox*',
 'KMidSimpleAPI*' => 'kde_KMidSimpleAPI*',
@@ -1047,9 +1047,9 @@ BEGIN
 'KPixmapSplitter*' => 'kde_KPixmapSplitter*',
 'KPlayObject*' => 'kde_KPlayObject*',
 'KPlayObjectFactory*' => 'kde_KPlayObjectFactory*',
-'KPopupFrame*' => 'kde_KPopupFrame*',
-'KPopupMenu*'  => 'kde_KPopupMenu*' ,
-'KPopupTitle*' => 'kde_KPopupTitle*',
+'TDEPopupFrame*' => 'kde_TDEPopupFrame*',
+'TDEPopupMenu*'  => 'kde_TDEPopupMenu*' ,
+'TDEPopupTitle*' => 'kde_TDEPopupTitle*',
 'KPreviewWidgetBase*' => 'kde_KPreviewWidgetBase*',
 'KPrintAction*' => 'kde_KPrintAction*',
 'KPrintDialogPage*' => 'kde_KPrintDialogPage*',
@@ -1067,9 +1067,9 @@ BEGIN
 'KProtocolManager*' => 'kde_KProtocolManager*',
 'KPushButton*' => 'kde_KPushButton*',
 'KRFCDate*' => 'kde_KRFCDate*',
-'KRadioAction*' => 'kde_KRadioAction*',
+'TDERadioAction*' => 'kde_TDERadioAction*',
 'KRandomSequence*' => 'kde_KRandomSequence*',
-'KRecentDocument*' => 'kde_KRecentDocument*',
+'TDERecentDocument*' => 'kde_TDERecentDocument*',
 'KRegExp*' => 'kde_KRegExp*',
 'KRegExpEditor*' => 'kde_KRegExpEditor*',
 'KRegExpEditorInterface*' => 'kde_KRegExpEditorInterface*',
@@ -1116,8 +1116,8 @@ BEGIN
 'KScriptClientInterface::Result' => 'int',
 'KScriptInterface*' => 'kde_KScriptInterface*',
 'KScriptManager*' => 'kde_KScriptManager*',
-'KSelectAction*' => 'kde_KSelectAction*',
-'KSelector*' => 'kde_KSelector*',
+'TDESelectAction*' => 'kde_TDESelectAction*',
+'TDESelector*' => 'kde_TDESelector*',
 'KSeparator*' => 'kde_KSeparator*',
 'KService&'  => 'kde_KService*' ,
 'KService*' => 'kde_KService*',
@@ -1133,9 +1133,9 @@ BEGIN
 'TDESharedPtr*' => 'kde_TDESharedPtr*',
 'KShellCompletion*' => 'kde_KShellCompletion*',
 'KShellProcess*' => 'kde_KShellProcess*',
-'KShortcuts&' => 'kde_KShortcuts*',
-'KShortcuts' => 'kde_KShortcuts*',
-'KShortcuts*' => 'kde_KShortcuts*',
+'TDEShortcuts&' => 'kde_TDEShortcuts*',
+'TDEShortcuts' => 'kde_TDEShortcuts*',
+'TDEShortcuts*' => 'kde_TDEShortcuts*',
 'KShred*' => 'kde_KShred*',
 'KSimpleConfig&'  => 'kde_KSimpleConfig*' ,
 'KSimpleConfig*' => 'kde_KSimpleConfig*',
@@ -1158,8 +1158,8 @@ BEGIN
 'KStatusBar*'  => 'kde_KStatusBar*' ,
 'KStatusBar::BarStatusstat::Toggle'  =>  'int' ,
 'KStatusBarLabel*' => 'kde_KStatusBarLabel*',
-'KStdAccel*' => 'kde_KStdAccel*',
-'KStdAccel::StdAccel'  => 'int' ,
+'TDEStdAccel*' => 'kde_TDEStdAccel*',
+'TDEStdAccel::StdAccel'  => 'int' ,
 'KStdAction*' => 'kde_KStdAction*',
 'KStdGuiItem*' => 'kde_KStdGuiItem*',
 'KStringHandler*' => 'kde_KStringHandler*',
@@ -1193,17 +1193,17 @@ BEGIN
 'KThemeStyle*' => 'kde_KThemeStyle*',
 'KTipDatabase*' => 'kde_KTipDatabase*',
 'KTipDialog*' => 'kde_KTipDialog*',
-'KToggleAction*'  => 'kde_KToggleAction*' ,
-'KToolBar*'  => 'kde_KToolBar*' ,
-'KToolBar::BarStatus' => 'int',
-'KToolBar::BarStatusstat::Toggle'  =>  'int' ,
-'KToolBarButton*'  => 'kde_KToolBarButton*' ,
-'KToolBarButtonList*' => 'kde_KToolBarButtonList*',
-'KToolBarPopupAction*' => 'kde_KToolBarPopupAction*',
-'KToolBarPos'  => 'int' ,
-'KToolBarRadioGroup*' => 'kde_KToolBarRadioGroup*',
-'KToolBarSeparator*' => 'kde_KToolBarSeparator*',
-'KToolButtonType'  => 'int' ,
+'TDEToggleAction*'  => 'kde_TDEToggleAction*' ,
+'TDEToolBar*'  => 'kde_TDEToolBar*' ,
+'TDEToolBar::BarStatus' => 'int',
+'TDEToolBar::BarStatusstat::Toggle'  =>  'int' ,
+'TDEToolBarButton*'  => 'kde_TDEToolBarButton*' ,
+'TDEToolBarButtonList*' => 'kde_TDEToolBarButtonList*',
+'TDEToolBarPopupAction*' => 'kde_TDEToolBarPopupAction*',
+'TDEToolBarPos'  => 'int' ,
+'TDEToolBarRadioGroup*' => 'kde_TDEToolBarRadioGroup*',
+'TDEToolBarSeparator*' => 'kde_TDEToolBarSeparator*',
+'TDEToolButtonType'  => 'int' ,
 'TDETrader*'  =>  'kde_TDETrader*' ,
 'KTypeList*' => 'kde_KTypeList*',
 'KURIFilter*'  =>  'kde_KURIFilter*' ,
@@ -2788,9 +2788,9 @@ BEGIN
 'TQValueList<CompletionEntry>' => 'kde_CompletionEntryValueList*',
 'StatusDocumentIface*' => 'kde_StatusDocumentIface*',
 'UndoDocumentIface*' => 'kde_UndoDocumentIface*',
-'KShortcut&' => 'kde_KShortcut*',
-'KShortcut' => 'kde_KShortcut*',
-'KShortcut*' => 'kde_KShortcut*',
+'TDEShortcut&' => 'kde_TDEShortcut*',
+'TDEShortcut' => 'kde_TDEShortcut*',
+'TDEShortcut*' => 'kde_TDEShortcut*',
 'KKey&' => 'kde_KKey*',
 'KKey*' => 'kde_KKey*',
 'KKeyNative&' => 'kde_KKeyNative*',
@@ -2800,7 +2800,7 @@ BEGIN
 'KKeyX11&' => 'kde_KKeyX11*',
 'KKeyX11' => 'kde_KKeyX11*',
 'KKeyX11*' => 'kde_KKeyX11*',
-'KAccelActions' => 'kde_KAccelActions*',
+'TDEAccelActions' => 'kde_TDEAccelActions*',
 'KRandomSequence&' => 'kde_KRandomSequence*',
 'KIcon::Context' => 'int',
 'KIcon::Group' => 'int',