Update embedded kalyptus installation

1 files changed, 854 insertions, 915 deletions

diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 8ba1996..586ddf3 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -1,5 +1,5 @@
 #***************************************************************************
-#                            kalyptusDataDict.pm -  A TQt/KDE types data dictionary
+#                            kalyptusDataDict.pm -  A Qt/KDE types data dictionary
 #                             -------------------
 #    begin                : Fri Oct 20 12:00:00 2000
 #    copyright            : (C) 2000-2001 Lost Highway Ltd. All Rights Reserved.
@@ -27,6 +27,7 @@ BEGIN
 {
 
 %interfacemap = (
+'TQGL' => 'TQGLInterface',
 'TQPaintDevice' => 'TQPaintDeviceInterface',
 'TQMenuData' => 'TQMenuDataInterface',
 'TQRangeControl' => 'TQRangeControlInterface',
@@ -54,9 +55,9 @@ BEGIN
 
 );
 
-# A hard coded type translation table (the idea from the Roberto Alsina's TQtc
+# A hard coded type translation table (the idea from the Roberto Alsina's Qtc
 # python conversion scripts). The particular format used here makes it possible to use
-# the same table with three different kdoc based TQt/KDE language binding generators;
+# the same table with three different kdoc based Qt/KDE language binding generators;
 # C, Objective-C and Java.
 %ctypemap = (
 
@@ -135,8 +136,6 @@ BEGIN
 'AudioSubSystemStart*' => 'kde_AudioSubSystemStart*',
 'AuthAccept&' => 'kde_AuthAccept*',
 'AuthAccept*' => 'kde_AuthAccept*',
-'AuthInfo&' => 'kde_AuthInfo*',
-'AuthInfo*' => 'kde_AuthInfo*',
 'BGMode' => 'int',
 'BMToken*' => 'kde_BMToken*',
 'BackgroundMode' => 'int',
@@ -274,7 +273,6 @@ BEGIN
 'Cursor*' => 'kde_Cursor*',
 'CursorInterface*' => 'kde_CursorInterface*',
 'DCOPClient*' => 'kde_DCOPClient*',
-'DCOPClientTransaction*'  =>  'kde_DCOPClientTransaction*' ,
 'DCOPObject*' => 'kde_DCOPObject*',
 'DCOPObjectProxy*' => 'kde_DCOPObjectProxy*',
 'DCOPRef&'  =>  'kde_DCOPRef*' ,
@@ -284,23 +282,25 @@ BEGIN
 'DOM::CSSProperty*'  =>  'kde_CSSProperty*' ,
 'DOM::DOMString&'  =>  'kde_DOMString*' ,
 'DOM::DOMString'  =>  'kde_DOMString*' ,
-'DOM::Document&'  =>  'kde_DOMDocument*' ,
-'DOM::Document'  =>  'kde_DOMDocument*' ,
-'DOM::Document*'  =>  'kde_DOMDocument*' ,
-'DOM::ElementImpl*'  =>  'kde_DOM_ElementImpl*' ,
+'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::MediaList*' => 'kde_MediaList*',
-'DOM::Node&'  =>  'kde_DOMNode*' ,
-'DOM::Node'  =>  'kde_DOMNode*' ,
+'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*',
 'DOM::StyleSheetList*' => 'kde_StyleSheetList*',
+'StyleSheetList&' => 'kde_StyleSheetList*',
+'StyleSheetList' => 'kde_StyleSheetList*',
+'StyleSheetList*' => 'kde_StyleSheetList*',
 'DOMException&' => 'kde_DOMException*',
 'DOMException*' => 'kde_DOMException*',
 'DOMImplementation&' => 'kde_DOMImplementation*',
@@ -322,8 +322,6 @@ BEGIN
 'Direction' => 'int',
 'DispatchFunction' => 'kde_DispatchFunction*',
 'Dispatcher*' => 'kde_Dispatcher*',
-'Display' => 'Display',
-'Display*' => 'Display*',
 'DistributionList*' => 'kde_DistributionList*',
 'DistributionListEditor*' => 'kde_DistributionListEditor*',
 'DistributionListManager*' => 'kde_DistributionListManager*',
@@ -412,7 +410,6 @@ BEGIN
 'Element&' => 'kde_Element*',
 'Element' => 'kde_Element*',
 'Element*' => 'kde_Element*',
-'ElementImpl*' => 'kde_ElementImpl*',
 'EmailSelectDialog*' => 'kde_EmailSelectDialog*',
 'EncoderFn'  =>  'int' ,
 'Endian' => 'int',
@@ -434,7 +431,6 @@ BEGIN
 'ExecState*' => 'kde_ExecState*',
 'ExtensionLoader*' => 'kde_ExtensionLoader*',
 'FALSE' => '0',
-'FILE*' => 'FILE*',
 'FMOut*' => 'kde_FMOut*',
 'Factory*' => 'kde_Factory*',
 'False' => '0',
@@ -486,12 +482,12 @@ BEGIN
 'GlobalComm_skel*' => 'kde_GlobalComm_skel*',
 'GlobalComm_stub*' => 'kde_GlobalComm_stub*',
 'HANDLE' => 'unsigned int',
-'HBITMAP'  =>  'void *' ,
-'HCURSOR'  =>  'void *' ,
-'HDC'  =>  'void *' ,
-'HFONT'  =>  'void *' ,
-'HPALETTE'  =>  'void *' ,
-'HRGN'  =>  'void *' ,
+'HBITMAP'  =>  'void*' ,
+'HCURSOR'  =>  'void*' ,
+'HDC'  =>  'void*' ,
+'HFONT'  =>  'void*' ,
+'HPALETTE'  =>  'void*' ,
+'HRGN'  =>  'void*' ,
 'HTMLAnchorElement&' => 'kde_HTMLAnchorElement*',
 'HTMLAnchorElement*' => 'kde_HTMLAnchorElement*',
 'HTMLAnchorElementImpl*' => 'kde_HTMLAnchorElementImpl*',
@@ -762,7 +758,6 @@ BEGIN
 'KCharSelectTable*' => 'kde_KCharSelectTable*',
 'KCharsets*'  =>  'kde_KCharsets*' ,
 'KCmdLineArgs*'  =>  'kde_KCmdLineArgs*' ,
-'KCmdLineOptions*'  => 'kde_KCmdLineOptions*' ,
 'KCodecs*' => 'kde_KCodecs*',
 'KColor&'  => 'kde_KColor*' ,
 'KColor*' => 'kde_KColor*',
@@ -778,13 +773,11 @@ BEGIN
 'KCommandHistory*' => 'kde_KCommandHistory*',
 'KCompletion*'  =>  'kde_KCompletion*' ,
 'KCompletionBase*' => 'kde_KCompletionBase*',
-'KCompletionBase::KeyBindingType'  => 'kde_KCompletionBase_KeyBindingType*' ,
 'KCompletionBox*' => 'kde_KCompletionBox*',
 'KConfig*'  => 'kde_KConfig*' ,
 'KConfigBackEnd*' => 'kde_KConfigBackEnd*',
 'KConfigBase&' => 'kde_KConfigBase*',
 'KConfigBase*'  => 'kde_KConfigBase*' ,
-'KConfigBase::ConfigState'  => 'kde_KConfigBase_ConfigState' ,
 'KConfigGroup*' => 'kde_KConfigGroup*',
 'KConfigGroupSaver*' => 'kde_KConfigGroupSaver*',
 'KConfigINIBackEnd*' => 'kde_KConfigINIBackEnd*',
@@ -794,13 +787,12 @@ BEGIN
 'KCookie*' => 'kde_KCookie*',
 'KCrash*' => 'kde_KCrash*',
 'KCursor*' => 'kde_KCursor*',
-'KDBGFUNC'  => 'void *' ,
+'KDBGFUNC'  => 'void*' ,
 'KDCOPActionProxy*' => 'kde_KDCOPActionProxy*',
 'KDCOPPropertyProxy*' => 'kde_KDCOPPropertyProxy*',
 'KDEAniMenu*' => 'kde_KDEAniMenu*',
 'KDEDModule*' => 'kde_KDEDModule*',
 'KDEDesktopMimeType*' => 'kde_KDEDesktopMimeType*',
-'KDEDesktopMimeType::Service&'  => 'kde_KDEDesktopMimeType_Service*' ,
 'KDESasl*' => 'kde_KDESasl*',
 'KDEStyle*' => 'kde_KDEStyle*',
 'KDEsuClient*' => 'kde_KDEsuClient*',
@@ -830,7 +822,6 @@ BEGIN
 'KDialogBase*'  =>  'kde_KDialogBase*' ,
 'KDialogBaseTile*' => 'kde_KDialogBaseTile*',
 'KDialogQueue*' => 'kde_KDialogQueue*',
-'KDirLister*' => 'kde_KDirLister*',
 'KDirNotify*' => 'kde_KDirNotify*',
 'KDirNotify_stub*' => 'kde_KDirNotify_stub*',
 'KDirOperator*' => 'kde_KDirOperator*',
@@ -868,11 +859,8 @@ BEGIN
 'KEntry*' => 'kde_KEntry*',
 'KEntryKey&'  => 'kde_KEntryKey*' ,
 'KEntryKey*' => 'kde_KEntryKey*',
-'KEntryMap'  => 'kde_KEntryMap*' ,
-'KEntryMap*'  => 'kde_KEntryMap*' ,
 'KExecMimeType*' => 'kde_KExecMimeType*',
 'KExecPropsPlugin*' => 'kde_KExecPropsPlugin*',
-'KExtendedSocket*' => 'kde_KExtendedSocket*',
 'KFile*' => 'kde_KFile*',
 'KFile::FileView'  => 'int' ,
 'KFile::Mode'  => 'int' ,
@@ -886,8 +874,6 @@ BEGIN
 'KFileFilterCombo*' => 'kde_KFileFilterCombo*',
 'KFileIconView*' => 'kde_KFileIconView*',
 'KFileIconViewItem*' => 'kde_KFileIconViewItem*',
-'KFileItem&' => 'kde_KFileItem*',
-'KFileItem*'  => 'kde_KFileItem*' ,
 'KFileItemList&'  => 'kde_KFileItemList*' ,
 'KFileItemList'  => 'kde_KFileItemList*' ,
 'KFileItemList*'  => 'kde_KFileItemList*' ,
@@ -943,19 +929,15 @@ BEGIN
 'KHelpMenu*' => 'kde_KHelpMenu*',
 'KHistoryCombo*' => 'kde_KHistoryCombo*',
 'KIO*' => 'kde_KIO*',
-'KIO::AuthInfo&' => 'kde_AuthInfo*',
 'KIO::CopyJob*'  => 'kde_CopyJob*' ,
 'KIO::DeleteJob*'  => 'kde_DeleteJob*' ,
 'KIO::Job*'  => 'kde_Job*' ,
 'KIO::ListJob*'  => 'kde_ListJob*' ,
-'KIO::MetaData&' => 'kde_MetaData*',
 'KIO::RenameDlg_Mode' => 'int',
 'KIO::RenameDlg_Result' => 'int',
 'KIO::SimpleJob*' => 'kde_SimpleJob*',
 'KIO::SkipDlg_Result' => 'int',
 'KIO::Slave*' => 'kde_Slave*',
-'KIO::UDSEntry&'  => 'kde_UDSEntry*' ,
-'KIO::UDSEntryList&'  => 'kde_UDSEntryList*' ,
 'KIOInputStream&' => 'kde_KIOInputStream*',
 'KIOInputStream*' => 'kde_KIOInputStream*',
 'KIOTestSlow&' => 'kde_KIOTestSlow*',
@@ -970,14 +952,11 @@ BEGIN
 'KIconEffect*'  =>  'kde_KIconEffect*' ,
 'KIconLoader*'  => 'kde_KIconLoader*' ,
 'KIconSelectAction*' => 'kde_KIconSelectAction*',
-'KIconTheme*'  => 'kde_KIconTheme*' ,
 'KIconView*' => 'kde_KIconView*',
 'KIconViewItem*' => 'kde_KIconViewItem*',
 'KImageEffect*' => 'kde_KImageEffect*',
 'KImageFilePreview*' => 'kde_KImageFilePreview*',
 'KImageIO*' => 'kde_KImageIO*',
-'KInetSocketAddress&' => 'kde_KInetSocketAddress*',
-'KInetSocketAddress*' => 'kde_KInetSocketAddress*',
 'KInstance&'  => 'kde_KInstance*' ,
 'KInstance'  => 'kde_KInstance*' ,
 'KInstance*'  => 'kde_KInstance*' ,
@@ -992,14 +971,7 @@ BEGIN
 'KJSO*' => 'kde_KJSO*',
 'KJScript*' => 'kde_KJScript*',
 'KJanusWidget*' => 'kde_KJanusWidget*',
-'KJavaApplet*'  =>  'kde_KJavaApplet*' ,
-'KJavaAppletContext*'  => 'kde_KJavaAppletContext*' ,
-'KJavaAppletServer*'  =>  'kde_KJavaAppletServer*' ,
-'KJavaAppletWidget*' => 'kde_KJavaAppletWidget*',
-'KJavaProcess*' => 'kde_KJavaProcess*',
-'KJavaScriptAdvice&'  => 'kde_KJavaScriptAdvice*' ,
 'KKeyChooser*' => 'kde_KKeyChooser*',
-'KKeyChooserItem*' => 'kde_KKeyChooserItem*',
 'KKeyDialog*' => 'kde_KKeyDialog*',
 'KKeyEntry&'  => 'kde_KKeyEntry*' ,
 'KKeyEntry*' => 'kde_KKeyEntry*',
@@ -1016,10 +988,8 @@ BEGIN
 'KLed*' => 'kde_KLed*',
 'KLibFactory*'  =>  'kde_KLibFactory*' ,
 'KLibLoader*'  =>  'kde_KLibLoader*' ,
-'KLibrary*'  => 'kde_KLibrary*' ,
 'KLineEdit*'  =>  'kde_KLineEdit*' ,
 'KLineEditDlg*' => 'kde_KLineEditDlg*',
-'KListAction*' => 'kde_KListAction*',
 'KListBox*' => 'kde_KListBox*',
 'KListView*'  => 'kde_KListView*' ,
 'KListViewItem*' => 'kde_KListViewItem*',
@@ -1033,7 +1003,6 @@ BEGIN
 'KMPrinter*' => 'kde_KMPrinter*',
 'KMPrinterList*' => 'kde_KMPrinterList*',
 'KMPrinterPage*' => 'kde_KMPrinterPage*',
-'KMacroCommand*' => 'kde_KMacroCommand*',
 'KMainWindow*' => 'kde_KMainWindow*',
 'KMainWindowInterface*' => 'kde_KMainWindowInterface*',
 'KMenuBar*'  => 'kde_KMenuBar*' ,
@@ -1042,13 +1011,10 @@ BEGIN
 'KMimeMagic*'  =>  'kde_KMimeMagic*' ,
 'KMimeMagicResult*'  => 'kde_KMimeMagicResult*' ,
 'KMimeSourceFactory*'  => 'kde_KMimeSourceFactory*' ,
-'KMimeType*' => 'kde_KMimeType*',
 'KMimeType::List&'  => 'kde_KMimeType_List*' ,
-'KMimeType::Ptr&'  => 'kde_KMimeType_Ptr*' ,
-'KMimeType::Ptr'  => 'kde_KMimeType_Ptr' ,
 'KMouseSettings*' => 'kde_KMouseSettings*',
 'KMultipleDrag*' => 'kde_KMultipleDrag*',
-'KNDBGFUNC'  => 'void *' ,
+'KNDBGFUNC'  => 'void*' ,
 'KNotifyClient*' => 'kde_KNotifyClient*',
 'KNumInput*'  => 'kde_KNumInput*' ,
 'KOCRDialog*' => 'kde_KOCRDialog*',
@@ -1069,10 +1035,7 @@ BEGIN
 'KParts::BrowserExtension*'  => 'kde_BrowserExtension*' ,
 'KParts::GUIActivateEvent*'  => 'kde_GUIActivateEvent*' ,
 'KParts::Part*' => 'kde_Part*',
-'KParts::PartManager*'  => 'kde_PartManager*' ,
 'KParts::ReadOnlyPart*'  => 'kde_ReadOnlyPart*' ,
-'KParts::URLArgs&'  => 'kde_URLArgs*' ,
-'KParts::URLArgs' => 'kde_URLArgs*',
 'KPasswordDialog*' => 'kde_KPasswordDialog*',
 'KPasswordEdit*' => 'kde_KPasswordEdit*',
 'KPixmap&'  => 'kde_KPixmap*' ,
@@ -1107,7 +1070,6 @@ BEGIN
 'KRadioAction*' => 'kde_KRadioAction*',
 'KRandomSequence*' => 'kde_KRandomSequence*',
 'KRecentDocument*' => 'kde_KRecentDocument*',
-'KRecentFilesAction*'  =>  'kde_KRecentFilesAction*' ,
 'KRegExp*' => 'kde_KRegExp*',
 'KRegExpEditor*' => 'kde_KRegExpEditor*',
 'KRegExpEditorInterface*' => 'kde_KRegExpEditorInterface*',
@@ -1136,7 +1098,7 @@ BEGIN
 'KSSLConnectionInfo*' => 'kde_KSSLConnectionInfo*',
 'KSSLInfoDlg*' => 'kde_KSSLInfoDlg*',
 'KSSLKeyGen*' => 'kde_KSSLKeyGen*',
-'KSSLKeyType' => 'kde_KSSLKeyType',
+'KSSLKeyType' => 'int',
 'KSSLPKCS12*' => 'kde_KSSLPKCS12*',
 'KSSLPKCS7*' => 'kde_KSSLPKCS7*',
 'KSSLPeerInfo&' => 'kde_KSSLPeerInfo*',
@@ -1157,11 +1119,8 @@ BEGIN
 'KSelectAction*' => 'kde_KSelectAction*',
 'KSelector*' => 'kde_KSelector*',
 'KSeparator*' => 'kde_KSeparator*',
-'KServerSocket*' => 'kde_KServerSocket*',
 'KService&'  => 'kde_KService*' ,
 'KService*' => 'kde_KService*',
-'KService::List'  => 'kde_KService_List*' ,
-'KService::Ptr'  => 'kde_KService_Ptr*' ,
 'KServiceGroup*' => 'kde_KServiceGroup*',
 'KServiceOffer&'  => 'kde_KServiceOffer*' ,
 'KServiceOffer*' => 'kde_KServiceOffer*',
@@ -1170,7 +1129,6 @@ BEGIN
 'KSessionManaged*' => 'kde_KSessionManaged*',
 'KShared&'  => 'kde_KShared*' ,
 'KShared*' => 'kde_KShared*',
-'KSharedPixmap*' => 'kde_KSharedPixmap*',
 'KSharedPtr&'  => 'kde_KSharedPtr*' ,
 'KSharedPtr*' => 'kde_KSharedPtr*',
 'KShellCompletion*' => 'kde_KShellCompletion*',
@@ -1182,10 +1140,6 @@ BEGIN
 'KSimpleConfig&'  => 'kde_KSimpleConfig*' ,
 'KSimpleConfig*' => 'kde_KSimpleConfig*',
 'KSimpleFileFilter*' => 'kde_KSimpleFileFilter*',
-'KSocket*' => 'kde_KSocket*',
-'KSocketAddress&' => 'kde_KSocketAddress*',
-'KSocketAddress*' => 'kde_KSocketAddress*',
-'KSocks*' => 'kde_KSocks*',
 'KSpell*' => 'kde_KSpell*',
 'KSpellConfig&'  => 'kde_KSpellConfig*' ,
 'KSpellConfig'  => 'kde_KSpellConfig*' ,
@@ -1212,10 +1166,9 @@ BEGIN
 'KStyle*'  => 'kde_KStyle*' ,
 'KSycoca*'  =>  'kde_KSycoca*' ,
 'KSycocaEntry*'  => 'kde_KSycocaEntry*' ,
-'KSycocaFactory*'  => 'kde_KSycocaFactory*' ,
-'KSycocaFactoryId'  => 'kde_KSycocaFactoryId' ,
-'KSycocaType&'  => 'kde_KSycocaType*' ,
-'KSycocaType'  => 'kde_KSycocaType*' ,
+'KSycocaFactoryId'  => 'int' ,
+'KSycocaType&'  => 'int' ,
+'KSycocaType'  => 'int' ,
 'KSystemTray*' => 'kde_KSystemTray*',
 'KTMainWindow*' => 'kde_KTMainWindow*',
 'KTabButton*' => 'kde_KTabButton*',
@@ -1265,6 +1218,10 @@ BEGIN
 '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*',
@@ -1301,9 +1258,6 @@ BEGIN
 'Keymap*' => 'kde_Keymap*',
 'LinkStyle&' => 'kde_LinkStyle*',
 'LinkStyle*' => 'kde_LinkStyle*',
-'List&' => 'kde_List*',
-'List' => 'kde_List',
-'List*' => 'kde_List*',
 'ListIterator&' => 'kde_ListIterator*',
 'ListIterator' => 'kde_ListIterator',
 'ListIterator*' => 'kde_ListIterator*',
@@ -1313,7 +1267,6 @@ BEGIN
 'Lookup*' => 'kde_Lookup*',
 'MCOPConfig*' => 'kde_MCOPConfig*',
 'MCOPUtils*' => 'kde_MCOPUtils*',
-'MSG*'  =>  'MSG*' ,
 'MailServer&'  =>  'MailServer*' ,
 'MailServer*' => 'kde_MailServer*',
 'MainWindow*' => 'kde_MainWindow*',
@@ -1323,7 +1276,7 @@ BEGIN
 'MediaDataPacket*' => 'kde_MediaDataPacket*',
 'MediaFrame*' => 'kde_MediaFrame*',
 'MediaList&' => 'kde_MediaList*',
-'MediaList' => 'kde_MediaList',
+'MediaList' => 'kde_MediaList*',
 'MediaList*' => 'kde_MediaList*',
 'MediaListImpl*' => 'kde_MediaListImpl*',
 'MediaModule&' => 'kde_MediaModule*',
@@ -1333,9 +1286,6 @@ BEGIN
 'MediaModule_skel*' => 'kde_MediaModule_skel*',
 'MediaModule_stub*' => 'kde_MediaModule_stub*',
 'MenuDockData*' => 'kde_MenuDockData*',
-'MetaData&' => 'kde_MetaData*',
-'MetaData' => 'kde_MetaData*',
-'MetaData*' => 'kde_MetaData*',
 'MethodDef&' => 'kde_MethodDef*',
 'MethodDef*' => 'kde_MethodDef*',
 'MidiEvent*' => 'kde_MidiEvent*',
@@ -1383,9 +1333,9 @@ BEGIN
 'NamedNodeMapImpl*' => 'kde_NamedNodeMapImpl*',
 'NetAccess*' => 'kde_NetAccess*',
 'NetRC*' => 'kde_NetRC*',
-'Node&' => 'kde_DOMNode*',
-'Node' => 'kde_DOMNode*',
-'Node*' => 'kde_DOMNode*',
+'Node&' => 'kde_Node*',
+'Node' => 'kde_Node*',
+'Node*' => 'kde_Node*',
 'NodeFilter&' => 'kde_NodeFilter*',
 'NodeFilter' => 'kde_NodeFilter*',
 'NodeFilter*' => 'kde_NodeFilter*',
@@ -1424,6 +1374,7 @@ BEGIN
 'Object_stub*' => 'kde_Object_stub*',
 'Observer*' => 'kde_Observer*',
 'OfferList'  =>  'kde_OfferList*' ,
+'KTrader::OfferList'  =>  'kde_OfferList*' ,
 'Offset' => 'int',
 'OnewayDispatchFunction' => 'kde_OnewayDispatchFunction*',
 'OnewayInvocation&' => 'kde_OnewayInvocation*',
@@ -1453,7 +1404,6 @@ BEGIN
 'Part*' => 'kde_Part*',
 'PartActivateEvent*' => 'kde_PartActivateEvent*',
 'PartBase*' => 'kde_PartBase*',
-'PartManager*' => 'kde_PartManager*',
 'PartSelectEvent*' => 'kde_PartSelectEvent*',
 'PassDlg*' => 'kde_PassDlg*',
 'PasswordDialog*' => 'kde_PasswordDialog*',
@@ -1505,851 +1455,841 @@ BEGIN
 'ProgressItem*' => 'kde_ProgressItem*',
 'PropagationMode' => 'int',
 'ProtocolInfo*' => 'kde_ProtocolInfo*',
-'Ptr' => 'void *',
+'Ptr' => 'void*',
 'PtyProcess*' => 'kde_PtyProcess*',
-'TQAccel*' => 'qt_TQAccel*',
-'TQAccessible*' => 'qt_TQAccessible*',
-'TQAccessibleFactoryInterface*' => 'qt_TQAccessibleFactoryInterface*',
-'TQAccessibleInterface*' => 'qt_TQAccessibleInterface*',
-'TQAccessibleInterface**' => 'qt_TQAccessibleInterface**',
-'TQAccessibleObject*' => 'qt_TQAccessibleObject*',
-'TQAction*'  =>  'qt_TQAction*' ,
-'TQActionGroup*' => 'qt_TQActionGroup*',
-'TQApplication*'  => 'qt_TQApplication*' ,
-'TQArabicCodec*' => 'qt_TQArabicCodec*',
-'TQArray*' => 'qt_TQArray*',
-'TQAsciiBucket*' => 'qt_TQAsciiBucket*',
-'TQAsciiCache*' => 'qt_TQAsciiCache*',
-'TQAsciiCacheIterator*' => 'qt_TQAsciiCacheIterator*',
-'TQAsciiDict*' => 'qt_TQAsciiDict*',
-'TQAsciiDictIterator*' => 'qt_TQAsciiDictIterator*',
-'TQAsyncIO*' => 'qt_TQAsyncIO*',
-'TQAuBucket*'  =>  'qt_TQAuBucket*' ,
-'TQAuServer*' => 'qt_TQAuServer*',
-'TQBaseBucket*'  =>  'qt_TQBaseBucket*' ,
-'TQBig5Codec*' => 'qt_TQBig5Codec*',
-'TQBitArray&'  => 'qt_TQBitArray*' ,
-'TQBitArray'  => 'qt_TQBitArray*' ,
-'TQBitArray*'  =>  'qt_TQBitArray*' ,
-'TQBitVal&'  => 'qt_TQBitVal*' ,
-'TQBitVal'  => 'qt_TQBitVal*' ,
-'TQBitVal*' => 'qt_TQBitVal*',
-'TQBitmap&' => 'qt_TQBitmap *',
-'TQBitmap' => 'qt_TQBitmap *',
-'TQBitmap*' => 'qt_TQBitmap *',
-'TQBoxLayout*' => 'qt_TQBoxLayout*',
-'TQBrush&' => 'qt_TQBrush *',
-'TQBrush'  =>  'qt_TQBrush*' ,
-'TQBrush*'  => 'qt_TQBrush*' ,
-'TQBrushData*' => 'qt_TQBrushData*',
-'TQBuffer*' => 'qt_TQBuffer*',
-'TQButton*' => 'qt_TQButton *',
-'TQButtonGroup*'  =>  'qt_TQButtonGroup*' ,
-'TQByteArray& arr ()' => 'qt_TQByteArray*',
-'TQByteArray&'  => 'qt_TQByteArray*' ,
-'TQByteArray' => 'qt_TQByteArray*',
-'TQByteArray*' => 'qt_TQByteArray*',
-'TQCDEStyle*' => 'qt_TQCDEStyle*',
+'TQAccel*' => 'qt_QAccel*',
+'TQAccessible*' => 'qt_QAccessible*',
+'TQAccessibleFactoryInterface*' => 'qt_QAccessibleFactoryInterface*',
+'TQAccessibleInterface*' => 'qt_QAccessibleInterface*',
+'TQAccessibleInterface**' => 'qt_QAccessibleInterface**',
+'TQAccessibleObject*' => 'qt_QAccessibleObject*',
+'TQAction*'  =>  'qt_QAction*' ,
+'TQActionGroup*' => 'qt_QActionGroup*',
+'TQApplication*'  => 'qt_QApplication*' ,
+'TQArabicCodec*' => 'qt_QArabicCodec*',
+'TQArray*' => 'qt_QArray*',
+'TQAsciiBucket*' => 'qt_QAsciiBucket*',
+'TQAsciiCache*' => 'qt_QAsciiCache*',
+'TQAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*',
+'TQAsciiDict*' => 'qt_QAsciiDict*',
+'TQAsciiDictIterator*' => 'qt_QAsciiDictIterator*',
+'TQAsyncIO*' => 'qt_QAsyncIO*',
+'TQAuBucket*'  =>  'qt_QAuBucket*' ,
+'TQAuServer*' => 'qt_QAuServer*',
+'TQBaseBucket*'  =>  'qt_QBaseBucket*' ,
+'TQBig5Codec*' => 'qt_QBig5Codec*',
+'TQBitArray&'  => 'qt_QBitArray*' ,
+'TQBitArray'  => 'qt_QBitArray*' ,
+'TQBitArray*'  =>  'qt_QBitArray*' ,
+'TQBitVal&'  => 'qt_QBitVal*' ,
+'TQBitVal'  => 'qt_QBitVal*' ,
+'TQBitVal*' => 'qt_QBitVal*',
+'TQBitmap&' => 'qt_QBitmap*',
+'TQBitmap' => 'qt_QBitmap*',
+'TQBitmap*' => 'qt_QBitmap*',
+'TQBoxLayout*' => 'qt_QBoxLayout*',
+'TQBrush&' => 'qt_QBrush*',
+'TQBrush'  =>  'qt_QBrush*' ,
+'TQBrush*'  => 'qt_QBrush*' ,
+'TQBrushData*' => 'qt_QBrushData*',
+'TQBuffer*' => 'qt_QBuffer*',
+'TQButton*' => 'qt_QButton*',
+'TQButtonGroup*'  =>  'qt_QButtonGroup*' ,
+'TQByteArray& arr ()' => 'qt_QByteArray*',
+'TQByteArray&'  => 'qt_QByteArray*' ,
+'TQByteArray' => 'qt_QByteArray*',
+'TQByteArray*' => 'qt_QByteArray*',
+'TQCDEStyle*' => 'qt_QCDEStyle*',
 'TQCOORD&' => 'short',
 'TQCOORD' => 'short',
-'TQCOORD*' => 'short *',
-'TQCString&'  =>  'qt_TQCString*' ,
-'TQCString'  =>  'qt_TQCString*' ,
-'TQCString*'  =>  'qt_TQCString*' ,
-'TQCStringLess*'  =>  'qt_TQCStringLess*' ,
-'TQCStringList'  => 'kde_TQCStringList*' ,
-'TQCache*' => 'qt_TQCache*',
-'TQCacheIterator*' => 'qt_TQCacheIterator*',
-'TQCanvas*'  =>  'qt_TQCanvas*' ,
-'TQCanvasEllipse*' => 'qt_TQCanvasEllipse*',
-'TQCanvasItem*'  =>  'qt_TQCanvasItem*' ,
-'TQCanvasItemList'  =>  'qt_TQCanvasItemList*' ,
-'TQCanvasItemList*' => 'qt_TQCanvasItemList*',
-'TQCanvasLine*' => 'qt_TQCanvasLine*',
-'TQCanvasPixmap*'  =>  'qt_TQCanvasPixmap*' ,
-'TQCanvasPixmapArray*'  =>  'qt_TQCanvasPixmapArray*' ,
-'TQCanvasPolygon*' => 'qt_TQCanvasPolygon*',
-'TQCanvasPolygonalItem*' => 'qt_TQCanvasPolygonalItem*',
-'TQCanvasRectangle*' => 'qt_TQCanvasRectangle*',
-'TQCanvasSpline*' => 'qt_TQCanvasSpline*',
-'TQCanvasSprite*' => 'qt_TQCanvasSprite*',
-'TQCanvasText*' => 'qt_TQCanvasText*',
-'TQCanvasView*'  =>  'qt_TQCanvasView*' ,
-'TQChain*'  => 'qt_TQChain*' ,
-'TQChar&'  =>  'qt_TQChar*' ,
-'TQChar'  =>  'qt_TQChar*' ,
-'TQChar*'  =>  'qt_TQChar*' ,
+'TQCOORD*' => 'short*',
+'TQCString&'  =>  'qt_QCString*' ,
+'TQCString'  =>  'qt_QCString*' ,
+'TQCString*'  =>  'qt_QCString*' ,
+'TQCStringLess*'  =>  'qt_QCStringLess*' ,
+'QCStringList'  => 'kde_QCStringList*' ,
+'TQCache*' => 'qt_QCache*',
+'TQCacheIterator*' => 'qt_QCacheIterator*',
+'TQCanvas*'  =>  'qt_QCanvas*' ,
+'TQCanvasEllipse*' => 'qt_QCanvasEllipse*',
+'TQCanvasItem*'  =>  'qt_QCanvasItem*' ,
+'TQCanvasItemList'  =>  'qt_QCanvasItemList*' ,
+'TQCanvasItemList*' => 'qt_QCanvasItemList*',
+'TQCanvasLine*' => 'qt_QCanvasLine*',
+'TQCanvasPixmap*'  =>  'qt_QCanvasPixmap*' ,
+'TQCanvasPixmapArray*'  =>  'qt_QCanvasPixmapArray*' ,
+'TQCanvasPolygon*' => 'qt_QCanvasPolygon*',
+'TQCanvasPolygonalItem*' => 'qt_QCanvasPolygonalItem*',
+'TQCanvasRectangle*' => 'qt_QCanvasRectangle*',
+'TQCanvasSpline*' => 'qt_QCanvasSpline*',
+'TQCanvasSprite*' => 'qt_QCanvasSprite*',
+'TQCanvasText*' => 'qt_QCanvasText*',
+'TQCanvasView*'  =>  'qt_QCanvasView*' ,
+'TQChain*'  => 'qt_QChain*' ,
 'TQChar::Category'  =>  'int' ,
 'TQChar::Decomposition'  =>  'int' ,
 'TQChar::Direction'  =>  'int' ,
 'TQChar::Joining'  =>  'int' ,
-'TQCharRef&'  =>  'qt_TQCharRef*' ,
-'TQCharRef'  =>  'qt_TQCharRef*' ,
-'TQCharRef*' => 'qt_TQCharRef*',
-'TQCheckBox*' => 'qt_TQCheckBox*',
-'TQCheckListItem*' => 'qt_TQCheckListItem *',
-'TQCheckTableItem*' => 'qt_TQCheckTableItem*',
-'TQChildEvent*'  => 'qt_TQChildEvent*' ,
-'TQClassInfo*'  =>  'qt_TQClassInfo*' ,
-'TQCleanupHandler*' => 'qt_TQCleanupHandler*',
-'TQClipboard*' => 'qt_TQClipboard *',
-'TQCloseEvent*'  => 'qt_TQCloseEvent*' ,
-'TQCollection&'  => 'qt_TQCollection*' ,
-'TQCollection*' => 'qt_TQCollection*',
-'TQCollection::Item&'  =>  'void *' ,
-'TQCollection::Item'  =>  'void *' ,
-'TQColor &' => 'qt_TQColor *',
-'TQColor&' => 'qt_TQColor *',
+'TQCharRef&'  =>  'qt_QCharRef*' ,
+'TQCharRef'  =>  'qt_QCharRef*' ,
+'TQCharRef*' => 'qt_QCharRef*',
+'TQCheckBox*' => 'qt_QCheckBox*',
+'TQCheckListItem*' => 'qt_QCheckListItem*',
+'TQCheckTableItem*' => 'qt_QCheckTableItem*',
+'TQChildEvent*'  => 'qt_QChildEvent*' ,
+'TQClassInfo*'  =>  'qt_QClassInfo*' ,
+'TQCleanupHandler*' => 'qt_QCleanupHandler*',
+'TQClipboard*' => 'qt_QClipboard*',
+'TQCloseEvent*'  => 'qt_QCloseEvent*' ,
+'TQCollection&'  => 'qt_QCollection*' ,
+'TQCollection*' => 'qt_QCollection*',
+'TQCollection::Item&'  =>  'void*' ,
+'TQCollection::Item'  =>  'void*' ,
+'TQColor &' => 'qt_QColor*',
+'TQColor&' => 'qt_QColor*',
 'TQColor&fillColor::white'  =>  'int' ,
 'TQColor&linkColor::blue'  =>  'int' ,
-'TQColor' => 'qt_TQColor *',
-'TQColor*'  => 'qt_TQColor*' ,
-'TQColorDialog*' => 'qt_TQColorDialog*',
-'TQColorDrag*' => 'qt_TQColorDrag*',
-'TQColorGroup&' => 'qt_TQColorGroup *',
-'TQColorGroup'  =>  'qt_TQColorGroup*' ,
-'TQColorGroup*'  => 'qt_TQColorGroup*' ,
+'TQColor' => 'qt_QColor*',
+'TQColor*'  => 'qt_QColor*' ,
+'TQColorDialog*' => 'qt_QColorDialog*',
+'TQColorDrag*' => 'qt_QColorDrag*',
+'TQColorGroup&' => 'qt_QColorGroup*',
+'TQColorGroup'  =>  'qt_QColorGroup*' ,
+'TQColorGroup*'  => 'qt_QColorGroup*' ,
 'TQColorGroup::ColorRole'  => 'int' ,
-'TQComboBox*'  =>  'qt_TQComboBox*' ,
+'TQComboBox*'  =>  'qt_QComboBox*' ,
 'TQComboBox::Policy'  => 'int' ,
 'TQComboBox::Policypolicy::AtBottom'  => 'int' ,
-'TQComboTableItem*' => 'qt_TQComboTableItem*',
-'TQCommonStyle*' => 'qt_TQCommonStyle*',
-'TQCompactStyle*' => 'qt_TQCompactStyle*',
-'TQComponentFactory*' => 'qt_TQComponentFactory*',
-'TQComponentFactoryInterface*' => 'qt_TQComponentFactoryInterface*',
-'TQComponentInterface*' => 'qt_TQComponentInterface*',
-'TQComponentRegistration*' => 'qt_TQComponentRegistration*',
-'TQComponentServerInterface*' => 'qt_TQComponentServerInterface*',
-'TQConfigDB*'  =>  'qt_TQConfigDB*' ,
-'TQConfigDB*'  => 'qt_TQConfigDB*' ,
-'TQConnection*' => 'qt_TQConnection*',
-'TQConnectionList&'  => 'qt_TQConnectionList*' ,
-'TQConnectionList*'  =>  'qt_TQConnectionList*' ,
-'TQConnectionListIt&'  => 'qt_TQConnectionListIt*' ,
-'TQConnectionListIt*' => 'qt_TQConnectionListIt*',
-'TQConstString' => 'qt_TQConstString*',
-'TQConstString*' => 'qt_TQConstString*',
-'TQContextMenuEvent*' => 'qt_TQContextMenuEvent*',
-'TQCursor&' => 'qt_TQCursor *',
-'TQCursor'  =>  'qt_TQCursor*' ,
-'TQCursor*' => 'qt_TQCursor *',
-'TQCustomEvent*'  =>  'qt_TQCustomEvent*' ,
-'TQCustomMenuItem*'  =>  'qt_TQCustomMenuItem*' ,
+'TQComboTableItem*' => 'qt_QComboTableItem*',
+'TQCommonStyle*' => 'qt_QCommonStyle*',
+'TQCompactStyle*' => 'qt_QCompactStyle*',
+'TQComponentFactory*' => 'qt_QComponentFactory*',
+'TQComponentFactoryInterface*' => 'qt_QComponentFactoryInterface*',
+'TQComponentInterface*' => 'qt_QComponentInterface*',
+'TQComponentRegistration*' => 'qt_QComponentRegistration*',
+'TQComponentServerInterface*' => 'qt_QComponentServerInterface*',
+'TQConfigDB*'  =>  'qt_QConfigDB*' ,
+'TQConfigDB*'  => 'qt_QConfigDB*' ,
+'TQConnection*' => 'qt_QConnection*',
+'TQConnectionList&'  => 'qt_QConnectionList*' ,
+'TQConnectionList*'  =>  'qt_QConnectionList*' ,
+'TQConnectionListIt&'  => 'qt_QConnectionListIt*' ,
+'TQConnectionListIt*' => 'qt_QConnectionListIt*',
+'TQConstString' => 'qt_QConstString*',
+'TQConstString*' => 'qt_QConstString*',
+'TQContextMenuEvent*' => 'qt_QContextMenuEvent*',
+'TQCursor&' => 'qt_QCursor*',
+'TQCursor'  =>  'qt_QCursor*' ,
+'TQCursor*' => 'qt_QCursor*',
+'TQCustomEvent*'  =>  'qt_QCustomEvent*' ,
+'TQCustomMenuItem*'  =>  'qt_QCustomMenuItem*' ,
 'TQDOM_NodeListPrivate*'  =>  'void*' ,
 'TQDOM_NodePrivate*'  =>  'void*' ,
-'TQDataBrowser*' => 'qt_TQDataBrowser*',
-'TQDataPump*' => 'qt_TQDataPump*',
-'TQDataSink*'  => 'qt_TQDataSink*' ,
-'TQDataSource*'  => 'qt_TQDataSource*' ,
-'TQDataStream&' => 'qt_TQDataStream *',
-'TQDataStream*'  => 'qt_TQDataStream*' ,
-'TQDataTable*' => 'qt_TQDataTable*',
-'TQDataView*' => 'qt_TQDataView*',
-'TQDate &' => 'qt_TQDate *',
-'TQDate date()' => 'qt_TQDate*',
-'TQDate&' => 'qt_TQDate *',
-'TQDate' => 'qt_TQDate *',
-'TQDate*' => 'qt_TQDate*',
-'TQDateEdit*' => 'qt_TQDateEdit*',
-'TQDateTime&' => 'qt_TQDateTime *',
-'TQDateTime' => 'qt_TQDateTime *',
-'TQDateTime*'  => 'qt_TQDateTime*' ,
-'TQDateTimeEdit*' => 'qt_TQDateTimeEdit*',
-'TQDateTimeEditBase*' => 'qt_TQDateTimeEditBase*',
-'TQDesktopWidget*' => 'qt_TQDesktopWidget*',
-'TQDial*' => 'qt_TQDial*',
-'TQDialog*' => 'qt_TQDialog*',
-'TQDict*' => 'qt_TQDict*',
-'TQDictIterator*' => 'qt_TQDictIterator*',
-'TQDir&' => 'qt_TQDir *',
-'TQDir' => 'qt_TQDir *',
-'TQDir*' => 'qt_TQDir *',
+'TQDataBrowser*' => 'qt_QDataBrowser*',
+'TQDataPump*' => 'qt_QDataPump*',
+'TQDataSink*'  => 'qt_QDataSink*' ,
+'TQDataSource*'  => 'qt_QDataSource*' ,
+'TQDataStream&' => 'qt_QDataStream*',
+'TQDataStream*'  => 'qt_QDataStream*' ,
+'TQDataTable*' => 'qt_QDataTable*',
+'TQDataView*' => 'qt_QDataView*',
+'TQDate &' => 'qt_QDate*',
+'TQDate date()' => 'qt_QDate*',
+'TQDate&' => 'qt_QDate*',
+'TQDate' => 'qt_QDate*',
+'TQDate*' => 'qt_QDate*',
+'TQDateEdit*' => 'qt_QDateEdit*',
+'TQDateTime&' => 'qt_QDateTime*',
+'TQDateTime' => 'qt_QDateTime*',
+'TQDateTime*'  => 'qt_QDateTime*' ,
+'TQDateTimeEdit*' => 'qt_QDateTimeEdit*',
+'TQDateTimeEditBase*' => 'qt_QDateTimeEditBase*',
+'TQDesktopWidget*' => 'qt_QDesktopWidget*',
+'TQDial*' => 'qt_QDial*',
+'TQDialog*' => 'qt_QDialog*',
+'TQDict*' => 'qt_QDict*',
+'TQDictIterator*' => 'qt_QDictIterator*',
+'TQDir&' => 'qt_QDir*',
+'TQDir' => 'qt_QDir*',
+'TQDir*' => 'qt_QDir*',
 'TQDir::SortSpec&'  => 'int' ,
 'TQDir::SortSpec'  => 'int' ,
-'TQDirSortItem*' => 'qt_TQDirSortItem*',
-'TQDiskFont*' => 'qt_TQDiskFont*',
-'TQDispatchInterface*' => 'qt_TQDispatchInterface*',
-'TQDns*' => 'qt_TQDns*',
-'TQDnsSocket*' => 'qt_TQDnsSocket*',
-'TQDockArea*' => 'qt_TQDockArea*',
-'TQDockAreaLayout*' => 'qt_TQDockAreaLayout*',
-'TQDockWindow*' => 'qt_TQDockWindow*',
-'TQDomAttr&'  =>  'qt_TQDomAttr*' ,
-'TQDomAttr'  =>  'qt_TQDomAttr*' ,
-'TQDomAttr*' => 'qt_TQDomAttr*',
-'TQDomCDATASection&'  =>  'qt_TQDomCDATASection*' ,
-'TQDomCDATASection'  =>  'qt_TQDomCDATASection*' ,
-'TQDomCDATASection*' => 'qt_TQDomCDATASection*',
-'TQDomCharacterData&'  =>  'qt_TQDomCharacterData*' ,
-'TQDomCharacterData'  =>  'qt_TQDomCharacterData*' ,
-'TQDomCharacterData*' => 'qt_TQDomCharacterData*',
-'TQDomComment&'  =>  'qt_TQDomComment*' ,
-'TQDomComment'  =>  'qt_TQDomComment*' ,
-'TQDomComment*' => 'qt_TQDomComment*',
-'TQDomDocument&'  =>  'qt_TQDomDocument*' ,
-'TQDomDocument'  =>  'qt_TQDomDocument*' ,
-'TQDomDocument*' => 'qt_TQDomDocument*',
-'TQDomDocumentFragment&'  =>  'qt_TQDomDocumentFragment*' ,
-'TQDomDocumentFragment'  =>  'qt_TQDomDocumentFragment*' ,
-'TQDomDocumentFragment*' => 'qt_TQDomDocumentFragment*',
-'TQDomDocumentType&'  =>  'qt_TQDomDocumentType*' ,
-'TQDomDocumentType'  =>  'qt_TQDomDocumentType*' ,
-'TQDomDocumentType*' => 'qt_TQDomDocumentType*',
-'TQDomElement&'  =>  'qt_TQDomElement*' ,
-'TQDomElement'  =>  'qt_TQDomElement*' ,
-'TQDomElement*' => 'qt_TQDomElement*',
-'TQDomEntity&'  =>  'qt_TQDomEntity*' ,
-'TQDomEntity'  =>  'qt_TQDomEntity*' ,
-'TQDomEntity*' => 'qt_TQDomEntity*',
-'TQDomEntityReference&'  =>  'qt_TQDomEntityReference*' ,
-'TQDomEntityReference'  =>  'qt_TQDomEntityReference*' ,
-'TQDomEntityReference*' => 'qt_TQDomEntityReference*',
-'TQDomImplementation&'  =>  'qt_TQDomImplementation*' ,
-'TQDomImplementation'  =>  'qt_TQDomImplementation*' ,
-'TQDomImplementation*' => 'qt_TQDomImplementation*',
-'TQDomNamedNodeMap&'  =>  'qt_TQDomNamedNodeMap*' ,
-'TQDomNamedNodeMap'  =>  'qt_TQDomNamedNodeMap*' ,
-'TQDomNamedNodeMap*' => 'qt_TQDomNamedNodeMap*',
-'TQDomNode&'  =>  'qt_TQDomNode*' ,
-'TQDomNode'  =>  'qt_TQDomNode*' ,
-'TQDomNode*' => 'qt_TQDomNode*',
+'TQDirSortItem*' => 'qt_QDirSortItem*',
+'TQDiskFont*' => 'qt_QDiskFont*',
+'TQDispatchInterface*' => 'qt_QDispatchInterface*',
+'TQDns*' => 'qt_QDns*',
+'TQDnsSocket*' => 'qt_QDnsSocket*',
+'TQDockArea*' => 'qt_QDockArea*',
+'TQDockAreaLayout*' => 'qt_QDockAreaLayout*',
+'TQDockWindow*' => 'qt_QDockWindow*',
+'TQDomAttr&'  =>  'qt_QDomAttr*' ,
+'TQDomAttr'  =>  'qt_QDomAttr*' ,
+'TQDomAttr*' => 'qt_QDomAttr*',
+'TQDomCDATASection&'  =>  'qt_QDomCDATASection*' ,
+'TQDomCDATASection'  =>  'qt_QDomCDATASection*' ,
+'TQDomCDATASection*' => 'qt_QDomCDATASection*',
+'TQDomCharacterData&'  =>  'qt_QDomCharacterData*' ,
+'TQDomCharacterData'  =>  'qt_QDomCharacterData*' ,
+'TQDomCharacterData*' => 'qt_QDomCharacterData*',
+'TQDomComment&'  =>  'qt_QDomComment*' ,
+'TQDomComment'  =>  'qt_QDomComment*' ,
+'TQDomComment*' => 'qt_QDomComment*',
+'TQDomDocument&'  =>  'qt_QDomDocument*' ,
+'TQDomDocument'  =>  'qt_QDomDocument*' ,
+'TQDomDocument*' => 'qt_QDomDocument*',
+'TQDomDocumentFragment&'  =>  'qt_QDomDocumentFragment*' ,
+'TQDomDocumentFragment'  =>  'qt_QDomDocumentFragment*' ,
+'TQDomDocumentFragment*' => 'qt_QDomDocumentFragment*',
+'TQDomDocumentType&'  =>  'qt_QDomDocumentType*' ,
+'TQDomDocumentType'  =>  'qt_QDomDocumentType*' ,
+'TQDomDocumentType*' => 'qt_QDomDocumentType*',
+'TQDomElement&'  =>  'qt_QDomElement*' ,
+'TQDomElement'  =>  'qt_QDomElement*' ,
+'TQDomElement*' => 'qt_QDomElement*',
+'TQDomEntity&'  =>  'qt_QDomEntity*' ,
+'TQDomEntity'  =>  'qt_QDomEntity*' ,
+'TQDomEntity*' => 'qt_QDomEntity*',
+'TQDomEntityReference&'  =>  'qt_QDomEntityReference*' ,
+'TQDomEntityReference'  =>  'qt_QDomEntityReference*' ,
+'TQDomEntityReference*' => 'qt_QDomEntityReference*',
+'TQDomImplementation&'  =>  'qt_QDomImplementation*' ,
+'TQDomImplementation'  =>  'qt_QDomImplementation*' ,
+'TQDomImplementation*' => 'qt_QDomImplementation*',
+'TQDomNamedNodeMap&'  =>  'qt_QDomNamedNodeMap*' ,
+'TQDomNamedNodeMap'  =>  'qt_QDomNamedNodeMap*' ,
+'TQDomNamedNodeMap*' => 'qt_QDomNamedNodeMap*',
+'TQDomNode&'  =>  'qt_QDomNode*' ,
+'TQDomNode'  =>  'qt_QDomNode*' ,
+'TQDomNode*' => 'qt_QDomNode*',
 'TQDomNode::NodeType' => 'int',
-'TQDomNodeList&'  =>  'qt_TQDomNodeList*' ,
-'TQDomNodeList'  =>  'qt_TQDomNodeList*' ,
-'TQDomNodeList*' => 'qt_TQDomNodeList*',
-'TQDomNodePrivate*' => 'qt_TQDomNodePrivate*',
-'TQDomNotation&'  =>  'qt_TQDomNotation*' ,
-'TQDomNotation'  =>  'qt_TQDomNotation*' ,
-'TQDomNotation*' => 'qt_TQDomNotation*',
-'TQDomProcessingInstruction&'  =>  'qt_TQDomProcessingInstruction*' ,
-'TQDomProcessingInstruction'  =>  'qt_TQDomProcessingInstruction*' ,
-'TQDomProcessingInstruction*' => 'qt_TQDomProcessingInstruction*',
-'TQDomText&'  =>  'qt_TQDomText*' ,
-'TQDomText'  =>  'qt_TQDomText*' ,
-'TQDomText*' => 'qt_TQDomText*',
-'TQDoubleValidator*' => 'qt_TQDoubleValidator*',
-'TQDragEnterEvent*'  => 'qt_TQDragEnterEvent*' ,
-'TQDragLeaveEvent*'  => 'qt_TQDragLeaveEvent*' ,
-'TQDragManager*' => 'qt_TQDragManager*',
-'TQDragMoveEvent*'  => 'qt_TQDragMoveEvent*' ,
-'TQDragObject*'  => 'qt_TQDragObject*' ,
-'TQDragResponseEvent*' => 'qt_TQDragResponseEvent*',
-'TQDropEvent*'  => 'qt_TQDropEvent*' ,
-'TQDropSite*' => 'qt_TQDropSite*',
-'TQEditorFactory*' => 'qt_TQEditorFactory*',
-'TQErrorMessage*' => 'qt_TQErrorMessage*',
-'TQEucJpCodec*' => 'qt_TQEucJpCodec*',
-'TQEucKrCodec*' => 'qt_TQEucKrCodec*',
-'TQEvent*' => 'qt_TQEvent *',
+'TQDomNodeList&'  =>  'qt_QDomNodeList*' ,
+'TQDomNodeList'  =>  'qt_QDomNodeList*' ,
+'TQDomNodeList*' => 'qt_QDomNodeList*',
+'TQDomNodePrivate*' => 'qt_QDomNodePrivate*',
+'TQDomNotation&'  =>  'qt_QDomNotation*' ,
+'TQDomNotation'  =>  'qt_QDomNotation*' ,
+'TQDomNotation*' => 'qt_QDomNotation*',
+'TQDomProcessingInstruction&'  =>  'qt_QDomProcessingInstruction*' ,
+'TQDomProcessingInstruction'  =>  'qt_QDomProcessingInstruction*' ,
+'TQDomProcessingInstruction*' => 'qt_QDomProcessingInstruction*',
+'TQDomText&'  =>  'qt_QDomText*' ,
+'TQDomText'  =>  'qt_QDomText*' ,
+'TQDomText*' => 'qt_QDomText*',
+'TQDoubleValidator*' => 'qt_QDoubleValidator*',
+'TQDragEnterEvent*'  => 'qt_QDragEnterEvent*' ,
+'TQDragLeaveEvent*'  => 'qt_QDragLeaveEvent*' ,
+'TQDragManager*' => 'qt_QDragManager*',
+'TQDragMoveEvent*'  => 'qt_QDragMoveEvent*' ,
+'TQDragObject*'  => 'qt_QDragObject*' ,
+'TQDragResponseEvent*' => 'qt_QDragResponseEvent*',
+'TQDropEvent*'  => 'qt_QDropEvent*' ,
+'TQDropSite*' => 'qt_QDropSite*',
+'TQEditorFactory*' => 'qt_QEditorFactory*',
+'TQErrorMessage*' => 'qt_QErrorMessage*',
+'TQEucJpCodec*' => 'qt_QEucJpCodec*',
+'TQEucKrCodec*' => 'qt_QEucKrCodec*',
+'TQEvent*' => 'qt_QEvent*',
 'TQEventLoop::ProcessEventsFlags' => 'uint',
-'TQFeatureListInterface*' => 'qt_TQFeatureListInterface*',
-'TQFile&' => 'qt_TQFile *',
-'TQFile*'  => 'qt_TQFile*' ,
-'TQFileDialog*' => 'qt_TQFileDialog*',
-'TQFileIconProvider*'  => 'qt_TQFileIconProvider*' ,
-'TQFileInfo&' => 'qt_TQFileInfo *',
-'TQFileInfo*' => 'qt_TQFileInfo*',
-'TQFileInfoList*'  => 'qt_TQFileInfoList*' ,
-'TQFilePreview*'  =>  'qt_TQFilePreview*' ,
-'TQFocusData*'  =>  'qt_TQFocusData*' ,
-'TQFocusEvent*'  => 'qt_TQFocusEvent*' ,
-'TQFont&' => 'qt_TQFont *',
-'TQFont' => 'qt_TQFont *',
-'TQFont*' => 'qt_TQFont *',
+'TQFeatureListInterface*' => 'qt_QFeatureListInterface*',
+'TQFile&' => 'qt_QFile*',
+'TQFile*'  => 'qt_QFile*' ,
+'TQFileDialog*' => 'qt_QFileDialog*',
+'TQFileIconProvider*'  => 'qt_QFileIconProvider*' ,
+'TQFileInfo&' => 'qt_QFileInfo*',
+'TQFileInfo*' => 'qt_QFileInfo*',
+'TQFileInfoList*'  => 'qt_QFileInfoList*' ,
+'TQFilePreview*'  =>  'qt_QFilePreview*' ,
+'TQFocusData*'  =>  'qt_QFocusData*' ,
+'TQFocusEvent*'  => 'qt_QFocusEvent*' ,
+'TQFont&' => 'qt_QFont*',
+'TQFont' => 'qt_QFont*',
+'TQFont*' => 'qt_QFont*',
 'TQFont::CharSet' => 'int',
 'TQFont::CharSetcharset::Unicode'  => 'int' ,
 'TQFont::StyleHint' => 'int',
-'TQFontData&'  => 'qt_TQFontData*' ,
-'TQFontDatabase*' => 'qt_TQFontDatabase*',
-'TQFontDialog*' => 'qt_TQFontDialog*',
-'TQFontInfo&' => 'qt_TQFontInfo *',
-'TQFontInfo' => 'qt_TQFontInfo *',
-'TQFontInfo*' => 'qt_TQFontInfo*',
-'TQFontMetrics&' => 'qt_TQFontMetrics *',
-'TQFontMetrics' => 'qt_TQFontMetrics *',
-'TQFontMetrics*' => 'qt_TQFontMetrics*',
-'TQFrame*'  => 'qt_TQFrame*' ,
-'TQFtp*' => 'qt_TQFtp*',
-'TQGArray&'  => 'qt_TQGArray*' ,
-'TQGArray*' => 'qt_TQGArray*',
-'TQGCache&'  => 'qt_TQGCache*' ,
-'TQGCache*' => 'qt_TQGCache*',
-'TQGCacheIterator&'  => 'qt_TQGCacheIterator*' ,
-'TQGCacheIterator*' => 'qt_TQGCacheIterator*',
-'TQGDict&'  => 'qt_TQGDict*' ,
-'TQGDict*' => 'qt_TQGDict*',
-'TQGDictIterator&'  => 'qt_TQGDictIterator*' ,
-'TQGDictIterator*' => 'qt_TQGDictIterator*',
-'TQGL*' => 'qt_TQGL*',
-'TQGLColormap&' => 'qt_TQGLColormap*',
-'TQGLColormap*' => 'qt_TQGLColormap*',
-'TQGLContext*'  =>  'qt_TQGLContext*' ,
-'TQGLFormat&'  =>  'qt_TQGLFormat*' ,
-'TQGLFormat'  =>  'qt_TQGLFormat*' ,
-'TQGLFormat*' => 'qt_TQGLFormat*',
-'TQGLWidget*'  =>  'qt_TQGLWidget*' ,
-'TQGLayoutIterator*'  =>  'qt_TQGLayoutIterator*' ,
-'TQGList&'  => 'qt_TQGList*' ,
-'TQGList*'  =>  'qt_TQGList*' ,
-'TQGListIterator&'  => 'qt_TQGListIterator*' ,
-'TQGListIterator*' => 'qt_TQGListIterator*',
-'TQGPlugin*' => 'qt_TQGPlugin*',
-'TQGPluginManager*' => 'qt_TQGPluginManager*',
-'TQGVector&'  => 'qt_TQGVector*' ,
-'TQGVector*'  => 'qt_TQGVector*' ,
-'TQGbkCodec*' => 'qt_TQGbkCodec*',
-'TQGfx*'  =>  'qt_TQGfx*' ,
-'TQGrid*'  => 'qt_TQGrid*' ,
+'TQFontData&'  => 'qt_QFontData*' ,
+'TQFontDatabase*' => 'qt_QFontDatabase*',
+'TQFontDialog*' => 'qt_QFontDialog*',
+'TQFontInfo&' => 'qt_QFontInfo*',
+'TQFontInfo' => 'qt_QFontInfo*',
+'TQFontInfo*' => 'qt_QFontInfo*',
+'TQFontMetrics&' => 'qt_QFontMetrics*',
+'TQFontMetrics' => 'qt_QFontMetrics*',
+'TQFontMetrics*' => 'qt_QFontMetrics*',
+'TQFrame*'  => 'qt_QFrame*' ,
+'TQFtp*' => 'qt_QFtp*',
+'TQGArray&'  => 'qt_QGArray*' ,
+'TQGArray*' => 'qt_QGArray*',
+'TQGCache&'  => 'qt_QGCache*' ,
+'TQGCache*' => 'qt_QGCache*',
+'TQGCacheIterator&'  => 'qt_QGCacheIterator*' ,
+'TQGCacheIterator*' => 'qt_QGCacheIterator*',
+'TQGDict&'  => 'qt_QGDict*' ,
+'TQGDict*' => 'qt_QGDict*',
+'TQGDictIterator&'  => 'qt_QGDictIterator*' ,
+'TQGDictIterator*' => 'qt_QGDictIterator*',
+'TQGL*' => 'qt_QGL*',
+'TQGLColormap&' => 'qt_QGLColormap*',
+'TQGLColormap*' => 'qt_QGLColormap*',
+'TQGLContext*'  =>  'qt_QGLContext*' ,
+'TQGLFormat&'  =>  'qt_QGLFormat*' ,
+'TQGLFormat'  =>  'qt_QGLFormat*' ,
+'TQGLFormat*' => 'qt_QGLFormat*',
+'TQGLWidget*'  =>  'qt_QGLWidget*' ,
+'TQGLayoutIterator*'  =>  'qt_QGLayoutIterator*' ,
+'TQGListIterator&'  => 'qt_QGListIterator*' ,
+'TQGListIterator*' => 'qt_QGListIterator*',
+'TQGPlugin*' => 'qt_QGPlugin*',
+'TQGPluginManager*' => 'qt_QGPluginManager*',
+'TQGbkCodec*' => 'qt_QGbkCodec*',
+'TQGfx*'  =>  'qt_QGfx*' ,
+'TQGrid*'  => 'qt_QGrid*' ,
 'TQGrid::Direction'  => 'int' ,
-'TQGridLayout*' => 'qt_TQGridLayout*',
-'TQGridView*' => 'qt_TQGridView*',
-'TQGroupBox*' => 'qt_TQGroupBox*',
-'TQGuardedPtr*' => 'qt_TQGuardedPtr*',
-'TQGuardedPtrPrivate*' => 'qt_TQGuardedPtrPrivate*',
-'TQHBox*'  => 'qt_TQHBox*' ,
-'TQHBoxLayout*'  =>  'qt_TQHBoxLayout*' ,
-'TQHButtonGroup*' => 'qt_TQHButtonGroup*',
-'TQHGroupBox*' => 'qt_TQHGroupBox*',
-'TQHeader*' => 'qt_TQHeader *',
-'TQHebrewCodec*' => 'qt_TQHebrewCodec*',
-'TQHideEvent*'  => 'qt_TQHideEvent*' ,
-'TQHostAddress&'  =>  'qt_TQHostAddress*' ,
-'TQHostAddress'  =>  'qt_TQHostAddress*' ,
-'TQHostAddress*'  =>  'qt_TQHostAddress*' ,
-'TQHttp*' => 'qt_TQHttp*',
-'TQIMEvent*' => 'qt_TQIMEvent*',
-'TQIODevice*' => 'qt_TQIODevice *',
+'TQGridLayout*' => 'qt_QGridLayout*',
+'TQGridView*' => 'qt_QGridView*',
+'TQGroupBox*' => 'qt_QGroupBox*',
+'TQGuardedPtr*' => 'qt_QGuardedPtr*',
+'TQGuardedPtrPrivate*' => 'qt_QGuardedPtrPrivate*',
+'TQHBox*'  => 'qt_QHBox*' ,
+'TQHBoxLayout*'  =>  'qt_QHBoxLayout*' ,
+'TQHButtonGroup*' => 'qt_QHButtonGroup*',
+'TQHGroupBox*' => 'qt_QHGroupBox*',
+'TQHeader*' => 'qt_QHeader*',
+'TQHebrewCodec*' => 'qt_QHebrewCodec*',
+'TQHideEvent*'  => 'qt_QHideEvent*' ,
+'TQHostAddress&'  =>  'qt_QHostAddress*' ,
+'TQHostAddress'  =>  'qt_QHostAddress*' ,
+'TQHostAddress*'  =>  'qt_QHostAddress*' ,
+'TQHttp*' => 'qt_QHttp*',
+'TQIMEvent*' => 'qt_QIMEvent*',
+'TQIODevice*' => 'qt_QIODevice*',
 'TQIODevice::Offset' => 'int',
-'TQIODeviceSource*' => 'qt_TQIODeviceSource*',
-'TQIOManager*' => 'qt_TQIOManager*',
-'TQIOWatch*' => 'qt_TQIOWatch*',
-'TQIconDrag*' => 'qt_TQIconDrag*',
-'TQIconDragItem&'  =>  'qt_TQIconDragItem*' ,
-'TQIconDragItem*' => 'qt_TQIconDragItem*',
-'TQIconSet&'  => 'qt_TQIconSet*' ,
-'TQIconSet'  => 'qt_TQIconSet*' ,
-'TQIconSet*'  =>  'qt_TQIconSet*' ,
-'TQIconView*'  => 'qt_TQIconView*' ,
-'TQIconViewItem*'  =>  'qt_TQIconViewItem*' ,
-'TQImage&' => 'qt_TQImage *',
-'TQImage' => 'qt_TQImage *',
-'TQImage*'  => 'qt_TQImage*' ,
-'TQImageConsumer*'  =>  'qt_TQImageConsumer*' ,
-'TQImageData*' => 'qt_TQImageData*',
-'TQImageDecoder*' => 'qt_TQImageDecoder*',
-'TQImageDrag*' => 'qt_TQImageDrag*',
-'TQImageFormat*'  =>  'qt_TQImageFormat*' ,
-'TQImageFormatInterface*' => 'qt_TQImageFormatInterface*',
-'TQImageFormatPlugin*' => 'qt_TQImageFormatPlugin*',
-'TQImageFormatType*'  => 'qt_TQImageFormatType*' ,
-'TQImageIO*' => 'qt_TQImageIO*',
-'TQImageTextKeyLang&'  =>  'qt_TQImageTextKeyLang*' ,
-'TQImageTextKeyLang*' => 'qt_TQImageTextKeyLang*',
-'TQInputDialog*' => 'qt_TQInputDialog*',
-'TQIntBucket*' => 'qt_TQIntBucket*',
-'TQIntCache*' => 'qt_TQIntCache*',
-'TQIntCacheIterator*' => 'qt_TQIntCacheIterator*',
-'TQIntDict*' => 'qt_TQIntDict*',
-'TQIntDictIterator*' => 'qt_TQIntDictIterator*',
-'TQIntValidator*' => 'qt_TQIntValidator*',
-'TQInterfaceListInterface*' => 'qt_TQInterfaceListInterface*',
-'TQInterfacePtr*' => 'qt_TQInterfacePtr*',
-'TQInterlaceStyle*' => 'qt_TQInterlaceStyle*',
-'TQInternal*' => 'qt_TQInternal*',
-'TQJisCodec*' => 'qt_TQJisCodec*',
-'TQJpUnicodeConv*'  =>  'qt_TQJpUnicodeConv*' ,
-'TQKeyEvent*'  => 'qt_TQKeyEvent*' ,
-'TQKeySequence&' => 'qt_TQKeySequence*',
-'TQKeySequence' => 'qt_TQKeySequence*',
-'TQKeySequence*' => 'qt_TQKeySequence*',
-'TQKoi8Codec*' => 'qt_TQKoi8Codec*',
-'TQLCDNumber*' => 'qt_TQLCDNumber*',
-'TQLNode*'  => 'qt_TQLNode*' ,
-'TQLabel*' => 'qt_TQLabel *',
-'TQLayout*' => 'qt_TQLayout *',
-'TQLayoutItem*'  =>  'qt_TQLayoutItem*' ,
-'TQLayoutIterator&'  =>  'qt_TQLayoutIterator*' ,
-'TQLayoutIterator'  =>  'qt_TQLayoutIterator*' ,
-'TQLayoutIterator*' => 'qt_TQLayoutIterator*',
-'TQLibrary*' => 'qt_TQLibrary*',
+'TQIODeviceSource*' => 'qt_QIODeviceSource*',
+'TQIOManager*' => 'qt_QIOManager*',
+'TQIOWatch*' => 'qt_QIOWatch*',
+'TQIconDrag*' => 'qt_QIconDrag*',
+'TQIconDragItem&'  =>  'qt_QIconDragItem*' ,
+'TQIconDragItem*' => 'qt_QIconDragItem*',
+'TQIconSet&'  => 'qt_QIconSet*' ,
+'TQIconSet'  => 'qt_QIconSet*' ,
+'TQIconSet*'  =>  'qt_QIconSet*' ,
+'TQIconView*'  => 'qt_QIconView*' ,
+'TQIconViewItem*'  =>  'qt_QIconViewItem*' ,
+'TQImage&' => 'qt_QImage*',
+'TQImage' => 'qt_QImage*',
+'TQImage*'  => 'qt_QImage*' ,
+'TQImageConsumer*'  =>  'qt_QImageConsumer*' ,
+'TQImageData*' => 'qt_QImageData*',
+'TQImageDecoder*' => 'qt_QImageDecoder*',
+'TQImageDrag*' => 'qt_QImageDrag*',
+'TQImageFormat*'  =>  'qt_QImageFormat*' ,
+'TQImageFormatInterface*' => 'qt_QImageFormatInterface*',
+'TQImageFormatPlugin*' => 'qt_QImageFormatPlugin*',
+'TQImageFormatType*'  => 'qt_QImageFormatType*' ,
+'TQImageIO*' => 'qt_QImageIO*',
+'TQImageTextKeyLang&'  =>  'qt_QImageTextKeyLang*' ,
+'TQImageTextKeyLang*' => 'qt_QImageTextKeyLang*',
+'TQInputDialog*' => 'qt_QInputDialog*',
+'TQIntBucket*' => 'qt_QIntBucket*',
+'TQIntCache*' => 'qt_QIntCache*',
+'TQIntCacheIterator*' => 'qt_QIntCacheIterator*',
+'TQIntDict*' => 'qt_QIntDict*',
+'TQIntDictIterator*' => 'qt_QIntDictIterator*',
+'TQIntValidator*' => 'qt_QIntValidator*',
+'TQInterfaceListInterface*' => 'qt_QInterfaceListInterface*',
+'TQInterfacePtr*' => 'qt_QInterfacePtr*',
+'TQInterlaceStyle*' => 'qt_QInterlaceStyle*',
+'TQInternal*' => 'qt_QInternal*',
+'TQJisCodec*' => 'qt_QJisCodec*',
+'TQJpUnicodeConv*'  =>  'qt_QJpUnicodeConv*' ,
+'TQKeyEvent*'  => 'qt_QKeyEvent*' ,
+'TQKeySequence&' => 'qt_QKeySequence*',
+'TQKeySequence' => 'qt_QKeySequence*',
+'TQKeySequence*' => 'qt_QKeySequence*',
+'TQKoi8Codec*' => 'qt_QKoi8Codec*',
+'TQLCDNumber*' => 'qt_QLCDNumber*',
+'TQLNode*'  => 'qt_QLNode*' ,
+'TQLabel*' => 'qt_QLabel*',
+'TQLayout*' => 'qt_QLayout*',
+'TQLayoutItem*'  =>  'qt_QLayoutItem*' ,
+'TQLayoutIterator&'  =>  'qt_QLayoutIterator*' ,
+'TQLayoutIterator'  =>  'qt_QLayoutIterator*' ,
+'TQLayoutIterator*' => 'qt_QLayoutIterator*',
+'TQLibrary*' => 'qt_QLibrary*',
 'TQLibrary::Policy' => 'int',
-'TQLibraryInterface*' => 'qt_TQLibraryInterface*',
-'TQLineEdit*'  =>  'qt_TQLineEdit*' ,
+'TQLibraryInterface*' => 'qt_QLibraryInterface*',
+'TQLineEdit*'  =>  'qt_QLineEdit*' ,
 'TQLineEdit::EchoMode'  =>  'int' ,
-'TQList*' => 'qt_TQList*',
-'TQListBox*' => 'qt_TQListBox *',
-'TQListBoxItem*' => 'qt_TQListBoxItem *',
-'TQListBoxPixmap*' => 'qt_TQListBoxPixmap*',
-'TQListBoxText*' => 'qt_TQListBoxText*',
-'TQListIterator*' => 'qt_TQListIterator*',
-'TQListView*' => 'qt_TQListView *',
-'TQListViewItem*&' => 'qt_TQListViewItem*',
-'TQListViewItem*' => 'qt_TQListViewItem *',
-'TQListViewItemIterator&'  =>  'qt_TQListViewItemIterator*' ,
-'TQListViewItemIterator'  =>  'qt_TQListViewItemIterator*' ,
-'TQListViewItemIterator*' => 'qt_TQListViewItemIterator*',
-'TQLocalFs*' => 'qt_TQLocalFs*',
-'TQMCPI*' => 'qt_TQMCPI*',
-'TQMSG*'  => 'TQMSG*' ,
-'TQMainWindow*'  =>  'qt_TQMainWindow*' ,
+'TQList*' => 'qt_QList*',
+'TQListBox*' => 'qt_QListBox*',
+'TQListBoxItem*' => 'qt_QListBoxItem*',
+'TQListBoxPixmap*' => 'qt_QListBoxPixmap*',
+'TQListBoxText*' => 'qt_QListBoxText*',
+'TQListIterator*' => 'qt_QListIterator*',
+'TQListView*' => 'qt_QListView*',
+'TQListViewItem*&' => 'qt_QListViewItem*',
+'TQListViewItem*' => 'qt_QListViewItem*',
+'TQListViewItemIterator&'  =>  'qt_QListViewItemIterator*' ,
+'TQListViewItemIterator'  =>  'qt_QListViewItemIterator*' ,
+'TQListViewItemIterator*' => 'qt_QListViewItemIterator*',
+'TQLocalFs*' => 'qt_QLocalFs*',
+'TQMCPI*' => 'qt_QMCPI*',
+'TQMainWindow*'  =>  'qt_QMainWindow*' ,
 'TQMainWindow::ToolBarDock' => 'int',
 'TQMainWindow::ToolBarDock::Top'  =>  'int' ,
-'TQMap&'  =>  'qt_TQMap*' ,
-'TQMap*' => 'qt_TQMap*',
-'TQMapConstIterator*' => 'qt_TQMapConstIterator*',
-'TQMapIterator*' => 'qt_TQMapIterator*',
-'TQMapNode*' => 'qt_TQMapNode*',
-'TQMapNodeBase*&'  =>  'qt_TQMapNodeBase*' ,
-'TQMapNodeBase*'  =>  'qt_TQMapNodeBase*' ,
-'TQMapPrivate*' => 'qt_TQMapPrivate*',
-'TQMapPrivateBase*'  =>  'qt_TQMapPrivateBase*' ,
-'TQMemArray*' => 'qt_TQMemArray*',
-'TQMember'  => 'qt_TQMember*' ,
-'TQMember*'  => 'qt_TQMember*' ,
-'TQMenuBar*' => 'qt_TQMenuBar *',
-'TQMenuData*' => 'qt_TQMenuData*',
-'TQMenuData**'  => 'qt_TQMenuData**' ,
-'TQMenuItem*' => 'qt_TQMenuItem *',
-'TQMessageBox*' => 'qt_TQMessageBox*',
-'TQMetaData*'  =>  'qt_TQMetaData*' ,
+'TQMap&'  =>  'qt_QMap*' ,
+'TQMap*' => 'qt_QMap*',
+'TQMapConstIterator*' => 'qt_QMapConstIterator*',
+'TQMapIterator*' => 'qt_QMapIterator*',
+'TQMapNode*' => 'qt_QMapNode*',
+'TQMapNodeBase*&'  =>  'qt_QMapNodeBase*' ,
+'TQMapNodeBase*'  =>  'qt_QMapNodeBase*' ,
+'TQMapPrivate*' => 'qt_QMapPrivate*',
+'TQMapPrivateBase*'  =>  'qt_QMapPrivateBase*' ,
+'TQMemArray*' => 'qt_QMemArray*',
+'TQMember'  => 'qt_QMember*' ,
+'TQMember*'  => 'qt_QMember*' ,
+'TQMenuBar*' => 'qt_QMenuBar*',
+'TQMenuData*' => 'qt_QMenuData*',
+'TQMenuItem*' => 'qt_QMenuItem*',
+'TQMessageBox*' => 'qt_QMessageBox*',
+'TQMetaData*'  =>  'qt_QMetaData*' ,
 'TQMetaData::Access*'  =>  'int*' ,
-'TQMetaEnum*'  =>  'qt_TQMetaEnum*' ,
+'TQMetaEnum*'  =>  'qt_QMetaEnum*' ,
 'TQMetaEnum::Item*'  =>  'int*' ,
-'TQMetaObject*&' => 'qt_TQMetaObject*',
-'TQMetaObject*' => 'qt_TQMetaObject *',
-'TQMetaObjectCleanUp*' => 'qt_TQMetaObjectCleanUp*',
-'TQMetaObjectInit*' => 'qt_TQMetaObjectInit*',
-'TQMetaProperty*'  =>  'qt_TQMetaProperty*' ,
-'TQMimeSource*'  =>  'qt_TQMimeSource*' ,
-'TQMimeSourceFactory*'  =>  'qt_TQMimeSourceFactory*' ,
-'TQMotifPlusStyle*' => 'qt_TQMotifPlusStyle*',
-'TQMotifStyle*' => 'qt_TQMotifStyle*',
-'TQMouseEvent*'  => 'qt_TQMouseEvent*' ,
-'TQMoveEvent*'  =>  'qt_TQMoveEvent*' ,
-'TQMovie&' => 'qt_TQMovie *',
-'TQMovie*' => 'qt_TQMovie *',
-'TQMultiLineEdit*' => 'qt_TQMultiLineEdit*',
-'TQMultiLineEditRow*' => 'qt_TQMultiLineEditRow*',
-'TQMutex*' => 'qt_TQMutex*',
-'TQNPInstance*' => 'qt_TQNPInstance*',
-'TQNPStream*' => 'qt_TQNPStream*',
-'TQNPWidget*' => 'qt_TQNPWidget*',
-'TQNPlugin*' => 'qt_TQNPlugin*',
-'TQNetworkOperation*'  =>  'qt_TQNetworkOperation*' ,
-'TQNetworkProtocol*'  =>  'qt_TQNetworkProtocol*' ,
+'TQMetaObject*&' => 'qt_QMetaObject*',
+'TQMetaObject*' => 'qt_QMetaObject*',
+'TQMetaObjectCleanUp*' => 'qt_QMetaObjectCleanUp*',
+'TQMetaObjectInit*' => 'qt_QMetaObjectInit*',
+'TQMetaProperty*'  =>  'qt_QMetaProperty*' ,
+'TQMimeSource*'  =>  'qt_QMimeSource*' ,
+'TQMimeSourceFactory*'  =>  'qt_QMimeSourceFactory*' ,
+'TQMotifPlusStyle*' => 'qt_QMotifPlusStyle*',
+'TQMotifStyle*' => 'qt_QMotifStyle*',
+'TQMouseEvent*'  => 'qt_QMouseEvent*' ,
+'TQMoveEvent*'  =>  'qt_QMoveEvent*' ,
+'TQMovie&' => 'qt_QMovie*',
+'TQMovie*' => 'qt_QMovie*',
+'TQMultiLineEdit*' => 'qt_QMultiLineEdit*',
+'TQMultiLineEditRow*' => 'qt_QMultiLineEditRow*',
+'TQMutex*' => 'qt_QMutex*',
+'TQNPInstance*' => 'qt_QNPInstance*',
+'TQNPStream*' => 'qt_QNPStream*',
+'TQNPWidget*' => 'qt_QNPWidget*',
+'TQNPlugin*' => 'qt_QNPlugin*',
+'TQNetworkOperation*'  =>  'qt_QNetworkOperation*' ,
+'TQNetworkProtocol*'  =>  'qt_QNetworkProtocol*' ,
 'TQNetworkProtocol::Operation'  =>  'int' ,
 'TQNetworkProtocol::State'  =>  'int' ,
-'TQNetworkProtocolFactory*' => 'qt_TQNetworkProtocolFactory*',
-'TQNetworkProtocolFactoryBase*'  =>  'qt_TQNetworkProtocolFactoryBase*' ,
-'TQObject*' => 'qt_TQObject *',
-'TQObjectCleanupHandler*' => 'qt_TQObjectCleanupHandler*',
-'TQObjectDictionary&'  => 'qt_TQObjectDictionary*' ,
-'TQObjectDictionary*' => 'qt_TQObjectDictionary*',
-'TQObjectInterface*' => 'qt_TQObjectInterface*',
-'TQObjectList&'  => 'qt_TQObjectList*' ,
-'TQObjectList*' => 'qt_TQObjectList*',
-'TQObjectListIt&'  => 'qt_TQObjectListIt*' ,
-'TQObjectListIt*' => 'qt_TQObjectListIt*',
-'TQPNGImagePacker*' => 'qt_TQPNGImagePacker*',
-'TQPNGImageWriter*' => 'qt_TQPNGImageWriter*',
-'TQPaintDevice*' => 'qt_TQPaintDevice *',
-'TQPaintDeviceMetrics*' => 'qt_TQPaintDeviceMetrics*',
-'TQPaintDeviceX11Data*'  =>  'qt_TQPaintDeviceX11Data*' ,
-'TQPaintEvent*'  => 'qt_TQPaintEvent*' ,
-'TQPainter&'  =>  'qt_TQPainter*' ,
-'TQPainter*' => 'qt_TQPainter *',
-'TQPair*' => 'qt_TQPair*',
-'TQPalData*' => 'qt_TQPalData*',
-'TQPalette&' => 'qt_TQPalette *',
-'TQPalette' => 'qt_TQPalette *',
-'TQPalette*' => 'qt_TQPalette *',
-'TQPen&' => 'qt_TQPen *',
-'TQPen'  =>  'qt_TQPen*' ,
-'TQPen*' => 'qt_TQPen*',
-'TQPenData*' => 'qt_TQPenData*',
-'TQPicture&' => 'qt_TQPicture *',
-'TQPicture' => 'qt_TQPicture*',
-'TQPicture*' => 'qt_TQPicture*',
-'TQPicturePrivate*' => 'qt_TQPicturePrivate*',
-'TQPixmap& pixmap()' => 'kde_TQPixmap*',
-'TQPixmap&' => 'qt_TQPixmap *',
-'TQPixmap' => 'qt_TQPixmap *',
-'TQPixmap*' => 'qt_TQPixmap *',
+'TQNetworkProtocolFactory*' => 'qt_QNetworkProtocolFactory*',
+'TQNetworkProtocolFactoryBase*'  =>  'qt_QNetworkProtocolFactoryBase*' ,
+'TQObject*' => 'qt_QObject*',
+'TQObjectCleanupHandler*' => 'qt_QObjectCleanupHandler*',
+'TQObjectDictionary&'  => 'qt_QObjectDictionary*' ,
+'TQObjectDictionary*' => 'qt_QObjectDictionary*',
+'TQObjectInterface*' => 'qt_QObjectInterface*',
+'TQObjectList&'  => 'qt_QObjectList*' ,
+'TQObjectList*' => 'qt_QObjectList*',
+'TQObjectListIt&'  => 'qt_QObjectListIt*' ,
+'TQObjectListIt*' => 'qt_QObjectListIt*',
+'TQPNGImagePacker*' => 'qt_QPNGImagePacker*',
+'TQPNGImageWriter*' => 'qt_QPNGImageWriter*',
+'TQPaintDevice*' => 'qt_QPaintDevice*',
+'TQPaintDeviceMetrics*' => 'qt_QPaintDeviceMetrics*',
+'TQPaintDeviceX11Data*'  =>  'qt_QPaintDeviceX11Data*' ,
+'TQPaintEvent*'  => 'qt_QPaintEvent*' ,
+'TQPainter&'  =>  'qt_QPainter*' ,
+'TQPainter*' => 'qt_QPainter*',
+'TQPair*' => 'qt_QPair*',
+'TQPalData*' => 'qt_QPalData*',
+'TQPalette&' => 'qt_QPalette*',
+'TQPalette' => 'qt_QPalette*',
+'TQPalette*' => 'qt_QPalette*',
+'TQPen&' => 'qt_QPen*',
+'TQPen'  =>  'qt_QPen*' ,
+'TQPen*' => 'qt_QPen*',
+'TQPenData*' => 'qt_QPenData*',
+'TQPicture&' => 'qt_QPicture*',
+'TQPicture' => 'qt_QPicture*',
+'TQPicture*' => 'qt_QPicture*',
+'TQPicturePrivate*' => 'qt_QPicturePrivate*',
+'TQPixmap& pixmap()' => 'kde_QPixmap*',
+'TQPixmap&' => 'qt_QPixmap*',
+'TQPixmap' => 'qt_QPixmap*',
+'TQPixmap*' => 'qt_QPixmap*',
 'TQPixmap::Optimization'  =>  'int' ,
 'TQPixmap::Optimization' => 'int',
 'TQPixmap::Optimization::DefaultOptim'  =>  'int' ,
-'TQPixmapCache*' => 'qt_TQPixmapCache*',
-'TQPixmapData*' => 'qt_TQPixmapData*',
-'TQPlatinumStyle*' => 'qt_TQPlatinumStyle*',
-'TQPluginManager*' => 'qt_TQPluginManager*',
-'TQPoint&' => 'qt_TQPoint*',
+'TQPixmapCache*' => 'qt_QPixmapCache*',
+'TQPixmapData*' => 'qt_QPixmapData*',
+'TQPlatinumStyle*' => 'qt_QPlatinumStyle*',
+'TQPluginManager*' => 'qt_QPluginManager*',
+'TQPoint&' => 'qt_QPoint*',
 'TQPoint&pos()'  =>  'int' ,
 'TQPoint&pos::pos()'  =>  'int' ,
-'TQPoint' => 'qt_TQPoint*',
-'TQPoint*'  => 'qt_TQPoint*' ,
-'TQPointArray&' => 'qt_TQPointArray*',
-'TQPointArray' => 'qt_TQPointArray*',
-'TQPointArray*' => 'qt_TQPointArray*',
-'TQPointVal&'  => 'qt_TQPointVal*' ,
-'TQPointVal'  => 'qt_TQPointVal*' ,
-'TQPolygonScanner*' => 'qt_TQPolygonScanner*',
-'TQPopupMenu*' => 'qt_TQPopupMenu*',
-'TQPrintDialog*' => 'qt_TQPrintDialog*',
-'TQPrinter*'  => 'qt_TQPrinter*' ,
+'TQPoint' => 'qt_QPoint*',
+'TQPoint*'  => 'qt_QPoint*' ,
+'TQPointArray&' => 'qt_QPointArray*',
+'TQPointArray' => 'qt_QPointArray*',
+'TQPointArray*' => 'qt_QPointArray*',
+'TQPointVal&'  => 'qt_QPointVal*' ,
+'TQPointVal'  => 'qt_QPointVal*' ,
+'TQPolygonScanner*' => 'qt_QPolygonScanner*',
+'TQPopupMenu*' => 'qt_QPopupMenu*',
+'TQPrintDialog*' => 'qt_QPrintDialog*',
+'TQPrinter*'  => 'qt_QPrinter*' ,
 'TQPrinter::PrinterMode' => 'int',
-'TQProcess*' => 'qt_TQProcess*',
-'TQProgressBar*' => 'qt_TQProgressBar*',
-'TQProgressDialog*' => 'qt_TQProgressDialog*',
-'TQPtrBucket*' => 'qt_TQPtrBucket*',
-'TQPtrCollection&' => 'qt_TQPtrCollection*',
-'TQPtrCollection*' => 'qt_TQPtrCollection*',
-'TQPtrDict*' => 'qt_TQPtrDict*',
-'TQPtrDictIterator*' => 'qt_TQPtrDictIterator*',
-'TQPtrList*' => 'qt_TQPtrList*',
-'TQPtrListIterator*' => 'qt_TQPtrListIterator*',
-'TQPtrQueue*' => 'qt_TQPtrQueue*',
-'TQPtrStack*' => 'qt_TQPtrStack*',
-'TQPtrVector*' => 'qt_TQPtrVector*',
-'TQPushButton*' => 'qt_TQPushButton*',
-'TQQueue*' => 'qt_TQQueue*',
+'TQProcess*' => 'qt_QProcess*',
+'TQProgressBar*' => 'qt_QProgressBar*',
+'TQProgressDialog*' => 'qt_QProgressDialog*',
+'TQPtrBucket*' => 'qt_QPtrBucket*',
+'TQPtrCollection&' => 'qt_QPtrCollection*',
+'TQPtrCollection*' => 'qt_QPtrCollection*',
+'TQPtrDict*' => 'qt_QPtrDict*',
+'TQPtrDictIterator*' => 'qt_QPtrDictIterator*',
+'TQPtrList*' => 'qt_QPtrList*',
+'TQPtrListIterator*' => 'qt_QPtrListIterator*',
+'TQPtrQueue*' => 'qt_QPtrQueue*',
+'TQPtrStack*' => 'qt_QPtrStack*',
+'TQPtrVector*' => 'qt_QPtrVector*',
+'TQPushButton*' => 'qt_QPushButton*',
+'TQQueue*' => 'qt_QQueue*',
 'TQRESULT' => 'long',
-'TQRadioButton*' => 'qt_TQRadioButton*',
-'TQRangeControl*' => 'qt_TQRangeControl*',
-'TQRect&' => 'qt_TQRect*',
-'TQRect' => 'qt_TQRect*',
-'TQRect*' => 'qt_TQRect*',
-'TQRegExp&' => 'qt_TQRegExp*',
-'TQRegExp*' => 'qt_TQRegExp*',
-'TQRegExpValidator*' => 'qt_TQRegExpValidator*',
-'TQRegion&' => 'qt_TQRegion *',
-'TQRegion' => 'qt_TQRegion *',
-'TQRegion*' => 'qt_TQRegion*',
-'TQRegionData*' => 'qt_TQRegionData*',
-'TQRemoteFactory*' => 'qt_TQRemoteFactory*',
-'TQRemotePlugin*' => 'qt_TQRemotePlugin*',
-'TQResizeEvent*'  => 'qt_TQResizeEvent*' ,
+'TQRadioButton*' => 'qt_QRadioButton*',
+'TQRangeControl*' => 'qt_QRangeControl*',
+'TQRect&' => 'qt_QRect*',
+'TQRect' => 'qt_QRect*',
+'TQRect*' => 'qt_QRect*',
+'TQRegExp&' => 'qt_QRegExp*',
+'TQRegExp*' => 'qt_QRegExp*',
+'TQRegExpValidator*' => 'qt_QRegExpValidator*',
+'TQRegion&' => 'qt_QRegion*',
+'TQRegion' => 'qt_QRegion*',
+'TQRegion*' => 'qt_QRegion*',
+'TQRegionData*' => 'qt_QRegionData*',
+'TQRemoteFactory*' => 'qt_QRemoteFactory*',
+'TQRemotePlugin*' => 'qt_QRemotePlugin*',
+'TQResizeEvent*'  => 'qt_QResizeEvent*' ,
 'TQRgb' => 'unsigned int',
-'TQRgb*' => 'int *',
-'TQRichText&'  =>  'qt_TQRichText*' ,
-'TQSGIStyle*' => 'qt_TQSGIStyle*',
-'TQScrollBar&'  =>  'qt_TQScrollBar*' ,
-'TQScrollBar*'  =>  'qt_TQScrollBar*' ,
-'TQScrollView*' => 'qt_TQScrollView*',
-'TQSemaphore*' => 'qt_TQSemaphore*',
-'TQSemiModal*' => 'qt_TQSemiModal*',
-'TQSenderObject*' => 'qt_TQSenderObject*',
-'TQServerSocket*' => 'qt_TQServerSocket*',
-'TQSessionManager&'  =>  'qt_TQSessionManager*' ,
-'TQSessionManager*' => 'qt_TQSessionManager*',
-'TQSettings*' => 'qt_TQSettings*',
-'TQShared*' => 'qt_TQShared*',
-'TQShowEvent*'  =>  'qt_TQShowEvent*' ,
-'TQSignal*' => 'qt_TQSignal *',
-'TQSignalDict&'  => 'qt_TQSignalDict*' ,
-'TQSignalDict*' => 'qt_TQSignalDict*',
-'TQSignalDictIt&'  => 'qt_TQSignalDictIt*' ,
-'TQSignalDictIt*' => 'qt_TQSignalDictIt*',
-'TQSignalMapper*' => 'qt_TQSignalMapper*',
-'TQSignalVec&' => 'qt_TQSignalVec*',
-'TQSignalVec*' => 'qt_TQSignalVec*',
-'TQSimpleRichText*' => 'qt_TQSimpleRichText*',
-'TQSize&' => 'qt_TQSize *',
-'TQSize' => 'qt_TQSize *',
-'TQSize*'  => 'qt_TQSize*' ,
-'TQSizeGrip*' => 'qt_TQSizeGrip*',
-'TQSizePolicy&'  =>  'qt_TQSizePolicy*' ,
-'TQSizePolicy'  =>  'qt_TQSizePolicy*' ,
-'TQSizePolicy*' => 'qt_TQSizePolicy*',
+'TQRgb*' => 'int*',
+'TQRichText&'  =>  'qt_QRichText*' ,
+'TQSGIStyle*' => 'qt_QSGIStyle*',
+'TQScrollBar&'  =>  'qt_QScrollBar*' ,
+'TQScrollBar*'  =>  'qt_QScrollBar*' ,
+'TQScrollView*' => 'qt_QScrollView*',
+'TQSemaphore*' => 'qt_QSemaphore*',
+'TQSemiModal*' => 'qt_QSemiModal*',
+'TQSenderObject*' => 'qt_QSenderObject*',
+'TQServerSocket*' => 'qt_QServerSocket*',
+'TQSessionManager&'  =>  'qt_QSessionManager*' ,
+'TQSessionManager*' => 'qt_QSessionManager*',
+'TQSettings*' => 'qt_QSettings*',
+'TQShared*' => 'qt_QShared*',
+'TQShowEvent*'  =>  'qt_QShowEvent*' ,
+'TQSignal*' => 'qt_QSignal*',
+'TQSignalDict&'  => 'qt_QSignalDict*' ,
+'TQSignalDict*' => 'qt_QSignalDict*',
+'TQSignalDictIt&'  => 'qt_QSignalDictIt*' ,
+'TQSignalDictIt*' => 'qt_QSignalDictIt*',
+'TQSignalMapper*' => 'qt_QSignalMapper*',
+'TQSignalVec&' => 'qt_QSignalVec*',
+'TQSignalVec*' => 'qt_QSignalVec*',
+'TQSimpleRichText*' => 'qt_QSimpleRichText*',
+'TQSize&' => 'qt_QSize*',
+'TQSize' => 'qt_QSize*',
+'TQSize*'  => 'qt_QSize*' ,
+'TQSizeGrip*' => 'qt_QSizeGrip*',
+'TQSizePolicy&'  =>  'qt_QSizePolicy*' ,
+'TQSizePolicy'  =>  'qt_QSizePolicy*' ,
+'TQSizePolicy*' => 'qt_QSizePolicy*',
 'TQSizePolicy::ExpandData'  =>  'int' ,
 'TQSizePolicy::SizeTypehData::Minimum'  =>  'int' ,
 'TQSizePolicy::SizeTypevData::Minimum'  =>  'int' ,
-'TQSjisCodec*' => 'qt_TQSjisCodec*',
-'TQSlider*' => 'qt_TQSlider*',
-'TQSmartPtr&'  =>  'qt_TQSmartPtr*' ,
-'TQSmartPtr*' => 'qt_TQSmartPtr*',
-'TQSmartPtrPrivate*' => 'qt_TQSmartPtrPrivate*',
-'TQSocket*' => 'qt_TQSocket*',
-'TQSocketDevice*'  =>  'qt_TQSocketDevice*' ,
-'TQSocketNotifier*' => 'qt_TQSocketNotifier*',
+'TQSjisCodec*' => 'qt_QSjisCodec*',
+'TQSlider*' => 'qt_QSlider*',
+'TQSmartPtr&'  =>  'qt_QSmartPtr*' ,
+'TQSmartPtr*' => 'qt_QSmartPtr*',
+'TQSmartPtrPrivate*' => 'qt_QSmartPtrPrivate*',
+'TQSocket*' => 'qt_QSocket*',
+'TQSocketDevice*'  =>  'qt_QSocketDevice*' ,
+'TQSocketNotifier*' => 'qt_QSocketNotifier*',
 'TQSocketNotifier::Type' => 'int',
-'TQSortedList*' => 'qt_TQSortedList*',
-'TQSound*' => 'qt_TQSound*',
-'TQSpacerItem*'  =>  'qt_TQSpacerItem*' ,
-'TQSpinBox*' => 'qt_TQSpinBox*',
-'TQSpinWidget*' => 'qt_TQSpinWidget*',
-'TQSplitter*' => 'qt_TQSplitter*',
-'TQSql*' => 'qt_TQSql*',
+'TQSortedList*' => 'qt_QSortedList*',
+'TQSound*' => 'qt_QSound*',
+'TQSpacerItem*'  =>  'qt_QSpacerItem*' ,
+'TQSpinBox*' => 'qt_QSpinBox*',
+'TQSpinWidget*' => 'qt_QSpinWidget*',
+'TQSplitter*' => 'qt_QSplitter*',
+'TQSql*' => 'qt_QSql*',
 'TQSql::Confirm' => 'int',
 'TQSql::Op' => 'int',
-'TQSqlCursor&' => 'qt_TQSqlCursor*',
-'TQSqlCursor' => 'qt_TQSqlCursor*',
-'TQSqlCursor*' => 'qt_TQSqlCursor*',
-'TQSqlDatabase*' => 'qt_TQSqlDatabase*',
-'TQSqlDriver*' => 'qt_TQSqlDriver*',
-'TQSqlDriverCreator*' => 'qt_TQSqlDriverCreator*',
-'TQSqlDriverCreatorBase*' => 'qt_TQSqlDriverCreatorBase*',
-'TQSqlDriverFactoryInterface*' => 'qt_TQSqlDriverFactoryInterface*',
-'TQSqlDriverPlugin*' => 'qt_TQSqlDriverPlugin*',
-'TQSqlEditorFactory*' => 'qt_TQSqlEditorFactory*',
-'TQSqlError&' => 'qt_TQSqlError*',
-'TQSqlError' => 'qt_TQSqlError*',
-'TQSqlError*' => 'qt_TQSqlError*',
-'TQSqlField&' => 'qt_TQSqlField*',
-'TQSqlField' => 'qt_TQSqlField*',
-'TQSqlField*' => 'qt_TQSqlField*',
-'TQSqlFieldInfo&' => 'qt_TQSqlFieldInfo*',
-'TQSqlFieldInfo*' => 'qt_TQSqlFieldInfo*',
-'TQSqlForm' => 'qt_TQSqlForm*',
-'TQSqlForm*' => 'qt_TQSqlForm*',
-'TQSqlIndex&' => 'qt_TQSqlIndex*',
-'TQSqlIndex' => 'qt_TQSqlIndex*',
-'TQSqlIndex*' => 'qt_TQSqlIndex*',
-'TQSqlPropertyMap*' => 'qt_TQSqlPropertyMap*',
-'TQSqlQuery&' => 'qt_TQSqlQuery*',
-'TQSqlQuery' => 'qt_TQSqlQuery*',
-'TQSqlQuery*' => 'qt_TQSqlQuery*',
-'TQSqlRecord&' => 'qt_TQSqlRecord*',
-'TQSqlRecord' => 'qt_TQSqlRecord*',
-'TQSqlRecord*' => 'qt_TQSqlRecord*',
-'TQSqlRecordInfo&' => 'qt_TQSqlRecordInfo*',
-'TQSqlRecordInfo' => 'qt_TQSqlRecordInfo*',
-'TQSqlRecordInfo*' => 'qt_TQSqlRecordInfo*',
-'TQSqlRecordPrivate*' => 'qt_TQSqlRecordPrivate*',
-'TQSqlRecordShared*' => 'qt_TQSqlRecordShared*',
-'TQSqlResult' => 'qt_TQSqlResult*',
-'TQSqlResult*' => 'qt_TQSqlResult*',
-'TQSqlResultShared*' => 'qt_TQSqlResultShared*',
-'TQStack*' => 'qt_TQStack*',
-'TQStatusBar*'  => 'qt_TQStatusBar*' ,
-'TQStoredDrag*' => 'qt_TQStoredDrag*',
-'TQStrIList' => 'kde_TQStrIList',
-'TQStrIList*' => 'qt_TQStrIList*',
-'TQStrIVec*' => 'qt_TQStrIVec*',
-'TQStrList&' => 'qt_TQStrList *',
-'TQStrList' => 'qt_TQStrList *',
-'TQStrList*' => 'qt_TQStrList *',
-'TQStrListIterator*' => 'qt_TQStrListIterator*',
-'TQStrVec*' => 'qt_TQStrVec*',
-'TQString&' => 'qt_TQString *',
-'TQString&::null'  =>  'qt_TQString*' ,
-'TQString&button0Text::null'  =>  'qt_TQString*' ,
-'TQString&button1Text::null'  =>  'qt_TQString*' ,
-'TQString&button2Text::null'  =>  'qt_TQString*' ,
-'TQString&buttonText::null'  =>  'qt_TQString*' ,
-'TQString&caption::null'  =>  'qt_TQString*' ,
-'TQString&charSet::null'  =>  'qt_TQString*' ,
-'TQString&context::null'  =>  'qt_TQString*' ,
-'TQString&defValue::null'  =>  'qt_TQString*' ,
-'TQString&dir::null'  =>  'qt_TQString*' ,
-'TQString&directory::null'  =>  'qt_TQString*' ,
-'TQString&filter::null'  =>  'qt_TQString*' ,
-'TQString&initially::null'  =>  'qt_TQString*' ,
-'TQString&location::null'  =>  'qt_TQString*' ,
-'TQString&n::null'  =>  'qt_TQString*' ,
-'TQString&nameFilter::null'  =>  'qt_TQString*' ,
-'TQString&noButtonText::null'  =>  'qt_TQString*' ,
-'TQString&search_delimiters::null'  =>  'qt_TQString*' ,
-'TQString&style::null'  =>  'qt_TQString*' ,
-'TQString&suffix::null'  =>  'qt_TQString*' ,
-'TQString&text::null'  =>  'qt_TQString*' ,
-'TQString&text_::null'  =>  'qt_TQString*' ,
-'TQString&translation::null'  =>  'qt_TQString*' ,
-'TQString&yesButtonText::null'  =>  'qt_TQString*' ,
-'TQString' => 'qt_TQString *',
-'TQString*'  => 'qt_TQString*' ,
-'TQString::null'  =>  'qt_TQString_null()' ,
-'TQStringBucket*' => 'qt_TQStringBucket*',
-'TQStringData*' => 'qt_TQStringData*',
-'TQStringList&'  =>  'qt_TQStringList*' ,
-'TQStringList'  =>  'qt_TQStringList*' ,
-'TQStringList*'  => 'qt_TQStringList*' ,
-'TQStringcharSetName::null'  =>  'qt_TQStringcharSetName*' ,
-'TQStyle&'  =>  'qt_TQStyle*' ,
-'TQStyle*'  =>  'qt_TQStyle*' ,
+'TQSqlCursor&' => 'qt_QSqlCursor*',
+'TQSqlCursor' => 'qt_QSqlCursor*',
+'TQSqlCursor*' => 'qt_QSqlCursor*',
+'TQSqlDatabase*' => 'qt_QSqlDatabase*',
+'TQSqlDriver*' => 'qt_QSqlDriver*',
+'TQSqlDriverCreator*' => 'qt_QSqlDriverCreator*',
+'TQSqlDriverCreatorBase*' => 'qt_QSqlDriverCreatorBase*',
+'TQSqlDriverFactoryInterface*' => 'qt_QSqlDriverFactoryInterface*',
+'TQSqlDriverPlugin*' => 'qt_QSqlDriverPlugin*',
+'TQSqlEditorFactory*' => 'qt_QSqlEditorFactory*',
+'TQSqlError&' => 'qt_QSqlError*',
+'TQSqlError' => 'qt_QSqlError*',
+'TQSqlError*' => 'qt_QSqlError*',
+'TQSqlField&' => 'qt_QSqlField*',
+'TQSqlField' => 'qt_QSqlField*',
+'TQSqlField*' => 'qt_QSqlField*',
+'TQSqlFieldInfo&' => 'qt_QSqlFieldInfo*',
+'TQSqlFieldInfo*' => 'qt_QSqlFieldInfo*',
+'TQSqlForm' => 'qt_QSqlForm*',
+'TQSqlForm*' => 'qt_QSqlForm*',
+'TQSqlIndex&' => 'qt_QSqlIndex*',
+'TQSqlIndex' => 'qt_QSqlIndex*',
+'TQSqlIndex*' => 'qt_QSqlIndex*',
+'TQSqlPropertyMap*' => 'qt_QSqlPropertyMap*',
+'TQSqlQuery&' => 'qt_QSqlQuery*',
+'TQSqlQuery' => 'qt_QSqlQuery*',
+'TQSqlQuery*' => 'qt_QSqlQuery*',
+'TQSqlRecord&' => 'qt_QSqlRecord*',
+'TQSqlRecord' => 'qt_QSqlRecord*',
+'TQSqlRecord*' => 'qt_QSqlRecord*',
+'TQSqlRecordInfo&' => 'qt_QSqlRecordInfo*',
+'TQSqlRecordInfo' => 'qt_QSqlRecordInfo*',
+'TQSqlRecordInfo*' => 'qt_QSqlRecordInfo*',
+'TQSqlRecordPrivate*' => 'qt_QSqlRecordPrivate*',
+'TQSqlRecordShared*' => 'qt_QSqlRecordShared*',
+'TQSqlResult' => 'qt_QSqlResult*',
+'TQSqlResult*' => 'qt_QSqlResult*',
+'TQSqlResultShared*' => 'qt_QSqlResultShared*',
+'TQStack*' => 'qt_QStack*',
+'TQStatusBar*'  => 'qt_QStatusBar*' ,
+'TQStoredDrag*' => 'qt_QStoredDrag*',
+'TQStrIList' => 'kde_QStrIList',
+'TQStrIList*' => 'qt_QStrIList*',
+'TQStrIVec*' => 'qt_QStrIVec*',
+'TQStrList&' => 'qt_QStrList*',
+'TQStrList' => 'qt_QStrList*',
+'TQStrList*' => 'qt_QStrList*',
+'TQStrListIterator*' => 'qt_QStrListIterator*',
+'TQStrVec*' => 'qt_QStrVec*',
+'TQString&' => 'qt_QString*',
+'TQString&::null'  =>  'qt_QString*' ,
+'TQString&button0Text::null'  =>  'qt_QString*' ,
+'TQString&button1Text::null'  =>  'qt_QString*' ,
+'TQString&button2Text::null'  =>  'qt_QString*' ,
+'TQString&buttonText::null'  =>  'qt_QString*' ,
+'TQString&caption::null'  =>  'qt_QString*' ,
+'TQString&charSet::null'  =>  'qt_QString*' ,
+'TQString&context::null'  =>  'qt_QString*' ,
+'TQString&defValue::null'  =>  'qt_QString*' ,
+'TQString&dir::null'  =>  'qt_QString*' ,
+'TQString&directory::null'  =>  'qt_QString*' ,
+'TQString&filter::null'  =>  'qt_QString*' ,
+'TQString&initially::null'  =>  'qt_QString*' ,
+'TQString&location::null'  =>  'qt_QString*' ,
+'TQString&n::null'  =>  'qt_QString*' ,
+'TQString&nameFilter::null'  =>  'qt_QString*' ,
+'TQString&noButtonText::null'  =>  'qt_QString*' ,
+'TQString&search_delimiters::null'  =>  'qt_QString*' ,
+'TQString&style::null'  =>  'qt_QString*' ,
+'TQString&suffix::null'  =>  'qt_QString*' ,
+'TQString&text::null'  =>  'qt_QString*' ,
+'TQString&text_::null'  =>  'qt_QString*' ,
+'TQString&translation::null'  =>  'qt_QString*' ,
+'TQString&yesButtonText::null'  =>  'qt_QString*' ,
+'TQString' => 'qt_QString*',
+'TQString*'  => 'qt_QString*' ,
+'TQString::null'  =>  'qt_QString_null()' ,
+'TQStringBucket*' => 'qt_QStringBucket*',
+'TQStringData*' => 'qt_QStringData*',
+'TQStringList&'  =>  'qt_QStringList*' ,
+'TQStringList'  =>  'qt_QStringList*' ,
+'TQStringList*'  => 'qt_QStringList*' ,
+'TQStringcharSetName::null'  =>  'qt_QStringcharSetName*' ,
+'TQStyle&'  =>  'qt_QStyle*' ,
+'TQStyle*'  =>  'qt_QStyle*' ,
 'TQStyle::ScrollControl'  => 'int' ,
 'TQStyle::StylePixmap' => 'int',
 'TQStyle::SubControl' => 'int',
 'TQStyle::SubRect' => 'int',
-'TQStyleFactory*' => 'qt_TQStyleFactory*',
-'TQStyleFactoryInterface*' => 'qt_TQStyleFactoryInterface*',
-'TQStyleHintReturn*' => 'qt_TQStyleHintReturn*',
+'TQStyleFactory*' => 'qt_QStyleFactory*',
+'TQStyleFactoryInterface*' => 'qt_QStyleFactoryInterface*',
 'TQStyleOption&' => 'int',
 'TQStyleOption' => 'int',
 'TQStyleOption*' => 'int*',
-'TQStylePlugin*' => 'qt_TQStylePlugin*',
-'TQStyleSheet*'  =>  'qt_TQStyleSheet*' ,
-'TQStyleSheetItem&'  =>  'qt_TQStyleSheetItem*' ,
-'TQStyleSheetItem*'  =>  'qt_TQStyleSheetItem*' ,
+'TQStylePlugin*' => 'qt_QStylePlugin*',
+'TQStyleSheet*'  =>  'qt_QStyleSheet*' ,
+'TQStyleSheetItem&'  =>  'qt_QStyleSheetItem*' ,
+'TQStyleSheetItem*'  =>  'qt_QStyleSheetItem*' ,
 'TQStyleSheetItem::DisplayMode*' => 'int',
 'TQStyleSheetItem::ListStyle*' => 'int',
 'TQStyleSheetItem::WhiteSpaceMode' => 'int',
-'TQTSCIICodec*' => 'qt_TQTSCIICodec*',
+'TQTSCIICodec*' => 'qt_QTSCIICodec*',
 'TQTSMFI'  =>  'int' ,
-'TQTab*' => 'qt_TQTab*',
-'TQTabBar*'  =>  'qt_TQTabBar*' ,
+'TQTab*' => 'qt_QTab*',
+'TQTabBar*'  =>  'qt_QTabBar*' ,
 'TQTabBar::Shape'  => 'int' ,
-'TQTabDialog*' => 'qt_TQTabDialog*',
-'TQTabWidget*' => 'qt_TQTabWidget*',
-'TQTable*'  =>  'qt_TQTable*' ,
-'TQTableHeader*' => 'qt_TQTableHeader*',
-'TQTableItem*'  =>  'qt_TQTableItem*' ,
-'TQTableSelection&'  =>  'qt_TQTableSelection*' ,
-'TQTableSelection'  =>  'qt_TQTableSelection*' ,
-'TQTableSelection*' => 'qt_TQTableSelection*',
-'TQTableView*' => 'qt_TQTableView*',
-'TQTabletEvent*' => 'qt_TQTabletEvent*',
-'TQTextBrowser*' => 'qt_TQTextBrowser*',
-'TQTextCodec*'  =>  'qt_TQTextCodec*' ,
-'TQTextCodecFactory*' => 'qt_TQTextCodecFactory*',
-'TQTextCodecFactoryInterface*' => 'qt_TQTextCodecFactoryInterface*',
-'TQTextCodecPlugin*' => 'qt_TQTextCodecPlugin*',
-'TQTextCursor*' => 'qt_TQTextCursor*',
-'TQTextDecoder*'  =>  'qt_TQTextDecoder*' ,
-'TQTextDocument*' => 'qt_TQTextDocument*',
-'TQTextDrag*' => 'qt_TQTextDrag*',
-'TQTextEdit*' => 'qt_TQTextEdit*',
-'TQTextEncoder*'  =>  'qt_TQTextEncoder*' ,
-'TQTextFormat*' => 'qt_TQTextFormat*',
-'TQTextIStream*' => 'qt_TQTextIStream*',
-'TQTextOStream&'  =>  'qt_TQTextOStream*' ,
-'TQTextOStream*' => 'qt_TQTextOStream*',
-'TQTextOStreamIterator*' => 'qt_TQTextOStreamIterator*',
-'TQTextParag**' => 'qt_TQTextParag**',
-'TQTextStream&'  => 'qt_TQTextStream*' ,
-'TQTextStream*'  => 'qt_TQTextStream*' ,
-'TQTextView*' => 'qt_TQTextView*',
-'TQThread*' => 'qt_TQThread*',
-'TQThreadData*' => 'qt_TQThreadData*',
-'TQThreadEvent*' => 'qt_TQThreadEvent*',
-'TQTime&' => 'qt_TQTime *',
-'TQTime' => 'qt_TQTime *',
-'TQTime*' => 'qt_TQTime*',
-'TQTimeEdit*' => 'qt_TQTimeEdit*',
-'TQTimeWatch*' => 'qt_TQTimeWatch*',
-'TQTimer*' => 'qt_TQTimer*',
-'TQTimerEvent*'  => 'qt_TQTimerEvent*' ,
-'TQToolBar*'  => 'qt_TQToolBar*' ,
-'TQToolButton*'  =>  'qt_TQToolButton*' ,
-'TQToolTip*' => 'qt_TQToolTip*',
-'TQToolTipGroup*' => 'qt_TQToolTipGroup *',
-'TQTranslator*'  =>  'qt_TQTranslator*' ,
-'TQTranslatorMessage&'  =>  'qt_TQTranslatorMessage*' ,
-'TQTranslatorMessage'  =>  'qt_TQTranslatorMessage*' ,
-'TQTranslatorMessage*' => 'qt_TQTranslatorMessage*',
-'TQTsciiCodec*' => 'qt_TQTsciiCodec*',
-'TQUObject*' => 'qt_TQUObject*',
-'TQUnknownInterface*' => 'qt_TQUnknownInterface*',
-'TQUnknownInterface**' => 'qt_TQUnknownInterface**',
-'TQUriDrag*' => 'qt_TQUriDrag*',
-'TQUrl&'  =>  'qt_TQUrl*' ,
-'TQUrl'  =>  'qt_TQUrl*' ,
-'TQUrl*' => 'qt_TQUrl*',
-'TQUrlInfo&'  =>  'qt_TQUrlInfo*' ,
-'TQUrlInfo'  =>  'qt_TQUrlInfo*' ,
-'TQUrlInfo*' => 'qt_TQUrlInfo*',
-'TQUrlOperator&'  =>  'qt_TQUrlOperator*' ,
-'TQUrlOperator*'  =>  'qt_TQUrlOperator*' ,
-'TQUtf16Codec*' => 'qt_TQUtf16Codec*',
-'TQUtf8Codec*' => 'qt_TQUtf8Codec*',
-'TQUuid&' => 'qt_TQUuid*',
-'TQUuid*' => 'qt_TQUuid*',
-'TQVBox*'  => 'qt_TQVBox*' ,
-'TQVBoxLayout*' => 'qt_TQVBoxLayout*',
-'TQVButtonGroup*' => 'qt_TQVButtonGroup*',
-'TQVFbHeader*' => 'qt_TQVFbHeader*',
-'TQVFbKeyData*' => 'qt_TQVFbKeyData*',
-'TQVGroupBox*' => 'qt_TQVGroupBox*',
-'TQValidator*' => 'qt_TQValidator *',
+'TQTabDialog*' => 'qt_QTabDialog*',
+'TQTabWidget*' => 'qt_QTabWidget*',
+'TQTable*'  =>  'qt_QTable*' ,
+'TQTableHeader*' => 'qt_QTableHeader*',
+'TQTableItem*'  =>  'qt_QTableItem*' ,
+'TQTableSelection&'  =>  'qt_QTableSelection*' ,
+'TQTableSelection'  =>  'qt_QTableSelection*' ,
+'TQTableSelection*' => 'qt_QTableSelection*',
+'TQTableView*' => 'qt_QTableView*',
+'TQTabletEvent*' => 'qt_QTabletEvent*',
+'TQTextBrowser*' => 'qt_QTextBrowser*',
+'TQTextCodec*'  =>  'qt_QTextCodec*' ,
+'TQTextCodecFactory*' => 'qt_QTextCodecFactory*',
+'TQTextCodecFactoryInterface*' => 'qt_QTextCodecFactoryInterface*',
+'TQTextCodecPlugin*' => 'qt_QTextCodecPlugin*',
+'TQTextCursor*' => 'qt_QTextCursor*',
+'TQTextDecoder*'  =>  'qt_QTextDecoder*' ,
+'TQTextDocument*' => 'qt_QTextDocument*',
+'TQTextDrag*' => 'qt_QTextDrag*',
+'TQTextEdit*' => 'qt_QTextEdit*',
+'TQTextEncoder*'  =>  'qt_QTextEncoder*' ,
+'TQTextFormat*' => 'qt_QTextFormat*',
+'TQTextIStream*' => 'qt_QTextIStream*',
+'TQTextOStream&'  =>  'qt_QTextOStream*' ,
+'TQTextOStream*' => 'qt_QTextOStream*',
+'TQTextOStreamIterator*' => 'qt_QTextOStreamIterator*',
+'TQTextParag**' => 'qt_QTextParag**',
+'TQTextStream&'  => 'qt_QTextStream*' ,
+'TQTextStream*'  => 'qt_QTextStream*' ,
+'TQTextView*' => 'qt_QTextView*',
+'TQThread*' => 'qt_QThread*',
+'TQThreadData*' => 'qt_QThreadData*',
+'TQThreadEvent*' => 'qt_QThreadEvent*',
+'TQTime&' => 'qt_QTime*',
+'TQTime' => 'qt_QTime*',
+'TQTime*' => 'qt_QTime*',
+'TQTimeEdit*' => 'qt_QTimeEdit*',
+'TQTimeWatch*' => 'qt_QTimeWatch*',
+'TQTimer*' => 'qt_QTimer*',
+'TQTimerEvent*'  => 'qt_QTimerEvent*' ,
+'TQToolBar*'  => 'qt_QToolBar*' ,
+'TQToolButton*'  =>  'qt_QToolButton*' ,
+'TQToolTip*' => 'qt_QToolTip*',
+'TQToolTipGroup*' => 'qt_QToolTipGroup*',
+'TQTranslator*'  =>  'qt_QTranslator*' ,
+'TQTranslatorMessage&'  =>  'qt_QTranslatorMessage*' ,
+'TQTranslatorMessage'  =>  'qt_QTranslatorMessage*' ,
+'TQTranslatorMessage*' => 'qt_QTranslatorMessage*',
+'TQTsciiCodec*' => 'qt_QTsciiCodec*',
+'TQUObject*' => 'qt_QUObject*',
+'TQUnknownInterface*' => 'qt_QUnknownInterface*',
+'TQUnknownInterface**' => 'qt_QUnknownInterface**',
+'TQUriDrag*' => 'qt_QUriDrag*',
+'TQUrl&'  =>  'qt_QUrl*' ,
+'TQUrl'  =>  'qt_QUrl*' ,
+'TQUrl*' => 'qt_QUrl*',
+'TQUrlInfo&'  =>  'qt_QUrlInfo*' ,
+'TQUrlInfo'  =>  'qt_QUrlInfo*' ,
+'TQUrlInfo*' => 'qt_QUrlInfo*',
+'TQUrlOperator&'  =>  'qt_QUrlOperator*' ,
+'TQUrlOperator*'  =>  'qt_QUrlOperator*' ,
+'TQUtf16Codec*' => 'qt_QUtf16Codec*',
+'TQUtf8Codec*' => 'qt_QUtf8Codec*',
+'TQUuid&' => 'qt_QUuid*',
+'TQUuid*' => 'qt_QUuid*',
+'TQVBox*'  => 'qt_QVBox*' ,
+'TQVBoxLayout*' => 'qt_QVBoxLayout*',
+'TQVButtonGroup*' => 'qt_QVButtonGroup*',
+'TQVFbHeader*' => 'qt_QVFbHeader*',
+'TQVFbKeyData*' => 'qt_QVFbKeyData*',
+'TQVGroupBox*' => 'qt_QVGroupBox*',
+'TQValidator*' => 'qt_QValidator*',
 'TQValidator::State' => 'int',
-'TQValueList*' => 'qt_TQValueList*',
-'TQValueListConstIterator*' => 'qt_TQValueListConstIterator*',
-'TQValueListIterator*' => 'qt_TQValueListIterator*',
-'TQValueListNode*' => 'qt_TQValueListNode*',
-'TQValueListPrivate*' => 'qt_TQValueListPrivate*',
-'TQValueStack*' => 'qt_TQValueStack*',
-'TQValueVector*' => 'qt_TQValueVector*',
-'TQValueVectorPrivate*' => 'qt_TQValueVectorPrivate*',
-'TQVariant&' => 'qt_TQVariant *',
-'TQVariant' => 'qt_TQVariant *',
-'TQVariant*' => 'qt_TQVariant*',
+'TQValueList*' => 'qt_QValueList*',
+'TQValueListConstIterator*' => 'qt_QValueListConstIterator*',
+'TQValueListIterator*' => 'qt_QValueListIterator*',
+'TQValueListNode*' => 'qt_QValueListNode*',
+'TQValueListPrivate*' => 'qt_QValueListPrivate*',
+'TQValueStack*' => 'qt_QValueStack*',
+'TQValueVector*' => 'qt_QValueVector*',
+'TQValueVectorPrivate*' => 'qt_QValueVectorPrivate*',
+'TQVariant&' => 'qt_QVariant*',
+'TQVariant' => 'qt_QVariant*',
+'TQVariant*' => 'qt_QVariant*',
 'TQVariant::Type'  => 'int' ,
-'TQVariantPrivate*'  =>  'qt_TQVariantPrivate*' ,
-'TQVector*' => 'qt_TQVector*',
-'TQWMatrix&' => 'qt_TQWMatrix *',
-'TQWMatrix' => 'qt_TQWMatrix *',
-'TQWMatrix*' => 'qt_TQWMatrix*',
-'TQWSDecoration&'  =>  'qt_TQWSDecoration*' ,
-'TQWSDecoration*'  =>  'qt_TQWSDecoration*' ,
-'TQWSDisplay*'  =>  'qt_TQWSDisplay*' ,
-'TQWSEvent*'  =>  'qt_TQWSEvent*' ,
-'TQWaitCondition*' => 'qt_TQWaitCondition*',
-'TQWhatsThis*' => 'qt_TQWhatsThis*',
-'TQWheelEvent*'  =>  'qt_TQWheelEvent*' ,
-'TQWidget *' => 'qt_TQWidget *',
-'TQWidget' => 'qt_TQWidget *',
-'TQWidget*' => 'qt_TQWidget *',
-'TQWidgetFactory*' => 'qt_TQWidgetFactory*',
-'TQWidgetIntDict&'  => 'qt_TQWidgetIntDict*' ,
-'TQWidgetIntDict*' => 'qt_TQWidgetIntDict*',
-'TQWidgetIntDictIt&'  => 'qt_TQWidgetIntDictIt*' ,
-'TQWidgetIntDictIt*' => 'qt_TQWidgetIntDictIt*',
-'TQWidgetItem*' => 'qt_TQWidgetItem*',
-'TQWidgetList&'  => 'qt_TQWidgetList *' ,
-'TQWidgetList&'  => 'qt_TQWidgetList*' ,
-'TQWidgetList'  =>  'qt_TQWidgetList *' ,
-'TQWidgetList'  =>  'qt_TQWidgetList*' ,
-'TQWidgetList*' => 'qt_TQWidgetList *',
-'TQWidgetList*' => 'qt_TQWidgetList*',
-'TQWidgetListIt&'  => 'qt_TQWidgetListIt*' ,
-'TQWidgetListIt*' => 'qt_TQWidgetListIt*',
-'TQWidgetMapper*' => 'qt_TQWidgetMapper*',
-'TQWidgetPlugin*' => 'qt_TQWidgetPlugin*',
-'TQWidgetStack*' => 'qt_TQWidgetStack*',
-'TQWindowsMime*'  =>  'qt_TQWindowsMime*' ,
-'TQWindowsStyle*' => 'qt_TQWindowsStyle*',
-'TQWizard*' => 'qt_TQWizard*',
-'TQWorkspace*' => 'qt_TQWorkspace*',
-'TQXEmbed*'  =>  'qt_TQXEmbed*' ,
-'TQXmlAttributes&'  =>  'qt_TQXmlAttributes*' ,
-'TQXmlAttributes*' => 'qt_TQXmlAttributes*',
-'TQXmlContentHandler*'  =>  'qt_TQXmlContentHandler*' ,
-'TQXmlDTDHandler*'  =>  'qt_TQXmlDTDHandler*' ,
-'TQXmlDeclHandler*'  =>  'qt_TQXmlDeclHandler*' ,
-'TQXmlDefaultHandler*' => 'qt_TQXmlDefaultHandler*',
-'TQXmlEntityResolver*'  =>  'qt_TQXmlEntityResolver*' ,
-'TQXmlErrorHandler*'  =>  'qt_TQXmlErrorHandler*' ,
-'TQXmlInputSource&'  =>  'qt_TQXmlInputSource*' ,
-'TQXmlInputSource*&' => 'qt_TQXmlInputSource*',
-'TQXmlInputSource*'  =>  'qt_TQXmlInputSource*' ,
-'TQXmlLexicalHandler*'  =>  'qt_TQXmlLexicalHandler*' ,
-'TQXmlLocator*'  =>  'qt_TQXmlLocator*' ,
-'TQXmlNamespaceSupport*' => 'qt_TQXmlNamespaceSupport*',
-'TQXmlParseException&'  =>  'qt_TQXmlParseException*' ,
-'TQXmlParseException*' => 'qt_TQXmlParseException*',
-'TQXmlReader*' => 'qt_TQXmlReader*',
-'TQXmlSimpleReader*'  =>  'qt_TQXmlSimpleReader*' ,
-'TQXtApplication*' => 'qt_TQXtApplication*',
-'TQXtWidget*' => 'qt_TQXtWidget*',
-'TTQ_INT16&' => 'short',
-'TTQ_INT16' => 'short',
-'TTQ_INT32&' => 'int',
-'TTQ_INT32' => 'int',
-'TTQ_INT8&' => 'char',
-'TTQ_INT8' => 'char',
-'TTQ_LONG&' => 'long',
-'TTQ_LONG' => 'long',
-'TTQ_PACKED*' => 'void*',
-'TTQ_UINT16&' => 'unsigned short',
-'TTQ_UINT16' => 'unsigned short',
-'TTQ_UINT32&' => 'unsigned int',
-'TTQ_UINT32' => 'unsigned int',
-'TTQ_UINT8&' => 'unsigned char',
-'TTQ_UINT8' => 'unsigned char',
-'TTQ_UINT8*'  =>  'unsigned char*' ,
-'TTQ_ULONG&' => 'long',
-'TTQ_ULONG' => 'long',
-'TQt*'  =>  'qt_TQt*' ,
+'TQVariantPrivate*'  =>  'qt_QVariantPrivate*' ,
+'TQVector*' => 'qt_QVector*',
+'TQWMatrix&' => 'qt_QWMatrix*',
+'TQWMatrix' => 'qt_QWMatrix*',
+'TQWMatrix*' => 'qt_QWMatrix*',
+'TQWSDecoration&'  =>  'qt_QWSDecoration*' ,
+'TQWSDecoration*'  =>  'qt_QWSDecoration*' ,
+'TQWSDisplay*'  =>  'qt_QWSDisplay*' ,
+'TQWSEvent*'  =>  'qt_QWSEvent*' ,
+'TQWaitCondition*' => 'qt_QWaitCondition*',
+'TQWhatsThis*' => 'qt_QWhatsThis*',
+'TQWheelEvent*'  =>  'qt_QWheelEvent*' ,
+'TQWidget*' => 'qt_QWidget*',
+'TQWidget' => 'qt_QWidget*',
+'TQWidget*' => 'qt_QWidget*',
+'TQWidgetFactory*' => 'qt_QWidgetFactory*',
+'TQWidgetIntDict&'  => 'qt_QWidgetIntDict*' ,
+'TQWidgetIntDict*' => 'qt_QWidgetIntDict*',
+'TQWidgetIntDictIt&'  => 'qt_QWidgetIntDictIt*' ,
+'TQWidgetIntDictIt*' => 'qt_QWidgetIntDictIt*',
+'TQWidgetItem*' => 'qt_QWidgetItem*',
+'TQWidgetList&'  => 'qt_QWidgetList*' ,
+'TQWidgetList&'  => 'qt_QWidgetList*' ,
+'TQWidgetList'  =>  'qt_QWidgetList*' ,
+'TQWidgetList'  =>  'qt_QWidgetList*' ,
+'TQWidgetList*' => 'qt_QWidgetList*',
+'TQWidgetList*' => 'qt_QWidgetList*',
+'TQWidgetListIt&'  => 'qt_QWidgetListIt*' ,
+'TQWidgetListIt*' => 'qt_QWidgetListIt*',
+'TQWidgetMapper*' => 'qt_QWidgetMapper*',
+'TQWidgetPlugin*' => 'qt_QWidgetPlugin*',
+'TQWidgetStack*' => 'qt_QWidgetStack*',
+'TQWindowsMime*'  =>  'qt_QWindowsMime*' ,
+'TQWindowsStyle*' => 'qt_QWindowsStyle*',
+'TQWizard*' => 'qt_QWizard*',
+'TQWorkspace*' => 'qt_QWorkspace*',
+'TQXEmbed*'  =>  'qt_QXEmbed*' ,
+'TQXmlAttributes&'  =>  'qt_QXmlAttributes*' ,
+'TQXmlAttributes*' => 'qt_QXmlAttributes*',
+'TQXmlContentHandler*'  =>  'qt_QXmlContentHandler*' ,
+'TQXmlDTDHandler*'  =>  'qt_QXmlDTDHandler*' ,
+'TQXmlDeclHandler*'  =>  'qt_QXmlDeclHandler*' ,
+'TQXmlDefaultHandler*' => 'qt_QXmlDefaultHandler*',
+'TQXmlEntityResolver*'  =>  'qt_QXmlEntityResolver*' ,
+'TQXmlErrorHandler*'  =>  'qt_QXmlErrorHandler*' ,
+'TQXmlInputSource&'  =>  'qt_QXmlInputSource*' ,
+'TQXmlInputSource*&' => 'qt_QXmlInputSource*',
+'TQXmlInputSource*'  =>  'qt_QXmlInputSource*' ,
+'TQXmlLexicalHandler*'  =>  'qt_QXmlLexicalHandler*' ,
+'TQXmlLocator*'  =>  'qt_QXmlLocator*' ,
+'TQXmlNamespaceSupport*' => 'qt_QXmlNamespaceSupport*',
+'TQXmlParseException&'  =>  'qt_QXmlParseException*' ,
+'TQXmlParseException*' => 'qt_QXmlParseException*',
+'TQXmlReader*' => 'qt_QXmlReader*',
+'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',
+'Q_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',
+'Qt*'  =>  'qt_Qt*' ,
 'TQt::ArrowType'  =>  'int' ,
 'TQt::BackgroundMode' => 'int',
 'TQt::DateFormat' => 'int',
@@ -2360,9 +2300,9 @@ BEGIN
 'TQt::RasterOp'  =>  'int' ,
 'TQt::UIEffect'  =>  'int' ,
 'TQt::WFlags'  =>  'int' ,
-'TQtMultiLineEdit*' => 'qt_TQtMultiLineEdit*',
-'TQtMultiLineEditRow*' => 'qt_TQtMultiLineEditRow*',
-'TQtTableView*' => 'qt_TQtTableView*',
+'QtMultiLineEdit*' => 'qt_QtMultiLineEdit*',
+'QtMultiLineEditRow*' => 'qt_QtMultiLineEditRow*',
+'QtTableView*' => 'qt_QtTableView*',
 'QwAbsSpriteFieldView*'  =>  'qt_QwAbsSpriteFieldView*' ,
 'QwClusterizer*'  =>  'qt_QwClusterizer*' ,
 'QwEllipse*' => 'qt_QwEllipse*',
@@ -2655,14 +2595,9 @@ BEGIN
 'UCharReference' => 'kde_UCharReference*',
 'UCharReference*' => 'kde_UCharReference*',
 'UDSAtom*' => 'kde_UDSAtom*',
-'UDSEntry&' => 'kde_UDSEntry*',
-'UDSEntryList&' => 'kde_UDSEntryList*',
 'UIServer*' => 'kde_UIServer*',
 'UIServer_stub*' => 'kde_UIServer_stub*',
 'ULONG_MAX' => 'ULONG_MAX',
-'URLArgs&' => 'kde_URLArgs*',
-'URLArgs' => 'kde_URLArgs*',
-'URLArgs*' => 'kde_URLArgs*',
 'UString&' => 'kde_UString*',
 'UString' => 'kde_UString*',
 'UString*' => 'kde_UString*',
@@ -2705,7 +2640,7 @@ BEGIN
 'bool&'  =>  'int' ,
 'bool' => 'int',
 'bool*' => 'int*',
-'char *' => 'char *',
+'char*' => 'char*',
 'char&'  =>  'char' ,
 'char' => 'char',
 'char* bugsEmailAddress @bugs.kde.org"' => 'String',
@@ -2739,27 +2674,13 @@ BEGIN
 'int&' => 'int',
 'int' => 'int',
 'int*' => 'int*',
+'int short' => 'short',
 'kdbgstream&'  => 'kde_Kdbgstream*' ,
 'kdbgstream*'  =>  'kde_kdbgstream*',
-'khtml*'  =>  'kde_khtml*',
-'khtml::ChildFrame*'  => 'kde_khtml_ChildFrame*' ,
-'khtml::DrawContentsEvent*'  => 'kde_khtml_DrawContentsEvent*' ,
-'khtml::MouseDoubleClickEvent*'  => 'kde_khtml_MouseDoubleClickEvent*' ,
-'khtml::MouseMoveEvent*'  => 'kde_khtml_MouseMoveEvent*' ,
-'khtml::MousePressEvent*'  => 'kde_khtml_MousePressEvent*' ,
-'khtml::MouseReleaseEvent*'  => 'kde_khtml_MouseReleaseEvent*' ,
-'khtml::RenderObject*'  => 'kde_khtml_RenderObject*' ,
-'khtml::RenderStyle*'  => 'kde_khtml_RenderStyle*' ,
-'khtml__DrawContentsEvent*'  =>  'kde_khtml__DrawContentsEvent*',
-'khtml__MouseDoubleClickEvent*'  =>  'kde_khtml__MouseDoubleClickEvent*',
-'khtml__MouseEvent*'  =>  'kde_khtml__MouseEvent*',
-'khtml__MouseMoveEvent*'  =>  'kde_khtml__MouseMoveEvent*',
-'khtml__MousePressEvent*'  =>  'kde_khtml__MousePressEvent*',
-'khtml__MouseReleaseEvent*'  =>  'kde_khtml__MouseReleaseEvent*',
 'kndbgstream&'  => 'void**' ,
 'kndbgstream*'  =>  'kde_kndbgstream*',
 'ksockaddr_in*'  => 'void*' ,
-'long _blockSize *' => 'long *',
+'long _blockSize*' => 'long*',
 'long int' => 'long',
 'long unsigned int' => 'long',
 'long&'  =>  'long' ,
@@ -2767,9 +2688,9 @@ BEGIN
 'long_blockSize*'  =>  'long_blockSize*' ,
 'longint' => 'long',
 'longunsigned int' => 'unsigned long',
-'lt_dlhandle'  =>  'void *' ,
+'lt_dlhandle'  =>  'void*' ,
 'lt_user_dlloader*'  =>  'kde_lt_user_dlloader*',
-'mcopbyte&' => 'void *',
+'mcopbyte&' => 'void*',
 'mcopbyte' => 'unsigned char',
 'mode_t _mode (mode_t) -1' => 'int',
 'mode_t'  =>  'long' ,
@@ -2794,8 +2715,8 @@ BEGIN
 'snd_seq_event_t*' => 'int*',
 'ssize_t' => 'int',
 'std*' => 'kde_std*',
-'std::string&'  =>  'char *' ,
-'std::string'  =>  'char *' ,
+'std::string&'  =>  'char*' ,
+'std::string'  =>  'char*' ,
 'time_t'  =>  'long' ,
 'timeval&' => 'int',
 'true' => '1',
@@ -2833,22 +2754,18 @@ BEGIN
 'void(*)()'  =>  'void(*)()' ,
 'void*' => 'void*',
 '~' => '~',
-'TQValueList<int>' => 'qt_TQIntValueList*',
-'TQValueList<int>&' => 'qt_TQIntValueList*',
-'TQValueList<TQIconDragItem>' => 'qt_TQIconDragItemValueList*',
-'TQValueList<TQIconDragItem>&' => 'qt_TQIconDragItemValueList*',
-'TQValueList<TQPixmap>' => 'qt_TQPixmapValueList*',
-'TQValueList<TQString>&' => 'qt_TQStringValueList*',
-'TQValueList<TQVariant>&' => 'qt_TQVariantValueList*',
-'TQValueList<TQUrlInfo>*' => 'qt_TQUrlInfoValueList*',
+'TQValueList<int>' => 'qt_QIntValueList*',
+'TQValueList<int>&' => 'qt_QIntValueList*',
+'TQValueList<TQIconDragItem>' => 'qt_QIconDragItemValueList*',
+'TQValueList<TQIconDragItem>&' => 'qt_QIconDragItemValueList*',
+'TQValueList<TQPixmap>' => 'qt_QPixmapValueList*',
+'TQValueList<TQString>&' => 'qt_QStringValueList*',
+'TQValueList<TQVariant>&' => 'qt_QVariantValueList*',
+'TQValueList<TQUrlInfo>*' => 'qt_QUrlInfoValueList*',
 'TQValueList<KDataToolInfo>&' => 'kde_KDataToolInfoValueList*',
-'TQPtrList<KAction>&' => 'kde_KActionPtrList*',
-'TQPtrList<KSSLCertificate>&' => 'kde_KSSLCertificatePtrList*',
-'TQPtrList<KXMLGUIClient>*' => 'kde_KXMLGUIClientPtrList*',
-'TQPtrList<TQDockWindow>*' => 'qt_TQDockWindowPtrList*',
-'TQPtrList<TQPixmap>' => 'qt_TQPixmapPtrList*',
-'TQPtrList<TQPoint>' => 'qt_TQPointPtrList*',
-'KService::Ptr&' => 'kde_KServicePtr*',
+'TQPtrList<TQDockWindow>*' => 'qt_QDockWindowPtrList*',
+'TQPtrList<TQPixmap>' => 'qt_QPixmapPtrList*',
+'TQPtrList<TQPoint>' => 'qt_QPointPtrList*',
 'ClassContext*' => 'kde_ClassContext*',
 'ClassStoreIface*' => 'kde_ClassStoreIface*',
 'ClipboardDocumentIface*' => 'kde_ClipboardDocumentIface*',
@@ -3021,6 +2938,22 @@ sub resolveType($$$)
 	# Look for builtin words (int etc.)
 	return $builtins{ $argType } if exists $builtins{ $argType };
 
+        # take recursive care of templated types
+	if($argType =~ /([\w_]+\s*)<(.*)>/) {
+	    my $tmpl = $2;
+            my $before = $`.$1;
+            my $after = $';
+            my @args = kdocUtil::splitUnnested( ',', $tmpl);
+            grep s/^\s+//, @args;
+            grep s/\s+$//, @args;
+            for my $a(@args) {
+		$a = resolveType( $a, $contextClass, $rootnode );
+            }
+            # normalize
+	    $argType = $before."<".join( ", ", @args).">".$after;
+		$argType =~ s/>>/> >/g;  # Nested template types must have a space
+        }
+
 	# Parse 'const' in front of it, and '*' or '&' after it
 	my $prefix = $argType =~ s/^const\s+// ? 'const ' : '';
 	my $suffix = $argType =~ s/\s*([\&\*]+)$// ? $1 : '';
@@ -3030,6 +2963,12 @@ sub resolveType($$$)
 	my $result = resolveTypeInternal( $argType, $contextClass, $rootnode );
 	return $prefix.$result.$suffix if $result;
 
+	# If the parent is a namespace, have a look there
+	if ($contextClass->{Parent} && $contextClass->{Parent}->{NodeType} eq 'namespace') {
+		$result = resolveTypeInternal( $argType, $contextClass->{Parent}, $rootnode );
+		return $prefix.$result.$suffix if $result;
+	}
+	
 	# Not found, so look as a toplevel class
 	#print "Checking that ".$argType." exists.\n";
 	return $prefix.$argType.$suffix if ( kdocAstUtil::findRef( $rootnode, $argType ) );