Update kalyptus according to tdebindings

1 files changed, 333 insertions, 333 deletions

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";
 		}
 	}