Update kalyptus according to tdebindings

10 files changed, 2084 insertions, 2092 deletions

diff --git a/kalyptus/README b/kalyptus/README
index 781ffe9..31b137c 100644
--- a/kalyptus/README
+++ b/kalyptus/README
@@ -68,21 +68,21 @@ mv SlaveInterface.cpp Slave.cpp
 mv SlaveInterface.java Slave.java
 
 # Edit and Compile the generated java
-cd kdejava/koala/org/kde/koala
+cd tdejava/koala/org/trinitydesktop/koala
 make
 
 # Build C++ JNI .h header files
-cd qtjava/javalib/org/kde/qt
-for FILE in *.class ; do NAME=`echo $FILE | sed 's/.class//'`; echo $NAME; javah  -classpath '../../..' org.kde.qt.$NAME ; done
-for FILE in org_kde* ; do NAME=`echo $FILE | sed -e 's/org_kde_qt_//'`; echo $NAME; mv $FILE $NAME; done
+cd qtjava/javalib/org/trinitydesktop/qt
+for FILE in *.class ; do NAME=`echo $FILE | sed 's/.class//'`; echo $NAME; javah  -classpath '../../..' org.trinitydesktop.qt.$NAME ; done
+for FILE in org_trinitydesktop* ; do NAME=`echo $FILE | sed -e 's/org_trinitydesktop_qt_//'`; echo $NAME; mv $FILE $NAME; done
 
-cd kdejava/koala/org/kde/koala
-for FILE in *.class ; do NAME=`echo $FILE | sed 's/.class//'`; echo $NAME; javah  -classpath '../../..:../../../../../qtjava/javalib/qtjava.jar' org.kde.koala.$NAME ; done
-for FILE in org_kde* ; do NAME=`echo $FILE | sed -e 's/org_kde_koala_//'`; echo $NAME; mv $FILE $NAME; done
-# Copy headers to kdejava/koala/kdejava
+cd tdejava/koala/org/trinitydesktop/koala
+for FILE in *.class ; do NAME=`echo $FILE | sed 's/.class//'`; echo $NAME; javah  -classpath '../../..:../../../../../qtjava/javalib/qtjava.jar' org.trinitydesktop.koala.$NAME ; done
+for FILE in org_trinitydesktop* ; do NAME=`echo $FILE | sed -e 's/org_trinitydesktop_koala_//'`; echo $NAME; mv $FILE $NAME; done
+# Copy headers to tdejava/koala/tdejava
 
 # Check that  the JNI .h function names match the .cpp ones
-cd kdejava/koala/org/kde/koala
+cd tdejava/koala/org/trinitydesktop/koala
 grep ^Java_ *.cpp | sed -e 's/^[^:]*:\([^(]*\).*/\1/'  | grep -v '[/]' | sort | uniq > cpp.fns
 grep Java_ *.h | awk '{ print $4 }' |  grep -v '[/]' | sort | uniq > h.fns
 kompare h.fns cpp.fns
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 058f7d8..5bc443b 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -535,20 +535,14 @@ LOOP:
 #			);
 #
 
-		next if ( $p =~ /^\s*Q_ENUMS/           # ignore Q_ENUMS
-                        || $p =~ /^\s*TQ_ENUMS/       # and TQ_ENUMS
+		next if ( $p =~ /^\s*TQ_ENUMS/           # ignore TQ_ENUMS
                         || $p =~ /^\s*TQ_OBJECT/       # and TQ_OBJECT
                         || $p =~ /^\s*Q_FLAGS/       # and Q_FLAGS
-                        || $p =~ /^\s*TQ_FLAGS/       # and TQ_FLAGS
                         || $p =~ /^\s*Q_DECLARE_FLAGS/       # and Q_DECLARE_FLAGS
-                        || $p =~ /^\s*TQ_DECLARE_FLAGS/       # and TQ_DECLARE_FLAGS
-                        || ( !$qt4 && $p =~ /^\s*Q_PROPERTY/ )      # and Q_PROPERTY
                         || ( !$qt4 && $p =~ /^\s*TQ_PROPERTY/ )      # and TQ_PROPERTY
                         || $p =~ /^\s*TQDOC_PROPERTY/
                         || $p =~ /^\s*Q_GADGET/
-                        || $p =~ /^\s*Q_OVERRIDE/       # and Q_OVERRIDE
                         || $p =~ /^\s*TQ_OVERRIDE/       # and TQ_OVERRIDE
-                        || $p =~ /^\s*Q_SETS/
                         || $p =~ /^\s*TQ_SETS/
                         || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/
                         || $p =~ /^\s*K_SYCOCATYPE/     # and K_SYCOCA stuff
@@ -733,10 +727,7 @@ sub readDecl
 		$declNodeType = "c";
 		return $l;
 	}
-	elsif ( $l =~ /Q_PROPERTY/ ) {	# property
-		return $l;
-	}
-	elsif ( $l =~ /TQ_PROPERTY/ ) {  # property
+	elsif ( $l =~ /TQ_PROPERTY/ ) {	# property
 		return $l;
 	}
 
@@ -818,17 +809,12 @@ sub identifyDecl
         elsif ( $declNodeType eq "k" ) {
 	        $cNode->AddProp( "DcopExported", 1 );
         }
-        # properties
-        elsif ( $decl =~ s/Q_PROPERTY// ) {
+    # properties
+    elsif ( $decl =~ s/TQ_PROPERTY// ) {
 		print "Property: <$1>\n" if $debug;
 
 		$newNode = newProperty( $decl );
 	}
-        elsif ( $decl =~ s/TQ_PROPERTY// ) {
-                print "Property: <$1>\n" if $debug;
-
-                $newNode = newProperty( $decl );
-        }
 	# Typedef struct/class
 	elsif ( $decl =~ /^\s*typedef
 			\s+(struct|union|class|enum)
diff --git a/kalyptus/kalyptusCxxToCSharp.pm b/kalyptus/kalyptusCxxToCSharp.pm
index 400611e..4336008 100644
--- a/kalyptus/kalyptusCxxToCSharp.pm
+++ b/kalyptus/kalyptusCxxToCSharp.pm
@@ -320,15 +320,15 @@ sub writeClassDoc
 	my $typeName = $node->{astNodeName}."*";
 
 	if ( kalyptusDataDict::ctypemap($typeName) eq "" ) {
-		$typeprefix = ($typeName =~ /^Q/ ? "qt_" : "kde_");
+		$typeprefix = ($typeName =~ /^Q/ ? "qt_" : "tde_");
 		kalyptusDataDict::setctypemap($typeName, $typeprefix.$node->{astNodeName}."*");
 		print "'$typeName' => '$typeprefix$typeName',\n";
 	} elsif ( kalyptusDataDict::ctypemap($typeName) =~ /^qt_/ ) {
 		$typeprefix = "qt_";
-	} elsif ( kalyptusDataDict::ctypemap($typeName) =~ /^kde_/ ) {
-		$typeprefix = "kde_";
+	} elsif ( kalyptusDataDict::ctypemap($typeName) =~ /^tde_/ ) {
+		$typeprefix = "tde_";
 	} else {
-		$typeprefix = "kde_";
+		$typeprefix = "tde_";
 	}
 
 	my $file = "$outputdir/".join("__", kdocAstUtil::heritage($node)).".cs";
diff --git a/kalyptus/kalyptusCxxToDcopIDL.pm b/kalyptus/kalyptusCxxToDcopIDL.pm
index ad7e3ee..5ff17c0 100644
--- a/kalyptus/kalyptusCxxToDcopIDL.pm
+++ b/kalyptus/kalyptusCxxToDcopIDL.pm
@@ -131,14 +131,14 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'Q_INT16' => 'short',
-   'Q_INT32' => 'int',
-   'Q_INT8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
-   'Q_UINT32' => 'uint',
-   'Q_UINT8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
 );
 
 }
@@ -836,7 +836,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 1f33d7a..a3cd69d 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -145,18 +145,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TQ_INT16' => 'short',
-   'TQ_INT32' => 'int',
-   'TQ_INT64' => 'long',
-   'TQ_INT8' => 'char',
-   'TQ_LONG' => 'long',
-   'TQ_LLONG' => 'long',
+   'TTQ_INT16' => 'short',
+   'TTQ_INT32' => 'int',
+   'TTQ_INT64' => 'long',
+   'TTQ_INT8' => 'char',
+   'TTQ_LONG' => 'long',
+   'TTQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TQ_UINT16' => 'ushort',
-   'TQ_UINT32' => 'uint',
-   'TQ_UINT64' => 'long',
-   'TQ_UINT8' => 'uchar',
-   'TQ_ULONG' => 'long',
+   'TTQ_UINT16' => 'ushort',
+   'TTQ_UINT32' => 'uint',
+   'TTQ_UINT64' => 'long',
+   'TTQ_UINT8' => 'uchar',
+   'TTQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
@@ -204,112 +204,112 @@ BEGIN
 
 %skippedJniMethods =
 (
-	'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2Z' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2I' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2I' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2Z' => 1,
-	'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QApplication_args__' => 1,
-	'Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2' => 1,
-	'Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QImage_2' => 1,
-	'Java_org_kde_qt_QListView_itemList' => 1,
-	'Java_org_kde_qt_QListViewItem_itemList' => 1,
-	'Java_org_kde_qt_Qt_color0' => 1,
-	'Java_org_kde_qt_Qt_color1' => 1,
-	'Java_org_kde_qt_Qt_black' => 1,
-	'Java_org_kde_qt_Qt_white' => 1,
-	'Java_org_kde_qt_Qt_darkGray' => 1,
-	'Java_org_kde_qt_Qt_lightGray' => 1,
-	'Java_org_kde_qt_Qt_gray' => 1,
-	'Java_org_kde_qt_Qt_red' => 1,
-	'Java_org_kde_qt_Qt_green' => 1,
-	'Java_org_kde_qt_Qt_blue' => 1,
-	'Java_org_kde_qt_Qt_cyan' => 1,
-	'Java_org_kde_qt_Qt_magenta' => 1,
-	'Java_org_kde_qt_Qt_yellow' => 1,
-	'Java_org_kde_qt_Qt_darkRed' => 1,
-	'Java_org_kde_qt_Qt_darkGreen' => 1,
-	'Java_org_kde_qt_Qt_darkBlue' => 1,
-	'Java_org_kde_qt_Qt_darkCyan' => 1,
-	'Java_org_kde_qt_Qt_darkMagenta' => 1,
-	'Java_org_kde_qt_Qt_darkYellow' => 1,
-	'Java_org_kde_qt_Qt_arrowCursor' => 1,
-	'Java_org_kde_qt_Qt_upArrowCursor' => 1,
-	'Java_org_kde_qt_Qt_crossCursor' => 1,
-	'Java_org_kde_qt_Qt_waitCursor' => 1,
-	'Java_org_kde_qt_Qt_ibeamCursor' => 1,
-	'Java_org_kde_qt_Qt_sizeVerCursor' => 1,
-	'Java_org_kde_qt_Qt_sizeHorCursor' => 1,
-	'Java_org_kde_qt_Qt_sizeBDiagCursor' => 1,
-	'Java_org_kde_qt_Qt_sizeFDiagCursor' => 1,
-	'Java_org_kde_qt_Qt_sizeAllCursor' => 1,
-	'Java_org_kde_qt_Qt_blankCursor' => 1,
-	'Java_org_kde_qt_Qt_splitVCursor' => 1,
-	'Java_org_kde_qt_Qt_splitHCursor' => 1,
-	'Java_org_kde_qt_Qt_pointingHandCursor' => 1,
-	'Java_org_kde_qt_Qt_forbiddenCursor' => 1,
-	'Java_org_kde_qt_Qt_qApp' => 1,
-	'Java_org_kde_qt_Qt_tqDebug' => 1,
-	'Java_org_kde_qt_Qt_tqWarning' => 1,
-	'Java_org_kde_qt_Qt_tqFatal' => 1,
-	'Java_org_kde_qt_QObject_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QObject_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QObject_disconnect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QObject_disconnect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QObject_emit' => 1,
-	'Java_org_kde_qt_QWidget_paintDevice' => 1,
-	'Java_org_kde_qt_QImage_bits__' => 1,
-	'Java_org_kde_qt_QImage_colorTable__' => 1,
-	'Java_org_kde_qt_QImage_scanLine__I' => 1,
-	'Java_org_kde_qt_QPixmap_paintDevice' => 1,
-	'Java_org_kde_qt_QPixmap_loadFromData___3C' => 1,
-	'Java_org_kde_qt_QPaintDevice_paintDevice' => 1,
-	'Java_org_kde_qt_QDragObject_mimeSource' => 1,
-	'Java_org_kde_qt_QPointArray_point__I_3I_3I' => 1,
-	'Java_org_kde_qt_QPointArray_setPoints__I_3S' => 1,
-	'Java_org_kde_qt_QPointArray_putPoints__II_3S' => 1,
-	'Java_org_kde_qt_QPointArray_count__' => 1,
-	'Java_org_kde_qt_QPointArray_isEmpty__' => 1,
-	'Java_org_kde_qt_QPointArray_isNull__' => 1,
-	'Java_org_kde_qt_QPointArray_resize__' => 1,
-	'Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QKeySequence_2II' => 1,
-	'Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QPopupMenu_connectItem__ILorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QPopupMenu_disconnectItem__ILorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QKeySequence_2II' => 1,
-	'Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuData_connectItem__ILorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuData_disconnectItem__ILorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QKeySequence_2II' => 1,
-	'Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuBar_connectItem__ILorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QMenuBar_disconnectItem__ILorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_qt_QUriDrag_decode__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
-	'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_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,
-	'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,
-	'Java_org_kde_koala_Scheduler_disconnect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
-	'Java_org_kde_koala_Scheduler_disconnect' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication___3Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication___3Ljava_lang_String_2I' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2Z' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2I' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2I' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2Z' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QApplication_args__' => 1,
+	'Java_org_trinitydesktop_qt_QBitmap_newTQBitmap__Lorg_trinitydesktop_qt_QPixmap_2' => 1,
+	'Java_org_trinitydesktop_qt_QBitmap_newTQBitmap__Lorg_trinitydesktop_qt_QImage_2' => 1,
+	'Java_org_trinitydesktop_qt_QListView_itemList' => 1,
+	'Java_org_trinitydesktop_qt_QListViewItem_itemList' => 1,
+	'Java_org_trinitydesktop_qt_Qt_color0' => 1,
+	'Java_org_trinitydesktop_qt_Qt_color1' => 1,
+	'Java_org_trinitydesktop_qt_Qt_black' => 1,
+	'Java_org_trinitydesktop_qt_Qt_white' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkGray' => 1,
+	'Java_org_trinitydesktop_qt_Qt_lightGray' => 1,
+	'Java_org_trinitydesktop_qt_Qt_gray' => 1,
+	'Java_org_trinitydesktop_qt_Qt_red' => 1,
+	'Java_org_trinitydesktop_qt_Qt_green' => 1,
+	'Java_org_trinitydesktop_qt_Qt_blue' => 1,
+	'Java_org_trinitydesktop_qt_Qt_cyan' => 1,
+	'Java_org_trinitydesktop_qt_Qt_magenta' => 1,
+	'Java_org_trinitydesktop_qt_Qt_yellow' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkRed' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkGreen' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkBlue' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkCyan' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkMagenta' => 1,
+	'Java_org_trinitydesktop_qt_Qt_darkYellow' => 1,
+	'Java_org_trinitydesktop_qt_Qt_arrowCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_upArrowCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_crossCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_waitCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_ibeamCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_sizeVerCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_sizeHorCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_sizeBDiagCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_sizeFDiagCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_sizeAllCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_blankCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_splitVCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_splitHCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_pointingHandCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_forbiddenCursor' => 1,
+	'Java_org_trinitydesktop_qt_Qt_qApp' => 1,
+	'Java_org_trinitydesktop_qt_Qt_tqDebug' => 1,
+	'Java_org_trinitydesktop_qt_Qt_tqWarning' => 1,
+	'Java_org_trinitydesktop_qt_Qt_tqFatal' => 1,
+	'Java_org_trinitydesktop_qt_QObject_connect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QObject_connect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QObject_disconnect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QObject_disconnect__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QObject_emit' => 1,
+	'Java_org_trinitydesktop_qt_QWidget_paintDevice' => 1,
+	'Java_org_trinitydesktop_qt_QImage_bits__' => 1,
+	'Java_org_trinitydesktop_qt_QImage_colorTable__' => 1,
+	'Java_org_trinitydesktop_qt_QImage_scanLine__I' => 1,
+	'Java_org_trinitydesktop_qt_QPixmap_paintDevice' => 1,
+	'Java_org_trinitydesktop_qt_QPixmap_loadFromData___3C' => 1,
+	'Java_org_trinitydesktop_qt_QPaintDevice_paintDevice' => 1,
+	'Java_org_trinitydesktop_qt_QDragObject_mimeSource' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_point__I_3I_3I' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_setPoints__I_3S' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_putPoints__II_3S' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_count__' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_isEmpty__' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_isNull__' => 1,
+	'Java_org_trinitydesktop_qt_QPointArray_resize__' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QKeySequence_2II' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_connectItem__ILorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QPopupMenu_disconnectItem__ILorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QKeySequence_2II' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_connectItem__ILorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuData_disconnectItem__ILorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QKeySequence_2II' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_connectItem__ILorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QMenuBar_disconnectItem__ILorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QUriDrag_decode__Lorg_trinitydesktop_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QUriDrag_decodeToUnicodeUris__Lorg_trinitydesktop_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_qt_QUriDrag_decodeLocalFiles__Lorg_trinitydesktop_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_koala_TDEApplication_setJavaSlotFactory' => 1,
+	'Java_org_trinitydesktop_koala_TDEMainWindow_memberList' => 1,
+	'Java_org_trinitydesktop_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2' => 1,
+	'Java_org_trinitydesktop_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2Z' => 1,
+	'Java_org_trinitydesktop_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z' => 1,
+	'Java_org_trinitydesktop_koala_Scheduler_connect__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_koala_Scheduler_connect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_koala_Scheduler_disconnect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2' => 1,
+	'Java_org_trinitydesktop_koala_Scheduler_disconnect' => 1,
 );	
 	
 	$qapplicationExtras = <<EOF;
@@ -321,7 +321,7 @@ EOF
 static jobjectArray _args = 0;
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2(JNIEnv *env, jobject obj, jobjectArray args)
+Java_org_trinitydesktop_qt_QApplication_newTQApplication___3Ljava_lang_String_2(JNIEnv *env, jobject obj, jobjectArray args)
 {
 	int argc = (int) env->GetArrayLength(args) + 1;
 	_args = (jobjectArray) env->NewGlobalRef(args);
@@ -333,7 +333,7 @@ Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2(JNIEnv *env
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z(JNIEnv *env, jobject obj, jobjectArray args, jboolean GUIenabled)
+Java_org_trinitydesktop_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z(JNIEnv *env, jobject obj, jobjectArray args, jboolean GUIenabled)
 {
 	int argc = (int) env->GetArrayLength(args) + 1;
 	_args = (jobjectArray) env->NewGlobalRef(args);
@@ -345,7 +345,7 @@ Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z(JNIEnv *en
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I(JNIEnv *env, jobject obj, jobjectArray args, jint arg1)
+Java_org_trinitydesktop_qt_QApplication_newTQApplication___3Ljava_lang_String_2I(JNIEnv *env, jobject obj, jobjectArray args, jint arg1)
 {
 	int argc = (int) env->GetArrayLength(args) + 1;
 	_args = (jobjectArray) env->NewGlobalRef(args);
@@ -357,7 +357,7 @@ Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I(JNIEnv *en
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_org_kde_qt_QApplication_args(JNIEnv *env, jobject obj)
+Java_org_trinitydesktop_qt_QApplication_args(JNIEnv *env, jobject obj)
 {
 	(void) env;
 	(void) obj;
@@ -382,7 +382,7 @@ EOF
 	
 	$qbitmapjniExtras = <<EOF;
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2(JNIEnv *env, jobject obj, jobject arg1)
+Java_org_trinitydesktop_qt_QBitmap_newTQBitmap__Lorg_trinitydesktop_qt_QPixmap_2(JNIEnv *env, jobject obj, jobject arg1)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
 		TQBitmap temp;
@@ -394,7 +394,7 @@ Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2(JNIEnv *env, jobject
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QImage_2(JNIEnv *env, jobject obj, jobject arg1)
+Java_org_trinitydesktop_qt_QBitmap_newTQBitmap__Lorg_trinitydesktop_qt_QImage_2(JNIEnv *env, jobject obj, jobject arg1)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
 		TQBitmap temp;
@@ -414,7 +414,7 @@ EOF
 	
 	$qlistviewjniExtras = <<EOF;
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_QListView_itemList(JNIEnv *env, jobject obj)
+Java_org_trinitydesktop_qt_QListView_itemList(JNIEnv *env, jobject obj)
 {
 	TQListViewItemIterator iterator((TQListView*) QtSupport::getQt(env, obj));
 	return QtSupport::arrayWithTQListViewItemList(env, &iterator);
@@ -428,7 +428,7 @@ EOF
 	
 	$qlistviewitemjniExtras = <<EOF;
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_QListViewItem_itemList(JNIEnv *env, jobject obj)
+Java_org_trinitydesktop_qt_QListViewItem_itemList(JNIEnv *env, jobject obj)
 {
 	TQListViewItemIterator iterator((TQListViewItem*) QtSupport::getQt(env, obj));
 	return QtSupport::arrayWithTQListViewItemList(env, &iterator);
@@ -561,264 +561,264 @@ EOF
 EOF
 
 	$qtjniExtras = <<EOF;
-#include <ntqapplication.h>
-#include <ntqstring.h>
-#include <ntqcstring.h>
+#include <qapplication.h>
+#include <qstring.h>
+#include <qcstring.h>
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_color0(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_color0(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color0, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color0, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_color1(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_color1(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color1, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color1, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_black(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_black(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::black, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::black, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_white(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_white(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::white, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::white, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkGray(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkGray(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGray, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGray, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_lightGray(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_lightGray(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::lightGray, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::lightGray, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_gray(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_gray(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::gray, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::gray, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_red(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_red(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::red, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::red, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_green(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_green(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::green, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::green, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_blue(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_blue(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blue, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blue, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_cyan(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_cyan(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::cyan, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::cyan, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_magenta(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_magenta(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::magenta, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::magenta, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_yellow(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_yellow(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::yellow, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::yellow, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkRed(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkRed(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkRed, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkRed, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkGreen(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkGreen(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGreen, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGreen, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkBlue(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkBlue(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkBlue, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkBlue, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkCyan(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkCyan(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkCyan, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkCyan, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkMagenta(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkMagenta(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkMagenta, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkMagenta, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_darkYellow(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_darkYellow(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkYellow, "org.kde.qt.TQColor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkYellow, "org.trinitydesktop.qt.TQColor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_arrowCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_arrowCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::arrowCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::arrowCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_upArrowCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_upArrowCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::upArrowCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::upArrowCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_crossCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_crossCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::crossCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::crossCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_waitCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_waitCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::waitCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::waitCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_ibeamCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_ibeamCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::ibeamCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::ibeamCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_sizeVerCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_sizeVerCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeVerCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeVerCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_sizeHorCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_sizeHorCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeHorCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeHorCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_sizeBDiagCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_sizeBDiagCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeBDiagCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeBDiagCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_sizeFDiagCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_sizeFDiagCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeFDiagCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeFDiagCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_sizeAllCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_sizeAllCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeAllCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeAllCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_blankCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_blankCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blankCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blankCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_splitVCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_splitVCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitVCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitVCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_splitHCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_splitHCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitHCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitHCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_pointingHandCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_pointingHandCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::pointingHandCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::pointingHandCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_forbiddenCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_forbiddenCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::forbiddenCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::forbiddenCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_whatsThisCursor(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_whatsThisCursor(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::whatsThisCursor, "org.kde.qt.TQCursor");
+	return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::whatsThisCursor, "org.trinitydesktop.qt.TQCursor");
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_Qt_qApp(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_qt_Qt_qApp(JNIEnv* env, jclass cls)
 {
 	(void) cls;
-	return (jobject) QtSupport::objectForQtKey(env, tqApp, "org.kde.qt.TQApplication");
+	return (jobject) QtSupport::objectForQtKey(env, tqApp, "org.trinitydesktop.qt.TQApplication");
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_Qt_tqDebug(JNIEnv* env, jclass cls, jstring message)
+Java_org_trinitydesktop_qt_Qt_tqDebug(JNIEnv* env, jclass cls, jstring message)
 {
 static TQCString * _qstring_message = 0;
 	(void) cls;
@@ -827,7 +827,7 @@ static TQCString * _qstring_message = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_Qt_tqWarning(JNIEnv* env, jclass cls, jstring message)
+Java_org_trinitydesktop_qt_Qt_tqWarning(JNIEnv* env, jclass cls, jstring message)
 {
 static TQCString * _qstring_message = 0;
 	(void) cls;
@@ -836,7 +836,7 @@ static TQCString * _qstring_message = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_Qt_tqFatal(JNIEnv* env, jclass cls, jstring message)
+Java_org_trinitydesktop_qt_Qt_tqFatal(JNIEnv* env, jclass cls, jstring message)
 {
 static TQCString * _qstring_message = 0;
 	(void) cls;
@@ -1021,33 +1021,33 @@ EOF
 
 	$qobjectjniExtras = <<EOF;
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QObject_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobject sender, jstring signal, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QObject_connect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobject sender, jstring signal, jobject receiver, jstring member)
 {
 	(void) cls;
 	return (jboolean) QtSupport::connect(env, sender, signal, receiver, member);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QObject_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject sender, jstring signal, jstring member)
+Java_org_trinitydesktop_qt_QObject_connect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject sender, jstring signal, jstring member)
 {
 	return (jboolean) QtSupport::connect(env, sender, signal, obj, member);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QObject_disconnect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jclass cls, jobject sender, jstring signal, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QObject_disconnect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jclass cls, jobject sender, jstring signal, jobject receiver, jstring member)
 {
 	(void) cls;
 	return (jboolean) QtSupport::disconnect(env, sender, signal, receiver, member);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QObject_disconnect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring signal, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QObject_disconnect__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring signal, jobject receiver, jstring member)
 {
 	return (jboolean) QtSupport::disconnect(env, obj, signal, receiver, member);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QObject_emit(JNIEnv* env, jobject obj, jstring signal, jobjectArray args)
+Java_org_trinitydesktop_qt_QObject_emit(JNIEnv* env, jobject obj, jstring signal, jobjectArray args)
 {
 	QtSupport::emitJavaSignal(env, obj, signal, args);
 	return;
@@ -1063,7 +1063,7 @@ EOF
 
 	$qwidgetjniExtras = <<EOF;
 JNIEXPORT jlong JNICALL
-Java_org_kde_qt_QWidget_paintDevice(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QWidget_paintDevice(JNIEnv* env, jobject obj)
 {
 	return (jlong) (TQPaintDevice*)(TQWidget*) QtSupport::getQt(env, obj);
 }
@@ -1072,7 +1072,7 @@ EOF
 	
 	$qimagejniExtras = <<EOF;
 JNIEXPORT jbyteArray JNICALL
-Java_org_kde_qt_QImage_bits(JNIEnv *env, jobject obj)
+Java_org_trinitydesktop_qt_QImage_bits(JNIEnv *env, jobject obj)
 {
 static uchar * ptr = 0;
 	ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->bits();
@@ -1083,7 +1083,7 @@ static uchar * ptr = 0;
 }
 
 JNIEXPORT jbyteArray JNICALL
-Java_org_kde_qt_QImage_scanLine(JNIEnv *env, jobject obj, jint arg1)
+Java_org_trinitydesktop_qt_QImage_scanLine(JNIEnv *env, jobject obj, jint arg1)
 {
 static uchar * ptr = 0;
 	ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->scanLine(arg1);
@@ -1094,7 +1094,7 @@ static uchar * ptr = 0;
 }
 
 JNIEXPORT jintArray JNICALL
-Java_org_kde_qt_QImage_colorTable(JNIEnv *env, jobject obj)
+Java_org_trinitydesktop_qt_QImage_colorTable(JNIEnv *env, jobject obj)
 {
 static TQRgb * ptr = 0;
 	ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->colorTable();
@@ -1116,14 +1116,14 @@ EOF
 
 	$qpixmapjniExtras = <<EOF;
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPixmap_loadFromData___3C(JNIEnv *env, jobject obj, jcharArray data)
+Java_org_trinitydesktop_qt_QPixmap_loadFromData___3C(JNIEnv *env, jobject obj, jcharArray data)
 {
 static TQByteArray * _qbyteArray_data = 0;
 	return (jboolean) ((TQPixmapJBridge*) QtSupport::getQt(env, obj))->loadFromData((uchar *) QtSupport::toUcharArray(env, data, &_qbyteArray_data), env->GetArrayLength(data), 0, 0);
 }
 	
 JNIEXPORT jlong JNICALL
-Java_org_kde_qt_QPixmap_paintDevice(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QPixmap_paintDevice(JNIEnv* env, jobject obj)
 {
 	return (jlong) (TQPaintDevice*)(TQPixmap*) QtSupport::getQt(env, obj);
 }
@@ -1138,7 +1138,7 @@ EOF
 
 	$qpaintdevicejniExtras = <<EOF;
 JNIEXPORT jlong JNICALL
-Java_org_kde_qt_QPaintDevice_paintDevice(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QPaintDevice_paintDevice(JNIEnv* env, jobject obj)
 {
 	return (jlong) (TQPaintDevice *) QtSupport::getQt(env, obj);
 }
@@ -1153,7 +1153,7 @@ EOF
 	
 	$qdragobjectjniExtras = <<EOF;
 JNIEXPORT jlong JNICALL
-Java_org_kde_qt_QDragObject_mimeSource(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QDragObject_mimeSource(JNIEnv* env, jobject obj)
 {
 	return (jlong) (TQMimeSource*) (TQDragObject*) QtSupport::getQt(env, obj);
 }
@@ -1168,7 +1168,7 @@ EOF
 	
 	$qdropeventjniExtras = <<EOF;
 JNIEXPORT jlong JNICALL
-Java_org_kde_qt_QDropEvent_mimeSource(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QDropEvent_mimeSource(JNIEnv* env, jobject obj)
 {
 	return (jlong) (TQMimeSource*) (TQDropEvent*) QtSupport::getQt(env, obj);
 }
@@ -1183,7 +1183,7 @@ EOF
 	
 	$qmimesourcejniExtras = <<EOF;
 JNIEXPORT jlong JNICALL
-Java_org_kde_qt_QMimeSource_mimeSource(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QMimeSource_mimeSource(JNIEnv* env, jobject obj)
 {
 	return (jlong) (TQMimeSource *) QtSupport::getQt(env, obj);
 }
@@ -1247,7 +1247,7 @@ EOF
 		
 	$qpointarrayjniExtras = <<EOF;
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jintArray x, jintArray y)
+Java_org_trinitydesktop_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jintArray x, jintArray y)
 {
 	int argx;
 	int argy;
@@ -1258,7 +1258,7 @@ Java_org_kde_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jin
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, jshortArray points)
+Java_org_trinitydesktop_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, jshortArray points)
 {
 	if (!((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint)nPoints)) {
 		return JNI_FALSE;
@@ -1272,7 +1272,7 @@ Java_org_kde_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, js
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint index, jint nPoints, jshortArray points)
+Java_org_trinitydesktop_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint index, jint nPoints, jshortArray points)
 {
 	if (	((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->size() < (uint) nPoints
 			&& !((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) nPoints) )
@@ -1288,101 +1288,101 @@ Java_org_kde_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint inde
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPointArray_size(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QPointArray_size(JNIEnv* env, jobject obj)
 {
 	return (jint) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->size();
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPointArray_count(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QPointArray_count(JNIEnv* env, jobject obj)
 {
 	return (jint) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->count();
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPointArray_isEmpty(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QPointArray_isEmpty(JNIEnv* env, jobject obj)
 {
 	return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->isEmpty();
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPointArray_isNull(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_qt_QPointArray_isNull(JNIEnv* env, jobject obj)
 {
 	return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->isNull();
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPointArray_resize(JNIEnv* env, jobject obj, jint size)
+Java_org_trinitydesktop_qt_QPointArray_resize(JNIEnv* env, jobject obj, jint size)
 {
 	return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) size);
 }
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPointArray_truncate(JNIEnv *env, jobject obj, jint pos)
+Java_org_trinitydesktop_qt_QPointArray_truncate(JNIEnv *env, jobject obj, jint pos)
 {
 	return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos);
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
+Java_org_trinitydesktop_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
 {
 	TQPoint _p= ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index);
-	return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.kde.qt.TQPoint", TRUE);
+	return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.trinitydesktop.qt.TQPoint", TRUE);
 }
 	
 EOF
 
 	$qpopupmenujniExtras = <<EOF;
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QKeySequence_2II(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member, jobject accel, jint identifier, jint index)
+Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QKeySequence_2II(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member, jobject accel, jint identifier, jint index)
 {
-	identifier = Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2II(env, obj, text, identifier, index);
+	identifier = Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Ljava_lang_String_2II(env, obj, text, identifier, index);
 
-	if ((bool) Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member)) {
-		Java_org_kde_qt_QPopupMenu_setAccel(env, obj, accel, identifier);
+	if ((bool) Java_org_trinitydesktop_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member)) {
+		Java_org_trinitydesktop_qt_QPopupMenu_setAccel(env, obj, accel, identifier);
 	}
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2II(env, obj, text, -1, -1);
-	Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Ljava_lang_String_2II(env, obj, text, -1, -1);
+	Java_org_trinitydesktop_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member)
 {
 static TQString * _qstring_text = 0;
-	jint identifier = Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1);
-	Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1);
+	Java_org_trinitydesktop_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
 	
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject pixmap, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject pixmap, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QPixmap_2II(env, obj, pixmap, -1, -1);
-	Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QPixmap_2II(env, obj, pixmap, -1, -1);
+	Java_org_trinitydesktop_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jobject pixmap, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jobject pixmap, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2II(env, obj, icon, pixmap, -1, -1);
-	Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QPopupMenu_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2II(env, obj, icon, pixmap, -1, -1);
+	Java_org_trinitydesktop_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPopupMenu_connectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QPopupMenu_connectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
 {
 	JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member);
 
@@ -1397,7 +1397,7 @@ Java_org_kde_qt_QPopupMenu_connectItem(JNIEnv *env, jobject obj, jint identifier
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QPopupMenu_disconnectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QPopupMenu_disconnectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
 {
 	JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member);
 
@@ -1415,56 +1415,56 @@ EOF
 
 	$qmenudatajniExtras = <<EOF;
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QKeySequence_2II(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member, jobject accel, jint identifier, jint index)
+Java_org_trinitydesktop_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QKeySequence_2II(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member, jobject accel, jint identifier, jint index)
 {
-	identifier = Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2II(env, obj, text, identifier, index);
+	identifier = Java_org_trinitydesktop_qt_QMenuData_insertItem__Ljava_lang_String_2II(env, obj, text, identifier, index);
 
-	if ((bool) Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member)) {
-		Java_org_kde_qt_QMenuData_setAccel(env, obj, accel, identifier);
+	if ((bool) Java_org_trinitydesktop_qt_QMenuData_connectItem(env, obj, identifier, receiver, member)) {
+		Java_org_trinitydesktop_qt_QMenuData_setAccel(env, obj, accel, identifier);
 	}
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2II(env, obj, text, -1, -1);
-	Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuData_insertItem__Ljava_lang_String_2II(env, obj, text, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member)
 {
 static TQString * _qstring_text = 0;
-	jint identifier = Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1);
-	Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
 	
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject pixmap, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject pixmap, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QPixmap_2II(env, obj, pixmap, -1, -1);
-	Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QPixmap_2II(env, obj, pixmap, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jobject pixmap, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jobject pixmap, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2II(env, obj, icon, pixmap, -1, -1);
-	Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuData_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2II(env, obj, icon, pixmap, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuData_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QMenuData_connectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuData_connectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
 {
 	JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member);
 
@@ -1479,7 +1479,7 @@ Java_org_kde_qt_QMenuData_connectItem(JNIEnv *env, jobject obj, jint identifier,
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QMenuData_disconnectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuData_disconnectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
 {
 	JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member);
 
@@ -1497,56 +1497,56 @@ EOF
 
 	$qmenubarjniExtras = <<EOF;
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QKeySequence_2II(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member, jobject accel, jint identifier, jint index)
+Java_org_trinitydesktop_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QKeySequence_2II(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member, jobject accel, jint identifier, jint index)
 {
-	identifier = Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2II(env, obj, text, identifier, index);
+	identifier = Java_org_trinitydesktop_qt_QMenuBar_insertItem__Ljava_lang_String_2II(env, obj, text, identifier, index);
 
-	if ((bool) Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member)) {
-		Java_org_kde_qt_QMenuBar_setAccel(env, obj, accel, identifier);
+	if ((bool) Java_org_trinitydesktop_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member)) {
+		Java_org_trinitydesktop_qt_QMenuBar_setAccel(env, obj, accel, identifier);
 	}
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jstring text, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2II(env, obj, text, -1, -1);
-	Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuBar_insertItem__Ljava_lang_String_2II(env, obj, text, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member)
 {
 static TQString * _qstring_text = 0;
-	jint identifier = Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1);
-	Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
 	
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject pixmap, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject pixmap, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QPixmap_2II(env, obj, pixmap, -1, -1);
-	Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QPixmap_2II(env, obj, pixmap, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jint JNICALL
-Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jobject pixmap, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jobject pixmap, jobject receiver, jstring member)
 {
-	jint identifier = Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Lorg_kde_qt_QPixmap_2II(env, obj, icon, pixmap, -1, -1);
-	Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
+	jint identifier = Java_org_trinitydesktop_qt_QMenuBar_insertItem__Lorg_trinitydesktop_qt_QIconSet_2Lorg_trinitydesktop_qt_QPixmap_2II(env, obj, icon, pixmap, -1, -1);
+	Java_org_trinitydesktop_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member);
 
 	return identifier;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QMenuBar_connectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuBar_connectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
 {
 	JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member);
 
@@ -1561,7 +1561,7 @@ Java_org_kde_qt_QMenuBar_connectItem(JNIEnv *env, jobject obj, jint identifier,
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QMenuBar_disconnectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
+Java_org_trinitydesktop_qt_QMenuBar_disconnectItem(JNIEnv *env, jobject obj, jint identifier, jobject receiver, jstring member)
 {
 	JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member);
 
@@ -1587,7 +1587,7 @@ EOF
 
 	$quridragjniExtras = <<EOF;
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QUriDrag_decode(JNIEnv *env, jclass cls, jobject e, jobject i)
+Java_org_trinitydesktop_qt_QUriDrag_decode(JNIEnv *env, jclass cls, jobject e, jobject i)
 {
 static TQStrList * _qlist_i = 0;
 	if (_qlist_i == 0) {
@@ -1600,7 +1600,7 @@ static TQStrList * _qlist_i = 0;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QUriDrag_decodeToUnicodeUris(JNIEnv *env, jclass cls, jobject e, jobject i)
+Java_org_trinitydesktop_qt_QUriDrag_decodeToUnicodeUris(JNIEnv *env, jclass cls, jobject e, jobject i)
 {
 static TQStringList * _qlist_i = 0;
 	if (_qlist_i == 0) {
@@ -1613,7 +1613,7 @@ static TQStringList * _qlist_i = 0;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_qt_QUriDrag_decodeLocalFiles(JNIEnv *env, jclass cls, jobject e, jobject i)
+Java_org_trinitydesktop_qt_QUriDrag_decodeLocalFiles(JNIEnv *env, jclass cls, jobject e, jobject i)
 {
 static TQStringList * _qlist_i = 0;
 	if (_qlist_i == 0) {
@@ -1636,14 +1636,14 @@ EOF
 EOF
 
 	$kapplicationjniExtras = <<EOF;
-#include <kdejava/KDEJavaSlot.h>
+#include <tdejava/TDEJavaSlot.h>
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
+Java_org_trinitydesktop_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
 {
 	(void) env;
 	(void) cls;
-	JavaSlot::setJavaSlotFactory(new KDEJavaSlotFactory());
+	JavaSlot::setJavaSlotFactory(new TDEJavaSlotFactory());
 	return;
 }
 	
@@ -1676,7 +1676,7 @@ EOF
 	
 	$tdemainwindowjniExtras = <<EOF;
 JNIEXPORT jobject JNICALL
-Java_org_kde_koala_TDEMainWindow_memberList(JNIEnv* env, jobject obj)
+Java_org_trinitydesktop_koala_TDEMainWindow_memberList(JNIEnv* env, jobject obj)
 {
 	return (jobject) KDESupport::arrayWithTDEMainWindowList(env, TDEMainWindow::memberList);
 }
@@ -1685,7 +1685,7 @@ EOF
 	
 	$kcmdlineargsjniExtras = <<EOF;
 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 cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version)
+Java_org_trinitydesktop_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;
@@ -1698,7 +1698,7 @@ static TQCString* _qstring__version = 0;
 }
 
 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 cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noKApp)
+Java_org_trinitydesktop_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;
@@ -1711,7 +1711,7 @@ static TQCString* _qstring__version = 0;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
+Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
@@ -1720,7 +1720,7 @@ Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEA
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
+Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
 {
 	(void) cls;
 	int argc = (int) env->GetArrayLength(args);
@@ -1732,7 +1732,7 @@ EOF
 
 	$schedulerjniExtras = <<EOF;
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Scheduler_connect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring signal, jobject receiver, jstring member)
+Java_org_trinitydesktop_koala_Scheduler_connect__Ljava_lang_String_2Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jstring signal, jobject receiver, jstring member)
 {
 	(void) cls;
 	JavaSlot *		javaSlot = QtSupport::slotForReceiver(env, receiver, member);
@@ -1742,13 +1742,13 @@ Java_org_kde_koala_Scheduler_connect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lj
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Scheduler_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject sender, jstring signal, jstring member)
+Java_org_trinitydesktop_koala_Scheduler_connect__Lorg_trinitydesktop_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject sender, jstring signal, jstring member)
 {
 	return QtSupport::connect(env, sender, signal, obj, member);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_org_kde_koala_Scheduler_disconnect(JNIEnv *env, jclass cls, jobject sender, jstring signal, jobject receiver, jstring member)
+Java_org_trinitydesktop_koala_Scheduler_disconnect(JNIEnv *env, jclass cls, jobject sender, jstring signal, jobject receiver, jstring member)
 {
 	(void) cls;
 	return QtSupport::disconnect(env, sender, signal, receiver, member);
@@ -1781,9 +1781,9 @@ sub javaImport($)
 	} elsif ( cplusplusToJava($classname_ptr) =~ /^[a-z]/ ) {
 		return "";
 	} elsif ( $classname =~ /^Q/ ) {
-		return "org.kde.qt." . $classname;
+		return "org.trinitydesktop.qt." . $classname;
 	} else {
-		return "org.kde.koala." . $classname;
+		return "org.trinitydesktop.koala." . $classname;
 	}
 }
 	
@@ -1823,18 +1823,18 @@ sub cplusplusToJava
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QIconDragItemValueList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QPixmapValueList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_QCStringList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_QCStringList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QObjectList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\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*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KURLList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_TDEMainWindow\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileItemList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileViewItemList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_DOMNodeList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_StyleSheetList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/
 				|| $cplusplusType =~ /TQMemArray<TQRect>/
 				|| $cplusplusType =~ /TQArray<TQRect>/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) {
@@ -1861,7 +1861,7 @@ sub cplusplusToJava
         } else {
 			return $1;
 		}
-	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) {
+	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) {
 		if ( kalyptusDataDict::interfacemap($1) ne () ) {
 			return $1."Interface";
         } else {
@@ -1992,9 +1992,9 @@ sub cplusplusToJNISignature
 	} elsif ( $javaType =~ /double\[\]/ ) {
 		return "_3D";
 	} elsif ( $javaType =~ /^Q/ ) {
-		return "Lorg_kde_qt_$javaType"."_2";
+		return "Lorg_trinitydesktop_qt_$javaType"."_2";
 	} elsif ( $javaType =~ /^[A-Z]/ ) {
-		return "Lorg_kde_koala_$javaType"."_2";
+		return "Lorg_trinitydesktop_koala_$javaType"."_2";
 	} elsif ( $javaType =~ /^boolean\s*/ ) {
 		return "Z";
 	} elsif ( $javaType =~ /^byte\s*/ ) {
@@ -2298,7 +2298,7 @@ sub jniToReturnValue($$$)
 		my $className = $cplusplusType;
 		$className =~ s/[\*\&]|const //g;
 		$returnCall = "\tjobject xret = QtSupport::objectForQtKey(env, (void*)";
-		my $fullyQualifiedReturnType = ($javaType =~ /^Q/ ? "org.kde.qt.$javaType" : "org.kde.koala.$javaType");
+		my $fullyQualifiedReturnType = ($javaType =~ /^Q/ ? "org.trinitydesktop.qt.$javaType" : "org.trinitydesktop.koala.$javaType");
 		if ($cplusplusType =~ /\*/) {
 			$returnCall .= "$functionCall, \"$fullyQualifiedReturnType\");\n";
 		} elsif ($cplusplusType =~ /\&/) {
@@ -2806,8 +2806,8 @@ sub writeClassDoc
 #	my $fileName  = join( "__", kdocAstUtil::heritage($node) );
 	print "Enter: $className\n" if $debug;
 	
-	my $typeprefix = ($className =~ /^Q/ ? "qt_" : "kde_");
-	my $packagename = ($typeprefix eq 'qt_' ? "org.kde.qt" : "org.kde.koala");
+	my $typeprefix = ($className =~ /^Q/ ? "qt_" : "tde_");
+	my $packagename = ($typeprefix eq 'qt_' ? "org.trinitydesktop.qt" : "org.trinitydesktop.koala");
 	
 	# Write out the *.java file
 	my $classFile = "$outputdir/$fileName.java";
@@ -2889,7 +2889,7 @@ sub writeClassDoc
 			# Special case these two classes as they have methods that use ArrayList added as 'extras'
 	    	print CLASS "import java.util.ArrayList;\n";
 		}
-	    print CLASS "import org.kde.qt.Qt;\n";
+	    print CLASS "import org.trinitydesktop.qt.Qt;\n";
 	}
 	
 	if ( kalyptusDataDict::interfacemap($javaClassName) ne () ) {
@@ -2936,7 +2936,7 @@ sub writeClassDoc
 				$ancestor =~ s/^.*:://;
 				$classdec .= "$ancestor ";
 				if ( $typeprefix ne 'qt_' and $ancestor =~ /^Q/ ) {
-					print CLASS "import org.kde.qt.$ancestor;\n";
+					print CLASS "import org.trinitydesktop.qt.$ancestor;\n";
 				}
 				last;
 			}
@@ -3015,7 +3015,7 @@ sub writeClassDoc
 	if ( $className eq 'Qt' ) {
 		if ($main::qt_embedded) {
 			$qtExtras =~ s/public static native TQCursor whatsThisCursor\(\);//;
-			$qtjniExtras =~ s/JNIEXPORT jobject JNICALL\nJava_org_kde_qt_Qt_whatsThisCursor[^}]*}//;
+			$qtjniExtras =~ s/JNIEXPORT jobject JNICALL\nJava_org_trinitydesktop_qt_Qt_whatsThisCursor[^}]*}//;
 		}
 		print CLASS $qtExtras;
 		$jniCode .= $qtjniExtras;
@@ -3098,17 +3098,17 @@ sub writeClassDoc
 	}	
 	
 	print JNISOURCE "\n";
-	print JNISOURCE "#include <ntqtjava/QtSupport.h>\n";
+	print JNISOURCE "#include <qtjava/QtSupport.h>\n";
 	
 	if ($jniCode =~ /JavaSlot/) {
-		print JNISOURCE "#include <ntqtjava/JavaSlot.h>\n";
+		print JNISOURCE "#include <qtjava/JavaSlot.h>\n";
 	}
 	
 	if ( $typeprefix eq "qt_" ) {
-		print JNISOURCE "#include <ntqtjava/$javaClassName" . ".h>\n";
+		print JNISOURCE "#include <qtjava/$javaClassName" . ".h>\n";
 	} else {
-		print JNISOURCE "#include <kdejava/KDESupport.h>\n";
-		print JNISOURCE "#include <kdejava/$javaClassName" . ".h>\n";
+		print JNISOURCE "#include <tdejava/TDESupport.h>\n";
+		print JNISOURCE "#include <tdejava/$javaClassName" . ".h>\n";
 	}
 	
 	if ($javaClassName eq 'TDEIO') {
@@ -3234,7 +3234,7 @@ sub jniMethodSignature($$$$$) {
 	my $javaClassName = shift;
 	my $javaArgList = shift;
 	
-	my $sig = ($javaClassName =~ /^Q/ ? "Java_org_kde_qt_" : "Java_org_kde_koala_");
+	my $sig = ($javaClassName =~ /^Q/ ? "Java_org_trinitydesktop_qt_" : "Java_org_trinitydesktop_koala_");
     $sig .= $javaClassName . "_";
 	$methodname =~ s/_/_1/g;
 	$sig .= $methodname . "__";
@@ -4147,7 +4147,7 @@ sub generateAllMethods($$$$$$$$)
     #my $className = $classNode->{astNodeName};
     my $className = join( "::", kdocAstUtil::heritage($classNode) );
 	my $javaClassName = $mainClassNode->{astNodeName};
-    my $jniClassName = ($classNode->{astNodeName} =~ /^Q/ ? "Java_org_kde_qt_" : "Java_org_kde_koala_") . $classNode->{astNodeName};
+    my $jniClassName = ($classNode->{astNodeName} =~ /^Q/ ? "Java_org_trinitydesktop_qt_" : "Java_org_trinitydesktop_koala_") . $classNode->{astNodeName};
 	# If the C++ class had multiple inheritance, then the code for all but one of the
 	# parents must be copied into the code for javaClassName. Hence, for TQWidget current
 	# classname might be TQPaintDevice, as its methods are needed in TQWidget.
@@ -4171,7 +4171,7 @@ sub generateAllMethods($$$$$$$$)
 #        }
 	}
 	
-    $addImport->{"org.kde.qt.QtSupport"} = 1;
+    $addImport->{"org.trinitydesktop.qt.QtSupport"} = 1;
 	
     # Do all enums first, anonymous ones and then named enums
     Iter::MembersByType ( $classNode, undef,
@@ -4351,17 +4351,17 @@ sub virtualMethodCallbacks
 
 			my $qobjectType = $node->{astNodeName};
 			$qobjectType =~ s/(.*)\*.*$/$1/;
-			$qobjectType =~ s/^([^Q].*)/org.kde.koala.$1/;
-			$qobjectType =~ s/^(Q.*)/org.kde.qt.$1/;
+			$qobjectType =~ s/^([^Q].*)/org.trinitydesktop.koala.$1/;
+			$qobjectType =~ s/^(Q.*)/org.trinitydesktop.qt.$1/;
 			if( $m->{ReturnType} eq 'void' && $#argTypeList eq 0 
-				&& cplusplusToJNISignature( @argTypeList[0] ) =~ /Lorg_kde/
+				&& cplusplusToJNISignature( @argTypeList[0] ) =~ /Lorg_trinitydesktop/
 				&& $isTQObject )
 			{
 				@castedArgList = makeCastedArgList( @argTypeList );
 				my $eventType = cplusplusToJava( @argTypeList[0] );
 				$eventType =~ s/(.*)\*.*$/$1/;
-				$eventType =~ s/^([^Q].*)/org.kde.koala.$1/;
-				$eventType =~ s/^(Q.*)/org.kde.qt.$1/;
+				$eventType =~ s/^([^Q].*)/org.trinitydesktop.koala.$1/;
+				$eventType =~ s/^(Q.*)/org.trinitydesktop.qt.$1/;
 				$jbridgeCode .= "\tvoid $name(@castedArgList[0..$#argTypeList]) {\n";
 				$jbridgeCode .= "\t\tif (!QtSupport::eventDelegate(this,\"$name\",(void*)" . (@argTypeList[0] =~ /\*/ ? "" : "&") . "arg1,\"$eventType\")) {\n";
 				$jbridgeCode .= "\t\t\t" . $parent->{astNodeName} . "::" . "$name(arg1);\n";
@@ -4552,7 +4552,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
@@ -5558,8 +5558,8 @@ sub printJavadocComment($$$$)
 			$text =~ s/\./#/g;
 			$text =~ s/\(\)//g;
 			$text =~ s/^\s*([a-z].*)/#$1/g;
-			$text =~ s/^\s*Q/org.kde.qt.Q/g;
-#			$text =~ s/^\s*K/org.kde.koala.K/g;
+			$text =~ s/^\s*Q/org.trinitydesktop.qt.Q/g;
+#			$text =~ s/^\s*K/org.trinitydesktop.koala.K/g;
 			$returntext .= "\t\t\@see $text\n";
 		}
 	}	
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index ddc245b..41e33ef 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -143,18 +143,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TQ_INT16' => 'short',
-   'TQ_INT32' => 'int',
-   'TQ_INT64' => 'long',
-   'TQ_INT8' => 'char',
-   'TQ_LONG' => 'long',
-   'TQ_LLONG' => 'long',
+   'TTQ_INT16' => 'short',
+   'TTQ_INT32' => 'int',
+   'TTQ_INT64' => 'long',
+   'TTQ_INT8' => 'char',
+   'TTQ_LONG' => 'long',
+   'TTQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TQ_UINT16' => 'ushort',
-   'TQ_UINT32' => 'uint',
-   'TQ_UINT64' => 'long',
-   'TQ_UINT8' => 'uchar',
-   'TQ_ULONG' => 'long',
+   'TTQ_UINT16' => 'ushort',
+   'TTQ_UINT32' => 'uint',
+   'TTQ_UINT64' => 'long',
+   'TTQ_UINT8' => 'uchar',
+   'TTQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
@@ -517,9 +517,9 @@ sub javaImport($)
 	} elsif ( cplusplusToJava($classname_ptr) =~ /^[a-z]/ ) {
 		return "";
 	} elsif ( $classname =~ /^Q/ ) {
-		return "org.kde.qt." . $classname;
+		return "org.trinitydesktop.qt." . $classname;
 	} else {
-		return "org.kde.koala." . $classname;
+		return "org.trinitydesktop.koala." . $classname;
 	}
 }
 	
@@ -557,18 +557,18 @@ sub cplusplusToJava
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QIconDragItemValueList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QPixmapValueList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_QCStringList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_QCStringList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QObjectList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\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*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KURLList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_TDEMainWindow\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileItemList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileViewItemList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_DOMNodeList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_StyleSheetList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/
 				|| $cplusplusType =~ /TQMemArray<TQRect>/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) {
 		return "ArrayList"
@@ -594,7 +594,7 @@ sub cplusplusToJava
         } else {
 			return $1;
 		}
-	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) {
+	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) {
 		if ( kalyptusDataDict::interfacemap($1) ne () ) {
 			return $1."Interface";
         } else {
@@ -1101,8 +1101,8 @@ sub writeClassDoc
 #	my $fileName  = join( "__", kdocAstUtil::heritage($node) );
 	print "Enter: $className\n" if $debug;
 	
-	my $typeprefix = ($className =~ /^Q/ ? "qt_" : "kde_");
-	my $packagename = ($typeprefix eq 'qt_' ? "org.kde.qt" : "org.kde.koala");
+	my $typeprefix = ($className =~ /^Q/ ? "qt_" : "tde_");
+	my $packagename = ($typeprefix eq 'qt_' ? "org.trinitydesktop.qt" : "org.trinitydesktop.koala");
 	
 	# Write out the *.java file
 	my $classFile = "$outputdir/$fileName.java";
@@ -1114,7 +1114,7 @@ sub writeClassDoc
 	print CLASS "package $packagename;\n\n";
 	
 	print CLASS "import java.lang.reflect.Proxy;\n";
-	print CLASS "import org.kde.qt.SmokeInvocation;\n";
+	print CLASS "import org.trinitydesktop.qt.SmokeInvocation;\n";
 	
 	my %javaMethods = ();
 	my %addImport = ();
@@ -1175,7 +1175,7 @@ sub writeClassDoc
 			# Special case these two classes as they have methods that use ArrayList added as 'extras'
 	    	print CLASS "import java.util.ArrayList;\n";
 		}
-	    print CLASS "import org.kde.qt.Qt;\n";
+	    print CLASS "import org.trinitydesktop.qt.Qt;\n";
 	}
 	
 	if ( kalyptusDataDict::interfacemap($javaClassName) ne () ) {
@@ -1221,7 +1221,7 @@ sub writeClassDoc
 				$ancestor =~ s/^.*:://;
 				$classdec .= "$ancestor ";
 				if ( $typeprefix ne 'qt_' and $ancestor =~ /^Q/ ) {
-					print CLASS "import org.kde.qt.$ancestor;\n";
+					print CLASS "import org.trinitydesktop.qt.$ancestor;\n";
 				}
 				last;
 			}
@@ -2155,7 +2155,7 @@ sub generateAllMethods($$$$$$)
 #        }
 	}
 	
-    $addImport->{"org.kde.qt.QtSupport"} = 1;
+    $addImport->{"org.trinitydesktop.qt.QtSupport"} = 1;
 	
     # Do all enums first, anonymous ones and then named enums
     Iter::MembersByType ( $classNode, undef,
@@ -2391,7 +2391,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
@@ -3397,8 +3397,8 @@ sub printJavadocComment($$$$)
 			$text =~ s/\./#/g;
 			$text =~ s/\(\)//g;
 			$text =~ s/^\s*([a-z].*)/#$1/g;
-			$text =~ s/^\s*Q/org.kde.qt.Q/g;
-#			$text =~ s/^\s*K/org.kde.koala.K/g;
+			$text =~ s/^\s*Q/org.trinitydesktop.qt.Q/g;
+#			$text =~ s/^\s*K/org.trinitydesktop.koala.K/g;
 			$returntext .= "\t\t\@see $text\n";
 		}
 	}	
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index bdf4f6d..089cec9 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -79,9 +79,9 @@ BEGIN
      'char*' => '$',
      'TQCOORD*' => '?',
      'TQRgb*' => '?',
-     'Q_UINT64' => '$',
-     'Q_INT64' => '$',
-     'Q_LLONG' => '$',
+     'TQ_UINT64' => '$',
+     'TQ_INT64' => '$',
+     'TQ_LLONG' => '$',
      'tquint64' => '$',
      'qint64' => '$',
      'long long' => '$',
@@ -146,21 +146,21 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'Q_INT16' => 'short',
+   'TQ_INT16' => 'short',
    'qint16' => 'short',
-   'Q_INT32' => 'int',
+   'TQ_INT32' => 'int',
    'qint32' => 'int',
    'qint32&' => 'int&',
-   'Q_INT8' => 'char',
+   'TQ_INT8' => 'char',
    'qint8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
    'tquint16' => 'ushort',
-   'Q_UINT32' => 'uint',
+   'TQ_UINT32' => 'uint',
    'tquint32' => 'uint',
-   'Q_UINT8' => 'uchar',
+   'TQ_UINT8' => 'uchar',
    'tquint8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_ULONG' => 'long',
    'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
@@ -553,18 +553,18 @@ sub cplusplusToCSharp
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QIconDragItemValueList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QPixmapValueList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_QCStringList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_QCStringList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QObjectList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\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*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/
-				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KURLList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_TDEMainWindow\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileItemList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileViewItemList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_DOMNodeList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_StyleSheetList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/
+				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/
 				|| $cplusplusType =~ /TQMemArray<TQRect>/
 				|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) {
 		return "ArrayList"
@@ -588,7 +588,7 @@ sub cplusplusToCSharp
         } else {
 			return $1;
 		}
-	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) {
+	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) {
 		if ( defined interfaceForClass($1) ) {
 			return interfaceForClass($1);
         } else {
@@ -1150,7 +1150,7 @@ sub writeClassDoc
 #	my $fileName  = join( "__", kdocAstUtil::heritage($node) );
 	print "Enter: $className\n" if $debug;
 	
-	my $typeprefix = ($className =~ /^Q/ ? "qt_" : "kde_");
+	my $typeprefix = ($className =~ /^Q/ ? "qt_" : "tde_");
 	my $packagename = ($typeprefix eq 'qt_' ? "Qt" : "KDE");
 	
 	# Write out the *.csharp file
@@ -2585,7 +2585,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index a1c5478..fa3722d 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -72,9 +72,9 @@ BEGIN
      'char*' => '$',
      'TQCOORD*' => '?',
      'TQRgb*' => '?',
-     'Q_UINT64' => '$',
-     'Q_INT64' => '$',
-     'Q_LLONG' => '$',
+     'TQ_UINT64' => '$',
+     'TQ_INT64' => '$',
+     'TQ_LLONG' => '$',
      'tquint64' => '$',
      'qint64' => '$',
      'long long' => '$',
@@ -140,21 +140,21 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'Q_INT16' => 'short',
+   'TQ_INT16' => 'short',
    'qint16' => 'short',
-   'Q_INT32' => 'int',
+   'TQ_INT32' => 'int',
    'qint32' => 'int',
    'qint32&' => 'int&',
-   'Q_INT8' => 'char',
+   'TQ_INT8' => 'char',
    'qint8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
    'tquint16' => 'ushort',
-   'Q_UINT32' => 'uint',
+   'TQ_UINT32' => 'uint',
    'tquint32' => 'uint',
-   'Q_UINT8' => 'uchar',
+   'TQ_UINT8' => 'uchar',
    'tquint8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_ULONG' => 'long',
    'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
@@ -919,13 +919,13 @@ my $fhn =1; # static
         map { for my $incl (keys %{$_->[2]}){ $includes{$incl}++ } } @code;
 
 	# Hack - some Qt/KDE headers need other headers included, but omit suitable #includes
-	if (defined $includes{"ntqregexp.h"} || defined $includes{"ntqcstring.h"}) {
-	    print $fh "#include <ntqregexp.h>\n";
-		delete $includes{"ntqregexp.h"};
+	if (defined $includes{"qregexp.h"} || defined $includes{"qcstring.h"}) {
+	    print $fh "#include <qregexp.h>\n";
+		delete $includes{"qregexp.h"};
 	}
-	if (defined $includes{"ntqmime.h"}) {
-	    print $fh "#include <ntqurl.h>\n";
-		delete $includes{"ntqurl.h"};
+	if (defined $includes{"qmime.h"}) {
+	    print $fh "#include <qurl.h>\n";
+		delete $includes{"qurl.h"};
 	}
 	if (defined $includes{"tdeshortcut.h"}) {
 	    print $fh "#include <tdeshortcut.h>\n";
@@ -946,9 +946,9 @@ my $fhn =1; # static
 	    print $fh "#include <$incl>\n";
 	}	
 	if (	$main::qt4
-			and (	defined $includes{"ntqtreewidget.h"} 
-					or defined $includes{"ntqlistwidget.h"} 
-					or defined $includes{"ntqtablewidget.h"} ) ) 
+			and (	defined $includes{"qtreewidget.h"} 
+					or defined $includes{"qlistwidget.h"} 
+					or defined $includes{"qtablewidget.h"} ) ) 
 	{
 	    print $fh "#include \"qwidgetitemdata_p.h\"\n";
 	}
@@ -1893,7 +1893,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
@@ -2469,7 +2469,7 @@ sub writeSmokeDataFile($) {
 		die "'Method index' for enum $sig not found" unless defined $xmethIndex;
 		my $typeId = findTypeEntry( $fullEnumName )->{index};
 		die "enum has no {case} value in $className: $fullEnumName" unless defined $classNode->{case}{$fullEnumName};
-		print OUT "\t{$classIndex, $xmethIndex, 0, 0, Smoke::mf_static, $typeId, $classNode->{case}{$fullEnumName}},\t//$methodCount $fullEnumName (enum)\n";
+		print OUT "\t{$classIndex, $xmethIndex, 0, 0, Smoke::mf_static|Smoke::mf_enum, $typeId, $classNode->{case}{$fullEnumName}},\t//$methodCount $fullEnumName (enum)\n";
 		$allMethods{$sig} = $methodCount;
 		print STDERR "Added entry for " . $sig . " into \$allMethods\n" if ($debug);
 		$methods[$methodCount] = {
@@ -2568,6 +2568,12 @@ sub writeSmokeDataFile($) {
 		my $methodFlags = '0';
 		# Make no distinction between a static method in an ordinary class, or a method in a namespace
 		$methodFlags .= "|Smoke::mf_static" if $m->{Flags} =~ "s" or $classNode->{NodeType} eq 'namespace';
+		$methodFlags .= "|Smoke::mf_const" if $m->{Flags} =~ "c"; # useful?? probably not
+		$methodFlags .= "|Smoke::mf_copyctor" if $m->{Flags} =~ "x";
+		$methodFlags .= "|Smoke::mf_internal" if $m->{Flags} =~ "i";
+		$methodFlags .= "|Smoke::mf_ctor" if $methName eq $className;
+		$methodFlags .= "|Smoke::mf_dtor" if $m->{ReturnType} eq '~';
+		$methodFlags .= "|Smoke::mf_protected" if $m->{Access} =~ /protected/;
 		$methodFlags =~ s/0\|//; # beautify
 		
 		print OUT "\t{$classIndex, $methodIndex, $arglist, $argcnt, $methodFlags, $retTypeIndex, $case},\t//$methodCount $className\::$sig";
diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm
index b4600be..5a568cb 100644
--- a/kalyptus/kalyptusCxxToSwig.pm
+++ b/kalyptus/kalyptusCxxToSwig.pm
@@ -82,14 +82,14 @@ BEGIN
    'TQStyle::SFlags' => 'int',
    'TQStyleOption&' => 'int&',
    'const TQStyleOption&' => 'const int&',
-   'Q_INT16' => 'short',
-   'Q_INT32' => 'int',
-   'Q_INT8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
-   'Q_UINT32' => 'uint',
-   'Q_UINT8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
 );
 	# Page footer
 
@@ -776,15 +776,15 @@ sub writeClassDoc
   my $typeName = $node->{astNodeName}."*";
 
   if ( kalyptusDataDict::ctypemap($typeName) eq "" ) {
-    $typeprefix = ($typeName =~ /^Q/ ? "qt_" : "kde_");
+    $typeprefix = ($typeName =~ /^Q/ ? "qt_" : "tde_");
     kalyptusDataDict::setctypemap($typeName, $typeprefix.$node->{astNodeName}."*");
     print "'$typeName' => '$typeprefix$typeName',\n";
   } elsif ( kalyptusDataDict::ctypemap($typeName) =~ /^qt_/ ) {
     $typeprefix = "qt_";
-  } elsif ( kalyptusDataDict::ctypemap($typeName) =~ /^kde_/ ) {
-		$typeprefix = "kde_";
+  } elsif ( kalyptusDataDict::ctypemap($typeName) =~ /^tde_/ ) {
+		$typeprefix = "tde_";
 	      } else {
-		$typeprefix = "kde_";
+		$typeprefix = "tde_";
 	      }
 
   my $basefile =  "$typeprefix".join("__", kdocAstUtil::heritage($node)).".i";
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index c691169..0d769c5 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -61,426 +61,426 @@ BEGIN
 # C, Objective-C and Java.
 %ctypemap = (
 
-'ASConsumer*' => 'kde_ASConsumer*',
-'ASProducer*' => 'kde_ASProducer*',
+'ASConsumer*' => 'tde_ASConsumer*',
+'ASProducer*' => 'tde_ASProducer*',
 'ASYNC'  =>  'void' ,
-'Address&'  =>  'kde_Address*' ,
-'Address*' => 'kde_Address*',
-'AddressBook*' => 'kde_AddressBook*',
-'AddressBook::Entry&'  =>  'kde_Entry*' ,
-'Addressee&' => 'kde_Addressee*',
-'Addressee*' => 'kde_Addressee*',
-'AddresseeData*' => 'kde_AddresseeData*',
-'AddresseeDialog*' => 'kde_AddresseeDialog*',
-'AddresseeItem*' => 'kde_AddresseeItem*',
-'AlsaOut*' => 'kde_AlsaOut*',
-'AnyConstRef&' => 'kde_AnyConstRef*',
-'AnyConstRef*' => 'kde_AnyConstRef*',
-'AnyRef&' => 'kde_AnyRef*',
-'AnyRef*' => 'kde_AnyRef*',
-'AnyRefBase&' => 'kde_AnyRefBase*',
-'AnyRefBase*' => 'kde_AnyRefBase*',
+'Address&'  =>  'tde_Address*' ,
+'Address*' => 'tde_Address*',
+'AddressBook*' => 'tde_AddressBook*',
+'AddressBook::Entry&'  =>  'tde_Entry*' ,
+'Addressee&' => 'tde_Addressee*',
+'Addressee*' => 'tde_Addressee*',
+'AddresseeData*' => 'tde_AddresseeData*',
+'AddresseeDialog*' => 'tde_AddresseeDialog*',
+'AddresseeItem*' => 'tde_AddresseeItem*',
+'AlsaOut*' => 'tde_AlsaOut*',
+'AnyConstRef&' => 'tde_AnyConstRef*',
+'AnyConstRef*' => 'tde_AnyConstRef*',
+'AnyRef&' => 'tde_AnyRef*',
+'AnyRef*' => 'tde_AnyRef*',
+'AnyRefBase&' => 'tde_AnyRefBase*',
+'AnyRefBase*' => 'tde_AnyRefBase*',
 'ArgList'  =>  'int' ,
 'ArrowType'  =>  'int' ,
-'Arts*' => 'kde_Arts*',
+'Arts*' => 'tde_Arts*',
 'Arts::AudioManagerClient' => 'int',
-'Arts::Buffer&' => 'kde_Arts_Buffer*',
-'Arts::Buffer*' => 'kde_Arts_Buffer*',
-'Arts::ByteSoundProducer' => 'kde_Arts_ByteSoundProducer*',
-'Arts::Connection*' => 'kde_Arts_Connection*',
-'Arts::DynamicCast&' => 'kde_Arts_DynamicCast*',
-'Arts::FlowSystemReceiver' => 'kde_Arts_FlowSystemReceiver*',
-'Arts::FlowSystemSender' => 'kde_Arts_FlowSystemSender*',
-'Arts::Format&' => 'kde_Arts_Format*',
-'Arts::Format' => 'kde_Arts_Format',
-'Arts::GenericAsyncStream*' => 'kde_Arts_GenericAsyncStream*',
-'Arts::GenericDataChannel*' => 'kde_Arts_GenericDataChannel*',
-'Arts::InterfaceDef' => 'kde_Arts_InterfaceDef*',
-'Arts::MethodDef&' => 'kde_Arts_MethodDef*',
-'Arts::ModuleDef&' => 'kde_Arts_ModuleDef*',
-'Arts::Notification&' => 'kde_Arts_Notification*',
-'Arts::Object' => 'kde_Arts_Object*',
-'Arts::Object::Pool&' => 'kde_Arts_Object_Pool*',
-'Arts::ObjectReference' => 'kde_Arts_ObjectReference*',
-'Arts::PlayObject' => 'kde_Arts_PlayObject*',
-'Arts::Reference&' => 'kde_Arts_Reference*',
-'Arts::StereoEffect' => 'kde_Arts_StereoEffect*',
-'Arts::StereoEffectStack' => 'kde_Arts_StereoEffectStack*',
-'Arts::SubClass&' => 'kde_Arts_SubClass*',
-'Arts::TypeDef' => 'kde_Arts_TypeDef*',
-'Arts::poTime&' => 'kde_Arts_poTime*',
-'Arts::poTime' => 'kde_Arts_poTime',
-'AsyncStream*' => 'kde_AsyncStream*',
-'Attr&' => 'kde_Attr*',
-'Attr' => 'kde_Attr*',
-'Attr*' => 'kde_Attr*',
-'AttrImpl*' => 'kde_AttrImpl*',
-'AttributeDef&' => 'kde_AttributeDef*',
-'AttributeDef*' => 'kde_AttributeDef*',
-'AudioManager&' => 'kde_AudioManager*',
-'AudioManager' => 'kde_AudioManager*',
-'AudioManager*' => 'kde_AudioManager*',
-'AudioManagerClient&' => 'kde_AudioManagerClient*',
-'AudioManagerClient' => 'kde_AudioManagerClient*',
-'AudioManagerClient*' => 'kde_AudioManagerClient*',
-'AudioManagerClient_base*' => 'kde_AudioManagerClient_base*',
-'AudioManagerClient_skel*' => 'kde_AudioManagerClient_skel*',
-'AudioManagerClient_stub*' => 'kde_AudioManagerClient_stub*',
-'AudioManagerInfo&' => 'kde_AudioManagerInfo*',
-'AudioManagerInfo*' => 'kde_AudioManagerInfo*',
-'AudioManager_base*' => 'kde_AudioManager_base*',
-'AudioManager_skel*' => 'kde_AudioManager_skel*',
-'AudioManager_stub*' => 'kde_AudioManager_stub*',
-'AudioPort*' => 'kde_AudioPort*',
-'AudioSubSystem*' => 'kde_AudioSubSystem*',
-'AudioSubSystemStart*' => 'kde_AudioSubSystemStart*',
-'AuthAccept&' => 'kde_AuthAccept*',
-'AuthAccept*' => 'kde_AuthAccept*',
+'Arts::Buffer&' => 'tde_Arts_Buffer*',
+'Arts::Buffer*' => 'tde_Arts_Buffer*',
+'Arts::ByteSoundProducer' => 'tde_Arts_ByteSoundProducer*',
+'Arts::Connection*' => 'tde_Arts_Connection*',
+'Arts::DynamicCast&' => 'tde_Arts_DynamicCast*',
+'Arts::FlowSystemReceiver' => 'tde_Arts_FlowSystemReceiver*',
+'Arts::FlowSystemSender' => 'tde_Arts_FlowSystemSender*',
+'Arts::Format&' => 'tde_Arts_Format*',
+'Arts::Format' => 'tde_Arts_Format',
+'Arts::GenericAsyncStream*' => 'tde_Arts_GenericAsyncStream*',
+'Arts::GenericDataChannel*' => 'tde_Arts_GenericDataChannel*',
+'Arts::InterfaceDef' => 'tde_Arts_InterfaceDef*',
+'Arts::MethodDef&' => 'tde_Arts_MethodDef*',
+'Arts::ModuleDef&' => 'tde_Arts_ModuleDef*',
+'Arts::Notification&' => 'tde_Arts_Notification*',
+'Arts::Object' => 'tde_Arts_Object*',
+'Arts::Object::Pool&' => 'tde_Arts_Object_Pool*',
+'Arts::ObjectReference' => 'tde_Arts_ObjectReference*',
+'Arts::PlayObject' => 'tde_Arts_PlayObject*',
+'Arts::Reference&' => 'tde_Arts_Reference*',
+'Arts::StereoEffect' => 'tde_Arts_StereoEffect*',
+'Arts::StereoEffectStack' => 'tde_Arts_StereoEffectStack*',
+'Arts::SubClass&' => 'tde_Arts_SubClass*',
+'Arts::TypeDef' => 'tde_Arts_TypeDef*',
+'Arts::poTime&' => 'tde_Arts_poTime*',
+'Arts::poTime' => 'tde_Arts_poTime',
+'AsyncStream*' => 'tde_AsyncStream*',
+'Attr&' => 'tde_Attr*',
+'Attr' => 'tde_Attr*',
+'Attr*' => 'tde_Attr*',
+'AttrImpl*' => 'tde_AttrImpl*',
+'AttributeDef&' => 'tde_AttributeDef*',
+'AttributeDef*' => 'tde_AttributeDef*',
+'AudioManager&' => 'tde_AudioManager*',
+'AudioManager' => 'tde_AudioManager*',
+'AudioManager*' => 'tde_AudioManager*',
+'AudioManagerClient&' => 'tde_AudioManagerClient*',
+'AudioManagerClient' => 'tde_AudioManagerClient*',
+'AudioManagerClient*' => 'tde_AudioManagerClient*',
+'AudioManagerClient_base*' => 'tde_AudioManagerClient_base*',
+'AudioManagerClient_skel*' => 'tde_AudioManagerClient_skel*',
+'AudioManagerClient_stub*' => 'tde_AudioManagerClient_stub*',
+'AudioManagerInfo&' => 'tde_AudioManagerInfo*',
+'AudioManagerInfo*' => 'tde_AudioManagerInfo*',
+'AudioManager_base*' => 'tde_AudioManager_base*',
+'AudioManager_skel*' => 'tde_AudioManager_skel*',
+'AudioManager_stub*' => 'tde_AudioManager_stub*',
+'AudioPort*' => 'tde_AudioPort*',
+'AudioSubSystem*' => 'tde_AudioSubSystem*',
+'AudioSubSystemStart*' => 'tde_AudioSubSystemStart*',
+'AuthAccept&' => 'tde_AuthAccept*',
+'AuthAccept*' => 'tde_AuthAccept*',
 'BGMode' => 'int',
-'BMToken*' => 'kde_BMToken*',
+'BMToken*' => 'tde_BMToken*',
 'BackgroundMode' => 'int',
-'BlockSelectionInterface*' => 'kde_BlockSelectionInterface*',
-'BookmarkTokenizer*' => 'kde_BookmarkTokenizer*',
+'BlockSelectionInterface*' => 'tde_BlockSelectionInterface*',
+'BookmarkTokenizer*' => 'tde_BookmarkTokenizer*',
 'Bool'  =>  'int' ,
-'Boolean&' => 'kde_Boolean*',
-'Boolean*' => 'kde_Boolean*',
-'BrowserExtension*' => 'kde_BrowserExtension*',
-'BrowserHostExtension*' => 'kde_BrowserHostExtension*',
-'BrowserInterface*' => 'kde_BrowserInterface*',
+'Boolean&' => 'tde_Boolean*',
+'Boolean*' => 'tde_Boolean*',
+'BrowserExtension*' => 'tde_BrowserExtension*',
+'BrowserHostExtension*' => 'tde_BrowserHostExtension*',
+'BrowserInterface*' => 'tde_BrowserInterface*',
 'BrushStyle' => 'int',
-'Buffer&' => 'kde_Buffer*',
-'Buffer*' => 'kde_Buffer*',
+'Buffer&' => 'tde_Buffer*',
+'Buffer*' => 'tde_Buffer*',
 'ButtonCode'  =>  'int' ,
 'ButtonState'  =>  'int' ,
-'ByteAsyncStream*' => 'kde_ByteAsyncStream*',
-'ByteDataPacket*' => 'kde_ByteDataPacket*',
-'ByteSoundProducer&' => 'kde_ByteSoundProducer*',
-'ByteSoundProducer' => 'kde_ByteSoundProducer*',
-'ByteSoundProducer*' => 'kde_ByteSoundProducer*',
-'ByteSoundProducer_base*' => 'kde_ByteSoundProducer_base*',
-'ByteSoundProducer_skel*' => 'kde_ByteSoundProducer_skel*',
-'ByteSoundProducer_stub*' => 'kde_ByteSoundProducer_stub*',
-'ByteStreamToAudio&' => 'kde_ByteStreamToAudio*',
-'ByteStreamToAudio' => 'kde_ByteStreamToAudio*',
-'ByteStreamToAudio*' => 'kde_ByteStreamToAudio*',
-'ByteStreamToAudio_base*' => 'kde_ByteStreamToAudio_base*',
-'ByteStreamToAudio_skel*' => 'kde_ByteStreamToAudio_skel*',
-'ByteStreamToAudio_stub*' => 'kde_ByteStreamToAudio_stub*',
-'CDATASection&' => 'kde_CDATASection*',
-'CDATASection' => 'kde_CDATASection*',
-'CDATASection*' => 'kde_CDATASection*',
+'ByteAsyncStream*' => 'tde_ByteAsyncStream*',
+'ByteDataPacket*' => 'tde_ByteDataPacket*',
+'ByteSoundProducer&' => 'tde_ByteSoundProducer*',
+'ByteSoundProducer' => 'tde_ByteSoundProducer*',
+'ByteSoundProducer*' => 'tde_ByteSoundProducer*',
+'ByteSoundProducer_base*' => 'tde_ByteSoundProducer_base*',
+'ByteSoundProducer_skel*' => 'tde_ByteSoundProducer_skel*',
+'ByteSoundProducer_stub*' => 'tde_ByteSoundProducer_stub*',
+'ByteStreamToAudio&' => 'tde_ByteStreamToAudio*',
+'ByteStreamToAudio' => 'tde_ByteStreamToAudio*',
+'ByteStreamToAudio*' => 'tde_ByteStreamToAudio*',
+'ByteStreamToAudio_base*' => 'tde_ByteStreamToAudio_base*',
+'ByteStreamToAudio_skel*' => 'tde_ByteStreamToAudio_skel*',
+'ByteStreamToAudio_stub*' => 'tde_ByteStreamToAudio_stub*',
+'CDATASection&' => 'tde_CDATASection*',
+'CDATASection' => 'tde_CDATASection*',
+'CDATASection*' => 'tde_CDATASection*',
 'CFlags' => 'int',
 'COORD'  =>  'short' ,
-'CSSCharsetRule&' => 'kde_CSSCharsetRule*',
-'CSSCharsetRule*' => 'kde_CSSCharsetRule*',
-'CSSCharsetRuleImpl*' => 'kde_CSSCharsetRuleImpl*',
-'CSSException&' => 'kde_CSSException*',
-'CSSException*' => 'kde_CSSException*',
-'CSSFontFaceRule&' => 'kde_CSSFontFaceRule*',
-'CSSFontFaceRule*' => 'kde_CSSFontFaceRule*',
-'CSSFontFaceRuleImpl*' => 'kde_CSSFontFaceRuleImpl*',
-'CSSImportRule&' => 'kde_CSSImportRule*',
-'CSSImportRule*' => 'kde_CSSImportRule*',
-'CSSImportRuleImpl*' => 'kde_CSSImportRuleImpl*',
-'CSSMediaRule&' => 'kde_CSSMediaRule*',
-'CSSMediaRule*' => 'kde_CSSMediaRule*',
-'CSSMediaRuleImpl*' => 'kde_CSSMediaRuleImpl*',
-'CSSPageRule&' => 'kde_CSSPageRule*',
-'CSSPageRule*' => 'kde_CSSPageRule*',
-'CSSPageRuleImpl*' => 'kde_CSSPageRuleImpl*',
-'CSSPrimitiveValue&' => 'kde_CSSPrimitiveValue*',
-'CSSPrimitiveValue' => 'kde_CSSPrimitiveValue*',
-'CSSPrimitiveValue*' => 'kde_CSSPrimitiveValue*',
-'CSSPrimitiveValueImpl*' => 'kde_CSSPrimitiveValueImpl*',
-'CSSRule&' => 'kde_CSSRule*',
-'CSSRule' => 'kde_CSSRule*',
-'CSSRule*' => 'kde_CSSRule*',
-'CSSRuleImpl*' => 'kde_CSSRuleImpl*',
-'CSSRuleList&' => 'kde_CSSRuleList*',
-'CSSRuleList' => 'kde_CSSRuleList*',
-'CSSRuleList*' => 'kde_CSSRuleList*',
-'CSSRuleListImpl*' => 'kde_CSSRuleListImpl*',
-'CSSStyleDeclaration&' => 'kde_CSSStyleDeclaration*',
-'CSSStyleDeclaration' => 'kde_CSSStyleDeclaration*',
-'CSSStyleDeclaration*' => 'kde_CSSStyleDeclaration*',
-'CSSStyleDeclarationImpl*' => 'kde_CSSStyleDeclarationImpl*',
-'CSSStyleRule&' => 'kde_CSSStyleRule*',
-'CSSStyleRule*' => 'kde_CSSStyleRule*',
-'CSSStyleRuleImpl*' => 'kde_CSSStyleRuleImpl*',
-'CSSStyleSheet&' => 'kde_CSSStyleSheet*',
-'CSSStyleSheet' => 'kde_CSSStyleSheet*',
-'CSSStyleSheet*' => 'kde_CSSStyleSheet*',
-'CSSStyleSheetImpl*' => 'kde_CSSStyleSheetImpl*',
-'CSSUnknownRule&' => 'kde_CSSUnknownRule*',
-'CSSUnknownRule*' => 'kde_CSSUnknownRule*',
-'CSSUnknownRuleImpl*' => 'kde_CSSUnknownRuleImpl*',
-'CSSValue&' => 'kde_CSSValue*',
-'CSSValue' => 'kde_CSSValue*',
-'CSSValue*' => 'kde_CSSValue*',
-'CSSValueImpl*' => 'kde_CSSValueImpl*',
-'CSSValueList&' => 'kde_CSSValueList*',
-'CSSValueList*' => 'kde_CSSValueList*',
-'CSSValueListImpl*' => 'kde_CSSValueListImpl*',
-'CString&' => 'kde_CString*',
-'CString' => 'kde_CString*',
-'CString*' => 'kde_CString*',
-'Cache*' => 'kde_Cache*',
-'CacheInfo*' => 'kde_CacheInfo*',
-'CachedObject*' => 'kde_CachedObject*',
-'CachedWav*' => 'kde_CachedWav*',
+'CSSCharsetRule&' => 'tde_CSSCharsetRule*',
+'CSSCharsetRule*' => 'tde_CSSCharsetRule*',
+'CSSCharsetRuleImpl*' => 'tde_CSSCharsetRuleImpl*',
+'CSSException&' => 'tde_CSSException*',
+'CSSException*' => 'tde_CSSException*',
+'CSSFontFaceRule&' => 'tde_CSSFontFaceRule*',
+'CSSFontFaceRule*' => 'tde_CSSFontFaceRule*',
+'CSSFontFaceRuleImpl*' => 'tde_CSSFontFaceRuleImpl*',
+'CSSImportRule&' => 'tde_CSSImportRule*',
+'CSSImportRule*' => 'tde_CSSImportRule*',
+'CSSImportRuleImpl*' => 'tde_CSSImportRuleImpl*',
+'CSSMediaRule&' => 'tde_CSSMediaRule*',
+'CSSMediaRule*' => 'tde_CSSMediaRule*',
+'CSSMediaRuleImpl*' => 'tde_CSSMediaRuleImpl*',
+'CSSPageRule&' => 'tde_CSSPageRule*',
+'CSSPageRule*' => 'tde_CSSPageRule*',
+'CSSPageRuleImpl*' => 'tde_CSSPageRuleImpl*',
+'CSSPrimitiveValue&' => 'tde_CSSPrimitiveValue*',
+'CSSPrimitiveValue' => 'tde_CSSPrimitiveValue*',
+'CSSPrimitiveValue*' => 'tde_CSSPrimitiveValue*',
+'CSSPrimitiveValueImpl*' => 'tde_CSSPrimitiveValueImpl*',
+'CSSRule&' => 'tde_CSSRule*',
+'CSSRule' => 'tde_CSSRule*',
+'CSSRule*' => 'tde_CSSRule*',
+'CSSRuleImpl*' => 'tde_CSSRuleImpl*',
+'CSSRuleList&' => 'tde_CSSRuleList*',
+'CSSRuleList' => 'tde_CSSRuleList*',
+'CSSRuleList*' => 'tde_CSSRuleList*',
+'CSSRuleListImpl*' => 'tde_CSSRuleListImpl*',
+'CSSStyleDeclaration&' => 'tde_CSSStyleDeclaration*',
+'CSSStyleDeclaration' => 'tde_CSSStyleDeclaration*',
+'CSSStyleDeclaration*' => 'tde_CSSStyleDeclaration*',
+'CSSStyleDeclarationImpl*' => 'tde_CSSStyleDeclarationImpl*',
+'CSSStyleRule&' => 'tde_CSSStyleRule*',
+'CSSStyleRule*' => 'tde_CSSStyleRule*',
+'CSSStyleRuleImpl*' => 'tde_CSSStyleRuleImpl*',
+'CSSStyleSheet&' => 'tde_CSSStyleSheet*',
+'CSSStyleSheet' => 'tde_CSSStyleSheet*',
+'CSSStyleSheet*' => 'tde_CSSStyleSheet*',
+'CSSStyleSheetImpl*' => 'tde_CSSStyleSheetImpl*',
+'CSSUnknownRule&' => 'tde_CSSUnknownRule*',
+'CSSUnknownRule*' => 'tde_CSSUnknownRule*',
+'CSSUnknownRuleImpl*' => 'tde_CSSUnknownRuleImpl*',
+'CSSValue&' => 'tde_CSSValue*',
+'CSSValue' => 'tde_CSSValue*',
+'CSSValue*' => 'tde_CSSValue*',
+'CSSValueImpl*' => 'tde_CSSValueImpl*',
+'CSSValueList&' => 'tde_CSSValueList*',
+'CSSValueList*' => 'tde_CSSValueList*',
+'CSSValueListImpl*' => 'tde_CSSValueListImpl*',
+'CString&' => 'tde_CString*',
+'CString' => 'tde_CString*',
+'CString*' => 'tde_CString*',
+'Cache*' => 'tde_Cache*',
+'CacheInfo*' => 'tde_CacheInfo*',
+'CachedObject*' => 'tde_CachedObject*',
+'CachedWav*' => 'tde_CachedWav*',
 'Cardinal'  =>  'int' ,
 'CharSet' => 'int',
-'CharacterData&' => 'kde_CharacterData*',
-'CharacterData*' => 'kde_CharacterData*',
-'CharacterDataImpl*' => 'kde_CharacterDataImpl*',
-'ChmodJob*' => 'kde_ChmodJob*',
-'ClassInfo*' => 'kde_ClassInfo*',
-'ClassStore*' => 'kde_ClassStore*',
-'ClassTreeNode*' => 'kde_ClassTreeNode*',
-'ClientHello&' => 'kde_ClientHello*',
-'ClientHello*' => 'kde_ClientHello*',
-'ClipboardInterface*' => 'kde_ClipboardInterface*',
-'CodeCompletionInterface*' => 'kde_CodeCompletionInterface*',
+'CharacterData&' => 'tde_CharacterData*',
+'CharacterData*' => 'tde_CharacterData*',
+'CharacterDataImpl*' => 'tde_CharacterDataImpl*',
+'ChmodJob*' => 'tde_ChmodJob*',
+'ClassInfo*' => 'tde_ClassInfo*',
+'ClassStore*' => 'tde_ClassStore*',
+'ClassTreeNode*' => 'tde_ClassTreeNode*',
+'ClientHello&' => 'tde_ClientHello*',
+'ClientHello*' => 'tde_ClientHello*',
+'ClipboardInterface*' => 'tde_ClipboardInterface*',
+'CodeCompletionInterface*' => 'tde_CodeCompletionInterface*',
 'ColorMode' => 'int',
-'Comment&' => 'kde_Comment*',
-'Comment' => 'kde_Comment*',
-'Comment*' => 'kde_Comment*',
-'CommentImpl*' => 'kde_CommentImpl*',
+'Comment&' => 'tde_Comment*',
+'Comment' => 'tde_Comment*',
+'Comment*' => 'tde_Comment*',
+'CommentImpl*' => 'tde_CommentImpl*',
 'ComparisonFlags' => 'int',
-'Compl' => 'kde_Compl',
-'Completion&' => 'kde_Completion*',
-'Completion*' => 'kde_Completion*',
-'CompletionEntry&' => 'kde_CompletionEntry*',
-'CompletionEntry*' => 'kde_CompletionEntry*',
+'Compl' => 'tde_Compl',
+'Completion&' => 'tde_Completion*',
+'Completion*' => 'tde_Completion*',
+'CompletionEntry&' => 'tde_CompletionEntry*',
+'CompletionEntry*' => 'tde_CompletionEntry*',
 'ComplexControl' => 'int',
-'ComponentFactory*' => 'kde_ComponentFactory*',
-'ConfigInterface*' => 'kde_ConfigInterface*',
-'Connection*' => 'kde_Connection*',
+'ComponentFactory*' => 'tde_ComponentFactory*',
+'ConfigInterface*' => 'tde_ConfigInterface*',
+'Connection*' => 'tde_Connection*',
 'ConstIterator'  =>  'int' ,
-'Constructor' => 'kde_Constructor*',
-'Constructor*' => 'kde_Constructor*',
-'ConstructorImp*' => 'kde_ConstructorImp*',
+'Constructor' => 'tde_Constructor*',
+'Constructor*' => 'tde_Constructor*',
+'ConstructorImp*' => 'tde_ConstructorImp*',
 'ContentsType' => 'int',
-'Context&' => 'kde_Context*',
-'Context*' => 'kde_Context*',
+'Context&' => 'tde_Context*',
+'Context*' => 'tde_Context*',
 'ControlElement' => 'int',
-'CopyInfo*' => 'kde_CopyInfo*',
-'CopyJob*' => 'kde_CopyJob*',
-'Core*' => 'kde_Core*',
-'Counter&' => 'kde_Counter*',
-'Counter' => 'kde_Counter*',
-'Counter*' => 'kde_Counter*',
-'Cursor*' => 'kde_Cursor*',
-'CursorInterface*' => 'kde_CursorInterface*',
-'DCOPClient*' => 'kde_DCOPClient*',
-'DCOPObject*' => 'kde_DCOPObject*',
-'DCOPObjectProxy*' => 'kde_DCOPObjectProxy*',
-'DCOPRef&'  =>  'kde_DCOPRef*' ,
-'DCOPRef*' => 'kde_DCOPRef*',
-'DCOPStub*' => 'kde_DCOPStub*',
-'DOM*' => 'kde_DOM*',
-'DOM::CSSProperty*'  =>  'kde_CSSProperty*' ,
-'DOM::DOMString&'  =>  'kde_DOMString*' ,
-'DOM::DOMString'  =>  'kde_DOMString*' ,
-'DOM::Document&'  =>  'kde_Document*' ,
-'DOM::Document'  =>  'kde_Document*' ,
-'DOM::Document*'  =>  'kde_Document*' ,
-'DOM::HTMLDocument'  =>  'kde_HTMLDocument*' ,
-'DOM::MediaList&' => 'kde_MediaList*',
-'DOM::MediaList' => 'kde_MediaList*',
-'DOM::MediaList*' => 'kde_MediaList*',
-'DOM::Node&'  =>  'kde_Node*' ,
-'DOM::Node'  =>  'kde_Node*' ,
-'DOM::NodeList&' => 'kde_DOMNodeList*',
-'DOM::NodeList' => 'kde_DOMNodeList*',
-'DOM::NodeList*' => 'kde_DOMNodeList*',
-'DOM::Range'  =>  'kde_Range*' ,
-'DOM::StyleSheetList&' => 'kde_StyleSheetList*',
-'DOM::StyleSheetList' => 'kde_StyleSheetList*',
-'DOM::StyleSheetList*' => 'kde_StyleSheetList*',
-'StyleSheetList&' => 'kde_StyleSheetList*',
-'StyleSheetList' => 'kde_StyleSheetList*',
-'StyleSheetList*' => 'kde_StyleSheetList*',
-'DOMException&' => 'kde_DOMException*',
-'DOMException*' => 'kde_DOMException*',
-'DOMImplementation&' => 'kde_DOMImplementation*',
-'DOMImplementation' => 'kde_DOMImplementation*',
-'DOMImplementation*' => 'kde_DOMImplementation*',
-'DOMImplementationImpl*' => 'kde_DOMImplementationImpl*',
-'DOMString&' => 'kde_DOMString*',
-'DOMString' => 'kde_DOMString*',
-'DOMString*' => 'kde_DOMString*',
-'DOMStringImpl*' => 'kde_DOMStringImpl*',
+'CopyInfo*' => 'tde_CopyInfo*',
+'CopyJob*' => 'tde_CopyJob*',
+'Core*' => 'tde_Core*',
+'Counter&' => 'tde_Counter*',
+'Counter' => 'tde_Counter*',
+'Counter*' => 'tde_Counter*',
+'Cursor*' => 'tde_Cursor*',
+'CursorInterface*' => 'tde_CursorInterface*',
+'DCOPClient*' => 'tde_DCOPClient*',
+'DCOPObject*' => 'tde_DCOPObject*',
+'DCOPObjectProxy*' => 'tde_DCOPObjectProxy*',
+'DCOPRef&'  =>  'tde_DCOPRef*' ,
+'DCOPRef*' => 'tde_DCOPRef*',
+'DCOPStub*' => 'tde_DCOPStub*',
+'DOM*' => 'tde_DOM*',
+'DOM::CSSProperty*'  =>  'tde_CSSProperty*' ,
+'DOM::DOMString&'  =>  'tde_DOMString*' ,
+'DOM::DOMString'  =>  'tde_DOMString*' ,
+'DOM::Document&'  =>  'tde_Document*' ,
+'DOM::Document'  =>  'tde_Document*' ,
+'DOM::Document*'  =>  'tde_Document*' ,
+'DOM::HTMLDocument'  =>  'tde_HTMLDocument*' ,
+'DOM::MediaList&' => 'tde_MediaList*',
+'DOM::MediaList' => 'tde_MediaList*',
+'DOM::MediaList*' => 'tde_MediaList*',
+'DOM::Node&'  =>  'tde_Node*' ,
+'DOM::Node'  =>  'tde_Node*' ,
+'DOM::NodeList&' => 'tde_DOMNodeList*',
+'DOM::NodeList' => 'tde_DOMNodeList*',
+'DOM::NodeList*' => 'tde_DOMNodeList*',
+'DOM::Range'  =>  'tde_Range*' ,
+'DOM::StyleSheetList&' => 'tde_StyleSheetList*',
+'DOM::StyleSheetList' => 'tde_StyleSheetList*',
+'DOM::StyleSheetList*' => 'tde_StyleSheetList*',
+'StyleSheetList&' => 'tde_StyleSheetList*',
+'StyleSheetList' => 'tde_StyleSheetList*',
+'StyleSheetList*' => 'tde_StyleSheetList*',
+'DOMException&' => 'tde_DOMException*',
+'DOMException*' => 'tde_DOMException*',
+'DOMImplementation&' => 'tde_DOMImplementation*',
+'DOMImplementation' => 'tde_DOMImplementation*',
+'DOMImplementation*' => 'tde_DOMImplementation*',
+'DOMImplementationImpl*' => 'tde_DOMImplementationImpl*',
+'DOMString&' => 'tde_DOMString*',
+'DOMString' => 'tde_DOMString*',
+'DOMString*' => 'tde_DOMString*',
+'DOMStringImpl*' => 'tde_DOMStringImpl*',
 'DW_EXPORT*' => 'void*',
-'DataPacket*' => 'kde_DataPacket*',
+'DataPacket*' => 'tde_DataPacket*',
 'DateFormat' => 'int',
-'Debug*' => 'kde_Debug*',
+'Debug*' => 'tde_Debug*',
 'DecoderFn'  =>  'int' ,
-'DefaultProgress*' => 'kde_DefaultProgress*',
-'DeleteJob*' => 'kde_DeleteJob*',
-'DeviceManager*' => 'kde_DeviceManager*',
+'DefaultProgress*' => 'tde_DefaultProgress*',
+'DeleteJob*' => 'tde_DeleteJob*',
+'DeviceManager*' => 'tde_DeviceManager*',
 'Direction' => 'int',
-'DispatchFunction' => 'kde_DispatchFunction*',
-'Dispatcher*' => 'kde_Dispatcher*',
-'DistributionList*' => 'kde_DistributionList*',
-'DistributionListEditor*' => 'kde_DistributionListEditor*',
-'DistributionListManager*' => 'kde_DistributionListManager*',
+'DispatchFunction' => 'tde_DispatchFunction*',
+'Dispatcher*' => 'tde_Dispatcher*',
+'DistributionList*' => 'tde_DistributionList*',
+'DistributionListEditor*' => 'tde_DistributionListEditor*',
+'DistributionListManager*' => 'tde_DistributionListManager*',
 'Dock&' => 'int',
 'Dock' => 'int',
-'DockMainWindow*' => 'kde_DockMainWindow*',
-'DockPosData&'  =>  'kde_DockPosData*' ,
-'DockPosData*' => 'kde_DockPosData*',
+'DockMainWindow*' => 'tde_DockMainWindow*',
+'DockPosData&'  =>  'tde_DockPosData*' ,
+'DockPosData*' => 'tde_DockPosData*',
 'DockWindowData*' => 'long',
-'Document&' => 'kde_Document*',
-'Document' => 'kde_Document*',
-'Document*' => 'kde_Document*',
-'DocumentFragment&' => 'kde_DocumentFragment*',
-'DocumentFragment' => 'kde_DocumentFragment*',
-'DocumentFragment*' => 'kde_DocumentFragment*',
-'DocumentFragmentImpl*' => 'kde_DocumentFragmentImpl*',
-'DocumentImpl*' => 'kde_DocumentImpl*',
-'DocumentStyle&' => 'kde_DocumentStyle*',
-'DocumentStyle*' => 'kde_DocumentStyle*',
-'DocumentType&' => 'kde_DocumentType*',
-'DocumentType' => 'kde_DocumentType*',
-'DocumentType*' => 'kde_DocumentType*',
-'DocumentationContext*' => 'kde_DocumentationContext*',
-'DomShared*' => 'kde_DomShared*',
+'Document&' => 'tde_Document*',
+'Document' => 'tde_Document*',
+'Document*' => 'tde_Document*',
+'DocumentFragment&' => 'tde_DocumentFragment*',
+'DocumentFragment' => 'tde_DocumentFragment*',
+'DocumentFragment*' => 'tde_DocumentFragment*',
+'DocumentFragmentImpl*' => 'tde_DocumentFragmentImpl*',
+'DocumentImpl*' => 'tde_DocumentImpl*',
+'DocumentStyle&' => 'tde_DocumentStyle*',
+'DocumentStyle*' => 'tde_DocumentStyle*',
+'DocumentType&' => 'tde_DocumentType*',
+'DocumentType' => 'tde_DocumentType*',
+'DocumentType*' => 'tde_DocumentType*',
+'DocumentationContext*' => 'tde_DocumentationContext*',
+'DomShared*' => 'tde_DomShared*',
 'DrageMode' => 'int',
-'DrawContentsEvent*' => 'kde_DrawContentsEvent*',
-'DwAddress&' => 'kde_DwAddress*',
-'DwAddress*' => 'kde_DwAddress*',
-'DwAddressList&' => 'kde_DwAddressList*',
-'DwAddressList*' => 'kde_DwAddressList*',
-'DwBody&' => 'kde_DwBody*',
-'DwBody*' => 'kde_DwBody*',
-'DwBodyPart&' => 'kde_DwBodyPart*',
-'DwBodyPart*' => 'kde_DwBodyPart*',
+'DrawContentsEvent*' => 'tde_DrawContentsEvent*',
+'DwAddress&' => 'tde_DwAddress*',
+'DwAddress*' => 'tde_DwAddress*',
+'DwAddressList&' => 'tde_DwAddressList*',
+'DwAddressList*' => 'tde_DwAddressList*',
+'DwBody&' => 'tde_DwBody*',
+'DwBody*' => 'tde_DwBody*',
+'DwBodyPart&' => 'tde_DwBodyPart*',
+'DwBodyPart*' => 'tde_DwBodyPart*',
 'DwBool' => 'int',
-'DwDateTime&' => 'kde_DwDateTime*',
-'DwDateTime*' => 'kde_DwDateTime*',
-'DwDispositionType&' => 'kde_DwDispositionType*',
-'DwDispositionType*' => 'kde_DwDispositionType*',
-'DwEntity&' => 'kde_DwEntity*',
-'DwField&' => 'kde_DwField*',
-'DwField*' => 'kde_DwField*',
-'DwFieldBody&' => 'kde_DwFieldBody*',
-'DwFieldBody*' => 'kde_DwFieldBody*',
-'DwGroup&' => 'kde_DwGroup*',
-'DwGroup*' => 'kde_DwGroup*',
-'DwHeaders&' => 'kde_DwHeaders*',
-'DwHeaders*' => 'kde_DwHeaders*',
+'DwDateTime&' => 'tde_DwDateTime*',
+'DwDateTime*' => 'tde_DwDateTime*',
+'DwDispositionType&' => 'tde_DwDispositionType*',
+'DwDispositionType*' => 'tde_DwDispositionType*',
+'DwEntity&' => 'tde_DwEntity*',
+'DwField&' => 'tde_DwField*',
+'DwField*' => 'tde_DwField*',
+'DwFieldBody&' => 'tde_DwFieldBody*',
+'DwFieldBody*' => 'tde_DwFieldBody*',
+'DwGroup&' => 'tde_DwGroup*',
+'DwGroup*' => 'tde_DwGroup*',
+'DwHeaders&' => 'tde_DwHeaders*',
+'DwHeaders*' => 'tde_DwHeaders*',
 'DwInt32' => 'int',
-'DwMailbox&' => 'kde_DwMailbox*',
-'DwMailbox*' => 'kde_DwMailbox*',
-'DwMailboxList&' => 'kde_DwMailboxList*',
-'DwMailboxList*' => 'kde_DwMailboxList*',
-'DwMechanism&' => 'kde_DwMechanism*',
-'DwMechanism*' => 'kde_DwMechanism*',
-'DwMediaType&' => 'kde_DwMediaType*',
-'DwMediaType*' => 'kde_DwMediaType*',
-'DwMessage&' => 'kde_DwMessage*',
-'DwMessage*' => 'kde_DwMessage*',
-'DwMessageComponent&' => 'kde_DwMessageComponent*',
-'DwMessageComponent*' => 'kde_DwMessageComponent*',
-'DwMime*' => 'kde_DwMime*',
-'DwMsgId&' => 'kde_DwMsgId*',
-'DwMsgId*' => 'kde_DwMsgId*',
-'DwObserver*' => 'kde_DwObserver*',
-'DwParameter&' => 'kde_DwParameter*',
-'DwParameter*' => 'kde_DwParameter*',
-'DwProtocolClient*' => 'kde_DwProtocolClient*',
-'DwString&' => 'kde_DwString*',
-'DwString' => 'kde_DwString',
-'DwString*' => 'kde_DwString*',
-'DwText&' => 'kde_DwText*',
-'DwText*' => 'kde_DwText*',
-'DwTokenizer&' => 'kde_DwTokenizer*',
+'DwMailbox&' => 'tde_DwMailbox*',
+'DwMailbox*' => 'tde_DwMailbox*',
+'DwMailboxList&' => 'tde_DwMailboxList*',
+'DwMailboxList*' => 'tde_DwMailboxList*',
+'DwMechanism&' => 'tde_DwMechanism*',
+'DwMechanism*' => 'tde_DwMechanism*',
+'DwMediaType&' => 'tde_DwMediaType*',
+'DwMediaType*' => 'tde_DwMediaType*',
+'DwMessage&' => 'tde_DwMessage*',
+'DwMessage*' => 'tde_DwMessage*',
+'DwMessageComponent&' => 'tde_DwMessageComponent*',
+'DwMessageComponent*' => 'tde_DwMessageComponent*',
+'DwMime*' => 'tde_DwMime*',
+'DwMsgId&' => 'tde_DwMsgId*',
+'DwMsgId*' => 'tde_DwMsgId*',
+'DwObserver*' => 'tde_DwObserver*',
+'DwParameter&' => 'tde_DwParameter*',
+'DwParameter*' => 'tde_DwParameter*',
+'DwProtocolClient*' => 'tde_DwProtocolClient*',
+'DwString&' => 'tde_DwString*',
+'DwString' => 'tde_DwString',
+'DwString*' => 'tde_DwString*',
+'DwText&' => 'tde_DwText*',
+'DwText*' => 'tde_DwText*',
+'DwTokenizer&' => 'tde_DwTokenizer*',
 'DwUint16' => 'unsigned short',
 'DwUint32' => 'unsigned int',
 'DwUint8' => 'unsigned char',
-'DynamicCast*' => 'kde_DynamicCast*',
-'DynamicRequest&' => 'kde_DynamicRequest*',
-'DynamicRequest*' => 'kde_DynamicRequest*',
-'EXPORT_DOCKCLASS*' => 'kde_EXPORT_DOCKCLASS*',
+'DynamicCast*' => 'tde_DynamicCast*',
+'DynamicRequest&' => 'tde_DynamicRequest*',
+'DynamicRequest*' => 'tde_DynamicRequest*',
+'EXPORT_DOCKCLASS*' => 'tde_EXPORT_DOCKCLASS*',
 'EchoMode' => 'int',
-'EditInterface*' => 'kde_EditInterface*',
-'Editor*' => 'kde_Editor*',
-'EditorContext*' => 'kde_EditorContext*',
-'Element&' => 'kde_Element*',
-'Element' => 'kde_Element*',
-'Element*' => 'kde_Element*',
-'EmailSelectDialog*' => 'kde_EmailSelectDialog*',
+'EditInterface*' => 'tde_EditInterface*',
+'Editor*' => 'tde_Editor*',
+'EditorContext*' => 'tde_EditorContext*',
+'Element&' => 'tde_Element*',
+'Element' => 'tde_Element*',
+'Element*' => 'tde_Element*',
+'EmailSelectDialog*' => 'tde_EmailSelectDialog*',
 'EncoderFn'  =>  'int' ,
 'Endian' => 'int',
-'Entity&' => 'kde_Entity*',
-'Entity*' => 'kde_Entity*',
-'EntityReference&' => 'kde_EntityReference*',
-'EntityReference' => 'kde_EntityReference*',
-'EntityReference*' => 'kde_EntityReference*',
-'Entry&'  =>  'kde_Entry*' ,
-'Entry*' => 'kde_Entry*',
-'Entry::Address&'  =>  'kde_EntryAddress' ,
-'EnumComponent&' => 'kde_EnumComponent*',
-'EnumComponent*' => 'kde_EnumComponent*',
-'EnumDef&' => 'kde_EnumDef*',
-'EnumDef*' => 'kde_EnumDef*',
-'EnumEntry*' => 'kde_EnumEntry*',
-'Error*' => 'kde_Error*',
-'Event*' => 'kde_Event*',
-'ExecState*' => 'kde_ExecState*',
-'ExtensionLoader*' => 'kde_ExtensionLoader*',
+'Entity&' => 'tde_Entity*',
+'Entity*' => 'tde_Entity*',
+'EntityReference&' => 'tde_EntityReference*',
+'EntityReference' => 'tde_EntityReference*',
+'EntityReference*' => 'tde_EntityReference*',
+'Entry&'  =>  'tde_Entry*' ,
+'Entry*' => 'tde_Entry*',
+'Entry::Address&'  =>  'tde_EntryAddress' ,
+'EnumComponent&' => 'tde_EnumComponent*',
+'EnumComponent*' => 'tde_EnumComponent*',
+'EnumDef&' => 'tde_EnumDef*',
+'EnumDef*' => 'tde_EnumDef*',
+'EnumEntry*' => 'tde_EnumEntry*',
+'Error*' => 'tde_Error*',
+'Event*' => 'tde_Event*',
+'ExecState*' => 'tde_ExecState*',
+'ExtensionLoader*' => 'tde_ExtensionLoader*',
 'FALSE' => '0',
-'FMOut*' => 'kde_FMOut*',
-'Factory*' => 'kde_Factory*',
+'FMOut*' => 'tde_FMOut*',
+'Factory*' => 'tde_Factory*',
 'False' => '0',
-'FileCopyJob*' => 'kde_FileCopyJob*',
-'FileProtocol*' => 'kde_FileProtocol*',
+'FileCopyJob*' => 'tde_FileCopyJob*',
+'FileProtocol*' => 'tde_FileProtocol*',
 'FileView&'  =>  'int' ,
-'FloatAsyncStream*' => 'kde_FloatAsyncStream*',
-'FloatDataPacket*' => 'kde_FloatDataPacket*',
-'FlowSystem&' => 'kde_FlowSystem*',
-'FlowSystem' => 'kde_FlowSystem*',
-'FlowSystem*' => 'kde_FlowSystem*',
-'FlowSystemReceiver&' => 'kde_FlowSystemReceiver*',
-'FlowSystemReceiver' => 'kde_FlowSystemReceiver*',
-'FlowSystemReceiver*' => 'kde_FlowSystemReceiver*',
-'FlowSystemReceiver_base*' => 'kde_FlowSystemReceiver_base*',
-'FlowSystemReceiver_skel*' => 'kde_FlowSystemReceiver_skel*',
-'FlowSystemReceiver_stub*' => 'kde_FlowSystemReceiver_stub*',
-'FlowSystemSender&' => 'kde_FlowSystemSender*',
-'FlowSystemSender' => 'kde_FlowSystemSender*',
-'FlowSystemSender*' => 'kde_FlowSystemSender*',
-'FlowSystemSender_base*' => 'kde_FlowSystemSender_base*',
-'FlowSystemSender_skel*' => 'kde_FlowSystemSender_skel*',
-'FlowSystemSender_stub*' => 'kde_FlowSystemSender_stub*',
-'FlowSystem_base*' => 'kde_FlowSystem_base*',
-'FlowSystem_impl*' => 'kde_FlowSystem_impl*',
-'FlowSystem_skel*' => 'kde_FlowSystem_skel*',
-'FlowSystem_stub*' => 'kde_FlowSystem_stub*',
+'FloatAsyncStream*' => 'tde_FloatAsyncStream*',
+'FloatDataPacket*' => 'tde_FloatDataPacket*',
+'FlowSystem&' => 'tde_FlowSystem*',
+'FlowSystem' => 'tde_FlowSystem*',
+'FlowSystem*' => 'tde_FlowSystem*',
+'FlowSystemReceiver&' => 'tde_FlowSystemReceiver*',
+'FlowSystemReceiver' => 'tde_FlowSystemReceiver*',
+'FlowSystemReceiver*' => 'tde_FlowSystemReceiver*',
+'FlowSystemReceiver_base*' => 'tde_FlowSystemReceiver_base*',
+'FlowSystemReceiver_skel*' => 'tde_FlowSystemReceiver_skel*',
+'FlowSystemReceiver_stub*' => 'tde_FlowSystemReceiver_stub*',
+'FlowSystemSender&' => 'tde_FlowSystemSender*',
+'FlowSystemSender' => 'tde_FlowSystemSender*',
+'FlowSystemSender*' => 'tde_FlowSystemSender*',
+'FlowSystemSender_base*' => 'tde_FlowSystemSender_base*',
+'FlowSystemSender_skel*' => 'tde_FlowSystemSender_skel*',
+'FlowSystemSender_stub*' => 'tde_FlowSystemSender_stub*',
+'FlowSystem_base*' => 'tde_FlowSystem_base*',
+'FlowSystem_impl*' => 'tde_FlowSystem_impl*',
+'FlowSystem_skel*' => 'tde_FlowSystem_skel*',
+'FlowSystem_stub*' => 'tde_FlowSystem_stub*',
 'FocusPolicy' => 'int',
-'Format&' => 'kde_Format*',
-'Format*' => 'kde_Format*',
-'Function*' => 'kde_Function*',
-'FunctionImp*' => 'kde_FunctionImp*',
+'Format&' => 'tde_Format*',
+'Format*' => 'tde_Format*',
+'Function*' => 'tde_Function*',
+'FunctionImp*' => 'tde_FunctionImp*',
 'GCI&'  =>  'GCI*' ,
 'GCI'  =>  'GCI*' ,
 'GCI*'  =>  'GCI*' ,
-'GUIActivateEvent*' => 'kde_GUIActivateEvent*',
+'GUIActivateEvent*' => 'tde_GUIActivateEvent*',
 'GUIStyle' => 'int',
-'GUSOut*' => 'kde_GUSOut*',
-'GenericAsyncStream*' => 'kde_GenericAsyncStream*',
-'GenericDataChannel*' => 'kde_GenericDataChannel*',
-'GenericDataPacket*' => 'kde_GenericDataPacket*',
-'GenericFactory*' => 'kde_GenericFactory*',
-'GenericFactoryBase*' => 'kde_GenericFactoryBase*',
-'Global*' => 'kde_Global*',
-'GlobalComm&' => 'kde_GlobalComm*',
-'GlobalComm' => 'kde_GlobalComm*',
-'GlobalComm*' => 'kde_GlobalComm*',
-'GlobalComm_base*' => 'kde_GlobalComm_base*',
-'GlobalComm_skel*' => 'kde_GlobalComm_skel*',
-'GlobalComm_stub*' => 'kde_GlobalComm_stub*',
+'GUSOut*' => 'tde_GUSOut*',
+'GenericAsyncStream*' => 'tde_GenericAsyncStream*',
+'GenericDataChannel*' => 'tde_GenericDataChannel*',
+'GenericDataPacket*' => 'tde_GenericDataPacket*',
+'GenericFactory*' => 'tde_GenericFactory*',
+'GenericFactoryBase*' => 'tde_GenericFactoryBase*',
+'Global*' => 'tde_Global*',
+'GlobalComm&' => 'tde_GlobalComm*',
+'GlobalComm' => 'tde_GlobalComm*',
+'GlobalComm*' => 'tde_GlobalComm*',
+'GlobalComm_base*' => 'tde_GlobalComm_base*',
+'GlobalComm_skel*' => 'tde_GlobalComm_skel*',
+'GlobalComm_stub*' => 'tde_GlobalComm_stub*',
 'HANDLE' => 'unsigned int',
 'HBITMAP'  =>  'void*' ,
 'HCURSOR'  =>  'void*' ,
@@ -488,975 +488,975 @@ BEGIN
 'HFONT'  =>  'void*' ,
 'HPALETTE'  =>  'void*' ,
 'HRGN'  =>  'void*' ,
-'HTMLAnchorElement&' => 'kde_HTMLAnchorElement*',
-'HTMLAnchorElement*' => 'kde_HTMLAnchorElement*',
-'HTMLAnchorElementImpl*' => 'kde_HTMLAnchorElementImpl*',
-'HTMLAppletElement&' => 'kde_HTMLAppletElement*',
-'HTMLAppletElement*' => 'kde_HTMLAppletElement*',
-'HTMLAppletElementImpl*' => 'kde_HTMLAppletElementImpl*',
-'HTMLAreaElement&' => 'kde_HTMLAreaElement*',
-'HTMLAreaElement*' => 'kde_HTMLAreaElement*',
-'HTMLAreaElementImpl*' => 'kde_HTMLAreaElementImpl*',
-'HTMLBRElement&' => 'kde_HTMLBRElement*',
-'HTMLBRElement*' => 'kde_HTMLBRElement*',
-'HTMLBRElementImpl*' => 'kde_HTMLBRElementImpl*',
-'HTMLBaseElement&' => 'kde_HTMLBaseElement*',
-'HTMLBaseElement*' => 'kde_HTMLBaseElement*',
-'HTMLBaseElementImpl*' => 'kde_HTMLBaseElementImpl*',
-'HTMLBaseFontElement&' => 'kde_HTMLBaseFontElement*',
-'HTMLBaseFontElement*' => 'kde_HTMLBaseFontElement*',
-'HTMLBaseFontElementImpl*' => 'kde_HTMLBaseFontElementImpl*',
-'HTMLBlockquoteElement&' => 'kde_HTMLBlockquoteElement*',
-'HTMLBlockquoteElement*' => 'kde_HTMLBlockquoteElement*',
-'HTMLBlockquoteElementImpl*' => 'kde_HTMLBlockquoteElementImpl*',
-'HTMLBodyElement&' => 'kde_HTMLBodyElement*',
-'HTMLBodyElement*' => 'kde_HTMLBodyElement*',
-'HTMLBodyElementImpl*' => 'kde_HTMLBodyElementImpl*',
-'HTMLButtonElement&' => 'kde_HTMLButtonElement*',
-'HTMLButtonElement*' => 'kde_HTMLButtonElement*',
-'HTMLButtonElementImpl*' => 'kde_HTMLButtonElementImpl*',
-'HTMLCollection&' => 'kde_HTMLCollection*',
-'HTMLCollection' => 'kde_HTMLCollection*',
-'HTMLCollection*' => 'kde_HTMLCollection*',
-'HTMLCollectionImpl*' => 'kde_HTMLCollectionImpl*',
-'HTMLDListElement&' => 'kde_HTMLDListElement*',
-'HTMLDListElement*' => 'kde_HTMLDListElement*',
-'HTMLDListElementImpl*' => 'kde_HTMLDListElementImpl*',
-'HTMLDirectoryElement&' => 'kde_HTMLDirectoryElement*',
-'HTMLDirectoryElement*' => 'kde_HTMLDirectoryElement*',
-'HTMLDirectoryElementImpl*' => 'kde_HTMLDirectoryElementImpl*',
-'HTMLDivElement&' => 'kde_HTMLDivElement*',
-'HTMLDivElement*' => 'kde_HTMLDivElement*',
-'HTMLDivElementImpl*' => 'kde_HTMLDivElementImpl*',
-'HTMLDocument&' => 'kde_HTMLDocument*',
-'HTMLDocument*' => 'kde_HTMLDocument*',
-'HTMLDocumentImpl*' => 'kde_HTMLDocumentImpl*',
-'HTMLElement&' => 'kde_HTMLElement*',
-'HTMLElement' => 'kde_HTMLElement*',
-'HTMLElement*' => 'kde_HTMLElement*',
-'HTMLElementImpl*' => 'kde_HTMLElementImpl*',
-'HTMLFieldSetElement&' => 'kde_HTMLFieldSetElement*',
-'HTMLFieldSetElement*' => 'kde_HTMLFieldSetElement*',
-'HTMLFieldSetElementImpl*' => 'kde_HTMLFieldSetElementImpl*',
-'HTMLFontElement&' => 'kde_HTMLFontElement*',
-'HTMLFontElement*' => 'kde_HTMLFontElement*',
-'HTMLFontElementImpl*' => 'kde_HTMLFontElementImpl*',
-'HTMLFormElement&' => 'kde_HTMLFormElement*',
-'HTMLFormElement' => 'kde_HTMLFormElement*',
-'HTMLFormElement*' => 'kde_HTMLFormElement*',
-'HTMLFormElementImpl*' => 'kde_HTMLFormElementImpl*',
-'HTMLFrameElement&' => 'kde_HTMLFrameElement*',
-'HTMLFrameElement*' => 'kde_HTMLFrameElement*',
-'HTMLFrameElementImpl*' => 'kde_HTMLFrameElementImpl*',
-'HTMLFrameSetElement&' => 'kde_HTMLFrameSetElement*',
-'HTMLFrameSetElement*' => 'kde_HTMLFrameSetElement*',
-'HTMLFrameSetElementImpl*' => 'kde_HTMLFrameSetElementImpl*',
-'HTMLHRElement&' => 'kde_HTMLHRElement*',
-'HTMLHRElement*' => 'kde_HTMLHRElement*',
-'HTMLHRElementImpl*' => 'kde_HTMLHRElementImpl*',
-'HTMLHeadElement&' => 'kde_HTMLHeadElement*',
-'HTMLHeadElement*' => 'kde_HTMLHeadElement*',
-'HTMLHeadElementImpl*' => 'kde_HTMLHeadElementImpl*',
-'HTMLHeadingElement&' => 'kde_HTMLHeadingElement*',
-'HTMLHeadingElement*' => 'kde_HTMLHeadingElement*',
-'HTMLHeadingElementImpl*' => 'kde_HTMLHeadingElementImpl*',
-'HTMLHtmlElement&' => 'kde_HTMLHtmlElement*',
-'HTMLHtmlElement*' => 'kde_HTMLHtmlElement*',
-'HTMLHtmlElementImpl*' => 'kde_HTMLHtmlElementImpl*',
-'HTMLIFrameElement&' => 'kde_HTMLIFrameElement*',
-'HTMLIFrameElement*' => 'kde_HTMLIFrameElement*',
-'HTMLIFrameElementImpl*' => 'kde_HTMLIFrameElementImpl*',
-'HTMLImageElement&' => 'kde_HTMLImageElement*',
-'HTMLImageElement*' => 'kde_HTMLImageElement*',
-'HTMLImageElementImpl*' => 'kde_HTMLImageElementImpl*',
-'HTMLInputElement&' => 'kde_HTMLInputElement*',
-'HTMLInputElement*' => 'kde_HTMLInputElement*',
-'HTMLInputElementImpl*' => 'kde_HTMLInputElementImpl*',
-'HTMLIsIndexElement&' => 'kde_HTMLIsIndexElement*',
-'HTMLIsIndexElement*' => 'kde_HTMLIsIndexElement*',
-'HTMLIsIndexElementImpl*' => 'kde_HTMLIsIndexElementImpl*',
-'HTMLLIElement&' => 'kde_HTMLLIElement*',
-'HTMLLIElement*' => 'kde_HTMLLIElement*',
-'HTMLLIElementImpl*' => 'kde_HTMLLIElementImpl*',
-'HTMLLabelElement&' => 'kde_HTMLLabelElement*',
-'HTMLLabelElement*' => 'kde_HTMLLabelElement*',
-'HTMLLabelElementImpl*' => 'kde_HTMLLabelElementImpl*',
-'HTMLLegendElement&' => 'kde_HTMLLegendElement*',
-'HTMLLegendElement*' => 'kde_HTMLLegendElement*',
-'HTMLLegendElementImpl*' => 'kde_HTMLLegendElementImpl*',
-'HTMLLinkElement&' => 'kde_HTMLLinkElement*',
-'HTMLLinkElement*' => 'kde_HTMLLinkElement*',
-'HTMLLinkElementImpl*' => 'kde_HTMLLinkElementImpl*',
-'HTMLMapElement&' => 'kde_HTMLMapElement*',
-'HTMLMapElement*' => 'kde_HTMLMapElement*',
-'HTMLMapElementImpl*' => 'kde_HTMLMapElementImpl*',
-'HTMLMenuElement&' => 'kde_HTMLMenuElement*',
-'HTMLMenuElement*' => 'kde_HTMLMenuElement*',
-'HTMLMenuElementImpl*' => 'kde_HTMLMenuElementImpl*',
-'HTMLMetaElement&' => 'kde_HTMLMetaElement*',
-'HTMLMetaElement*' => 'kde_HTMLMetaElement*',
-'HTMLMetaElementImpl*' => 'kde_HTMLMetaElementImpl*',
-'HTMLModElement&' => 'kde_HTMLModElement*',
-'HTMLModElement*' => 'kde_HTMLModElement*',
-'HTMLModElementImpl*' => 'kde_HTMLModElementImpl*',
-'HTMLOListElement&' => 'kde_HTMLOListElement*',
-'HTMLOListElement*' => 'kde_HTMLOListElement*',
-'HTMLOListElementImpl*' => 'kde_HTMLOListElementImpl*',
-'HTMLObjectElement&' => 'kde_HTMLObjectElement*',
-'HTMLObjectElement*' => 'kde_HTMLObjectElement*',
-'HTMLObjectElementImpl*' => 'kde_HTMLObjectElementImpl*',
-'HTMLOptGroupElement&' => 'kde_HTMLOptGroupElement*',
-'HTMLOptGroupElement*' => 'kde_HTMLOptGroupElement*',
-'HTMLOptGroupElementImpl*' => 'kde_HTMLOptGroupElementImpl*',
-'HTMLOptionElement&' => 'kde_HTMLOptionElement*',
-'HTMLOptionElement*' => 'kde_HTMLOptionElement*',
-'HTMLOptionElementImpl*' => 'kde_HTMLOptionElementImpl*',
-'HTMLParagraphElement&' => 'kde_HTMLParagraphElement*',
-'HTMLParagraphElement*' => 'kde_HTMLParagraphElement*',
-'HTMLParagraphElementImpl*' => 'kde_HTMLParagraphElementImpl*',
-'HTMLParamElement&' => 'kde_HTMLParamElement*',
-'HTMLParamElement*' => 'kde_HTMLParamElement*',
-'HTMLParamElementImpl*' => 'kde_HTMLParamElementImpl*',
-'HTMLPreElement&' => 'kde_HTMLPreElement*',
-'HTMLPreElement*' => 'kde_HTMLPreElement*',
-'HTMLPreElementImpl*' => 'kde_HTMLPreElementImpl*',
-'HTMLQuoteElement&' => 'kde_HTMLQuoteElement*',
-'HTMLQuoteElement*' => 'kde_HTMLQuoteElement*',
-'HTMLQuoteElementImpl*' => 'kde_HTMLQuoteElementImpl*',
-'HTMLScriptElement&' => 'kde_HTMLScriptElement*',
-'HTMLScriptElement*' => 'kde_HTMLScriptElement*',
-'HTMLScriptElementImpl*' => 'kde_HTMLScriptElementImpl*',
-'HTMLSelectElement&' => 'kde_HTMLSelectElement*',
-'HTMLSelectElement*' => 'kde_HTMLSelectElement*',
-'HTMLSelectElementImpl*' => 'kde_HTMLSelectElementImpl*',
-'HTMLStyleElement&' => 'kde_HTMLStyleElement*',
-'HTMLStyleElement*' => 'kde_HTMLStyleElement*',
-'HTMLStyleElementImpl*' => 'kde_HTMLStyleElementImpl*',
-'HTMLTableCaptionElement&' => 'kde_HTMLTableCaptionElement*',
-'HTMLTableCaptionElement' => 'kde_HTMLTableCaptionElement*',
-'HTMLTableCaptionElement*' => 'kde_HTMLTableCaptionElement*',
-'HTMLTableCaptionElementImpl*' => 'kde_HTMLTableCaptionElementImpl*',
-'HTMLTableCellElement&' => 'kde_HTMLTableCellElement*',
-'HTMLTableCellElement*' => 'kde_HTMLTableCellElement*',
-'HTMLTableCellElementImpl*' => 'kde_HTMLTableCellElementImpl*',
-'HTMLTableColElement&' => 'kde_HTMLTableColElement*',
-'HTMLTableColElement*' => 'kde_HTMLTableColElement*',
-'HTMLTableColElementImpl*' => 'kde_HTMLTableColElementImpl*',
-'HTMLTableElement&' => 'kde_HTMLTableElement*',
-'HTMLTableElement*' => 'kde_HTMLTableElement*',
-'HTMLTableElementImpl*' => 'kde_HTMLTableElementImpl*',
-'HTMLTableRowElement&' => 'kde_HTMLTableRowElement*',
-'HTMLTableRowElement*' => 'kde_HTMLTableRowElement*',
-'HTMLTableRowElementImpl*' => 'kde_HTMLTableRowElementImpl*',
-'HTMLTableSectionElement&' => 'kde_HTMLTableSectionElement*',
-'HTMLTableSectionElement' => 'kde_HTMLTableSectionElement*',
-'HTMLTableSectionElement*' => 'kde_HTMLTableSectionElement*',
-'HTMLTableSectionElementImpl*' => 'kde_HTMLTableSectionElementImpl*',
-'HTMLTextAreaElement&' => 'kde_HTMLTextAreaElement*',
-'HTMLTextAreaElement*' => 'kde_HTMLTextAreaElement*',
-'HTMLTextAreaElementImpl*' => 'kde_HTMLTextAreaElementImpl*',
-'HTMLTitleElement&' => 'kde_HTMLTitleElement*',
-'HTMLTitleElement*' => 'kde_HTMLTitleElement*',
-'HTMLTitleElementImpl*' => 'kde_HTMLTitleElementImpl*',
-'HTMLUListElement&' => 'kde_HTMLUListElement*',
-'HTMLUListElement*' => 'kde_HTMLUListElement*',
-'HTMLUListElementImpl*' => 'kde_HTMLUListElementImpl*',
+'HTMLAnchorElement&' => 'tde_HTMLAnchorElement*',
+'HTMLAnchorElement*' => 'tde_HTMLAnchorElement*',
+'HTMLAnchorElementImpl*' => 'tde_HTMLAnchorElementImpl*',
+'HTMLAppletElement&' => 'tde_HTMLAppletElement*',
+'HTMLAppletElement*' => 'tde_HTMLAppletElement*',
+'HTMLAppletElementImpl*' => 'tde_HTMLAppletElementImpl*',
+'HTMLAreaElement&' => 'tde_HTMLAreaElement*',
+'HTMLAreaElement*' => 'tde_HTMLAreaElement*',
+'HTMLAreaElementImpl*' => 'tde_HTMLAreaElementImpl*',
+'HTMLBRElement&' => 'tde_HTMLBRElement*',
+'HTMLBRElement*' => 'tde_HTMLBRElement*',
+'HTMLBRElementImpl*' => 'tde_HTMLBRElementImpl*',
+'HTMLBaseElement&' => 'tde_HTMLBaseElement*',
+'HTMLBaseElement*' => 'tde_HTMLBaseElement*',
+'HTMLBaseElementImpl*' => 'tde_HTMLBaseElementImpl*',
+'HTMLBaseFontElement&' => 'tde_HTMLBaseFontElement*',
+'HTMLBaseFontElement*' => 'tde_HTMLBaseFontElement*',
+'HTMLBaseFontElementImpl*' => 'tde_HTMLBaseFontElementImpl*',
+'HTMLBlockquoteElement&' => 'tde_HTMLBlockquoteElement*',
+'HTMLBlockquoteElement*' => 'tde_HTMLBlockquoteElement*',
+'HTMLBlockquoteElementImpl*' => 'tde_HTMLBlockquoteElementImpl*',
+'HTMLBodyElement&' => 'tde_HTMLBodyElement*',
+'HTMLBodyElement*' => 'tde_HTMLBodyElement*',
+'HTMLBodyElementImpl*' => 'tde_HTMLBodyElementImpl*',
+'HTMLButtonElement&' => 'tde_HTMLButtonElement*',
+'HTMLButtonElement*' => 'tde_HTMLButtonElement*',
+'HTMLButtonElementImpl*' => 'tde_HTMLButtonElementImpl*',
+'HTMLCollection&' => 'tde_HTMLCollection*',
+'HTMLCollection' => 'tde_HTMLCollection*',
+'HTMLCollection*' => 'tde_HTMLCollection*',
+'HTMLCollectionImpl*' => 'tde_HTMLCollectionImpl*',
+'HTMLDListElement&' => 'tde_HTMLDListElement*',
+'HTMLDListElement*' => 'tde_HTMLDListElement*',
+'HTMLDListElementImpl*' => 'tde_HTMLDListElementImpl*',
+'HTMLDirectoryElement&' => 'tde_HTMLDirectoryElement*',
+'HTMLDirectoryElement*' => 'tde_HTMLDirectoryElement*',
+'HTMLDirectoryElementImpl*' => 'tde_HTMLDirectoryElementImpl*',
+'HTMLDivElement&' => 'tde_HTMLDivElement*',
+'HTMLDivElement*' => 'tde_HTMLDivElement*',
+'HTMLDivElementImpl*' => 'tde_HTMLDivElementImpl*',
+'HTMLDocument&' => 'tde_HTMLDocument*',
+'HTMLDocument*' => 'tde_HTMLDocument*',
+'HTMLDocumentImpl*' => 'tde_HTMLDocumentImpl*',
+'HTMLElement&' => 'tde_HTMLElement*',
+'HTMLElement' => 'tde_HTMLElement*',
+'HTMLElement*' => 'tde_HTMLElement*',
+'HTMLElementImpl*' => 'tde_HTMLElementImpl*',
+'HTMLFieldSetElement&' => 'tde_HTMLFieldSetElement*',
+'HTMLFieldSetElement*' => 'tde_HTMLFieldSetElement*',
+'HTMLFieldSetElementImpl*' => 'tde_HTMLFieldSetElementImpl*',
+'HTMLFontElement&' => 'tde_HTMLFontElement*',
+'HTMLFontElement*' => 'tde_HTMLFontElement*',
+'HTMLFontElementImpl*' => 'tde_HTMLFontElementImpl*',
+'HTMLFormElement&' => 'tde_HTMLFormElement*',
+'HTMLFormElement' => 'tde_HTMLFormElement*',
+'HTMLFormElement*' => 'tde_HTMLFormElement*',
+'HTMLFormElementImpl*' => 'tde_HTMLFormElementImpl*',
+'HTMLFrameElement&' => 'tde_HTMLFrameElement*',
+'HTMLFrameElement*' => 'tde_HTMLFrameElement*',
+'HTMLFrameElementImpl*' => 'tde_HTMLFrameElementImpl*',
+'HTMLFrameSetElement&' => 'tde_HTMLFrameSetElement*',
+'HTMLFrameSetElement*' => 'tde_HTMLFrameSetElement*',
+'HTMLFrameSetElementImpl*' => 'tde_HTMLFrameSetElementImpl*',
+'HTMLHRElement&' => 'tde_HTMLHRElement*',
+'HTMLHRElement*' => 'tde_HTMLHRElement*',
+'HTMLHRElementImpl*' => 'tde_HTMLHRElementImpl*',
+'HTMLHeadElement&' => 'tde_HTMLHeadElement*',
+'HTMLHeadElement*' => 'tde_HTMLHeadElement*',
+'HTMLHeadElementImpl*' => 'tde_HTMLHeadElementImpl*',
+'HTMLHeadingElement&' => 'tde_HTMLHeadingElement*',
+'HTMLHeadingElement*' => 'tde_HTMLHeadingElement*',
+'HTMLHeadingElementImpl*' => 'tde_HTMLHeadingElementImpl*',
+'HTMLHtmlElement&' => 'tde_HTMLHtmlElement*',
+'HTMLHtmlElement*' => 'tde_HTMLHtmlElement*',
+'HTMLHtmlElementImpl*' => 'tde_HTMLHtmlElementImpl*',
+'HTMLIFrameElement&' => 'tde_HTMLIFrameElement*',
+'HTMLIFrameElement*' => 'tde_HTMLIFrameElement*',
+'HTMLIFrameElementImpl*' => 'tde_HTMLIFrameElementImpl*',
+'HTMLImageElement&' => 'tde_HTMLImageElement*',
+'HTMLImageElement*' => 'tde_HTMLImageElement*',
+'HTMLImageElementImpl*' => 'tde_HTMLImageElementImpl*',
+'HTMLInputElement&' => 'tde_HTMLInputElement*',
+'HTMLInputElement*' => 'tde_HTMLInputElement*',
+'HTMLInputElementImpl*' => 'tde_HTMLInputElementImpl*',
+'HTMLIsIndexElement&' => 'tde_HTMLIsIndexElement*',
+'HTMLIsIndexElement*' => 'tde_HTMLIsIndexElement*',
+'HTMLIsIndexElementImpl*' => 'tde_HTMLIsIndexElementImpl*',
+'HTMLLIElement&' => 'tde_HTMLLIElement*',
+'HTMLLIElement*' => 'tde_HTMLLIElement*',
+'HTMLLIElementImpl*' => 'tde_HTMLLIElementImpl*',
+'HTMLLabelElement&' => 'tde_HTMLLabelElement*',
+'HTMLLabelElement*' => 'tde_HTMLLabelElement*',
+'HTMLLabelElementImpl*' => 'tde_HTMLLabelElementImpl*',
+'HTMLLegendElement&' => 'tde_HTMLLegendElement*',
+'HTMLLegendElement*' => 'tde_HTMLLegendElement*',
+'HTMLLegendElementImpl*' => 'tde_HTMLLegendElementImpl*',
+'HTMLLinkElement&' => 'tde_HTMLLinkElement*',
+'HTMLLinkElement*' => 'tde_HTMLLinkElement*',
+'HTMLLinkElementImpl*' => 'tde_HTMLLinkElementImpl*',
+'HTMLMapElement&' => 'tde_HTMLMapElement*',
+'HTMLMapElement*' => 'tde_HTMLMapElement*',
+'HTMLMapElementImpl*' => 'tde_HTMLMapElementImpl*',
+'HTMLMenuElement&' => 'tde_HTMLMenuElement*',
+'HTMLMenuElement*' => 'tde_HTMLMenuElement*',
+'HTMLMenuElementImpl*' => 'tde_HTMLMenuElementImpl*',
+'HTMLMetaElement&' => 'tde_HTMLMetaElement*',
+'HTMLMetaElement*' => 'tde_HTMLMetaElement*',
+'HTMLMetaElementImpl*' => 'tde_HTMLMetaElementImpl*',
+'HTMLModElement&' => 'tde_HTMLModElement*',
+'HTMLModElement*' => 'tde_HTMLModElement*',
+'HTMLModElementImpl*' => 'tde_HTMLModElementImpl*',
+'HTMLOListElement&' => 'tde_HTMLOListElement*',
+'HTMLOListElement*' => 'tde_HTMLOListElement*',
+'HTMLOListElementImpl*' => 'tde_HTMLOListElementImpl*',
+'HTMLObjectElement&' => 'tde_HTMLObjectElement*',
+'HTMLObjectElement*' => 'tde_HTMLObjectElement*',
+'HTMLObjectElementImpl*' => 'tde_HTMLObjectElementImpl*',
+'HTMLOptGroupElement&' => 'tde_HTMLOptGroupElement*',
+'HTMLOptGroupElement*' => 'tde_HTMLOptGroupElement*',
+'HTMLOptGroupElementImpl*' => 'tde_HTMLOptGroupElementImpl*',
+'HTMLOptionElement&' => 'tde_HTMLOptionElement*',
+'HTMLOptionElement*' => 'tde_HTMLOptionElement*',
+'HTMLOptionElementImpl*' => 'tde_HTMLOptionElementImpl*',
+'HTMLParagraphElement&' => 'tde_HTMLParagraphElement*',
+'HTMLParagraphElement*' => 'tde_HTMLParagraphElement*',
+'HTMLParagraphElementImpl*' => 'tde_HTMLParagraphElementImpl*',
+'HTMLParamElement&' => 'tde_HTMLParamElement*',
+'HTMLParamElement*' => 'tde_HTMLParamElement*',
+'HTMLParamElementImpl*' => 'tde_HTMLParamElementImpl*',
+'HTMLPreElement&' => 'tde_HTMLPreElement*',
+'HTMLPreElement*' => 'tde_HTMLPreElement*',
+'HTMLPreElementImpl*' => 'tde_HTMLPreElementImpl*',
+'HTMLQuoteElement&' => 'tde_HTMLQuoteElement*',
+'HTMLQuoteElement*' => 'tde_HTMLQuoteElement*',
+'HTMLQuoteElementImpl*' => 'tde_HTMLQuoteElementImpl*',
+'HTMLScriptElement&' => 'tde_HTMLScriptElement*',
+'HTMLScriptElement*' => 'tde_HTMLScriptElement*',
+'HTMLScriptElementImpl*' => 'tde_HTMLScriptElementImpl*',
+'HTMLSelectElement&' => 'tde_HTMLSelectElement*',
+'HTMLSelectElement*' => 'tde_HTMLSelectElement*',
+'HTMLSelectElementImpl*' => 'tde_HTMLSelectElementImpl*',
+'HTMLStyleElement&' => 'tde_HTMLStyleElement*',
+'HTMLStyleElement*' => 'tde_HTMLStyleElement*',
+'HTMLStyleElementImpl*' => 'tde_HTMLStyleElementImpl*',
+'HTMLTableCaptionElement&' => 'tde_HTMLTableCaptionElement*',
+'HTMLTableCaptionElement' => 'tde_HTMLTableCaptionElement*',
+'HTMLTableCaptionElement*' => 'tde_HTMLTableCaptionElement*',
+'HTMLTableCaptionElementImpl*' => 'tde_HTMLTableCaptionElementImpl*',
+'HTMLTableCellElement&' => 'tde_HTMLTableCellElement*',
+'HTMLTableCellElement*' => 'tde_HTMLTableCellElement*',
+'HTMLTableCellElementImpl*' => 'tde_HTMLTableCellElementImpl*',
+'HTMLTableColElement&' => 'tde_HTMLTableColElement*',
+'HTMLTableColElement*' => 'tde_HTMLTableColElement*',
+'HTMLTableColElementImpl*' => 'tde_HTMLTableColElementImpl*',
+'HTMLTableElement&' => 'tde_HTMLTableElement*',
+'HTMLTableElement*' => 'tde_HTMLTableElement*',
+'HTMLTableElementImpl*' => 'tde_HTMLTableElementImpl*',
+'HTMLTableRowElement&' => 'tde_HTMLTableRowElement*',
+'HTMLTableRowElement*' => 'tde_HTMLTableRowElement*',
+'HTMLTableRowElementImpl*' => 'tde_HTMLTableRowElementImpl*',
+'HTMLTableSectionElement&' => 'tde_HTMLTableSectionElement*',
+'HTMLTableSectionElement' => 'tde_HTMLTableSectionElement*',
+'HTMLTableSectionElement*' => 'tde_HTMLTableSectionElement*',
+'HTMLTableSectionElementImpl*' => 'tde_HTMLTableSectionElementImpl*',
+'HTMLTextAreaElement&' => 'tde_HTMLTextAreaElement*',
+'HTMLTextAreaElement*' => 'tde_HTMLTextAreaElement*',
+'HTMLTextAreaElementImpl*' => 'tde_HTMLTextAreaElementImpl*',
+'HTMLTitleElement&' => 'tde_HTMLTitleElement*',
+'HTMLTitleElement*' => 'tde_HTMLTitleElement*',
+'HTMLTitleElementImpl*' => 'tde_HTMLTitleElementImpl*',
+'HTMLUListElement&' => 'tde_HTMLUListElement*',
+'HTMLUListElement*' => 'tde_HTMLUListElement*',
+'HTMLUListElementImpl*' => 'tde_HTMLUListElementImpl*',
 'HandlerType'  =>  'qt_HandlerType*' ,
-'HashEntry*' => 'kde_HashEntry*',
-'HashTable*' => 'kde_HashTable*',
-'Header&' => 'kde_Header*',
-'Header*' => 'kde_Header*',
-'HighlightingInterface*' => 'kde_HighlightingInterface*',
-'HistoryProvider*' => 'kde_HistoryProvider*',
-'HostImp*' => 'kde_HostImp*',
-'IDLFileReg*' => 'kde_IDLFileReg*',
-'IOManager*' => 'kde_IOManager*',
-'IONotify*' => 'kde_IONotify*',
-'IOType*' => 'kde_IOType*',
-'IOWatchFD*' => 'kde_IOWatchFD*',
+'HashEntry*' => 'tde_HashEntry*',
+'HashTable*' => 'tde_HashTable*',
+'Header&' => 'tde_Header*',
+'Header*' => 'tde_Header*',
+'HighlightingInterface*' => 'tde_HighlightingInterface*',
+'HistoryProvider*' => 'tde_HistoryProvider*',
+'HostImp*' => 'tde_HostImp*',
+'IDLFileReg*' => 'tde_IDLFileReg*',
+'IOManager*' => 'tde_IOManager*',
+'IONotify*' => 'tde_IONotify*',
+'IOType*' => 'tde_IOType*',
+'IOWatchFD*' => 'tde_IOWatchFD*',
 'Icon' => 'int',
-'IconListBox*' => 'kde_IconListBox*',
+'IconListBox*' => 'tde_IconListBox*',
 'Imp*' => 'void*',
-'Info*' => 'kde_Info*',
-'InterfaceDef&' => 'kde_InterfaceDef*',
-'InterfaceDef' => 'kde_InterfaceDef*',
-'InterfaceDef*' => 'kde_InterfaceDef*',
-'InterfaceEntry*' => 'kde_InterfaceEntry*',
-'InterfaceRepo&' => 'kde_InterfaceRepo*',
-'InterfaceRepo' => 'kde_InterfaceRepo*',
-'InterfaceRepo*' => 'kde_InterfaceRepo*',
-'InterfaceRepo_base*' => 'kde_InterfaceRepo_base*',
-'InterfaceRepo_impl*' => 'kde_InterfaceRepo_impl*',
-'InterfaceRepo_skel*' => 'kde_InterfaceRepo_skel*',
-'InterfaceRepo_stub*' => 'kde_InterfaceRepo_stub*',
-'InternalFunctionImp*' => 'kde_InternalFunctionImp*',
-'Interpreter*' => 'kde_Interpreter*',
-'Invocation&' => 'kde_Invocation*',
-'Invocation*' => 'kde_Invocation*',
+'Info*' => 'tde_Info*',
+'InterfaceDef&' => 'tde_InterfaceDef*',
+'InterfaceDef' => 'tde_InterfaceDef*',
+'InterfaceDef*' => 'tde_InterfaceDef*',
+'InterfaceEntry*' => 'tde_InterfaceEntry*',
+'InterfaceRepo&' => 'tde_InterfaceRepo*',
+'InterfaceRepo' => 'tde_InterfaceRepo*',
+'InterfaceRepo*' => 'tde_InterfaceRepo*',
+'InterfaceRepo_base*' => 'tde_InterfaceRepo_base*',
+'InterfaceRepo_impl*' => 'tde_InterfaceRepo_impl*',
+'InterfaceRepo_skel*' => 'tde_InterfaceRepo_skel*',
+'InterfaceRepo_stub*' => 'tde_InterfaceRepo_stub*',
+'InternalFunctionImp*' => 'tde_InternalFunctionImp*',
+'Interpreter*' => 'tde_Interpreter*',
+'Invocation&' => 'tde_Invocation*',
+'Invocation*' => 'tde_Invocation*',
 'Iterator'  =>  'Iterator*' ,
 'Job*' => 'void*',
 'K&'  =>  'K*' ,
-'TDEAboutApplication*' => 'kde_TDEAboutApplication*',
-'TDEAboutContainer*'  =>  'kde_TDEAboutContainer*' ,
-'TDEAboutContributor*' => 'kde_TDEAboutContributor*',
-'TDEAboutData*'  =>  'kde_TDEAboutData*' ,
-'TDEAboutDialog*' => 'kde_TDEAboutDialog*',
-'TDEAboutKDE*' => 'kde_TDEAboutKDE*',
-'TDEAboutPerson*' => 'kde_TDEAboutPerson*',
-'TDEAboutTranslator*' => 'kde_TDEAboutTranslator*',
-'TDEAboutWidget*' => 'kde_TDEAboutWidget*',
-'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*' ,
-'KAppTreeListItem*'  =>  'kde_KAppTreeListItem*' ,
-'TDEApplication*'  =>  'kde_TDEApplication*' ,
-'TDEApplicationPropsPlugin*' => 'kde_TDEApplicationPropsPlugin*',
-'TDEApplicationTree*' => 'kde_TDEApplicationTree*',
-'KArchive*' => 'kde_KArchive*',
-'KArchiveDirectory*' => 'kde_KArchiveDirectory*',
-'KArchiveEntry*' => 'kde_KArchiveEntry*',
-'KArchiveFile*' => 'kde_KArchiveFile*',
-'KArrowButton*' => 'kde_KArrowButton*',
-'KArtsDispatcher*' => 'kde_KArtsDispatcher*',
-'KArtsFloatWatch*' => 'kde_KArtsFloatWatch*',
-'KAsyncIO*' => 'kde_KAsyncIO*',
-'KAudioPlayer*' => 'kde_KAudioPlayer*',
-'KAuthIcon*' => 'kde_KAuthIcon*',
-'KAutoMount*' => 'kde_KAutoMount*',
-'KAutoUnmount*' => 'kde_KAutoUnmount*',
-'KBindingPropsPlugin*' => 'kde_KBindingPropsPlugin*',
-'KBlankEffect*' => 'kde_KBlankEffect*',
-'TDEBufferedIO*' => 'kde_TDEBufferedIO*',
-'KBugReport*' => 'kde_KBugReport*',
-'KButtonBox*' => 'kde_KButtonBox*',
-'TDECModule*'  =>  'kde_TDECModule*' ,
-'KCatalogue&' => 'kde_KCatalogue*',
-'KCatalogue*' => 'kde_KCatalogue*',
-'KCharSelect*' => 'kde_KCharSelect*',
-'KCharSelectTable*' => 'kde_KCharSelectTable*',
-'KCharsets*'  =>  'kde_KCharsets*' ,
-'TDECmdLineArgs*'  =>  'kde_TDECmdLineArgs*' ,
-'KCodecs*' => 'kde_KCodecs*',
-'KColor&'  => 'kde_KColor*' ,
-'KColor*' => 'kde_KColor*',
-'KColorButton*' => 'kde_KColorButton*',
-'KColorCells*' => 'kde_KColorCells*',
-'KColorCombo*' => 'kde_KColorCombo*',
-'KColorDialog*' => 'kde_KColorDialog*',
-'KColorDrag*'  =>  'kde_KColorDrag*' ,
-'KColorPatch*' => 'kde_KColorPatch*',
-'KCombiView*' => 'kde_KCombiView*',
-'KComboBox*'  =>  'kde_KComboBox*' ,
-'KCommand*' => 'kde_KCommand*',
-'KCommandHistory*' => 'kde_KCommandHistory*',
-'TDECompletion*'  =>  'kde_TDECompletion*' ,
-'TDECompletionBase*' => 'kde_TDECompletionBase*',
-'TDECompletionBox*' => 'kde_TDECompletionBox*',
-'TDEConfig*'  => 'kde_TDEConfig*' ,
-'TDEConfigBackEnd*' => 'kde_TDEConfigBackEnd*',
-'TDEConfigBase&' => 'kde_TDEConfigBase*',
-'TDEConfigBase*'  => 'kde_TDEConfigBase*' ,
-'TDEConfigGroup*' => 'kde_TDEConfigGroup*',
-'TDEConfigGroupSaver*' => 'kde_TDEConfigGroupSaver*',
-'TDEConfigINIBackEnd*' => 'kde_TDEConfigINIBackEnd*',
-'KContainerLayout*' => 'kde_KContainerLayout*',
-'KContainerLayoutItem*'  => 'kde_KContainerLayoutItem*' ,
-'KContextMenuManager*' => 'kde_KContextMenuManager*',
-'KCookie*' => 'kde_KCookie*',
-'TDECrash*' => 'kde_TDECrash*',
-'KCursor*' => 'kde_KCursor*',
+'TDEAboutApplication*' => 'tde_TDEAboutApplication*',
+'TDEAboutContainer*'  =>  'tde_TDEAboutContainer*' ,
+'TDEAboutContributor*' => 'tde_TDEAboutContributor*',
+'TDEAboutData*'  =>  'tde_TDEAboutData*' ,
+'TDEAboutDialog*' => 'tde_TDEAboutDialog*',
+'TDEAboutKDE*' => 'tde_TDEAboutKDE*',
+'TDEAboutPerson*' => 'tde_TDEAboutPerson*',
+'TDEAboutTranslator*' => 'tde_TDEAboutTranslator*',
+'TDEAboutWidget*' => 'tde_TDEAboutWidget*',
+'TDEAccel*'  =>  'tde_TDEAccel*' ,
+'TDEAccelAction&' => 'tde_TDEAccelAction*',
+'TDEAccelAction*' => 'tde_TDEAccelAction*',
+'TDEAccelActions&' => 'tde_TDEAccelActions*',
+'TDEAccelActions*' => 'tde_TDEAccelActions*',
+'TDEAccelBase*' => 'tde_TDEAccelBase*',
+'TDEAccelGen*' => 'tde_TDEAccelGen*',
+'TDEAccelMenu*' => 'tde_TDEAccelMenu*',
+'TDEAccelSequence&' => 'tde_TDEAccelSequence*',
+'TDEAccelSequence' => 'tde_TDEAccelSequence*',
+'TDEAccelSequence*' => 'tde_TDEAccelSequence*',
+'TDEAccelShortcut&' => 'tde_TDEAccelShortcut*',
+'TDEAccelShortcut' => 'tde_TDEAccelShortcut*',
+'TDEAccelShortcut*' => 'tde_TDEAccelShortcut*',
+'TDEAccelShortcuts&' => 'tde_TDEAccelShortcuts*',
+'TDEAccelShortcuts*' => 'tde_TDEAccelShortcuts*',
+'TDEAction*'  =>  'tde_TDEAction*' ,
+'TDEActionCollection&'  => 'tde_TDEActionCollection*' ,
+'TDEActionCollection'  => 'tde_TDEActionCollection*' ,
+'TDEActionCollection*'  => 'tde_TDEActionCollection*' ,
+'TDEActionMenu*' => 'tde_TDEActionMenu*',
+'TDEActionSeparator*' => 'tde_TDEActionSeparator*',
+'KAddressInfo*' => 'tde_KAddressInfo*',
+'KAlphaPainter*' => 'tde_KAlphaPainter*',
+'KAnimWidget*'  =>  'tde_KAnimWidget*' ,
+'KAppTreeListItem*'  =>  'tde_KAppTreeListItem*' ,
+'TDEApplication*'  =>  'tde_TDEApplication*' ,
+'TDEApplicationPropsPlugin*' => 'tde_TDEApplicationPropsPlugin*',
+'TDEApplicationTree*' => 'tde_TDEApplicationTree*',
+'KArchive*' => 'tde_KArchive*',
+'KArchiveDirectory*' => 'tde_KArchiveDirectory*',
+'KArchiveEntry*' => 'tde_KArchiveEntry*',
+'KArchiveFile*' => 'tde_KArchiveFile*',
+'KArrowButton*' => 'tde_KArrowButton*',
+'KArtsDispatcher*' => 'tde_KArtsDispatcher*',
+'KArtsFloatWatch*' => 'tde_KArtsFloatWatch*',
+'KAsyncIO*' => 'tde_KAsyncIO*',
+'KAudioPlayer*' => 'tde_KAudioPlayer*',
+'KAuthIcon*' => 'tde_KAuthIcon*',
+'KAutoMount*' => 'tde_KAutoMount*',
+'KAutoUnmount*' => 'tde_KAutoUnmount*',
+'KBindingPropsPlugin*' => 'tde_KBindingPropsPlugin*',
+'KBlankEffect*' => 'tde_KBlankEffect*',
+'TDEBufferedIO*' => 'tde_TDEBufferedIO*',
+'KBugReport*' => 'tde_KBugReport*',
+'KButtonBox*' => 'tde_KButtonBox*',
+'TDECModule*'  =>  'tde_TDECModule*' ,
+'KCatalogue&' => 'tde_KCatalogue*',
+'KCatalogue*' => 'tde_KCatalogue*',
+'KCharSelect*' => 'tde_KCharSelect*',
+'KCharSelectTable*' => 'tde_KCharSelectTable*',
+'KCharsets*'  =>  'tde_KCharsets*' ,
+'TDECmdLineArgs*'  =>  'tde_TDECmdLineArgs*' ,
+'KCodecs*' => 'tde_KCodecs*',
+'KColor&'  => 'tde_KColor*' ,
+'KColor*' => 'tde_KColor*',
+'KColorButton*' => 'tde_KColorButton*',
+'KColorCells*' => 'tde_KColorCells*',
+'KColorCombo*' => 'tde_KColorCombo*',
+'KColorDialog*' => 'tde_KColorDialog*',
+'KColorDrag*'  =>  'tde_KColorDrag*' ,
+'KColorPatch*' => 'tde_KColorPatch*',
+'KCombiView*' => 'tde_KCombiView*',
+'KComboBox*'  =>  'tde_KComboBox*' ,
+'KCommand*' => 'tde_KCommand*',
+'KCommandHistory*' => 'tde_KCommandHistory*',
+'TDECompletion*'  =>  'tde_TDECompletion*' ,
+'TDECompletionBase*' => 'tde_TDECompletionBase*',
+'TDECompletionBox*' => 'tde_TDECompletionBox*',
+'TDEConfig*'  => 'tde_TDEConfig*' ,
+'TDEConfigBackEnd*' => 'tde_TDEConfigBackEnd*',
+'TDEConfigBase&' => 'tde_TDEConfigBase*',
+'TDEConfigBase*'  => 'tde_TDEConfigBase*' ,
+'TDEConfigGroup*' => 'tde_TDEConfigGroup*',
+'TDEConfigGroupSaver*' => 'tde_TDEConfigGroupSaver*',
+'TDEConfigINIBackEnd*' => 'tde_TDEConfigINIBackEnd*',
+'KContainerLayout*' => 'tde_KContainerLayout*',
+'KContainerLayoutItem*'  => 'tde_KContainerLayoutItem*' ,
+'KContextMenuManager*' => 'tde_KContextMenuManager*',
+'KCookie*' => 'tde_KCookie*',
+'TDECrash*' => 'tde_TDECrash*',
+'KCursor*' => 'tde_KCursor*',
 'KDBGFUNC'  => 'void*' ,
-'KDCOPActionProxy*' => 'kde_KDCOPActionProxy*',
-'KDCOPPropertyProxy*' => 'kde_KDCOPPropertyProxy*',
-'KDEAniMenu*' => 'kde_KDEAniMenu*',
-'KDEDModule*' => 'kde_KDEDModule*',
-'KDEDesktopMimeType*' => 'kde_KDEDesktopMimeType*',
-'KDESasl*' => 'kde_KDESasl*',
-'KDEStyle*' => 'kde_KDEStyle*',
-'KDataTool*' => 'kde_KDataTool*',
-'KDataToolAction*' => 'kde_KDataToolAction*',
-'KDataToolInfo&' => 'kde_KDataToolInfo*',
-'KDataToolInfo*' => 'kde_KDataToolInfo*',
-'KDateInternalMonthPicker*' => 'kde_KDateInternalMonthPicker*',
-'KDateInternalYearSelector*' => 'kde_KDateInternalYearSelector*',
-'KDatePicker*' => 'kde_KDatePicker*',
-'KDateTable*' => 'kde_KDateTable*',
-'KDateValidator*' => 'kde_KDateValidator*',
-'KDateWidget*' => 'kde_KDateWidget*',
-'KDesktopFile*'  => 'kde_KDesktopFile*' ,
-'KDevApi*' => 'kde_KDevApi*',
-'KDevAppFrontend*' => 'kde_KDevAppFrontend*',
-'KDevCompilerOptions*' => 'kde_KDevCompilerOptions*',
-'KDevCore*' => 'kde_KDevCore*',
-'KDevFactory*' => 'kde_KDevFactory*',
-'KDevLanguageSupport*' => 'kde_KDevLanguageSupport*',
-'KDevMakeFrontend*' => 'kde_KDevMakeFrontend*',
-'KDevPart*' => 'kde_KDevPart*',
-'KDevProject*' => 'kde_KDevProject*',
-'KDevVersionControl*' => 'kde_KDevVersionControl*',
-'KDevicePropsPlugin*' => 'kde_KDevicePropsPlugin*',
-'KDialog*' => 'kde_KDialog*',
-'KDialogBase*'  =>  'kde_KDialogBase*' ,
-'KDialogBaseTile*' => 'kde_KDialogBaseTile*',
-'KDialogQueue*' => 'kde_KDialogQueue*',
-'KDirNotify*' => 'kde_KDirNotify*',
-'KDirNotify_stub*' => 'kde_KDirNotify_stub*',
-'KDirOperator*' => 'kde_KDirOperator*',
-'KDirSelectDialog*' => 'kde_KDirSelectDialog*',
-'KDirSize*'  =>  'kde_KDirSize*' ,
-'KDirWatch*'  =>  'kde_KDirWatch*' ,
-'KDirectionButton*' => 'kde_KDirectionButton*',
-'KDockArea*' => 'kde_KDockArea*',
-'KDockMainWindow*' => 'kde_KDockMainWindow*',
-'KDockManager*'  => 'kde_KDockManager*' ,
-'KDockTabBar*' => 'kde_KDockTabBar*',
+'KDCOPActionProxy*' => 'tde_KDCOPActionProxy*',
+'KDCOPPropertyProxy*' => 'tde_KDCOPPropertyProxy*',
+'KDEAniMenu*' => 'tde_KDEAniMenu*',
+'KDEDModule*' => 'tde_KDEDModule*',
+'KDEDesktopMimeType*' => 'tde_KDEDesktopMimeType*',
+'KDESasl*' => 'tde_KDESasl*',
+'KDEStyle*' => 'tde_KDEStyle*',
+'KDataTool*' => 'tde_KDataTool*',
+'KDataToolAction*' => 'tde_KDataToolAction*',
+'KDataToolInfo&' => 'tde_KDataToolInfo*',
+'KDataToolInfo*' => 'tde_KDataToolInfo*',
+'KDateInternalMonthPicker*' => 'tde_KDateInternalMonthPicker*',
+'KDateInternalYearSelector*' => 'tde_KDateInternalYearSelector*',
+'KDatePicker*' => 'tde_KDatePicker*',
+'KDateTable*' => 'tde_KDateTable*',
+'KDateValidator*' => 'tde_KDateValidator*',
+'KDateWidget*' => 'tde_KDateWidget*',
+'KDesktopFile*'  => 'tde_KDesktopFile*' ,
+'KDevApi*' => 'tde_KDevApi*',
+'KDevAppFrontend*' => 'tde_KDevAppFrontend*',
+'KDevCompilerOptions*' => 'tde_KDevCompilerOptions*',
+'KDevCore*' => 'tde_KDevCore*',
+'KDevFactory*' => 'tde_KDevFactory*',
+'KDevLanguageSupport*' => 'tde_KDevLanguageSupport*',
+'KDevMakeFrontend*' => 'tde_KDevMakeFrontend*',
+'KDevPart*' => 'tde_KDevPart*',
+'KDevProject*' => 'tde_KDevProject*',
+'KDevVersionControl*' => 'tde_KDevVersionControl*',
+'KDevicePropsPlugin*' => 'tde_KDevicePropsPlugin*',
+'KDialog*' => 'tde_KDialog*',
+'KDialogBase*'  =>  'tde_KDialogBase*' ,
+'KDialogBaseTile*' => 'tde_KDialogBaseTile*',
+'KDialogQueue*' => 'tde_KDialogQueue*',
+'KDirNotify*' => 'tde_KDirNotify*',
+'KDirNotify_stub*' => 'tde_KDirNotify_stub*',
+'KDirOperator*' => 'tde_KDirOperator*',
+'KDirSelectDialog*' => 'tde_KDirSelectDialog*',
+'KDirSize*'  =>  'tde_KDirSize*' ,
+'KDirWatch*'  =>  'tde_KDirWatch*' ,
+'KDirectionButton*' => 'tde_KDirectionButton*',
+'KDockArea*' => 'tde_KDockArea*',
+'KDockMainWindow*' => 'tde_KDockMainWindow*',
+'KDockManager*'  => 'tde_KDockManager*' ,
+'KDockTabBar*' => 'tde_KDockTabBar*',
 'KDockTabBar::TabPos' => 'int',
-'KDockTabBarPainter*' => 'kde_KDockTabBarPainter*',
-'KDockTabCtl*' => 'kde_KDockTabCtl*',
-'KDockTabCtl_PrivateStruct*'  =>  'kde_KDockTabCtl_PrivateStruct*' ,
-'KDockTabGroup*'  =>  'kde_KDockTabGroup*' ,
-'KDockWidget*'  => 'kde_KDockWidget*' ,
-'KDockWidgetAbstractHeader*'  => 'kde_KDockWidgetAbstractHeader*' ,
-'KDockWidgetAbstractHeaderDrag*' => 'kde_KDockWidgetAbstractHeaderDrag*',
-'KDockWidgetHeader*' => 'kde_KDockWidgetHeader*',
-'KDockWidgetHeaderDrag*' => 'kde_KDockWidgetHeaderDrag*',
-'KDockWindow*' => 'kde_KDockWindow*',
-'KDoubleNumInput*' => 'kde_KDoubleNumInput*',
-'KDualColorButton*' => 'kde_KDualColorButton*',
-'KEMailSettings*' => 'kde_KEMailSettings*',
-'KEdFind*' => 'kde_KEdFind*',
-'KEdGotoLine*' => 'kde_KEdGotoLine*',
-'KEdReplace*' => 'kde_KEdReplace*',
-'KEdit*' => 'kde_KEdit*',
-'KEditListBox*' => 'kde_KEditListBox*',
-'KEditToolbar*' => 'kde_KEditToolbar*',
-'KEditToolbarWidget*' => 'kde_KEditToolbarWidget*',
-'KEntry&'  => 'kde_KEntry*' ,
-'KEntry'  => 'kde_KEntry*' ,
-'KEntry*' => 'kde_KEntry*',
-'KEntryKey&'  => 'kde_KEntryKey*' ,
-'KEntryKey*' => 'kde_KEntryKey*',
-'KExecMimeType*' => 'kde_KExecMimeType*',
-'KExecPropsPlugin*' => 'kde_KExecPropsPlugin*',
-'KFile*' => 'kde_KFile*',
+'KDockTabBarPainter*' => 'tde_KDockTabBarPainter*',
+'KDockTabCtl*' => 'tde_KDockTabCtl*',
+'KDockTabCtl_PrivateStruct*'  =>  'tde_KDockTabCtl_PrivateStruct*' ,
+'KDockTabGroup*'  =>  'tde_KDockTabGroup*' ,
+'KDockWidget*'  => 'tde_KDockWidget*' ,
+'KDockWidgetAbstractHeader*'  => 'tde_KDockWidgetAbstractHeader*' ,
+'KDockWidgetAbstractHeaderDrag*' => 'tde_KDockWidgetAbstractHeaderDrag*',
+'KDockWidgetHeader*' => 'tde_KDockWidgetHeader*',
+'KDockWidgetHeaderDrag*' => 'tde_KDockWidgetHeaderDrag*',
+'KDockWindow*' => 'tde_KDockWindow*',
+'KDoubleNumInput*' => 'tde_KDoubleNumInput*',
+'KDualColorButton*' => 'tde_KDualColorButton*',
+'KEMailSettings*' => 'tde_KEMailSettings*',
+'KEdFind*' => 'tde_KEdFind*',
+'KEdGotoLine*' => 'tde_KEdGotoLine*',
+'KEdReplace*' => 'tde_KEdReplace*',
+'KEdit*' => 'tde_KEdit*',
+'KEditListBox*' => 'tde_KEditListBox*',
+'KEditToolbar*' => 'tde_KEditToolbar*',
+'KEditToolbarWidget*' => 'tde_KEditToolbarWidget*',
+'KEntry&'  => 'tde_KEntry*' ,
+'KEntry'  => 'tde_KEntry*' ,
+'KEntry*' => 'tde_KEntry*',
+'KEntryKey&'  => 'tde_KEntryKey*' ,
+'KEntryKey*' => 'tde_KEntryKey*',
+'KExecMimeType*' => 'tde_KExecMimeType*',
+'KExecPropsPlugin*' => 'tde_KExecPropsPlugin*',
+'KFile*' => 'tde_KFile*',
 'KFile::FileView'  => 'int' ,
 'KFile::Mode'  => 'int' ,
 'KFile::SelectionMode'  => 'int' ,
-'KFileBookmark*'  =>  'kde_KFileBookmark*' ,
-'KFileBookmarkManager*' => 'kde_KFileBookmarkManager*',
-'KFileComboBox*' => 'kde_KFileComboBox*',
-'KFileDetailView*' => 'kde_KFileDetailView*',
-'KFileDialog*'  =>  'kde_KFileDialog*' ,
-'KFileFilter*' => 'kde_KFileFilter*',
-'KFileFilterCombo*' => 'kde_KFileFilterCombo*',
-'KFileIconView*' => 'kde_KFileIconView*',
-'KFileIconViewItem*' => 'kde_KFileIconViewItem*',
-'KFileItemList&'  => 'kde_KFileItemList*' ,
-'KFileItemList'  => 'kde_KFileItemList*' ,
-'KFileItemList*'  => 'kde_KFileItemList*' ,
-'KFileListViewItem*' => 'kde_KFileListViewItem*',
-'KFileMetaInfo*' => 'kde_KFileMetaInfo*',
-'KFileMetaInfoItem*' => 'kde_KFileMetaInfoItem*',
-'KFileMetaInfoProvider*' => 'kde_KFileMetaInfoProvider*',
-'KFileOpenWithHandler*' => 'kde_KFileOpenWithHandler*',
-'KFilePermissionsPropsPlugin*' => 'kde_KFilePermissionsPropsPlugin*',
-'KFilePlugin*' => 'kde_KFilePlugin*',
-'KFilePreview*' => 'kde_KFilePreview*',
-'KFilePropsPlugin*' => 'kde_KFilePropsPlugin*',
-'KFileReader*'  => 'kde_KFileReader*' ,
-'KFileTreeBranch*' => 'kde_KFileTreeBranch*',
-'KFileTreeView*' => 'kde_KFileTreeView*',
-'KFileTreeViewItem*' => 'kde_KFileTreeViewItem*',
-'KFileTreeViewToolTip*' => 'kde_KFileTreeViewToolTip*',
-'KFileView*'  => 'kde_KFileView*' ,
+'KFileBookmark*'  =>  'tde_KFileBookmark*' ,
+'KFileBookmarkManager*' => 'tde_KFileBookmarkManager*',
+'KFileComboBox*' => 'tde_KFileComboBox*',
+'KFileDetailView*' => 'tde_KFileDetailView*',
+'KFileDialog*'  =>  'tde_KFileDialog*' ,
+'KFileFilter*' => 'tde_KFileFilter*',
+'KFileFilterCombo*' => 'tde_KFileFilterCombo*',
+'KFileIconView*' => 'tde_KFileIconView*',
+'KFileIconViewItem*' => 'tde_KFileIconViewItem*',
+'KFileItemList&'  => 'tde_KFileItemList*' ,
+'KFileItemList'  => 'tde_KFileItemList*' ,
+'KFileItemList*'  => 'tde_KFileItemList*' ,
+'KFileListViewItem*' => 'tde_KFileListViewItem*',
+'KFileMetaInfo*' => 'tde_KFileMetaInfo*',
+'KFileMetaInfoItem*' => 'tde_KFileMetaInfoItem*',
+'KFileMetaInfoProvider*' => 'tde_KFileMetaInfoProvider*',
+'KFileOpenWithHandler*' => 'tde_KFileOpenWithHandler*',
+'KFilePermissionsPropsPlugin*' => 'tde_KFilePermissionsPropsPlugin*',
+'KFilePlugin*' => 'tde_KFilePlugin*',
+'KFilePreview*' => 'tde_KFilePreview*',
+'KFilePropsPlugin*' => 'tde_KFilePropsPlugin*',
+'KFileReader*'  => 'tde_KFileReader*' ,
+'KFileTreeBranch*' => 'tde_KFileTreeBranch*',
+'KFileTreeView*' => 'tde_KFileTreeView*',
+'KFileTreeViewItem*' => 'tde_KFileTreeViewItem*',
+'KFileTreeViewToolTip*' => 'tde_KFileTreeViewToolTip*',
+'KFileView*'  => 'tde_KFileView*' ,
 'KFileView::FileView' => 'int',
-'KFileViewItem&' => 'kde_KFileViewItem*',
-'KFileViewItem*'  => 'kde_KFileViewItem*' ,
-'KFileViewItem**'  => 'kde_KFileViewItem**' ,
-'KFileViewItemList&'  => 'kde_KFileViewItemList*' ,
-'KFileViewItemList*'  => 'kde_KFileViewItemList*' ,
-'KFileViewSignaler*' => 'kde_KFileViewSignaler*',
-'KFilterBase*' => 'kde_KFilterBase*',
-'KFilterDev*' => 'kde_KFilterDev*',
-'KFloatValidator*' => 'kde_KFloatValidator*',
-'KFloatWatchProxy&' => 'kde_KFloatWatchProxy*',
-'KFloatWatchProxy' => 'kde_KFloatWatchProxy*',
-'KFloatWatchProxy*' => 'kde_KFloatWatchProxy*',
-'KFolderType*' => 'kde_KFolderType*',
-'TDEsuClient*' => 'kde_TDEsuClient*',
-'TDEFontAction*' => 'kde_TDEFontAction*',
-'TDEFontChooser*' => 'kde_TDEFontChooser*',
-'TDEFontCombo*' => 'kde_TDEFontCombo*',
-'TDEFontDialog*' => 'kde_TDEFontDialog*',
-'TDEFontSizeAction*' => 'kde_TDEFontSizeAction*',
-'KGenericFactory*' => 'kde_KGenericFactory*',
-'KGenericFactoryBase*' => 'kde_KGenericFactoryBase*',
-'TDEGlobal*' => 'kde_TDEGlobal*',
-'TDEGlobalAccel*'  =>  'kde_TDEGlobalAccel*' ,
-'TDEGlobalSettings*' => 'kde_TDEGlobalSettings*',
+'KFileViewItem&' => 'tde_KFileViewItem*',
+'KFileViewItem*'  => 'tde_KFileViewItem*' ,
+'KFileViewItem**'  => 'tde_KFileViewItem**' ,
+'KFileViewItemList&'  => 'tde_KFileViewItemList*' ,
+'KFileViewItemList*'  => 'tde_KFileViewItemList*' ,
+'KFileViewSignaler*' => 'tde_KFileViewSignaler*',
+'KFilterBase*' => 'tde_KFilterBase*',
+'KFilterDev*' => 'tde_KFilterDev*',
+'KFloatValidator*' => 'tde_KFloatValidator*',
+'KFloatWatchProxy&' => 'tde_KFloatWatchProxy*',
+'KFloatWatchProxy' => 'tde_KFloatWatchProxy*',
+'KFloatWatchProxy*' => 'tde_KFloatWatchProxy*',
+'KFolderType*' => 'tde_KFolderType*',
+'TDEsuClient*' => 'tde_TDEsuClient*',
+'TDEFontAction*' => 'tde_TDEFontAction*',
+'TDEFontChooser*' => 'tde_TDEFontChooser*',
+'TDEFontCombo*' => 'tde_TDEFontCombo*',
+'TDEFontDialog*' => 'tde_TDEFontDialog*',
+'TDEFontSizeAction*' => 'tde_TDEFontSizeAction*',
+'KGenericFactory*' => 'tde_KGenericFactory*',
+'KGenericFactoryBase*' => 'tde_KGenericFactoryBase*',
+'TDEGlobal*' => 'tde_TDEGlobal*',
+'TDEGlobalAccel*'  =>  'tde_TDEGlobalAccel*' ,
+'TDEGlobalSettings*' => 'tde_TDEGlobalSettings*',
 'TDEGlobalSettings::Completion'  => 'int' ,
-'KGradientSelector*' => 'kde_KGradientSelector*',
-'KGuiItem&' => 'kde_KGuiItem*',
-'KGuiItem' => 'kde_KGuiItem*',
-'KGuiItem*' => 'kde_KGuiItem*',
-'KHSSelector*' => 'kde_KHSSelector*',
-'TDEHTMLPart*'  =>  'kde_TDEHTMLPart*' ,
-'TDEHTMLSettings&' => 'kde_TDEHTMLSettings*',
-'TDEHTMLSettings*'  => 'kde_TDEHTMLSettings*' ,
-'TDEHTMLView*'  => 'kde_TDEHTMLView*' ,
-'KHelpMenu*' => 'kde_KHelpMenu*',
-'KHistoryCombo*' => 'kde_KHistoryCombo*',
-'TDEIO*' => 'kde_TDEIO*',
-'TDEIO::CopyJob*'  => 'kde_CopyJob*' ,
-'TDEIO::DeleteJob*'  => 'kde_DeleteJob*' ,
-'TDEIO::Job*'  => 'kde_Job*' ,
-'TDEIO::ListJob*'  => 'kde_ListJob*' ,
+'KGradientSelector*' => 'tde_KGradientSelector*',
+'KGuiItem&' => 'tde_KGuiItem*',
+'KGuiItem' => 'tde_KGuiItem*',
+'KGuiItem*' => 'tde_KGuiItem*',
+'KHSSelector*' => 'tde_KHSSelector*',
+'TDEHTMLPart*'  =>  'tde_TDEHTMLPart*' ,
+'TDEHTMLSettings&' => 'tde_TDEHTMLSettings*',
+'TDEHTMLSettings*'  => 'tde_TDEHTMLSettings*' ,
+'TDEHTMLView*'  => 'tde_TDEHTMLView*' ,
+'KHelpMenu*' => 'tde_KHelpMenu*',
+'KHistoryCombo*' => 'tde_KHistoryCombo*',
+'TDEIO*' => 'tde_TDEIO*',
+'TDEIO::CopyJob*'  => 'tde_CopyJob*' ,
+'TDEIO::DeleteJob*'  => 'tde_DeleteJob*' ,
+'TDEIO::Job*'  => 'tde_Job*' ,
+'TDEIO::ListJob*'  => 'tde_ListJob*' ,
 'TDEIO::RenameDlg_Mode' => 'int',
 'TDEIO::RenameDlg_Result' => 'int',
-'TDEIO::SimpleJob*' => 'kde_SimpleJob*',
+'TDEIO::SimpleJob*' => 'tde_SimpleJob*',
 'TDEIO::SkipDlg_Result' => 'int',
-'TDEIO::Slave*' => 'kde_Slave*',
-'TDEIOInputStream&' => 'kde_TDEIOInputStream*',
-'TDEIOInputStream*' => 'kde_TDEIOInputStream*',
-'KIOTestSlow&' => 'kde_KIOTestSlow*',
-'KIOTestSlow' => 'kde_KIOTestSlow*',
-'KIOTestSlow*' => 'kde_KIOTestSlow*',
-'KIPC*' => 'kde_KIPC*',
-'TDEIcon'  => 'kde_TDEIcon*' ,
-'TDEIcon*' => 'kde_TDEIcon*',
-'TDEIconButton*' => 'kde_TDEIconButton*',
-'TDEIconCanvas*' => 'kde_TDEIconCanvas*',
-'TDEIconDialog*' => 'kde_TDEIconDialog*',
-'TDEIconEffect*'  =>  'kde_TDEIconEffect*' ,
-'TDEIconLoader*'  => 'kde_TDEIconLoader*' ,
-'TDEIconSelectAction*' => 'kde_TDEIconSelectAction*',
-'TDEIconView*' => 'kde_TDEIconView*',
-'TDEIconViewItem*' => 'kde_TDEIconViewItem*',
-'KImageEffect*' => 'kde_KImageEffect*',
-'KImageFilePreview*' => 'kde_KImageFilePreview*',
-'KImageIO*' => 'kde_KImageIO*',
-'TDEInstance&'  => 'kde_TDEInstance*' ,
-'TDEInstance'  => 'kde_TDEInstance*' ,
-'TDEInstance*'  => 'kde_TDEInstance*' ,
-'KIntNumInput*' => 'kde_KIntNumInput*',
-'KIntSpinBox*' => 'kde_KIntSpinBox*',
-'KIntValidator*' => 'kde_KIntValidator*',
-'KJS*' => 'kde_KJS*',
-'KJS::KJSO&' => 'kde_KJS_KJSO*',
-'KJS::UString&' => 'kde_KJS_UString*',
-'KJSO&' => 'kde_KJSO*',
-'KJSO' => 'kde_KJSO*',
-'KJSO*' => 'kde_KJSO*',
-'KJScript*' => 'kde_KJScript*',
-'KJanusWidget*' => 'kde_KJanusWidget*',
-'KKeyChooser*' => 'kde_KKeyChooser*',
-'KKeyDialog*' => 'kde_KKeyDialog*',
-'KKeyEntry&'  => 'kde_KKeyEntry*' ,
-'KKeyEntry*' => 'kde_KKeyEntry*',
-'KKeyEntryMap&'  => 'kde_KKeyEntryMap*' ,
-'KKeyEntryMap'  => 'kde_KKeyEntryMap*' ,
-'KKeyEntryMap*'  => 'kde_KKeyEntryMap*' ,
-'KKeySequence&' => 'kde_KKeySequence*',
-'KKeySequence' => 'kde_KKeySequence*',
-'KKeySequence*' => 'kde_KKeySequence*',
+'TDEIO::Slave*' => 'tde_Slave*',
+'TDEIOInputStream&' => 'tde_TDEIOInputStream*',
+'TDEIOInputStream*' => 'tde_TDEIOInputStream*',
+'KIOTestSlow&' => 'tde_KIOTestSlow*',
+'KIOTestSlow' => 'tde_KIOTestSlow*',
+'KIOTestSlow*' => 'tde_KIOTestSlow*',
+'KIPC*' => 'tde_KIPC*',
+'TDEIcon'  => 'tde_TDEIcon*' ,
+'TDEIcon*' => 'tde_TDEIcon*',
+'TDEIconButton*' => 'tde_TDEIconButton*',
+'TDEIconCanvas*' => 'tde_TDEIconCanvas*',
+'TDEIconDialog*' => 'tde_TDEIconDialog*',
+'TDEIconEffect*'  =>  'tde_TDEIconEffect*' ,
+'TDEIconLoader*'  => 'tde_TDEIconLoader*' ,
+'TDEIconSelectAction*' => 'tde_TDEIconSelectAction*',
+'TDEIconView*' => 'tde_TDEIconView*',
+'TDEIconViewItem*' => 'tde_TDEIconViewItem*',
+'KImageEffect*' => 'tde_KImageEffect*',
+'KImageFilePreview*' => 'tde_KImageFilePreview*',
+'KImageIO*' => 'tde_KImageIO*',
+'TDEInstance&'  => 'tde_TDEInstance*' ,
+'TDEInstance'  => 'tde_TDEInstance*' ,
+'TDEInstance*'  => 'tde_TDEInstance*' ,
+'KIntNumInput*' => 'tde_KIntNumInput*',
+'KIntSpinBox*' => 'tde_KIntSpinBox*',
+'KIntValidator*' => 'tde_KIntValidator*',
+'KJS*' => 'tde_KJS*',
+'KJS::KJSO&' => 'tde_KJS_KJSO*',
+'KJS::UString&' => 'tde_KJS_UString*',
+'KJSO&' => 'tde_KJSO*',
+'KJSO' => 'tde_KJSO*',
+'KJSO*' => 'tde_KJSO*',
+'KJScript*' => 'tde_KJScript*',
+'KJanusWidget*' => 'tde_KJanusWidget*',
+'KKeyChooser*' => 'tde_KKeyChooser*',
+'KKeyDialog*' => 'tde_KKeyDialog*',
+'KKeyEntry&'  => 'tde_KKeyEntry*' ,
+'KKeyEntry*' => 'tde_KKeyEntry*',
+'KKeyEntryMap&'  => 'tde_KKeyEntryMap*' ,
+'KKeyEntryMap'  => 'tde_KKeyEntryMap*' ,
+'KKeyEntryMap*'  => 'tde_KKeyEntryMap*' ,
+'KKeySequence&' => 'tde_KKeySequence*',
+'KKeySequence' => 'tde_KKeySequence*',
+'KKeySequence*' => 'tde_KKeySequence*',
 'KKeySequence::I18N' => 'int',
-'KKeySequences&' => 'kde_KKeySequences*',
-'KKeySequences' => 'kde_KKeySequences*',
-'KKeySequences*' => 'kde_KKeySequences*',
-'KLed*' => 'kde_KLed*',
-'KLibFactory*'  =>  'kde_KLibFactory*' ,
-'KLibLoader*'  =>  'kde_KLibLoader*' ,
-'KLineEdit*'  =>  'kde_KLineEdit*' ,
-'KLineEditDlg*' => 'kde_KLineEditDlg*',
-'TDEListBox*' => 'kde_TDEListBox*',
-'TDEListView*'  => 'kde_TDEListView*' ,
-'TDEListViewItem*' => 'kde_TDEListViewItem*',
-'TDELocale&'  => 'kde_TDELocale*' ,
-'TDELocale*'  => 'kde_TDELocale*' ,
-'KMJobViewer*' => 'kde_KMJobViewer*',
-'KMMainView*' => 'kde_KMMainView*',
-'KMManager*' => 'kde_KMManager*',
-'KMObject*' => 'kde_KMObject*',
-'KMPrinter&' => 'kde_KMPrinter*',
-'KMPrinter*' => 'kde_KMPrinter*',
-'KMPrinterList*' => 'kde_KMPrinterList*',
-'KMPrinterPage*' => 'kde_KMPrinterPage*',
-'TDEMainWindow*' => 'kde_TDEMainWindow*',
-'TDEMainWindowInterface*' => 'kde_TDEMainWindowInterface*',
-'KMenuBar*'  => 'kde_KMenuBar*' ,
-'KMessageBox*' => 'kde_KMessageBox*',
-'KMidSimpleAPI*' => 'kde_KMidSimpleAPI*',
-'KMimeMagic*'  =>  'kde_KMimeMagic*' ,
-'KMimeMagicResult*'  => 'kde_KMimeMagicResult*' ,
-'KMimeSourceFactory*'  => 'kde_KMimeSourceFactory*' ,
-'KMimeType::List&'  => 'kde_KMimeType_List*' ,
-'KMouseSettings*' => 'kde_KMouseSettings*',
-'KMultipleDrag*' => 'kde_KMultipleDrag*',
+'KKeySequences&' => 'tde_KKeySequences*',
+'KKeySequences' => 'tde_KKeySequences*',
+'KKeySequences*' => 'tde_KKeySequences*',
+'KLed*' => 'tde_KLed*',
+'KLibFactory*'  =>  'tde_KLibFactory*' ,
+'KLibLoader*'  =>  'tde_KLibLoader*' ,
+'KLineEdit*'  =>  'tde_KLineEdit*' ,
+'KLineEditDlg*' => 'tde_KLineEditDlg*',
+'TDEListBox*' => 'tde_TDEListBox*',
+'TDEListView*'  => 'tde_TDEListView*' ,
+'TDEListViewItem*' => 'tde_TDEListViewItem*',
+'TDELocale&'  => 'tde_TDELocale*' ,
+'TDELocale*'  => 'tde_TDELocale*' ,
+'KMJobViewer*' => 'tde_KMJobViewer*',
+'KMMainView*' => 'tde_KMMainView*',
+'KMManager*' => 'tde_KMManager*',
+'KMObject*' => 'tde_KMObject*',
+'KMPrinter&' => 'tde_KMPrinter*',
+'KMPrinter*' => 'tde_KMPrinter*',
+'KMPrinterList*' => 'tde_KMPrinterList*',
+'KMPrinterPage*' => 'tde_KMPrinterPage*',
+'TDEMainWindow*' => 'tde_TDEMainWindow*',
+'TDEMainWindowInterface*' => 'tde_TDEMainWindowInterface*',
+'KMenuBar*'  => 'tde_KMenuBar*' ,
+'KMessageBox*' => 'tde_KMessageBox*',
+'KMidSimpleAPI*' => 'tde_KMidSimpleAPI*',
+'KMimeMagic*'  =>  'tde_KMimeMagic*' ,
+'KMimeMagicResult*'  => 'tde_KMimeMagicResult*' ,
+'KMimeSourceFactory*'  => 'tde_KMimeSourceFactory*' ,
+'KMimeType::List&'  => 'tde_KMimeType_List*' ,
+'KMouseSettings*' => 'tde_KMouseSettings*',
+'KMultipleDrag*' => 'tde_KMultipleDrag*',
 'KNDBGFUNC'  => 'void*' ,
-'KNotifyClient*' => 'kde_KNotifyClient*',
-'KNumInput*'  => 'kde_KNumInput*' ,
-'KOCRDialog*' => 'kde_KOCRDialog*',
-'KOCRDialogFactory*' => 'kde_KOCRDialogFactory*',
-'KOpenSSLProxy*' => 'kde_KOpenSSLProxy*',
-'KOpenWithDlg*' => 'kde_KOpenWithDlg*',
-'KOpenWithHandler*'  =>  'kde_KOpenWithHandler*' ,
-'KPAC*' => 'kde_KPAC*',
-'KPReloadObject*' => 'kde_KPReloadObject*',
-'KPalette&'  => 'kde_KPalette*' ,
-'KPalette*' => 'kde_KPalette*',
-'KPaletteTable*' => 'kde_KPaletteTable*',
-'KPanelAppMenu*' => 'kde_KPanelAppMenu*',
-'KPanelApplet*' => 'kde_KPanelApplet*',
-'KPanelExtension*' => 'kde_KPanelExtension*',
-'KPanelMenu*'  =>  'kde_KPanelMenu*' ,
-'KParts*' => 'kde_KParts*',
-'KParts::BrowserExtension*'  => 'kde_BrowserExtension*' ,
-'KParts::GUIActivateEvent*'  => 'kde_GUIActivateEvent*' ,
-'KParts::Part*' => 'kde_Part*',
-'KParts::ReadOnlyPart*'  => 'kde_ReadOnlyPart*' ,
-'KPasswordDialog*' => 'kde_KPasswordDialog*',
-'KPasswordEdit*' => 'kde_KPasswordEdit*',
-'KPixmap&'  => 'kde_KPixmap*' ,
-'KPixmap'  => 'kde_KPixmap*' ,
-'KPixmap*' => 'kde_KPixmap*',
-'KPixmapEffect*' => 'kde_KPixmapEffect*',
-'KPixmapIO*' => 'kde_KPixmapIO*',
-'KPixmapProvider*'  => 'kde_KPixmapProvider*' ,
-'KPixmapSplitter*' => 'kde_KPixmapSplitter*',
-'KPlayObject*' => 'kde_KPlayObject*',
-'KPlayObjectFactory*' => 'kde_KPlayObjectFactory*',
-'TDEPopupFrame*' => 'kde_TDEPopupFrame*',
-'TDEPopupMenu*'  => 'kde_TDEPopupMenu*' ,
-'TDEPopupTitle*' => 'kde_TDEPopupTitle*',
-'KPreviewWidgetBase*' => 'kde_KPreviewWidgetBase*',
-'KPrintAction*' => 'kde_KPrintAction*',
-'KPrintDialogPage*' => 'kde_KPrintDialogPage*',
-'KPrinter*' => 'kde_KPrinter*',
-'KPrinterWrapper*' => 'kde_KPrinterWrapper*',
-'KProcIO*'  =>  'kde_KProcIO*' ,
-'TDEProcess&'  => 'kde_TDEProcess*' ,
-'TDEProcess*'  => 'kde_TDEProcess*' ,
-'TDEProcessController*' => 'kde_TDEProcessController*',
-'TDEProcessRunner*' => 'kde_TDEProcessRunner*',
-'KProgress*' => 'kde_KProgress*',
-'KPropertiesDialog*'  => 'kde_KPropertiesDialog*' ,
-'KPropsDlgPlugin*'  => 'kde_KPropsDlgPlugin*' ,
-'KProtocolInfo*' => 'kde_KProtocolInfo*',
-'KProtocolManager*' => 'kde_KProtocolManager*',
-'KPushButton*' => 'kde_KPushButton*',
-'KRFCDate*' => 'kde_KRFCDate*',
-'TDERadioAction*' => 'kde_TDERadioAction*',
-'KRandomSequence*' => 'kde_KRandomSequence*',
-'TDERecentDocument*' => 'kde_TDERecentDocument*',
-'KRegExp*' => 'kde_KRegExp*',
-'KRegExpEditor*' => 'kde_KRegExpEditor*',
-'KRegExpEditorInterface*' => 'kde_KRegExpEditorInterface*',
-'KRestrictedLine*' => 'kde_KRestrictedLine*',
-'KRootPermsIcon*' => 'kde_KRootPermsIcon*',
-'KRootPixmap*' => 'kde_KRootPixmap*',
-'KRootProp*' => 'kde_KRootProp*',
-'KRuler*' => 'kde_KRuler*',
-'KRun*' => 'kde_KRun*',
-'KSSL&' => 'kde_KSSL*',
-'KSSL*' => 'kde_KSSL*',
+'KNotifyClient*' => 'tde_KNotifyClient*',
+'KNumInput*'  => 'tde_KNumInput*' ,
+'KOCRDialog*' => 'tde_KOCRDialog*',
+'KOCRDialogFactory*' => 'tde_KOCRDialogFactory*',
+'KOpenSSLProxy*' => 'tde_KOpenSSLProxy*',
+'KOpenWithDlg*' => 'tde_KOpenWithDlg*',
+'KOpenWithHandler*'  =>  'tde_KOpenWithHandler*' ,
+'KPAC*' => 'tde_KPAC*',
+'KPReloadObject*' => 'tde_KPReloadObject*',
+'KPalette&'  => 'tde_KPalette*' ,
+'KPalette*' => 'tde_KPalette*',
+'KPaletteTable*' => 'tde_KPaletteTable*',
+'KPanelAppMenu*' => 'tde_KPanelAppMenu*',
+'KPanelApplet*' => 'tde_KPanelApplet*',
+'KPanelExtension*' => 'tde_KPanelExtension*',
+'KPanelMenu*'  =>  'tde_KPanelMenu*' ,
+'KParts*' => 'tde_KParts*',
+'KParts::BrowserExtension*'  => 'tde_BrowserExtension*' ,
+'KParts::GUIActivateEvent*'  => 'tde_GUIActivateEvent*' ,
+'KParts::Part*' => 'tde_Part*',
+'KParts::ReadOnlyPart*'  => 'tde_ReadOnlyPart*' ,
+'KPasswordDialog*' => 'tde_KPasswordDialog*',
+'KPasswordEdit*' => 'tde_KPasswordEdit*',
+'KPixmap&'  => 'tde_KPixmap*' ,
+'KPixmap'  => 'tde_KPixmap*' ,
+'KPixmap*' => 'tde_KPixmap*',
+'KPixmapEffect*' => 'tde_KPixmapEffect*',
+'KPixmapIO*' => 'tde_KPixmapIO*',
+'KPixmapProvider*'  => 'tde_KPixmapProvider*' ,
+'KPixmapSplitter*' => 'tde_KPixmapSplitter*',
+'KPlayObject*' => 'tde_KPlayObject*',
+'KPlayObjectFactory*' => 'tde_KPlayObjectFactory*',
+'TDEPopupFrame*' => 'tde_TDEPopupFrame*',
+'TDEPopupMenu*'  => 'tde_TDEPopupMenu*' ,
+'TDEPopupTitle*' => 'tde_TDEPopupTitle*',
+'KPreviewWidgetBase*' => 'tde_KPreviewWidgetBase*',
+'KPrintAction*' => 'tde_KPrintAction*',
+'KPrintDialogPage*' => 'tde_KPrintDialogPage*',
+'KPrinter*' => 'tde_KPrinter*',
+'KPrinterWrapper*' => 'tde_KPrinterWrapper*',
+'KProcIO*'  =>  'tde_KProcIO*' ,
+'TDEProcess&'  => 'tde_TDEProcess*' ,
+'TDEProcess*'  => 'tde_TDEProcess*' ,
+'TDEProcessController*' => 'tde_TDEProcessController*',
+'TDEProcessRunner*' => 'tde_TDEProcessRunner*',
+'KProgress*' => 'tde_KProgress*',
+'KPropertiesDialog*'  => 'tde_KPropertiesDialog*' ,
+'KPropsDlgPlugin*'  => 'tde_KPropsDlgPlugin*' ,
+'KProtocolInfo*' => 'tde_KProtocolInfo*',
+'KProtocolManager*' => 'tde_KProtocolManager*',
+'KPushButton*' => 'tde_KPushButton*',
+'KRFCDate*' => 'tde_KRFCDate*',
+'TDERadioAction*' => 'tde_TDERadioAction*',
+'KRandomSequence*' => 'tde_KRandomSequence*',
+'TDERecentDocument*' => 'tde_TDERecentDocument*',
+'KRegExp*' => 'tde_KRegExp*',
+'KRegExpEditor*' => 'tde_KRegExpEditor*',
+'KRegExpEditorInterface*' => 'tde_KRegExpEditorInterface*',
+'KRestrictedLine*' => 'tde_KRestrictedLine*',
+'KRootPermsIcon*' => 'tde_KRootPermsIcon*',
+'KRootPixmap*' => 'tde_KRootPixmap*',
+'KRootProp*' => 'tde_KRootProp*',
+'KRuler*' => 'tde_KRuler*',
+'KRun*' => 'tde_KRun*',
+'KSSL&' => 'tde_KSSL*',
+'KSSL*' => 'tde_KSSL*',
 'KSSLAuthAction' => 'int',
 'KSSLAuthAction*' => 'int*',
-'KSSLCertBox*' => 'kde_KSSLCertBox*',
-'KSSLCertChain&' => 'kde_KSSLCertChain*',
-'KSSLCertChain*' => 'kde_KSSLCertChain*',
-'KSSLCertDlg*' => 'kde_KSSLCertDlg*',
-'KSSLCertDlgRet' => 'kde_KSSLCertDlgRet*',
-'KSSLCertDlgRet*' => 'kde_KSSLCertDlgRet*',
-'KSSLCertificate&' => 'kde_KSSLCertificate*',
-'KSSLCertificate*' => 'kde_KSSLCertificate*',
-'KSSLCertificateCache*' => 'kde_KSSLCertificateCache*',
-'KSSLCertificateFactory*' => 'kde_KSSLCertificateFactory*',
-'KSSLCertificateHome*' => 'kde_KSSLCertificateHome*',
-'KSSLConnectionInfo&' => 'kde_KSSLConnectionInfo*',
-'KSSLConnectionInfo*' => 'kde_KSSLConnectionInfo*',
-'KSSLInfoDlg*' => 'kde_KSSLInfoDlg*',
-'KSSLKeyGen*' => 'kde_KSSLKeyGen*',
+'KSSLCertBox*' => 'tde_KSSLCertBox*',
+'KSSLCertChain&' => 'tde_KSSLCertChain*',
+'KSSLCertChain*' => 'tde_KSSLCertChain*',
+'KSSLCertDlg*' => 'tde_KSSLCertDlg*',
+'KSSLCertDlgRet' => 'tde_KSSLCertDlgRet*',
+'KSSLCertDlgRet*' => 'tde_KSSLCertDlgRet*',
+'KSSLCertificate&' => 'tde_KSSLCertificate*',
+'KSSLCertificate*' => 'tde_KSSLCertificate*',
+'KSSLCertificateCache*' => 'tde_KSSLCertificateCache*',
+'KSSLCertificateFactory*' => 'tde_KSSLCertificateFactory*',
+'KSSLCertificateHome*' => 'tde_KSSLCertificateHome*',
+'KSSLConnectionInfo&' => 'tde_KSSLConnectionInfo*',
+'KSSLConnectionInfo*' => 'tde_KSSLConnectionInfo*',
+'KSSLInfoDlg*' => 'tde_KSSLInfoDlg*',
+'KSSLKeyGen*' => 'tde_KSSLKeyGen*',
 'KSSLKeyType' => 'int',
-'KSSLPKCS12*' => 'kde_KSSLPKCS12*',
-'KSSLPKCS7*' => 'kde_KSSLPKCS7*',
-'KSSLPeerInfo&' => 'kde_KSSLPeerInfo*',
-'KSSLPeerInfo*' => 'kde_KSSLPeerInfo*',
-'KSSLSettings*' => 'kde_KSSLSettings*',
-'KSSLSigners*' => 'kde_KSSLSigners*',
-'KSSLX509Map*' => 'kde_KSSLX509Map*',
-'KSSLX509V3&' => 'kde_KSSLX509V3*',
-'KSSLX509V3*' => 'kde_KSSLX509V3*',
-'KSaveFile*' => 'kde_KSaveFile*',
-'KScanDialog*' => 'kde_KScanDialog*',
-'KScanDialogFactory*' => 'kde_KScanDialogFactory*',
-'KScreenSaver*' => 'kde_KScreenSaver*',
-'KScriptClientInterface*' => 'kde_KScriptClientInterface*',
+'KSSLPKCS12*' => 'tde_KSSLPKCS12*',
+'KSSLPKCS7*' => 'tde_KSSLPKCS7*',
+'KSSLPeerInfo&' => 'tde_KSSLPeerInfo*',
+'KSSLPeerInfo*' => 'tde_KSSLPeerInfo*',
+'KSSLSettings*' => 'tde_KSSLSettings*',
+'KSSLSigners*' => 'tde_KSSLSigners*',
+'KSSLX509Map*' => 'tde_KSSLX509Map*',
+'KSSLX509V3&' => 'tde_KSSLX509V3*',
+'KSSLX509V3*' => 'tde_KSSLX509V3*',
+'KSaveFile*' => 'tde_KSaveFile*',
+'KScanDialog*' => 'tde_KScanDialog*',
+'KScanDialogFactory*' => 'tde_KScanDialogFactory*',
+'KScreenSaver*' => 'tde_KScreenSaver*',
+'KScriptClientInterface*' => 'tde_KScriptClientInterface*',
 'KScriptClientInterface::Result' => 'int',
-'KScriptInterface*' => 'kde_KScriptInterface*',
-'KScriptManager*' => 'kde_KScriptManager*',
-'TDESelectAction*' => 'kde_TDESelectAction*',
-'TDESelector*' => 'kde_TDESelector*',
-'KSeparator*' => 'kde_KSeparator*',
-'KService&'  => 'kde_KService*' ,
-'KService*' => 'kde_KService*',
-'KServiceGroup*' => 'kde_KServiceGroup*',
-'KServiceOffer&'  => 'kde_KServiceOffer*' ,
-'KServiceOffer*' => 'kde_KServiceOffer*',
-'KServiceType*' => 'kde_KServiceType*',
-'KServiceTypeProfile*'  =>  'kde_KServiceTypeProfile*' ,
-'KSessionManaged*' => 'kde_KSessionManaged*',
-'TDEShared&'  => 'kde_TDEShared*' ,
-'TDEShared*' => 'kde_TDEShared*',
-'TDESharedPtr&'  => 'kde_TDESharedPtr*' ,
-'TDESharedPtr*' => 'kde_TDESharedPtr*',
-'KShellCompletion*' => 'kde_KShellCompletion*',
-'KShellProcess*' => 'kde_KShellProcess*',
-'TDEShortcuts&' => 'kde_TDEShortcuts*',
-'TDEShortcuts' => 'kde_TDEShortcuts*',
-'TDEShortcuts*' => 'kde_TDEShortcuts*',
-'KShred*' => 'kde_KShred*',
-'KSimpleConfig&'  => 'kde_KSimpleConfig*' ,
-'KSimpleConfig*' => 'kde_KSimpleConfig*',
-'KSimpleFileFilter*' => 'kde_KSimpleFileFilter*',
-'KSpell*' => 'kde_KSpell*',
-'KSpellConfig&'  => 'kde_KSpellConfig*' ,
-'KSpellConfig'  => 'kde_KSpellConfig*' ,
-'KSpellConfig*'  => 'kde_KSpellConfig*' ,
-'KSpellDlg*' => 'kde_KSpellDlg*',
-'KSqueezedTextLabel*' => 'kde_KSqueezedTextLabel*',
-'TDEStandardDirs*'  => 'kde_TDEStandardDirs*' ,
-'TDEStartupInfo*' => 'kde_TDEStartupInfo*',
-'TDEStartupInfoData&' => 'kde_TDEStartupInfoData*',
-'TDEStartupInfoData*' => 'kde_TDEStartupInfoData*',
-'TDEStartupInfoId&' => 'kde_TDEStartupInfoId*',
-'TDEStartupInfoId' => 'kde_TDEStartupInfoId*',
-'TDEStartupInfoId*' => 'kde_TDEStartupInfoId*',
-'KStaticDeleter*' => 'kde_KStaticDeleter*',
-'KStaticDeleterBase*'  => 'kde_KStaticDeleterBase*' ,
-'KStatusBar*'  => 'kde_KStatusBar*' ,
+'KScriptInterface*' => 'tde_KScriptInterface*',
+'KScriptManager*' => 'tde_KScriptManager*',
+'TDESelectAction*' => 'tde_TDESelectAction*',
+'TDESelector*' => 'tde_TDESelector*',
+'KSeparator*' => 'tde_KSeparator*',
+'KService&'  => 'tde_KService*' ,
+'KService*' => 'tde_KService*',
+'KServiceGroup*' => 'tde_KServiceGroup*',
+'KServiceOffer&'  => 'tde_KServiceOffer*' ,
+'KServiceOffer*' => 'tde_KServiceOffer*',
+'KServiceType*' => 'tde_KServiceType*',
+'KServiceTypeProfile*'  =>  'tde_KServiceTypeProfile*' ,
+'KSessionManaged*' => 'tde_KSessionManaged*',
+'TDEShared&'  => 'tde_TDEShared*' ,
+'TDEShared*' => 'tde_TDEShared*',
+'TDESharedPtr&'  => 'tde_TDESharedPtr*' ,
+'TDESharedPtr*' => 'tde_TDESharedPtr*',
+'KShellCompletion*' => 'tde_KShellCompletion*',
+'KShellProcess*' => 'tde_KShellProcess*',
+'TDEShortcuts&' => 'tde_TDEShortcuts*',
+'TDEShortcuts' => 'tde_TDEShortcuts*',
+'TDEShortcuts*' => 'tde_TDEShortcuts*',
+'KShred*' => 'tde_KShred*',
+'KSimpleConfig&'  => 'tde_KSimpleConfig*' ,
+'KSimpleConfig*' => 'tde_KSimpleConfig*',
+'KSimpleFileFilter*' => 'tde_KSimpleFileFilter*',
+'KSpell*' => 'tde_KSpell*',
+'KSpellConfig&'  => 'tde_KSpellConfig*' ,
+'KSpellConfig'  => 'tde_KSpellConfig*' ,
+'KSpellConfig*'  => 'tde_KSpellConfig*' ,
+'KSpellDlg*' => 'tde_KSpellDlg*',
+'KSqueezedTextLabel*' => 'tde_KSqueezedTextLabel*',
+'TDEStandardDirs*'  => 'tde_TDEStandardDirs*' ,
+'TDEStartupInfo*' => 'tde_TDEStartupInfo*',
+'TDEStartupInfoData&' => 'tde_TDEStartupInfoData*',
+'TDEStartupInfoData*' => 'tde_TDEStartupInfoData*',
+'TDEStartupInfoId&' => 'tde_TDEStartupInfoId*',
+'TDEStartupInfoId' => 'tde_TDEStartupInfoId*',
+'TDEStartupInfoId*' => 'tde_TDEStartupInfoId*',
+'KStaticDeleter*' => 'tde_KStaticDeleter*',
+'KStaticDeleterBase*'  => 'tde_KStaticDeleterBase*' ,
+'KStatusBar*'  => 'tde_KStatusBar*' ,
 'KStatusBar::BarStatusstat::Toggle'  =>  'int' ,
-'KStatusBarLabel*' => 'kde_KStatusBarLabel*',
-'TDEStdAccel*' => 'kde_TDEStdAccel*',
+'KStatusBarLabel*' => 'tde_KStatusBarLabel*',
+'TDEStdAccel*' => 'tde_TDEStdAccel*',
 'TDEStdAccel::StdAccel'  => 'int' ,
-'KStdAction*' => 'kde_KStdAction*',
-'KStdGuiItem*' => 'kde_KStdGuiItem*',
-'KStringHandler*' => 'kde_KStringHandler*',
-'TDEStyle*'  => 'kde_TDEStyle*' ,
-'KSycoca*'  =>  'kde_KSycoca*' ,
-'KSycocaEntry*'  => 'kde_KSycocaEntry*' ,
+'KStdAction*' => 'tde_KStdAction*',
+'KStdGuiItem*' => 'tde_KStdGuiItem*',
+'KStringHandler*' => 'tde_KStringHandler*',
+'TDEStyle*'  => 'tde_TDEStyle*' ,
+'KSycoca*'  =>  'tde_KSycoca*' ,
+'KSycocaEntry*'  => 'tde_KSycocaEntry*' ,
 'KSycocaFactoryId'  => 'int' ,
 'KSycocaType&'  => 'int' ,
 'KSycocaType'  => 'int' ,
-'KSystemTray*' => 'kde_KSystemTray*',
-'KTMainWindow*' => 'kde_KTMainWindow*',
-'KTabButton*' => 'kde_KTabButton*',
-'KTabCtl*' => 'kde_KTabCtl*',
-'KTar*' => 'kde_KTar*',
-'KTarBase*'  =>  'kde_KTarBase*' ,
-'KTarData*' => 'kde_KTarData*',
-'KTarDirectory*'  => 'kde_KTarDirectory*' ,
-'KTarEntry*'  => 'kde_KTarEntry*' ,
-'KTarFile*' => 'kde_KTarFile*',
-'KTarGz*' => 'kde_KTarGz*',
-'KTempFile*' => 'kde_KTempFile*',
-'KTextBrowser*' => 'kde_KTextBrowser*',
-'KTextEditor*' => 'kde_KTextEditor*',
-'KTextEditor__View&'  =>  'kde_KTextEditor__View*',
-'KTextEditor__View'  =>  'kde_KTextEditor__View*',
-'KTextEditor__View*'  =>  'kde_KTextEditor__View*',
-'KThemeBase*'  =>  'kde_KThemeBase*', ,
-'KThemeCache*'  =>  'kde_KThemeCache*',
-'KThemePixmap&'  => 'kde_KThemePixmap*' ,
-'KThemePixmap*'  => 'kde_KThemePixmap*' ,
-'KThemeStyle*' => 'kde_KThemeStyle*',
-'KTipDatabase*' => 'kde_KTipDatabase*',
-'KTipDialog*' => 'kde_KTipDialog*',
-'TDEToggleAction*'  => 'kde_TDEToggleAction*' ,
-'TDEToolBar*'  => 'kde_TDEToolBar*' ,
+'KSystemTray*' => 'tde_KSystemTray*',
+'KTMainWindow*' => 'tde_KTMainWindow*',
+'KTabButton*' => 'tde_KTabButton*',
+'KTabCtl*' => 'tde_KTabCtl*',
+'KTar*' => 'tde_KTar*',
+'KTarBase*'  =>  'tde_KTarBase*' ,
+'KTarData*' => 'tde_KTarData*',
+'KTarDirectory*'  => 'tde_KTarDirectory*' ,
+'KTarEntry*'  => 'tde_KTarEntry*' ,
+'KTarFile*' => 'tde_KTarFile*',
+'KTarGz*' => 'tde_KTarGz*',
+'KTempFile*' => 'tde_KTempFile*',
+'KTextBrowser*' => 'tde_KTextBrowser*',
+'KTextEditor*' => 'tde_KTextEditor*',
+'KTextEditor__View&'  =>  'tde_KTextEditor__View*',
+'KTextEditor__View'  =>  'tde_KTextEditor__View*',
+'KTextEditor__View*'  =>  'tde_KTextEditor__View*',
+'KThemeBase*'  =>  'tde_KThemeBase*', ,
+'KThemeCache*'  =>  'tde_KThemeCache*',
+'KThemePixmap&'  => 'tde_KThemePixmap*' ,
+'KThemePixmap*'  => 'tde_KThemePixmap*' ,
+'KThemeStyle*' => 'tde_KThemeStyle*',
+'KTipDatabase*' => 'tde_KTipDatabase*',
+'KTipDialog*' => 'tde_KTipDialog*',
+'TDEToggleAction*'  => 'tde_TDEToggleAction*' ,
+'TDEToolBar*'  => 'tde_TDEToolBar*' ,
 'TDEToolBar::BarStatus' => 'int',
 'TDEToolBar::BarStatusstat::Toggle'  =>  'int' ,
-'TDEToolBarButton*'  => 'kde_TDEToolBarButton*' ,
-'TDEToolBarButtonList*' => 'kde_TDEToolBarButtonList*',
-'TDEToolBarPopupAction*' => 'kde_TDEToolBarPopupAction*',
+'TDEToolBarButton*'  => 'tde_TDEToolBarButton*' ,
+'TDEToolBarButtonList*' => 'tde_TDEToolBarButtonList*',
+'TDEToolBarPopupAction*' => 'tde_TDEToolBarPopupAction*',
 'TDEToolBarPos'  => 'int' ,
-'TDEToolBarRadioGroup*' => 'kde_TDEToolBarRadioGroup*',
-'TDEToolBarSeparator*' => 'kde_TDEToolBarSeparator*',
+'TDEToolBarRadioGroup*' => 'tde_TDEToolBarRadioGroup*',
+'TDEToolBarSeparator*' => 'tde_TDEToolBarSeparator*',
 'TDEToolButtonType'  => 'int' ,
-'TDETrader*'  =>  'kde_TDETrader*' ,
-'KTypeList*' => 'kde_KTypeList*',
-'KURIFilter*'  =>  'kde_KURIFilter*' ,
-'KURIFilterData&'  => 'kde_KURIFilterData*' ,
-'KURIFilterData*' => 'kde_KURIFilterData*',
-'KURIFilterPlugin*' => 'kde_KURIFilterPlugin*',
-'KURIFilterPluginList*' => 'kde_KURIFilterPluginList*',
-'KURL& url ()' => 'kde_KURL*',
-'KURL& urlName ()' => 'kde_KURL*',
-'KURL&'  => 'kde_KURL*' ,
-'KURL'  => 'kde_KURL*' ,
-'KURL*' => 'kde_KURL*',
-'KURL::List&'  => 'kde_KURLList*' ,
-'KURL::List'  => 'kde_KURLList*' ,
-'KURL::List*'  => 'kde_KURLList*' ,
-'List&'  => 'kde_KURLList*' ,
-'List'  => 'kde_KURLList*' ,
-'List*'  => 'kde_KURLList*' ,
-'KURLComboBox*' => 'kde_KURLComboBox*',
-'KURLComboItem*'  => 'kde_KURLComboItem*' ,
-'KURLCompletion*' => 'kde_KURLCompletion*',
-'KURLDrag*' => 'kde_KURLDrag*',
-'KURLLabel*' => 'kde_KURLLabel*',
-'KURLPixmapProvider*' => 'kde_KURLPixmapProvider*',
-'KURLPropsPlugin*' => 'kde_KURLPropsPlugin*',
-'KURLRequester*' => 'kde_KURLRequester*',
-'KURLRequesterDlg*' => 'kde_KURLRequesterDlg*',
-'KUniqueApplication*' => 'kde_KUniqueApplication*',
-'KUnixSocketAddress*' => 'kde_KUnixSocketAddress*',
-'KValueSelector*' => 'kde_KValueSelector*',
-'KWin*' => 'kde_KWin*',
-'KWinModule*' => 'kde_KWinModule*',
-'KWindowListMenu*' => 'kde_KWindowListMenu*',
-'KWizard*' => 'kde_KWizard*',
-'KWordWrap*' => 'kde_KWordWrap*',
-'KWritePermsIcon*' => 'kde_KWritePermsIcon*',
-'KXMLGUIBuilder*'  =>  'kde_KXMLGUIBuilder*' ,
-'KXMLGUIClient*'  => 'kde_KXMLGUIClient*' ,
-'KXMLGUIFactory*'  => 'kde_KXMLGUIFactory*' ,
-'KXMessages*' => 'kde_KXMessages*',
-'KXYSelector*' => 'kde_KXYSelector*',
-'TDEZoneAllocator*' => 'kde_TDEZoneAllocator*',
-'KabAPI*' => 'kde_KabAPI*',
-'KabKey&'  => 'kde_KabKey*' ,
-'KabKey'  => 'kde_KabKey*' ,
-'KabKey*' => 'kde_KabKey*',
+'TDETrader*'  =>  'tde_TDETrader*' ,
+'KTypeList*' => 'tde_KTypeList*',
+'KURIFilter*'  =>  'tde_KURIFilter*' ,
+'KURIFilterData&'  => 'tde_KURIFilterData*' ,
+'KURIFilterData*' => 'tde_KURIFilterData*',
+'KURIFilterPlugin*' => 'tde_KURIFilterPlugin*',
+'KURIFilterPluginList*' => 'tde_KURIFilterPluginList*',
+'KURL& url ()' => 'tde_KURL*',
+'KURL& urlName ()' => 'tde_KURL*',
+'KURL&'  => 'tde_KURL*' ,
+'KURL'  => 'tde_KURL*' ,
+'KURL*' => 'tde_KURL*',
+'KURL::List&'  => 'tde_KURLList*' ,
+'KURL::List'  => 'tde_KURLList*' ,
+'KURL::List*'  => 'tde_KURLList*' ,
+'List&'  => 'tde_KURLList*' ,
+'List'  => 'tde_KURLList*' ,
+'List*'  => 'tde_KURLList*' ,
+'KURLComboBox*' => 'tde_KURLComboBox*',
+'KURLComboItem*'  => 'tde_KURLComboItem*' ,
+'KURLCompletion*' => 'tde_KURLCompletion*',
+'KURLDrag*' => 'tde_KURLDrag*',
+'KURLLabel*' => 'tde_KURLLabel*',
+'KURLPixmapProvider*' => 'tde_KURLPixmapProvider*',
+'KURLPropsPlugin*' => 'tde_KURLPropsPlugin*',
+'KURLRequester*' => 'tde_KURLRequester*',
+'KURLRequesterDlg*' => 'tde_KURLRequesterDlg*',
+'KUniqueApplication*' => 'tde_KUniqueApplication*',
+'KUnixSocketAddress*' => 'tde_KUnixSocketAddress*',
+'KValueSelector*' => 'tde_KValueSelector*',
+'KWin*' => 'tde_KWin*',
+'KWinModule*' => 'tde_KWinModule*',
+'KWindowListMenu*' => 'tde_KWindowListMenu*',
+'KWizard*' => 'tde_KWizard*',
+'KWordWrap*' => 'tde_KWordWrap*',
+'KWritePermsIcon*' => 'tde_KWritePermsIcon*',
+'KXMLGUIBuilder*'  =>  'tde_KXMLGUIBuilder*' ,
+'KXMLGUIClient*'  => 'tde_KXMLGUIClient*' ,
+'KXMLGUIFactory*'  => 'tde_KXMLGUIFactory*' ,
+'KXMessages*' => 'tde_KXMessages*',
+'KXYSelector*' => 'tde_KXYSelector*',
+'TDEZoneAllocator*' => 'tde_TDEZoneAllocator*',
+'KabAPI*' => 'tde_KabAPI*',
+'KabKey&'  => 'tde_KabKey*' ,
+'KabKey'  => 'tde_KabKey*' ,
+'KabKey*' => 'tde_KabKey*',
 'Key&'  =>  'Key*' ,
-'KeyBindingMap'  => 'kde_KeyBindingMap*' ,
-'KeyValueMap&'  => 'kde_KeyValueMap*' ,
-'KeyValueMap*&'  => 'kde_KeyValueMap*' ,
-'KeyValueMap*'  => 'kde_KeyValueMap*' ,
-'Keymap*' => 'kde_Keymap*',
-'LinkStyle&' => 'kde_LinkStyle*',
-'LinkStyle*' => 'kde_LinkStyle*',
-'ListIterator&' => 'kde_ListIterator*',
-'ListIterator' => 'kde_ListIterator',
-'ListIterator*' => 'kde_ListIterator*',
-'ListJob*' => 'kde_ListJob*',
-'ListNode*' => 'kde_ListNode*',
-'ListProgress*' => 'kde_ListProgress*',
-'Lookup*' => 'kde_Lookup*',
-'MCOPConfig*' => 'kde_MCOPConfig*',
-'MCOPUtils*' => 'kde_MCOPUtils*',
+'KeyBindingMap'  => 'tde_KeyBindingMap*' ,
+'KeyValueMap&'  => 'tde_KeyValueMap*' ,
+'KeyValueMap*&'  => 'tde_KeyValueMap*' ,
+'KeyValueMap*'  => 'tde_KeyValueMap*' ,
+'Keymap*' => 'tde_Keymap*',
+'LinkStyle&' => 'tde_LinkStyle*',
+'LinkStyle*' => 'tde_LinkStyle*',
+'ListIterator&' => 'tde_ListIterator*',
+'ListIterator' => 'tde_ListIterator',
+'ListIterator*' => 'tde_ListIterator*',
+'ListJob*' => 'tde_ListJob*',
+'ListNode*' => 'tde_ListNode*',
+'ListProgress*' => 'tde_ListProgress*',
+'Lookup*' => 'tde_Lookup*',
+'MCOPConfig*' => 'tde_MCOPConfig*',
+'MCOPUtils*' => 'tde_MCOPUtils*',
 'MailServer&'  =>  'MailServer*' ,
-'MailServer*' => 'kde_MailServer*',
-'MainWindow*' => 'kde_MainWindow*',
-'Mark*' => 'kde_Mark*',
-'MarkInterface*' => 'kde_MarkInterface*',
-'MediaAsyncStream*' => 'kde_MediaAsyncStream*',
-'MediaDataPacket*' => 'kde_MediaDataPacket*',
-'MediaFrame*' => 'kde_MediaFrame*',
-'MediaList&' => 'kde_MediaList*',
-'MediaList' => 'kde_MediaList*',
-'MediaList*' => 'kde_MediaList*',
-'MediaListImpl*' => 'kde_MediaListImpl*',
-'MediaModule&' => 'kde_MediaModule*',
-'MediaModule' => 'kde_MediaModule*',
-'MediaModule*' => 'kde_MediaModule*',
-'MediaModule_base*' => 'kde_MediaModule_base*',
-'MediaModule_skel*' => 'kde_MediaModule_skel*',
-'MediaModule_stub*' => 'kde_MediaModule_stub*',
-'MenuDockData*' => 'kde_MenuDockData*',
-'MethodDef&' => 'kde_MethodDef*',
-'MethodDef*' => 'kde_MethodDef*',
-'MidiEvent*' => 'kde_MidiEvent*',
-'MidiFileInfo*' => 'kde_MidiFileInfo*',
-'MidiMapper*' => 'kde_MidiMapper*',
-'MidiOut*' => 'kde_MidiOut*',
-'MidiPlayer*' => 'kde_MidiPlayer*',
-'MidiStatus*' => 'kde_MidiStatus*',
-'MidiTrack*' => 'kde_MidiTrack*',
-'MimetypeJob*' => 'kde_MimetypeJob*',
+'MailServer*' => 'tde_MailServer*',
+'MainWindow*' => 'tde_MainWindow*',
+'Mark*' => 'tde_Mark*',
+'MarkInterface*' => 'tde_MarkInterface*',
+'MediaAsyncStream*' => 'tde_MediaAsyncStream*',
+'MediaDataPacket*' => 'tde_MediaDataPacket*',
+'MediaFrame*' => 'tde_MediaFrame*',
+'MediaList&' => 'tde_MediaList*',
+'MediaList' => 'tde_MediaList*',
+'MediaList*' => 'tde_MediaList*',
+'MediaListImpl*' => 'tde_MediaListImpl*',
+'MediaModule&' => 'tde_MediaModule*',
+'MediaModule' => 'tde_MediaModule*',
+'MediaModule*' => 'tde_MediaModule*',
+'MediaModule_base*' => 'tde_MediaModule_base*',
+'MediaModule_skel*' => 'tde_MediaModule_skel*',
+'MediaModule_stub*' => 'tde_MediaModule_stub*',
+'MenuDockData*' => 'tde_MenuDockData*',
+'MethodDef&' => 'tde_MethodDef*',
+'MethodDef*' => 'tde_MethodDef*',
+'MidiEvent*' => 'tde_MidiEvent*',
+'MidiFileInfo*' => 'tde_MidiFileInfo*',
+'MidiMapper*' => 'tde_MidiMapper*',
+'MidiOut*' => 'tde_MidiOut*',
+'MidiPlayer*' => 'tde_MidiPlayer*',
+'MidiStatus*' => 'tde_MidiStatus*',
+'MidiTrack*' => 'tde_MidiTrack*',
+'MimetypeJob*' => 'tde_MimetypeJob*',
 'Mode' => 'int',
-'ModuleDef&' => 'kde_ModuleDef*',
-'ModuleDef*' => 'kde_ModuleDef*',
-'MouseDoubleClickEvent*' => 'kde_MouseDoubleClickEvent*',
-'MouseEvent*' => 'kde_MouseEvent*',
-'MouseMoveEvent*' => 'kde_MouseMoveEvent*',
-'MousePressEvent*' => 'kde_MousePressEvent*',
-'MouseReleaseEvent*' => 'kde_MouseReleaseEvent*',
-'MultiGetJob*' => 'kde_MultiGetJob*',
-'MultiPort*' => 'kde_MultiPort*',
-'NET*' => 'kde_NET*',
+'ModuleDef&' => 'tde_ModuleDef*',
+'ModuleDef*' => 'tde_ModuleDef*',
+'MouseDoubleClickEvent*' => 'tde_MouseDoubleClickEvent*',
+'MouseEvent*' => 'tde_MouseEvent*',
+'MouseMoveEvent*' => 'tde_MouseMoveEvent*',
+'MousePressEvent*' => 'tde_MousePressEvent*',
+'MouseReleaseEvent*' => 'tde_MouseReleaseEvent*',
+'MultiGetJob*' => 'tde_MultiGetJob*',
+'MultiPort*' => 'tde_MultiPort*',
+'NET*' => 'tde_NET*',
 'NET::WindowType'  =>  'int' ,
 'NETIcon'  =>  'kdeNETIcon*' ,
-'NETIcon*' => 'kde_NETIcon*',
-'NETPoint&'  =>  'kde_NETPoint*' ,
-'NETPoint'  =>  'kde_NETPoint*' ,
-'NETPoint*' => 'kde_NETPoint*',
-'NETRect&'  =>  'kde_NETRect*' ,
-'NETRect'  =>  'kde_NETRect*' ,
-'NETRect*' => 'kde_NETRect*',
-'NETRootInfo&'  =>  'kde_NETRootInfo*' ,
-'NETRootInfo*' => 'kde_NETRootInfo*',
-'NETRootInfoPrivate*' => 'kde_NETRootInfoPrivate*',
-'NETSize&'  =>  'kde_NETSize*' ,
-'NETSize'  =>  'kde_NETSize*' ,
-'NETSize*' => 'kde_NETSize*',
-'NETStrut'  =>  'kde_NETStrut*' ,
-'NETStrut*' => 'kde_NETStrut*',
-'NETWinInfo&'  =>  'kde_NETWinInfo*' ,
-'NETWinInfo*' => 'kde_NETWinInfo*',
-'NETWinInfoPrivate*' => 'kde_NETWinInfoPrivate*',
-'NamedNodeMap&' => 'kde_NamedNodeMap*',
-'NamedNodeMap' => 'kde_NamedNodeMap*',
-'NamedNodeMap*' => 'kde_NamedNodeMap*',
-'NamedNodeMapImpl*' => 'kde_NamedNodeMapImpl*',
-'NetAccess*' => 'kde_NetAccess*',
-'NetRC*' => 'kde_NetRC*',
-'Node&' => 'kde_Node*',
-'Node' => 'kde_Node*',
-'Node*' => 'kde_Node*',
-'NodeFilter&' => 'kde_NodeFilter*',
-'NodeFilter' => 'kde_NodeFilter*',
-'NodeFilter*' => 'kde_NodeFilter*',
-'NodeFilterImpl*' => 'kde_NodeFilterImpl*',
-'NodeImpl*' => 'kde_NodeImpl*',
-'NodeIterator&' => 'kde_NodeIterator*',
-'NodeIterator' => 'kde_NodeIterator*',
-'NodeIterator*' => 'kde_NodeIterator*',
-'NodeIteratorImpl*' => 'kde_NodeIteratorImpl*',
-'NodeList&' => 'kde_DOMNodeList*',
-'NodeList' => 'kde_DOMNodeList*',
-'NodeList*' => 'kde_DOMNodeList*',
-'NodeListImpl*' => 'kde_NodeListImpl*',
+'NETIcon*' => 'tde_NETIcon*',
+'NETPoint&'  =>  'tde_NETPoint*' ,
+'NETPoint'  =>  'tde_NETPoint*' ,
+'NETPoint*' => 'tde_NETPoint*',
+'NETRect&'  =>  'tde_NETRect*' ,
+'NETRect'  =>  'tde_NETRect*' ,
+'NETRect*' => 'tde_NETRect*',
+'NETRootInfo&'  =>  'tde_NETRootInfo*' ,
+'NETRootInfo*' => 'tde_NETRootInfo*',
+'NETRootInfoPrivate*' => 'tde_NETRootInfoPrivate*',
+'NETSize&'  =>  'tde_NETSize*' ,
+'NETSize'  =>  'tde_NETSize*' ,
+'NETSize*' => 'tde_NETSize*',
+'NETStrut'  =>  'tde_NETStrut*' ,
+'NETStrut*' => 'tde_NETStrut*',
+'NETWinInfo&'  =>  'tde_NETWinInfo*' ,
+'NETWinInfo*' => 'tde_NETWinInfo*',
+'NETWinInfoPrivate*' => 'tde_NETWinInfoPrivate*',
+'NamedNodeMap&' => 'tde_NamedNodeMap*',
+'NamedNodeMap' => 'tde_NamedNodeMap*',
+'NamedNodeMap*' => 'tde_NamedNodeMap*',
+'NamedNodeMapImpl*' => 'tde_NamedNodeMapImpl*',
+'NetAccess*' => 'tde_NetAccess*',
+'NetRC*' => 'tde_NetRC*',
+'Node&' => 'tde_Node*',
+'Node' => 'tde_Node*',
+'Node*' => 'tde_Node*',
+'NodeFilter&' => 'tde_NodeFilter*',
+'NodeFilter' => 'tde_NodeFilter*',
+'NodeFilter*' => 'tde_NodeFilter*',
+'NodeFilterImpl*' => 'tde_NodeFilterImpl*',
+'NodeImpl*' => 'tde_NodeImpl*',
+'NodeIterator&' => 'tde_NodeIterator*',
+'NodeIterator' => 'tde_NodeIterator*',
+'NodeIterator*' => 'tde_NodeIterator*',
+'NodeIteratorImpl*' => 'tde_NodeIteratorImpl*',
+'NodeList&' => 'tde_DOMNodeList*',
+'NodeList' => 'tde_DOMNodeList*',
+'NodeList*' => 'tde_DOMNodeList*',
+'NodeListImpl*' => 'tde_NodeListImpl*',
 'NodePtr'  =>  'int' ,
 'NodeType'  =>  'int' ,
-'Notation&' => 'kde_Notation*',
-'Notation*' => 'kde_Notation*',
-'NoteArray*' => 'kde_NoteArray*',
-'Notification&' => 'kde_Notification*',
-'Notification' => 'kde_Notification*',
-'Notification*' => 'kde_Notification*',
-'NotificationClient*' => 'kde_NotificationClient*',
-'NotificationManager*' => 'kde_NotificationManager*',
+'Notation&' => 'tde_Notation*',
+'Notation*' => 'tde_Notation*',
+'NoteArray*' => 'tde_NoteArray*',
+'Notification&' => 'tde_Notification*',
+'Notification' => 'tde_Notification*',
+'Notification*' => 'tde_Notification*',
+'NotificationClient*' => 'tde_NotificationClient*',
+'NotificationManager*' => 'tde_NotificationManager*',
 'Null*' => 'null',
-'Number&' => 'kde_Number*',
-'Number*' => 'kde_Number*',
-'Object&' => 'kde_Object*',
-'Object' => 'kde_Object*',
-'Object*' => 'kde_Object*',
-'ObjectImp*' => 'kde_ObjectImp*',
-'ObjectManager*' => 'kde_ObjectManager*',
-'ObjectReference&' => 'kde_ObjectReference*',
-'ObjectReference*' => 'kde_ObjectReference*',
-'Object_base*' => 'kde_Object_base*',
-'Object_skel*' => 'kde_Object_skel*',
-'Object_stub*' => 'kde_Object_stub*',
-'Observer*' => 'kde_Observer*',
-'OfferList'  =>  'kde_OfferList*' ,
-'TDETrader::OfferList'  =>  'kde_OfferList*' ,
+'Number&' => 'tde_Number*',
+'Number*' => 'tde_Number*',
+'Object&' => 'tde_Object*',
+'Object' => 'tde_Object*',
+'Object*' => 'tde_Object*',
+'ObjectImp*' => 'tde_ObjectImp*',
+'ObjectManager*' => 'tde_ObjectManager*',
+'ObjectReference&' => 'tde_ObjectReference*',
+'ObjectReference*' => 'tde_ObjectReference*',
+'Object_base*' => 'tde_Object_base*',
+'Object_skel*' => 'tde_Object_skel*',
+'Object_stub*' => 'tde_Object_stub*',
+'Observer*' => 'tde_Observer*',
+'OfferList'  =>  'tde_OfferList*' ,
+'TDETrader::OfferList'  =>  'tde_OfferList*' ,
 'Offset' => 'int',
-'OnewayDispatchFunction' => 'kde_OnewayDispatchFunction*',
-'OnewayInvocation&' => 'kde_OnewayInvocation*',
-'OnewayInvocation*' => 'kde_OnewayInvocation*',
-'OpenURLEvent*' => 'kde_OpenURLEvent*',
+'OnewayDispatchFunction' => 'tde_OnewayDispatchFunction*',
+'OnewayInvocation&' => 'tde_OnewayInvocation*',
+'OnewayInvocation*' => 'tde_OnewayInvocation*',
+'OpenURLEvent*' => 'tde_OpenURLEvent*',
 'Orientation' => 'int',
 'PFlags' => 'int',
 'PIAccess' => 'int',
 'PID' => 'long',
 'PIType' => 'int',
-'PTY*' => 'kde_PTY*',
+'PTY*' => 'tde_PTY*',
 'PageSize' => 'int',
-'ParamDef&' => 'kde_ParamDef*',
-'ParamDef*' => 'kde_ParamDef*',
-'ParsedArgument*' => 'kde_ParsedArgument*',
-'ParsedAttribute*' => 'kde_ParsedAttribute*',
-'ParsedClass&' => 'kde_ParsedClass&',
-'ParsedClass*' => 'kde_ParsedClass*',
-'ParsedClassContainer*' => 'kde_ParsedClassContainer*',
-'ParsedContainer*' => 'kde_ParsedContainer*',
-'ParsedItem*' => 'kde_ParsedItem*',
-'ParsedMethod*' => 'kde_ParsedMethod*',
-'ParsedParent*' => 'kde_ParsedParent*',
-'ParsedScopeContainer*' => 'kde_ParsedScopeContainer*',
-'ParsedSignalSlot*' => 'kde_ParsedSignalSlot*',
-'ParsedStruct*' => 'kde_ParsedStruct*',
-'Part*' => 'kde_Part*',
-'PartActivateEvent*' => 'kde_PartActivateEvent*',
-'PartBase*' => 'kde_PartBase*',
-'PartSelectEvent*' => 'kde_PartSelectEvent*',
-'PassDlg*' => 'kde_PassDlg*',
-'PasswordDialog*' => 'kde_PasswordDialog*',
+'ParamDef&' => 'tde_ParamDef*',
+'ParamDef*' => 'tde_ParamDef*',
+'ParsedArgument*' => 'tde_ParsedArgument*',
+'ParsedAttribute*' => 'tde_ParsedAttribute*',
+'ParsedClass&' => 'tde_ParsedClass&',
+'ParsedClass*' => 'tde_ParsedClass*',
+'ParsedClassContainer*' => 'tde_ParsedClassContainer*',
+'ParsedContainer*' => 'tde_ParsedContainer*',
+'ParsedItem*' => 'tde_ParsedItem*',
+'ParsedMethod*' => 'tde_ParsedMethod*',
+'ParsedParent*' => 'tde_ParsedParent*',
+'ParsedScopeContainer*' => 'tde_ParsedScopeContainer*',
+'ParsedSignalSlot*' => 'tde_ParsedSignalSlot*',
+'ParsedStruct*' => 'tde_ParsedStruct*',
+'Part*' => 'tde_Part*',
+'PartActivateEvent*' => 'tde_PartActivateEvent*',
+'PartBase*' => 'tde_PartBase*',
+'PartSelectEvent*' => 'tde_PartSelectEvent*',
+'PassDlg*' => 'tde_PassDlg*',
+'PasswordDialog*' => 'tde_PasswordDialog*',
 'PenCapStyle'  =>  'int' ,
 'PenJoinStyle'  =>  'int' ,
 'PenStyle' => 'int',
-'PersistantClassStore*' => 'kde_PersistantClassStore*',
-'PhoneNumber&' => 'kde_PhoneNumber*',
-'PhoneNumber*' => 'kde_PhoneNumber*',
-'PipeBuffer*' => 'kde_PipeBuffer*',
-'PipeSegment*' => 'kde_PipeSegment*',
-'Pix&'  =>  'kde_Pix*' ,
-'Pix'  =>  'kde_Pix*' ,
+'PersistantClassStore*' => 'tde_PersistantClassStore*',
+'PhoneNumber&' => 'tde_PhoneNumber*',
+'PhoneNumber*' => 'tde_PhoneNumber*',
+'PipeBuffer*' => 'tde_PipeBuffer*',
+'PipeSegment*' => 'tde_PipeSegment*',
+'Pix&'  =>  'tde_Pix*' ,
+'Pix'  =>  'tde_Pix*' ,
 'PixelMetric' => 'int',
-'PlayObject&' => 'kde_PlayObject*',
-'PlayObject' => 'kde_PlayObject*',
-'PlayObject*' => 'kde_PlayObject*',
-'PlayObjectFactory&' => 'kde_PlayObjectFactory*',
-'PlayObjectFactory' => 'kde_PlayObjectFactory',
-'PlayObjectFactory*' => 'kde_PlayObjectFactory*',
-'PlayObjectFactory_base*' => 'kde_PlayObjectFactory_base*',
-'PlayObjectFactory_skel*' => 'kde_PlayObjectFactory_skel*',
-'PlayObjectFactory_stub*' => 'kde_PlayObjectFactory_stub*',
-'PlayObject_base*' => 'kde_PlayObject_base*',
-'PlayObject_private&' => 'kde_PlayObject_private*',
-'PlayObject_private' => 'kde_PlayObject_private',
-'PlayObject_private*' => 'kde_PlayObject_private*',
-'PlayObject_private_base*' => 'kde_PlayObject_private_base*',
-'PlayObject_private_skel*' => 'kde_PlayObject_private_skel*',
-'PlayObject_private_stub*' => 'kde_PlayObject_private_stub*',
-'PlayObject_skel*' => 'kde_PlayObject_skel*',
-'PlayObject_stub*' => 'kde_PlayObject_stub*',
-'PlayerController*' => 'kde_PlayerController*',
-'Plugin*' => 'kde_Plugin*',
-'PluginInfo*' => 'kde_PluginInfo*',
+'PlayObject&' => 'tde_PlayObject*',
+'PlayObject' => 'tde_PlayObject*',
+'PlayObject*' => 'tde_PlayObject*',
+'PlayObjectFactory&' => 'tde_PlayObjectFactory*',
+'PlayObjectFactory' => 'tde_PlayObjectFactory',
+'PlayObjectFactory*' => 'tde_PlayObjectFactory*',
+'PlayObjectFactory_base*' => 'tde_PlayObjectFactory_base*',
+'PlayObjectFactory_skel*' => 'tde_PlayObjectFactory_skel*',
+'PlayObjectFactory_stub*' => 'tde_PlayObjectFactory_stub*',
+'PlayObject_base*' => 'tde_PlayObject_base*',
+'PlayObject_private&' => 'tde_PlayObject_private*',
+'PlayObject_private' => 'tde_PlayObject_private',
+'PlayObject_private*' => 'tde_PlayObject_private*',
+'PlayObject_private_base*' => 'tde_PlayObject_private_base*',
+'PlayObject_private_skel*' => 'tde_PlayObject_private_skel*',
+'PlayObject_private_stub*' => 'tde_PlayObject_private_stub*',
+'PlayObject_skel*' => 'tde_PlayObject_skel*',
+'PlayObject_stub*' => 'tde_PlayObject_stub*',
+'PlayerController*' => 'tde_PlayerController*',
+'Plugin*' => 'tde_Plugin*',
+'PluginInfo*' => 'tde_PluginInfo*',
 'Policy' => 'int',
-'Pool&' => 'kde_Pool*',
-'Pool*' => 'kde_Pool*',
-'PopupMenuInterface*' => 'kde_PopupMenuInterface*',
-'Port*' => 'kde_Port*',
-'PreviewJob*' => 'kde_PreviewJob*',
+'Pool&' => 'tde_Pool*',
+'Pool*' => 'tde_Pool*',
+'PopupMenuInterface*' => 'tde_PopupMenuInterface*',
+'Port*' => 'tde_Port*',
+'PreviewJob*' => 'tde_PreviewJob*',
 'PrimitiveElement' => 'int',
-'PrintInterface*' => 'kde_PrintInterface*',
+'PrintInterface*' => 'tde_PrintInterface*',
 'PrinterMode' => 'int',
-'ProcessingInstruction&' => 'kde_ProcessingInstruction*',
-'ProcessingInstruction' => 'kde_ProcessingInstruction*',
-'ProcessingInstruction*' => 'kde_ProcessingInstruction*',
-'ProgressBase*' => 'kde_ProgressBase*',
-'ProgressItem*' => 'kde_ProgressItem*',
+'ProcessingInstruction&' => 'tde_ProcessingInstruction*',
+'ProcessingInstruction' => 'tde_ProcessingInstruction*',
+'ProcessingInstruction*' => 'tde_ProcessingInstruction*',
+'ProgressBase*' => 'tde_ProgressBase*',
+'ProgressItem*' => 'tde_ProgressItem*',
 'PropagationMode' => 'int',
-'ProtocolInfo*' => 'kde_ProtocolInfo*',
+'ProtocolInfo*' => 'tde_ProtocolInfo*',
 'Ptr' => 'void*',
-'PtyProcess*' => 'kde_PtyProcess*',
+'PtyProcess*' => 'tde_PtyProcess*',
 'TQAccel*' => 'qt_QAccel*',
 'TQAccessible*' => 'qt_QAccessible*',
 'TQAccessibleFactoryInterface*' => 'qt_QAccessibleFactoryInterface*',
@@ -1507,7 +1507,7 @@ BEGIN
 'TQCString'  =>  'qt_QCString*' ,
 'TQCString*'  =>  'qt_QCString*' ,
 'TQCStringLess*'  =>  'qt_QCStringLess*' ,
-'QCStringList'  => 'kde_QCStringList*' ,
+'QCStringList'  => 'tde_QCStringList*' ,
 'TQCache*' => 'qt_QCache*',
 'TQCacheIterator*' => 'qt_QCacheIterator*',
 'TQCanvas*'  =>  'qt_QCanvas*' ,
@@ -1913,7 +1913,7 @@ BEGIN
 'TQPicture' => 'qt_QPicture*',
 'TQPicture*' => 'qt_QPicture*',
 'TQPicturePrivate*' => 'qt_QPicturePrivate*',
-'TQPixmap& pixmap()' => 'kde_QPixmap*',
+'TQPixmap& pixmap()' => 'tde_QPixmap*',
 'TQPixmap&' => 'qt_QPixmap*',
 'TQPixmap' => 'qt_QPixmap*',
 'TQPixmap*' => 'qt_QPixmap*',
@@ -2064,7 +2064,7 @@ BEGIN
 'TQStack*' => 'qt_QStack*',
 'TQStatusBar*'  => 'qt_QStatusBar*' ,
 'TQStoredDrag*' => 'qt_QStoredDrag*',
-'TQStrIList' => 'kde_QStrIList',
+'TQStrIList' => 'tde_QStrIList',
 'TQStrIList*' => 'qt_QStrIList*',
 'TQStrIVec*' => 'qt_QStrIVec*',
 'TQStrList&' => 'qt_QStrList*',
@@ -2250,7 +2250,7 @@ BEGIN
 'TQWindowsStyle*' => 'qt_QWindowsStyle*',
 'TQWizard*' => 'qt_QWizard*',
 'TQWorkspace*' => 'qt_QWorkspace*',
-'TQXEmbed*'  =>  'qt_QXEmbed*' ,
+'QXEmbed*'  =>  'qt_QXEmbed*' ,
 'TQXmlAttributes&'  =>  'qt_QXmlAttributes*' ,
 'TQXmlAttributes*' => 'qt_QXmlAttributes*',
 'TQXmlContentHandler*'  =>  'qt_QXmlContentHandler*' ,
@@ -2271,24 +2271,24 @@ BEGIN
 'TQXmlSimpleReader*'  =>  'qt_QXmlSimpleReader*' ,
 'TQXtApplication*' => 'qt_QXtApplication*',
 'TQXtWidget*' => 'qt_QXtWidget*',
-'Q_INT16&' => 'short',
-'Q_INT16' => 'short',
-'Q_INT32&' => 'int',
-'Q_INT32' => 'int',
-'Q_INT8&' => 'char',
-'Q_INT8' => 'char',
-'Q_LONG&' => 'long',
-'Q_LONG' => 'long',
+'TQ_INT16&' => 'short',
+'TQ_INT16' => 'short',
+'TQ_INT32&' => 'int',
+'TQ_INT32' => 'int',
+'TQ_INT8&' => 'char',
+'TQ_INT8' => 'char',
+'TQ_LONG&' => 'long',
+'TQ_LONG' => 'long',
 'TQ_PACKED*' => 'void*',
-'Q_UINT16&' => 'unsigned short',
-'Q_UINT16' => 'unsigned short',
-'Q_UINT32&' => 'unsigned int',
-'Q_UINT32' => 'unsigned int',
-'Q_UINT8&' => 'unsigned char',
-'Q_UINT8' => 'unsigned char',
-'Q_UINT8*'  =>  'unsigned char*' ,
-'Q_ULONG&' => 'long',
-'Q_ULONG' => 'long',
+'TQ_UINT16&' => 'unsigned short',
+'TQ_UINT16' => 'unsigned short',
+'TQ_UINT32&' => 'unsigned int',
+'TQ_UINT32' => 'unsigned int',
+'TQ_UINT8&' => 'unsigned char',
+'TQ_UINT8' => 'unsigned char',
+'TQ_UINT8*'  =>  'unsigned char*' ,
+'TQ_ULONG&' => 'long',
+'TQ_ULONG' => 'long',
 'Qt*'  =>  'qt_Qt*' ,
 'TQt::ArrowType'  =>  'int' ,
 'TQt::BackgroundMode' => 'int',
@@ -2328,311 +2328,311 @@ BEGIN
 'QwTextSprite*' => 'qt_QwTextSprite*',
 'QwTiledSpriteField*' => 'qt_QwTiledSpriteField*',
 'QwVirtualSprite*' => 'qt_QwVirtualSprite*',
-'RArray*' => 'kde_RArray*',
-'RGBColor&' => 'kde_RGBColor*',
-'RGBColor' => 'kde_RGBColor*',
-'RGBColor*' => 'kde_RGBColor*',
-'Range&' => 'kde_Range*',
-'Range' => 'kde_Range*',
-'Range*' => 'kde_Range*',
-'RangeException&' => 'kde_RangeException*',
-'RangeException*' => 'kde_RangeException*',
-'RangeImpl*' => 'kde_RangeImpl*',
+'RArray*' => 'tde_RArray*',
+'RGBColor&' => 'tde_RGBColor*',
+'RGBColor' => 'tde_RGBColor*',
+'RGBColor*' => 'tde_RGBColor*',
+'Range&' => 'tde_Range*',
+'Range' => 'tde_Range*',
+'Range*' => 'tde_Range*',
+'RangeException&' => 'tde_RangeException*',
+'RangeException*' => 'tde_RangeException*',
+'RangeImpl*' => 'tde_RangeImpl*',
 'RasterOp' => 'int',
-'RawDataPacket*' => 'kde_RawDataPacket*',
-'ReadOnlyPart*' => 'kde_ReadOnlyPart*',
-'ReadWritePart*' => 'kde_ReadWritePart*',
-'Rect&' => 'kde_Rect*',
-'Rect' => 'kde_Rect*',
-'Rect*' => 'kde_Rect*',
-'Reference&' => 'kde_Reference*',
-'Reference*' => 'kde_Reference*',
-'ReferenceClean*' => 'kde_ReferenceClean*',
-'ReferenceHelper*' => 'kde_ReferenceHelper*',
+'RawDataPacket*' => 'tde_RawDataPacket*',
+'ReadOnlyPart*' => 'tde_ReadOnlyPart*',
+'ReadWritePart*' => 'tde_ReadWritePart*',
+'Rect&' => 'tde_Rect*',
+'Rect' => 'tde_Rect*',
+'Rect*' => 'tde_Rect*',
+'Reference&' => 'tde_Reference*',
+'Reference*' => 'tde_Reference*',
+'ReferenceClean*' => 'tde_ReferenceClean*',
+'ReferenceHelper*' => 'tde_ReferenceHelper*',
 'Region' => 'int',
 'RegionType' => 'int',
-'RemoteScheduleNode*' => 'kde_RemoteScheduleNode*',
-'RenameDlg*' => 'kde_RenameDlg*',
-'RenderStyle*'  =>  'kde_RenderStyle*' ,
-'Rep*' => 'kde_Rep*',
+'RemoteScheduleNode*' => 'tde_RemoteScheduleNode*',
+'RenameDlg*' => 'tde_RenameDlg*',
+'RenderStyle*'  =>  'tde_RenderStyle*' ,
+'Rep*' => 'tde_Rep*',
 'RunMode'  =>  'int' ,
-'SButton*' => 'kde_SButton*',
+'SButton*' => 'tde_SButton*',
 'SCFlags' => 'int',
 'SFlags' => 'int',
-'ScheduleNode*' => 'kde_ScheduleNode*',
-'Scheduler*' => 'kde_Scheduler*',
+'ScheduleNode*' => 'tde_ScheduleNode*',
+'Scheduler*' => 'tde_Scheduler*',
 'ScrollBarMode' => 'int',
 'ScrollControl'  =>  'int' ,
-'SearchInterface*' => 'kde_SearchInterface*',
-'Section&'  =>  'kde_Section*' ,
-'Section*&'  =>  'kde_Section*' ,
-'Section*'  =>  'kde_Section*' ,
+'SearchInterface*' => 'tde_SearchInterface*',
+'Section&'  =>  'tde_Section*' ,
+'Section*&'  =>  'tde_Section*' ,
+'Section*'  =>  'tde_Section*' ,
 'SegmentStyle' => 'int',
-'SelectionInterface*' => 'kde_SelectionInterface*',
+'SelectionInterface*' => 'tde_SelectionInterface*',
 'Separator' => 'int',
 'Server&'  =>  'Server*' ,
-'Server*' => 'kde_Server*',
-'ServerHello&' => 'kde_ServerHello*',
-'ServerHello*' => 'kde_ServerHello*',
-'Service*' => 'kde_Service*',
-'SessionData*' => 'kde_SessionData*',
-'SimpleFormat*' => 'kde_SimpleFormat*',
-'SimpleJob*' => 'kde_SimpleJob*',
-'SimpleSoundServer&' => 'kde_SimpleSoundServer*',
-'SimpleSoundServer' => 'kde_SimpleSoundServer*',
-'SimpleSoundServer*' => 'kde_SimpleSoundServer*',
-'SimpleSoundServer_base*' => 'kde_SimpleSoundServer_base*',
-'SimpleSoundServer_skel*' => 'kde_SimpleSoundServer_skel*',
-'SimpleSoundServer_stub*' => 'kde_SimpleSoundServer_stub*',
-'SkipDlg*' => 'kde_SkipDlg*',
-'Slave*' => 'kde_Slave*',
-'SlaveBase*' => 'kde_SlaveBase*',
-'SlaveBasePrivate*' => 'kde_SlaveBasePrivate*',
-'SlaveConfig*' => 'kde_SlaveConfig*',
-'SlaveInterface*' => 'kde_SlaveInterface*',
-'SocketConnection*' => 'kde_SocketConnection*',
+'Server*' => 'tde_Server*',
+'ServerHello&' => 'tde_ServerHello*',
+'ServerHello*' => 'tde_ServerHello*',
+'Service*' => 'tde_Service*',
+'SessionData*' => 'tde_SessionData*',
+'SimpleFormat*' => 'tde_SimpleFormat*',
+'SimpleJob*' => 'tde_SimpleJob*',
+'SimpleSoundServer&' => 'tde_SimpleSoundServer*',
+'SimpleSoundServer' => 'tde_SimpleSoundServer*',
+'SimpleSoundServer*' => 'tde_SimpleSoundServer*',
+'SimpleSoundServer_base*' => 'tde_SimpleSoundServer_base*',
+'SimpleSoundServer_skel*' => 'tde_SimpleSoundServer_skel*',
+'SimpleSoundServer_stub*' => 'tde_SimpleSoundServer_stub*',
+'SkipDlg*' => 'tde_SkipDlg*',
+'Slave*' => 'tde_Slave*',
+'SlaveBase*' => 'tde_SlaveBase*',
+'SlaveBasePrivate*' => 'tde_SlaveBasePrivate*',
+'SlaveConfig*' => 'tde_SlaveConfig*',
+'SlaveInterface*' => 'tde_SlaveInterface*',
+'SocketConnection*' => 'tde_SocketConnection*',
 'Spec' => 'int',
-'SpecialEvent*' => 'kde_SpecialEvent*',
-'SshProcess*' => 'kde_SshProcess*',
-'SshProcessPrivate*' => 'kde_SshProcessPrivate*',
-'StartupClass*' => 'kde_StartupClass*',
-'StartupManager*' => 'kde_StartupManager*',
-'StatJob*' => 'kde_StatJob*',
+'SpecialEvent*' => 'tde_SpecialEvent*',
+'SshProcess*' => 'tde_SshProcess*',
+'SshProcessPrivate*' => 'tde_SshProcessPrivate*',
+'StartupClass*' => 'tde_StartupClass*',
+'StartupManager*' => 'tde_StartupManager*',
+'StatJob*' => 'tde_StatJob*',
 'State' => 'int',
 'TQSocket::State' => 'int',
-'StatusbarProgress*' => 'kde_StatusbarProgress*',
-'StdAddressBook*' => 'kde_StdAddressBook*',
-'StdFlowSystem*' => 'kde_StdFlowSystem*',
-'StdIOManager*' => 'kde_StdIOManager*',
-'StdScheduleNode*' => 'kde_StdScheduleNode*',
-'StdSynthModule*' => 'kde_StdSynthModule*',
-'StereoEffect&' => 'kde_StereoEffect*',
-'StereoEffect' => 'kde_StereoEffect*',
-'StereoEffect*' => 'kde_StereoEffect*',
-'StereoEffectStack&' => 'kde_StereoEffectStack*',
-'StereoEffectStack' => 'kde_StereoEffectStack*',
-'StereoEffectStack*' => 'kde_StereoEffectStack*',
-'StereoEffectStack_base*' => 'kde_StereoEffectStack_base*',
-'StereoEffectStack_skel*' => 'kde_StereoEffectStack_skel*',
-'StereoEffectStack_stub*' => 'kde_StereoEffectStack_stub*',
-'StereoEffect_base*' => 'kde_StereoEffect_base*',
-'StereoEffect_skel*' => 'kde_StereoEffect_skel*',
-'StereoEffect_stub*' => 'kde_StereoEffect_stub*',
-'StereoFFTScope&' => 'kde_StereoFFTScope*',
-'StereoFFTScope' => 'kde_StereoFFTScope*',
-'StereoFFTScope*' => 'kde_StereoFFTScope*',
-'StereoFFTScope_base*' => 'kde_StereoFFTScope_base*',
-'StereoFFTScope_skel*' => 'kde_StereoFFTScope_skel*',
-'StereoFFTScope_stub*' => 'kde_StereoFFTScope_stub*',
-'StereoVolumeControl&' => 'kde_StereoVolumeControl*',
-'StereoVolumeControl' => 'kde_StereoVolumeControl*',
-'StereoVolumeControl*' => 'kde_StereoVolumeControl*',
-'StereoVolumeControl_base*' => 'kde_StereoVolumeControl_base*',
-'StereoVolumeControl_skel*' => 'kde_StereoVolumeControl_skel*',
-'StereoVolumeControl_stub*' => 'kde_StereoVolumeControl_stub*',
+'StatusbarProgress*' => 'tde_StatusbarProgress*',
+'StdAddressBook*' => 'tde_StdAddressBook*',
+'StdFlowSystem*' => 'tde_StdFlowSystem*',
+'StdIOManager*' => 'tde_StdIOManager*',
+'StdScheduleNode*' => 'tde_StdScheduleNode*',
+'StdSynthModule*' => 'tde_StdSynthModule*',
+'StereoEffect&' => 'tde_StereoEffect*',
+'StereoEffect' => 'tde_StereoEffect*',
+'StereoEffect*' => 'tde_StereoEffect*',
+'StereoEffectStack&' => 'tde_StereoEffectStack*',
+'StereoEffectStack' => 'tde_StereoEffectStack*',
+'StereoEffectStack*' => 'tde_StereoEffectStack*',
+'StereoEffectStack_base*' => 'tde_StereoEffectStack_base*',
+'StereoEffectStack_skel*' => 'tde_StereoEffectStack_skel*',
+'StereoEffectStack_stub*' => 'tde_StereoEffectStack_stub*',
+'StereoEffect_base*' => 'tde_StereoEffect_base*',
+'StereoEffect_skel*' => 'tde_StereoEffect_skel*',
+'StereoEffect_stub*' => 'tde_StereoEffect_stub*',
+'StereoFFTScope&' => 'tde_StereoFFTScope*',
+'StereoFFTScope' => 'tde_StereoFFTScope*',
+'StereoFFTScope*' => 'tde_StereoFFTScope*',
+'StereoFFTScope_base*' => 'tde_StereoFFTScope_base*',
+'StereoFFTScope_skel*' => 'tde_StereoFFTScope_skel*',
+'StereoFFTScope_stub*' => 'tde_StereoFFTScope_stub*',
+'StereoVolumeControl&' => 'tde_StereoVolumeControl*',
+'StereoVolumeControl' => 'tde_StereoVolumeControl*',
+'StereoVolumeControl*' => 'tde_StereoVolumeControl*',
+'StereoVolumeControl_base*' => 'tde_StereoVolumeControl_base*',
+'StereoVolumeControl_skel*' => 'tde_StereoVolumeControl_skel*',
+'StereoVolumeControl_stub*' => 'tde_StereoVolumeControl_stub*',
 'StreamMode&' => 'int',
-'String*' => 'kde_String*',
-'StringSectionMap::iterator&'  =>  'kde_StringSectionMap*' ,
-'StringSectionMap::iterator'  =>  'kde_StringSectionMap*r' ,
-'StubProcess*' => 'kde_StubProcess*',
+'String*' => 'tde_String*',
+'StringSectionMap::iterator&'  =>  'tde_StringSectionMap*' ,
+'StringSectionMap::iterator'  =>  'tde_StringSectionMap*r' ,
+'StubProcess*' => 'tde_StubProcess*',
 'StyleHint' => 'int',
-'StyleListImpl*' => 'kde_StyleListImpl*',
+'StyleListImpl*' => 'tde_StyleListImpl*',
 'StylePixmap' => 'int',
-'StyleSheet&' => 'kde_StyleSheet*',
-'StyleSheet' => 'kde_StyleSheet*',
-'StyleSheet*' => 'kde_StyleSheet*',
-'StyleSheetImpl*' => 'kde_StyleSheetImpl*',
-'StyleSheetList&' => 'kde_StyleSheetList*',
-'StyleSheetList' => 'kde_StyleSheetList',
-'StyleSheetList*' => 'kde_StyleSheetList*',
-'StyleSheetListImpl*' => 'kde_StyleSheetListImpl*',
+'StyleSheet&' => 'tde_StyleSheet*',
+'StyleSheet' => 'tde_StyleSheet*',
+'StyleSheet*' => 'tde_StyleSheet*',
+'StyleSheetImpl*' => 'tde_StyleSheetImpl*',
+'StyleSheetList&' => 'tde_StyleSheetList*',
+'StyleSheetList' => 'tde_StyleSheetList',
+'StyleSheetList*' => 'tde_StyleSheetList*',
+'StyleSheetListImpl*' => 'tde_StyleSheetListImpl*',
 'StyleStrategy' => 'int',
-'SuProcess*' => 'kde_SuProcess*',
-'SubClass&' => 'kde_SubClass*',
-'SubClass*' => 'kde_SubClass*',
+'SuProcess*' => 'tde_SuProcess*',
+'SubClass&' => 'tde_SubClass*',
+'SubClass*' => 'tde_SubClass*',
 'SubControl' => 'int',
 'SubRect' => 'int',
-'SynthBuffer*' => 'kde_SynthBuffer*',
-'SynthModule&' => 'kde_SynthModule*',
-'SynthModule' => 'kde_SynthModule*',
-'SynthModule*' => 'kde_SynthModule*',
-'SynthModule_base*' => 'kde_SynthModule_base*',
-'SynthModule_skel*' => 'kde_SynthModule_skel*',
-'SynthModule_stub*' => 'kde_SynthModule_stub*',
-'SynthOut*' => 'kde_SynthOut*',
-'Synth_ADD&' => 'kde_Synth_ADD*',
-'Synth_ADD' => 'kde_Synth_ADD*',
-'Synth_ADD*' => 'kde_Synth_ADD*',
-'Synth_ADD_base*' => 'kde_Synth_ADD_base*',
-'Synth_ADD_skel*' => 'kde_Synth_ADD_skel*',
-'Synth_ADD_stub*' => 'kde_Synth_ADD_stub*',
-'Synth_AMAN_PLAY&' => 'kde_Synth_AMAN_PLAY*',
-'Synth_AMAN_PLAY' => 'kde_Synth_AMAN_PLAY*',
-'Synth_AMAN_PLAY*' => 'kde_Synth_AMAN_PLAY*',
-'Synth_AMAN_PLAY_base*' => 'kde_Synth_AMAN_PLAY_base*',
-'Synth_AMAN_PLAY_skel*' => 'kde_Synth_AMAN_PLAY_skel*',
-'Synth_AMAN_PLAY_stub*' => 'kde_Synth_AMAN_PLAY_stub*',
-'Synth_AMAN_RECORD&' => 'kde_Synth_AMAN_RECORD*',
-'Synth_AMAN_RECORD' => 'kde_Synth_AMAN_RECORD*',
-'Synth_AMAN_RECORD*' => 'kde_Synth_AMAN_RECORD*',
-'Synth_AMAN_RECORD_base*' => 'kde_Synth_AMAN_RECORD_base*',
-'Synth_AMAN_RECORD_skel*' => 'kde_Synth_AMAN_RECORD_skel*',
-'Synth_AMAN_RECORD_stub*' => 'kde_Synth_AMAN_RECORD_stub*',
-'Synth_BUS_DOWNLINK&' => 'kde_Synth_BUS_DOWNLINK*',
-'Synth_BUS_DOWNLINK' => 'kde_Synth_BUS_DOWNLINK*',
-'Synth_BUS_DOWNLINK*' => 'kde_Synth_BUS_DOWNLINK*',
-'Synth_BUS_DOWNLINK_base*' => 'kde_Synth_BUS_DOWNLINK_base*',
-'Synth_BUS_DOWNLINK_skel*' => 'kde_Synth_BUS_DOWNLINK_skel*',
-'Synth_BUS_DOWNLINK_stub*' => 'kde_Synth_BUS_DOWNLINK_stub*',
-'Synth_BUS_UPLINK&' => 'kde_Synth_BUS_UPLINK*',
-'Synth_BUS_UPLINK' => 'kde_Synth_BUS_UPLINK*',
-'Synth_BUS_UPLINK*' => 'kde_Synth_BUS_UPLINK*',
-'Synth_BUS_UPLINK_base*' => 'kde_Synth_BUS_UPLINK_base*',
-'Synth_BUS_UPLINK_skel*' => 'kde_Synth_BUS_UPLINK_skel*',
-'Synth_BUS_UPLINK_stub*' => 'kde_Synth_BUS_UPLINK_stub*',
-'Synth_FREQUENCY&' => 'kde_Synth_FREQUENCY*',
-'Synth_FREQUENCY' => 'kde_Synth_FREQUENCY*',
-'Synth_FREQUENCY*' => 'kde_Synth_FREQUENCY*',
-'Synth_FREQUENCY_base*' => 'kde_Synth_FREQUENCY_base*',
-'Synth_FREQUENCY_skel*' => 'kde_Synth_FREQUENCY_skel*',
-'Synth_FREQUENCY_stub*' => 'kde_Synth_FREQUENCY_stub*',
-'Synth_MUL&' => 'kde_Synth_MUL*',
-'Synth_MUL' => 'kde_Synth_MUL*',
-'Synth_MUL*' => 'kde_Synth_MUL*',
-'Synth_MULTI_ADD&' => 'kde_Synth_MULTI_ADD*',
-'Synth_MULTI_ADD' => 'kde_Synth_MULTI_ADD*',
-'Synth_MULTI_ADD*' => 'kde_Synth_MULTI_ADD*',
-'Synth_MULTI_ADD_base*' => 'kde_Synth_MULTI_ADD_base*',
-'Synth_MULTI_ADD_skel*' => 'kde_Synth_MULTI_ADD_skel*',
-'Synth_MULTI_ADD_stub*' => 'kde_Synth_MULTI_ADD_stub*',
-'Synth_MUL_base*' => 'kde_Synth_MUL_base*',
-'Synth_MUL_skel*' => 'kde_Synth_MUL_skel*',
-'Synth_MUL_stub*' => 'kde_Synth_MUL_stub*',
-'Synth_PLAY&' => 'kde_Synth_PLAY*',
-'Synth_PLAY' => 'kde_Synth_PLAY*',
-'Synth_PLAY*' => 'kde_Synth_PLAY*',
-'Synth_PLAY_WAV&' => 'kde_Synth_PLAY_WAV*',
-'Synth_PLAY_WAV' => 'kde_Synth_PLAY_WAV*',
-'Synth_PLAY_WAV*' => 'kde_Synth_PLAY_WAV*',
-'Synth_PLAY_WAV_base*' => 'kde_Synth_PLAY_WAV_base*',
-'Synth_PLAY_WAV_skel*' => 'kde_Synth_PLAY_WAV_skel*',
-'Synth_PLAY_WAV_stub*' => 'kde_Synth_PLAY_WAV_stub*',
-'Synth_PLAY_base*' => 'kde_Synth_PLAY_base*',
-'Synth_PLAY_skel*' => 'kde_Synth_PLAY_skel*',
-'Synth_PLAY_stub*' => 'kde_Synth_PLAY_stub*',
-'Synth_RECORD&' => 'kde_Synth_RECORD*',
-'Synth_RECORD' => 'kde_Synth_RECORD*',
-'Synth_RECORD*' => 'kde_Synth_RECORD*',
-'Synth_RECORD_base*' => 'kde_Synth_RECORD_base*',
-'Synth_RECORD_skel*' => 'kde_Synth_RECORD_skel*',
-'Synth_RECORD_stub*' => 'kde_Synth_RECORD_stub*',
-'Synth_WAVE_SIN&' => 'kde_Synth_WAVE_SIN*',
-'Synth_WAVE_SIN' => 'kde_Synth_WAVE_SIN*',
-'Synth_WAVE_SIN*' => 'kde_Synth_WAVE_SIN*',
-'Synth_WAVE_SIN_base*' => 'kde_Synth_WAVE_SIN_base*',
-'Synth_WAVE_SIN_skel*' => 'kde_Synth_WAVE_SIN_skel*',
-'Synth_WAVE_SIN_stub*' => 'kde_Synth_WAVE_SIN_stub*',
+'SynthBuffer*' => 'tde_SynthBuffer*',
+'SynthModule&' => 'tde_SynthModule*',
+'SynthModule' => 'tde_SynthModule*',
+'SynthModule*' => 'tde_SynthModule*',
+'SynthModule_base*' => 'tde_SynthModule_base*',
+'SynthModule_skel*' => 'tde_SynthModule_skel*',
+'SynthModule_stub*' => 'tde_SynthModule_stub*',
+'SynthOut*' => 'tde_SynthOut*',
+'Synth_ADD&' => 'tde_Synth_ADD*',
+'Synth_ADD' => 'tde_Synth_ADD*',
+'Synth_ADD*' => 'tde_Synth_ADD*',
+'Synth_ADD_base*' => 'tde_Synth_ADD_base*',
+'Synth_ADD_skel*' => 'tde_Synth_ADD_skel*',
+'Synth_ADD_stub*' => 'tde_Synth_ADD_stub*',
+'Synth_AMAN_PLAY&' => 'tde_Synth_AMAN_PLAY*',
+'Synth_AMAN_PLAY' => 'tde_Synth_AMAN_PLAY*',
+'Synth_AMAN_PLAY*' => 'tde_Synth_AMAN_PLAY*',
+'Synth_AMAN_PLAY_base*' => 'tde_Synth_AMAN_PLAY_base*',
+'Synth_AMAN_PLAY_skel*' => 'tde_Synth_AMAN_PLAY_skel*',
+'Synth_AMAN_PLAY_stub*' => 'tde_Synth_AMAN_PLAY_stub*',
+'Synth_AMAN_RECORD&' => 'tde_Synth_AMAN_RECORD*',
+'Synth_AMAN_RECORD' => 'tde_Synth_AMAN_RECORD*',
+'Synth_AMAN_RECORD*' => 'tde_Synth_AMAN_RECORD*',
+'Synth_AMAN_RECORD_base*' => 'tde_Synth_AMAN_RECORD_base*',
+'Synth_AMAN_RECORD_skel*' => 'tde_Synth_AMAN_RECORD_skel*',
+'Synth_AMAN_RECORD_stub*' => 'tde_Synth_AMAN_RECORD_stub*',
+'Synth_BUS_DOWNLINK&' => 'tde_Synth_BUS_DOWNLINK*',
+'Synth_BUS_DOWNLINK' => 'tde_Synth_BUS_DOWNLINK*',
+'Synth_BUS_DOWNLINK*' => 'tde_Synth_BUS_DOWNLINK*',
+'Synth_BUS_DOWNLINK_base*' => 'tde_Synth_BUS_DOWNLINK_base*',
+'Synth_BUS_DOWNLINK_skel*' => 'tde_Synth_BUS_DOWNLINK_skel*',
+'Synth_BUS_DOWNLINK_stub*' => 'tde_Synth_BUS_DOWNLINK_stub*',
+'Synth_BUS_UPLINK&' => 'tde_Synth_BUS_UPLINK*',
+'Synth_BUS_UPLINK' => 'tde_Synth_BUS_UPLINK*',
+'Synth_BUS_UPLINK*' => 'tde_Synth_BUS_UPLINK*',
+'Synth_BUS_UPLINK_base*' => 'tde_Synth_BUS_UPLINK_base*',
+'Synth_BUS_UPLINK_skel*' => 'tde_Synth_BUS_UPLINK_skel*',
+'Synth_BUS_UPLINK_stub*' => 'tde_Synth_BUS_UPLINK_stub*',
+'Synth_FRETQUENCY&' => 'tde_Synth_FRETQUENCY*',
+'Synth_FRETQUENCY' => 'tde_Synth_FRETQUENCY*',
+'Synth_FRETQUENCY*' => 'tde_Synth_FRETQUENCY*',
+'Synth_FRETQUENCY_base*' => 'tde_Synth_FRETQUENCY_base*',
+'Synth_FRETQUENCY_skel*' => 'tde_Synth_FRETQUENCY_skel*',
+'Synth_FRETQUENCY_stub*' => 'tde_Synth_FRETQUENCY_stub*',
+'Synth_MUL&' => 'tde_Synth_MUL*',
+'Synth_MUL' => 'tde_Synth_MUL*',
+'Synth_MUL*' => 'tde_Synth_MUL*',
+'Synth_MULTI_ADD&' => 'tde_Synth_MULTI_ADD*',
+'Synth_MULTI_ADD' => 'tde_Synth_MULTI_ADD*',
+'Synth_MULTI_ADD*' => 'tde_Synth_MULTI_ADD*',
+'Synth_MULTI_ADD_base*' => 'tde_Synth_MULTI_ADD_base*',
+'Synth_MULTI_ADD_skel*' => 'tde_Synth_MULTI_ADD_skel*',
+'Synth_MULTI_ADD_stub*' => 'tde_Synth_MULTI_ADD_stub*',
+'Synth_MUL_base*' => 'tde_Synth_MUL_base*',
+'Synth_MUL_skel*' => 'tde_Synth_MUL_skel*',
+'Synth_MUL_stub*' => 'tde_Synth_MUL_stub*',
+'Synth_PLAY&' => 'tde_Synth_PLAY*',
+'Synth_PLAY' => 'tde_Synth_PLAY*',
+'Synth_PLAY*' => 'tde_Synth_PLAY*',
+'Synth_PLAY_WAV&' => 'tde_Synth_PLAY_WAV*',
+'Synth_PLAY_WAV' => 'tde_Synth_PLAY_WAV*',
+'Synth_PLAY_WAV*' => 'tde_Synth_PLAY_WAV*',
+'Synth_PLAY_WAV_base*' => 'tde_Synth_PLAY_WAV_base*',
+'Synth_PLAY_WAV_skel*' => 'tde_Synth_PLAY_WAV_skel*',
+'Synth_PLAY_WAV_stub*' => 'tde_Synth_PLAY_WAV_stub*',
+'Synth_PLAY_base*' => 'tde_Synth_PLAY_base*',
+'Synth_PLAY_skel*' => 'tde_Synth_PLAY_skel*',
+'Synth_PLAY_stub*' => 'tde_Synth_PLAY_stub*',
+'Synth_RECORD&' => 'tde_Synth_RECORD*',
+'Synth_RECORD' => 'tde_Synth_RECORD*',
+'Synth_RECORD*' => 'tde_Synth_RECORD*',
+'Synth_RECORD_base*' => 'tde_Synth_RECORD_base*',
+'Synth_RECORD_skel*' => 'tde_Synth_RECORD_skel*',
+'Synth_RECORD_stub*' => 'tde_Synth_RECORD_stub*',
+'Synth_WAVE_SIN&' => 'tde_Synth_WAVE_SIN*',
+'Synth_WAVE_SIN' => 'tde_Synth_WAVE_SIN*',
+'Synth_WAVE_SIN*' => 'tde_Synth_WAVE_SIN*',
+'Synth_WAVE_SIN_base*' => 'tde_Synth_WAVE_SIN_base*',
+'Synth_WAVE_SIN_skel*' => 'tde_Synth_WAVE_SIN_skel*',
+'Synth_WAVE_SIN_stub*' => 'tde_Synth_WAVE_SIN_stub*',
 'T&'  =>  'T*' ,
 'T'  =>  'T*' ,
 'T*'  =>  'T*' ,
-'TCPConnection*' => 'kde_TCPConnection*',
-'TCPServer*' => 'kde_TCPServer*',
-'TCPSlaveBase*' => 'kde_TCPSlaveBase*',
+'TCPConnection*' => 'tde_TCPConnection*',
+'TCPServer*' => 'tde_TCPServer*',
+'TCPSlaveBase*' => 'tde_TCPSlaveBase*',
 'TRUE' => '1',
-'Task*' => 'kde_Task*',
-'Text&' => 'kde_Text*',
-'Text' => 'kde_Text*',
-'Text*' => 'kde_Text*',
+'Task*' => 'tde_Task*',
+'Text&' => 'tde_Text*',
+'Text' => 'tde_Text*',
+'Text*' => 'tde_Text*',
 'TextFormat'  =>  'int' ,
-'TextImpl*' => 'kde_TextImpl*',
-'ThumbCreator*' => 'kde_ThumbCreator*',
+'TextImpl*' => 'tde_TextImpl*',
+'ThumbCreator*' => 'tde_ThumbCreator*',
 'TickSetting' => 'int',
-'Ticket*' => 'kde_Ticket*',
-'TimeNotify*' => 'kde_TimeNotify*',
-'TimeWatcher*' => 'kde_TimeWatcher*',
-'TimeZone&' => 'kde_TimeZone*',
-'TimeZone*' => 'kde_TimeZone*',
-'TmpGlobalComm&' => 'kde_TmpGlobalComm*',
-'TmpGlobalComm' => 'kde_TmpGlobalComm*',
-'TmpGlobalComm*' => 'kde_TmpGlobalComm*',
-'TmpGlobalComm_base*' => 'kde_TmpGlobalComm_base*',
-'TmpGlobalComm_skel*' => 'kde_TmpGlobalComm_skel*',
-'TmpGlobalComm_stub*' => 'kde_TmpGlobalComm_stub*',
+'Ticket*' => 'tde_Ticket*',
+'TimeNotify*' => 'tde_TimeNotify*',
+'TimeWatcher*' => 'tde_TimeWatcher*',
+'TimeZone&' => 'tde_TimeZone*',
+'TimeZone*' => 'tde_TimeZone*',
+'TmpGlobalComm&' => 'tde_TmpGlobalComm*',
+'TmpGlobalComm' => 'tde_TmpGlobalComm*',
+'TmpGlobalComm*' => 'tde_TmpGlobalComm*',
+'TmpGlobalComm_base*' => 'tde_TmpGlobalComm_base*',
+'TmpGlobalComm_skel*' => 'tde_TmpGlobalComm_skel*',
+'TmpGlobalComm_stub*' => 'tde_TmpGlobalComm_stub*',
 'ToolBarDock&'  =>  'int' ,
 'ToolBarDock' => 'int',
-'TraderOffer&' => 'kde_TraderOffer*',
-'TraderOffer' => 'kde_TraderOffer*',
-'TraderOffer*' => 'kde_TraderOffer*',
-'TraderOffer_base*' => 'kde_TraderOffer_base*',
-'TraderOffer_skel*' => 'kde_TraderOffer_skel*',
-'TraderOffer_stub*' => 'kde_TraderOffer_stub*',
-'TraderQuery&' => 'kde_TraderQuery*',
-'TraderQuery' => 'kde_TraderQuery*',
-'TraderQuery*' => 'kde_TraderQuery*',
-'TraderQuery_base*' => 'kde_TraderQuery_base*',
-'TraderQuery_skel*' => 'kde_TraderQuery_skel*',
-'TraderQuery_stub*' => 'kde_TraderQuery_stub*',
-'TransferJob*' => 'kde_TransferJob*',
-'TreeWalker&' => 'kde_TreeWalker*',
-'TreeWalker' => 'kde_TreeWalker*',
-'TreeWalker*' => 'kde_TreeWalker*',
-'TreeWalkerImpl*' => 'kde_TreeWalkerImpl*',
+'TraderOffer&' => 'tde_TraderOffer*',
+'TraderOffer' => 'tde_TraderOffer*',
+'TraderOffer*' => 'tde_TraderOffer*',
+'TraderOffer_base*' => 'tde_TraderOffer_base*',
+'TraderOffer_skel*' => 'tde_TraderOffer_skel*',
+'TraderOffer_stub*' => 'tde_TraderOffer_stub*',
+'TraderQuery&' => 'tde_TraderQuery*',
+'TraderQuery' => 'tde_TraderQuery*',
+'TraderQuery*' => 'tde_TraderQuery*',
+'TraderQuery_base*' => 'tde_TraderQuery_base*',
+'TraderQuery_skel*' => 'tde_TraderQuery_skel*',
+'TraderQuery_stub*' => 'tde_TraderQuery_stub*',
+'TransferJob*' => 'tde_TransferJob*',
+'TreeWalker&' => 'tde_TreeWalker*',
+'TreeWalker' => 'tde_TreeWalker*',
+'TreeWalker*' => 'tde_TreeWalker*',
+'TreeWalkerImpl*' => 'tde_TreeWalkerImpl*',
 'True' => '1',
-'Type&' => 'kde_Type*',
+'Type&' => 'tde_Type*',
 'Type' => 'int',
-'Type*' => 'kde_Type*',
-'TypeComponent&' => 'kde_TypeComponent*',
-'TypeComponent*' => 'kde_TypeComponent*',
-'TypeDef&' => 'kde_TypeDef*',
-'TypeDef' => 'kde_TypeDef*',
-'TypeDef*' => 'kde_TypeDef*',
-'TypeEntry*' => 'kde_TypeEntry*',
-'TypeInfo*' => 'kde_TypeInfo*',
-'UChar&' => 'kde_UChar*',
-'UChar' => 'kde_UChar*',
-'UChar*' => 'kde_UChar*',
-'UCharReference&' => 'kde_UCharReference*',
-'UCharReference' => 'kde_UCharReference*',
-'UCharReference*' => 'kde_UCharReference*',
-'UDSAtom*' => 'kde_UDSAtom*',
-'UIServer*' => 'kde_UIServer*',
-'UIServer_stub*' => 'kde_UIServer_stub*',
+'Type*' => 'tde_Type*',
+'TypeComponent&' => 'tde_TypeComponent*',
+'TypeComponent*' => 'tde_TypeComponent*',
+'TypeDef&' => 'tde_TypeDef*',
+'TypeDef' => 'tde_TypeDef*',
+'TypeDef*' => 'tde_TypeDef*',
+'TypeEntry*' => 'tde_TypeEntry*',
+'TypeInfo*' => 'tde_TypeInfo*',
+'UChar&' => 'tde_UChar*',
+'UChar' => 'tde_UChar*',
+'UChar*' => 'tde_UChar*',
+'UCharReference&' => 'tde_UCharReference*',
+'UCharReference' => 'tde_UCharReference*',
+'UCharReference*' => 'tde_UCharReference*',
+'UDSAtom*' => 'tde_UDSAtom*',
+'UIServer*' => 'tde_UIServer*',
+'UIServer_stub*' => 'tde_UIServer_stub*',
 'ULONG_MAX' => 'ULONG_MAX',
-'UString&' => 'kde_UString*',
-'UString' => 'kde_UString*',
-'UString*' => 'kde_UString*',
-'Undefined*' => 'kde_Undefined*',
-'UndoInterface*' => 'kde_UndoInterface*',
+'UString&' => 'tde_UString*',
+'UString' => 'tde_UString*',
+'UString*' => 'tde_UString*',
+'Undefined*' => 'tde_Undefined*',
+'UndoInterface*' => 'tde_UndoInterface*',
 'UndoRedoInfo*' => 'int*',
-'UnixConnection*' => 'kde_UnixConnection*',
-'UnixServer*' => 'kde_UnixServer*',
-'VCardFormat*' => 'kde_VCardFormat*',
-'VPort*' => 'kde_VPort*',
-'Value&' => 'kde_Value*',
-'Value' => 'kde_Value*',
-'Value*' => 'kde_Value*',
+'UnixConnection*' => 'tde_UnixConnection*',
+'UnixServer*' => 'tde_UnixServer*',
+'VCardFormat*' => 'tde_VCardFormat*',
+'VPort*' => 'tde_VPort*',
+'Value&' => 'tde_Value*',
+'Value' => 'tde_Value*',
+'Value*' => 'tde_Value*',
 'VerticalAlignment*' => 'int*',
-'View*'  =>  'kde_View*' ,
-'ViewCursorInterface*' => 'kde_ViewCursorInterface*',
-'VoiceManager*' => 'kde_VoiceManager*',
+'View*'  =>  'tde_View*' ,
+'ViewCursorInterface*' => 'tde_ViewCursorInterface*',
+'VoiceManager*' => 'tde_VoiceManager*',
 'WFlags' => 'int',
 'WId' => 'unsigned int',
 'WState' => 'int',
-'WavPlayObject&' => 'kde_WavPlayObject*',
-'WavPlayObject' => 'kde_WavPlayObject*',
-'WavPlayObject*' => 'kde_WavPlayObject*',
-'WavPlayObject_base*' => 'kde_WavPlayObject_base*',
-'WavPlayObject_skel*' => 'kde_WavPlayObject_skel*',
-'WavPlayObject_stub*' => 'kde_WavPlayObject_stub*',
-'WeakReference*' => 'kde_WeakReference*',
-'WeakReferenceBase*' => 'kde_WeakReferenceBase*',
+'WavPlayObject&' => 'tde_WavPlayObject*',
+'WavPlayObject' => 'tde_WavPlayObject*',
+'WavPlayObject*' => 'tde_WavPlayObject*',
+'WavPlayObject_base*' => 'tde_WavPlayObject_base*',
+'WavPlayObject_skel*' => 'tde_WavPlayObject_skel*',
+'WavPlayObject_stub*' => 'tde_WavPlayObject_stub*',
+'WeakReference*' => 'tde_WeakReference*',
+'WeakReferenceBase*' => 'tde_WeakReferenceBase*',
 'Widget'  =>  'int' ,
 'WidgetClass'  =>  'int' ,
 'WidthMode' => 'int',
-'Window' => 'kde_Window*',
-'Window*' => 'kde_Window*',
-'WindowArgs&' => 'kde_WindowArgs*',
-'WindowArgs*' => 'kde_WindowArgs*',
+'Window' => 'tde_Window*',
+'Window*' => 'tde_Window*',
+'WindowArgs&' => 'tde_WindowArgs*',
+'WindowArgs*' => 'tde_WindowArgs*',
 'WindowsVersion'  =>  'int' ,
 'XrmOptionDescRec*'  =>  'XrmOptionDescRec*' ,
 'array_data*'  =>  'void*' ,
@@ -2648,13 +2648,13 @@ BEGIN
 'char*' => 'char*',
 'char**' => 'char**',
 'char*xpm[]'  =>  'char**' ,
-'classConnection*' => 'kde_classConnection*',
-'classDeviceManager*' => 'kde_classDeviceManager*',
-'classExtensionLoader*' => 'kde_classExtensionLoader*',
-'classMidiStatus*' => 'kde_classMidiStatus*',
-'classObjectReference' => 'kde_classObjectReference*',
-'classTQPainter*' => 'kde_classTQPainter*',
-'classStartupClass*' => 'kde_classStartupClass*',
+'classConnection*' => 'tde_classConnection*',
+'classDeviceManager*' => 'tde_classDeviceManager*',
+'classExtensionLoader*' => 'tde_classExtensionLoader*',
+'classMidiStatus*' => 'tde_classMidiStatus*',
+'classObjectReference' => 'tde_classObjectReference*',
+'classTQPainter*' => 'tde_classTQPainter*',
+'classStartupClass*' => 'tde_classStartupClass*',
 'double d .0' => 'double',
 'double nDefault .0' => 'double',
 'double pri .0' => 'double',
@@ -2675,10 +2675,10 @@ BEGIN
 'int' => 'int',
 'int*' => 'int*',
 'int short' => 'short',
-'kdbgstream&'  => 'kde_Kdbgstream*' ,
-'kdbgstream*'  =>  'kde_kdbgstream*',
+'kdbgstream&'  => 'tde_Kdbgstream*' ,
+'kdbgstream*'  =>  'tde_kdbgstream*',
 'kndbgstream&'  => 'void**' ,
-'kndbgstream*'  =>  'kde_kndbgstream*',
+'kndbgstream*'  =>  'tde_kndbgstream*',
 'ksockaddr_in*'  => 'void*' ,
 'long _blockSize*' => 'long*',
 'long int' => 'long',
@@ -2689,18 +2689,18 @@ BEGIN
 'longint' => 'long',
 'longunsigned int' => 'unsigned long',
 'lt_dlhandle'  =>  'void*' ,
-'lt_user_dlloader*'  =>  'kde_lt_user_dlloader*',
+'lt_user_dlloader*'  =>  'tde_lt_user_dlloader*',
 'mcopbyte&' => 'void*',
 'mcopbyte' => 'unsigned char',
 'mode_t _mode (mode_t) -1' => 'int',
 'mode_t'  =>  'long' ,
-'noteCmd' => 'kde_noteCmd*',
-'noteCmd*' => 'kde_noteCmd*',
+'noteCmd' => 'tde_noteCmd*',
+'noteCmd*' => 'tde_noteCmd*',
 'ostream&' => 'int',
 'ostream*' => 'int',
 'pid_t'  =>  'long' ,
-'poTime&' => 'kde_poTime*',
-'poTime*' => 'kde_poTime*',
+'poTime&' => 'tde_poTime*',
+'poTime*' => 'tde_poTime*',
 'short unsigned' => 'short',
 'short' => 'short',
 'short*' => 'short*',
@@ -2714,7 +2714,7 @@ BEGIN
 'size_type'  =>  'int' ,
 'snd_seq_event_t*' => 'int*',
 'ssize_t' => 'int',
-'std*' => 'kde_std*',
+'std*' => 'tde_std*',
 'std::string&'  =>  'char*' ,
 'std::string'  =>  'char*' ,
 'time_t'  =>  'long' ,
@@ -2762,46 +2762,46 @@ BEGIN
 'TQValueList<TQString>&' => 'qt_QStringValueList*',
 'TQValueList<TQVariant>&' => 'qt_QVariantValueList*',
 'TQValueList<TQUrlInfo>*' => 'qt_QUrlInfoValueList*',
-'TQValueList<KDataToolInfo>&' => 'kde_KDataToolInfoValueList*',
+'TQValueList<KDataToolInfo>&' => 'tde_KDataToolInfoValueList*',
 'TQPtrList<TQDockWindow>*' => 'qt_QDockWindowPtrList*',
 'TQPtrList<TQPixmap>' => 'qt_QPixmapPtrList*',
 'TQPtrList<TQPoint>' => 'qt_QPointPtrList*',
-'ClassContext*' => 'kde_ClassContext*',
-'ClassStoreIface*' => 'kde_ClassStoreIface*',
-'ClipboardDocumentIface*' => 'kde_ClipboardDocumentIface*',
-'CodeCompletionDocumentIface*' => 'kde_CodeCompletionDocumentIface*',
-'CursorDocumentIface*' => 'kde_CursorDocumentIface*',
-'DebugDocumentIface*' => 'kde_DebugDocumentIface*',
-'DocumentInterface*' => 'kde_DocumentInterface*',
-'EditDocumentIface*' => 'kde_EditDocumentIface*',
-'EditorInterface*' => 'kde_EditorInterface*',
-'FileContext*' => 'kde_FileContext*',
-'KDevAppFrontendIface*' => 'kde_KDevAppFrontendIface*',
-'KDevCoreIface*' => 'kde_KDevCoreIface*',
-'KDevMakeFrontendIface*' => 'kde_KDevMakeFrontendIface*',
-'KEditor*' => 'kde_KEditor*',
-'KEditor::Document*' => 'kde_Document*',
-'ParsedClassContainer&' => 'kde_ParsedClassContainer*',
-'ParsedContainer&' => 'kde_ParsedContainer*',
-'ParsedScopeContainer&' => 'kde_ParsedScopeContainer*',
-'TQValueList<ParsedMethod>*' => 'kde_ParsedMethodList*',
-'TQValueList<CompletionEntry>' => 'kde_CompletionEntryValueList*',
-'StatusDocumentIface*' => 'kde_StatusDocumentIface*',
-'UndoDocumentIface*' => 'kde_UndoDocumentIface*',
-'TDEShortcut&' => 'kde_TDEShortcut*',
-'TDEShortcut' => 'kde_TDEShortcut*',
-'TDEShortcut*' => 'kde_TDEShortcut*',
-'KKey&' => 'kde_KKey*',
-'KKey*' => 'kde_KKey*',
-'KKeyNative&' => 'kde_KKeyNative*',
-'KKeyNative*' => 'kde_KKeyNative*',
-'KKeyVariations&' => 'kde_KKeyVariations*',
-'KKeyVariations*' => 'kde_KKeyVariations*',
-'KKeyX11&' => 'kde_KKeyX11*',
-'KKeyX11' => 'kde_KKeyX11*',
-'KKeyX11*' => 'kde_KKeyX11*',
-'TDEAccelActions' => 'kde_TDEAccelActions*',
-'KRandomSequence&' => 'kde_KRandomSequence*',
+'ClassContext*' => 'tde_ClassContext*',
+'ClassStoreIface*' => 'tde_ClassStoreIface*',
+'ClipboardDocumentIface*' => 'tde_ClipboardDocumentIface*',
+'CodeCompletionDocumentIface*' => 'tde_CodeCompletionDocumentIface*',
+'CursorDocumentIface*' => 'tde_CursorDocumentIface*',
+'DebugDocumentIface*' => 'tde_DebugDocumentIface*',
+'DocumentInterface*' => 'tde_DocumentInterface*',
+'EditDocumentIface*' => 'tde_EditDocumentIface*',
+'EditorInterface*' => 'tde_EditorInterface*',
+'FileContext*' => 'tde_FileContext*',
+'KDevAppFrontendIface*' => 'tde_KDevAppFrontendIface*',
+'KDevCoreIface*' => 'tde_KDevCoreIface*',
+'KDevMakeFrontendIface*' => 'tde_KDevMakeFrontendIface*',
+'KEditor*' => 'tde_KEditor*',
+'KEditor::Document*' => 'tde_Document*',
+'ParsedClassContainer&' => 'tde_ParsedClassContainer*',
+'ParsedContainer&' => 'tde_ParsedContainer*',
+'ParsedScopeContainer&' => 'tde_ParsedScopeContainer*',
+'TQValueList<ParsedMethod>*' => 'tde_ParsedMethodList*',
+'TQValueList<CompletionEntry>' => 'tde_CompletionEntryValueList*',
+'StatusDocumentIface*' => 'tde_StatusDocumentIface*',
+'UndoDocumentIface*' => 'tde_UndoDocumentIface*',
+'TDEShortcut&' => 'tde_TDEShortcut*',
+'TDEShortcut' => 'tde_TDEShortcut*',
+'TDEShortcut*' => 'tde_TDEShortcut*',
+'KKey&' => 'tde_KKey*',
+'KKey*' => 'tde_KKey*',
+'KKeyNative&' => 'tde_KKeyNative*',
+'KKeyNative*' => 'tde_KKeyNative*',
+'KKeyVariations&' => 'tde_KKeyVariations*',
+'KKeyVariations*' => 'tde_KKeyVariations*',
+'KKeyX11&' => 'tde_KKeyX11*',
+'KKeyX11' => 'tde_KKeyX11*',
+'KKeyX11*' => 'tde_KKeyX11*',
+'TDEAccelActions' => 'tde_TDEAccelActions*',
+'KRandomSequence&' => 'tde_KRandomSequence*',
 'TDEIcon::Context' => 'int',
 'TDEIcon::Group' => 'int',
 );