From e63beeb5bdb82987b1e00bc35178667786fbad48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 16:20:48 -0600 Subject: Fix incorrect conversion --- kjsembed/Doxyfile | 2 +- kjsembed/Doxyfile-Internal | 2 +- kjsembed/bindings/bindingobject.cpp | 4 +- kjsembed/bindings/bindingobject.h | 8 +- kjsembed/bindings/brush_imp.cpp | 8 +- kjsembed/bindings/dcop_imp.cpp | 420 ++++++++-------- kjsembed/bindings/dcop_imp.h | 30 +- kjsembed/bindings/iconset_imp.cpp | 26 +- kjsembed/bindings/image_imp.cpp | 42 +- kjsembed/bindings/image_imp.h | 22 +- kjsembed/bindings/kconfig_imp.cpp | 112 ++--- kjsembed/bindings/kconfig_imp.h | 98 ++-- kjsembed/bindings/movie_imp.cpp | 26 +- kjsembed/bindings/movie_imp.h | 20 +- kjsembed/bindings/netaccess_imp.cpp | 20 +- kjsembed/bindings/netaccess_imp.h | 16 +- kjsembed/bindings/painter_imp.cpp | 66 +-- kjsembed/bindings/painter_imp.h | 44 +- kjsembed/bindings/pen_imp.cpp | 8 +- kjsembed/bindings/pixmap_imp.cpp | 20 +- kjsembed/bindings/pixmap_imp.h | 18 +- kjsembed/bindings/point_imp.cpp | 8 +- kjsembed/bindings/rect_imp.cpp | 8 +- kjsembed/bindings/size_imp.cpp | 24 +- kjsembed/bindings/sql_imp.cpp | 98 ++-- kjsembed/bindings/sql_imp.h | 74 +-- kjsembed/bindwizard/Doxyfile.in | 2 +- kjsembed/builtins/qdir_imp.cpp | 136 +++--- kjsembed/builtins/qdir_imp.h | 6 +- kjsembed/builtins/qfile_imp.cpp | 48 +- kjsembed/builtins/qfile_imp.h | 8 +- kjsembed/builtins/resources.cpp | 52 +- kjsembed/builtins/resources.h | 4 +- kjsembed/builtins/saxhandler.cpp | 28 +- kjsembed/builtins/saxhandler.h | 10 +- kjsembed/builtins/stdaction_imp.cpp | 6 +- kjsembed/builtins/stddialog_imp.cpp | 16 +- kjsembed/builtins/textstream_imp.cpp | 14 +- kjsembed/builtins/textstream_imp.h | 6 +- kjsembed/cpptests/jsaccess/jsaccess.cpp | 4 +- kjsembed/customobject_imp.cpp | 220 ++++----- kjsembed/customobject_imp.h | 2 +- kjsembed/design.h | 20 +- kjsembed/docs/embedding/qtembed/main.cpp | 2 +- kjsembed/docs/embedding/qtembed/posviewimp.cpp | 2 +- kjsembed/docs/embedding/qtembed/posviewimp.h | 2 +- .../docs/embedding/simple-embed/embedviewimp.cpp | 22 +- .../docs/embedding/simple-embed/embedviewimp.h | 8 +- kjsembed/docs/examples/README | 2 +- kjsembed/docs/examples/html2text/test.htm | 10 +- kjsembed/docs/examples/imageinfo/example.html | 2 +- kjsembed/docs/examples/imageinfo/example1.htm | 2 +- kjsembed/docs/examples/imageinfo/thumbs.html | 2 +- kjsembed/docs/examples/index.html | 12 +- kjsembed/docs/features.html | 10 +- kjsembed/docs/tutorial/kjsembed.html | 10 +- kjsembed/docs/types.html | 40 +- kjsembed/doxygen_fakes.h | 10 +- kjsembed/global.cpp | 44 +- kjsembed/global.h | 14 +- kjsembed/jsbinding.cpp | 286 +++++------ kjsembed/jsbinding.h | 84 ++-- kjsembed/jsbindingbase.h | 2 +- kjsembed/jsbindingplugin.cpp | 2 +- kjsembed/jsbindingplugin.h | 6 +- kjsembed/jsbuiltin_imp.cpp | 56 +-- kjsembed/jsbuiltin_imp.h | 6 +- kjsembed/jsbuiltinproxy.cpp | 6 +- kjsembed/jsbuiltinproxy.h | 6 +- kjsembed/jsconsolewidget.cpp | 58 +-- kjsembed/jsconsolewidget.h | 26 +- kjsembed/jseventmapper.cpp | 54 +- kjsembed/jseventmapper.h | 12 +- kjsembed/jseventutils.cpp | 102 ++-- kjsembed/jseventutils.h | 30 +- kjsembed/jsfactory.cpp | 480 +++++++++--------- kjsembed/jsfactory.h | 108 ++-- kjsembed/jsfactory_imp.cpp | 62 +-- kjsembed/jsfactory_imp.h | 8 +- kjsembed/jsobjecteventproxy.cpp | 16 +- kjsembed/jsobjecteventproxy.h | 14 +- kjsembed/jsobjectproxy.cpp | 48 +- kjsembed/jsobjectproxy.h | 50 +- kjsembed/jsobjectproxy_imp.cpp | 132 ++--- kjsembed/jsobjectproxy_imp.h | 14 +- kjsembed/jsopaqueproxy.cpp | 28 +- kjsembed/jsopaqueproxy.h | 30 +- kjsembed/jsproxy.cpp | 2 +- kjsembed/jsproxy.h | 4 +- kjsembed/jssecuritypolicy.cpp | 8 +- kjsembed/jssecuritypolicy.h | 12 +- kjsembed/jsvalueproxy.cpp | 8 +- kjsembed/jsvalueproxy.h | 8 +- kjsembed/kjscmd.cpp | 14 +- kjsembed/kjsembedpart.cpp | 72 +-- kjsembed/kjsembedpart.h | 80 +-- kjsembed/kjsembedpart_imp.cpp | 8 +- kjsembed/kjsembedpart_imp.h | 6 +- kjsembed/kscript/javascript.cpp | 20 +- kjsembed/kscript/javascript.h | 24 +- kjsembed/ksimpleprocess.cpp | 20 +- kjsembed/ksimpleprocess.h | 10 +- kjsembed/plugin/jsconsoleplugin.cpp | 2 +- kjsembed/plugin/jsconsoleplugin.h | 2 +- kjsembed/plugins/customobject_plugin.cpp | 8 +- kjsembed/plugins/customobject_plugin.h | 4 +- kjsembed/plugins/customqobject_plugin.cpp | 12 +- kjsembed/plugins/customqobject_plugin.h | 14 +- kjsembed/plugins/imagefx_plugin.cpp | 176 +++---- kjsembed/plugins/imagefx_plugin.h | 24 +- kjsembed/plugins/kfileitemloader.cpp | 6 +- kjsembed/plugins/kfileitemloader.h | 2 +- kjsembed/plugins/qprocess_plugin.cpp | 52 +- kjsembed/plugins/qprocess_plugin.h | 22 +- kjsembed/qjscmd.cpp | 6 +- kjsembed/qtbindings/qcanvas_imp.cpp | 140 +++--- kjsembed/qtbindings/qcanvas_imp.h | 8 +- kjsembed/qtbindings/qcanvasellipse_imp.cpp | 52 +- kjsembed/qtbindings/qcanvasellipse_imp.h | 8 +- kjsembed/qtbindings/qcanvasitem_imp.cpp | 68 +-- kjsembed/qtbindings/qcanvasitem_imp.h | 8 +- kjsembed/qtbindings/qcanvasitemlist_imp.cpp | 26 +- kjsembed/qtbindings/qcanvasitemlist_imp.h | 8 +- kjsembed/qtbindings/qcanvasline_imp.cpp | 38 +- kjsembed/qtbindings/qcanvasline_imp.h | 8 +- kjsembed/qtbindings/qcanvaspixmap_imp.cpp | 44 +- kjsembed/qtbindings/qcanvaspixmap_imp.h | 8 +- kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp | 66 +-- kjsembed/qtbindings/qcanvaspixmaparray_imp.h | 8 +- kjsembed/qtbindings/qcanvaspolygon_imp.cpp | 34 +- kjsembed/qtbindings/qcanvaspolygon_imp.h | 8 +- kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp | 46 +- kjsembed/qtbindings/qcanvaspolygonalitem_imp.h | 8 +- kjsembed/qtbindings/qcanvasrectangle_imp.cpp | 58 +-- kjsembed/qtbindings/qcanvasrectangle_imp.h | 8 +- kjsembed/qtbindings/qcanvasspline_imp.cpp | 34 +- kjsembed/qtbindings/qcanvasspline_imp.h | 8 +- kjsembed/qtbindings/qcanvassprite_imp.cpp | 60 +-- kjsembed/qtbindings/qcanvassprite_imp.h | 8 +- kjsembed/qtbindings/qcanvastext_imp.cpp | 68 +-- kjsembed/qtbindings/qcanvastext_imp.h | 8 +- kjsembed/qtbindings/qcanvasview_imp.cpp | 60 +-- kjsembed/qtbindings/qcanvasview_imp.h | 8 +- kjsembed/qtbindings/qchecklistitem_imp.cpp | 130 ++--- kjsembed/qtbindings/qchecklistitem_imp.h | 8 +- kjsembed/qtbindings/qcombobox_imp.cpp | 114 ++--- kjsembed/qtbindings/qcombobox_imp.h | 8 +- kjsembed/qtbindings/qframe_imp.cpp | 36 +- kjsembed/qtbindings/qframe_imp.h | 2 +- kjsembed/qtbindings/qlistview_imp.cpp | 146 +++--- kjsembed/qtbindings/qlistview_imp.h | 8 +- kjsembed/qtbindings/qlistviewitem_imp.cpp | 250 +++++----- kjsembed/qtbindings/qlistviewitem_imp.h | 8 +- kjsembed/qtbindings/qmenudata_imp.cpp | 172 +++---- kjsembed/qtbindings/qmenudata_imp.h | 8 +- kjsembed/qtbindings/qmenuitem_imp.cpp | 50 +- kjsembed/qtbindings/qmenuitem_imp.h | 8 +- kjsembed/qtbindings/qpopupmenu_imp.cpp | 44 +- kjsembed/qtbindings/qpopupmenu_imp.h | 8 +- kjsembed/qtbindings/qt_imp.cpp | 10 +- kjsembed/qtstubs.cpp | 6 +- kjsembed/qtstubs.h | 12 +- kjsembed/slotproxy.cpp | 52 +- kjsembed/slotproxy.h | 44 +- kjsembed/slotutils.cpp | 244 ++++----- kjsembed/slotutils.h | 56 +-- kjsembed/tools/Doxyfile | 2 +- kjsembed/tools/coverage/allqobjects.txt | 290 +++++------ kjsembed/tools/coverage/supported.txt | 102 ++-- kjsembed/tools/coverage/unsupported.txt | 190 +++---- kjsembed/tools/headers/qbrush.h | 40 +- kjsembed/tools/headers/qcanvas.h | 544 ++++++++++----------- kjsembed/tools/headers/qdir.h | 116 ++--- kjsembed/tools/headers/qpen.h | 36 +- kjsembed/tools/headers/qtimer.h | 18 +- kjsembed/xmlactionclient.cpp | 104 ++-- kjsembed/xmlactionclient.h | 52 +- 177 files changed, 4088 insertions(+), 4088 deletions(-) (limited to 'kjsembed') diff --git a/kjsembed/Doxyfile b/kjsembed/Doxyfile index 851bbe45..9c253ddd 100644 --- a/kjsembed/Doxyfile +++ b/kjsembed/Doxyfile @@ -58,7 +58,7 @@ SHOW_USED_FILES = YES #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -TTQUIET = NO +TQUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES diff --git a/kjsembed/Doxyfile-Internal b/kjsembed/Doxyfile-Internal index 919e3d44..983323ba 100644 --- a/kjsembed/Doxyfile-Internal +++ b/kjsembed/Doxyfile-Internal @@ -268,7 +268,7 @@ SHOW_USED_FILES = YES # The TQUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. -TTQUIET = NO +TQUIET = NO # The WARNINGS tag can be used to turn on/off the warning messages that are # generated by doxygen. Possible values are YES and NO. If left blank diff --git a/kjsembed/bindings/bindingobject.cpp b/kjsembed/bindings/bindingobject.cpp index c8b2bd1a..2c280e5c 100644 --- a/kjsembed/bindings/bindingobject.cpp +++ b/kjsembed/bindings/bindingobject.cpp @@ -5,8 +5,8 @@ namespace KJSEmbed { namespace Bindings { -BindingObject::BindingObject( TTQObject *parent, const char *name ) - : TTQObject( parent, name ) +BindingObject::BindingObject( TQObject *parent, const char *name ) + : TQObject( parent, name ) { } diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h index 6a40f55c..60cb32c2 100644 --- a/kjsembed/bindings/bindingobject.h +++ b/kjsembed/bindings/bindingobject.h @@ -28,8 +28,8 @@ namespace KJSEmbed { namespace Bindings { /** - * A baseclass for TTQObject bindings. This class is currently just a - * stub, but I hope it will contain utilities for TTQObject wrapper + * A baseclass for TQObject bindings. This class is currently just a + * stub, but I hope it will contain utilities for TQObject wrapper * classes. * * @author Richard Moore, rich@kde.org @@ -40,7 +40,7 @@ class BindingObject : public TQObject Q_OBJECT public: - BindingObject( TTQObject *parent, const char *name=0 ); + BindingObject( TQObject *parent, const char *name=0 ); virtual ~BindingObject(); const char *jsClassName() const { return jsClazz; } @@ -49,7 +49,7 @@ protected: void setJSClassName( const char *clazz ) { jsClazz = clazz; } private: - TTQCString jsClazz; + TQCString jsClazz; class BindingObjectPrivate *d; }; diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp index 571d64ea..ab2eee3f 100644 --- a/kjsembed/bindings/brush_imp.cpp +++ b/kjsembed/bindings/brush_imp.cpp @@ -41,7 +41,7 @@ BrushImp::~BrushImp() void BrushImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQBrush") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQBrush") ) return; JSProxy::MethodTable methods[] = { { Methodstyle, "style"}, @@ -80,9 +80,9 @@ void BrushImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { KJS::Value BrushImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQBrush") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQBrush") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); - TTQBrush brush = op->toVariant().toBrush(); + TQBrush brush = op->toVariant().toBrush(); KJS::Value retValue = KJS::Value(); switch ( mid ) { @@ -104,7 +104,7 @@ KJS::Value BrushImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L } case MethodsetColor: { - TTQColor color = extractTQColor(exec, args, 0); + TQColor color = extractTQColor(exec, args, 0); brush.setColor(color); break; } diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index 62ffb456..9aa863e1 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -65,8 +65,8 @@ namespace KJSEmbed { namespace Bindings { KJS::Object JSDCOPRefLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const { - TTQString application = extractTQString(exec, args, 0); - TTQString object = extractTQString(exec, args, 1); + TQString application = extractTQString(exec, args, 0); + TQString object = extractTQString(exec, args, 1); JSOpaqueProxy * prx; if( application.isEmpty() ) prx= new JSOpaqueProxy( new DCOPRef(), "DCOPRef" ); @@ -157,14 +157,14 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: kdWarning() << "Not enough args..." << endl; return KJS::Boolean(false); } - TTQByteArray data, replyData; - TTQDataStream ds( replyData, IO_ReadOnly); - TTQCString type; + TQByteArray data, replyData; + TQDataStream ds( replyData, IO_ReadOnly); + TQCString type; - TTQString app = ref->app(); - TTQString interface = ref->obj(); - TTQString function = extractTQString(exec, args, 0); - TTQStringList argTypes = JSDCOPClient::getTypes( function ); + TQString app = ref->app(); + TQString interface = ref->obj(); + TQString function = extractTQString(exec, args, 0); + TQStringList argTypes = JSDCOPClient::getTypes( function ); if( args.size() > 1) for( int idx = 1; idx < args.size(); ++idx) @@ -182,12 +182,12 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: if ( args.size() < 1 ) return KJS::Boolean(false); - TTQByteArray data; - TTQString app = ref->app(); - TTQString interface = ref->obj(); - TTQString function = extractTQString(exec, args, 0); + TQByteArray data; + TQString app = ref->app(); + TQString interface = ref->obj(); + TQString function = extractTQString(exec, args, 0); - TTQStringList argTypes = JSDCOPClient::getTypes( function ); + TQStringList argTypes = JSDCOPClient::getTypes( function ); if( args.size() > 1) for( int idx = 1; idx < args.size(); ++idx) @@ -215,9 +215,9 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: } case MethodsetRef: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); - TTQString arg2 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); + TQString arg2 = extractTQString(exec, args, 0); ref->setRef(arg0.latin1(), arg1.latin1(), arg2.latin1() ); break; } @@ -304,52 +304,52 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } case MethodremoteObjects: { - TTQString arg0 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); retValue = convertToValue( exec, remoteObjects(arg0)); break; } case MethodremoteInterfaces: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); this->remoteInterfaces(arg0, arg1); break; } case MethodremoteFunctions: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); remoteFunctions(arg0, arg1); break; } case MethodconnectDCOPSignal: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); - TTQString arg2 = extractTQString(exec, args, 2); - TTQString arg3 = extractTQString(exec, args, 3); - TTQString arg4 = extractTQString(exec, args, 4); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); + TQString arg2 = extractTQString(exec, args, 2); + TQString arg3 = extractTQString(exec, args, 3); + TQString arg4 = extractTQString(exec, args, 4); bool arg5 = (args.size() > 5) ? args[5].toBoolean(exec) : false; connectDCOPSignal( arg0, arg1, arg2, arg3, arg4, arg5); break; } case MethoddisconnectDCOPSignal: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); - TTQString arg2 = extractTQString(exec, args, 2); - TTQString arg3 = extractTQString(exec, args, 3); - TTQString arg4 = extractTQString(exec, args, 4); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); + TQString arg2 = extractTQString(exec, args, 2); + TQString arg3 = extractTQString(exec, args, 3); + TQString arg4 = extractTQString(exec, args, 4); disconnectDCOPSignal(arg0, arg1, arg2, arg3, arg4); break; } case MethodDCOPStart: { - TTQString arg0 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); - retValue = KJS::String( dcopStart( arg0, TTQStringList() ) ); + retValue = KJS::String( dcopStart( arg0, TQStringList() ) ); break; } case MethodappId: retValue = KJS::String( kapp->dcopClient()->appId().data() ); break; case MethodisApplicationRegistered: { - TTQString arg0 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); retValue = KJS::Boolean( kapp->dcopClient()->isApplicationRegistered( arg0.latin1() ) ); break; } @@ -387,20 +387,20 @@ KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const K if ( args.size() < 3 ) return KJS::Boolean(false); - TTQStringList types; - TTQByteArray data, replyData; - TTQDataStream ds( replyData, IO_ReadOnly); - TTQCString type; + TQStringList types; + TQByteArray data, replyData; + TQDataStream ds( replyData, IO_ReadOnly); + TQCString type; - TTQString app = extractTQString(exec, args, 0); - TTQString interface = extractTQString(exec, args, 1); - TTQString function = extractTQString(exec, args, 2); - TTQStringList argTypes = getTypes( function ); + TQString app = extractTQString(exec, args, 0); + TQString interface = extractTQString(exec, args, 1); + TQString function = extractTQString(exec, args, 2); + TQStringList argTypes = getTypes( function ); if( args.size() > 3) for( int idx = 3; idx < args.size(); ++idx) { - TTQVariant var = convertToVariant(exec,args[idx] ); + TQVariant var = convertToVariant(exec,args[idx] ); marshall(var, argTypes[idx -3 ], data); } if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) @@ -414,23 +414,23 @@ KJS::Value JSDCOPClient::dcopSend( KJS::ExecState * exec, KJS::Object &, const K if ( args.size() < 3 ) return KJS::Boolean(false); - TTQByteArray data; - TTQString app = extractTQString(exec, args, 0); - TTQString interface = extractTQString(exec, args, 1); - TTQString function = extractTQString(exec, args, 2); - TTQStringList argTypes = getTypes( function ); + TQByteArray data; + TQString app = extractTQString(exec, args, 0); + TQString interface = extractTQString(exec, args, 1); + TQString function = extractTQString(exec, args, 2); + TQStringList argTypes = getTypes( function ); if( args.size() > 3) for( int idx = 3; idx < args.size(); ++idx) { - TTQVariant var = convertToVariant(exec,args[idx] ); + TQVariant var = convertToVariant(exec,args[idx] ); marshall(var, argTypes[idx - 3], data); } return KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data)); } -KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TTQCString& type, TTQDataStream& data) +KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TQCString& type, TQDataStream& data) { kdDebug() << "Demarshall " << type << endl; @@ -449,23 +449,23 @@ KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TTQCString& ty return convertToValue(exec, demarshall(type, data)); } -TTQStringList JSDCOPClient::getTypes( const TTQString& function ) +TQStringList JSDCOPClient::getTypes( const TQString& function ) { - TTQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1()); - TTQString args = myFunction.mid( myFunction.find('(') + 1 ); + TQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1()); + TQString args = myFunction.mid( myFunction.find('(') + 1 ); args = args.left( args.length() - 1); - return TTQStringList::split(',', args); + return TQStringList::split(',', args); } -void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName, TTQByteArray& buffer ) +void JSDCOPClient::marshall( const TQVariant& data, const TQString& typeName, TQByteArray& buffer ) { - TTQDataStream stream(buffer, IO_WriteOnly | IO_Append); + TQDataStream stream(buffer, IO_WriteOnly | IO_Append); - if ( typeName == "TTQString" ) + if ( typeName == "TQString" ) { stream << data.toString(); } - else if ( typeName == "TTQCString") + else if ( typeName == "TQCString") { stream << data.toCString(); } @@ -485,99 +485,99 @@ void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName, { stream << data.toDouble(); } - else if ( typeName == "TTQMap" ) + else if ( typeName == "TQMap" ) { stream << data.toMap(); } - else if ( typeName == "TTQValueList") + else if ( typeName == "TQValueList") { stream << data.toList(); } - else if ( typeName == "TTQFont") + else if ( typeName == "TQFont") { stream << data.toFont(); } - else if ( typeName == "TTQPixmap") + else if ( typeName == "TQPixmap") { stream << data.toPixmap(); } - else if ( typeName == "TTQBrush") + else if ( typeName == "TQBrush") { stream << data.toBrush(); } - else if ( typeName == "TTQRect") + else if ( typeName == "TQRect") { stream << data.toRect(); } - else if ( typeName == "TTQSize") + else if ( typeName == "TQSize") { stream << data.toSize(); } - else if ( typeName == "TTQColor") + else if ( typeName == "TQColor") { stream << data.toColor(); } - else if ( typeName == "TTQPalette") + else if ( typeName == "TQPalette") { stream << data.toPalette(); } - else if ( typeName == "TTQColorGroup") + else if ( typeName == "TQColorGroup") { stream << data.toColorGroup(); } - /*else if ( typeName == "TTQIconSet") + /*else if ( typeName == "TQIconSet") { stream << data.toIconSet(); }*/ - else if ( typeName == "TTQPoint") + else if ( typeName == "TQPoint") { stream << data.toPoint(); } - else if ( typeName == "TTQImage") + else if ( typeName == "TQImage") { stream << data.toImage(); } - else if ( typeName == "TTQPointArray") + else if ( typeName == "TQPointArray") { stream << data.toPointArray(); } - else if ( typeName == "TTQRegion") + else if ( typeName == "TQRegion") { stream << data.toRegion(); } - else if ( typeName == "TTQBitmap") + else if ( typeName == "TQBitmap") { stream << data.toBitmap(); } - else if ( typeName == "TTQCursor") + else if ( typeName == "TQCursor") { stream << data.toCursor(); } - /*else if ( typeName == "TTQSizePolicy") + /*else if ( typeName == "TQSizePolicy") { stream << data.toSizePolicy(); }*/ - else if ( typeName == "TTQDate") + else if ( typeName == "TQDate") { stream << data.toDate(); } - else if ( typeName == "TTQTime") + else if ( typeName == "TQTime") { stream << data.toTime(); } - else if ( typeName == "TTQDateTime") + else if ( typeName == "TQDateTime") { stream << data.toDateTime(); } - else if ( typeName == "TTQByteArray") + else if ( typeName == "TQByteArray") { stream << data.toByteArray(); } - else if ( typeName == "TTQBitArray") + else if ( typeName == "TQBitArray") { stream << data.toBitArray(); } - else if ( typeName == "TTQKeySequence") + else if ( typeName == "TQKeySequence") { stream << data.toKeySequence(); } @@ -591,18 +591,18 @@ void JSDCOPClient::marshall( const TTQVariant& data, const TTQString& typeName, } -TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList& args ) +TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& args ) { - TTQString error; - TTQString startFunction; + TQString error; + TQString startFunction; if (appName.endsWith(".desktop")) - startFunction = "start_service_by_desktop_path(TTQString,TTQStringList)"; + startFunction = "start_service_by_desktop_path(TQString,TQStringList)"; else - startFunction = "start_service_by_desktop_name(TTQString,TTQStringList)"; + startFunction = "start_service_by_desktop_name(TQString,TQStringList)"; - TTQByteArray data, replyData; - TTQCString replyType; - TTQDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); arg << appName << args; if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(), data, replyType, replyData) ) @@ -611,7 +611,7 @@ TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList } else { - TTQDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { @@ -620,8 +620,8 @@ TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList else { int result; - TTQCString dcopName; - TTQString error; + TQCString dcopName; + TQString error; reply >> result >> dcopName >> error; if (result != 0) { @@ -640,57 +640,57 @@ TTQString JSDCOPClient::dcopStart( const TTQString &appName, const TTQStringList } -TTQStringList JSDCOPClient::remoteFunctions( const TTQString & remApp, const TTQString & remObj ) +TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj ) { - TTQStringList returnList; + TQStringList returnList; TQCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -TTQStringList JSDCOPClient::remoteInterfaces( const TTQString & remApp, const TTQString & remObj ) +TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj ) { - TTQStringList returnList; + TQStringList returnList; TQCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -TTQStringList JSDCOPClient::remoteObjects( const TTQString & remApp ) +TQStringList JSDCOPClient::remoteObjects( const TQString & remApp ) { - TTQStringList returnList; + TQStringList returnList; TQCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -TTQStringList JSDCOPClient::registeredApplications( ) +TQStringList JSDCOPClient::registeredApplications( ) { - TTQStringList returnList; + TQStringList returnList; TQCStringList lst = kapp->dcopClient()->registeredApplications( ); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -bool JSDCOPClient::connectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot, bool Volatile) +bool JSDCOPClient::connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile) { return kapp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile); } -bool JSDCOPClient::disconnectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot) +bool JSDCOPClient::disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot) { return kapp->dcopClient()->disconnectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1()); } KJS::Object JSDCOPInterfacerLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const { - TTQObject *parent = extractTQObject(exec, args, 0); - TTQString name = extractTQString(exec, args, 1); - TTQObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() ); + TQObject *parent = extractTQObject(exec, args, 0); + TQString name = extractTQString(exec, args, 1); + TQObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() ); JSObjectProxy *prxy = new JSObjectProxy(jspart, obj); KJS::Object object(prxy); addBindings(jspart,exec,object); @@ -704,7 +704,7 @@ void JSDCOPInterfacerLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState * prx->addBindings( exec, proxy ); } -void JSDCOPInterface::publish( const TTQString & signature ) +void JSDCOPInterface::publish( const TQString & signature ) { if( m_Members.find(signature.latin1() ) == m_Members.end()) m_Members.append(signature.latin1() ); @@ -714,22 +714,22 @@ JSDCOPInterface::~ JSDCOPInterface( ) { } -JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, TTQObject * parent, const char * name ) +JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, TQObject * parent, const char * name ) : BindingObject( parent, name ),DCOPObject(name), m_js(js) { m_Members.clear(); } -TTQCStringList JSDCOPInterface::functionsDynamic( ) +TQCStringList JSDCOPInterface::functionsDynamic( ) { return m_Members; } -bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQByteArray & data, TTQCString & replyType, TTQByteArray & replyData ) +bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByteArray & data, TQCString & replyType, TQByteArray & replyData ) { bool isOkay = false; - TTQRegExp reg = TTQRegExp("([_\\d\\w]+)(\\()(.*)(\\))"); + TQRegExp reg = TQRegExp("([_\\d\\w]+)(\\()(.*)(\\))"); reg.search(rawFunction); kdDebug() << "Raw function: " << rawFunction << endl; @@ -737,9 +737,9 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB kdDebug() << "Signature: " << reg.cap(1) << endl; kdDebug() << "Args: " << reg.cap(3) << endl; - TTQString signature = reg.cap(1); + TQString signature = reg.cap(1); - TTQStringList argStrings = TTQStringList::split(',', reg.cap(3), false); + TQStringList argStrings = TQStringList::split(',', reg.cap(3), false); kdDebug() << argStrings.count() << " args..." << endl; KJS::ExecState *exec = m_js->globalExec(); @@ -751,7 +751,7 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB if ( fun.implementsCall() ) { - TTQDataStream ds( data, IO_ReadOnly ); + TQDataStream ds( data, IO_ReadOnly ); KJS::List args; for( uint idx = 0; idx < argStrings.count(); ++idx) { @@ -779,7 +779,7 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB if( oprx ) { replyType = "DCOPRef"; - TTQDataStream refStream( replyData, IO_WriteOnly ); + TQDataStream refStream( replyData, IO_WriteOnly ); if( oprx->typeName() == "DCOPRef" ) { DCOPRef ref(*oprx->toNative()); @@ -790,7 +790,7 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB } else { - TTQVariant returnVariant = convertToVariant(exec, retValue); + TQVariant returnVariant = convertToVariant(exec, retValue); JSDCOPClient::marshall(returnVariant,returnVariant.typeName(), replyData); replyType = returnVariant.typeName(); isOkay = true; @@ -800,216 +800,216 @@ bool JSDCOPInterface::processDynamic( const TTQCString & rawFunction, const TTQB return isOkay; } -TTQVariant JSDCOPClient::demarshall( const TTQCString & type, TTQDataStream & reply ) +TQVariant JSDCOPClient::demarshall( const TQCString & type, TQDataStream & reply ) { kdDebug() << "Type: '" << type << "'"<< endl; - /*if ( type == "TTQMap" ) // ? dont handle? + /*if ( type == "TQMap" ) // ? dont handle? { - TTQMap result; + TQMap result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQValueList") // ? dont handle? + else if ( type == "TQValueList") // ? dont handle? { - TTQValueList result; + TQValueList result; reply >> result; - return TTQVariant(result); + return TQVariant(result); }else if ( type == "TQVariantList") { TQVariantList result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } else */ - if ( type == "TTQString") + if ( type == "TQString") { - TTQString result; + TQString result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } else if ( type == "int") { int result; reply >> result; kdDebug() << "Result: " << result << endl; - return TTQVariant(result); + return TQVariant(result); } else if ( type == "uint") { uint result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } else if ( type == "bool") { bool result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } else if ( type == "double") { double result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQCString") + else if ( type == "TQCString") { - TTQCString result; + TQCString result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQVariant") + else if ( type == "TQVariant") { - TTQVariant result; + TQVariant result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQFont") + else if ( type == "TQFont") { - TTQFont result; + TQFont result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQPixmap") + else if ( type == "TQPixmap") { - TTQPixmap result; + TQPixmap result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQBrush") + else if ( type == "TQBrush") { - TTQBrush result; + TQBrush result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQRect") + else if ( type == "TQRect") { - TTQRect result; + TQRect result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQSize") + else if ( type == "TQSize") { - TTQSize result; + TQSize result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQColor") + else if ( type == "TQColor") { - TTQColor result; + TQColor result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQPalette") + else if ( type == "TQPalette") { - TTQPalette result; + TQPalette result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQColorGroup") + else if ( type == "TQColorGroup") { - TTQColorGroup result; + TQColorGroup result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - /*else if ( type == "TTQIconSet") + /*else if ( type == "TQIconSet") { - TTQIconSet result; + TQIconSet result; reply >> result; - return TTQVariant(result); + return TQVariant(result); }*/ - else if ( type == "TTQPoint") + else if ( type == "TQPoint") { - TTQPoint result; + TQPoint result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQImage") + else if ( type == "TQImage") { - TTQImage result; + TQImage result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQPointArray") + else if ( type == "TQPointArray") { - TTQPointArray result; + TQPointArray result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQRegion") + else if ( type == "TQRegion") { - TTQRegion result; + TQRegion result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQBitmap") + else if ( type == "TQBitmap") { - TTQBitmap result; + TQBitmap result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQCursor") + else if ( type == "TQCursor") { - TTQCursor result; + TQCursor result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - /*else if ( type == "TTQSizePolicy") + /*else if ( type == "TQSizePolicy") { - TTQSizePolicy result; + TQSizePolicy result; reply >> result; - return TTQVariant(result); + return TQVariant(result); }*/ - else if ( type == "TTQDate") + else if ( type == "TQDate") { - TTQDate result; + TQDate result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQTime") + else if ( type == "TQTime") { - TTQTime result; + TQTime result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQDateTime") + else if ( type == "TQDateTime") { - TTQDateTime result; + TQDateTime result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQByteArray") + else if ( type == "TQByteArray") { - TTQByteArray result; + TQByteArray result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQBitArray") + else if ( type == "TQBitArray") { - TTQBitArray result; + TQBitArray result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQKeySequence") + else if ( type == "TQKeySequence") { - TTQKeySequence result; + TQKeySequence result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } - else if ( type == "TTQStringList") + else if ( type == "TQStringList") { - TTQStringList result; + TQStringList result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } else if ( type == "TQCStringList") { - TTQStringList result; + TQStringList result; reply >> result; - return TTQVariant(result); + return TQVariant(result); } else - return TTQVariant(); + return TQVariant(); } } // namespace Bindings diff --git a/kjsembed/bindings/dcop_imp.h b/kjsembed/bindings/dcop_imp.h index ca20fdca..8b186e72 100644 --- a/kjsembed/bindings/dcop_imp.h +++ b/kjsembed/bindings/dcop_imp.h @@ -48,19 +48,19 @@ class JSDCOPInterfacerLoader : public JSBindingBase }; /** -* TTQObject Binding for a DCOP interface +* TQObject Binding for a DCOP interface */ class JSDCOPInterface : public BindingObject, public DCOPObject { Q_OBJECT public: - JSDCOPInterface( KJS::Interpreter *js, TTQObject *parent, const char *name=0 ); + JSDCOPInterface( KJS::Interpreter *js, TQObject *parent, const char *name=0 ); virtual ~JSDCOPInterface(); TQCStringList functionsDynamic(); - bool processDynamic (const TTQCString &fun, const TTQByteArray &data, TTQCString &replyType, TTQByteArray &replyData); + bool processDynamic (const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData); public slots: - void publish(const TTQString& signature); + void publish(const TQString& signature); private: TQCStringList m_Members; @@ -123,23 +123,23 @@ public: /** Invokes the call function. */ virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); - static KJS::Value demarshall( KJS::ExecState * exec, const TTQCString& type, TTQDataStream& data); - static TTQVariant demarshall( const TTQCString &type, TTQDataStream &ds); - static void marshall( const TTQVariant& data, const TTQString &typeName, TTQByteArray& buffer ); - static TTQStringList getTypes( const TTQString& function); + static KJS::Value demarshall( KJS::ExecState * exec, const TQCString& type, TQDataStream& data); + static TQVariant demarshall( const TQCString &type, TQDataStream &ds); + static void marshall( const TQVariant& data, const TQString &typeName, TQByteArray& buffer ); + static TQStringList getTypes( const TQString& function); bool attach() const; bool detach() const; bool isAttached() const; - TTQString dcopStart( const TTQString& appName, const TTQStringList& args); - TTQStringList registeredApplications(); - TTQStringList remoteObjects( const TTQString& remApp); - TTQStringList remoteInterfaces( const TTQString& remApp, const TTQString& remObj ); - TTQStringList remoteFunctions( const TTQString& remApp, const TTQString& remObj); - bool connectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot, bool Volatile = false); - bool disconnectDCOPSignal (const TTQString &sender, const TTQString &senderObj, const TTQString &signal, const TTQString &receiverObj, const TTQString &slot); + TQString dcopStart( const TQString& appName, const TQStringList& args); + TQStringList registeredApplications(); + TQStringList remoteObjects( const TQString& remApp); + TQStringList remoteInterfaces( const TQString& remApp, const TQString& remObj ); + TQStringList remoteFunctions( const TQString& remApp, const TQString& remObj); + bool connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile = false); + bool disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot); KJS::Value dcopCall(KJS::ExecState *exec, KJS::Object &, const KJS::List &args); KJS::Value dcopSend(KJS::ExecState *exec, KJS::Object &, const KJS::List &args); private: diff --git a/kjsembed/bindings/iconset_imp.cpp b/kjsembed/bindings/iconset_imp.cpp index 230fbe63..43ec0f83 100644 --- a/kjsembed/bindings/iconset_imp.cpp +++ b/kjsembed/bindings/iconset_imp.cpp @@ -109,29 +109,29 @@ KJS::Value IconsetImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS: return KJS::Value(); } - if ( op->typeName() != "TTQIconSet" ) { + if ( op->typeName() != "TQIconSet" ) { kdWarning() << "IconsetImp::call() failed, type is " << op->typeName() << endl; return KJS::Value(); } - TTQIconSet iconset = op->toVariant().toIconSet(); + TQIconSet iconset = op->toVariant().toIconSet(); KJS::Value retValue = KJS::Value(); switch ( mid ) { case MethodReset: { - TTQPixmap pix = extractTQPixmap(exec, args, 0); - TTQIconSet::Size size = (TTQIconSet::Size) extractInt(exec, args, 1 ); + TQPixmap pix = extractTQPixmap(exec, args, 0); + TQIconSet::Size size = (TQIconSet::Size) extractInt(exec, args, 1 ); iconset.reset(pix,size); break; } case MethodSetPixmap: { - TTQPixmap pix = extractTQPixmap( exec, args, 0); - TTQString fname = extractTQString( exec, args, 0); - TTQIconSet::Size size = (TTQIconSet::Size) extractInt(exec, args, 1 ); - TTQIconSet::Mode mode = (TTQIconSet::Mode) extractInt( exec, args, 2 ); - TTQIconSet::State state = (TTQIconSet::State) extractInt( exec, args, 3); + TQPixmap pix = extractTQPixmap( exec, args, 0); + TQString fname = extractTQString( exec, args, 0); + TQIconSet::Size size = (TQIconSet::Size) extractInt(exec, args, 1 ); + TQIconSet::Mode mode = (TQIconSet::Mode) extractInt( exec, args, 2 ); + TQIconSet::State state = (TQIconSet::State) extractInt( exec, args, 3); if( pix.isNull() ) iconset.setPixmap( fname, size, mode, state ); else @@ -140,13 +140,13 @@ KJS::Value IconsetImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS: } case MethodPixmap: { - TTQPixmap pix; + TQPixmap pix; if( args.size() == 3 ) { - TTQIconSet::Size size = (TTQIconSet::Size)extractInt( exec, args, 0 ); - TTQIconSet::Mode mode = (TTQIconSet::Mode)extractInt( exec, args, 1 ); - TTQIconSet::State state = (TTQIconSet::State)extractInt( exec, args, 1 ); + TQIconSet::Size size = (TQIconSet::Size)extractInt( exec, args, 0 ); + TQIconSet::Mode mode = (TQIconSet::Mode)extractInt( exec, args, 1 ); + TQIconSet::State state = (TQIconSet::State)extractInt( exec, args, 1 ); pix = iconset.pixmap( size, mode, state ); } else diff --git a/kjsembed/bindings/image_imp.cpp b/kjsembed/bindings/image_imp.cpp index 8c79e946..eb428ab3 100644 --- a/kjsembed/bindings/image_imp.cpp +++ b/kjsembed/bindings/image_imp.cpp @@ -43,7 +43,7 @@ ImageImp::~ImageImp() void ImageImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQImage") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQImage") ) return; JSProxy::MethodTable methods[] = { { Methodwidth, "width" }, @@ -68,7 +68,7 @@ void ImageImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { } KJS::Value ImageImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQImage") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQImage") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); img = op->toVariant().toImage(); @@ -99,18 +99,18 @@ KJS::Value ImageImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L } case Methodload: { - TTQString arg0 = extractTQString( exec, args, 0); + TQString arg0 = extractTQString( exec, args, 0); retValue = KJS::Boolean( load( arg0 )); break; } case Methodsave: { - TTQString arg0 = extractTQString( exec, args, 0); - TTQString arg1 = extractTQString( exec, args, 1); + TQString arg0 = extractTQString( exec, args, 0); + TQString arg1 = extractTQString( exec, args, 1); retValue = KJS::Boolean( save( arg0, arg1 )); break; } case MethodsetFormat: { - TTQString arg0 = extractTQString( exec, args, 0); + TQString arg0 = extractTQString( exec, args, 0); setFormat( arg0 ); break; } @@ -127,7 +127,7 @@ KJS::Value ImageImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L break; } case MethodsetPixmap: { - TTQPixmap pix = extractTQPixmap(exec, args, 0); + TQPixmap pix = extractTQPixmap(exec, args, 0); setPixmap(pix); break; } @@ -184,50 +184,50 @@ bool ImageImp::isOk() const { return !img.isNull(); } -TTQPixmap ImageImp::pixmap() const { +TQPixmap ImageImp::pixmap() const { if ( img.isNull() ) - return TTQPixmap(); + return TQPixmap(); - TTQPixmap pix; + TQPixmap pix; pix.convertFromImage( img ); return pix; } -void ImageImp::setPixmap( const TTQPixmap &pix ) { +void ImageImp::setPixmap( const TQPixmap &pix ) { if ( img.isNull() ) - img = TTQImage(); + img = TQImage(); img = pix.convertToImage(); } -TTQString ImageImp::format() const { +TQString ImageImp::format() const { return fmt; } -TTQString ImageImp::filename() const { +TQString ImageImp::filename() const { return nm; } -void ImageImp::setFormat( const TTQString &f ) { +void ImageImp::setFormat( const TQString &f ) { fmt = f; } -bool ImageImp::load( const TTQString &filename ) { +bool ImageImp::load( const TQString &filename ) { if ( !img.isNull() ) - img = TTQImage(); + img = TQImage(); nm = filename; - fmt = TTQImageIO::imageFormat( filename ); + fmt = TQImageIO::imageFormat( filename ); bool ok = img.load( filename ); if ( !ok ) { kdWarning() << "Error loading " << filename << endl; - img = TTQImage(); + img = TQImage(); } return ok; } -bool ImageImp::save( const TTQString &filename, const TTQString &fmt ) { +bool ImageImp::save( const TQString &filename, const TQString &fmt ) { if ( img.isNull() ) { kdWarning() << "Attempt to save a null image to '" << filename << "'" << endl; @@ -250,7 +250,7 @@ void ImageImp::smoothScale( int w, int h ) { void ImageImp::smoothScaleMin( int w, int h ) { if ( img.isNull()) return; - img = img.smoothScale( w, h, TTQImage::ScaleMin ); + img = img.smoothScale( w, h, TQImage::ScaleMin ); } diff --git a/kjsembed/bindings/image_imp.h b/kjsembed/bindings/image_imp.h index 94d84e01..39cb7031 100644 --- a/kjsembed/bindings/image_imp.h +++ b/kjsembed/bindings/image_imp.h @@ -32,7 +32,7 @@ namespace KJSEmbed { namespace Bindings { /** - * Methods for the TTQImage binding. + * Methods for the TQImage binding. * * @author Richard Moore, rich@kde.org * @version $Id$ @@ -66,27 +66,27 @@ public: private: - TTQString filename() const; - TTQString format() const; + TQString filename() const; + TQString format() const; int width() const; int height() const; int depth() const; bool isOk() const; - TTQPixmap pixmap() const; + TQPixmap pixmap() const; - bool load( const TTQString &filename ); - bool save( const TTQString &filename, const TTQString &fmt ); - void setFormat( const TTQString &fmt ); + bool load( const TQString &filename ); + bool save( const TQString &filename, const TQString &fmt ); + void setFormat( const TQString &fmt ); void smoothScale( int w, int h ); void smoothScaleMin( int w, int h ); - void setPixmap( const TTQPixmap &pix ); + void setPixmap( const TQPixmap &pix ); int mid; - TTQImage img; // this is a temp!!! - TTQString nm; - TTQString fmt; + TQImage img; // this is a temp!!! + TQString nm; + TQString fmt; }; } // namespace diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/kconfig_imp.cpp index c669663f..3cf6e532 100644 --- a/kjsembed/bindings/kconfig_imp.cpp +++ b/kjsembed/bindings/kconfig_imp.cpp @@ -32,7 +32,7 @@ namespace KJSEmbed { namespace Bindings { -Config::Config( TTQObject *parent, const char *name) +Config::Config( TQObject *parent, const char *name) : BindingObject(parent, name) { @@ -46,21 +46,21 @@ Config::Config( TTQObject *parent, const char *name) kdWarning( 80001 ) << "Could not write to config file." << endl; } #else - m_config = new TTQSettings(); + m_config = new TQSettings(); if( name == 0) m_name = "qjcmd"; else m_name = name; - m_config->setPath( "TQJSEmbed",m_name, TTQSettings::User ); + m_config->setPath( "TQJSEmbed",m_name, TQSettings::User ); m_forceGlobal = false; #endif } /* -Config::Config( TTQObject *parent, const char *name , const TTQString& confName) +Config::Config( TQObject *parent, const char *name , const TQString& confName) : BindingObject(parent, name) { - TTQString fileName = ::locate("kde_config", confName); + TQString fileName = ::locate("kde_config", confName); m_config = new KConfig(fileName); } */ @@ -82,7 +82,7 @@ void Config::setDesktopGroup() #endif } -void Config::setGroup(const TTQString& group) +void Config::setGroup(const TQString& group) { #ifndef QT_ONLY m_config->setGroup(group); @@ -92,12 +92,12 @@ void Config::setGroup(const TTQString& group) #endif } -TTQString Config::group() +TQString Config::group() { return m_config->group(); } -TTQStringList Config::groupList() +TQStringList Config::groupList() { #ifndef QT_ONLY return m_config->groupList(); @@ -107,7 +107,7 @@ TTQStringList Config::groupList() #endif } -TTQString Config::locale() +TQString Config::locale() { #ifndef QT_ONLY return m_config->locale(); @@ -122,7 +122,7 @@ void Config::setForceGlobal( bool force ) m_config->setForceGlobal(force); #else m_forceGlobal = force; - m_config->setPath( "TQJSEmbed",m_name, (force)?TTQSettings::Global:TTQSettings::User ); + m_config->setPath( "TQJSEmbed",m_name, (force)?TQSettings::Global:TQSettings::User ); #endif } @@ -203,7 +203,7 @@ void Config::sync() m_config->sync(); } -bool Config::hasKey( const TTQString& key ) const +bool Config::hasKey( const TQString& key ) const { #ifndef QT_ONLY return m_config->hasKey(key); @@ -212,7 +212,7 @@ bool Config::hasKey( const TTQString& key ) const #endif } -bool Config::entryIsImmutable(const TTQString &key) const +bool Config::entryIsImmutable(const TQString &key) const { #ifndef QT_ONLY return m_config->entryIsImmutable(key); @@ -222,7 +222,7 @@ bool Config::entryIsImmutable(const TTQString &key) const #endif } -void Config::revertToDefault(const TTQString &key) +void Config::revertToDefault(const TQString &key) { #ifndef QT_ONLY m_config->revertToDefault(key); @@ -231,7 +231,7 @@ void Config::revertToDefault(const TTQString &key) #endif } -bool Config::hasDefault(const TTQString &key) const +bool Config::hasDefault(const TQString &key) const { #ifndef QT_ONLY return m_config->hasDefault(key); @@ -250,28 +250,28 @@ void Config::setFileWriteMode(int mode) #endif } -TTQString Config::readEntry(const TTQString& pKey, const TTQString& aDefault ) const +TQString Config::readEntry(const TQString& pKey, const TQString& aDefault ) const { return m_config->readEntry(pKey,aDefault); } -TTQVariant Config::readPropertyEntry( const TTQString& pKey, const TTQVariant &pDefault) const +TQVariant Config::readPropertyEntry( const TQString& pKey, const TQVariant &pDefault) const { #ifndef QT_ONLY return m_config->readPropertyEntry(pKey,pDefault); #else - TTQVariant returnVariant; + TQVariant returnVariant; returnVariant = m_config->readEntry(pKey, pDefault.toString()); return returnVariant; #endif } -TTQStringList Config::readListEntry( const TTQString& pKey ) const +TQStringList Config::readListEntry( const TQString& pKey ) const { return m_config->readListEntry(pKey); } -TTQString Config::readPathEntry( const TTQString& pKey, const TTQString & aDefault ) const +TQString Config::readPathEntry( const TQString& pKey, const TQString & aDefault ) const { #ifndef QT_ONLY return m_config->readPathEntry(pKey,aDefault); @@ -280,7 +280,7 @@ TTQString Config::readPathEntry( const TTQString& pKey, const TTQString & aDefau #endif } -TTQStringList Config::readPathListEntry( const TTQString& pKey ) const +TQStringList Config::readPathListEntry( const TQString& pKey ) const { #ifndef QT_ONLY return m_config->readPathListEntry(pKey); @@ -290,12 +290,12 @@ TTQStringList Config::readPathListEntry( const TTQString& pKey ) const } -int Config::readNumEntry( const TTQString& pKey, int nDefault) const +int Config::readNumEntry( const TQString& pKey, int nDefault) const { return m_config->readNumEntry(pKey,nDefault); } -uint Config::readUnsignedNumEntry( const TTQString& pKey, uint nDefault) const +uint Config::readUnsignedNumEntry( const TQString& pKey, uint nDefault) const { #ifndef QT_ONLY return m_config->readUnsignedNumEntry(pKey,nDefault); @@ -304,7 +304,7 @@ uint Config::readUnsignedNumEntry( const TTQString& pKey, uint nDefault) const #endif } -long Config::readLongNumEntry( const TTQString& pKey, long nDefault) const +long Config::readLongNumEntry( const TQString& pKey, long nDefault) const { #ifndef QT_ONLY return m_config->readLongNumEntry(pKey,nDefault); @@ -313,7 +313,7 @@ long Config::readLongNumEntry( const TTQString& pKey, long nDefault) const #endif } -double Config::readDoubleNumEntry( const TTQString& pKey, double nDefault ) const +double Config::readDoubleNumEntry( const TQString& pKey, double nDefault ) const { #ifndef QT_ONLY return m_config->readDoubleNumEntry(pKey,nDefault); @@ -322,66 +322,66 @@ double Config::readDoubleNumEntry( const TTQString& pKey, double nDefault ) cons #endif } -TTQFont Config::readFontEntry( const TTQString& pKey, const TTQFont* pDefault ) const +TQFont Config::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const { #ifndef QT_ONLY return m_config->readFontEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,TTQVariant(*pDefault)).toFont(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toFont(); #endif } -bool Config::readBoolEntry( const TTQString& pKey, const bool bDefault ) const +bool Config::readBoolEntry( const TQString& pKey, const bool bDefault ) const { return m_config->readBoolEntry(pKey,bDefault); } -TTQRect Config::readRectEntry( const TTQString& pKey, const TTQRect* pDefault ) const +TQRect Config::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const { #ifndef QT_ONLY return m_config->readRectEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,TTQVariant(*pDefault)).toRect(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toRect(); #endif } -TTQPoint Config::readPointEntry( const TTQString& pKey, const TTQPoint* pDefault ) const +TQPoint Config::readPointEntry( const TQString& pKey, const TQPoint* pDefault ) const { #ifndef QT_ONLY return m_config->readPointEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,TTQVariant(*pDefault)).toPoint(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toPoint(); #endif } -TTQSize Config::readSizeEntry( const TTQString& pKey, const TTQSize* pDefault ) const +TQSize Config::readSizeEntry( const TQString& pKey, const TQSize* pDefault ) const { #ifndef QT_ONLY return m_config->readSizeEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,TTQVariant(*pDefault)).toSize(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toSize(); #endif } -TTQColor Config::readColorEntry( const TTQString& pKey, const TTQColor* pDefault ) const +TQColor Config::readColorEntry( const TQString& pKey, const TQColor* pDefault ) const { #ifndef QT_ONLY return m_config->readColorEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,TTQVariant(*pDefault)).toColor(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toColor(); #endif } -TTQDateTime Config::readDateTimeEntry( const TTQString& pKey, const TTQDateTime* pDefault) const +TQDateTime Config::readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const { #ifndef QT_ONLY return m_config->readDateTimeEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,TTQVariant(*pDefault)).toDateTime(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toDateTime(); #endif } -TTQString Config::readEntryUntranslated( const TTQString& pKey, const TTQString& aDefault ) const +TQString Config::readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const { #ifndef QT_ONLY return m_config->readEntryUntranslated(pKey,aDefault); @@ -389,12 +389,12 @@ TTQString Config::readEntryUntranslated( const TTQString& pKey, const TTQString& return m_config->readEntry(pKey,aDefault); #endif } -void Config::writeEntry( const TTQString& pKey, const TTQString& pValue ) +void Config::writeEntry( const TQString& pKey, const TQString& pValue ) { m_config->writeEntry(pKey,pValue); } -void Config::writePropertyEntry( const TTQString& pKey, const TTQVariant& pValue ) +void Config::writePropertyEntry( const TQString& pKey, const TQVariant& pValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, pValue ); @@ -403,7 +403,7 @@ void Config::writePropertyEntry( const TTQString& pKey, const TTQVariant& pValue #endif } -void Config::writeListEntry( const TTQString& pKey, const TTQStringList &rValue ) +void Config::writeListEntry( const TQString& pKey, const TQStringList &rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -412,7 +412,7 @@ void Config::writeListEntry( const TTQString& pKey, const TTQStringList &rValue #endif } -void Config::writeNumEntry( const TTQString& pKey, int nValue ) +void Config::writeNumEntry( const TQString& pKey, int nValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, nValue ); @@ -420,7 +420,7 @@ void Config::writeNumEntry( const TTQString& pKey, int nValue ) m_config->writeEntry(pKey,nValue); #endif } -void Config::writeUnsignedNumEntry( const TTQString& pKey, uint nValue ) +void Config::writeUnsignedNumEntry( const TQString& pKey, uint nValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, nValue ); @@ -428,7 +428,7 @@ void Config::writeUnsignedNumEntry( const TTQString& pKey, uint nValue ) writeNumEntry(pKey, (int)nValue ); #endif } -void Config::writeLongNumEntry( const TTQString& pKey, unsigned long nValue ) +void Config::writeLongNumEntry( const TQString& pKey, unsigned long nValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, nValue ); @@ -436,15 +436,15 @@ void Config::writeLongNumEntry( const TTQString& pKey, unsigned long nValue ) writeNumEntry(pKey, (int)nValue); #endif } -void Config::writeDoubleNumEntry( const TTQString& pKey, double nValue ) +void Config::writeDoubleNumEntry( const TQString& pKey, double nValue ) { m_config->writeEntry(pKey,nValue); } -void Config::writeBoolEntry( const TTQString& pKey, bool bValue ) +void Config::writeBoolEntry( const TQString& pKey, bool bValue ) { m_config->writeEntry(pKey,bValue); } -void Config::writeFontEntry( const TTQString& pKey, const TTQFont& rFont ) +void Config::writeFontEntry( const TQString& pKey, const TQFont& rFont ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rFont ); @@ -453,7 +453,7 @@ void Config::writeFontEntry( const TTQString& pKey, const TTQFont& rFont ) #endif } -void Config::writeColorEntry( const TTQString& pKey, const TTQColor& rColor ) +void Config::writeColorEntry( const TQString& pKey, const TQColor& rColor ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rColor ); @@ -462,7 +462,7 @@ void Config::writeColorEntry( const TTQString& pKey, const TTQColor& rColor ) #endif } -void Config::writeDateTimeEntry( const TTQString& pKey, const TTQDateTime& rDateTime ) +void Config::writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rDateTime ); @@ -471,7 +471,7 @@ void Config::writeDateTimeEntry( const TTQString& pKey, const TTQDateTime& rDate #endif } -void Config::writeRectEntry( const TTQString& pKey, const TTQRect& rValue ) +void Config::writeRectEntry( const TQString& pKey, const TQRect& rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -480,7 +480,7 @@ void Config::writeRectEntry( const TTQString& pKey, const TTQRect& rValue ) #endif } -void Config::writePointEntry( const TTQString& pKey, const TTQPoint& rValue ) +void Config::writePointEntry( const TQString& pKey, const TQPoint& rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -489,7 +489,7 @@ void Config::writePointEntry( const TTQString& pKey, const TTQPoint& rValue ) #endif } -void Config::writeSizeEntry( const TTQString& pKey, const TTQSize& rValue ) +void Config::writeSizeEntry( const TQString& pKey, const TQSize& rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -497,7 +497,7 @@ void Config::writeSizeEntry( const TTQString& pKey, const TTQSize& rValue ) writePropertyEntry(pKey,rValue); #endif } -void Config::writePathEntry( const TTQString& pKey, const TTQString & path ) +void Config::writePathEntry( const TQString& pKey, const TQString & path ) { #ifndef QT_ONLY m_config->writePathEntry(pKey,path); @@ -505,7 +505,7 @@ void Config::writePathEntry( const TTQString& pKey, const TTQString & path ) writeEntry(pKey,path); #endif } -void Config::writePathListEntry( const TTQString& pKey, const TTQStringList &rValue ) +void Config::writePathListEntry( const TQString& pKey, const TQStringList &rValue ) { #ifndef QT_ONLY m_config->writePathEntry(pKey,rValue); @@ -513,7 +513,7 @@ void Config::writePathListEntry( const TTQString& pKey, const TTQStringList &rVa writeListEntry(pKey,rValue); #endif } -void Config::deleteEntry( const TTQString& pKey, bool bNLS , bool bGlobal ) +void Config::deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ) { #ifndef QT_ONLY m_config->deleteEntry(pKey,bNLS,bGlobal); @@ -523,7 +523,7 @@ void Config::deleteEntry( const TTQString& pKey, bool bNLS , bool bGlobal ) m_config->removeEntry(pKey); #endif } -bool Config::deleteGroup( const TTQString& group, bool bDeep , bool bGlobal ) +bool Config::deleteGroup( const TQString& group, bool bDeep , bool bGlobal ) { #ifndef QT_ONLY return m_config->deleteGroup(group,bDeep,bGlobal); diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h index 0e063cb0..5eb99973 100644 --- a/kjsembed/bindings/kconfig_imp.h +++ b/kjsembed/bindings/kconfig_imp.h @@ -36,7 +36,7 @@ #ifndef QT_ONLY class KConfig; #else -class TTQSettings; +class TQSettings; #endif namespace KJSEmbed { @@ -51,9 +51,9 @@ class Config : public BindingObject Q_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) public: - Config( TTQObject *parent=0, const char *name=0); + Config( TQObject *parent=0, const char *name=0); /* - Config( TTQObject *parent, const char *name, const TTQString& confName ); + Config( TQObject *parent, const char *name, const TQString& confName ); */ virtual ~Config(); @@ -70,62 +70,62 @@ public slots: // Group void setDesktopGroup(); - void setGroup(const TTQString&); - TTQString group(); - TTQStringList groupList(); - TTQString locale(); + void setGroup(const TQString&); + TQString group(); + TQStringList groupList(); + TQString locale(); void rollback( bool bDeep ); void sync(); - bool hasKey( const TTQString& key ) const; - bool entryIsImmutable(const TTQString &key) const; - void revertToDefault(const TTQString &key); - bool hasDefault(const TTQString &key) const; + bool hasKey( const TQString& key ) const; + bool entryIsImmutable(const TQString &key) const; + void revertToDefault(const TQString &key); + bool hasDefault(const TQString &key) const; void setFileWriteMode(int mode); - TTQString readEntry(const TTQString& pKey, const TTQString& aDefault ) const; - TTQVariant readPropertyEntry( const TTQString& pKey, const TTQVariant &var) const; - TTQStringList readListEntry( const TTQString& pKey ) const; - TTQString readPathEntry( const TTQString& pKey, const TTQString & aDefault) const; - TTQStringList readPathListEntry( const TTQString& pKey ) const; - int readNumEntry( const TTQString& pKey, int nDefault ) const; - uint readUnsignedNumEntry( const TTQString& pKey, uint nDefault ) const; - long readLongNumEntry( const TTQString& pKey, long nDefault ) const; - double readDoubleNumEntry( const TTQString& pKey, double nDefault ) const; - TTQFont readFontEntry( const TTQString& pKey, const TTQFont* pDefault) const; - bool readBoolEntry( const TTQString& pKey, const bool bDefault ) const; - TTQRect readRectEntry( const TTQString& pKey, const TTQRect* pDefault) const; - TTQPoint readPointEntry( const TTQString& pKey, const TTQPoint* pDefault) const; - TTQSize readSizeEntry( const TTQString& pKey, const TTQSize* pDefault) const; - TTQColor readColorEntry( const TTQString& pKey, const TTQColor* pDefault) const; - TTQDateTime readDateTimeEntry( const TTQString& pKey, const TTQDateTime* pDefault) const; - TTQString readEntryUntranslated( const TTQString& pKey, const TTQString& aDefault ) const; - - void writeEntry( const TTQString& pKey, const TTQString& pValue ); - void writePropertyEntry( const TTQString& pKey, const TTQVariant& pValue ); - void writeListEntry( const TTQString& pKey, const TTQStringList &rValue ); - void writeNumEntry( const TTQString& pKey, int nValue ); - void writeUnsignedNumEntry( const TTQString& pKey, uint nValue ); - void writeLongNumEntry( const TTQString& pKey, unsigned long nValue ); - void writeDoubleNumEntry( const TTQString& pKey, double nValue ); - void writeBoolEntry( const TTQString& pKey, bool bValue ); - void writeFontEntry( const TTQString& pKey, const TTQFont& rFont ); - void writeColorEntry( const TTQString& pKey, const TTQColor& rColor ); - void writeDateTimeEntry( const TTQString& pKey, const TTQDateTime& rDateTime ); - void writeRectEntry( const TTQString& pKey, const TTQRect& rValue ); - void writePointEntry( const TTQString& pKey, const TTQPoint& rValue ); - void writeSizeEntry( const TTQString& pKey, const TTQSize& rValue ); - void writePathEntry( const TTQString& pKey, const TTQString & path ); - void writePathListEntry( const TTQString& pKey, const TTQStringList &rValue); - void deleteEntry( const TTQString& pKey, bool bNLS , bool bGlobal ); - bool deleteGroup( const TTQString& group, bool bDeep , bool bGlobal ); + TQString readEntry(const TQString& pKey, const TQString& aDefault ) const; + TQVariant readPropertyEntry( const TQString& pKey, const TQVariant &var) const; + TQStringList readListEntry( const TQString& pKey ) const; + TQString readPathEntry( const TQString& pKey, const TQString & aDefault) const; + TQStringList readPathListEntry( const TQString& pKey ) const; + int readNumEntry( const TQString& pKey, int nDefault ) const; + uint readUnsignedNumEntry( const TQString& pKey, uint nDefault ) const; + long readLongNumEntry( const TQString& pKey, long nDefault ) const; + double readDoubleNumEntry( const TQString& pKey, double nDefault ) const; + TQFont readFontEntry( const TQString& pKey, const TQFont* pDefault) const; + bool readBoolEntry( const TQString& pKey, const bool bDefault ) const; + TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault) const; + TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault) const; + TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault) const; + TQColor readColorEntry( const TQString& pKey, const TQColor* pDefault) const; + TQDateTime readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const; + TQString readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const; + + void writeEntry( const TQString& pKey, const TQString& pValue ); + void writePropertyEntry( const TQString& pKey, const TQVariant& pValue ); + void writeListEntry( const TQString& pKey, const TQStringList &rValue ); + void writeNumEntry( const TQString& pKey, int nValue ); + void writeUnsignedNumEntry( const TQString& pKey, uint nValue ); + void writeLongNumEntry( const TQString& pKey, unsigned long nValue ); + void writeDoubleNumEntry( const TQString& pKey, double nValue ); + void writeBoolEntry( const TQString& pKey, bool bValue ); + void writeFontEntry( const TQString& pKey, const TQFont& rFont ); + void writeColorEntry( const TQString& pKey, const TQColor& rColor ); + void writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ); + void writeRectEntry( const TQString& pKey, const TQRect& rValue ); + void writePointEntry( const TQString& pKey, const TQPoint& rValue ); + void writeSizeEntry( const TQString& pKey, const TQSize& rValue ); + void writePathEntry( const TQString& pKey, const TQString & path ); + void writePathListEntry( const TQString& pKey, const TQStringList &rValue); + void deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ); + bool deleteGroup( const TQString& group, bool bDeep , bool bGlobal ); private: #ifndef QT_ONLY KConfig *m_config; #else - TTQSettings *m_config; - TTQString m_name; + TQSettings *m_config; + TQString m_name; bool m_forceGlobal; #endif }; diff --git a/kjsembed/bindings/movie_imp.cpp b/kjsembed/bindings/movie_imp.cpp index d5d7a3cd..7f786c52 100644 --- a/kjsembed/bindings/movie_imp.cpp +++ b/kjsembed/bindings/movie_imp.cpp @@ -27,21 +27,21 @@ namespace KJSEmbed { namespace Bindings { -Movie::Movie( TTQObject *parent, const char *name ) : BindingObject(parent, name) +Movie::Movie( TQObject *parent, const char *name ) : BindingObject(parent, name) { - movie = TTQMovie(); + movie = TQMovie(); } Movie::~Movie() { } -TTQColor Movie::backgroundColor() const +TQColor Movie::backgroundColor() const { if( movie.isNull() ) - return TTQColor(); + return TQColor(); return movie.backgroundColor(); } -void Movie::setBackgroundColor( const TTQColor &c ) +void Movie::setBackgroundColor( const TQColor &c ) { if( movie.isNull() ) return; @@ -59,30 +59,30 @@ void Movie::setSpeed( int percent ) return; movie.setSpeed(percent); } -bool Movie::load( const TTQString &filename, int bufsize) +bool Movie::load( const TQString &filename, int bufsize) { - movie = TTQMovie( filename, bufsize); + movie = TQMovie( filename, bufsize); if ( movie.isNull() ) return false; else return true; } -TTQRect Movie::getValidRect() +TQRect Movie::getValidRect() { if( movie.isNull() ) - return TTQRect(); + return TQRect(); return movie.getValidRect(); } -TTQPixmap Movie::framePixmap() +TQPixmap Movie::framePixmap() { if( movie.isNull() ) - return TTQPixmap(); + return TQPixmap(); return movie.framePixmap(); } -TTQImage Movie::frameImage() +TQImage Movie::frameImage() { if( movie.isNull() ) - return TTQImage(); + return TQImage(); return movie.frameImage(); } bool Movie::isNull() diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h index 96feffca..74508e99 100644 --- a/kjsembed/bindings/movie_imp.h +++ b/kjsembed/bindings/movie_imp.h @@ -30,7 +30,7 @@ namespace KJSEmbed { namespace Bindings { /** - * TTQObject Binding for TTQMovie. + * TQObject Binding for TQMovie. * * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ @@ -39,22 +39,22 @@ class Movie : public BindingObject { Q_OBJECT - Q_PROPERTY( TTQColor setBackgroundColor READ backgroundColor ) + Q_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) Q_PROPERTY( int setSpeed READ speed ) public: - Movie( TTQObject *parent=0, const char *name=0 ); + Movie( TQObject *parent=0, const char *name=0 ); virtual ~Movie(); - TTQColor backgroundColor() const; - void setBackgroundColor( const TTQColor &c ); + TQColor backgroundColor() const; + void setBackgroundColor( const TQColor &c ); int speed() const; void setSpeed ( int percent ); public slots: - bool load( const TTQString &filename, int bufsize = 1024); - TTQRect getValidRect(); - TTQPixmap framePixmap(); - TTQImage frameImage(); + bool load( const TQString &filename, int bufsize = 1024); + TQRect getValidRect(); + TQPixmap framePixmap(); + TQImage frameImage(); bool isNull(); int frameNumber(); int steps(); @@ -68,7 +68,7 @@ public slots: void restart(); private: - TTQMovie movie; + TQMovie movie; }; } // namespace diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index d9864710..c7462e28 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -32,7 +32,7 @@ namespace KJSEmbed { namespace Bindings { -NetAccess::NetAccess( TTQObject *parent, const char *name ) +NetAccess::NetAccess( TQObject *parent, const char *name ) : BindingObject( parent, name ) { } @@ -41,9 +41,9 @@ NetAccess::~NetAccess() { } -bool NetAccess::download( const KURL& src, const TTQString& loc ) +bool NetAccess::download( const KURL& src, const TQString& loc ) { - TTQString mloc = loc; + TQString mloc = loc; #if KDE_IS_VERSION(3,1,90) return KIO::NetAccess::download( src, mloc, 0 ); #else @@ -51,19 +51,19 @@ bool NetAccess::download( const KURL& src, const TTQString& loc ) #endif } -TTQString NetAccess::createTempFile( const TTQString& prefix, const TTQString& ext, uint mode ) +TQString NetAccess::createTempFile( const TQString& prefix, const TQString& ext, uint mode ) { KTempFile tmpFile = KTempFile(prefix, ext, mode); tmpFile.setAutoDelete(false); return tmpFile.name(); } -void NetAccess::removeTempFile( const TTQString& name ) +void NetAccess::removeTempFile( const TQString& name ) { KIO::NetAccess::removeTempFile( name ); } -bool NetAccess::upload( const TTQString& src, const KURL& dest ) +bool NetAccess::upload( const TQString& src, const KURL& dest ) { #if KDE_IS_VERSION(3,1,90) return KIO::NetAccess::upload( src, dest, 0 ); @@ -124,17 +124,17 @@ int NetAccess::propertiesDialog( const KURL &url ) return dlg.exec(); } -TTQString NetAccess::fish_execute( const KURL& url, const TTQString& command ) +TQString NetAccess::fish_execute( const KURL& url, const TQString& command ) { #if KDE_IS_VERSION(3,1,90) return KIO::NetAccess::fish_execute( url, command, 0 ); #else kdWarning() << "NetAccess::fish_execute(url,command) is not supported on 3.1" << endl; - return TTQString::null; + return TQString::null; #endif } -TTQString NetAccess::mimetype( const KURL& url ) +TQString NetAccess::mimetype( const KURL& url ) { kdDebug()<<"mimetype CALLED "<setDevice(w); p->setCanDelete(false); } else if( !pix.isNull() ) - p->setDevice( new TTQPixmap(pix) ); + p->setDevice( new TQPixmap(pix) ); */ JSOpaqueProxy *prx = new JSOpaqueProxy( p, "Painter" ); prx->setOwner( JSProxy::JavaScript ); @@ -63,7 +63,7 @@ namespace Bindings { PainterRef::PainterRef() { m_device = 0L; - m_painter = new TTQPainter; + m_painter = new TQPainter; m_canDelete = true; } PainterRef::~PainterRef() @@ -74,17 +74,17 @@ PainterRef::~PainterRef() delete m_painter; } -TTQPainter *PainterRef::painter() +TQPainter *PainterRef::painter() { return m_painter; } -TTQPaintDevice *PainterRef::device() +TQPaintDevice *PainterRef::device() { return m_device; } -void PainterRef::setDevice(TTQPaintDevice *d) +void PainterRef::setDevice(TQPaintDevice *d) { if( m_device && m_canDelete) { @@ -162,17 +162,17 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li } else { - TTQString msg = i18n( "Paintdevice was not a valid widget." ); + TQString msg = i18n( "Paintdevice was not a valid widget." ); throwError(exec,msg); retValue = KJS::Boolean(false); } } else if ( vp ) { - TTQPixmap *p = new TTQPixmap(vp->toVariant().toPixmap()); + TQPixmap *p = new TQPixmap(vp->toVariant().toPixmap()); if( p->isNull() ) { - TTQString msg = i18n( "Cannto paint to a null pixmap." ).arg( op->typeName() ); + TQString msg = i18n( "Cannto paint to a null pixmap." ).arg( op->typeName() ); throwError(exec,msg); retValue = KJS::Boolean(false); } @@ -183,22 +183,22 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li retValue = KJS::Boolean( begin() ); } } - else if ( op && op->typeName() == "TTQPaintDevice" ) + else if ( op && op->typeName() == "TQPaintDevice" ) { - pr->setDevice( op->toNative() ); + pr->setDevice( op->toNative() ); pr->setCanDelete(false); retValue = KJS::Boolean( begin() ); } else { - TTQString msg = i18n( "Paintdevice of type '%1' is not supported." ).arg( op->typeName() ); + TQString msg = i18n( "Paintdevice of type '%1' is not supported." ).arg( op->typeName() ); throwError(exec,msg); retValue = KJS::Boolean(false); } } else { - TTQString msg = i18n( "Incorrect number of arguements '%1'." ).arg( args.size() ); + TQString msg = i18n( "Incorrect number of arguements '%1'." ).arg( args.size() ); throwError(exec,msg); retValue = KJS::Boolean(false); } @@ -216,7 +216,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li break; case MethodsetPen: { - TTQPen pn = extractTQPen(exec, args, 0); + TQPen pn = extractTQPen(exec, args, 0); setPen(pn); break; } @@ -367,7 +367,7 @@ bool Painter::begin() { return pr->painter()->begin(pr->device()); } -bool Painter::begin(TTQPaintDevice *dev) +bool Painter::begin(TQPaintDevice *dev) { return pr->painter()->begin(dev); } @@ -377,29 +377,29 @@ bool Painter::end() return pr->painter()->end(); } -TTQPixmap Painter::pixmap() const +TQPixmap Painter::pixmap() const { - TTQPixmap *pix = dynamic_cast(pr->device()); + TQPixmap *pix = dynamic_cast(pr->device()); if( pix ) { return *pix; } - return TTQPixmap(); + return TQPixmap(); } -void Painter::setPen( const TTQPen& pn ) +void Painter::setPen( const TQPen& pn ) { pr->painter()->setPen(pn); } -TTQPen Painter::pen() const +TQPen Painter::pen() const { return pr->painter()->pen(); } -TTQRect Painter::textBox(const TTQString &text) +TQRect Painter::textBox(const TQString &text) { - TTQFontMetrics fnt = pr->painter()->fontMetrics(); + TQFontMetrics fnt = pr->painter()->fontMetrics(); return fnt.boundingRect(text); } @@ -438,7 +438,7 @@ void Painter::drawEllipse( int x, int y, int w, int h ) pr->painter()->drawEllipse( x, y, w, h ); } -void Painter::drawText( int x, int y, const TTQString &txt ) +void Painter::drawText( int x, int y, const TQString &txt ) { pr->painter()->drawText( x, y, txt ); } @@ -451,15 +451,15 @@ void Painter::drawPie ( int x, int y, int w, int h, int a, int alen ) { pr->painter()->drawPie( x, y, w, h, a, alen); } -void Painter::drawPixmap ( int x, int y, const TTQPixmap & pixmap, int sx, int sy, int sw, int sh ) +void Painter::drawPixmap ( int x, int y, const TQPixmap & pixmap, int sx, int sy, int sw, int sh ) { pr->painter()->drawPixmap( x, y, pixmap, sx, sy, sw, sh ); } -void Painter::drawImage ( int x, int y, const TTQImage &image, int sx , int sy, int sw , int sh, int conversionFlags) +void Painter::drawImage ( int x, int y, const TQImage &image, int sx , int sy, int sw , int sh, int conversionFlags) { pr->painter()->drawImage( x, y, image, sx, sy, sw, sh, conversionFlags ); } -void Painter::drawTiledPixmap ( int x, int y, int w, int h, const TTQPixmap & pixmap, int sx, int sy ) +void Painter::drawTiledPixmap ( int x, int y, int w, int h, const TQPixmap & pixmap, int sx, int sy ) { pr->painter()->drawTiledPixmap( x, y, w, h, pixmap, sx, sy ); } @@ -481,22 +481,22 @@ void Painter::translate ( double dx, double dy ) pr->painter()->translate( dx, dy ); } -void KJSEmbed::Bindings::Painter::setFont( const TTQFont & font ) +void KJSEmbed::Bindings::Painter::setFont( const TQFont & font ) { pr->painter()->setFont(font); } -TTQFont KJSEmbed::Bindings::Painter::font( ) const +TQFont KJSEmbed::Bindings::Painter::font( ) const { return pr->painter()->font(); } -TTQColor KJSEmbed::Bindings::Painter::backgroundColor( ) const +TQColor KJSEmbed::Bindings::Painter::backgroundColor( ) const { return pr->painter()->backgroundColor(); } -void KJSEmbed::Bindings::Painter::setBackgroundColor( const TTQColor & color ) +void KJSEmbed::Bindings::Painter::setBackgroundColor( const TQColor & color ) { pr->painter()->setBackgroundColor(color); } @@ -505,12 +505,12 @@ void KJSEmbed::Bindings::Painter::setBackgroundColor( const TTQColor & color ) } // namespace KJSEmbed -void KJSEmbed::Bindings::Painter::setBrush( const TTQColor & brush ) +void KJSEmbed::Bindings::Painter::setBrush( const TQColor & brush ) { pr->painter()->setBrush(brush); } -TTQColor KJSEmbed::Bindings::Painter::brush( ) const +TQColor KJSEmbed::Bindings::Painter::brush( ) const { return pr->painter()->brush().color(); } diff --git a/kjsembed/bindings/painter_imp.h b/kjsembed/bindings/painter_imp.h index 0f99a777..f831b7fd 100644 --- a/kjsembed/bindings/painter_imp.h +++ b/kjsembed/bindings/painter_imp.h @@ -27,7 +27,7 @@ #include #include -class TTQPixmap; +class TQPixmap; namespace KJSEmbed { namespace Bindings { @@ -46,22 +46,22 @@ class PainterRef PainterRef(); ~PainterRef(); - TTQPainter *painter(); + TQPainter *painter(); - TTQPaintDevice *device(); - void setDevice(TTQPaintDevice *d); + TQPaintDevice *device(); + void setDevice(TQPaintDevice *d); void setCanDelete(bool can ) {m_canDelete = can;} bool canDelete() const { return m_canDelete;} private: - TTQPainter *m_painter; - TTQPaintDevice *m_device; + TQPainter *m_painter; + TQPaintDevice *m_device; bool m_canDelete; }; /** - * JSProxyImp binding for painting on a TTQPixmap. + * JSProxyImp binding for painting on a TQPixmap. * * @author Richard Moore, rich@kde.org */ @@ -84,12 +84,12 @@ public: private: bool begin(); - bool begin(TTQPaintDevice *dev); + bool begin(TQPaintDevice *dev); bool end(); - TTQPixmap pixmap() const; - void setPen( const TTQPen& pn); - TTQPen pen() const; - TTQRect textBox(const TTQString &text); + TQPixmap pixmap() const; + void setPen( const TQPen& pn); + TQPen pen() const; + TQRect textBox(const TQString &text); void moveTo( int x, int y ); void lineTo( int x, int y ); void drawPoint( int x, int y ); @@ -97,22 +97,22 @@ private: void drawRect( int x, int y, int w, int h ); void drawRoundRect( int x, int y, int w, int h, int, int); void drawEllipse( int x, int y, int w, int h ); - void drawText( int x, int y, const TTQString &txt ); + void drawText( int x, int y, const TQString &txt ); void drawArc( int x, int y, int w, int h, int a, int alen ); void drawPie( int x, int y, int w, int h, int a, int alen ); - void drawPixmap ( int x, int y, const TTQPixmap &pixmap, int sx, int sy, int sw, int sh ); - void drawImage ( int x, int y, const TTQImage &image, int sx, int sy, int sw, int sh, int conversionFlags ); - void drawTiledPixmap ( int x, int y, int w, int h, const TTQPixmap &pixmap, int sx, int sy); + void drawPixmap ( int x, int y, const TQPixmap &pixmap, int sx, int sy, int sw, int sh ); + void drawImage ( int x, int y, const TQImage &image, int sx, int sy, int sw, int sh, int conversionFlags ); + void drawTiledPixmap ( int x, int y, int w, int h, const TQPixmap &pixmap, int sx, int sy); void scale ( double sx, double sy ); void shear ( double sh, double sv ); void rotate ( double a ); void translate ( double dx, double dy ); - void setFont( const TTQFont &font); - TTQFont font() const; - void setBrush( const TTQColor &brush ); - TTQColor brush() const; - TTQColor backgroundColor() const; - void setBackgroundColor(const TTQColor &color); + void setFont( const TQFont &font); + TQFont font() const; + void setBrush( const TQColor &brush ); + TQColor brush() const; + TQColor backgroundColor() const; + void setBackgroundColor(const TQColor &color); private: int mid; diff --git a/kjsembed/bindings/pen_imp.cpp b/kjsembed/bindings/pen_imp.cpp index 8f9396bc..63344a52 100644 --- a/kjsembed/bindings/pen_imp.cpp +++ b/kjsembed/bindings/pen_imp.cpp @@ -40,7 +40,7 @@ Pen::~Pen() } void Pen::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQPen") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQPen") ) return; JSProxy::MethodTable methods[] = { { Methodwidth, "width"}, @@ -80,9 +80,9 @@ void Pen::addBindings( KJS::ExecState *exec, KJS::Object &object ) { KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQPen") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQPen") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); - TTQPen pen = op->toVariant().toPen(); + TQPen pen = op->toVariant().toPen(); KJS::Value retValue = KJS::Value(); switch ( mid ) { @@ -104,7 +104,7 @@ KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List & } case MethodsetColor: { - TTQColor color = extractTQColor(exec, args, 0); + TQColor color = extractTQColor(exec, args, 0); pen.setColor(color); break; } diff --git a/kjsembed/bindings/pixmap_imp.cpp b/kjsembed/bindings/pixmap_imp.cpp index 50396d3a..5fead7ce 100644 --- a/kjsembed/bindings/pixmap_imp.cpp +++ b/kjsembed/bindings/pixmap_imp.cpp @@ -43,7 +43,7 @@ Pixmap::~Pixmap() void Pixmap::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType( object, JSProxy::ValueProxy, "TTQPixmap") ) + if( !JSProxy::checkType( object, JSProxy::ValueProxy, "TQPixmap") ) return; JSProxy::MethodTable methods[] = { @@ -68,7 +68,7 @@ void Pixmap::addBindings( KJS::ExecState *exec, KJS::Object &object ) { KJS::Value Pixmap::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType( self, JSProxy::ValueProxy, "TTQPixmap") ) + if( !JSProxy::checkType( self, JSProxy::ValueProxy, "TQPixmap") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); @@ -144,35 +144,35 @@ void Pixmap::resize( int w, int h ) pix.resize( w, h ); } -void Pixmap::resize( const TTQSize &size ) +void Pixmap::resize( const TQSize &size ) { pix.resize( size ); } -void Pixmap::fill( const TTQColor &c ) +void Pixmap::fill( const TQColor &c ) { pix.fill( c ); } void Pixmap::grabWindow(int winID, int x, int y, int w, int h) { - pix = TTQPixmap::grabWindow((WId)winID, x, y, w, h); + pix = TQPixmap::grabWindow((WId)winID, x, y, w, h); } -TTQPixmap Pixmap::mask() +TQPixmap Pixmap::mask() { return *(pix.mask()); } -void Pixmap::setMask(const TTQPixmap& mask) +void Pixmap::setMask(const TQPixmap& mask) { - TTQBitmap bm; + TQBitmap bm; bm = mask; pix.setMask(bm); } -TTQPixmap Pixmap::createHeuristicMask ( bool clipTight ) +TQPixmap Pixmap::createHeuristicMask ( bool clipTight ) { - return (TTQPixmap)pix.createHeuristicMask(clipTight); + return (TQPixmap)pix.createHeuristicMask(clipTight); } } // namespace KJSEmbed::Bindings diff --git a/kjsembed/bindings/pixmap_imp.h b/kjsembed/bindings/pixmap_imp.h index caffdd8f..08baa96c 100644 --- a/kjsembed/bindings/pixmap_imp.h +++ b/kjsembed/bindings/pixmap_imp.h @@ -30,7 +30,7 @@ namespace KJSEmbed { namespace Bindings { /** - * TTQObject Binding for TTQPixmap. + * TQObject Binding for TQPixmap. * * @author Richard Moore, rich@kde.org * @version $Id$ @@ -60,25 +60,25 @@ private: int width() const { return pix.width(); } int height() const { return pix.height(); } - TTQSize size() const { return pix.size(); } - TTQRect rect() const { return pix.rect(); } + TQSize size() const { return pix.size(); } + TQRect rect() const { return pix.rect(); } int depth() const { return pix.depth(); } void resize( int w, int h ); - void resize( const TTQSize &size ); - void fill( const TTQColor &color ); + void resize( const TQSize &size ); + void fill( const TQColor &color ); - TTQPixmap mask(); - void setMask(const TTQPixmap& mask); - TTQPixmap createHeuristicMask ( bool clipTight ); + TQPixmap mask(); + void setMask(const TQPixmap& mask); + TQPixmap createHeuristicMask ( bool clipTight ); // Image Capture void grabWindow(int winID, int x =0, int y = 0, int w = -1, int h = -1); private: int mid; - TTQPixmap pix; + TQPixmap pix; }; } // namespace diff --git a/kjsembed/bindings/point_imp.cpp b/kjsembed/bindings/point_imp.cpp index cc9d06af..fff93aad 100644 --- a/kjsembed/bindings/point_imp.cpp +++ b/kjsembed/bindings/point_imp.cpp @@ -38,7 +38,7 @@ namespace Bindings { } void Point::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQPoint") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQPoint") ) return; JSProxy::MethodTable methods[] = { { Methodx, "x"}, @@ -53,10 +53,10 @@ namespace Bindings { } KJS::Value Point::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQPoint") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQPoint") ) return KJS::Value(); JSValueProxy *vp = JSProxy::toValueProxy( self.imp() ); KJS::Value retValue = KJS::Value(); - TTQPoint val = vp->toVariant().toPoint(); + TQPoint val = vp->toVariant().toPoint(); switch ( mid ) { case Methodx: @@ -75,7 +75,7 @@ namespace Bindings { retValue = KJS::Number(val.manhattanLength()); break; default: - TTQString msg = i18n( "Point has no method %1" ).arg(mid); + TQString msg = i18n( "Point has no method %1" ).arg(mid); return throwError(exec, msg); break; } diff --git a/kjsembed/bindings/rect_imp.cpp b/kjsembed/bindings/rect_imp.cpp index a36b6759..2614197b 100644 --- a/kjsembed/bindings/rect_imp.cpp +++ b/kjsembed/bindings/rect_imp.cpp @@ -38,7 +38,7 @@ namespace Bindings { } void Rect::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQRect") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQRect") ) return; JSProxy::MethodTable methods[] = { { Methodx, "x" }, @@ -58,12 +58,12 @@ namespace Bindings { } KJS::Value Rect::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQRect") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQRect") ) return KJS::Value(); KJS::Value retValue = KJS::Value(); JSValueProxy *vp = JSProxy::toValueProxy( self.imp() ); - TTQRect val = vp->toVariant().toRect(); + TQRect val = vp->toVariant().toRect(); switch ( mid ) { case Methodx: @@ -94,7 +94,7 @@ namespace Bindings { retValue = convertToValue( exec, val.contains( extractTQRect(exec, args, 0), extractBool(exec, args, 1)) ); break; default: - TTQString msg = i18n( "Rect has no method %1" ).arg(mid); + TQString msg = i18n( "Rect has no method %1" ).arg(mid); return throwError(exec, msg); break; } diff --git a/kjsembed/bindings/size_imp.cpp b/kjsembed/bindings/size_imp.cpp index f2123eb7..1e41e60a 100644 --- a/kjsembed/bindings/size_imp.cpp +++ b/kjsembed/bindings/size_imp.cpp @@ -38,7 +38,7 @@ Size::~Size() } void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TTQSize") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQSize") ) return; JSProxy::MethodTable methods[] = { { Methodwidth, "width"}, @@ -58,9 +58,9 @@ void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) { // JSProxy::EnumTable enums[] = { - { "ScaleFree", (int)TTQSize::ScaleFree }, - { "ScaleMin", (int)TTQSize::ScaleMin }, - { "ScaleMax", (int)TTQSize::ScaleMax }, + { "ScaleFree", (int)TQSize::ScaleFree }, + { "ScaleMin", (int)TQSize::ScaleMin }, + { "ScaleMax", (int)TQSize::ScaleMax }, { 0, 0 } }; @@ -68,10 +68,10 @@ void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) { } KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TTQSize") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQSize") ) return KJS::Value(); KJS::Value retValue = KJS::Value(); JSValueProxy *vp = JSProxy::toValueProxy( self.imp() ); - TTQSize val = vp->toVariant().toSize(); + TQSize val = vp->toVariant().toSize(); switch ( mid ) { case Methodwidth: @@ -89,14 +89,14 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List case Methodscale: { if( args.size() == 2 ) { - TTQSize sz = extractTQSize(exec, args, 0); + TQSize sz = extractTQSize(exec, args, 0); int mode = extractInt(exec, args, 1); - val.scale(sz, (TTQSize::ScaleMode)mode); + val.scale(sz, (TQSize::ScaleMode)mode); } else { int x = extractInt(exec, args, 0); int y = extractInt(exec, args, 1); int mode = extractInt(exec, args, 2); - val.scale(x,y, (TTQSize::ScaleMode)mode); + val.scale(x,y, (TQSize::ScaleMode)mode); } break; } @@ -105,18 +105,18 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List break; case MethodexpandedTo: { - TTQSize sz = extractTQSize(exec, args, 0); + TQSize sz = extractTQSize(exec, args, 0); retValue = convertToValue( exec, val.expandedTo(sz) ); break; } case MethodboundedTo: { - TTQSize sz = extractTQSize(exec, args, 0); + TQSize sz = extractTQSize(exec, args, 0); retValue = convertToValue( exec, val.boundedTo(sz) ); break; } default: - TTQString msg = i18n( "Size has no method %1" ).arg(mid); + TQString msg = i18n( "Size has no method %1" ).arg(mid); return throwError(exec, msg); break; } diff --git a/kjsembed/bindings/sql_imp.cpp b/kjsembed/bindings/sql_imp.cpp index 3d7e9578..5fa9782f 100644 --- a/kjsembed/bindings/sql_imp.cpp +++ b/kjsembed/bindings/sql_imp.cpp @@ -30,44 +30,44 @@ namespace KJSEmbed { namespace Bindings { -SqlDatabase::SqlDatabase( TTQObject *parent, const char *name): BindingObject(parent, name) +SqlDatabase::SqlDatabase( TQObject *parent, const char *name): BindingObject(parent, name) { connectionName = "defaultConnection"; setJSClassName( "SqlDatabase" ); } SqlDatabase::~SqlDatabase() { - TTQSqlDatabase::removeDatabase(connectionName); + TQSqlDatabase::removeDatabase(connectionName); } -bool SqlDatabase::addDatabase ( const TTQString &type, const TTQString &conn ) +bool SqlDatabase::addDatabase ( const TQString &type, const TQString &conn ) { connectionName = conn; - TTQSqlDatabase *db = TTQSqlDatabase::addDatabase(type, connectionName); + TQSqlDatabase *db = TQSqlDatabase::addDatabase(type, connectionName); if ( !db ) return false; return true; } -TTQStringList SqlDatabase::drivers () +TQStringList SqlDatabase::drivers () { - return TTQSqlDatabase::drivers(); + return TQSqlDatabase::drivers(); } bool SqlDatabase::open ( ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->open(); return false; } -bool SqlDatabase::open ( const TTQString &user, const TTQString &password ) +bool SqlDatabase::open ( const TQString &user, const TQString &password ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->open(user, password); return false; } void SqlDatabase::close () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) { db->close(); @@ -75,28 +75,28 @@ void SqlDatabase::close () } bool SqlDatabase::isOpen () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->isOpen(); return false; } bool SqlDatabase::isOpenError () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->isOpenError(); return true; } -TTQStringList SqlDatabase::tables () +TQStringList SqlDatabase::tables () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->tables(); - return TTQStringList(); + return TQStringList(); } -SqlQuery *SqlDatabase::exec (const TTQString &query ) +SqlQuery *SqlDatabase::exec (const TQString &query ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) { kdDebug() <<" exec query " << query << endl; @@ -108,9 +108,9 @@ SqlQuery *SqlDatabase::exec (const TTQString &query ) } return 0L; } -TTQString SqlDatabase::lastError () const +TQString SqlDatabase::lastError () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) { return db->lastError().text(); @@ -119,105 +119,105 @@ TTQString SqlDatabase::lastError () const } bool SqlDatabase::transaction () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->transaction(); return false; } bool SqlDatabase::commit () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->commit(); return false; } bool SqlDatabase::rollback () { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->rollback(); return false; } -void SqlDatabase::setDatabaseName (const TTQString &name ) +void SqlDatabase::setDatabaseName (const TQString &name ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setDatabaseName(name); } -void SqlDatabase::setUserName (const TTQString &name ) +void SqlDatabase::setUserName (const TQString &name ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setUserName(name); } -void SqlDatabase::setPassword (const TTQString &password ) +void SqlDatabase::setPassword (const TQString &password ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setPassword(password); } -void SqlDatabase::setHostName (const TTQString &host ) +void SqlDatabase::setHostName (const TQString &host ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setHostName(host); } void SqlDatabase::setPort ( int p ) { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setPort(p); } -TTQString SqlDatabase::databaseName () const +TQString SqlDatabase::databaseName () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->databaseName(); return ""; } -TTQString SqlDatabase::userName () const +TQString SqlDatabase::userName () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->userName(); return ""; } -TTQString SqlDatabase::password () const +TQString SqlDatabase::password () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->password(); return ""; } -TTQString SqlDatabase::hostName () const +TQString SqlDatabase::hostName () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->hostName(); return ""; } -TTQString SqlDatabase::driverName () const +TQString SqlDatabase::driverName () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->driverName(); return ""; } int SqlDatabase::port () const { - TTQSqlDatabase *db = TTQSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->port(); return 0; } -SqlQuery::SqlQuery( TTQObject *parent, const char *name ): BindingObject(parent, name) +SqlQuery::SqlQuery( TQObject *parent, const char *name ): BindingObject(parent, name) { kdDebug() << "New null SQL Query" << endl; - m_query = TTQSqlQuery(); + m_query = TQSqlQuery(); setJSClassName( "SqlQuery" ); } -SqlQuery::SqlQuery( TTQObject *parent, const char *name, const TTQSqlQuery &q ): BindingObject(parent, name) +SqlQuery::SqlQuery( TQObject *parent, const char *name, const TQSqlQuery &q ): BindingObject(parent, name) { kdDebug() << "New SQL Query with argument" << endl; m_query = q; @@ -252,7 +252,7 @@ int SqlQuery::at () const { return m_query.at(); } -TTQString SqlQuery::lastQuery () const +TQString SqlQuery::lastQuery () const { kdDebug() << "Last query error: " << m_query.lastQuery() << endl; return m_query.lastQuery(); @@ -261,7 +261,7 @@ int SqlQuery::numRowsAffected () const { return m_query.numRowsAffected(); } -TTQString SqlQuery::lastError () const +TQString SqlQuery::lastError () const { return m_query.lastError().text(); } @@ -273,11 +273,11 @@ int SqlQuery::size () const { return m_query.size(); } -bool SqlQuery::exec ( const TTQString & query ) +bool SqlQuery::exec ( const TQString & query ) { return m_query.exec( query ); } -TTQVariant SqlQuery::value ( int i ) +TQVariant SqlQuery::value ( int i ) { return m_query.value(i); } diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h index c99558f8..950ef156 100644 --- a/kjsembed/bindings/sql_imp.h +++ b/kjsembed/bindings/sql_imp.h @@ -28,7 +28,7 @@ namespace KJSEmbed { namespace Bindings { /** - * TTQObject Binding for TQSQLQuery. + * TQObject Binding for TQSQLQuery. * * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ @@ -42,17 +42,17 @@ class SqlQuery : public BindingObject Q_PROPERTY( bool select READ isSelect) Q_PROPERTY( bool valid READ isValid) Q_PROPERTY( bool active READ isActive) - Q_PROPERTY( TTQString lastError READ lastError) - Q_PROPERTY( TTQString lastQuery READ lastQuery) + Q_PROPERTY( TQString lastError READ lastError) + Q_PROPERTY( TQString lastQuery READ lastQuery) public: - SqlQuery( TTQObject *parent=0, const char *name=0 ); - SqlQuery( TTQObject *parent, const char *name, const TTQSqlQuery &q ); + SqlQuery( TQObject *parent=0, const char *name=0 ); + SqlQuery( TQObject *parent, const char *name, const TQSqlQuery &q ); //SqlQuery( const SqlQuery ©); virtual ~SqlQuery(); - TTQSqlQuery query(){ return m_query; } - void setQuery(const TTQSqlQuery &q) {m_query = TTQSqlQuery(q); } + TQSqlQuery query(){ return m_query; } + void setQuery(const TQSqlQuery &q) {m_query = TQSqlQuery(q); } int size () const; bool isSelect () const; @@ -60,16 +60,16 @@ public: bool isActive () const; int at () const; int numRowsAffected () const; - TTQString lastError () const; - TTQString lastQuery () const; + TQString lastError () const; + TQString lastQuery () const; public slots: bool isNull ( int field ); - bool exec ( const TTQString & m_query ); - TTQVariant value ( int i ); + bool exec ( const TQString & m_query ); + TQVariant value ( int i ); bool seek ( int i, bool relative = FALSE ); bool next (); bool prev (); @@ -77,11 +77,11 @@ public slots: bool last (); private: - TTQSqlQuery m_query; + TQSqlQuery m_query; }; /** - * TTQObject Binding for TQSQLDatabase. + * TQObject Binding for TQSQLDatabase. * * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ @@ -89,49 +89,49 @@ private: class SqlDatabase : public BindingObject { Q_OBJECT - Q_PROPERTY( TTQString databaseName READ databaseName WRITE setDatabaseName) - Q_PROPERTY( TTQString userName READ userName WRITE setUserName) - Q_PROPERTY( TTQString password READ password WRITE setPassword) - Q_PROPERTY( TTQString hostName READ hostName WRITE setHostName) + Q_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) + Q_PROPERTY( TQString userName READ userName WRITE setUserName) + Q_PROPERTY( TQString password READ password WRITE setPassword) + Q_PROPERTY( TQString hostName READ hostName WRITE setHostName) Q_PROPERTY( int port READ port WRITE setPort) - Q_PROPERTY( TTQString driverName READ driverName) - Q_PROPERTY( TTQString lastError READ lastError) + Q_PROPERTY( TQString driverName READ driverName) + Q_PROPERTY( TQString lastError READ lastError) public: - SqlDatabase( TTQObject *parent=0, const char *name=0 ); + SqlDatabase( TQObject *parent=0, const char *name=0 ); virtual ~SqlDatabase(); public slots: - void setDatabaseName (const TTQString &name ); - void setUserName (const TTQString &name ); - void setPassword (const TTQString &password ); - void setHostName (const TTQString &host ); + void setDatabaseName (const TQString &name ); + void setUserName (const TQString &name ); + void setPassword (const TQString &password ); + void setHostName (const TQString &host ); void setPort ( int p ); - TTQString databaseName () const; - TTQString userName () const; - TTQString password () const; - TTQString hostName () const; + TQString databaseName () const; + TQString userName () const; + TQString password () const; + TQString hostName () const; int port () const; - TTQString driverName () const; + TQString driverName () const; - bool addDatabase ( const TTQString & type, const TTQString & connectionName = TTQSqlDatabase::defaultConnection ); - TTQStringList drivers (); + bool addDatabase ( const TQString & type, const TQString & connectionName = TQSqlDatabase::defaultConnection ); + TQStringList drivers (); bool open (); - bool open ( const TTQString &user, const TTQString &password ); + bool open ( const TQString &user, const TQString &password ); void close (); bool isOpen (); bool isOpenError (); - TTQStringList tables (); - SqlQuery *exec( const TTQString &query ); - TTQString lastError () const; + TQStringList tables (); + SqlQuery *exec( const TQString &query ); + TQString lastError () const; bool transaction (); bool commit (); bool rollback (); private: - TTQString connectionName; - //TTQSqlDatabase *db; + TQString connectionName; + //TQSqlDatabase *db; }; diff --git a/kjsembed/bindwizard/Doxyfile.in b/kjsembed/bindwizard/Doxyfile.in index d9574b64..6acab7db 100644 --- a/kjsembed/bindwizard/Doxyfile.in +++ b/kjsembed/bindwizard/Doxyfile.in @@ -268,7 +268,7 @@ SHOW_USED_FILES = YES # The TQUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. -TTQUIET = YES +TQUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are # generated by doxygen. Possible values are YES and NO. If left blank diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp index 4a1d6bde..6d4f674f 100644 --- a/kjsembed/builtins/qdir_imp.cpp +++ b/kjsembed/builtins/qdir_imp.cpp @@ -26,10 +26,10 @@ namespace Bindings { { JSOpaqueProxy * prx; if ( args.size() == 0 ) { - prx = new JSOpaqueProxy( new TTQDir( TTQDir::current() ), "TTQDir" ); + prx = new JSOpaqueProxy( new TQDir( TQDir::current() ), "TQDir" ); } else { - TTQString arg0 = ( args.size() >= 1 ) ? args[ 0 ].toString( exec ).qstring() : TTQString::null; - prx = new JSOpaqueProxy( new TTQDir( arg0 ), "TTQDir" ); + TQString arg0 = ( args.size() >= 1 ) ? args[ 0 ].toString( exec ).qstring() : TQString::null; + prx = new JSOpaqueProxy( new TQDir( arg0 ), "TQDir" ); } prx->setOwner( JSProxy::JavaScript ); KJS::Object proxyObj( prx ); @@ -44,12 +44,12 @@ namespace Bindings { } -TTQDirImp::TQDirImp( KJS::ExecState *exec, int id ) +TQDirImp::TQDirImp( KJS::ExecState *exec, int id ) : JSProxyImp(exec), mid(id) { } -TTQDirImp::~TQDirImp() +TQDirImp::~TQDirImp() { } @@ -177,31 +177,31 @@ void TQDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) EnumValue enums[] = { // enum FilterSpec - { "Dirs", TTQDir::Dirs }, - { "Files", TTQDir::Files }, - { "Drives", TTQDir::Drives }, - { "NoSymLinks", TTQDir::NoSymLinks }, - { "All", TTQDir::All }, - { "TypeMask", TTQDir::TypeMask }, - { "Readable", TTQDir::Readable }, - { "Writable", TTQDir::Writable }, - { "Executable", TTQDir::Executable }, - { "RWEMask", TTQDir::RWEMask }, - { "Modified", TTQDir::Modified }, - { "Hidden", TTQDir::Hidden }, - { "System", TTQDir::System }, - { "AccessMask", TTQDir::AccessMask }, - { "DefaultFilter", TTQDir::DefaultFilter }, + { "Dirs", TQDir::Dirs }, + { "Files", TQDir::Files }, + { "Drives", TQDir::Drives }, + { "NoSymLinks", TQDir::NoSymLinks }, + { "All", TQDir::All }, + { "TypeMask", TQDir::TypeMask }, + { "Readable", TQDir::Readable }, + { "Writable", TQDir::Writable }, + { "Executable", TQDir::Executable }, + { "RWEMask", TQDir::RWEMask }, + { "Modified", TQDir::Modified }, + { "Hidden", TQDir::Hidden }, + { "System", TQDir::System }, + { "AccessMask", TQDir::AccessMask }, + { "DefaultFilter", TQDir::DefaultFilter }, // enum SortSpec - { "Name", TTQDir::Name }, - { "Time", TTQDir::Time }, - { "Size", TTQDir::Size }, - { "Unsorted", TTQDir::Unsorted }, - { "SortByMask", TTQDir::SortByMask }, - { "DirsFirst", TTQDir::DirsFirst }, - { "Reversed", TTQDir::Reversed }, - { "IgnoreCase", TTQDir::IgnoreCase }, - { "DefaultSort", TTQDir::DefaultSort }, + { "Name", TQDir::Name }, + { "Time", TQDir::Time }, + { "Size", TQDir::Size }, + { "Unsorted", TQDir::Unsorted }, + { "SortByMask", TQDir::SortByMask }, + { "DirsFirst", TQDir::DirsFirst }, + { "Reversed", TQDir::Reversed }, + { "IgnoreCase", TQDir::IgnoreCase }, + { "DefaultSort", TQDir::DefaultSort }, { 0, 0 } }; @@ -222,12 +222,12 @@ KJS::Value TQDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L return KJS::Value(); } - if ( op->typeName() != "TTQDir" ) { + if ( op->typeName() != "TQDir" ) { kdWarning() << "TQDirImp::call() failed, type is " << op->typeName() << endl; return KJS::Value(); } - instance = op->toNative(); + instance = op->toNative(); switch( mid ) { @@ -431,7 +431,7 @@ KJS::Value TQDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L break; } - TTQString msg = i18n( "TQDirImp has no method with id '%1'." ).arg( mid ); + TQString msg = i18n( "TQDirImp has no method with id '%1'." ).arg( mid ); return throwError(exec, msg,KJS::ReferenceError); } @@ -439,7 +439,7 @@ KJS::Value TQDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L KJS::Value TQDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->setPath( arg0 ); @@ -450,7 +450,7 @@ KJS::Value TQDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value TQDirImp::path_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->path( ); return KJS::String( ret ); @@ -459,7 +459,7 @@ KJS::Value TQDirImp::path_8( KJS::ExecState *exec, KJS::Object &obj, const KJS:: KJS::Value TQDirImp::absPath_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->absPath( ); return KJS::String( ret ); @@ -468,7 +468,7 @@ KJS::Value TQDirImp::absPath_9( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value TQDirImp::canonicalPath_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->canonicalPath( ); return KJS::String( ret ); @@ -477,7 +477,7 @@ KJS::Value TQDirImp::canonicalPath_10( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value TQDirImp::dirName_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->dirName( ); return KJS::String( ret ); @@ -486,11 +486,11 @@ KJS::Value TQDirImp::dirName_11( KJS::ExecState *exec, KJS::Object &obj, const K KJS::Value TQDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; - TTQString ret; + TQString ret; ret = instance->filePath( arg0, arg1 ); @@ -501,11 +501,11 @@ KJS::Value TQDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value TQDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; - TTQString ret; + TQString ret; ret = instance->absFilePath( arg0, arg1 ); @@ -516,7 +516,7 @@ KJS::Value TQDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value TQDirImp::cd_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -540,7 +540,7 @@ KJS::Value TQDirImp::cdUp_15( KJS::ExecState *exec, KJS::Object &obj, const KJS: KJS::Value TQDirImp::nameFilter_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->nameFilter( ); return KJS::String( ret ); @@ -549,7 +549,7 @@ KJS::Value TQDirImp::nameFilter_16( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value TQDirImp::setNameFilter_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->setNameFilter( arg0 ); @@ -641,7 +641,7 @@ KJS::Value TQDirImp::encodedEntryList_26( KJS::ExecState *exec, KJS::Object &obj KJS::Value TQDirImp::encodedEntryList_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; @@ -662,7 +662,7 @@ KJS::Value TQDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; - TTQStringList ret; + TQStringList ret; ret = instance->entryList( arg0, arg1 ); @@ -674,13 +674,13 @@ KJS::Value TQDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value TQDirImp::entryList_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1; - TTQStringList ret; + TQStringList ret; ret = instance->entryList( arg0, arg1, @@ -707,7 +707,7 @@ KJS::Value TQDirImp::entryInfoList_30( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value TQDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; @@ -724,7 +724,7 @@ KJS::Value TQDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value TQDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -739,7 +739,7 @@ KJS::Value TQDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value TQDirImp::rmdir_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -798,7 +798,7 @@ KJS::Value TQDirImp::convertToAbs_38( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value TQDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -813,9 +813,9 @@ KJS::Value TQDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value TQDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; bool arg2 = (args.size() >= 3) ? args[2].toBoolean(exec) : false; @@ -831,7 +831,7 @@ KJS::Value TQDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value TQDirImp::exists_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -854,9 +854,9 @@ KJS::Value TQDirImp::refresh_44( KJS::ExecState *exec, KJS::Object &obj, const K KJS::Value TQDirImp::convertSeparators_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - TTQString ret; + TQString ret; ret = instance->convertSeparators( arg0 ); return KJS::String( ret ); @@ -882,7 +882,7 @@ KJS::Value TQDirImp::separator_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value TQDirImp::setCurrent_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->setCurrent( @@ -918,7 +918,7 @@ KJS::Value TQDirImp::root_51( KJS::ExecState *exec, KJS::Object &obj, const KJS: KJS::Value TQDirImp::currentDirPath_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->currentDirPath( ); return KJS::String( ret ); @@ -927,7 +927,7 @@ KJS::Value TQDirImp::currentDirPath_52( KJS::ExecState *exec, KJS::Object &obj, KJS::Value TQDirImp::homeDirPath_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->homeDirPath( ); return KJS::String( ret ); @@ -936,7 +936,7 @@ KJS::Value TQDirImp::homeDirPath_53( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value TQDirImp::rootDirPath_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->rootDirPath( ); return KJS::String( ret ); @@ -945,12 +945,12 @@ KJS::Value TQDirImp::rootDirPath_54( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value TQDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQStringList arg0; + TQStringList arg0; if ( args.size() >= 1 ) { // TODO: populate the list } - TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; bool ret; ret = instance->match( @@ -963,9 +963,9 @@ KJS::Value TQDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value TQDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; bool ret; ret = instance->match( @@ -978,9 +978,9 @@ KJS::Value TQDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value TQDirImp::cleanDirPath_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - TTQString ret; + TQString ret; ret = instance->cleanDirPath( arg0 ); return KJS::String( ret ); @@ -990,7 +990,7 @@ KJS::Value TQDirImp::cleanDirPath_57( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value TQDirImp::isRelativePath_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->isRelativePath( diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h index ed89ad7c..55c319a5 100644 --- a/kjsembed/builtins/qdir_imp.h +++ b/kjsembed/builtins/qdir_imp.h @@ -10,7 +10,7 @@ #include #include -class TTQDir; +class TQDir; /** * Namespace containing the KJSEmbed library. @@ -25,7 +25,7 @@ namespace Bindings { }; } /** - * Wrapper class for TTQDir methods. + * Wrapper class for TQDir methods. * * @author Richard Moore, rich@kde.org */ @@ -157,7 +157,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - TTQDir *instance; // Temp + TQDir *instance; // Temp int mid; }; diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp index 85d2fc6b..7f3d2b5b 100644 --- a/kjsembed/builtins/qfile_imp.cpp +++ b/kjsembed/builtins/qfile_imp.cpp @@ -25,12 +25,12 @@ */ namespace KJSEmbed { -TTQFileImp::TQFileImp( KJS::ExecState *exec, int mid, bool constructor ) +TQFileImp::TQFileImp( KJS::ExecState *exec, int mid, bool constructor ) : JSProxyImp(exec), id(mid), cons(constructor) { } -TTQFileImp::~TQFileImp() +TQFileImp::~TQFileImp() { } @@ -71,7 +71,7 @@ void TQFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - TTQCString lastName; + TQCString lastName; do { if ( lastName != methods[idx].name ) { @@ -85,23 +85,23 @@ void TQFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } -TTQFile *TQFileImp::toTQFile( KJS::Object &self ) +TQFile *TQFileImp::toTQFile( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - TTQObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast( obj ); + return dynamic_cast( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "TTQFile" ) + if ( op->typeName() != "TQFile" ) return 0; - return op->toNative(); + return op->toNative(); } @@ -121,7 +121,7 @@ KJS::Object TQFileImp::construct( KJS::ExecState *exec, const KJS::List &args ) break; } - TTQString msg = i18n("TQFileCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("TQFileCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -135,7 +135,7 @@ KJS::Object TQFileImp::TQFile_2( KJS::ExecState *exec, const KJS::List &args ) { // TODO - TTQWidget *arg0 = 0L; + TQWidget *arg0 = 0L; return KJS::Object(); } @@ -266,7 +266,7 @@ KJS::Value TQFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: break; } - TTQString msg = i18n( "TQFileImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "TQFileImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg, KJS::ReferenceError ); } @@ -274,7 +274,7 @@ KJS::Value TQFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: KJS::Value TQFileImp::name_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->name( ); return KJS::String( ret ); @@ -283,7 +283,7 @@ KJS::Value TQFileImp::name_4( KJS::ExecState *exec, KJS::Object &obj, const KJS: KJS::Value TQFileImp::setName_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->setName( arg0 ); @@ -389,7 +389,7 @@ KJS::Value TQFileImp::at_14( KJS::ExecState *exec, KJS::Object &obj, const KJS:: KJS::Value TQFileImp::at_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQFile::Offset arg0 = 0; // TODO (hack for qfile) + TQFile::Offset arg0 = 0; // TODO (hack for qfile) bool ret; ret = instance->at( @@ -447,7 +447,7 @@ KJS::Value TQFileImp::writeBlock_18( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value TQFileImp::writeBlock_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQByteArray arg0; // TODO (hack for qfile) + TQByteArray arg0; // TODO (hack for qfile) instance->writeBlock( arg0 ); @@ -478,7 +478,7 @@ KJS::Value TQFileImp::readLine_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value TQFileImp::readLine_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; // Unsupported parameter Q_ULONG return KJS::Value(); @@ -537,7 +537,7 @@ KJS::Value TQFileImp::handle_25( KJS::ExecState *exec, KJS::Object &obj, const K KJS::Value TQFileImp::errorString_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString ret; + TQString ret; ret = instance->errorString( ); return KJS::String( ret ); @@ -546,7 +546,7 @@ KJS::Value TQFileImp::errorString_26( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value TQFileImp::encodeName_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->encodeName( arg0 ); @@ -557,9 +557,9 @@ KJS::Value TQFileImp::encodeName_27( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value TQFileImp::decodeName_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - const TTQCString arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0; + const TQCString arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0; - TTQString ret; + TQString ret; ret = instance->decodeName( arg0 ); return KJS::String( ret ); @@ -569,7 +569,7 @@ KJS::Value TQFileImp::decodeName_28( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value TQFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQFile::EncoderFn arg0 = 0; // TODO (hack for qfile) + TQFile::EncoderFn arg0 = 0; // TODO (hack for qfile) instance->setEncodingFunction( arg0 ); @@ -580,7 +580,7 @@ KJS::Value TQFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object KJS::Value TQFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQFile::DecoderFn arg0 = 0; // TODO (hack for qfile) + TQFile::DecoderFn arg0 = 0; // TODO (hack for qfile) instance->setDecodingFunction( arg0 ); @@ -591,7 +591,7 @@ KJS::Value TQFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object KJS::Value TQFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->exists( @@ -603,7 +603,7 @@ KJS::Value TQFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const K KJS::Value TQFileImp::remove_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->remove( diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h index 6db9b2df..69d28e9d 100644 --- a/kjsembed/builtins/qfile_imp.h +++ b/kjsembed/builtins/qfile_imp.h @@ -9,7 +9,7 @@ #include -class TTQFile; +class TQFile; /** * Namespace containing the KJSEmbed library. @@ -17,7 +17,7 @@ class TTQFile; namespace KJSEmbed { /** - * Wrapper class for TTQFile methods. + * Wrapper class for TQFile methods. * * @author Richard Moore, rich@kde.org */ @@ -72,7 +72,7 @@ public: static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static TTQFile *toTQFile( KJS::Object &object ); + static TQFile *toTQFile( KJS::Object &object ); // // Constructors implemented by this class. @@ -132,7 +132,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - TTQFile *instance; // Temp + TQFile *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index 40ffdcd2..192b17fa 100644 --- a/kjsembed/builtins/resources.cpp +++ b/kjsembed/builtins/resources.cpp @@ -70,75 +70,75 @@ void StdDirsImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) KJS::Value StdDirsImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { -// TTQString arg0 = extractTQString(exec, args, 0); -// TTQString arg1 = extractTQString(exec, args, 1); +// TQString arg0 = extractTQString(exec, args, 0); +// TQString arg1 = extractTQString(exec, args, 1); switch( id ) { case StdDirsImp::findResource: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); - TTQString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); + TQString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1); return KJS::String( path ); } case StdDirsImp::addResourceType: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); bool isOk = KGlobal::dirs ()->addResourceType(arg0.latin1(), arg1); return KJS::Boolean( isOk ); } case StdDirsImp::kde_default: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString path = KGlobal::dirs ()->kde_default(arg0.latin1()); + TQString arg0 = extractTQString(exec, args, 0); + TQString path = KGlobal::dirs ()->kde_default(arg0.latin1()); return KJS::String( path ); } case StdDirsImp::addResourceDir: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); bool isOk = KGlobal::dirs ()->addResourceDir(arg0.latin1(), arg1); return KJS::Boolean( isOk ); } case StdDirsImp::findResourceDir: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); - TTQString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); + TQString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1); return KJS::String( path ); } case StdDirsImp::saveLocation: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString arg1 = extractTQString(exec, args, 1); + TQString arg0 = extractTQString(exec, args, 0); + TQString arg1 = extractTQString(exec, args, 1); bool arg2 = (args.size() > 2) ? args[2].toBoolean(exec) : true; - TTQString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2); + TQString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2); return KJS::String( path ); } case StdDirsImp::makeDir: { - TTQString arg0 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); int arg1 = (args.size() > 1) ? args[1].toInteger(exec) : 0755; bool isOk = KStandardDirs::makeDir(arg0, arg1); return KJS::Boolean( isOk ); } case StdDirsImp::exists: { - TTQString arg0 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); bool isOk = KStandardDirs::exists(arg0); return KJS::Boolean( isOk ); } case StdDirsImp::realPath: { - TTQString arg0 = extractTQString(exec, args, 0); - TTQString path = KStandardDirs::realPath(arg0); + TQString arg0 = extractTQString(exec, args, 0); + TQString path = KStandardDirs::realPath(arg0); return KJS::String( path ); } case StdDirsImp::currentDirPath: - return KJS::String(TTQDir::currentDirPath()); + return KJS::String(TQDir::currentDirPath()); case StdDirsImp::homeDirPath: - return KJS::String(TTQDir::homeDirPath()); + return KJS::String(TQDir::homeDirPath()); case StdDirsImp::applicationDirPath: return KJS::String(qApp->applicationDirPath()); default: @@ -178,14 +178,14 @@ void StdIconsImp::addBindings( JSFactory *fact, KJS::ExecState *exec, KJS::Obje } -KJS::Value StdIconsImp::wrapPixmap(KJS::ExecState *exec, const TTQPixmap &icon) +KJS::Value StdIconsImp::wrapPixmap(KJS::ExecState *exec, const TQPixmap &icon) { return convertToValue(exec, icon); } KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const KJS::List &args ) { - TTQString arg0 = extractTQString(exec, args, 0); // Name + TQString arg0 = extractTQString(exec, args, 0); // Name int arg1 = extractInt(exec, args, 1); // Size 0, 16, 24, 32, 48, 64, 128 int arg2 = extractInt(exec, args, 2); // State 0 DefaultState, 1 ActiveState, 2 DisabledState, 3 LastState @@ -212,7 +212,7 @@ KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const } case StdIconsImp::MimeSourceIcon: { - return wrapPixmap( exec, TTQPixmap::fromMimeSource(arg0)); + return wrapPixmap( exec, TQPixmap::fromMimeSource(arg0)); } default: kdWarning() << "StdDirsImp has no method " << id << endl; diff --git a/kjsembed/builtins/resources.h b/kjsembed/builtins/resources.h index 45d7dad7..cfd589ce 100644 --- a/kjsembed/builtins/resources.h +++ b/kjsembed/builtins/resources.h @@ -87,8 +87,8 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - /** wrap a TTQPixmap **/ - KJS::Value wrapPixmap(KJS::ExecState *exec,const TTQPixmap &icon); + /** wrap a TQPixmap **/ + KJS::Value wrapPixmap(KJS::ExecState *exec,const TQPixmap &icon); uint id; JSFactory *jsfact; }; diff --git a/kjsembed/builtins/saxhandler.cpp b/kjsembed/builtins/saxhandler.cpp index 50507ff9..ff0334bf 100644 --- a/kjsembed/builtins/saxhandler.cpp +++ b/kjsembed/builtins/saxhandler.cpp @@ -23,7 +23,7 @@ namespace KJSEmbed { namespace BuiltIns { SaxHandler::SaxHandler( KJS::ExecState *execstate ) - : TTQXmlDefaultHandler(), exec(execstate), error( ErrorNone ) + : TQXmlDefaultHandler(), exec(execstate), error( ErrorNone ) { } @@ -45,7 +45,7 @@ bool SaxHandler::startDocument() KJS::Identifier funName("startDocument"); if ( !jshandler.hasProperty(exec, funName) ) - return TTQXmlDefaultHandler::startDocument(); + return TQXmlDefaultHandler::startDocument(); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -66,7 +66,7 @@ bool SaxHandler::endDocument() KJS::Identifier funName("endDocument"); if ( !jshandler.hasProperty(exec, funName) ) - return TTQXmlDefaultHandler::endDocument(); + return TQXmlDefaultHandler::endDocument(); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -78,8 +78,8 @@ bool SaxHandler::endDocument() return ret.toBoolean( exec ); } -bool SaxHandler::startElement( const TTQString &ns, const TTQString &ln, const TTQString &qn, - const TTQXmlAttributes &attrs ) +bool SaxHandler::startElement( const TQString &ns, const TQString &ln, const TQString &qn, + const TQXmlAttributes &attrs ) { if ( !jshandler.isValid() ) { error = ErrorNoHandler; @@ -88,7 +88,7 @@ bool SaxHandler::startElement( const TTQString &ns, const TTQString &ln, const T KJS::Identifier funName("startElement"); if ( !jshandler.hasProperty(exec, funName) ) - return TTQXmlDefaultHandler::startElement( ns, ln, qn, attrs ); + return TQXmlDefaultHandler::startElement( ns, ln, qn, attrs ); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -106,7 +106,7 @@ bool SaxHandler::startElement( const TTQString &ns, const TTQString &ln, const T return ret.toBoolean( exec ); } -bool SaxHandler::endElement( const TTQString &ns, const TTQString &ln, const TTQString &qn ) +bool SaxHandler::endElement( const TQString &ns, const TQString &ln, const TQString &qn ) { if ( !jshandler.isValid() ) { error = ErrorNoHandler; @@ -115,7 +115,7 @@ bool SaxHandler::endElement( const TTQString &ns, const TTQString &ln, const TTQ KJS::Identifier funName("endElement"); if ( !jshandler.hasProperty(exec, funName) ) - return TTQXmlDefaultHandler::endElement( ns, ln, qn ); + return TQXmlDefaultHandler::endElement( ns, ln, qn ); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -132,7 +132,7 @@ bool SaxHandler::endElement( const TTQString &ns, const TTQString &ln, const TTQ return ret.toBoolean( exec ); } -bool SaxHandler::characters( const TTQString &chars ) +bool SaxHandler::characters( const TQString &chars ) { if ( !jshandler.isValid() ) { error = ErrorNoHandler; @@ -141,7 +141,7 @@ bool SaxHandler::characters( const TTQString &chars ) KJS::Identifier funName("characters"); if ( !jshandler.hasProperty(exec, funName) ) - return TTQXmlDefaultHandler::characters( chars ); + return TQXmlDefaultHandler::characters( chars ); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -156,15 +156,15 @@ bool SaxHandler::characters( const TTQString &chars ) return ret.toBoolean( exec ); } -TTQString SaxHandler::errorString() +TQString SaxHandler::errorString() { switch( error ) { case ErrorNoHandler: - return TTQString("No handler specified"); + return TQString("No handler specified"); break; case ErrorNotCallable: - return TTQString("One of the callbacks of the handler is not callable"); + return TQString("One of the callbacks of the handler is not callable"); break; case ErrorNone: // This only means that no error occured in the JS dispatch, there @@ -175,7 +175,7 @@ TTQString SaxHandler::errorString() break; } - return TTQXmlDefaultHandler::errorString(); + return TQXmlDefaultHandler::errorString(); } } // namespace KJSEmbed::BuiltIns diff --git a/kjsembed/builtins/saxhandler.h b/kjsembed/builtins/saxhandler.h index 4a1b1954..5feeef58 100644 --- a/kjsembed/builtins/saxhandler.h +++ b/kjsembed/builtins/saxhandler.h @@ -57,12 +57,12 @@ public: virtual bool startDocument(); virtual bool endDocument(); - virtual bool startElement( const TTQString &ns, const TTQString &ln, const TTQString &qn, - const TTQXmlAttributes &attrs ); - virtual bool endElement( const TTQString &ns, const TTQString &ln, const TTQString &qn ); - virtual bool characters( const TTQString &chars ); + virtual bool startElement( const TQString &ns, const TQString &ln, const TQString &qn, + const TQXmlAttributes &attrs ); + virtual bool endElement( const TQString &ns, const TQString &ln, const TQString &qn ); + virtual bool characters( const TQString &chars ); - virtual TTQString errorString(); + virtual TQString errorString(); private: KJS::ExecState *exec; diff --git a/kjsembed/builtins/stdaction_imp.cpp b/kjsembed/builtins/stdaction_imp.cpp index d81ead33..aa1c43ed 100644 --- a/kjsembed/builtins/stdaction_imp.cpp +++ b/kjsembed/builtins/stdaction_imp.cpp @@ -75,12 +75,12 @@ KJS::Value StdActionImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, cons return KJS::Null(); // recv, slot, parent, name? - TTQObject *recv = extractTQObject( exec, args, 0); + TQObject *recv = extractTQObject( exec, args, 0); - TTQString sl = extractTQString( exec, args, 1 ); + TQString sl = extractTQString( exec, args, 1 ); const char *slc = sl.isNull() ? "" : sl.ascii(); - TTQObject *parentobj = extractTQObject( exec, args, 2 ); + TQObject *parentobj = extractTQObject( exec, args, 2 ); KActionCollection *parent = parentobj ? dynamic_cast( parentobj ) : 0; KStdAction::StdAction actid = static_cast(id); diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp index 122cd300..24c973b0 100644 --- a/kjsembed/builtins/stddialog_imp.cpp +++ b/kjsembed/builtins/stddialog_imp.cpp @@ -76,32 +76,32 @@ void StdDialogImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) KJS::Value StdDialogImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { - TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null; - TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null; + TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null; switch( id ) { case MethodGetOpenFileName: { - TTQString s = KFileDialog::getOpenFileName( arg0, arg1 ); + TQString s = KFileDialog::getOpenFileName( arg0, arg1 ); return KJS::String( s ); } case MethodGetSaveFileName: { - TTQString s = KFileDialog::getSaveFileName( arg0, arg1 ); + TQString s = KFileDialog::getSaveFileName( arg0, arg1 ); return KJS::String( s ); } case MethodGetExistingDirectory: { - TTQString s = KFileDialog::getExistingDirectory( arg0 ); + TQString s = KFileDialog::getExistingDirectory( arg0 ); return KJS::String( s ); } #ifndef QT_ONLY case MethodGetColor: { - TTQColor col; + TQColor col; int res = KColorDialog::getColor( col ); - if ( res == TTQDialog::Accepted ) - return convertToValue( exec, TTQVariant(col) ); + if ( res == TQDialog::Accepted ) + return convertToValue( exec, TQVariant(col) ); } case MethodGetOpenURL: { diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp index de155cfa..d28bb46c 100644 --- a/kjsembed/builtins/textstream_imp.cpp +++ b/kjsembed/builtins/textstream_imp.cpp @@ -28,7 +28,7 @@ namespace KJSEmbed { namespace BuiltIns { -TextStreamImp::TextStreamImp( KJS::ExecState *exec, int mid, TTQTextStream *textstream ) +TextStreamImp::TextStreamImp( KJS::ExecState *exec, int mid, TQTextStream *textstream ) : JSProxyImp(exec), id(mid), ts(textstream) { } @@ -47,7 +47,7 @@ void TextStreamImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) return; } - TTQTextStream *ts = op->toTextStream(); + TQTextStream *ts = op->toTextStream(); if ( !ts ) { kdWarning() << "TextStreamImp::addBindings() failed, type is " << op->typeName() << endl; return; @@ -73,12 +73,12 @@ void TextStreamImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) KJS::Value TextStreamImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { - TTQString not_readable = i18n( "Attempt to read from a write-only text stream." ); - TTQString not_writable = i18n( "Attempt to write to a read-only text stream." ); + TQString not_readable = i18n( "Attempt to read from a write-only text stream." ); + TQString not_writable = i18n( "Attempt to write to a read-only text stream." ); - TTQString arg0 = extractTQString(exec, args, 0); + TQString arg0 = extractTQString(exec, args, 0); - TTQIODevice *dev = ts->device(); + TQIODevice *dev = ts->device(); KJS::Object err; switch ( id ) { @@ -102,7 +102,7 @@ KJS::Value TextStreamImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, con break; case MethodReadLine: if ( dev->isReadable() ) { - TTQString line = ts->readLine(); + TQString line = ts->readLine(); if ( line.isNull() ) return KJS::Null(); else diff --git a/kjsembed/builtins/textstream_imp.h b/kjsembed/builtins/textstream_imp.h index 7a2bf824..c08470fc 100644 --- a/kjsembed/builtins/textstream_imp.h +++ b/kjsembed/builtins/textstream_imp.h @@ -27,7 +27,7 @@ #include -class TTQTextStream; +class TQTextStream; namespace KJSEmbed { namespace BuiltIns { @@ -51,7 +51,7 @@ public: MethodFlush }; - TextStreamImp( KJS::ExecState *exec, int id, TTQTextStream *ts ); + TextStreamImp( KJS::ExecState *exec, int id, TQTextStream *ts ); ~TextStreamImp(); static void addBindings( KJS::ExecState *exec, KJS::Object &object ); @@ -64,7 +64,7 @@ public: private: int id; - TTQTextStream *ts; + TQTextStream *ts; class TextStreamImpPrivate *d; }; diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp index 5e2e7d6c..6d22b412 100644 --- a/kjsembed/cpptests/jsaccess/jsaccess.cpp +++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp @@ -47,7 +47,7 @@ int main( int argc, char **argv ) KJS::Interpreter *js = part->interpreter(); KJS::ExecState *exec = js->globalExec(); - TTQString script = "var foobar = \"test from javascript.\";" + TQString script = "var foobar = \"test from javascript.\";" "function testNoArgsFunction( ){ return foobar; }" "function testNoReturnFunction( value ){ foobar = value; }" "function testFunction( value ){ return \"testFunction dorks with \" + value;}"; @@ -58,7 +58,7 @@ int main( int argc, char **argv ) /** * Test extraction of a Variant from javascript */ - TTQString value = part->getVariant("foobar").toString(); + TQString value = part->getVariant("foobar").toString(); if( value != "test from javascript." ) kdWarning() << "Get variant failed with: " << value << endl; diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index a29815f0..74f58c2f 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -102,8 +102,8 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) if ( !proxy ) return; kdDebug() << "CustomObjectImp::addBindings is a proxy" << endl; - TTQObject *qobj = proxy->object(); - TTQWidget *widget = proxy->widget(); + TQObject *qobj = proxy->object(); + TQWidget *widget = proxy->widget(); #ifndef QT_ONLY if ( qobj ) { @@ -126,13 +126,13 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) obj = new CustomObjectImp( exec, WidgetDrawText, proxy ); object.put( exec, "drawText", KJS::Object(obj) ); - TTQListBox *listbox = dynamic_cast( widget ); + TQListBox *listbox = dynamic_cast( widget ); if ( listbox ) { obj = new CustomObjectImp( exec, ListBoxInsertItem, proxy ); object.put( exec, "insertItem", KJS::Object(obj) ); } - TTQListView *listview = dynamic_cast( widget ); + TQListView *listview = dynamic_cast( widget ); if ( listview ) { obj = new CustomObjectImp( exec, ListViewAddColumn, proxy ); object.put( exec, "addColumn", KJS::Object(obj) ); @@ -149,7 +149,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) obj = new CustomObjectImp( exec, ListViewCurrentItem, proxy ); object.put( exec, "currentItem", KJS::Object(obj) ); } - TTQSplashScreen *splashscreen = dynamic_cast(widget); + TQSplashScreen *splashscreen = dynamic_cast(widget); if( splashscreen ) { obj = new CustomObjectImp(exec, TQSplashScreenSetPixmap, proxy ); @@ -189,13 +189,13 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) #endif // QT_ONLY - TTQTabWidget *tw = dynamic_cast( widget ); + TQTabWidget *tw = dynamic_cast( widget ); if ( tw ) { obj = new CustomObjectImp( exec, TabWidgetAddTab, proxy ); object.put( exec, "addTab", KJS::Object(obj) ); } - TTQScrollView *sv = dynamic_cast( widget ); + TQScrollView *sv = dynamic_cast( widget ); if ( sv ) { obj = new CustomObjectImp( exec, ScrollViewViewport, proxy ); object.put( exec, "viewport", KJS::Object(obj) ); @@ -213,17 +213,17 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) ADDBINDING( TQCanvasView, widget ) /* - TTQMenuData *md = dynamic_cast( widget ); + TQMenuData *md = dynamic_cast( widget ); if ( md ) { TQMenuDataImp::addBindings( exec, object ); } - TTQMenuItem *mitem = dynamic_cast( widget ); + TQMenuItem *mitem = dynamic_cast( widget ); if ( mitem ) { TQMenuItemImp::addBindings( exec, object ); } */ - TTQMenuData *menuData = dynamic_cast(widget); + TQMenuData *menuData = dynamic_cast(widget); if( menuData ) { obj = new CustomObjectImp( exec, TQMenuDataInsertItem, proxy ); @@ -234,12 +234,12 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) object.put( exec, "insertSeparator", KJS::Object(obj) ); } - TTQHBox *hbox = dynamic_cast( widget ); + TQHBox *hbox = dynamic_cast( widget ); if ( hbox ) { obj = new CustomObjectImp( exec, HBoxSpacing, proxy ); object.put( exec, "setSpacing", KJS::Object(obj) ); } - TTQToolBox *tb = dynamic_cast( qobj ); + TQToolBox *tb = dynamic_cast( qobj ); if ( tb ) { obj = new CustomObjectImp( exec, TQToolBoxAddItem, proxy ); object.put( exec, "addItem", KJS::Object(obj) ); @@ -262,7 +262,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } if ( qobj ) { - TTQApplication *app = dynamic_cast( qobj ); + TQApplication *app = dynamic_cast( qobj ); if ( app ) { obj = new CustomObjectImp( exec, ApplicationExec, proxy ); object.put( exec, "exec", KJS::Object(obj) ); @@ -292,7 +292,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) #endif // QT_ONLY - TTQTimer *timer = dynamic_cast( qobj ); + TQTimer *timer = dynamic_cast( qobj ); if ( timer ) { obj = new CustomObjectImp( exec, TimerIsActive, proxy ); object.put( exec, "isActive", KJS::Object(obj) ); @@ -302,7 +302,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) object.put( exec, "stop", KJS::Object(obj) ); } - TTQBoxLayout *box = dynamic_cast( qobj ); + TQBoxLayout *box = dynamic_cast( qobj ); if ( box ) { obj = new CustomObjectImp( exec, BoxLayoutAddWidget, proxy ); object.put( exec, "addWidget", KJS::Object(obj) ); @@ -529,10 +529,10 @@ KJS::Value CustomObjectImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Value CustomObjectImp::qsplashScreenSetPixmap(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQSplashScreen *ss = dynamic_cast(proxy->widget()); + TQSplashScreen *ss = dynamic_cast(proxy->widget()); if ( ss ) { - TTQPixmap pix = extractTQPixmap(exec, args, 0 ); + TQPixmap pix = extractTQPixmap(exec, args, 0 ); ss->setPixmap(pix); } return KJS::Value(); @@ -540,10 +540,10 @@ KJS::Value CustomObjectImp::qsplashScreenSetPixmap(KJS::ExecState *exec, KJS::Ob KJS::Value CustomObjectImp::qsplashScreenPixmap(KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { - TTQSplashScreen *ss = dynamic_cast(proxy->widget()); + TQSplashScreen *ss = dynamic_cast(proxy->widget()); if ( ss ) { - TTQPixmap pix = *(ss->pixmap()); + TQPixmap pix = *(ss->pixmap()); return convertToValue(exec, pix); } return KJS::Value(); @@ -551,10 +551,10 @@ KJS::Value CustomObjectImp::qsplashScreenPixmap(KJS::ExecState *exec, KJS::Objec KJS::Value CustomObjectImp::qsplashScreenFinish(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQSplashScreen *ss = dynamic_cast(proxy->widget()); + TQSplashScreen *ss = dynamic_cast(proxy->widget()); if ( ss ) { - TTQWidget *w = extractTQWidget(exec, args, 0 ); + TQWidget *w = extractTQWidget(exec, args, 0 ); ss->finish(w); } return KJS::Value(); @@ -562,7 +562,7 @@ KJS::Value CustomObjectImp::qsplashScreenFinish(KJS::ExecState *exec, KJS::Objec KJS::Value CustomObjectImp::qsplashScreenRepaint(KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { - TTQSplashScreen *ss = dynamic_cast(proxy->widget()); + TQSplashScreen *ss = dynamic_cast(proxy->widget()); if ( ss ) { ss->repaint(); @@ -573,10 +573,10 @@ KJS::Value CustomObjectImp::qsplashScreenRepaint(KJS::ExecState *exec, KJS::Obje KJS::Value CustomObjectImp::widgetGrabWidget(KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { - TTQWidget *w = proxy->widget(); + TQWidget *w = proxy->widget(); if ( !w ) return KJS::Value(); - TTQVariant pix(TTQPixmap::grabWidget(w) ); + TQVariant pix(TQPixmap::grabWidget(w) ); return convertToValue( exec, pix ); } @@ -585,7 +585,7 @@ void CustomObjectImp::widgetDrawLine( KJS::ExecState *exec, KJS::Object &, const if ( args.size() != 4 ) return; - TTQWidget *w = proxy->widget(); + TQWidget *w = proxy->widget(); if ( !w ) return; @@ -594,7 +594,7 @@ void CustomObjectImp::widgetDrawLine( KJS::ExecState *exec, KJS::Object &, const int x1 = extractInt( exec, args, 2 ); int y1 = extractInt( exec, args, 3 ); - TTQPainter p(w); + TQPainter p(w); p.drawLine(x,y,x1,y1); } @@ -603,13 +603,13 @@ void CustomObjectImp::widgetDrawText( KJS::ExecState *exec, KJS::Object &, const if ( args.size() != 3 ) return; - TTQWidget *w = proxy->widget(); + TQWidget *w = proxy->widget(); if ( !w ) return; int x = extractInt( exec, args, 0 ); int y = extractInt( exec, args, 1 ); - TTQString s = extractTQString( exec, args, 2 ); + TQString s = extractTQString( exec, args, 2 ); w->drawText( x, y, s ); } @@ -618,11 +618,11 @@ void CustomObjectImp::listBoxInsertItem( KJS::ExecState *exec, KJS::Object &, co if ( args.size() != 1 ) return; - TTQListBox *lb = dynamic_cast( proxy->object() ); + TQListBox *lb = dynamic_cast( proxy->object() ); if ( !lb ) return; - TTQString s = extractTQString( exec, args, 0 ); + TQString s = extractTQString( exec, args, 0 ); lb->insertItem( s ); } @@ -631,11 +631,11 @@ void CustomObjectImp::listViewAddColumn( KJS::ExecState *exec, KJS::Object &, co if ( args.size() != 1 ) return; - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if ( !lv ) return; - TTQString s = extractTQString( exec, args, 0 ); + TQString s = extractTQString( exec, args, 0 ); lv->addColumn( s ); } @@ -651,10 +651,10 @@ void CustomObjectImp::listViewInsertItem( KJS::ExecState *exec, KJS::Object &, c KListViewItem *lvm = new KListViewItem(klv); for( int idx = 0; idx < args.size(); ++idx){ - TTQVariant arg = convertToVariant(exec, args[idx]); - if( arg.canCast(TTQVariant::String) ) + TQVariant arg = convertToVariant(exec, args[idx]); + if( arg.canCast(TQVariant::String) ) lvm->setText(idx, arg.toString()); - else if ( arg.canCast(TTQVariant::Pixmap) ) + else if ( arg.canCast(TQVariant::Pixmap) ) lvm->setPixmap(idx, arg.toPixmap()); } return; @@ -662,15 +662,15 @@ void CustomObjectImp::listViewInsertItem( KJS::ExecState *exec, KJS::Object &, c #endif // QT_ONLY - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if ( lv ) { - TTQListViewItem *lvm = new TTQListViewItem(lv); + TQListViewItem *lvm = new TQListViewItem(lv); for( int idx = 0; idx < args.size(); ++idx){ - TTQVariant arg = convertToVariant(exec, args[idx]); - if( arg.canCast(TTQVariant::String) ) + TQVariant arg = convertToVariant(exec, args[idx]); + if( arg.canCast(TQVariant::String) ) lvm->setText(idx, arg.toString()); - else if ( arg.canCast(TTQVariant::Pixmap) ) + else if ( arg.canCast(TQVariant::Pixmap) ) lvm->setPixmap(idx, arg.toPixmap()); } @@ -682,23 +682,23 @@ KJS::Value CustomObjectImp::listViewSelectedItem( KJS::ExecState *exec, KJS::Obj if ( args.size() ) return KJS::Value(); - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if ( !lv ) return KJS::Value(); - TTQListViewItem *lvi = lv->selectedItem(); + TQListViewItem *lvi = lv->selectedItem(); if ( !lvi ) return KJS::Null(); - TTQCheckListItem *cli = dynamic_cast( lvi ); + TQCheckListItem *cli = dynamic_cast( lvi ); if ( cli ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TTQCheckListItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TQCheckListItem" ); KJS::Object proxyObj(prx); proxy->part()->factory()->extendOpaqueProxy(exec, proxyObj); return proxyObj; } - JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TTQListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TQListViewItem" ); KJS::Object proxyObj(prx); proxy->part()->factory()->extendOpaqueProxy(exec, proxyObj); return proxyObj; @@ -710,7 +710,7 @@ void CustomObjectImp::listViewHideColumn( KJS::ExecState *exec, KJS::Object &, c if ( args.size() != 1 ) return; - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if ( !lv ) return; @@ -728,7 +728,7 @@ void CustomObjectImp::mainWinSetCentralWidget( KJS::ExecState *exec, KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *cwproxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQWidget *cw = cwproxy ? cwproxy->widget() : 0; + TQWidget *cw = cwproxy ? cwproxy->widget() : 0; if ( !cw ) return; KMainWindow *mw = dynamic_cast( proxy->object() ); @@ -793,7 +793,7 @@ KJS::Value CustomObjectImp::mainWinMenuBar( KJS::ExecState *exec, KJS::Object &, return KJS::Value(); } - TTQObject *obj = mw->menuBar(); + TQObject *obj = mw->menuBar(); return proxy->part()->factory()->createProxy( exec, obj, proxy ); #else // QT_ONLY @@ -812,7 +812,7 @@ KJS::Value CustomObjectImp::mainWinStatusBar( KJS::ExecState *exec, KJS::Object return KJS::Value(); } - TTQObject *obj = mw->statusBar(); + TQObject *obj = mw->statusBar(); return proxy->part()->factory()->createProxy( exec, obj, proxy ); #else // QT_ONLY @@ -853,13 +853,13 @@ void CustomObjectImp::tabWidgetAddTab( KJS::ExecState *exec, KJS::Object&, const if ( args.size() < 2 ) return; - TTQTabWidget *tw = dynamic_cast( proxy->object() ); + TQTabWidget *tw = dynamic_cast( proxy->object() ); if ( !tw ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *tproxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQWidget *w = tproxy ? tproxy->widget() : 0; + TQWidget *w = tproxy ? tproxy->widget() : 0; if ( !w ) return; @@ -868,13 +868,13 @@ void CustomObjectImp::tabWidgetAddTab( KJS::ExecState *exec, KJS::Object&, const KJS::Value CustomObjectImp::scrollViewViewport( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { - TTQScrollView *sv = dynamic_cast( proxy->object() ); + TQScrollView *sv = dynamic_cast( proxy->object() ); if ( !sv ) return KJS::Value(); KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *sproxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQWidget *w = sproxy ? sproxy->widget() : 0; + TQWidget *w = sproxy ? sproxy->widget() : 0; if ( !w ) return KJS::Value(); @@ -886,13 +886,13 @@ void CustomObjectImp::scrollViewAddChild( KJS::ExecState *exec, KJS::Object&, co if ( args.size() < 1 ) return; - TTQScrollView *sv = dynamic_cast( proxy->object() ); + TQScrollView *sv = dynamic_cast( proxy->object() ); if ( !sv ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *sproxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQWidget *w = sproxy ? sproxy->widget() : 0; + TQWidget *w = sproxy ? sproxy->widget() : 0; if ( !w ) return; @@ -904,7 +904,7 @@ void CustomObjectImp::scrollViewAddChild( KJS::ExecState *exec, KJS::Object&, co KJS::Value CustomObjectImp::applicationExec( KJS::ExecState *, KJS::Object&, const KJS::List& ) { - TTQApplication *app = dynamic_cast( proxy->object() ); + TQApplication *app = dynamic_cast( proxy->object() ); if ( !app ) return KJS::Value(); @@ -913,7 +913,7 @@ KJS::Value CustomObjectImp::applicationExec( KJS::ExecState *, KJS::Object&, con KJS::Value CustomObjectImp::timerIsActive( KJS::ExecState *, KJS::Object &, const KJS::List & ) { - TTQTimer *timer = dynamic_cast( proxy->object() ); + TQTimer *timer = dynamic_cast( proxy->object() ); if ( !timer ) return KJS::Value(); @@ -922,7 +922,7 @@ KJS::Value CustomObjectImp::timerIsActive( KJS::ExecState *, KJS::Object &, cons KJS::Value CustomObjectImp::timerStart( KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQTimer *timer = dynamic_cast( proxy->object() ); + TQTimer *timer = dynamic_cast( proxy->object() ); if ( !timer ) return KJS::Value(); @@ -939,7 +939,7 @@ KJS::Value CustomObjectImp::timerStart( KJS::ExecState *exec, KJS::Object &, con KJS::Value CustomObjectImp::timerStop( KJS::ExecState *, KJS::Object &, const KJS::List & ) { - TTQTimer *timer = dynamic_cast( proxy->object() ); + TQTimer *timer = dynamic_cast( proxy->object() ); if ( !timer ) return KJS::Value(); @@ -952,13 +952,13 @@ void CustomObjectImp::boxLayoutAddWidget( KJS::ExecState *exec, KJS::Object &, c if ( (args.size() < 1) || (args.size() > 3) ) return; - TTQBoxLayout *box = dynamic_cast( proxy->object() ); + TQBoxLayout *box = dynamic_cast( proxy->object() ); if ( !box ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQWidget *w = proxy ? proxy->widget() : 0; + TQWidget *w = proxy ? proxy->widget() : 0; if ( !w ) return; @@ -975,7 +975,7 @@ void CustomObjectImp::boxLayoutAddSpacing( KJS::ExecState *exec, KJS::Object &, if ( args.size() != 1 ) return; - TTQBoxLayout *box = dynamic_cast( proxy->object() ); + TQBoxLayout *box = dynamic_cast( proxy->object() ); if ( !box ) return; @@ -987,7 +987,7 @@ void CustomObjectImp::boxLayoutAddStretch( KJS::ExecState *exec, KJS::Object &, if ( args.size() > 1 ) return; - TTQBoxLayout *box = dynamic_cast( proxy->object() ); + TQBoxLayout *box = dynamic_cast( proxy->object() ); if ( !box ) return; @@ -1002,13 +1002,13 @@ void CustomObjectImp::boxLayoutAddLayout( KJS::ExecState *exec, KJS::Object &, c if ( (args.size() < 1) || (args.size() > 2) ) return; - TTQBoxLayout *box = dynamic_cast( proxy->object() ); + TQBoxLayout *box = dynamic_cast( proxy->object() ); if ( !box ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQLayout *l = proxy ? (dynamic_cast(proxy->object())) : 0; + TQLayout *l = proxy ? (dynamic_cast(proxy->object())) : 0; if ( !l ) return; @@ -1051,7 +1051,7 @@ KJS::Value CustomObjectImp::kroPartWriteStream( KJS::ExecState *exec, KJS::Objec if ( !ro ) return KJS::Boolean( false ); - TTQCString s = extractTQString( exec, args, 0 ).latin1(); + TQCString s = extractTQString( exec, args, 0 ).latin1(); bool ok = ro->writeStream( s ); return KJS::Boolean( ok ); @@ -1087,7 +1087,7 @@ void CustomObjectImp::hboxSpacing( KJS::ExecState *exec, KJS::Object &, const KJ if ( args.size() != 1 ) return; - TTQHBox *box = dynamic_cast( proxy->object() ); + TQHBox *box = dynamic_cast( proxy->object() ); if ( !box ) return; @@ -1167,7 +1167,7 @@ KJS::Value CustomObjectImp::ksystemtrayLoadIcon( KJS::ExecState *exec, KJS::Obje if ( args.size() != 1 ) return KJS::Value(); - TTQVariant pix( KSystemTray::loadIcon( extractTQString( exec, args, 0 ) ) ); + TQVariant pix( KSystemTray::loadIcon( extractTQString( exec, args, 0 ) ) ); return convertToValue( exec, pix ); #endif // QT_ONLY return KJS::Null(); @@ -1175,7 +1175,7 @@ return KJS::Null(); KJS::Value CustomObjectImp::qcanvasViewCanvas( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { - TTQCanvasView *cv = dynamic_cast( proxy->object() ); + TQCanvasView *cv = dynamic_cast( proxy->object() ); if ( !cv ) return KJS::Value(); @@ -1184,28 +1184,28 @@ KJS::Value CustomObjectImp::qcanvasViewCanvas( KJS::ExecState *exec, KJS::Object void CustomObjectImp::qcanvasViewSetCanvas( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { - TTQCanvasView *cv = dynamic_cast( proxy->object() ); + TQCanvasView *cv = dynamic_cast( proxy->object() ); if ( !cv ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() ); - TTQObject *obj = proxy->object(); + TQObject *obj = proxy->object(); if ( !obj ) return; - TTQCanvas *c = (TTQCanvas *) obj; + TQCanvas *c = (TQCanvas *) obj; cv->setCanvas(c); } KJS::Value Bindings::CustomObjectImp::qlistViewTakeItem( KJS::ExecState * exec, KJS::Object &, const KJS::List &args ) { - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if( !lv ) return KJS::Boolean(false); KJS::Object lviObj = args[0].toObject(exec); JSOpaqueProxy *prxy = JSProxy::toOpaqueProxy(lviObj.imp() ); - TTQListViewItem *itm = prxy->toNative(); + TQListViewItem *itm = prxy->toNative(); if( !itm ) { // Trow an error... @@ -1217,42 +1217,42 @@ KJS::Value Bindings::CustomObjectImp::qlistViewTakeItem( KJS::ExecState * exec, KJS::Value Bindings::CustomObjectImp::qlistViewFirstChild( KJS::ExecState * exec, KJS::Object &, const KJS::List &args ) { - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if( !lv ) return KJS::Boolean(false); - TTQListViewItem *itm = lv->firstChild(); - KJS::Object jsObject( new JSOpaqueProxy( itm, "TTQListViewItem") ); + TQListViewItem *itm = lv->firstChild(); + KJS::Object jsObject( new JSOpaqueProxy( itm, "TQListViewItem") ); proxy->part()->factory()->extendOpaqueProxy(exec, jsObject); return jsObject; } KJS::Value Bindings::CustomObjectImp::qlistViewCurrentItem( KJS::ExecState * exec, KJS::Object &, const KJS::List &args ) { - TTQListView *lv = dynamic_cast( proxy->object() ); + TQListView *lv = dynamic_cast( proxy->object() ); if( !lv ) return KJS::Boolean(false); - TTQListViewItem *itm = lv->currentItem(); - KJS::Object jsObject( new JSOpaqueProxy( itm, "TTQListViewItem") ); + TQListViewItem *itm = lv->currentItem(); + KJS::Object jsObject( new JSOpaqueProxy( itm, "TQListViewItem") ); proxy->part()->factory()->extendOpaqueProxy(exec, jsObject); return jsObject; } KJS::Value Bindings::CustomObjectImp::qtoolBoxAddItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return KJS::Boolean(false); if( args.size() == 2) { - TTQWidget *w = extractTQWidget( exec, args, 0 ); - TTQString lab = extractTQString( exec, args, 1 ); + TQWidget *w = extractTQWidget( exec, args, 0 ); + TQString lab = extractTQString( exec, args, 1 ); return KJS::Number( tb->addItem(w,lab) ); } if( args.size() == 3) { - TTQWidget *w = extractTQWidget( exec, args, 0 ); - TTQIconSet ico = extractTQPixmap( exec, args, 1 ); - TTQString lab = extractTQString( exec, args, 2 ); + TQWidget *w = extractTQWidget( exec, args, 0 ); + TQIconSet ico = extractTQPixmap( exec, args, 1 ); + TQString lab = extractTQString( exec, args, 2 ); return KJS::Number( tb->addItem(w,ico,lab) ); } return KJS::Boolean(false); @@ -1260,22 +1260,22 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxAddItem(KJS::ExecState *exec, KJS: KJS::Value Bindings::CustomObjectImp::qtoolBoxInsertItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return KJS::Boolean(false); if( args.size() == 3) { int idx = extractInt(exec, args, 0); - TTQWidget *w = extractTQWidget( exec, args, 1 ); - TTQString lab = extractTQString( exec, args, 2 ); + TQWidget *w = extractTQWidget( exec, args, 1 ); + TQString lab = extractTQString( exec, args, 2 ); return KJS::Number( tb->insertItem(idx,w,lab) ); } if( args.size() == 4) { int idx = extractInt(exec, args, 0); - TTQWidget *w = extractTQWidget( exec, args, 1 ); - TTQIconSet ico = extractTQPixmap( exec, args, 2 ); - TTQString lab = extractTQString( exec, args, 3 ); + TQWidget *w = extractTQWidget( exec, args, 1 ); + TQIconSet ico = extractTQPixmap( exec, args, 2 ); + TQString lab = extractTQString( exec, args, 3 ); return KJS::Number( tb->insertItem(idx,w,ico,lab) ); } return KJS::Boolean(false); @@ -1283,16 +1283,16 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxInsertItem(KJS::ExecState *exec, K void Bindings::CustomObjectImp::qtoolBoxRemoveItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return; - TTQWidget *w = extractTQWidget(exec, args, 0); + TQWidget *w = extractTQWidget(exec, args, 0); tb->removeItem(w); } KJS::Value Bindings::CustomObjectImp::qtoolBoxItemLabel(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); @@ -1301,63 +1301,63 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxItemLabel(KJS::ExecState *exec, KJ void Bindings::CustomObjectImp::qtoolBoxSetItemLabel(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return; int idx = extractInt(exec, args, 0); - TTQString lab = extractTQString( exec, args, 1 ); + TQString lab = extractTQString( exec, args, 1 ); tb->setItemLabel(idx,lab); } KJS::Value Bindings::CustomObjectImp::qtoolBoxItemIconSet(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); - TTQPixmap pix = tb->itemIconSet(idx).pixmap(); + TQPixmap pix = tb->itemIconSet(idx).pixmap(); return convertToValue( exec, pix ); } void Bindings::CustomObjectImp::qtoolBoxSetItemIconSet(KJS::ExecState *exec, KJS::Object &, const KJS::List &args) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return; int idx = extractInt(exec, args, 0); - TTQIconSet ico = extractTQPixmap( exec, args, 1); + TQIconSet ico = extractTQPixmap( exec, args, 1); tb->setItemIconSet(idx,ico); } KJS::Value Bindings::CustomObjectImp::qtoolBoxItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQToolBox *tb = dynamic_cast( proxy->object() ); + TQToolBox *tb = dynamic_cast( proxy->object() ); if( !tb ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); return proxy->part()->factory()->createProxy( exec, tb->item(idx), proxy ); } -TTQPopupMenu *getMenu(const KJS::Object &obj) +TQPopupMenu *getMenu(const KJS::Object &obj) { JSObjectProxy *jsproxy = JSProxy::toObjectProxy( obj.imp() ); - return dynamic_cast( jsproxy->object() ); + return dynamic_cast( jsproxy->object() ); } KJS::Value Bindings::CustomObjectImp::qmenuDataInsertItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQMenuData *menu = dynamic_cast( proxy->object() ); + TQMenuData *menu = dynamic_cast( proxy->object() ); if( !menu ) return KJS::Boolean(false); int offset = 0; - TTQString text = extractTQString(exec,args, offset); - TTQPixmap pix = extractTQPixmap(exec,args, offset); + TQString text = extractTQString(exec,args, offset); + TQPixmap pix = extractTQPixmap(exec,args, offset); int id = -1; int idx = -1; int newIndex = 0; - TTQPopupMenu *parentMenu = 0; + TQPopupMenu *parentMenu = 0; if( !pix.isNull() ) { @@ -1419,7 +1419,7 @@ KJS::Value Bindings::CustomObjectImp::qmenuDataInsertItem(KJS::ExecState *exec, void Bindings::CustomObjectImp::qmenuDataRemoveItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQMenuData *menu = dynamic_cast( proxy->object() ); + TQMenuData *menu = dynamic_cast( proxy->object() ); if( !menu ) return; int idx = extractInt(exec, args, 0); @@ -1428,7 +1428,7 @@ void Bindings::CustomObjectImp::qmenuDataRemoveItem(KJS::ExecState *exec, KJS::O KJS::Value Bindings::CustomObjectImp::qmenuDataInsertSeparator(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - TTQMenuData *menu = dynamic_cast( proxy->object() ); + TQMenuData *menu = dynamic_cast( proxy->object() ); if( !menu ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); diff --git a/kjsembed/customobject_imp.h b/kjsembed/customobject_imp.h index 74658a1f..600d7a15 100644 --- a/kjsembed/customobject_imp.h +++ b/kjsembed/customobject_imp.h @@ -28,7 +28,7 @@ #include -class TTQObject; +class TQObject; namespace KJSEmbed { namespace Bindings { diff --git a/kjsembed/design.h b/kjsembed/design.h index e8bdbbc0..dd9bf357 100644 --- a/kjsembed/design.h +++ b/kjsembed/design.h @@ -38,7 +38,7 @@ * A widget that provides an interactive JS console. * * @ref KJSEmbed::JSObjectProxy : - * A Javascript object that can access the properties of a TTQObject, + * A Javascript object that can access the properties of a TQObject, * * @ref KJSEmbed::SecurityPolicy : * Defines a security policy for @ref JSObjectProxy. @@ -71,12 +71,12 @@ * class, but is more easily used via the addObject(...) methods of @ref KJSEmbedPart. * * The following code shows how easy it is to make an object available for - * scripting. It creates a TTQVBox containing two TQLabels then makes them visible + * scripting. It creates a TQVBox containing two TQLabels then makes them visible * to KJSEmbed: * 
- *    TTQVBox *toplevel = new TTQVBox( 0, "box" );
- *    TTQLabel *title = new TTQLabel( "Some Title", toplevel, "title");
- *    TTQLabel *main = new TTQLabel( "Some text, more text.", toplevel, "main" );
+ *    TQVBox *toplevel = new TQVBox( 0, "box" );
+ *    TQLabel *title = new TQLabel( "Some Title", toplevel, "title");
+ *    TQLabel *main = new TQLabel( "Some text, more text.", toplevel, "main" );
  *
  *    js->addObject( title );
  *    js->addObject( main, "text" );
@@ -92,14 +92,14 @@
  *
* The script above would set the text of the label to 'Hello World'. * - * The slots of a TTQObject bound to the interpreter are made available to + * The slots of a TQObject bound to the interpreter are made available to * scripts as if they normal methods. In the example above, we could conceal * the label 'main' entirely by calling its hide() slot: * 
  *    main.hide()
  *
* - * @section tree Access To the TTQObject Tree + * @section tree Access To the TQObject Tree * * As well as providing script access to an individual widget, KJSEmbed * allows scripts to walk the object tree and access others. If we @@ -134,7 +134,7 @@ * To embed the interpreter we can just create a new KJSEmbed part. * @skipline m_part * To publish the objects we can then call @ref KJSEmbed::KJSEmbedPart::addObject on our part. - * This will then add any TTQObject based class the the global scope of the + * This will then add any TQObject based class the the global scope of the * javascript interperter. * @skipline addObject * Once you have your objects published you can then execute javascript code from a file. @@ -148,10 +148,10 @@ * @ref KJS::List. This is just a list of @ref KJS::Value objects and can be created from * TQVariants or from custom @ref KJS::Object based classes. * Once you have the data back from the method you can convert it easily from the @ref KJS::Value - * type to a TTQVariant with the @ref KJSEmbed::convertToVariant method. + * type to a TQVariant with the @ref KJSEmbed::convertToVariant method. * @line personalData * @until notes: - * Complex arrays or @ref KJS::Objects are transparently converted to TTQVariant::Map types so + * Complex arrays or @ref KJS::Objects are transparently converted to TQVariant::Map types so * they can easily be manipulated from C++. * The KJSEmbed::console is also easy to add to applications. An example of a method that * will toggle the console is below. diff --git a/kjsembed/docs/embedding/qtembed/main.cpp b/kjsembed/docs/embedding/qtembed/main.cpp index 78808aac..fbf8541b 100644 --- a/kjsembed/docs/embedding/qtembed/main.cpp +++ b/kjsembed/docs/embedding/qtembed/main.cpp @@ -10,7 +10,7 @@ int main ( int argc, char ** argv ) { - TTQApplication app( argc, argv ); + TQApplication app( argc, argv ); POSViewImp *view = new POSViewImp; app.setMainWidget(view); view->show(); diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.cpp b/kjsembed/docs/embedding/qtembed/posviewimp.cpp index 118e471b..a9c3c289 100644 --- a/kjsembed/docs/embedding/qtembed/posviewimp.cpp +++ b/kjsembed/docs/embedding/qtembed/posviewimp.cpp @@ -14,7 +14,7 @@ #include #include -POSViewImp::POSViewImp(TTQWidget *parent, const char *name) +POSViewImp::POSViewImp(TQWidget *parent, const char *name) :POSViewBase(parent, name) { m_part = new KJSEmbed::KJSEmbedPart(0, "kjsembed_part", this,"JSEmbed"); diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.h b/kjsembed/docs/embedding/qtembed/posviewimp.h index 2bb0df9c..764ac813 100644 --- a/kjsembed/docs/embedding/qtembed/posviewimp.h +++ b/kjsembed/docs/embedding/qtembed/posviewimp.h @@ -15,7 +15,7 @@ namespace KJSEmbed { class POSViewImp: public POSViewBase { Q_OBJECT public: - POSViewImp( TTQWidget *parent = 0, const char *name = 0 ); + POSViewImp( TQWidget *parent = 0, const char *name = 0 ); public slots: void loadScript(); diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp b/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp index 87ae4f00..b71521d5 100644 --- a/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp +++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp @@ -15,7 +15,7 @@ #include #include -EmbedViewImp::EmbedViewImp(TTQWidget *parent, const char *name) +EmbedViewImp::EmbedViewImp(TQWidget *parent, const char *name) :EmbedView(parent, name) { m_part = new KJSEmbed::KJSEmbedPart(0, "kjsembed_part", this,"JSEmbed"); @@ -30,10 +30,10 @@ void EmbedViewImp::okClicked() { KJS::List args; KJS::Value val = m_part->callMethod("handleOk", args); - TTQMap personalData = KJSEmbed::convertToVariant(m_part->globalExec(), val).toMap(); - TTQDate birthday = personalData["birthday"].toDate(); - TTQColor eyecolor = personalData["eyeColor"].toColor(); - TTQString notes = personalData["notes"].toString(); + TQMap personalData = KJSEmbed::convertToVariant(m_part->globalExec(), val).toMap(); + TQDate birthday = personalData["birthday"].toDate(); + TQColor eyecolor = personalData["eyeColor"].toColor(); + TQString notes = personalData["notes"].toString(); kdDebug() << "birthday: " << birthday << endl; kdDebug() << "eyecolor: " << eyecolor << endl; @@ -53,23 +53,23 @@ void EmbedViewImp::consoleClicked() m_part->view()->setHidden(!m_part->view()->isHidden()); } -bool EmbedViewImp::runScript( const TTQString &file ) +bool EmbedViewImp::runScript( const TQString &file ) { return m_part->runFile(file, m_part->globalObject() ); } -TTQVariant EmbedViewImp::someValue() const +TQVariant EmbedViewImp::someValue() const { - TTQMap returnMap; + TQMap returnMap; returnMap["name"] = m_name->text(); returnMap["title"] = m_title->text(); returnMap["dept"] = m_dept->text(); - return TTQVariant(returnMap); + return TQVariant(returnMap); } -void EmbedViewImp::setSomeValue( const TTQVariant &val ) +void EmbedViewImp::setSomeValue( const TQVariant &val ) { - TTQMap map = val.toMap(); + TQMap map = val.toMap(); m_name->setText(map["name"].toString()); m_title->setText(map["title"].toString()); m_dept->setText(map["dept"].toString()); diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.h b/kjsembed/docs/embedding/simple-embed/embedviewimp.h index 5003c182..7c678a32 100644 --- a/kjsembed/docs/embedding/simple-embed/embedviewimp.h +++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.h @@ -16,17 +16,17 @@ class EmbedViewImp: public EmbedView { Q_OBJECT public: - EmbedViewImp( TTQWidget *parent = 0, const char *name = 0 ); + EmbedViewImp( TQWidget *parent = 0, const char *name = 0 ); - bool runScript( const TTQString &file ); + bool runScript( const TQString &file ); public slots: virtual void cancelClicked(); virtual void okClicked(); virtual void consoleClicked(); - TTQVariant someValue() const; - void setSomeValue( const TTQVariant &var ); + TQVariant someValue() const; + void setSomeValue( const TQVariant &var ); private: KJSEmbed::KJSEmbedPart *m_part; }; diff --git a/kjsembed/docs/examples/README b/kjsembed/docs/examples/README index 71449ae3..ce89dc9e 100644 --- a/kjsembed/docs/examples/README +++ b/kjsembed/docs/examples/README @@ -57,7 +57,7 @@ JS UIC An easy way to deal with UI files. Multi-file Scripts Multi-file Scripts. Opaque Values Opaque types. Standard Icons Loading standard icons. -TTQComboBox A simple demo of TQComboBox. +TQComboBox A simple demo of TQComboBox. Embedding several Shows how to embed multiple parts in the same script. KParts Writing data Shows how to send data directly to a part, rather than diff --git a/kjsembed/docs/examples/html2text/test.htm b/kjsembed/docs/examples/html2text/test.htm index af257805..1639b375 100644 --- a/kjsembed/docs/examples/html2text/test.htm +++ b/kjsembed/docs/examples/html2text/test.htm @@ -53,7 +53,7 @@ pre { <li>Scripts can access the properties and slots of TQObjects as if they were normal Javascript properties and methods.</li> <li>Scripts can load dialogs and widgets created with Qt Designer.</li> - <li>Scripts can create instances of anu TTQWidget subclass supported by TTQWidgetFactory.</li> + <li>Scripts can create instances of anu TQWidget subclass supported by TQWidgetFactory.</li> <li>Making your own TQObjects/TQWidgets available for scripting is one-liner.</li> <li>Scripts can traverse the widget tree, so your entire application can be made scriptable without explicitly binding every object.</li> @@ -87,11 +87,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget) kjs> console.childCount() 4 kjs> console.childAt(1) -CmdEdit (TTQComboBox) +CmdEdit (TQComboBox) kjs> console.childAt(2) -RunButton (TTQPushButton) +RunButton (TQPushButton) kjs> console.child(&quot;RunButton&quot;) -RunButton (TTQPushButton) +RunButton (TQPushButton) kjs> console.child(&quot;RunButton&quot;).text = &quot;Go!&quot; Go! kjs> console.caption = &quot;Different Title&quot; @@ -145,7 +145,7 @@ print( cmd ); <p class="precaption">Listing 1: A Script That Displays the Grep Dialog</p> <p>In order to find out what the user asked us to search for we need to extract the contents of the various fields in our dialog. We know that the field for - entering the text to be searched for is a TTQLineEdit called 'search_edit', so + entering the text to be searched for is a TQLineEdit called 'search_edit', so we can use the child() method to get hold of it (this method searches through the children of an object until it finds one with a matching name). Once we've found the right object getting hold of the text is easy because all TQLineEdits diff --git a/kjsembed/docs/examples/imageinfo/example.html b/kjsembed/docs/examples/imageinfo/example.html index 58205bda..4a9873c7 100644 --- a/kjsembed/docs/examples/imageinfo/example.html +++ b/kjsembed/docs/examples/imageinfo/example.html @@ -10,7 +10,7 @@ example1.png (848x686)

This image shows the results of running the imagegallery script. As you can -see the script automatically creates thumbnails (using TTQImage::smoothScale() +see the script automatically creates thumbnails (using TQImage::smoothScale() for quality) and includes image descriptions if present. The descriptions can include HTML markup like this, and even links. diff --git a/kjsembed/docs/examples/imageinfo/example1.htm b/kjsembed/docs/examples/imageinfo/example1.htm index 3a0a4ef9..bbe9bb0b 100644 --- a/kjsembed/docs/examples/imageinfo/example1.htm +++ b/kjsembed/docs/examples/imageinfo/example1.htm @@ -1,5 +1,5 @@ This image shows the results of running the imagegallery script. As you can -see the script automatically creates thumbnails (using TTQImage::smoothScale() +see the script automatically creates thumbnails (using TQImage::smoothScale() for quality) and includes image descriptions if present. The descriptions can include HTML markup like this, and even links. diff --git a/kjsembed/docs/examples/imageinfo/thumbs.html b/kjsembed/docs/examples/imageinfo/thumbs.html index b47501f8..2c66e0a5 100644 --- a/kjsembed/docs/examples/imageinfo/thumbs.html +++ b/kjsembed/docs/examples/imageinfo/thumbs.html @@ -10,7 +10,7 @@ example1.png (848x686)

This image shows the results of running the imagegallery script. As you can -see the script automatically creates thumbnails (using TTQImage::smoothScale() +see the script automatically creates thumbnails (using TQImage::smoothScale() for quality) and includes image descriptions if present. The descriptions can include HTML markup like this, and even links. diff --git a/kjsembed/docs/examples/index.html b/kjsembed/docs/examples/index.html index a3a44761..4b48cc31 100644 --- a/kjsembed/docs/examples/index.html +++ b/kjsembed/docs/examples/index.html @@ -75,21 +75,21 @@ facilities. Two examples that create a graphical tree. One from a JS data structure, the other from the widget tree of a ui file. qobject-dom -Illustrates the TTQObject DOM API. +Illustrates the TQObject DOM API. connect-cpp Connects a signal to slot. connect Connects signals of various types to JS methods. imageviewer -Illustrates the use of TTQPixmap values. +Illustrates the use of TQPixmap values. netaccess Illustrates the bindings to KIO::NetAccess. listview Creates a simple KListView. frame -Shows off TTQFrame support and the use of enums. +Shows off TQFrame support and the use of enums. timer -Creates a flashing LED using TTQTimer. +Creates a flashing LED using TQTimer. Actions A simple KAction demo. Built-In Messages @@ -108,8 +108,8 @@ from a JS data structure, the other from the widget tree of a ui file. Opaque types. Standard Icons Loading standard icons. -TTQComboBox -A simple demo of TTQComboBox. +TQComboBox +A simple demo of TQComboBox. Embedding several KParts Shows how to embed multiple parts in the same script. Writing data directly to a KPart diff --git a/kjsembed/docs/features.html b/kjsembed/docs/features.html index 8c8e378d..ae6f0b7b 100644 --- a/kjsembed/docs/features.html +++ b/kjsembed/docs/features.html @@ -12,14 +12,14 @@ This document is a high-level summary of the feature set of KJSEmbed.

Qt Integration

    -
  • Generic proxy class providing access to any TTQObject. +
  • Generic proxy class providing access to any TQObject.
  • Call slots from scripts as if they are JS methods.
  • Connect signals to JS methods as if they are slots. -
  • Navigate the TTQObject tree using a DOM compatible API. +
  • Navigate the TQObject tree using a DOM compatible API.
  • Load designer's UI files to dynamically load dialogs and widgets. -
  • Create any TTQWidget supported by TTQWidgetFactory. -
  • Custom factory for creating TQObjects (such as TTQTimer). -
  • An opaque wrapper handling any TTQVariant value and any pointer. +
  • Create any TQWidget supported by TQWidgetFactory. +
  • Custom factory for creating TQObjects (such as TQTimer). +
  • An opaque wrapper handling any TQVariant value and any pointer.

KDE Integration

diff --git a/kjsembed/docs/tutorial/kjsembed.html b/kjsembed/docs/tutorial/kjsembed.html index 7e2c38fd..c9ae359e 100644 --- a/kjsembed/docs/tutorial/kjsembed.html +++ b/kjsembed/docs/tutorial/kjsembed.html @@ -54,7 +54,7 @@ pre {
  • Scripts can access the properties and slots of TQObjects as if they were normal Javascript properties and methods.
  • Scripts can load dialogs and widgets created with Qt Designer.
    • -
  • Scripts can create instances of anu TTQWidget subclass supported by TTQWidgetFactory.
    • +
  • Scripts can create instances of anu TQWidget subclass supported by TQWidgetFactory.
  • Making your own TQObjects/TQWidgets available for scripting is one-liner.
  • Scripts can traverse the widget tree, so your entire application can be made scriptable without explicitly binding every object.
    • @@ -88,11 +88,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget) kjs> console.childCount() 4 kjs> console.child(1) -CmdEdit (TTQComboBox) +CmdEdit (TQComboBox) kjs> console.child(2) -RunButton (TTQPushButton) +RunButton (TQPushButton) kjs> console.child("RunButton") -RunButton (TTQPushButton) +RunButton (TQPushButton) kjs> console.child("RunButton").text = "Go!" Go! kjs> console.caption = "Different Title" @@ -149,7 +149,7 @@ print( cmd );

    Listing 1: A Script That Displays the Grep Dialog

    In order to find out what the user asked us to search for we need to extract the contents of the various fields in our dialog. We know that the field for - entering the text to be searched for is a TTQLineEdit called 'search_edit', so + entering the text to be searched for is a TQLineEdit called 'search_edit', so we can use the child() method to get hold of it (this method searches through the children of an object until it finds one with a matching name). Once we've found the right object getting hold of the text is easy because all TQLineEdits diff --git a/kjsembed/docs/types.html b/kjsembed/docs/types.html index ab823896..cdffa1f0 100644 --- a/kjsembed/docs/types.html +++ b/kjsembed/docs/types.html @@ -38,8 +38,8 @@ continue to be supported.

    Strings

      -
    • TTQString -> String -
    • TTQCString -> String +
    • TQString -> String +
    • TQCString -> String
    • const char * -> String
    • String -> TQString
    • String -> TQCString @@ -48,66 +48,66 @@ continue to be supported.

      Qt Object Types

      -

      TTQColor

      +

      TQColor

      Represents a color, possibly including an alpha channel.
        -
      • TTQColor -> '#rrggbb' +
      • TQColor -> '#rrggbb'
      • '#rrggbb' -> TQColor
      • '#rrggbbaa' -> TQColor
      -

      TTQPoint

      +

      TQPoint

      Represents a point.
        -
      • TTQPoint -> [x,y] +
      • TQPoint -> [x,y]
      • [x,y] -> TQPoint
      • obj.x obj.y -> TQPoint
      -

      TTQSize

      +

      TQSize

      Represents a size.
        -
      • TTQSize -> [w,h] +
      • TQSize -> [w,h]
      • [w,h] -> TQSize
      • obj.w obj.h -> TQSize
      -

      TTQRect

      +

      TQRect

      Represents a rectangle.
        -
      • TTQRect -> [x,y,w,h] +
      • TQRect -> [x,y,w,h]
      • [x,y,w,h] -> TQRect
      • obj.x obj.y obj.w obj.h -> TQRect
      -

      TTQDate

      +

      TQDate

      Represents a date.
        -
      • TTQDate -> '' +
      • TQDate -> ''
      -

      TTQTime

      +

      TQTime

      Represents a time.
        -
      • TTQTime -> '' +
      • TQTime -> ''
      -

      TTQDateTime

      +

      TQDateTime

      Represents a date/time pair.
        -
      • TTQDateTime -> '' +
      • TQDateTime -> ''
      -

      TTQKeySequence

      +

      TQKeySequence

      Represents a sequence of keys, eg. it is used for accelerators.
        -
      • TTQKeySequence -> '' +
      • TQKeySequence -> ''
      -

      TTQFont

      +

      TQFont

      Represents a font.
        -
      • TTQFont -> '' +
      • TQFont -> ''

      KDE Object Types

      diff --git a/kjsembed/doxygen_fakes.h b/kjsembed/doxygen_fakes.h index 16c3c76b..676d2496 100644 --- a/kjsembed/doxygen_fakes.h +++ b/kjsembed/doxygen_fakes.h @@ -1,17 +1,17 @@ /** An object that supports signals and slots. */ -class TTQObject {}; +class TQObject {}; /** Base-class of all widgets. */ -class TTQWidget : public TTQObject {}; +class TQWidget : public TQObject {}; /** A widget that has a frame. */ -class TTQFrame : public TTQWidget {}; +class TQFrame : public TQWidget {}; /** Namespace for the KParts framework. */ namespace KParts { /** A base-class for plugins that extend a KPart. */ - class Plugin : public TTQObject, public XMLGUIClient {}; + class Plugin : public TQObject, public XMLGUIClient {}; /** A base-class for KParts. */ - class Part : public TTQObject, public XMLGUIClient {}; + class Part : public TQObject, public XMLGUIClient {}; /** A base-class for KParts that provide a read-only view. */ class ReadOnlyPart : public Part {}; }; diff --git a/kjsembed/global.cpp b/kjsembed/global.cpp index f48a9384..4d6937cb 100644 --- a/kjsembed/global.cpp +++ b/kjsembed/global.cpp @@ -32,9 +32,9 @@ # endif #endif -static TTQTextStream *kjsembed_err = 0L; -static TTQTextStream *kjsembed_in = 0L; -static TTQTextStream *kjsembed_out = 0L; +static TQTextStream *kjsembed_err = 0L; +static TQTextStream *kjsembed_in = 0L; +static TQTextStream *kjsembed_out = 0L; #ifndef _WIN32 char *itoa(int num, char *str, int radix) @@ -66,9 +66,9 @@ char *itoa(int num, char *str, int radix) #endif #ifdef _WIN32 -static TTQFile win32_stdin; -static TTQFile win32_stdout; -static TTQFile win32_stderr; +static TQFile win32_stdin; +static TQFile win32_stdout; +static TQFile win32_stderr; static const WORD MAX_CONSOLE_LINES = 500; @@ -102,23 +102,23 @@ void RedirectIOToConsole() { #endif -TTQTextStream &consoleOut( ) +TQTextStream &consoleOut( ) { return *KJSEmbed::conout(); } -TTQTextStream &consoleError( ) +TQTextStream &consoleError( ) { return *KJSEmbed::conerr(); } -TTQTextStream &consoleIn( ) +TQTextStream &consoleIn( ) { return *KJSEmbed::conin(); } #ifdef QT_ONLY -TTQTextStream &kdDebug( int area ) +TQTextStream &kdDebug( int area ) { #ifndef QT_DEBUG return consoleError() << "DEBUG: (" << area << ") "; @@ -128,50 +128,50 @@ TTQTextStream &kdDebug( int area ) } -TTQTextStream &kdWarning( int area ) +TQTextStream &kdWarning( int area ) { return consoleOut() << "WARNING: (" << area << ") "; } -TTQString i18n( const char *string ) +TQString i18n( const char *string ) { - return TTQObject::tr( string, "qjsembed string"); + return TQObject::tr( string, "qjsembed string"); } #endif -TTQTextStream *KJSEmbed::conin() +TQTextStream *KJSEmbed::conin() { if ( !kjsembed_in ) { #ifdef _WIN32 - kjsembed_in = new TTQTextStream( &win32_stdin ); + kjsembed_in = new TQTextStream( &win32_stdin ); #else - kjsembed_in = new TTQTextStream( stdin, IO_ReadOnly ); + kjsembed_in = new TQTextStream( stdin, IO_ReadOnly ); #endif } return kjsembed_in; } -TTQTextStream *KJSEmbed::conout() +TQTextStream *KJSEmbed::conout() { if ( !kjsembed_out ) { #ifdef _WIN32 - kjsembed_out = new TTQTextStream( &win32_stdout ); + kjsembed_out = new TQTextStream( &win32_stdout ); #else - kjsembed_out = new TTQTextStream( stdout, IO_WriteOnly ); + kjsembed_out = new TQTextStream( stdout, IO_WriteOnly ); #endif } return kjsembed_out; } -TTQTextStream *KJSEmbed::conerr() +TQTextStream *KJSEmbed::conerr() { if ( !kjsembed_err ) { #ifdef _WIN32 - kjsembed_err = new TTQTextStream( &win32_stderr ); + kjsembed_err = new TQTextStream( &win32_stderr ); #else - kjsembed_err = new TTQTextStream( stderr, IO_WriteOnly ); + kjsembed_err = new TQTextStream( stderr, IO_WriteOnly ); #endif } return kjsembed_err; diff --git a/kjsembed/global.h b/kjsembed/global.h index 1c4a2210..e2e4a652 100644 --- a/kjsembed/global.h +++ b/kjsembed/global.h @@ -55,9 +55,9 @@ char *itoa(int num, char *str, int radix = 10); #include namespace KJSEmbed { -KJSEMBED_EXPORT TTQTextStream *conin(); -KJSEMBED_EXPORT TTQTextStream *conout(); -KJSEMBED_EXPORT TTQTextStream *conerr(); +KJSEMBED_EXPORT TQTextStream *conin(); +KJSEMBED_EXPORT TQTextStream *conout(); +KJSEMBED_EXPORT TQTextStream *conerr(); } #ifndef QT_ONLY @@ -75,13 +75,13 @@ KJSEMBED_EXPORT TTQTextStream *conerr(); * These are the custom definitions used when we only have Qt. */ -KJSEMBED_EXPORT TTQTextStream &kdDebug( int area=0 ); -KJSEMBED_EXPORT TTQTextStream &kdWarning( int area=0 ); +KJSEMBED_EXPORT TQTextStream &kdDebug( int area=0 ); +KJSEMBED_EXPORT TQTextStream &kdWarning( int area=0 ); #ifndef NO_I18N -KJSEMBED_EXPORT TTQString i18n( const char *string ); +KJSEMBED_EXPORT TQString i18n( const char *string ); #else -#define i18n(x) TTQString(x) +#define i18n(x) TQString(x) #endif // NO_I18N #endif // QT_ONLY diff --git a/kjsembed/jsbinding.cpp b/kjsembed/jsbinding.cpp index 5d8e4a14..cb6316d7 100644 --- a/kjsembed/jsbinding.cpp +++ b/kjsembed/jsbinding.cpp @@ -41,7 +41,7 @@ namespace KJSEmbed { // ========= // // Bool, Double, CString, String, StringList, Int, UInt, Date, Time, DateTime, - // Rect, Size, Point, Pixmap, Image, Brush, Pen, Size, Rect, Point, TTQValueList + // Rect, Size, Point, Pixmap, Image, Brush, Pen, Size, Rect, Point, TQValueList // // Opqaue // ====== @@ -51,7 +51,7 @@ namespace KJSEmbed { // ByteArray, BitArray // - KJS::Value convertToValue( KJS::ExecState *exec, const TTQVariant &val ) { + KJS::Value convertToValue( KJS::ExecState *exec, const TQVariant &val ) { if ( !val.isValid() ) return KJS::Undefined(); @@ -61,23 +61,23 @@ namespace KJSEmbed { switch( type ) { - case TTQVariant::String: - case TTQVariant::CString: + case TQVariant::String: + case TQVariant::CString: return KJS::String( val.toString() ); break; - case TTQVariant::Int: + case TQVariant::Int: return KJS::Number( val.toInt() ); break; - case TTQVariant::UInt: + case TQVariant::UInt: return KJS::Number( val.toUInt() ); break; - case TTQVariant::Double: + case TQVariant::Double: return KJS::Number( val.toDouble() ); break; - case TTQVariant::Bool: + case TQVariant::Bool: return KJS::Boolean( val.toBool() ); break; - case TTQVariant::Rect: + case TQVariant::Rect: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -86,14 +86,14 @@ namespace KJSEmbed { return proxyObj; break; } - case TTQVariant::Date: - case TTQVariant::DateTime: - case TTQVariant::Time: + case TQVariant::Date: + case TQVariant::DateTime: + case TQVariant::Time: { - TTQDateTime dt = TTQDateTime::currentDateTime(); - if ( type == TTQVariant::Date ) + TQDateTime dt = TQDateTime::currentDateTime(); + if ( type == TQVariant::Date ) dt.setDate( val.toDate() ); - else if ( type == TTQVariant::Time ) + else if ( type == TQVariant::Time ) dt.setTime( val.toTime() ); else dt = val.toDateTime(); @@ -107,7 +107,7 @@ namespace KJSEmbed { return KJS::Object( exec->interpreter() ->builtinDate().construct( exec, items ) ); break; } - case TTQVariant::Point: + case TQVariant::Point: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -116,37 +116,37 @@ namespace KJSEmbed { return proxyObj; break; } - case TTQVariant::StringList: + case TQVariant::StringList: { - TTQStringList lst = val.toStringList(); - TTQStringList::Iterator idx = lst.begin(); + TQStringList lst = val.toStringList(); + TQStringList::Iterator idx = lst.begin(); for ( ; idx != lst.end(); ++idx ) items.append( KJS::String( ( *idx ) ) ); return KJS::Object( exec->interpreter() ->builtinArray().construct( exec, items ) ); break; } - case TTQVariant::List: -// case TTQVariant::StringList: + case TQVariant::List: +// case TQVariant::StringList: // This will cause an extra conversion step for a TQStrinList so use the above case. { - TTQValueList lst = val.toList(); - TTQValueList::Iterator idx = lst.begin(); + TQValueList lst = val.toList(); + TQValueList::Iterator idx = lst.begin(); for ( ; idx != lst.end(); ++idx ) items.append( convertToValue( exec, ( *idx ) ) ); return KJS::Object( exec->interpreter() ->builtinArray().construct( exec, items ) ); break; } - case TTQVariant::Map: + case TQVariant::Map: { - TTQMap map = val.toMap(); - TTQMap::Iterator idx = map.begin(); + TQMap map = val.toMap(); + TQMap::Iterator idx = map.begin(); KJS::Object array( exec->interpreter() ->builtinArray().construct( exec, 0 ) ); for ( ; idx != map.end(); ++idx ) array.put(exec, KJS::Identifier(idx.key().latin1()), convertToValue( exec, idx.data() ) ); return array; break; } - case TTQVariant::Pixmap: + case TQVariant::Pixmap: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -155,7 +155,7 @@ namespace KJSEmbed { return proxyObj; break; } - case TTQVariant::Brush: + case TQVariant::Brush: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -163,7 +163,7 @@ namespace KJSEmbed { Bindings::BrushImp::addBindings( exec, proxyObj ); return proxyObj; } - case TTQVariant::Image: + case TQVariant::Image: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -172,7 +172,7 @@ namespace KJSEmbed { return proxyObj; break; } - case TTQVariant::Pen: + case TQVariant::Pen: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -181,7 +181,7 @@ namespace KJSEmbed { return proxyObj; break; } - case TTQVariant::Size: + case TQVariant::Size: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -192,7 +192,7 @@ namespace KJSEmbed { } default: { - if ( val.canCast( TTQVariant::String ) ) + if ( val.canCast( TQVariant::String ) ) return KJS::String( val.toString() ); else { @@ -209,8 +209,8 @@ namespace KJSEmbed { } } - TTQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ) { - TTQVariant val; + TQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ) { + TQVariant val; KJS::Type type = v.type(); kdDebug( 80001 ) << "Convert a value of type " << type << " to a variant" << endl; switch( type ) @@ -253,12 +253,12 @@ namespace KJSEmbed { */ /*if ( prx ) { - TTQObject * o = prx->object(); - TTQCString cs( o ? o->className() : "" ); + TQObject * o = prx->object(); + TQCString cs( o ? o->className() : "" ); if ( obj.implementsConstruct() ) - val = TTQString( "new %1();" ).arg( obj.className().qstring() ); + val = TQString( "new %1();" ).arg( obj.className().qstring() ); else if ( obj.implementsCall() ) - val = TTQString( "%1(...);" ).arg( obj.className().qstring() ); + val = TQString( "%1(...);" ).arg( obj.className().qstring() ); kdDebug( 80001 ) << "convertToVariant() got a JSObjectProxy" << endl; } else */if ( vprx ) { kdDebug( 80001 ) << "convertToVariant() got a variant JSValueProxy" << endl; @@ -267,7 +267,7 @@ namespace KJSEmbed { /* kdDebug( 80001 ) << "convertToVariant() got a JSProxy" << endl; val = prxy->typeName(); */ - } else { // Last resort map the object to a TTQMap + } else { // Last resort map the object to a TQMap kdDebug( 80001 ) << "convertToVariant() map to struct." << endl; val = convertArrayToMap(exec, v); } @@ -276,7 +276,7 @@ namespace KJSEmbed { } default: { - TTQString msg = i18n( "Unsupported KJS::Value, type %1" ).arg( ( int ) v.type() ); + TQString msg = i18n( "Unsupported KJS::Value, type %1" ).arg( ( int ) v.type() ); throwError(exec, msg); val = msg; break; @@ -286,8 +286,8 @@ namespace KJSEmbed { return val; } - TTQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj ) { - TTQStringList returnList; + TQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj ) { + TQStringList returnList; if ( !obj.isValid() ) { return returnList; } @@ -300,16 +300,16 @@ namespace KJSEmbed { if ( obj.hasProperty( exec, name ) ) { KJS::Value v = obj.get( exec, name ); KJS::Object vobj = v.toObject( exec ); - TTQString nm( name.ustring().qstring() ); - TTQString vl; + TQString nm( name.ustring().qstring() ); + TQString vl; if ( vobj.implementsConstruct() ) { if ( vobj.prototype().toString( exec ).qstring() == "[function]" ) - returnList << TTQString( "%1(...)" ).arg( nm ); + returnList << TQString( "%1(...)" ).arg( nm ); } else if ( vobj.implementsCall() ) { - returnList << TTQString( "%1(...)" ).arg( nm ); + returnList << TQString( "%1(...)" ).arg( nm ); } else { - TTQVariant val = convertToVariant( exec, v ); + TQVariant val = convertToVariant( exec, v ); vl = val.toString(); returnList << nm; } @@ -319,17 +319,17 @@ namespace KJSEmbed { } JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); - TTQObject *qo = proxy ? proxy->object() : 0; - TTQMetaObject *mo = qo ? qo->metaObject() : 0; + TQObject *qo = proxy ? proxy->object() : 0; + TQMetaObject *mo = qo ? qo->metaObject() : 0; // TQObject if ( proxy ) { // TQProperties - TTQStrList propList( mo->propertyNames( true ) ); - for ( TTQStrListIterator iter1( propList ); iter1.current(); ++iter1 ) { + TQStrList propList( mo->propertyNames( true ) ); + for ( TQStrListIterator iter1( propList ); iter1.current(); ++iter1 ) { - TTQCString name = iter1.current(); + TQCString name = iter1.current(); int propid = mo->findProperty( name.data(), true ); if ( propid == -1 ) continue; @@ -338,11 +338,11 @@ namespace KJSEmbed { // Slots KJS::List items; - TTQStrList slotList( mo->slotNames( true ) ); + TQStrList slotList( mo->slotNames( true ) ); - for ( TTQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { - TTQCString name = iter2.current(); - TTQString nm( name ); + for ( TQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { + TQCString name = iter2.current(); + TQString nm( name ); int slotid = mo->findSlot( name.data(), true ); if ( slotid != -1 ) { @@ -353,12 +353,12 @@ namespace KJSEmbed { return returnList; } - TTQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ) { + TQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ) { if ( !obj.isValid() ) - return TTQString( "Invalid object\n" ); + return TQString( "Invalid object\n" ); - TTQStringList properties; - TTQStringList methods; + TQStringList properties; + TQStringList methods; KJS::ReferenceList l = obj.propList( exec, true ); KJS::ReferenceListIterator propIt = l.begin(); @@ -371,7 +371,7 @@ namespace KJSEmbed { KJS::Value v = obj.get( exec, name ); KJS::Object vobj = v.toObject( exec ); - TTQString nm( name.ustring().qstring() ); + TQString nm( name.ustring().qstring() ); kdDebug( 80001 ) << "Getting: " << name.ustring().qstring() << " " << vobj.prototype().toString( exec ).qstring() << endl; @@ -392,21 +392,21 @@ namespace KJSEmbed { propIt++; } - TTQString s; + TQString s; // JS properties - s += TTQString( "

      Properties

      \n" ); + s += TQString( "

      Properties

      \n" ); if ( !properties.isEmpty() ) { s += "\n"; s += "\n"; properties.sort(); - for ( TTQStringList::Iterator iter = properties.begin(); iter != properties.end(); ++iter ) { + for ( TQStringList::Iterator iter = properties.begin(); iter != properties.end(); ++iter ) { KJS::Value v = obj.get( exec, KJS::Identifier( KJS::UString( *iter ) ) ); - TTQVariant val = convertToVariant( exec, v ); + TQVariant val = convertToVariant( exec, v ); - s += TTQString( "\n" ) + s += TQString( "\n" ) .arg( val.typeName() ).arg( *iter ).arg( val.toString() ); } @@ -415,12 +415,12 @@ namespace KJSEmbed { s += "None\n"; // Methods - s += TTQString( "

      Methods

      \n" ); + s += TQString( "

      Methods

      \n" ); if ( !methods.isEmpty() ) { s += "
      TypeNameValue
      %1%2%3
      %1%2%3
      "; methods.sort(); - for ( TTQStringList::Iterator iter = methods.begin(); iter != methods.end(); ++iter ) { + for ( TQStringList::Iterator iter = methods.begin(); iter != methods.end(); ++iter ) { s += ""; @@ -433,22 +433,22 @@ namespace KJSEmbed { return s; } - TTQString dumpTQObject( KJS::ExecState * /*exec*/, KJS::Object &obj ) { + TQString dumpTQObject( KJS::ExecState * /*exec*/, KJS::Object &obj ) { if ( !obj.isValid() ) - return TTQString( "Invalid object\n" ); + return TQString( "Invalid object\n" ); - TTQString s( "" ); + TQString s( "" ); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); - TTQObject *qo = proxy ? proxy->object() : 0; - TTQMetaObject *mo = qo ? qo->metaObject() : 0; + TQObject *qo = proxy ? proxy->object() : 0; + TQMetaObject *mo = qo ? qo->metaObject() : 0; // TQObject if ( proxy ) { // TQProperties - s += TTQString( "

      Qt Properties

      \n" ); + s += TQString( "

      Qt Properties

      \n" ); - TTQStrList propList( mo->propertyNames( true ) ); + TQStrList propList( mo->propertyNames( true ) ); if ( !propList.isEmpty() ) { @@ -456,15 +456,15 @@ namespace KJSEmbed { s += "\n"; propList.sort(); - for ( TTQStrListIterator iter( propList ); iter.current(); ++iter ) { + for ( TQStrListIterator iter( propList ); iter.current(); ++iter ) { - TTQCString name = iter.current(); + TQCString name = iter.current(); int propid = mo->findProperty( name.data(), true ); if ( propid == -1 ) continue; - TTQVariant vl = qo->property( name.data() ); - s += TTQString( "\n" ) + TQVariant vl = qo->property( name.data() ); + s += TQString( "\n" ) .arg( mo->property( propid, true ) ->type() ).arg( name ).arg( vl.toString() ); } @@ -474,20 +474,20 @@ namespace KJSEmbed { } // Signals - s += TTQString( "

      Qt Signals

      \n" ); + s += TQString( "

      Qt Signals

      \n" ); s += "
      "; s += *iter; s += "(...)
      TypeNameValue
      %1%2%3
      %1%2%3
      "; - TTQStrList signalList( mo->signalNames( true ) ); + TQStrList signalList( mo->signalNames( true ) ); signalList.sort(); - for ( TTQStrListIterator iter1( signalList ); iter1.current(); ++iter1 ) { + for ( TQStrListIterator iter1( signalList ); iter1.current(); ++iter1 ) { - TTQCString name = iter1.current(); - TTQString nm( name ); + TQCString name = iter1.current(); + TQString nm( name ); int signalid = mo->findSignal( name.data(), true ); if ( signalid != -1 ) - s += TTQString( "\n" ).arg( nm ); + s += TQString( "\n" ).arg( nm ); } s += "
      %1
      %1
      "; @@ -495,33 +495,33 @@ namespace KJSEmbed { s += "None"; // Slots - s += TTQString( "

      Qt Slots

      \n" ); + s += TQString( "

      Qt Slots

      \n" ); s += ""; KJS::List items; - TTQStrList slotList( mo->slotNames( true ) ); + TQStrList slotList( mo->slotNames( true ) ); slotList.sort(); - for ( TTQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { + for ( TQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { - TTQCString name = iter2.current(); - TTQString nm( name ); + TQCString name = iter2.current(); + TQString nm( name ); int slotid = mo->findSlot( name.data(), true ); if ( slotid != -1 ) { const TQMetaData * md = mo->slot( slotid, true ); const TQUMethod *method = md->method; if ( method->count && ( method->parameters->inOut == TQUParameter::Out ) ) { - TTQCString typenm( method->parameters->type->desc() ); + TQCString typenm( method->parameters->type->desc() ); if ( typenm == "ptr" ) { - s += TTQString( "\n" ) + s += TQString( "\n" ) .arg( ( const char * ) method->parameters->typeExtra ).arg( nm ); } else { - s += TTQString( "\n" ) + s += TQString( "\n" ) .arg( typenm.data() ).arg( nm ); } } else - s += TTQString( "\n" ).arg( nm ); + s += TQString( "\n" ).arg( nm ); } } @@ -535,44 +535,44 @@ namespace KJSEmbed { - TTQPen extractTQPen( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPen() : TTQPen(); + TQPen extractTQPen( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPen() : TQPen(); } - TTQBrush extractTQBrush( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toBrush() : TTQBrush(); + TQBrush extractTQBrush( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toBrush() : TQBrush(); } - TTQFont extractTQFont( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toFont() : TTQFont(); + TQFont extractTQFont( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toFont() : TQFont(); } - TTQPixmap extractTQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPixmap() : TTQPixmap(); + TQPixmap extractTQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPixmap() : TQPixmap(); } - TTQImage extractTQImage( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toImage() : TTQImage(); + TQImage extractTQImage( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toImage() : TQImage(); } - TTQPalette extractTQPalette( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPalette() : TTQPalette(); + TQPalette extractTQPalette( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPalette() : TQPalette(); } - TTQString extractTQString( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? args[ idx ].toString( exec ).qstring() : TTQString::null; + TQString extractTQString( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? args[ idx ].toString( exec ).qstring() : TQString::null; } int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx ) { return ( args.size() > idx ) ? args[ idx ].toInteger( exec ) : 0; } - TTQColor extractTQColor( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toColor() : TTQColor(); + TQColor extractTQColor( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toColor() : TQColor(); } - TTQSize extractTQSize( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toSize() : TTQSize(); + TQSize extractTQSize( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toSize() : TQSize(); } bool extractBool( KJS::ExecState *exec, const KJS::List &args, int idx ) { @@ -587,8 +587,8 @@ namespace KJSEmbed { return ( args.size() > idx ) ? args[ idx ].toUInt32( exec ) : 0; } - TTQStringList extractTQStringList( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertArrayToStringList( exec, args[ idx ] ) : TTQStringList(); + TQStringList extractTQStringList( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertArrayToStringList( exec, args[ idx ] ) : TQStringList(); } /** @@ -628,8 +628,8 @@ namespace KJSEmbed { return None; } - TTQMap convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ) { - TTQMap returnMap; + TQMap convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ) { + TQMap returnMap; KJS::Object obj = value.toObject(exec); // if( obj.className().qstring() == "Array" ) { KJS::ReferenceList lst = obj.propList(exec,false); @@ -644,8 +644,8 @@ namespace KJSEmbed { return returnMap; } - TTQValueList convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ) { - TTQValueList returnList; + TQValueList convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ) { + TQValueList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { int length = obj.get( exec, KJS::Identifier( "length" ) ).toInteger( exec ); @@ -661,8 +661,8 @@ namespace KJSEmbed { return returnList; } - TTQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { - TTQStringList returnList; + TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { + TQStringList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { int length = obj.get( exec, KJS::Identifier( "length" ) ).toInteger( exec ); @@ -679,8 +679,8 @@ namespace KJSEmbed { return returnList; } /* - TTQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { - TTQStringList returnList; + TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { + TQStringList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { @@ -693,9 +693,9 @@ namespace KJSEmbed { return returnList; } */ - TTQDateTime convertDateToDateTime( KJS::ExecState *exec, const KJS::Value &value ) { + TQDateTime convertDateToDateTime( KJS::ExecState *exec, const KJS::Value &value ) { KJS::List args; - TTQDateTime returnDateTime; + TQDateTime returnDateTime; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Date" ) { @@ -706,8 +706,8 @@ namespace KJSEmbed { int day = obj.get( exec, KJS::Identifier( "getDate" ) ).toObject( exec ).call( exec, obj, args ).toInteger( exec ); int year = obj.get( exec, KJS::Identifier( "getFullYear" ) ).toObject( exec ).call( exec, obj, args ).toInteger( exec ); - returnDateTime.setDate( TTQDate( year, month + 1, day ) ); - returnDateTime.setTime( TTQTime( hours, minutes, seconds ) ); + returnDateTime.setDate( TQDate( year, month + 1, day ) ); + returnDateTime.setTime( TQTime( hours, minutes, seconds ) ); } else { kdWarning() << "convertDateToDateTime() received a " << obj.className().qstring() << " instead of a Date" << endl; } @@ -715,32 +715,32 @@ namespace KJSEmbed { return returnDateTime; } - TTQDateTime extractTQDateTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ) : TTQDateTime(); + TQDateTime extractTQDateTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ) : TQDateTime(); } - TTQDate extractTQDate( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).date() : TTQDate(); + TQDate extractTQDate( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).date() : TQDate(); } - TTQTime extractTQTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).time() : TTQTime(); + TQTime extractTQTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).time() : TQTime(); } - TTQRect extractTQRect( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toRect() : TTQRect(); + TQRect extractTQRect( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toRect() : TQRect(); } - TTQPoint extractTQPoint( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPoint() : TTQPoint(); + TQPoint extractTQPoint( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPoint() : TQPoint(); } - TTQStrList extractTQStrList( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertArrayToStrList( exec, args[ idx ] ) : TTQStrList(); + TQStrList extractTQStrList( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertArrayToStrList( exec, args[ idx ] ) : TQStrList(); } - TTQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value ) { - TTQStrList returnList; + TQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value ) { + TQStrList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { @@ -753,7 +753,7 @@ namespace KJSEmbed { return returnList; } - TTQObject *extractTQObject( KJS::ExecState *exec, const KJS::List &args, int idx ) { + TQObject *extractTQObject( KJS::ExecState *exec, const KJS::List &args, int idx ) { KJS::Object obj = args[ idx ].toObject( exec ); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); if ( !proxy ) @@ -762,7 +762,7 @@ namespace KJSEmbed { } - TTQWidget *extractTQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ) { + TQWidget *extractTQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ) { KJS::Object obj = args[ idx ].toObject( exec ); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); if ( !proxy ) @@ -775,7 +775,7 @@ namespace KJSEmbed { return JSProxy::toOpaqueProxy( obj.imp() ); } - KJS::Object throwError( KJS::ExecState *exec, const TTQString &error, KJS::ErrorType type ) + KJS::Object throwError( KJS::ExecState *exec, const TQString &error, KJS::ErrorType type ) { int sourceId = exec->context().sourceId(); int startLine = exec->context().curStmtFirstLine(); diff --git a/kjsembed/jsbinding.h b/kjsembed/jsbinding.h index 1f696be6..6646d9c2 100644 --- a/kjsembed/jsbinding.h +++ b/kjsembed/jsbinding.h @@ -38,7 +38,7 @@ */ namespace KJS { - inline UString::UString( const TTQString &d ) + inline UString::UString( const TQString &d ) { uint len = d.length(); UChar *dat = new UChar[len]; @@ -46,19 +46,19 @@ namespace KJS { rep = UString::Rep::create(dat, len); } - inline TTQString UString::qstring() const + inline TQString UString::qstring() const { - return TTQString((TTQChar*) data(), size()); + return TQString((TQChar*) data(), size()); } - inline TTQConstString UString::qconststring() const + inline TQConstString UString::qconststring() const { - return TTQConstString((TTQChar*) data(), size()); + return TQConstString((TQChar*) data(), size()); } - inline TTQString Identifier::qstring() const + inline TQString Identifier::qstring() const { - return TTQString((TTQChar*) data(), size()); + return TQString((TQChar*) data(), size()); } } @@ -71,64 +71,64 @@ namespace KJSEmbed { KJSEMBED_EXPORT JavaScriptArrayType checkArray( KJS::ExecState *exec, const KJS::Value &val ); - /** Converts a TTQVariant to the closest possible KJS::Value. */ - KJSEMBED_EXPORT KJS::Value convertToValue( KJS::ExecState *exec, const TTQVariant &val); + /** Converts a TQVariant to the closest possible KJS::Value. */ + KJSEMBED_EXPORT KJS::Value convertToValue( KJS::ExecState *exec, const TQVariant &val); - /** Converts a KJS::Value to the closest possible TTQVariant. */ - KJSEMBED_EXPORT TTQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ); + /** Converts a KJS::Value to the closest possible TQVariant. */ + KJSEMBED_EXPORT TQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ); /** Returns HTML that documents the specified object. */ - KJSEMBED_EXPORT TTQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ); + KJSEMBED_EXPORT TQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ); - /** Returns HTML that documents the TTQObject facilities of the specified object. */ - KJSEMBED_EXPORT TTQString dumpTQObject( KJS::ExecState *exec, KJS::Object &obj ); + /** Returns HTML that documents the TQObject facilities of the specified object. */ + KJSEMBED_EXPORT TQString dumpTQObject( KJS::ExecState *exec, KJS::Object &obj ); - /** Returns a TTQStringList that contains all possible properties, + /** Returns a TQStringList that contains all possible properties, * methods and slots for use with a completion object */ - KJSEMBED_EXPORT TTQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj); - - KJSEMBED_EXPORT TTQPen extractTQPen(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQFont extractTQFont(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQBrush extractTQBrush(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQPalette extractTQPalette(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQPixmap extractTQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQImage extractTQImage( KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQString extractTQString( KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj); + + KJSEMBED_EXPORT TQPen extractTQPen(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQFont extractTQFont(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQBrush extractTQBrush(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQPalette extractTQPalette(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQPixmap extractTQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQImage extractTQImage( KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQString extractTQString( KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQColor extractTQColor(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQSize extractTQSize(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQColor extractTQColor(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQSize extractTQSize(KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT bool extractBool(KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT double extractDouble(KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT uint extractUInt(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQStringList extractTQStringList(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQStringList extractTQStringList(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQDateTime extractTQDateTime(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQDate extractTQDate(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQTime extractTQTime(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQRect extractTQRect(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQPoint extractTQPoint(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQDateTime extractTQDateTime(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQDate extractTQDate(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQTime extractTQTime(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQRect extractTQRect(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQPoint extractTQPoint(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQFont extractTQFont(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQStrList extractTQStrList(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQFont extractTQFont(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQStrList extractTQStrList(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT TTQObject *extractTQObject( KJS::ExecState *exec, const KJS::List &args, int idx ); - KJSEMBED_EXPORT TTQWidget *extractTQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ); + KJSEMBED_EXPORT TQObject *extractTQObject( KJS::ExecState *exec, const KJS::List &args, int idx ); + KJSEMBED_EXPORT TQWidget *extractTQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ); KJSEMBED_EXPORT JSOpaqueProxy *extractOpaqueProxy( KJS::ExecState *exec, const KJS::List &args, int idx ); // Helpers for Variant conversions.... - KJSEMBED_EXPORT TTQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value); - KJSEMBED_EXPORT TTQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value); - KJSEMBED_EXPORT TTQDateTime convertDateToDateTime(KJS::ExecState *exec, const KJS::Value &value); - KJSEMBED_EXPORT TTQValueList convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ); - KJSEMBED_EXPORT TTQMap convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ); + KJSEMBED_EXPORT TQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value); + KJSEMBED_EXPORT TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value); + KJSEMBED_EXPORT TQDateTime convertDateToDateTime(KJS::ExecState *exec, const KJS::Value &value); + KJSEMBED_EXPORT TQValueList convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ); + KJSEMBED_EXPORT TQMap convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ); /** * This will throw an exception with the error string. * @returns An error object. */ - KJS::Object throwError( KJS::ExecState *exec, const TTQString &error, KJS::ErrorType type = KJS::GeneralError ); + KJS::Object throwError( KJS::ExecState *exec, const TQString &error, KJS::ErrorType type = KJS::GeneralError ); } #endif // KJSEMBEDJSBINDING_H diff --git a/kjsembed/jsbindingbase.h b/kjsembed/jsbindingbase.h index 83f05c06..cca40fc3 100644 --- a/kjsembed/jsbindingbase.h +++ b/kjsembed/jsbindingbase.h @@ -38,7 +38,7 @@ class KJSEmbedPart; public: /** * This method is called by the KJSFactory to bootstrap the plugin. - * Plugin developers will want to use this method to create their TTQObject binding, + * Plugin developers will want to use this method to create their TQObject binding, * or call their addBindings() method in their JSOpaque proxy or JSValueProxy. * * The value returned from ths function is the KJS::Object that represents the diff --git a/kjsembed/jsbindingplugin.cpp b/kjsembed/jsbindingplugin.cpp index 1f04e78a..4edacf5e 100644 --- a/kjsembed/jsbindingplugin.cpp +++ b/kjsembed/jsbindingplugin.cpp @@ -26,7 +26,7 @@ namespace KJSEmbed { namespace Bindings { -JSBindingPlugin::JSBindingPlugin( TTQObject *parent, const char *name, const TTQStringList &/*args*/ ): TTQObject(parent,name) +JSBindingPlugin::JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ): TQObject(parent,name) { } diff --git a/kjsembed/jsbindingplugin.h b/kjsembed/jsbindingplugin.h index 6d54a508..fb7d6361 100644 --- a/kjsembed/jsbindingplugin.h +++ b/kjsembed/jsbindingplugin.h @@ -39,14 +39,14 @@ namespace KJSEmbed { * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ */ - class KJSEMBED_EXPORT JSBindingPlugin : public TTQObject { + class KJSEMBED_EXPORT JSBindingPlugin : public TQObject { Q_OBJECT public: - JSBindingPlugin( TTQObject *parent, const char *name, const TTQStringList &args ); + JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &args ); virtual ~JSBindingPlugin(); /** * This method is called by the KJSFactory to bootstrap the plugin. - * Plugin developers will want to use this method to create their TTQObject binding, + * Plugin developers will want to use this method to create their TQObject binding, * or call their addBindings() method in their JSOpaque proxy or JSValueProxy. * * The value returned from ths function is the KJS::Object that represents the diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp index 19b4e42f..c0f758e2 100644 --- a/kjsembed/jsbuiltin_imp.cpp +++ b/kjsembed/jsbuiltin_imp.cpp @@ -61,7 +61,7 @@ namespace KJSEmbed { namespace Bindings { -JSBuiltInImp::JSBuiltInImp( JSBuiltIn *builtin, int mid, const TTQString &p ) +JSBuiltInImp::JSBuiltInImp( JSBuiltIn *builtin, int mid, const TQString &p ) : JSProxyImp(builtin->part()->globalExec()), part(builtin->part()), id(mid), param(p) { setName( KJS::Identifier( KJS::UString(param) ) ); @@ -71,8 +71,8 @@ JSBuiltInImp::~JSBuiltInImp() {} KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null; - TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::null; + TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null; + TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null; if ( id == MethodLoadScript ) { @@ -85,7 +85,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ return KJS::Boolean( ok ); } else { - TTQString msg = i18n( "Method retquires 1 or 2 arguments, received %1." ).arg( args.size() ); + TQString msg = i18n( "Method retquires 1 or 2 arguments, received %1." ).arg( args.size() ); return throwError(exec, msg); } } @@ -109,45 +109,45 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } else if ( id == MethodReadLine ) { - TTQString line = conin()->readLine(); + TQString line = conin()->readLine(); if ( !line.isNull() ) return KJS::String( line ); } else if ( id == MethodOpenFile ) { // #warning "This is leaked!!!!!" -// TTQFile *f=new TTQFile( arg0 ); +// TQFile *f=new TQFile( arg0 ); // int mode = 0; -// if ( arg1 == TTQString("ro") ) +// if ( arg1 == TQString("ro") ) // mode = IO_ReadOnly; -// else if ( arg1 == TTQString("wo") ) +// else if ( arg1 == TQString("wo") ) // mode = IO_WriteOnly; // if ( !f->open( mode ) ) // return KJS::Boolean(false); -// Bindings::TextStream *ts = new Bindings::TextStream( part, "file", new TTQTextStream(f) ); +// Bindings::TextStream *ts = new Bindings::TextStream( part, "file", new TQTextStream(f) ); // return KJS::Object( ts ); return KJS::Null(); } else if ( id == MethodReadFile ) { - TTQFile f( arg0 ); + TQFile f( arg0 ); if ( !f.open( IO_ReadOnly ) ) { - TTQString msg = i18n( "Could not open file '%1'." ).arg(arg0); + TQString msg = i18n( "Could not open file '%1'." ).arg(arg0); return throwError(exec, msg); } - TTQString s = f.readAll(); + TQString s = f.readAll(); return KJS::String( s ); } else if ( id == MethodWriteFile ) { - TTQFile f( arg0 ); + TQFile f( arg0 ); if ( !f.open( IO_WriteOnly ) ) return KJS::Boolean( false ); - TTQTextStream ts( &f ); + TQTextStream ts( &f ); ts << arg1; return KJS::Boolean( true ); @@ -171,16 +171,16 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } else if ( id == MethodSaxLoadFile ) { if ( args.size() != 2 ) { - TTQString msg = i18n( "Method retquires 2 arguments, received %1." ).arg( args.size() ); + TQString msg = i18n( "Method retquires 2 arguments, received %1." ).arg( args.size() ); return throwError(exec, msg); } BuiltIns::SaxHandler sax( exec ); sax.setHandler( args[0].toObject(exec) ); - TTQFile f( arg1 ); - TTQXmlInputSource src( &f ); - TTQXmlSimpleReader reader; + TQFile f( arg1 ); + TQXmlInputSource src( &f ); + TQXmlSimpleReader reader; reader.setContentHandler( &sax ); bool ok = reader.parse( src ); @@ -193,11 +193,11 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ else if ( id == MethodDumpCompletion ) { KJS::Object obj = obj.isValid() ? args[0].toObject(exec) : KJS::Object(); if ( !obj.isValid() ) { - TTQString msg = i18n( "Method retquires an object." ); + TQString msg = i18n( "Method retquires an object." ); return throwError(exec, msg,KJS::TypeError); } - TTQVariant v = dumpCompletion( exec, obj ); + TQVariant v = dumpCompletion( exec, obj ); return convertToValue( exec, v ); // FIXME: This will crash if the type is wrong } else if ( id == MethodAlert ) { @@ -205,7 +205,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ #ifndef QT_ONLY KMessageBox::information( 0L, arg0 ); #else // QT_ONLY - TTQMessageBox::information( 0L, i18n("Information"), arg0 ); + TQMessageBox::information( 0L, i18n("Information"), arg0 ); #endif // QT_ONLY return KJS::Undefined(); @@ -216,24 +216,24 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ #ifndef QT_ONLY answer = KMessageBox::questionYesNo( 0L, arg0 ); #else // QT_ONLY - answer = TTQMessageBox::question(0L, i18n("Question"), arg0 ); + answer = TQMessageBox::question(0L, i18n("Question"), arg0 ); #endif // QT_ONLY return KJS::Number( answer ); } else if ( id == MethodPrompt ) { - TTQString text; + TQString text; #ifndef QT_ONLY text = KInputDialog::getText( arg0, arg0, arg1 ); #else // QT_ONLY - text = TQInputDialog::getText( arg0, arg0, TTQLineEdit::Normal, arg1 ); + text = TQInputDialog::getText( arg0, arg0, TQLineEdit::Normal, arg1 ); #endif // QT_ONLY return KJS::String( text ); } else if ( id == MethodI18n ) { - TTQString retString(i18n(arg0.latin1())); + TQString retString(i18n(arg0.latin1())); return KJS::String( retString ); } else if ( id == MethodImport ) { @@ -242,11 +242,11 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ // Scan $KDEDIRS/share/apps/$APPNAME/ // Scan $KDEDIRS/share/apps/kjsembed/ KGlobal::dirs()->addResourceType("kjsembed", KStandardDirs::kde_default("data") +"/kjsembed/"); - TTQString fname = KGlobal::dirs ()->findResource ("kjsembed", TTQString(arg0)); + TQString fname = KGlobal::dirs ()->findResource ("kjsembed", TQString(arg0)); kdDebug(80001) << "Loading: " << fname << endl; - //TTQString code = part->loadFile(fname); + //TQString code = part->loadFile(fname); return KJS::Boolean( part->runFile(fname, part->globalObject())); #else // QT_ONLY @@ -269,7 +269,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ kdWarning() << "JSBuiltInImp has no method " << id << endl; } - TTQString msg = i18n( "JSBuiltInImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "JSBuiltInImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } diff --git a/kjsembed/jsbuiltin_imp.h b/kjsembed/jsbuiltin_imp.h index 7393b17e..6d833457 100644 --- a/kjsembed/jsbuiltin_imp.h +++ b/kjsembed/jsbuiltin_imp.h @@ -55,10 +55,10 @@ public: MethodShell,CustomMethod=0x1000 }; - JSBuiltInImp( JSBuiltIn *builtin, int id, const TTQString ¶m=TTQString::null ); + JSBuiltInImp( JSBuiltIn *builtin, int id, const TQString ¶m=TQString::null ); ~JSBuiltInImp(); - TTQString parameter() const { return param; } + TQString parameter() const { return param; } /** Returns true iff this object implements the call function. */ virtual bool implementsCall() const { return true; } @@ -69,7 +69,7 @@ public: private: KJSEmbedPart *part; uint id; - TTQString param; + TQString param; class JSBuiltInImpPrivate *d; }; diff --git a/kjsembed/jsbuiltinproxy.cpp b/kjsembed/jsbuiltinproxy.cpp index 2c6ea816..8ee39143 100644 --- a/kjsembed/jsbuiltinproxy.cpp +++ b/kjsembed/jsbuiltinproxy.cpp @@ -18,7 +18,7 @@ */ #include "jsbuiltinproxy.h" namespace KJSEmbed { -JSBuiltinProxy::JSBuiltinProxy( const TTQString &name ) : JSProxy( JSProxy::BuiltinProxy ), m_name(name) +JSBuiltinProxy::JSBuiltinProxy( const TQString &name ) : JSProxy( JSProxy::BuiltinProxy ), m_name(name) { } @@ -28,7 +28,7 @@ JSBuiltinProxy::~JSBuiltinProxy() } -TTQString JSBuiltinProxy::typeName() const +TQString JSBuiltinProxy::typeName() const { return m_name; } @@ -41,7 +41,7 @@ bool JSBuiltinProxy::inherits( const char *clazz ) KJS::UString JSBuiltinProxy::toString( KJS::ExecState */*exec*/ ) const { - TTQString s( "%1 (%2)" ); + TQString s( "%1 (%2)" ); return KJS::UString( s.arg("JSBuiltinProxy").arg(m_name).latin1() ); } diff --git a/kjsembed/jsbuiltinproxy.h b/kjsembed/jsbuiltinproxy.h index c3ae95d5..6eacd4ac 100644 --- a/kjsembed/jsbuiltinproxy.h +++ b/kjsembed/jsbuiltinproxy.h @@ -35,11 +35,11 @@ namespace KJSEmbed { class KJSEMBED_EXPORT JSBuiltinProxy : public JSProxy { public: - JSBuiltinProxy( const TTQString &name ); + JSBuiltinProxy( const TQString &name ); virtual ~JSBuiltinProxy(); - virtual TTQString typeName() const; + virtual TQString typeName() const; virtual bool inherits( const char *clazz ); @@ -50,7 +50,7 @@ public: /** Reimplemented to return the name and class of the target. */ virtual KJS::UString toString( KJS::ExecState *exec ) const; private: - TTQString m_name; + TQString m_name; }; } // namespace KJSEmbed diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index f3c61c6c..d2978a84 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -50,11 +50,11 @@ class JSConsoleWidgetPrivate { }; -JSConsoleWidget::JSConsoleWidget( KJSEmbedPart *jspart, TTQWidget *parent, const char *name ) - : TTQFrame( parent, name ? name : "jsconsole_widget" ), +JSConsoleWidget::JSConsoleWidget( KJSEmbedPart *jspart, TQWidget *parent, const char *name ) + : TQFrame( parent, name ? name : "jsconsole_widget" ), js(jspart), proc(0), d(0) { - setFocusPolicy( TTQWidget::StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); createView(); } @@ -64,8 +64,8 @@ JSConsoleWidget::~JSConsoleWidget() void JSConsoleWidget::createView() { - TTQPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) ); - TTQPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) ); + TQPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) ); + TQPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) ); setIcon( px ); KWin::setIcons( winId(), pxl, px ); @@ -77,32 +77,32 @@ void JSConsoleWidget::createView() log->setReadOnly( true ); log->setUndoRedoEnabled( false ); log->setTextFormat( TQt::RichText ); - log->setWrapPolicy( TTQTextEdit::Anywhere ); + log->setWrapPolicy( TQTextEdit::Anywhere ); log->setText( "
      " );
-    log->setFocusPolicy( TTQWidget::NoFocus );
+    log->setFocusPolicy( TQWidget::NoFocus );
 
     // Command entry section
-    cmdBox = new TTQHBox( this, "cmd_box" );
+    cmdBox = new TQHBox( this, "cmd_box" );
     cmdBox->setSpacing( KDialog::spacingHint() );
 
-    TTQLabel *prompt = new TTQLabel( i18n("&KJS>"), cmdBox, "prompt" );
+    TQLabel *prompt = new TQLabel( i18n("&KJS>"), cmdBox, "prompt" );
     cmd = new KLineEdit( cmdBox, "cmd_edit" );
-    cmd->setFocusPolicy( TTQWidget::StrongFocus );
+    cmd->setFocusPolicy( TQWidget::StrongFocus );
     cmd->setFocus();
     prompt->setBuddy( cmd );
 
-    go = new TTQPushButton( i18n("&Run"), cmdBox, "run_button" );
+    go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" );
     go->setFixedSize( go->sizeHint() );
 
-    connect( cmd, TQT_SIGNAL(returnPressed(const TTQString&)), go, TQT_SLOT( animateClick() ) );
+    connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) );
     connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) );
 
     // Setup completion
     KCompletion *comp = cmd->completionObject();
-    connect( cmd, TQT_SIGNAL(returnPressed(const TTQString&)), comp, TQT_SLOT(addItem(const TTQString&)) );
+    connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) );
 
     // Layout
-    TTQVBoxLayout *vert = new TTQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+    TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
     vert->addWidget( ttl );
     vert->addWidget( log );
     vert->addWidget( cmdBox );
@@ -110,17 +110,17 @@ void JSConsoleWidget::createView()
 
 void JSConsoleWidget::invoke()
 {
-    TTQString code( cmd->text() );
-    println( TTQString( "KJS> %1" ).arg( code ) );
+    TQString code( cmd->text() );
+    println( TQString( "KJS> %1" ).arg( code ) );
     execute( code );
 }
 
-bool JSConsoleWidget::execute( const TTQString &cmd )
+bool JSConsoleWidget::execute( const TQString &cmd )
 {
     return execute( cmd, KJS::Null() );
 }
 
-bool JSConsoleWidget::execute( const TTQString &cmd, const KJS::Value &self )
+bool JSConsoleWidget::execute( const TQString &cmd, const KJS::Value &self )
 {
     KJS::Completion jsres;
     bool ok = js->execute( jsres, cmd, self );
@@ -141,8 +141,8 @@ bool JSConsoleWidget::execute( const TTQString &cmd, const KJS::Value &self )
 	    return ok;
 	}
 
-	TTQString txt = s.qstring();
-	txt = txt.replace( TTQChar('\n'), "
      " );
+	TQString txt = s.qstring();
+	txt = txt.replace( TQChar('\n'), "
      " );
 	println( txt );
 
 	return ok;
@@ -166,15 +166,15 @@ bool JSConsoleWidget::execute( const TTQString &cmd, const KJS::Value &self )
     return ok;
 }
 
-void JSConsoleWidget::println( const TTQString &msg )
+void JSConsoleWidget::println( const TQString &msg )
 {
     log->append( msg );
     log->scrollToBottom();
 }
 
-void JSConsoleWidget::warn( const TTQString &msg )
+void JSConsoleWidget::warn( const TQString &msg )
 {
-    TTQString err( "%1" );
+    TQString err( "%1" );
     println( err.arg(msg) );
 }
 
@@ -182,7 +182,7 @@ void JSConsoleWidget::warn( const TTQString &msg )
 // Process Handling
 //
 
-bool JSConsoleWidget::run( const TTQString &cmd )
+bool JSConsoleWidget::run( const TQString &cmd )
 {
     kdDebug(80001) << "JSConsoleWidget::run(" << cmd << ")" << endl;
 
@@ -205,7 +205,7 @@ bool JSConsoleWidget::run( const TTQString &cmd )
 
 void JSConsoleWidget::childExited()
 {
-    TTQString s;
+    TQString s;
     if ( proc->normalExit() ) {
 	if ( proc->exitStatus() )
 	    s = i18n( "[Exited with status %1]\n" ).arg( proc->exitStatus() );
@@ -224,14 +224,14 @@ void JSConsoleWidget::childExited()
 
 void JSConsoleWidget::receivedStdOutput( KProcess *, char *buffer, int buflen )
 {
-    TTQCString buf = TTQCString( buffer, buflen+1 );
-    println( TTQString(buf) );
+    TQCString buf = TQCString( buffer, buflen+1 );
+    println( TQString(buf) );
 }
 
 void JSConsoleWidget::receivedStdError( KProcess *, char *buffer, int buflen )
 {
-    TTQCString buf = TTQCString( buffer, buflen+1 );
-    warn( TTQString(buf) );
+    TQCString buf = TQCString( buffer, buflen+1 );
+    warn( TQString(buf) );
 }
 
 
diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h
index 0d3598ce..b0ed7787 100644
--- a/kjsembed/jsconsolewidget.h
+++ b/kjsembed/jsconsolewidget.h
@@ -25,8 +25,8 @@
 #include 
 #include 
 
-class TTQPushButton;
-class TTQHBox;
+class TQPushButton;
+class TQHBox;
 
 class KLineEdit;
 class KPopupTitle;
@@ -43,7 +43,7 @@ namespace KJSEmbed {
 class KJSEmbedPart;
 
 /**
- * A TTQWidget that provides a console for executing Javascript commands. Creating
+ * A TQWidget that provides a console for executing Javascript commands. Creating
  * a JS console is easy, as you can see below:
  *
  * 
      @@ -64,7 +64,7 @@ class KJSEMBED_EXPORT JSConsoleWidget : public TQFrame
     Q_OBJECT
 
 public:
-    JSConsoleWidget( KJSEmbedPart *js, TTQWidget *parent=0, const char *name=0 );
+    JSConsoleWidget( KJSEmbedPart *js, TQWidget *parent=0, const char *name=0 );
     virtual ~JSConsoleWidget();
 
 public slots:
@@ -78,28 +78,28 @@ public slots:
     KPopupTitle *title() const { return ttl; }
 
     /**
-     * Returns the TTQHBox used to layout the entry part of the console. This
+     * Returns the TQHBox used to layout the entry part of the console. This
      * can be used by clients to hide and show the interactive parts of the
      * console, or to add new buttons etc.
      */
-    TTQHBox *commandBox() const { return cmdBox; }
+    TQHBox *commandBox() const { return cmdBox; }
 
     /** Invokes the content of the command entry field. */
     void invoke();
 
     /** Invokes the specified command string. */
-    virtual bool execute( const TTQString &cmd );
+    virtual bool execute( const TQString &cmd );
 
-    bool execute( const TTQString &cmd, const KJS::Value &self );
+    bool execute( const TQString &cmd, const KJS::Value &self );
 
     /** Prints the specified string to the console. */
-    virtual void println( const TTQString &text );
+    virtual void println( const TQString &text );
 
     /**
      * Prints the specified string to the console as a warning, the default
      * implementation prints the text in red.
      */
-    virtual void warn( const TTQString &text );
+    virtual void warn( const TQString &text );
 
     /**
      * Runs the specified command using KShellProcess. The output of the
@@ -115,7 +115,7 @@ public slots:
      * to ensure that you only expose safe objects and methods to the
      * interpreter.
      */
-    virtual bool run( const TTQString &shellCmd );
+    virtual bool run( const TQString &shellCmd );
 
 protected:
     /** Creates the console view. */
@@ -136,9 +136,9 @@ private:
     KShellProcess *proc;
 
     KTextEdit *log;
-    TTQHBox *cmdBox;
+    TQHBox *cmdBox;
     KLineEdit *cmd;
-    TTQPushButton *go;
+    TQPushButton *go;
     KPopupTitle *ttl;
 
     class JSConsoleWidgetPrivate *d;
diff --git a/kjsembed/jseventmapper.cpp b/kjsembed/jseventmapper.cpp
index 062f2c22..000353d3 100644
--- a/kjsembed/jseventmapper.cpp
+++ b/kjsembed/jseventmapper.cpp
@@ -25,46 +25,46 @@ namespace KJSEmbed {
 /** Used internally for the event handler table. */
 struct EventType
 {
-    EventType( KJS::Identifier _id, TTQEvent::Type _type ) :
+    EventType( KJS::Identifier _id, TQEvent::Type _type ) :
 	id(_id), type(_type) {;}
 
     const KJS::Identifier id;
-    const TTQEvent::Type type;
+    const TQEvent::Type type;
 };
 
 static EventType events[] = {
-	EventType(KJS::Identifier("timerEvent"), TTQEvent::Timer),
+	EventType(KJS::Identifier("timerEvent"), TQEvent::Timer),
 
 #ifdef ENABLE_CHILDEVENTS
-    EventType( KJS::Identifier("childInsertEvent"), TTQEvent::ChildInserted ),
-    EventType( KJS::Identifier("childRemoveEvent"), TTQEvent::ChildRemoved ),
+    EventType( KJS::Identifier("childInsertEvent"), TQEvent::ChildInserted ),
+    EventType( KJS::Identifier("childRemoveEvent"), TQEvent::ChildRemoved ),
 #endif
 
-    EventType( KJS::Identifier("mouseReleaseEvent"), TTQEvent::MouseButtonRelease ),
-    EventType( KJS::Identifier("mouseMoveEvent"), TTQEvent::MouseMove ),
-    EventType( KJS::Identifier("mouseDoubleClickEvent"), TTQEvent::MouseButtonDblClick ),
-    EventType( KJS::Identifier("mousePressEvent"), TTQEvent::MouseButtonPress ),
+    EventType( KJS::Identifier("mouseReleaseEvent"), TQEvent::MouseButtonRelease ),
+    EventType( KJS::Identifier("mouseMoveEvent"), TQEvent::MouseMove ),
+    EventType( KJS::Identifier("mouseDoubleClickEvent"), TQEvent::MouseButtonDblClick ),
+    EventType( KJS::Identifier("mousePressEvent"), TQEvent::MouseButtonPress ),
 
-    EventType( KJS::Identifier("keyPressEvent"), TTQEvent::KeyPress ),
-    EventType( KJS::Identifier("keyReleaseEvent"), TTQEvent::KeyRelease ),
+    EventType( KJS::Identifier("keyPressEvent"), TQEvent::KeyPress ),
+    EventType( KJS::Identifier("keyReleaseEvent"), TQEvent::KeyRelease ),
 
-    EventType( KJS::Identifier("paintEvent"), TTQEvent::Paint ),
+    EventType( KJS::Identifier("paintEvent"), TQEvent::Paint ),
 
-    EventType( KJS::Identifier("moveEvent"), TTQEvent::Move ),
-    EventType( KJS::Identifier("resizeEvent"), TTQEvent::Resize ),
+    EventType( KJS::Identifier("moveEvent"), TQEvent::Move ),
+    EventType( KJS::Identifier("resizeEvent"), TQEvent::Resize ),
 
-    EventType( KJS::Identifier("closeEvent"), TTQEvent::Close ),
+    EventType( KJS::Identifier("closeEvent"), TQEvent::Close ),
 
-    EventType( KJS::Identifier("showEvent"), TTQEvent::Show ),
-    EventType( KJS::Identifier("hideEvent"), TTQEvent::Hide ),
+    EventType( KJS::Identifier("showEvent"), TQEvent::Show ),
+    EventType( KJS::Identifier("hideEvent"), TQEvent::Hide ),
 
-    EventType( KJS::Identifier("dragEnterEvent"), TTQEvent::DragEnter ),
-    EventType( KJS::Identifier("dragMoveEvent"), TTQEvent::DragMove ),
-    EventType( KJS::Identifier("dragLeaveEvent"), TTQEvent::DragLeave ),
-    EventType( KJS::Identifier("dragResponseEvent"), TTQEvent::DragResponse ),
-    EventType( KJS::Identifier("dropEvent"), TTQEvent::Drop ),
+    EventType( KJS::Identifier("dragEnterEvent"), TQEvent::DragEnter ),
+    EventType( KJS::Identifier("dragMoveEvent"), TQEvent::DragMove ),
+    EventType( KJS::Identifier("dragLeaveEvent"), TQEvent::DragLeave ),
+    EventType( KJS::Identifier("dragResponseEvent"), TQEvent::DragResponse ),
+    EventType( KJS::Identifier("dropEvent"), TQEvent::Drop ),
 
-    EventType( KJS::Identifier(), TTQEvent::None )
+    EventType( KJS::Identifier(), TQEvent::None )
 };
 
 JSEventMapper::JSEventMapper()
@@ -73,23 +73,23 @@ JSEventMapper::JSEventMapper()
     do {
 	addEvent( events[i].id, events[i].type );
 	i++;
-    } while( events[i].type != TTQEvent::None );
+    } while( events[i].type != TQEvent::None );
 }
 
 JSEventMapper::~JSEventMapper()
 {
 }
 
-void JSEventMapper::addEvent( const KJS::Identifier &name, TTQEvent::Type t )
+void JSEventMapper::addEvent( const KJS::Identifier &name, TQEvent::Type t )
 {
     handlerToEvent.insert( name.qstring(), (const uint *) t );
     eventToHandler.insert( (long) t, &name );
 }
 
-TTQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const
+TQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const
 {
     uint evt = (uint)(long)handlerToEvent[ name.qstring() ];
-    return static_cast( evt );
+    return static_cast( evt );
 }
 
 } // namespace KJSEmbed
diff --git a/kjsembed/jseventmapper.h b/kjsembed/jseventmapper.h
index f086a982..3539e94a 100644
--- a/kjsembed/jseventmapper.h
+++ b/kjsembed/jseventmapper.h
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 
 /**
- * Maintains a map between the types of TTQEvent and the names of their event
+ * Maintains a map between the types of TQEvent and the names of their event
  * handlers.
  *
  * @author Richard Moore, rich@kde.org
@@ -47,7 +47,7 @@ public:
      * Adds an event to the map. The event handler has the specified name, and
      * the event has the specified type.
      */
-    void addEvent( const KJS::Identifier &name, TTQEvent::Type t );
+    void addEvent( const KJS::Identifier &name, TQEvent::Type t );
 
     /** Returns true iff the specified name is the identifier for an event handler. */
     bool isEventHandler( const KJS::Identifier &name ) const {
@@ -55,13 +55,13 @@ public:
     }
 
     /** Returns the type of the events handled by the specified handler. */
-    TTQEvent::Type findEventType( const KJS::Identifier &name ) const;
+    TQEvent::Type findEventType( const KJS::Identifier &name ) const;
 
-    KJS::Identifier *findEventHandler( TTQEvent::Type t ) const { return eventToHandler.find(t); }
+    KJS::Identifier *findEventHandler( TQEvent::Type t ) const { return eventToHandler.find(t); }
 
 private:
-    TTQDict handlerToEvent;
-    TTQIntDict eventToHandler;
+    TQDict handlerToEvent;
+    TQIntDict eventToHandler;
     class JSEventMapperPrivate *d;
 };
 
diff --git a/kjsembed/jseventutils.cpp b/kjsembed/jseventutils.cpp
index 2aabf762..4c5bbd13 100644
--- a/kjsembed/jseventutils.cpp
+++ b/kjsembed/jseventutils.cpp
@@ -33,15 +33,15 @@ JSFactory *JSEventUtils::factory( const JSObjectProxy *prx )
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQMouseEvent *ev, const JSObjectProxy *context )
+					const TQMouseEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object mev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object mev = convertEvent( exec, (TQEvent *)ev, context);
 
-    mev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ) );
+    mev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) );
     mev.put( exec, "x", KJS::Number(ev->x()) );
     mev.put( exec, "y", KJS::Number(ev->y()) );
 
-    mev.put( exec, "globalPos", convertToValue( exec, TTQVariant(ev->globalPos()) ) );
+    mev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) );
     mev.put( exec, "globalX", KJS::Number(ev->globalX()) );
     mev.put( exec, "globalY", KJS::Number(ev->globalY()) );
 
@@ -53,19 +53,19 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQPaintEvent *ev, const JSObjectProxy *context )
+					const TQPaintEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object pev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object pev = convertEvent( exec, (TQEvent *)ev, context);
 
-    pev.put( exec, "rect", convertToValue( exec, TTQVariant(ev->rect()) ) );
-    pev.put( exec, "erased", convertToValue( exec, TTQVariant(ev->erased()) ) );
+    pev.put( exec, "rect", convertToValue( exec, TQVariant(ev->rect()) ) );
+    pev.put( exec, "erased", convertToValue( exec, TQVariant(ev->erased()) ) );
     return pev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQKeyEvent *ev, const JSObjectProxy *context )
+					const TQKeyEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object kev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object kev = convertEvent( exec, (TQEvent *)ev, context);
 
     kev.put( exec, "key", KJS::Number(ev->key()) );
     kev.put( exec, "ascii", KJS::Number(ev->ascii()) );
@@ -75,37 +75,37 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
     kev.put( exec, "text", KJS::String(ev->text()));
     kev.put( exec, "isAutoRepeat", KJS::Boolean(ev->isAutoRepeat()) );
     kev.put( exec, "count", KJS::Number( ev->count()) );
-    //kev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
-    //kev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
+    //kev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) );
+    //kev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
     return kev;
 }
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQIMEvent *ev, const JSObjectProxy *context )
+					const TQIMEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object qev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object qev = convertEvent( exec, (TQEvent *)ev, context);
 
     qev.put( exec, "text", KJS::String(ev->text()) );
     qev.put( exec, "cursorPos", KJS::Number(ev->cursorPos()) );
     qev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) );
-    //qev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
-    //qev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
+    //qev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) );
+    //qev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
     return qev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQResizeEvent *ev, const JSObjectProxy *context )
+					const TQResizeEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object rev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object rev = convertEvent( exec, (TQEvent *)ev, context);
 
-    rev.put( exec, "size", convertToValue( exec, TTQVariant(ev->size()) ));
-    rev.put( exec, "oldSize", convertToValue( exec, TTQVariant(ev->oldSize())  ));
+    rev.put( exec, "size", convertToValue( exec, TQVariant(ev->size()) ));
+    rev.put( exec, "oldSize", convertToValue( exec, TQVariant(ev->oldSize())  ));
     return rev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQFocusEvent *ev, const JSObjectProxy *context )
+					const TQFocusEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object fev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object fev = convertEvent( exec, (TQEvent *)ev, context);
 
     fev.put( exec, "gotFocus", KJS::Boolean(ev->gotFocus()) );
     fev.put( exec, "lostFocus", KJS::Boolean(ev->lostFocus()) );
@@ -113,21 +113,21 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQCloseEvent *ev, const JSObjectProxy *context )
+					const TQCloseEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object cev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object cev = convertEvent( exec, (TQEvent *)ev, context);
 
     cev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) );
-    //cev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
-    //cev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
+    //cev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) );
+    //cev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
     return cev;
 }
 
 #ifdef ENABLE_CHILDEVENTS
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQChildEvent *ev, const JSObjectProxy *context )
+					const TQChildEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object cev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object cev = convertEvent( exec, (TQEvent *)ev, context);
 
     cev.put( exec, "inserted", KJS::Boolean(ev->inserted()) );
     cev.put( exec, "removed", KJS::Boolean(ev->removed()) );
@@ -138,23 +138,23 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
 #endif
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQMoveEvent *ev, const JSObjectProxy *context )
+					const TQMoveEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object mev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object mev = convertEvent( exec, (TQEvent *)ev, context);
 
-    mev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ));
-    mev.put( exec, "oldPos", convertToValue( exec, TTQVariant(ev->oldPos()) ));
+    mev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ));
+    mev.put( exec, "oldPos", convertToValue( exec, TQVariant(ev->oldPos()) ));
     return mev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQWheelEvent *ev, const JSObjectProxy *context )
+					const TQWheelEvent *ev, const JSObjectProxy *context )
 {
-    KJS::Object wev = convertEvent( exec, (TTQEvent *)ev, context);
+    KJS::Object wev = convertEvent( exec, (TQEvent *)ev, context);
 
     wev.put( exec, "delta", KJS::Number(ev->delta()) );
-    wev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ) );
-    wev.put( exec, "globalPos", convertToValue( exec, TTQVariant(ev->globalPos()) ) );
+    wev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) );
+    wev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) );
     wev.put( exec, "x", KJS::Number(ev->x()) );
     wev.put( exec, "y", KJS::Number(ev->y()) );
     wev.put( exec, "globalX", KJS::Number(ev->globalX()) );
@@ -163,13 +163,13 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
     wev.put( exec, "state", KJS::Number(ev->state()) );
     wev.put( exec, "orientation", KJS::Number(ev->orientation()) );
     wev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) );
-    //wev.put( exec, "accept", KJS::Void( exec, TTQVariant(ev->accept()), context ) );
-    //wev.put( exec, "ignore", KJS::Void( exec, TTQVariant(ev->ignore()), context ) );
+    //wev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) );
+    //wev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) );
     return wev;
 }
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-					const TTQEvent *ev, const JSObjectProxy * /*context*/)
+					const TQEvent *ev, const JSObjectProxy * /*context*/)
 {
     KJS::Object evnt( new JSOpaqueProxy(ev) );
     evnt.put( exec, "type", KJS::Number( (int) ev->type()) );
@@ -177,10 +177,10 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
     return evnt;
 }
 
-KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const TTQDropEvent * ev, const JSObjectProxy * context )
+KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const TQDropEvent * ev, const JSObjectProxy * context )
 {
-	KJS::Object dev = convertEvent( exec, (TTQEvent *)ev, context);
-	dev.put( exec, "pos", convertToValue( exec, TTQVariant(ev->pos()) ) );
+	KJS::Object dev = convertEvent( exec, (TQEvent *)ev, context);
+	dev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) );
 	dev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) );
 	dev.put( exec, "isActionAccepted", KJS::Boolean(ev->isActionAccepted()) );
 	dev.put( exec, "source", factory(context)->createProxy(exec, ev->source(), context) );
@@ -189,31 +189,31 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const TTQDropEven
 } 
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-				const TTQDragMoveEvent *ev, const JSObjectProxy *context )
+				const TQDragMoveEvent *ev, const JSObjectProxy *context )
 {
-	KJS::Object mev = convertEvent(exec, (TTQDropEvent *)ev, context);
-	mev.put( exec, "answerRect", convertToValue( exec, TTQVariant(ev->answerRect()) ) );
+	KJS::Object mev = convertEvent(exec, (TQDropEvent *)ev, context);
+	mev.put( exec, "answerRect", convertToValue( exec, TQVariant(ev->answerRect()) ) );
 	return mev;
 } 
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-				const TTQTimerEvent *ev, const JSObjectProxy *context )
+				const TQTimerEvent *ev, const JSObjectProxy *context )
 {
-	KJS::Object dev = convertEvent( exec, (TTQEvent *)ev, context);
+	KJS::Object dev = convertEvent( exec, (TQEvent *)ev, context);
 	dev.put( exec, "timerId", KJS::Number(ev->timerId()) );
 	return dev;
 } 
 
 KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec,
-				const TTQContextMenuEvent *ev, const JSObjectProxy *context )
+				const TQContextMenuEvent *ev, const JSObjectProxy *context )
 {
-	KJS::Object cxev = convertEvent( exec, (TTQEvent *)ev, context);
+	KJS::Object cxev = convertEvent( exec, (TQEvent *)ev, context);
 	cxev.put( exec, "x", KJS::Number(ev->x()) );
 	cxev.put( exec, "y", KJS::Number(ev->y()) );
 	cxev.put( exec, "globalX", KJS::Number(ev->globalX()) );
 	cxev.put( exec, "globalY", KJS::Number(ev->globalY()) );
-	cxev.put( exec, "pos",convertToValue( exec, TTQVariant(ev->pos()) ) );
-	cxev.put( exec, "globalPos", convertToValue( exec, TTQVariant(ev->globalPos()) ) );
+	cxev.put( exec, "pos",convertToValue( exec, TQVariant(ev->pos()) ) );
+	cxev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) );
 	cxev.put( exec, "state", KJS::Number( (int) ev->state()) );
 	cxev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) );
 	cxev.put( exec, "isConsumed", KJS::Boolean(ev->isConsumed()) );
diff --git a/kjsembed/jseventutils.h b/kjsembed/jseventutils.h
index 6ec70f21..2d2044e9 100644
--- a/kjsembed/jseventutils.h
+++ b/kjsembed/jseventutils.h
@@ -37,51 +37,51 @@ class KJSEMBED_EXPORT JSEventUtils
 {
 public:
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQMouseEvent *ev, const JSObjectProxy *context );
+				     const TQMouseEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQPaintEvent *ev, const JSObjectProxy *context );
+				     const TQPaintEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQKeyEvent *ev, const JSObjectProxy *context );
+				     const TQKeyEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQIMEvent *ev, const JSObjectProxy *context );
+				     const TQIMEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQResizeEvent *ev, const JSObjectProxy *context );
+				     const TQResizeEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQFocusEvent *ev, const JSObjectProxy *context );
+				     const TQFocusEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQCloseEvent *ev, const JSObjectProxy *context );
+				     const TQCloseEvent *ev, const JSObjectProxy *context );
 
 #ifdef ENABLE_CHILDEVENTS
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQChildEvent *ev, const JSObjectProxy *context );
+				     const TQChildEvent *ev, const JSObjectProxy *context );
 #endif
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQMoveEvent *ev, const JSObjectProxy *context );
+				     const TQMoveEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQWheelEvent *ev, const JSObjectProxy *context );
+				     const TQWheelEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQEvent *ev, const JSObjectProxy *context );
+				     const TQEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQDropEvent *ev, const JSObjectProxy *context );
+				     const TQDropEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQDragMoveEvent *ev, const JSObjectProxy *context );
+				     const TQDragMoveEvent *ev, const JSObjectProxy *context );
 
     static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQTimerEvent *ev, const JSObjectProxy *context );
+				     const TQTimerEvent *ev, const JSObjectProxy *context );
 
    static KJS::Object convertEvent( KJS::ExecState *exec,
-				     const TTQContextMenuEvent *ev, const JSObjectProxy *context );
+				     const TQContextMenuEvent *ev, const JSObjectProxy *context );
 
 
 
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 8749481a..5e6a22a7 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -137,9 +137,9 @@ namespace KJSEmbed {
 
     class JSFactoryPrivate {
     public:
-        TTQDict plugins;
-        TTQDict opaqueTypes;
-        TTQDict objectTypes;
+        TQDict plugins;
+        TQDict opaqueTypes;
+        TQDict objectTypes;
     };
 
 
@@ -147,9 +147,9 @@ namespace KJSEmbed {
             : jspart( part ) {
         evmapper = new JSEventMapper();
         d = new JSFactoryPrivate;
-        registerOpaqueType("TTQDir", new Bindings::TQDirLoader());
-        registerOpaqueType("TTQCheckListItem", new Bindings::TQCheckListItemLoader());
-        registerOpaqueType("TTQListViewItem", new Bindings::TQListViewItemLoader());
+        registerOpaqueType("TQDir", new Bindings::TQDirLoader());
+        registerOpaqueType("TQCheckListItem", new Bindings::TQCheckListItemLoader());
+        registerOpaqueType("TQListViewItem", new Bindings::TQListViewItemLoader());
         registerOpaqueType("Painter", new Bindings::PainterLoader());
 
 #ifndef QT_ONLY
@@ -174,7 +174,7 @@ namespace KJSEmbed {
 
         KTrader::OfferListIterator itr = offers.begin();
         while ( itr != offers.end() ) {
-            TTQString classname = ( *itr ) ->name();
+            TQString classname = ( *itr ) ->name();
             JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, classname );
             parent.put( exec, KJS::Identifier( cons->parameter() ), KJS::Object( cons ) );
             addType( classname, TypePlugin );
@@ -187,19 +187,19 @@ namespace KJSEmbed {
 
     }
 
-    bool JSFactory::isBindingPlugin( const TTQString &classname ) const {
+    bool JSFactory::isBindingPlugin( const TQString &classname ) const {
         if ( !isSupported( classname ) )
             return false;
         return ( objtypes[ classname ] & TypePlugin );
     }
 
-    KJS::Object JSFactory::createBindingPlugin( KJS::ExecState *exec, const TTQString &classname, const KJS::List &args ) {
+    KJS::Object JSFactory::createBindingPlugin( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ) {
 #ifndef QT_ONLY
 
         Bindings::JSBindingPlugin * plugin = d->plugins[ classname ];
         if ( plugin == 0L ) {
-            TTQString query = "JSBindingPlugin/Binding";
-            TTQString constraint = "[Name] == '" + classname + "'";
+            TQString query = "JSBindingPlugin/Binding";
+            TQString constraint = "[Name] == '" + classname + "'";
             plugin = KParts::ComponentFactory::createInstanceFromQuery( query, constraint );
             if ( plugin != 0L )
                 d->plugins.insert( classname, plugin );
@@ -219,10 +219,10 @@ namespace KJSEmbed {
         return KJS::Object();
     }
 
-    KJS::Object JSFactory::create( KJS::ExecState *exec, const TTQString &classname, const KJS::List &args ) {
+    KJS::Object JSFactory::create( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ) {
         KJS::Object returnObject;
         if ( !isSupported( classname ) ) {
-            TTQString msg = i18n( "Object of type '%1' is not supported." ).arg( classname );
+            TQString msg = i18n( "Object of type '%1' is not supported." ).arg( classname );
             return throwError(exec, msg,KJS::TypeError);
         }
         if ( isTQObject( classname ) ) {
@@ -232,15 +232,15 @@ namespace KJSEmbed {
                 returnObject = factory->createBinding( jspart, exec, args );
                 JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript );
             } else {
-                TTQObject *parent = extractTQObject(exec, args, 0);
-                TTQString name = extractTQString(exec, args, 1);
+                TQObject *parent = extractTQObject(exec, args, 0);
+                TQString name = extractTQString(exec, args, 1);
     
-                TTQObject *obj = create( classname, parent, name.latin1() );
+                TQObject *obj = create( classname, parent, name.latin1() );
                 if ( obj ) {
                     returnObject = createProxy( exec, obj );
                     JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript );
                 } else {
-                    TTQString msg = i18n( "TTQObject of type '%1' could not be created." ).arg( classname );
+                    TQString msg = i18n( "TQObject of type '%1' could not be created." ).arg( classname );
                     returnObject = throwError(exec, msg,KJS::TypeError);
                 }
             }
@@ -253,30 +253,30 @@ namespace KJSEmbed {
                 returnObject = createOpaque( exec, classname, args );
 
             if ( !returnObject.isValid() ) {
-                TTQString msg = i18n( "Opaque object of type '%1' could not be created." ).arg( classname );
+                TQString msg = i18n( "Opaque object of type '%1' could not be created." ).arg( classname );
                 returnObject = throwError(exec, msg,KJS::TypeError);
             }
         } else if ( isValue( classname ) ) {
             returnObject = createValue( exec, classname, args );
             if ( !returnObject.isValid() ) {
-                TTQString msg = i18n( "Value object of type '%1' could not be created." ).arg( classname );
+                TQString msg = i18n( "Value object of type '%1' could not be created." ).arg( classname );
                 returnObject = throwError(exec, msg,KJS::TypeError);
             }
         } else if ( isBindingPlugin( classname ) ) {
             returnObject = createBindingPlugin( exec, classname, args );
             if ( !returnObject.isValid() ) {
-                TTQString msg = i18n( "Plugin object of type '%1' could not be created." ).arg( classname );
+                TQString msg = i18n( "Plugin object of type '%1' could not be created." ).arg( classname );
                 returnObject = throwError(exec, msg,KJS::TypeError);
             } else
                 JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript );
         } else {
-            TTQString msg = i18n( "Could not create object of type '%1'." ).arg( classname );
+            TQString msg = i18n( "Could not create object of type '%1'." ).arg( classname );
             returnObject = throwError(exec, msg,KJS::TypeError);
         }
         return returnObject;
     }
 
-    KJS::Object JSFactory::createProxy( KJS::ExecState *exec, TTQObject *target,
+    KJS::Object JSFactory::createProxy( KJS::ExecState *exec, TQObject *target,
                                         const JSObjectProxy *ctx ) const {
         kdDebug( 80001 ) << "JSFactory::createProxy: Target '" << target->name()
         << "' type " << target->className() << endl;
@@ -301,7 +301,7 @@ namespace KJSEmbed {
     }
 
     KJS::Object JSFactory::createProxy( KJS::ExecState *exec,
-                                        TTQTextStream *target, const JSObjectProxy *context ) const {
+                                        TQTextStream *target, const JSObjectProxy *context ) const {
         Q_UNUSED( context )
         kdDebug( 80001 ) << "TextStream proxy created" << endl;
 
@@ -314,74 +314,74 @@ namespace KJSEmbed {
     }
 
     KJS::Object JSFactory::createProxy( KJS::ExecState *exec,
-                                        TTQEvent *target, const JSObjectProxy *context ) const {
+                                        TQEvent *target, const JSObjectProxy *context ) const {
         switch ( target->type() ) {
-            case TTQEvent::MouseButtonPress:
-            case TTQEvent::MouseButtonRelease:
-            case TTQEvent::MouseMove:
-            case TTQEvent::MouseButtonDblClick:
-                return JSEventUtils::convertEvent( exec, ( TTQMouseEvent * ) target, context );
+            case TQEvent::MouseButtonPress:
+            case TQEvent::MouseButtonRelease:
+            case TQEvent::MouseMove:
+            case TQEvent::MouseButtonDblClick:
+                return JSEventUtils::convertEvent( exec, ( TQMouseEvent * ) target, context );
                 break;
-            case TTQEvent::KeyPress:
-            case TTQEvent::KeyRelease:
-            case TTQEvent::Accel:
-            case TTQEvent::AccelOverride:
-                return JSEventUtils::convertEvent( exec, ( TTQKeyEvent * ) target, context );
+            case TQEvent::KeyPress:
+            case TQEvent::KeyRelease:
+            case TQEvent::Accel:
+            case TQEvent::AccelOverride:
+                return JSEventUtils::convertEvent( exec, ( TQKeyEvent * ) target, context );
                 break;
-            case TTQEvent::IMStart:
-            case TTQEvent::IMCompose:
-            case TTQEvent::IMEnd:
-                return JSEventUtils::convertEvent( exec, ( TTQIMEvent * ) target, context );
+            case TQEvent::IMStart:
+            case TQEvent::IMCompose:
+            case TQEvent::IMEnd:
+                return JSEventUtils::convertEvent( exec, ( TQIMEvent * ) target, context );
                 break;
-            case TTQEvent::Paint:
-                return JSEventUtils::convertEvent( exec, ( TTQPaintEvent * ) target, context );
+            case TQEvent::Paint:
+                return JSEventUtils::convertEvent( exec, ( TQPaintEvent * ) target, context );
                 break;
-            case TTQEvent::Resize:
-                return JSEventUtils::convertEvent( exec, ( TTQResizeEvent * ) target, context );
+            case TQEvent::Resize:
+                return JSEventUtils::convertEvent( exec, ( TQResizeEvent * ) target, context );
                 break;
-            case TTQEvent::FocusIn:
-            case TTQEvent::FocusOut:
-                return JSEventUtils::convertEvent( exec, ( TTQFocusEvent * ) target, context );
+            case TQEvent::FocusIn:
+            case TQEvent::FocusOut:
+                return JSEventUtils::convertEvent( exec, ( TQFocusEvent * ) target, context );
                 break;
-            case TTQEvent::Close:
-                return JSEventUtils::convertEvent( exec, ( TTQCloseEvent * ) target, context );
+            case TQEvent::Close:
+                return JSEventUtils::convertEvent( exec, ( TQCloseEvent * ) target, context );
                 break;
-            case TTQEvent::ChildInserted:
-            case TTQEvent::ChildRemoved:
-                return JSEventUtils::convertEvent( exec, ( TTQChildEvent * ) target, context );
+            case TQEvent::ChildInserted:
+            case TQEvent::ChildRemoved:
+                return JSEventUtils::convertEvent( exec, ( TQChildEvent * ) target, context );
                 break;
-            case TTQEvent::Move:
-                return JSEventUtils::convertEvent( exec, ( TTQMoveEvent * ) target, context );
+            case TQEvent::Move:
+                return JSEventUtils::convertEvent( exec, ( TQMoveEvent * ) target, context );
                 break;
-            case TTQEvent::Wheel:
-                return JSEventUtils::convertEvent( exec, ( TTQWheelEvent * ) target, context );
+            case TQEvent::Wheel:
+                return JSEventUtils::convertEvent( exec, ( TQWheelEvent * ) target, context );
                 break;
-            case TTQEvent::Timer:
-                return JSEventUtils::convertEvent( exec, ( TTQTimerEvent * ) target, context );
+            case TQEvent::Timer:
+                return JSEventUtils::convertEvent( exec, ( TQTimerEvent * ) target, context );
                 break;
-            case TTQEvent::ContextMenu:
-                return JSEventUtils::convertEvent( exec, ( TTQContextMenuEvent * ) target, context );
+            case TQEvent::ContextMenu:
+                return JSEventUtils::convertEvent( exec, ( TQContextMenuEvent * ) target, context );
                 break;
-            case TTQEvent::DragMove:
-            case TTQEvent::DragEnter:
-                return JSEventUtils::convertEvent( exec, ( TTQDragMoveEvent * ) target, context );
+            case TQEvent::DragMove:
+            case TQEvent::DragEnter:
+                return JSEventUtils::convertEvent( exec, ( TQDragMoveEvent * ) target, context );
                 break;
-            case TTQEvent::Drop:
-                return JSEventUtils::convertEvent( exec, ( TTQDropEvent * ) target, context );
+            case TQEvent::Drop:
+                return JSEventUtils::convertEvent( exec, ( TQDropEvent * ) target, context );
                 break;
-            case TTQEvent::Enter:
-            case TTQEvent::Leave:
-            case TTQEvent::Clipboard:
-            case TTQEvent::DragLeave:
-            case TTQEvent::Show:
-            case TTQEvent::Hide:
-                return JSEventUtils::convertEvent( exec, ( TTQEvent * ) target, context );
+            case TQEvent::Enter:
+            case TQEvent::Leave:
+            case TQEvent::Clipboard:
+            case TQEvent::DragLeave:
+            case TQEvent::Show:
+            case TQEvent::Hide:
+                return JSEventUtils::convertEvent( exec, ( TQEvent * ) target, context );
                 break;
             default:
                 break;
         }
 
-        return JSEventUtils::convertEvent( exec, ( TTQEvent * ) target, context );
+        return JSEventUtils::convertEvent( exec, ( TQEvent * ) target, context );
     }
 
     KJS::Object JSFactory::extendProxy( KJS::ExecState *exec, KJS::Object &target ) const {
@@ -402,8 +402,8 @@ namespace KJSEmbed {
 
         Bindings::JSBindingPlugin *plugin = d->plugins[ proxy->object() ->className() ];
         if ( plugin == 0L ) {
-            TTQString query = "JSBindingPlugin/Binding";
-            TTQString constraint = "[Name] == '" + TTQString::fromUtf8( proxy->object() ->className() ) + "'";
+            TQString query = "JSBindingPlugin/Binding";
+            TQString constraint = "[Name] == '" + TQString::fromUtf8( proxy->object() ->className() ) + "'";
             plugin = KParts::ComponentFactory::createInstanceFromQuery( query, constraint );
             if ( plugin != 0L )
                 d->plugins.insert( proxy->object() ->className(), plugin );
@@ -424,7 +424,7 @@ namespace KJSEmbed {
     }
 
 
-    TTQObject *JSFactory::createBinding( const TTQString &cname, TTQObject *parent, const char *name ) {
+    TQObject *JSFactory::createBinding( const TQString &cname, TQObject *parent, const char *name ) {
 #ifndef QT_ONLY
 
         // Bindings
@@ -446,15 +446,15 @@ namespace KJSEmbed {
         return 0;
     }
 
-    TTQObject *JSFactory::createObject( const TTQString &cname, TTQObject *parent, const char *name ) {
+    TQObject *JSFactory::createObject( const TQString &cname, TQObject *parent, const char *name ) {
 
         // TQObjects defined by Qt
-        if ( cname == "TTQObject" )
-            return new TTQObject( parent, name );
-        else if ( cname == "TTQTimer" )
-            return new TTQTimer( parent, name );
-        else if ( cname == "TTQCanvas" )
-            return new TTQCanvas( parent, name );
+        if ( cname == "TQObject" )
+            return new TQObject( parent, name );
+        else if ( cname == "TQTimer" )
+            return new TQTimer( parent, name );
+        else if ( cname == "TQCanvas" )
+            return new TQCanvas( parent, name );
 
 #ifndef QT_ONLY
         // TQObjects defined by KDE
@@ -464,20 +464,20 @@ namespace KJSEmbed {
             return new KToggleAction( parent, name );
 #endif // QT_ONLY
 
-        TTQWidget *w = dynamic_cast( parent );
+        TQWidget *w = dynamic_cast( parent );
         if ( !w )
             return 0;
 
-        if ( cname == "TTQHBoxLayout" )
-            return new TTQHBoxLayout( w, 0, -1, name );
-        else if ( cname == "TTQVBoxLayout" )
-            return new TTQVBoxLayout( w, 0, -1, name );
+        if ( cname == "TQHBoxLayout" )
+            return new TQHBoxLayout( w, 0, -1, name );
+        else if ( cname == "TQVBoxLayout" )
+            return new TQVBoxLayout( w, 0, -1, name );
         return 0;
     }
 
-    KJS::Object JSFactory::createOpaque( KJS::ExecState *exec, const TTQString &cname, const KJS::List &args ) {
+    KJS::Object JSFactory::createOpaque( KJS::ExecState *exec, const TQString &cname, const KJS::List &args ) {
 
-        if ( cname == "TTQCanvasText" ) {
+        if ( cname == "TQCanvasText" ) {
                     kdDebug( 80001 ) << "Creating canvas item, type is " << cname << endl;
 
                     JSOpaqueProxy *prx = 0;
@@ -490,11 +490,11 @@ namespace KJSEmbed {
 
                         if ( arg0 ) {
 
-                            TTQObject * obj0 = arg0->object();
+                            TQObject * obj0 = arg0->object();
 
-                            if ( obj0->inherits( "TTQCanvas" ) ) {
-                                TTQCanvas * parent = ( TTQCanvas * ) ( obj0 );
-                                prx = new JSOpaqueProxy( new TTQCanvasText( parent ), "TTQCanvasText" );
+                            if ( obj0->inherits( "TQCanvas" ) ) {
+                                TQCanvas * parent = ( TQCanvas * ) ( obj0 );
+                                prx = new JSOpaqueProxy( new TQCanvasText( parent ), "TQCanvasText" );
 
                                 KJS::Object proxyObj( prx );
                                 TQCanvasItemImp::addBindings( exec, proxyObj );
@@ -511,17 +511,17 @@ namespace KJSEmbed {
 
                     } else if ( args.size() == 2 ) {
 
-                        TTQString arg0 = args[ 0 ].toString( exec ).qstring();
+                        TQString arg0 = args[ 0 ].toString( exec ).qstring();
                         JSObjectProxy *arg1 = JSProxy::toObjectProxy( args[ 1 ].imp() );
 
                         if ( arg1 ) {
 
-                            TTQString arg0 = args[ 0 ].toString( exec ).qstring();
-                            TTQObject *obj1 = arg1->object();
+                            TQString arg0 = args[ 0 ].toString( exec ).qstring();
+                            TQObject *obj1 = arg1->object();
 
-                            if ( obj1->inherits( "TTQCanvas" ) ) {
-                                TTQCanvas * parent = ( TTQCanvas * ) ( obj1 );
-                                prx = new JSOpaqueProxy( new TTQCanvasText( parent ), "TTQCanvasText" );
+                            if ( obj1->inherits( "TQCanvas" ) ) {
+                                TQCanvas * parent = ( TQCanvas * ) ( obj1 );
+                                prx = new JSOpaqueProxy( new TQCanvasText( parent ), "TQCanvasText" );
 
                                 KJS::Object proxyObj( prx );
                                 TQCanvasItemImp::addBindings( exec, proxyObj );
@@ -542,9 +542,9 @@ namespace KJSEmbed {
         return KJS::Object();
     }
 
-    KJS::Object JSFactory::createValue( KJS::ExecState *exec, const TTQString &cname, const KJS::List & args ) {
+    KJS::Object JSFactory::createValue( KJS::ExecState *exec, const TQString &cname, const KJS::List & args ) {
         if ( cname == "Image" ) {
-            TTQImage img = TTQImage();
+            TQImage img = TQImage();
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( img );
             KJS::Object proxyObj( prx );
@@ -552,7 +552,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Pixmap" ) {
-            TTQPixmap pix = TTQPixmap();
+            TQPixmap pix = TQPixmap();
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( pix );
             KJS::Object proxyObj( prx );
@@ -560,7 +560,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Brush" ) {
-            TTQBrush brsh;
+            TQBrush brsh;
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( brsh );
             KJS::Object proxyObj( prx );
@@ -568,7 +568,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Pen" ) {
-            TTQPen pen;
+            TQPen pen;
             JSValueProxy *prx = new JSValueProxy( );
             prx->setValue( pen );
             KJS::Object proxyObj( prx );
@@ -576,7 +576,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Rect" ) {
-            TTQRect rect;
+            TQRect rect;
             if ( args.size() == 4 ) {
                 rect.setX( extractInt( exec, args, 0 ) );
                 rect.setY( extractInt( exec, args, 1 ) );
@@ -590,7 +590,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Point" ) {
-            TTQPoint point;
+            TQPoint point;
             if ( args.size() == 2 ) {
                 point.setX( extractInt( exec, args, 0 ) );
                 point.setY( extractInt( exec, args, 1 ) );
@@ -602,7 +602,7 @@ namespace KJSEmbed {
             return proxyObj;
         }
         if ( cname == "Size" ) {
-            TTQSize size;
+            TQSize size;
             if ( args.size() == 2 ) {
                 size.setWidth( extractInt( exec, args, 0 ) );
                 size.setHeight( extractInt( exec, args, 1 ) );
@@ -618,21 +618,21 @@ namespace KJSEmbed {
         return KJS::Object();
     }
 
-    TTQWidget *JSFactory::createWidget( const TTQString &cname, TTQWidget *pw, const char *name ) {
-        if ( cname == "TTQSplitter" )
-            return new TTQSplitter( pw, name );
-        else if ( cname == "TTQMainWindow" )
-            return new TTQMainWindow( pw, name );
-        else if ( cname == "TTQProgressDialog" )
-            return new TTQProgressDialog( pw, name );
-        else if ( cname == "TTQScrollView" )
-            return new TTQScrollView( pw, name );
-        else if ( cname == "TTQCanvasView" )
-            return new TTQCanvasView( pw, name );
-        else if ( cname == "TTQSplashScreen" ) {
-            TTQPixmap pix( 16, 16 );
+    TQWidget *JSFactory::createWidget( const TQString &cname, TQWidget *pw, const char *name ) {
+        if ( cname == "TQSplitter" )
+            return new TQSplitter( pw, name );
+        else if ( cname == "TQMainWindow" )
+            return new TQMainWindow( pw, name );
+        else if ( cname == "TQProgressDialog" )
+            return new TQProgressDialog( pw, name );
+        else if ( cname == "TQScrollView" )
+            return new TQScrollView( pw, name );
+        else if ( cname == "TQCanvasView" )
+            return new TQCanvasView( pw, name );
+        else if ( cname == "TQSplashScreen" ) {
+            TQPixmap pix( 16, 16 );
             pix.fill();
-            return new TTQSplashScreen( pix );
+            return new TQSplashScreen( pix );
         }
 #ifndef QT_ONLY
         else if ( cname == "KMainWindow" )
@@ -646,19 +646,19 @@ namespace KJSEmbed {
         return 0;
     }
 
-    TTQObject *JSFactory::create( const TTQString &cname, TTQObject *parent, const char *name ) {
+    TQObject *JSFactory::create( const TQString &cname, TQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "KJSEmbedPart::create() name " << name << " class " << cname << endl;
 
         // Factory widgets
-        TTQWidgetFactory wf;
-        TTQWidget *pw = ( parent && parent->isWidgetType() ) ? static_cast( parent ) : 0;
-        TTQWidget *w = wf.createWidget( cname, pw, name );
+        TQWidgetFactory wf;
+        TQWidget *pw = ( parent && parent->isWidgetType() ) ? static_cast( parent ) : 0;
+        TQWidget *w = wf.createWidget( cname, pw, name );
         if ( w ) {
             kdDebug( 80001 ) << "Created from factory" << endl;
             return w;
         }
         // Custom widgets
-        TTQObject *obj;
+        TQObject *obj;
         obj = createWidget( cname, pw, name );
         if ( obj ) {
             if ( !isTQObject( obj->className() ) )
@@ -689,22 +689,22 @@ namespace KJSEmbed {
         return 0;
     }
 
-    KParts::ReadOnlyPart *JSFactory::createROPart( const TTQString &svc, TTQObject *parent, const char *name ) {
+    KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, TQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " parent " << ( long ) parent << endl;
         return createROPart( svc, "'KParts/ReadOnlyPart' in ServiceTypes", parent, name );
     }
 
-    KParts::ReadOnlyPart *JSFactory::createROPart( const TTQString &svc, const TTQString &con,
-            TTQObject *parent, const char *name ) {
+    KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, const TQString &con,
+            TQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent << endl;
 
-        return createROPart( svc, con, parent, name, TTQStringList() );
+        return createROPart( svc, con, parent, name, TQStringList() );
     }
 
-    KParts::ReadOnlyPart *JSFactory::createROPart( const TTQString &svc, const TTQString &con,
-            TTQObject *parent, const char *name,
-            const TTQStringList &args ) {
+    KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, const TQString &con,
+            TQObject *parent, const char *name,
+            const TQStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent
@@ -721,7 +721,7 @@ namespace KJSEmbed {
             return 0;
         }
 
-        TTQObject *obj = fact->create( parent, name, "KParts::ReadOnlyPart", args );
+        TQObject *obj = fact->create( parent, name, "KParts::ReadOnlyPart", args );
         addType( obj->className() );
         return static_cast( obj );
 #else // QT_ONLY
@@ -736,22 +736,22 @@ namespace KJSEmbed {
 
     }
 
-    KParts::ReadWritePart *JSFactory::createRWPart( const TTQString &svc, TTQObject *parent, const char *name ) {
+    KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, TQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " parent " << ( long ) parent << endl;
         return createRWPart( svc, "'KParts/ReadWritePart' in ServiceTypes", parent, name );
     }
 
-    KParts::ReadWritePart *JSFactory::createRWPart( const TTQString &svc, const TTQString &con,
-            TTQObject *parent, const char *name ) {
+    KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, const TQString &con,
+            TQObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent << endl;
 
-        return createRWPart( svc, con, parent, name, TTQStringList() );
+        return createRWPart( svc, con, parent, name, TQStringList() );
     }
 
-    KParts::ReadWritePart *JSFactory::createRWPart( const TTQString &svc, const TTQString &con,
-            TTQObject *parent, const char *name,
-            const TTQStringList &args ) {
+    KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, const TQString &con,
+            TQObject *parent, const char *name,
+            const TQStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con
         << " parent " << ( long ) parent
@@ -768,7 +768,7 @@ namespace KJSEmbed {
             return 0;
         }
 
-        TTQObject *obj = fact->create( parent, name, "KParts::ReadWritePart", args );
+        TQObject *obj = fact->create( parent, name, "KParts::ReadWritePart", args );
         addType( obj->className() );
         return static_cast( obj );
 #else // QT_ONLY
@@ -783,15 +783,15 @@ namespace KJSEmbed {
 
     }
 
-    TTQWidget *JSFactory::loadUI( const TTQString &uiFile, TTQObject *connector, TTQWidget *parent, const char *name ) {
-        return TTQWidgetFactory::create( uiFile, connector, parent, name );
+    TQWidget *JSFactory::loadUI( const TQString &uiFile, TQObject *connector, TQWidget *parent, const char *name ) {
+        return TQWidgetFactory::create( uiFile, connector, parent, name );
     }
 
-    TTQStringList JSFactory::listBindingPlugins( KJS::ExecState *exec, KJS::Object &self ) {
+    TQStringList JSFactory::listBindingPlugins( KJS::ExecState *exec, KJS::Object &self ) {
         Q_UNUSED( exec )
         Q_UNUSED( self )
-        TTQStringList pluginList;
-        TTQStringList allTypes = objtypes.keys();
+        TQStringList pluginList;
+        TQStringList allTypes = objtypes.keys();
         for ( uint idx = 0; idx < allTypes.count(); ++idx ) {
             if ( objtypes[ allTypes[ idx ] ] & TypePlugin )
                 pluginList.append( allTypes[ idx ] );
@@ -799,34 +799,34 @@ namespace KJSEmbed {
         return pluginList;
     }
 
-    bool JSFactory::isTQObject( const TTQString &clazz ) const {
+    bool JSFactory::isTQObject( const TQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return false;
 
         return ( objtypes[ clazz ] & TypeTQObject );
     }
 
-    bool JSFactory::isValue( const TTQString &clazz ) const {
+    bool JSFactory::isValue( const TQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return false;
 
         return objtypes[ clazz ] == TypeValue;
     }
 
-    bool JSFactory::isOpaque( const TTQString &clazz ) const {
+    bool JSFactory::isOpaque( const TQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return false;
         return objtypes[ clazz ] == TypeOpaque;
     }
 
-    void JSFactory::addTQObjectPlugin( const TTQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin ) {
+    void JSFactory::addTQObjectPlugin( const TQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin ) {
         if ( plugin ) {
             addType( classname, TypeTQObjectPlugin );
             d->plugins.insert( classname, plugin );
         }
     }
 
-    void JSFactory::addType( const TTQString &clazz, uint prxtype ) {
+    void JSFactory::addType( const TQString &clazz, uint prxtype ) {
         if ( prxtype == TypeInvalid ) {
             objtypes.remove( clazz );
             return ;
@@ -835,12 +835,12 @@ namespace KJSEmbed {
         objtypes[ clazz ] = prxtype;
     }
 
-    bool JSFactory::isSupported( const TTQString &clazz ) const {
+    bool JSFactory::isSupported( const TQString &clazz ) const {
         kdDebug() << "Checking " << clazz << endl;
         return objtypes.contains( clazz );
     }
 
-    uint JSFactory::proxyType( const TTQString &clazz ) const {
+    uint JSFactory::proxyType( const TQString &clazz ) const {
         if ( !isSupported( clazz ) )
             return TypeInvalid;
         return objtypes[ clazz ];
@@ -856,14 +856,14 @@ namespace KJSEmbed {
         addBindingPluginTypes( exec, parent );
     }
 
-    TTQStringList JSFactory::types() const {
+    TQStringList JSFactory::types() const {
         return objtypes.keys();
     }
 
     void JSFactory::addWidgetFactoryTypes( KJS::ExecState *exec, KJS::Object &parent ) {
-        TTQStringList sl = TTQWidgetFactory::widgets();
+        TQStringList sl = TQWidgetFactory::widgets();
 
-        for ( TTQStringList::Iterator it = sl.begin(); it != sl.end(); ++it ) {
+        for ( TQStringList::Iterator it = sl.begin(); it != sl.end(); ++it ) {
             JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, *it );
             parent.put( exec, KJS::Identifier( KJS::UString( cons->parameter() ) ), KJS::Object( cons ) );
             addType( *it );
@@ -873,9 +873,9 @@ namespace KJSEmbed {
     void JSFactory::addCustomTypes( KJS::ExecState *exec, KJS::Object &parent ) {
         const char * classes[] = {
 
-                                     "TTQSplitter", "TTQScrollView", "TTQCanvasView", "TTQCanvas",
-                                     "TTQObject", "TTQTimer", "TTQSplashScreen", "TTQProgressDialog",
-                                     "TTQLayout", "TTQBoxLayout", "TTQHBoxLayout", "TTQVBoxLayout",
+                                     "TQSplitter", "TQScrollView", "TQCanvasView", "TQCanvas",
+                                     "TQObject", "TQTimer", "TQSplashScreen", "TQProgressDialog",
+                                     "TQLayout", "TQBoxLayout", "TQHBoxLayout", "TQVBoxLayout",
 #ifndef QT_ONLY
                                      "KMainWindow", "KXMLGUIClient", "KSystemTray",
                                      "KAction", "KToggleAction",
@@ -920,10 +920,10 @@ namespace KJSEmbed {
 
     void JSFactory::addOpaqueTypes( KJS::ExecState *exec, KJS::Object &parent ) {
         const char * classes[] = {
-                                     "TTQTextStream",
+                                     "TQTextStream",
                                      "TextStream",
-                                     "TTQCanvasItem",
-                                     "TTQCanvasText",
+                                     "TQCanvasItem",
+                                     "TQCanvasText",
                                      0
                                  };
 
@@ -934,7 +934,7 @@ namespace KJSEmbed {
         }
 
         // Create the custom added types.
-        TTQDictIterator idx( d->opaqueTypes );
+        TQDictIterator idx( d->opaqueTypes );
         for( ; idx.current(); ++idx){
             JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, idx.currentKey() );
             parent.put( exec, KJS::Identifier( KJS::UString( cons->parameter() ) ), KJS::Object( cons ) );
@@ -964,100 +964,100 @@ namespace KJSEmbed {
 
     void JSFactory::addObjectTypes( KJS::ExecState *exec, KJS::Object & parent ) {
         const char * classes[] = {
-                                     "TTQAccel",
-                                     "TTQAccessibleObject",
-                                     "TTQAction",
-                                     "TTQActionGroup",
-                                     "TTQApplication",
+                                     "TQAccel",
+                                     "TQAccessibleObject",
+                                     "TQAction",
+                                     "TQActionGroup",
+                                     "TQApplication",
                                      "TQAquaStyle",
                                      "TQAssistantClient",
                                      "TQAxObject",
                                      "TQAxWidget",
-                                     "TTQButton",
+                                     "TQButton",
                                      "TQCDEStyle",
                                      "TQClipboard",
                                      "TQColorDialog",
-                                     "TTQColorDrag",
-                                     "TTQComboBox",
-                                     "TTQCommonStyle",
+                                     "TQColorDrag",
+                                     "TQComboBox",
+                                     "TQCommonStyle",
                                      "TQCopChannel",
-                                     "TTQDataPump",
-                                     "TTQDateTimeEditBase",
-                                     "TTQDesktopWidget",
-                                     "TTQDns",
-                                     "TTQDockArea",
-                                     "TTQDockWindow",
-                                     "TTQDoubleValidator",
-                                     "TTQDragObject",
-                                     "TTQEditorFactory",
-                                     "TTQErrorMessage",
-                                     "TTQEventLoop",
-                                     "TTQFileDialog",
-                                     "TTQFileIconProvider",
+                                     "TQDataPump",
+                                     "TQDateTimeEditBase",
+                                     "TQDesktopWidget",
+                                     "TQDns",
+                                     "TQDockArea",
+                                     "TQDockWindow",
+                                     "TQDoubleValidator",
+                                     "TQDragObject",
+                                     "TQEditorFactory",
+                                     "TQErrorMessage",
+                                     "TQEventLoop",
+                                     "TQFileDialog",
+                                     "TQFileIconProvider",
                                      "TQFontDialog",
-                                     "TTQFtp",
+                                     "TQFtp",
                                      "TQGLWidget",
-                                     "TTQGridLayout",
-                                     "TTQGridView",
-                                     "TTQHButtonGroup",
-                                     "TTQHGroupBox",
-                                     "TTQHeader",
-                                     "TTQHttp",
-                                     "TTQIconDrag",
-                                     "TTQImageDrag",
+                                     "TQGridLayout",
+                                     "TQGridView",
+                                     "TQHButtonGroup",
+                                     "TQHGroupBox",
+                                     "TQHeader",
+                                     "TQHttp",
+                                     "TQIconDrag",
+                                     "TQImageDrag",
                                      "TQInputDialog",
-                                     "TTQIntValidator",
-                                     "TTQLocalFs",
+                                     "TQIntValidator",
+                                     "TQLocalFs",
                                      "TQMacStyle",
-                                     "TTQMenuBar",
-                                     "TTQMessageBox",
+                                     "TQMenuBar",
+                                     "TQMessageBox",
                                      "TQMotif",
                                      "TQMotifDialog",
-                                     "TTQMotifPlusStyle",
-                                     "TTQMotifStyle",
+                                     "TQMotifPlusStyle",
+                                     "TQMotifStyle",
                                      "TQMotifWidget",
                                      "TQNPInstance",
                                      "TQNPWidget",
-                                     "TTQNetworkOperation",
-                                     "TTQNetworkProtocol",
-                                     "TTQObjectCleanupHandler",
-                                     "TTQPlatinumStyle",
-                                     "TTQProcess",
-                                     "TTQPopupMenu",
-                                     "TTQProgressDialog",
-                                     "TTQRegExpValidator",
+                                     "TQNetworkOperation",
+                                     "TQNetworkProtocol",
+                                     "TQObjectCleanupHandler",
+                                     "TQPlatinumStyle",
+                                     "TQProcess",
+                                     "TQPopupMenu",
+                                     "TQProgressDialog",
+                                     "TQRegExpValidator",
                                      "TQSGIStyle",
-                                     "TTQServerSocket",
+                                     "TQServerSocket",
                                      "TQSessionManager",
-                                     "TTQSignal",
-                                     "TTQSignalMapper",
-                                     "TTQSizeGrip",
-                                     "TTQSocket",
-                                     "TTQSocketNotifier",
-                                     "TTQSound",
-                                     "TTQSqlDatabase",
-                                     "TTQSqlDriver",
-                                     "TTQSqlEditorFactory",
-                                     "TTQSqlForm",
-                                     "TTQStatusBar",
-                                     "TTQStoredDrag",
-                                     "TTQStyle",
-                                     "TTQStyleSheet",
-                                     "TTQTabBar",
-                                     "TTQTabDialog",
-                                     "TTQTextDrag",
-                                     "TTQToolBar",
-                                     "TTQToolTipGroup",
+                                     "TQSignal",
+                                     "TQSignalMapper",
+                                     "TQSizeGrip",
+                                     "TQSocket",
+                                     "TQSocketNotifier",
+                                     "TQSound",
+                                     "TQSqlDatabase",
+                                     "TQSqlDriver",
+                                     "TQSqlEditorFactory",
+                                     "TQSqlForm",
+                                     "TQStatusBar",
+                                     "TQStoredDrag",
+                                     "TQStyle",
+                                     "TQStyleSheet",
+                                     "TQTabBar",
+                                     "TQTabDialog",
+                                     "TQTextDrag",
+                                     "TQToolBar",
+                                     "TQToolTipGroup",
                                      "TQTranslator",
-                                     "TTQUriDrag",
-                                     "TTQUrlOperator",
-                                     "TTQVButtonGroup",
-                                     "TTQVGroupBox",
-                                     "TTQValidator",
+                                     "TQUriDrag",
+                                     "TQUrlOperator",
+                                     "TQVButtonGroup",
+                                     "TQVGroupBox",
+                                     "TQValidator",
                                      "TQWSKeyboardHandler",
-                                     "TTQWindowsStyle",
+                                     "TQWindowsStyle",
                                      "TQWindowsXPStyle",
-                                     "TTQWorkspace",
+                                     "TQWorkspace",
                                      "TQXtWidget",
 
                                      0
@@ -1068,7 +1068,7 @@ namespace KJSEmbed {
                 addType( classes[ i ] );
         }
                 // Create the custom added types.
-        TTQDictIterator idx( d->objectTypes );
+        TQDictIterator idx( d->objectTypes );
         for( ; idx.current(); ++idx){
             JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, idx.currentKey() );
             parent.put( exec, KJS::Identifier( KJS::UString( cons->parameter() ) ), KJS::Object( cons ) );
@@ -1076,12 +1076,12 @@ namespace KJSEmbed {
         }
     }
 
-    void JSFactory::registerOpaqueType( const TTQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
+    void JSFactory::registerOpaqueType( const TQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
     {
         d->opaqueTypes.insert(className,bindingFactory);
     } 
 
-    void JSFactory::unregisterOpaqueType( const TTQString & className )
+    void JSFactory::unregisterOpaqueType( const TQString & className )
     {
         d->opaqueTypes.remove(className);
     }
@@ -1100,12 +1100,12 @@ namespace KJSEmbed {
 	   }
 	}
     }
-    void JSFactory::registerObjectType( const TTQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
+    void JSFactory::registerObjectType( const TQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory )
     {
         d->objectTypes.insert(className,bindingFactory);
     } 
 
-    void JSFactory::unregisterObjectType( const TTQString & className )
+    void JSFactory::unregisterObjectType( const TQString & className )
     {
         d->objectTypes.remove(className);
     }
diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h
index 2b77011b..374b5fde 100644
--- a/kjsembed/jsfactory.h
+++ b/kjsembed/jsfactory.h
@@ -29,10 +29,10 @@
 #include 
 #include 
 
-class TTQEvent;
-class TTQObject;
-class TTQWidget;
-class TTQTextStream;
+class TQEvent;
+class TQObject;
+class TQWidget;
+class TQTextStream;
 
 namespace KParts {
     class ReadOnlyPart;
@@ -96,18 +96,18 @@ public:
     //
 
     /** Creates an object of the specified class, then returns a proxy. */
-    KJS::Object create( KJS::ExecState *exec, const TTQString &classname, const KJS::List &args );
+    KJS::Object create( KJS::ExecState *exec, const TQString &classname, const KJS::List &args );
 
     /** Creates a proxy object for the specified target with the specified context. */
-    KJS::Object createProxy( KJS::ExecState *exec, TTQObject *target,
+    KJS::Object createProxy( KJS::ExecState *exec, TQObject *target,
 			     const JSObjectProxy *context=0 ) const;
 
     /** Creates a proxy object for the specified target with the specified context. */
-    KJS::Object createProxy( KJS::ExecState *exec, TTQTextStream *target,
+    KJS::Object createProxy( KJS::ExecState *exec, TQTextStream *target,
 			     const JSObjectProxy *context=0 ) const;
 
     /** Creates a proxy object for the specified target with the specified context. */
-    KJS::Object createProxy( KJS::ExecState *exec, TTQEvent *target,
+    KJS::Object createProxy( KJS::ExecState *exec, TQEvent *target,
 			     const JSObjectProxy *context ) const;
     
     
@@ -115,12 +115,12 @@ public:
     * Registers an opaque proxy factory with the with the factory.
     * To add an opaque type to the system you need to provide a factory based off of @ref KJSEmbed::Bindings::JSBindingBase
      */
-    void registerOpaqueType( const TTQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
+    void registerOpaqueType( const TQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
 
     /**
     * Remove an opaque type from the system.
      */
-    void unregisterOpaqueType( const TTQString &className );
+    void unregisterOpaqueType( const TQString &className );
 
     /**
      * When passed an object for a type handled by an Opaque proxy this method
@@ -130,15 +130,15 @@ public:
     void extendOpaqueProxy( KJS::ExecState *exec, KJS::Object &proxy) const;
 
     /**
-    * Registers a TTQObject proxy factory with the with the factory.
+    * Registers a TQObject proxy factory with the with the factory.
     * To add an opaque type to the system you need to provide a factory based off of @ref KJSEmbed::Bindings::JSBindingBase
      */
-    void registerObjectType( const TTQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
+    void registerObjectType( const TQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory);
 
     /**
     * Remove an opaque type from the system.
      */
-    void unregisterObjectType( const TTQString &className );
+    void unregisterObjectType( const TQString &className );
 
     /**
      * When passed an object for a type handled by an Opaque proxy this method
@@ -158,22 +158,22 @@ public:
      * created is the first offer returned by the trader, and will have the
      * specified parent and name.
      */
-    KParts::ReadOnlyPart *createROPart( const TTQString &svc, TTQObject *parent=0, const char *name=0 );
+    KParts::ReadOnlyPart *createROPart( const TQString &svc, TQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadOnlyPart that views the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadOnlyPart *createROPart( const TTQString &svc, const TTQString &constraint,
-					TTQObject *parent=0, const char *name=0 );
+    KParts::ReadOnlyPart *createROPart( const TQString &svc, const TQString &constraint,
+					TQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadOnlyPart that views the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadOnlyPart *createROPart( const TTQString &svc, const TTQString &constraint,
-					TTQObject *parent, const char *name,
-					const TTQStringList &args );
+    KParts::ReadOnlyPart *createROPart( const TQString &svc, const TQString &constraint,
+					TQObject *parent, const char *name,
+					const TQStringList &args );
 
     /**
      * Creates a ReadWritePart that edits the specified service type. The
@@ -181,34 +181,34 @@ public:
      * created is the first offer returned by the trader, and will have the
      * specified parent and name.
      */
-    KParts::ReadWritePart *createRWPart( const TTQString &svc, TTQObject *parent=0, const char *name=0 );
+    KParts::ReadWritePart *createRWPart( const TQString &svc, TQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadWritePart that edits the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadWritePart *createRWPart( const TTQString &svc, const TTQString &constraint,
-					 TTQObject *parent=0, const char *name=0 );
+    KParts::ReadWritePart *createRWPart( const TQString &svc, const TQString &constraint,
+					 TQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a ReadWritePart that edits the specified service type and matches
      * the specified constraint.
      */
-    KParts::ReadWritePart *createRWPart( const TTQString &svc, const TTQString &constraint,
-					 TTQObject *parent, const char *name,
-					 const TTQStringList &args );
+    KParts::ReadWritePart *createRWPart( const TQString &svc, const TQString &constraint,
+					 TQObject *parent, const char *name,
+					 const TQStringList &args );
 
     /**
      * Loads the widget defined in the specified .ui file. If the widget
      * cannot be created then 0 is returned.
      */
-    TTQWidget *loadUI( const TTQString &uiFile, TTQObject *connector=0, TTQWidget *parent=0, const char *name=0 );
+    TQWidget *loadUI( const TQString &uiFile, TQObject *connector=0, TQWidget *parent=0, const char *name=0 );
 
     /**
     * Queries KTrader for a plugin that provides the asked for object binding.
     *If the binding was added the object is returned, otherwise a KJS::Null is.
     */
-    TTQStringList listBindingPlugins( KJS::ExecState *exec, KJS::Object &self);
+    TQStringList listBindingPlugins( KJS::ExecState *exec, KJS::Object &self);
     //
     // Methods that tell the factory how to handle different classes.
     //
@@ -216,48 +216,48 @@ public:
     * Adds a binding plugin type to the list of available types the factory can create.
     */
     void addBindingPluginTypes(KJS::ExecState *exec, KJS::Object &parent);
-    bool isBindingPlugin(const TTQString &classname) const;
+    bool isBindingPlugin(const TQString &classname) const;
     /**
     * Creates the actual object from the binding plugin.
     */
-    KJS::Object createBindingPlugin(KJS::ExecState *exec, const TTQString &classname, const KJS::List &args );
+    KJS::Object createBindingPlugin(KJS::ExecState *exec, const TQString &classname, const KJS::List &args );
     /**
      * Returns true iff the factory knows the type of proxy to use for the
      * class with the name specified.
      */
-    bool isSupported( const TTQString &clazz ) const;
+    bool isSupported( const TQString &clazz ) const;
 
     /**
      * Returns true iff the class with the specified name is handled with the
-     * TTQObject proxy type.
+     * TQObject proxy type.
      */
-    bool isTQObject( const TTQString &clazz ) const;
+    bool isTQObject( const TQString &clazz ) const;
 
     /**
      * Returns true iff the class with the specified name is handled with the
      * value proxy type.
      */
-    bool isValue( const TTQString &clazz ) const;
+    bool isValue( const TQString &clazz ) const;
 
     /**
      * Returns true iff the class with the specified name is handled with the
      * opaque proxy type.
      */
-    bool isOpaque( const TTQString &clazz ) const;
+    bool isOpaque( const TQString &clazz ) const;
 
     /**
      * Returns the ProxyType of the class with the specified name. If the
      * named class is not known to the interpreter then TypeInvalid is
      * returned.
      */
-    uint proxyType( const TTQString &clazz ) const;
+    uint proxyType( const TQString &clazz ) const;
 
 
     /**
      *Allows adding of an already loaded binding plugin for a certain class type
      *
      */
-    void addTQObjectPlugin(const TTQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin);
+    void addTQObjectPlugin(const TQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin);
 
     void addBindingsPlugin(KJS::ExecState *exec, KJS::Object &target) const;
 
@@ -266,58 +266,58 @@ public:
      * class. Note that you can remove support for a type by using this method
      * with TypeInvalid.
      */
-    void addType( const TTQString &clazz, uint proxytype=JSFactory::TypeTQObject );
+    void addType( const TQString &clazz, uint proxytype=JSFactory::TypeTQObject );
 
     /** Adds the types defined by the factory to the specified parent. */
     void addTypes( KJS::ExecState *exec, KJS::Object &parent );
 
-    TTQStringList types() const;
+    TQStringList types() const;
 
 protected:
     /** Adds custom bindings to the specified proxy object. */
     KJS::Object extendProxy( KJS::ExecState *exec, KJS::Object &target ) const;
 
     /** Creates an instance of the named class and returns it in a JSValueProxy. */
-    KJS::Object createValue( KJS::ExecState *exec, const TTQString &cname, const KJS::List &args );
+    KJS::Object createValue( KJS::ExecState *exec, const TQString &cname, const KJS::List &args );
 
     /**
-     * Creates an instance of a TTQObject subclass. If the instance cannot be
+     * Creates an instance of a TQObject subclass. If the instance cannot be
      * created then 0 is returned.
      */
-    TTQObject *create( const TTQString &classname, TTQObject *parent=0, const char *name=0  );
+    TQObject *create( const TQString &classname, TQObject *parent=0, const char *name=0  );
 
     /** Creates an instance of the named class and returns it in a JSOpaqueProxy. */
-    KJS::Object createOpaque( KJS::ExecState *exec, const TTQString &cname, const KJS::List &args );
+    KJS::Object createOpaque( KJS::ExecState *exec, const TQString &cname, const KJS::List &args );
 
 
-    /** Creates an instance of the named binding TTQObject. */
-    TTQObject *createBinding( const TTQString &cname, TTQObject *parent, const char *name );
+    /** Creates an instance of the named binding TQObject. */
+    TQObject *createBinding( const TQString &cname, TQObject *parent, const char *name );
 
     /**
-     * Creates an instance of the named TTQObject. This method is only used for
+     * Creates an instance of the named TQObject. This method is only used for
      * non-widget objects.
      */
-    TTQObject *createObject( const TTQString &cname, TTQObject *parent, const char *name );
+    TQObject *createObject( const TQString &cname, TQObject *parent, const char *name );
 
     /**
-     * Creates an instance of the named TTQWidget. Note that this method is only
-     * used to create widgets that are not supported by TTQWidgetFactory.
+     * Creates an instance of the named TQWidget. Note that this method is only
+     * used to create widgets that are not supported by TQWidgetFactory.
      */
-    TTQWidget *createWidget( const TTQString &cname, TTQWidget *parent, const char *name );
+    TQWidget *createWidget( const TQString &cname, TQWidget *parent, const char *name );
 
 private:
     
-    /** Adds the types defined by TTQWidgetFactory to the specified parent. */
+    /** Adds the types defined by TQWidgetFactory to the specified parent. */
     void addWidgetFactoryTypes( KJS::ExecState *exec, KJS::Object &parent );
 
-    /** Adds support for custom TTQObject types to the specified parent. */
+    /** Adds support for custom TQObject types to the specified parent. */
     void addCustomTypes( KJS::ExecState *exec, KJS::Object &parent );
 
-    /** Adds support for TTQObject binding types to the specified parent. */
+    /** Adds support for TQObject binding types to the specified parent. */
     void addBindingTypes( KJS::ExecState *exec, KJS::Object &parent );
 
     /**
-     * Adds support for any TTQObject types that are known about, but have no
+     * Adds support for any TQObject types that are known about, but have no
      * custom support (and no constructor).
      */
     void addObjectTypes( KJS::ExecState *exec, KJS::Object &parent );
@@ -329,7 +329,7 @@ private:
 private:
     KJSEmbedPart *jspart;
     JSEventMapper *evmapper;
-    TTQMap objtypes;
+    TQMap objtypes;
     class JSFactoryPrivate *d;
 };
 
diff --git a/kjsembed/jsfactory_imp.cpp b/kjsembed/jsfactory_imp.cpp
index dd999610..e987d020 100644
--- a/kjsembed/jsfactory_imp.cpp
+++ b/kjsembed/jsfactory_imp.cpp
@@ -35,7 +35,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-JSFactoryImp::JSFactoryImp( KJS::ExecState *exec, JSFactory *jsfact, int mid, const TTQString &p )
+JSFactoryImp::JSFactoryImp( KJS::ExecState *exec, JSFactory *jsfact, int mid, const TQString &p )
     : JSProxyImp(exec), fact(jsfact), id(mid), param(p), defaultVal()
 {
     setName( KJS::Identifier(KJS::UString(param)) );
@@ -50,7 +50,7 @@ KJS::Object JSFactoryImp::construct( KJS::ExecState *exec, const KJS::List &args
     if ( id != NewInstance ) {
 	kdDebug(80001) << "JSFactoryImp has no such constructor, id " << id << endl;
 
-	TTQString msg = i18n( "JSFactoryImp has no constructor with id '%1'." ).arg( id );
+	TQString msg = i18n( "JSFactoryImp has no constructor with id '%1'." ).arg( id );
   return throwError(exec, msg,KJS::ReferenceError);
     }
 
@@ -71,8 +71,8 @@ KJS::Value JSFactoryImp::defaultValue( KJS::ExecState *exec, KJS::Type hint ) co
 
 KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args )
 {
-    TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null;
-    TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::null;
+    TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null;
+    TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null;
 
     kdDebug( 80001 ) << "JSFactoryImp::call() " << id << endl;
     KJS::Object err;
@@ -81,20 +81,20 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     case MethodLoadUI:
     {
 	JSObjectProxy *cproxy = JSProxy::toObjectProxy( args[1].imp() );
-	TTQObject *cqo = cproxy ? cproxy->object() : 0;
+	TQObject *cqo = cproxy ? cproxy->object() : 0;
 
 	JSObjectProxy *proxy = JSProxy::toObjectProxy( args[2].imp() );
-	TTQWidget *qw = proxy ? proxy->widget() : 0;
-	TTQWidget *obj = fact->loadUI( arg0, cqo, qw, arg1.latin1() );
+	TQWidget *qw = proxy ? proxy->widget() : 0;
+	TQWidget *obj = fact->loadUI( arg0, cqo, qw, arg1.latin1() );
 	if ( obj )
 	{
 		KJS::Object parentObject = fact->createProxy( exec, obj );
 	// Add properties for child widgets.
-		const TTQObjectList *lst = obj->children();
+		const TQObjectList *lst = obj->children();
 		if ( lst )
 		{
-			TTQObjectListIt it( *lst );
-			TTQObject *child;
+			TQObjectListIt it( *lst );
+			TQObject *child;
 			while ( (child = it.current()) != 0 )
 			{
 				publishChildren( child, parentObject);
@@ -104,7 +104,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 		return parentObject;
 	}
 
-	TTQString msg = i18n( "Unable to create ui from file '%1'." ).arg(arg0);
+	TQString msg = i18n( "Unable to create ui from file '%1'." ).arg(arg0);
   err = throwError(exec, msg,KJS::ReferenceError);
 	break;
     }
@@ -112,8 +112,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     {
 
 	kdDebug(80001) << "MethodCreateROPart called, args.size is " << args.size() << endl;
-	TTQObject *qo = 0;
-	TTQObject *ropart = 0;
+	TQObject *qo = 0;
+	TQObject *ropart = 0;
 
 	if ( args.size() == 3 ) {
 	    JSObjectProxy *proxy = JSProxy::toObjectProxy( args[1].imp() );
@@ -128,7 +128,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 	else if ( args.size() == 5 ) {
 	    JSObjectProxy *proxy = JSProxy::toObjectProxy( args[2].imp() );
 	    qo = proxy ? proxy->object() : 0;
-	    TTQStringList slist = extractTQStringList( exec, args, 4 );
+	    TQStringList slist = extractTQStringList( exec, args, 4 );
 	    ropart = fact->createROPart( arg0, arg1, qo, args[3].toString(exec).ascii(), slist );
 	}
 
@@ -141,7 +141,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 	if ( ropart )
 	    return fact->createProxy( exec, ropart );
 
-	TTQString msg = i18n( "Unable to create read-only part for service '%1'." ).arg(arg0);
+	TQString msg = i18n( "Unable to create read-only part for service '%1'." ).arg(arg0);
   err = throwError(exec, msg,KJS::ReferenceError);
 	break;
     }
@@ -155,8 +155,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     {
 
 	KJS::List l;
-	TTQStringList widgets = TTQWidgetFactory::widgets();
-	for ( TTQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) {
+	TQStringList widgets = TQWidgetFactory::widgets();
+	for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) {
 	    l.append( KJS::String( *it ) );
 	}
 
@@ -186,8 +186,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     case MethodTypes:
     {
 	KJS::List l;
-	TTQStringList types = fact->types();
-	for ( TTQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
+	TQStringList types = fact->types();
+	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
 	    l.append( KJS::String( *it ) );
 	}
 
@@ -203,8 +203,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     {
 
 	kdDebug(80001) << "MethodCreateRWPart called, args.size is " << args.size() << endl;
-	TTQObject *qo = 0;
-	TTQObject *rwpart = 0;
+	TQObject *qo = 0;
+	TQObject *rwpart = 0;
 
 	if ( args.size() == 3 ) {
 	    JSObjectProxy *proxy = JSProxy::toObjectProxy( args[1].imp() );
@@ -226,7 +226,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 	if ( rwpart )
 	    return fact->createProxy( exec, rwpart );
 
-	TTQString msg = i18n( "Unable to create read-write part for service '%1'." ).arg(arg0);
+	TQString msg = i18n( "Unable to create read-write part for service '%1'." ).arg(arg0);
   err = throwError(exec, msg,KJS::ReferenceError);
 	break;
     }
@@ -245,7 +245,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
     default:
     {
 	kdWarning() << "JSBuiltInImp has no method " << id << endl;
-	TTQString msg = i18n( "JSFactoryImp has no method with id '%1'." ).arg( id );
+	TQString msg = i18n( "JSFactoryImp has no method with id '%1'." ).arg( id );
   err = throwError(exec, msg,KJS::ReferenceError);
     }
     }
@@ -253,9 +253,9 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
 }
 
 
-void JSFactoryImp::publishChildren(TTQObject *obj, KJS::Object &parent)
+void JSFactoryImp::publishChildren(TQObject *obj, KJS::Object &parent)
 {
-	TTQString name = obj->name();
+	TQString name = obj->name();
 	name.remove(":");
 	name.remove(" ");
 	name.remove("<");
@@ -264,9 +264,9 @@ void JSFactoryImp::publishChildren(TTQObject *obj, KJS::Object &parent)
 	JSProxy::toProxy( newParent.imp() ) ->setOwner( JSProxy::JavaScript );
 
 	// Hack to publish TQToolBoxes children
-	TTQToolBox *box = dynamic_cast(obj);
-	TTQTabWidget *tab = dynamic_cast(obj);
-	TTQWizard *wiz = dynamic_cast(obj);
+	TQToolBox *box = dynamic_cast(obj);
+	TQTabWidget *tab = dynamic_cast(obj);
+	TQWizard *wiz = dynamic_cast(obj);
 
 	if( box ) {
 		int count = box->count();
@@ -281,10 +281,10 @@ void JSFactoryImp::publishChildren(TTQObject *obj, KJS::Object &parent)
 		for( int idx = 0; idx < count; ++idx)
 		publishChildren(wiz->page(idx),newParent);
 	} else {
-		const TTQObjectList *lst = obj->children();
+		const TQObjectList *lst = obj->children();
 		if ( lst ) {
-			TTQObjectListIt it( *lst );
-			TTQObject *child;
+			TQObjectListIt it( *lst );
+			TQObject *child;
 			while ( (child = it.current()) != 0 ) {
 				publishChildren( child, newParent);
 				++it;
diff --git a/kjsembed/jsfactory_imp.h b/kjsembed/jsfactory_imp.h
index fa23127d..ee4c59f0 100644
--- a/kjsembed/jsfactory_imp.h
+++ b/kjsembed/jsfactory_imp.h
@@ -60,10 +60,10 @@ public:
 	MethodCreateObject
     };
 
-    JSFactoryImp( KJS::ExecState *exec, JSFactory *fact, int id, const TTQString ¶m=TTQString::null );
+    JSFactoryImp( KJS::ExecState *exec, JSFactory *fact, int id, const TQString ¶m=TQString::null );
     ~JSFactoryImp();
 
-    TTQString parameter() const { return param; }
+    TQString parameter() const { return param; }
 
     /** Returns true iff this object implements the construct function. */
     virtual bool implementsConstruct() const { return true; }
@@ -83,10 +83,10 @@ public:
     JSFactory *factory() const { return fact; }
 
 private:
-    void publishChildren(TTQObject *obj, KJS::Object &parent);
+    void publishChildren(TQObject *obj, KJS::Object &parent);
     JSFactory *fact;
     uint id;
-    TTQString param;
+    TQString param;
     KJS::Value defaultVal;
     class JSFactoryImpPrivate *d;
 };
diff --git a/kjsembed/jsobjecteventproxy.cpp b/kjsembed/jsobjecteventproxy.cpp
index 3ebdee1f..acb2ad10 100644
--- a/kjsembed/jsobjecteventproxy.cpp
+++ b/kjsembed/jsobjecteventproxy.cpp
@@ -34,10 +34,10 @@
 namespace KJSEmbed {
 
 // We'll need to increase this if we need to support any custom events
-static const TTQEvent::Type TQEVENT_TYPE_MAX = TTQEvent::TabletRelease;
+static const TQEvent::Type TQEVENT_TYPE_MAX = TQEvent::TabletRelease;
 
 JSObjectEventProxy::JSObjectEventProxy( JSObjectProxy *parent, const char *name )
-    : TTQObject( parent->object(), name ? name : "jsobjecteventproxy" ),
+    : TQObject( parent->object(), name ? name : "jsobjecteventproxy" ),
       proxy( parent ), eventMask( TQEVENT_TYPE_MAX ), refcount(0)
 {
     eventMask.fill( false );
@@ -47,12 +47,12 @@ JSObjectEventProxy::~JSObjectEventProxy()
 {
 }
 
-bool JSObjectEventProxy::isFiltered( TTQEvent::Type t ) const
+bool JSObjectEventProxy::isFiltered( TQEvent::Type t ) const
 {
     return eventMask.testBit( t );
 }
 
-void JSObjectEventProxy::addFilter( TTQEvent::Type t )
+void JSObjectEventProxy::addFilter( TQEvent::Type t )
 {
     if ( !refcount )
 	proxy->object()->installEventFilter( this );
@@ -65,7 +65,7 @@ void JSObjectEventProxy::addFilter( TTQEvent::Type t )
     kdDebug(80001) << "JSObjectEventProxy::addFilter done" << endl;
 }
 
-void JSObjectEventProxy::removeFilter( TTQEvent::Type t )
+void JSObjectEventProxy::removeFilter( TQEvent::Type t )
 {
     eventMask.clearBit( t );
     refcount--;
@@ -77,7 +77,7 @@ void JSObjectEventProxy::removeFilter( TTQEvent::Type t )
     kdDebug(80001) << "JSObjectEventProxy::removeFilter done" << endl;
 }
 
-bool JSObjectEventProxy::eventFilter( TTQObject * /*watched*/, TTQEvent *e )
+bool JSObjectEventProxy::eventFilter( TQObject * /*watched*/, TQEvent *e )
 {
     if ( isFiltered(e->type()) )
 	callHandler( e );
@@ -85,7 +85,7 @@ bool JSObjectEventProxy::eventFilter( TTQObject * /*watched*/, TTQEvent *e )
     return false;
 }
 
-KJS::Value JSObjectEventProxy::callHandler( TTQEvent *e )
+KJS::Value JSObjectEventProxy::callHandler( TQEvent *e )
 {
 // Be careful enabling this as if there are a lot of events then the event loop times
 // out and the app crashes with 'Alarm Clock'.
@@ -98,7 +98,7 @@ KJS::Value JSObjectEventProxy::callHandler( TTQEvent *e )
     KJS::Object fun = jsobj.get(exec, *id ).toObject( exec );
 
     if ( !fun.implementsCall() ) {
-      TTQString msg = i18n( "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4." )
+      TQString msg = i18n( "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4." )
 	  .arg(jsobj.className().ascii()).arg(id->ascii()).arg(fun.className().ascii()).arg(e->type());
       return throwError(exec, msg, KJS::TypeError );
     }
diff --git a/kjsembed/jsobjecteventproxy.h b/kjsembed/jsobjecteventproxy.h
index e05c2b1f..e21e4cb8 100644
--- a/kjsembed/jsobjecteventproxy.h
+++ b/kjsembed/jsobjecteventproxy.h
@@ -32,7 +32,7 @@ namespace KJSEmbed {
 class JSObjectProxy;
 
 /**
- * Filters events for a TTQObject and forwards them to a JS handler.
+ * Filters events for a TQObject and forwards them to a JS handler.
  *
  * @version $Id$
  * @author Richard Moore, rich@kde.org
@@ -46,26 +46,26 @@ public:
     virtual ~JSObjectEventProxy();
 
     /** Returns true iff we forward the event type to JS. */
-    bool isFiltered( TTQEvent::Type t ) const;
+    bool isFiltered( TQEvent::Type t ) const;
 
     /** Adds an event type to those we forward to JS. */
-    void addFilter( TTQEvent::Type t );
+    void addFilter( TQEvent::Type t );
 
     /**
      * Removes an event type from those we forward to JS. If there are no
      * event types left to forward then we self-destruct.
      */
-    void removeFilter( TTQEvent::Type t );
+    void removeFilter( TQEvent::Type t );
 
     /** Reimplemented to forward events to JS. */
-    bool eventFilter ( TTQObject *watched, TTQEvent *e );
+    bool eventFilter ( TQObject *watched, TQEvent *e );
 
 protected:
-    KJS::Value callHandler( TTQEvent *e );
+    KJS::Value callHandler( TQEvent *e );
 
 private:
     JSObjectProxy *proxy;
-    TTQBitArray eventMask;
+    TQBitArray eventMask;
     uint refcount;
     class JSObjectEventProxyPrivate *d;
 };
diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp
index e7d1e5d0..7011e338 100644
--- a/kjsembed/jsobjectproxy.cpp
+++ b/kjsembed/jsobjectproxy.cpp
@@ -53,19 +53,19 @@ namespace KJSEmbed {
 
     typedef Bindings::JSObjectProxyImp JSObjectProxyImp;
 
-    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *r, const JSSecurityPolicy *sp )
+    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *r, const JSSecurityPolicy *sp )
             : JSProxy( JSProxy::ObjectProxy ),
     jspart( part ), js( part->interpreter() ), obj( target ), root( r ) {
         policy = sp ? sp : JSSecurityPolicy::defaultPolicy();
     }
 
-    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *r )
+    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *r )
             : JSProxy( JSProxy::ObjectProxy ),
     jspart( part ), js( part->interpreter() ), obj( target ), root( r ) {
         policy = JSSecurityPolicy::defaultPolicy();
     }
 
-    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TTQObject *target )
+    JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target )
             : JSProxy( JSProxy::ObjectProxy ),
     jspart( part ), js( part->interpreter() ), obj( target ), root( target ) {
         policy = JSSecurityPolicy::defaultPolicy();
@@ -93,7 +93,7 @@ namespace KJSEmbed {
             return KJS::UString();
         }
 
-        TTQString s( "%1 (%2)" );
+        TQString s( "%1 (%2)" );
         s = s.arg( obj ? obj->name() : "Dead Object" );
         s = s.arg( obj ? obj->className() : "" );
         return KJS::UString( s );
@@ -115,11 +115,11 @@ namespace KJSEmbed {
             kdDebug( 80001 ) << "JS getting '" << p.ascii() << endl;
 
             // Properties
-            TTQString prop = p.ustring().qstring();
-            TTQMetaObject *meta = obj->metaObject();
+            TQString prop = p.ustring().qstring();
+            TQMetaObject *meta = obj->metaObject();
 
             if ( meta->findProperty( p.ascii(), true ) != -1 ) {
-                TTQVariant val = obj->property( prop.ascii() );
+                TQVariant val = obj->property( prop.ascii() );
                 kdDebug( 80001 ) << "JS getting '" << p.ascii() << "' ( " << val.typeName() << ")" << endl;
 
                 return convertToValue( exec, val );
@@ -149,10 +149,10 @@ namespace KJSEmbed {
         }
 
         // Properties
-        TTQMetaObject *meta = obj->metaObject();
+        TQMetaObject *meta = obj->metaObject();
         int propIndex = meta->findProperty( p.ascii(), true );
         if ( propIndex != -1 ) {
-            TTQVariant val = convertToVariant( exec, v );
+            TQVariant val = convertToVariant( exec, v );
             if ( meta->property(propIndex, true)->isEnumType() ) {
                 obj->setProperty( p.ascii(), val.toUInt() );
             } else if ( val.isValid() ) {
@@ -199,7 +199,7 @@ namespace KJSEmbed {
 
     void JSObjectProxy::addBindingsClass( KJS::ExecState *exec, KJS::Object & /*object*/ ) {
         KJS::Identifier clazzid;
-        TTQObject *o = obj;
+        TQObject *o = obj;
         Bindings::BindingObject *bo = dynamic_cast( o );
         if ( bo ) {
             clazzid = KJS::Identifier( bo->jsClassName() ? bo->jsClassName() : obj->className() );
@@ -227,14 +227,14 @@ namespace KJSEmbed {
     }
 
     void JSObjectProxy::addBindingsEnum( KJS::ExecState *exec, KJS::Object &object ) {
-        TTQMetaObject * mo = obj->metaObject();
-        TTQStrList enumList = mo->enumeratorNames( true );
+        TQMetaObject * mo = obj->metaObject();
+        TQStrList enumList = mo->enumeratorNames( true );
 
-        for ( TTQStrListIterator iter( enumList ); iter.current(); ++iter ) {
+        for ( TQStrListIterator iter( enumList ); iter.current(); ++iter ) {
 
             const TQMetaEnum *me = mo->enumerator( iter.current(), true );
             for ( uint i = 0 ; i < me->count ; i++ ) {
-                TTQCString key( ( me->items ) [ i ].key );
+                TQCString key( ( me->items ) [ i ].key );
                 int val = ( me->items ) [ i ].value;
                 object.put( exec, key.data(), KJS::Number( val ), KJS::ReadOnly );
             }
@@ -243,16 +243,16 @@ namespace KJSEmbed {
 
     void JSObjectProxy::addBindingsSlots( KJS::ExecState *exec, KJS::Object &object ) {
         // Publish slots with supported signatures as methods.
-        TTQMetaObject * mo = obj->metaObject();
-        TTQStrList slotList( mo->slotNames( true ) );
-        for ( TTQStrListIterator iter( slotList ); iter.current(); ++iter ) {
+        TQMetaObject * mo = obj->metaObject();
+        TQStrList slotList( mo->slotNames( true ) );
+        for ( TQStrListIterator iter( slotList ); iter.current(); ++iter ) {
             addSlotBinding( iter.current(), exec, object );
         }
     }
 
-    void JSObjectProxy::addSlotBinding( const TTQCString &name, KJS::ExecState *exec, KJS::Object &object ) {
+    void JSObjectProxy::addSlotBinding( const TQCString &name, KJS::ExecState *exec, KJS::Object &object ) {
         // Lookup and bind slot
-        TTQMetaObject * mo = obj->metaObject();
+        TQMetaObject * mo = obj->metaObject();
         int slotid = mo->findSlot( name.data(), true );
         if ( slotid == -1 )
             return ;
@@ -267,14 +267,14 @@ namespace KJSEmbed {
         if ( id < 0 )
             return ;
 
-        TTQCString jsname = name;
+        TQCString jsname = name;
         jsname.detach();
-        jsname.replace( TTQRegExp( "\\([^\\)]*\\)" ), "" );
+        jsname.replace( TQRegExp( "\\([^\\)]*\\)" ), "" );
 
         // Find the return type, we only care if it is a pointer type
         const TQUMethod *m = md->method;
         const char *retclass = 0;
-        TTQCString ptr( "ptr" );
+        TQCString ptr( "ptr" );
 
         if ( m->count && ( m->parameters->inOut == TQUParameter::Out )
                 && ( ptr == m->parameters->type->desc() ) ) {
@@ -291,8 +291,8 @@ namespace KJSEmbed {
             object.put( exec, KJS::Identifier( jsname.data() ), KJS::Object( imp ) );
         } else {
             // The identifier has already been used
-            TTQString s( name );
-            TTQCString cs = TTQString( "%1%2" ).arg( jsname ).arg( s.contains( ',' ) + 1 ).ascii();
+            TQString s( name );
+            TQCString cs = TQString( "%1%2" ).arg( jsname ).arg( s.contains( ',' ) + 1 ).ascii();
             //kdDebug(80001) << "Method " << jsname << " exists, using " << cs << " for " << s << endl;
             object.put( exec, KJS::Identifier( cs.data() ), KJS::Object( imp ) );
         }
diff --git a/kjsembed/jsobjectproxy.h b/kjsembed/jsobjectproxy.h
index fde60c61..b8ead87c 100644
--- a/kjsembed/jsobjectproxy.h
+++ b/kjsembed/jsobjectproxy.h
@@ -41,19 +41,19 @@ class KJSEmbedPart;
 class JSObjectEventProxy;
 
 /**
- * A JS object that provides a binding to a TTQObject.
+ * A JS object that provides a binding to a TQObject.
  * 
      Introduction
      
  * This class defines a @ref KJS::ObjectImp that allows scripts to access
- * the properties of a TTQObject. The scripts can also create child objects,
+ * the properties of a TQObject. The scripts can also create child objects,
  * load dialogs from .ui files created by Designer and navigate the  object
- * tree in a similar manner to the DCOP/TTQObject bridge.
+ * tree in a similar manner to the DCOP/TQObject bridge.
  * 
      Example Usage
      
  * The following example creates a @ref KJS::ObjectImp that provides
- * a binding to the properties of a @ref TTQLineEdit . This binding is
+ * a binding to the properties of a @ref TQLineEdit . This binding is
  * then used to create a property 'edit' for the object 'jsparent'.
  * 
        *
- *   TTQLineEdit *edit = new TTQLineEdit();
+ *   TQLineEdit *edit = new TQLineEdit();
  *   KJSEmbed::JSObjectProxy *proxy = new KJSEmbed::JSObjectProxy( js, edit );
  *   jsparent.put( js->globalExec(), "edit", proxy );
  *
@@ -82,24 +82,24 @@ class KJSEMBED_EXPORT JSObjectProxy : public JSProxy
 public:
     /**
      * Create a JS binding to the target object. The binding will allow scripts to
-     * access any TTQObject that is descended the target and no others.
+     * access any TQObject that is descended the target and no others.
      */
-    JSObjectProxy( KJSEmbedPart *part, TTQObject *target );
+    JSObjectProxy( KJSEmbedPart *part, TQObject *target );
 
     /**
      * Create a JS binding to the target object. The binding will allow scripts to
-     * access any TTQObject that is descended from the specified root. If the specified
+     * access any TQObject that is descended from the specified root. If the specified
      * root is 0 then access is granted to all objects.
      */
-    JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *root );
+    JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *root );
 
     /**
      * Create a JS binding to the target object. The binding will allow scripts to
-     * access any TTQObject that is descended from the specified root, according to
+     * access any TQObject that is descended from the specified root, according to
      * the specified @ref JSSecurityPolicy . If the specified root is 0 then access
      * is granted to all objects.
      */
-    JSObjectProxy( KJSEmbedPart *part, TTQObject *target, TTQObject *root, const JSSecurityPolicy *sp );
+    JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *root, const JSSecurityPolicy *sp );
 
     virtual ~JSObjectProxy();
 
@@ -110,24 +110,24 @@ public:
     KJS::Interpreter *interpreter() const { return js; }
 
     /** Returns the root object that defines the limit of the scope of this proxy. */
-    TTQObject *rootObject() const { return root; }
+    TQObject *rootObject() const { return root; }
 
-    /** Returns the TTQObject the proxy is attached to. */
-    TTQObject *object() const { return obj; }
+    /** Returns the TQObject the proxy is attached to. */
+    TQObject *object() const { return obj; }
 
     /** Returns the className of the proxied object */
-    TTQString typeName() const { return obj->className(); }
+    TQString typeName() const { return obj->className(); }
 
-    /** Returns the associated TTQWidget, or 0 if the object is not a widget. */
-    TTQWidget *widget() const
+    /** Returns the associated TQWidget, or 0 if the object is not a widget. */
+    TQWidget *widget() const
 	{
-	    TTQObject *w = obj;
-	    return (w && w->isWidgetType()) ? static_cast(w) : 0;
+	    TQObject *w = obj;
+	    return (w && w->isWidgetType()) ? static_cast(w) : 0;
 	}
 
     //void *toVoidStar() { return obj; }
     //template
-    //T *toNative(){ return dynamic_cast(obj); }
+    //T *toNative(){ return dynamic_cast(obj); }
 
     /** Returns true iff the content of this proxy inherits the specified base-class. */
     bool inherits( const char *clazz ) { return obj->isA( clazz ); }
@@ -152,7 +152,7 @@ public:
     virtual KJS::UString toString( KJS::ExecState *exec ) const;
 
     /**
-     * Adds methods for traversing the TTQObject tree to the specified
+     * Adds methods for traversing the TQObject tree to the specified
      * @ref KJS::Object . Only TQObjects descended from the root specified
      * in the constructor can be reached through JS proxies created with
      * these bindings.
@@ -180,14 +180,14 @@ protected:
 private:
     bool isAllowed( KJS::Interpreter *js ) const;
 
-    void addSlotBinding( const TTQCString &name, KJS::ExecState *exec, KJS::Object &object );
+    void addSlotBinding( const TQCString &name, KJS::ExecState *exec, KJS::Object &object );
 
 private:
     KJSEmbedPart *jspart;
     KJS::Interpreter *js;
-    TTQGuardedPtr obj;
-    TTQGuardedPtr root;
-    TTQGuardedPtr evproxy;
+    TQGuardedPtr obj;
+    TQGuardedPtr root;
+    TQGuardedPtr evproxy;
     const JSSecurityPolicy *policy;
     class JSObjectProxyPrivate *d;
     friend class Bindings::JSObjectProxyImp;
diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp
index 5e11e2c3..5d025bf3 100644
--- a/kjsembed/jsobjectproxy_imp.cpp
+++ b/kjsembed/jsobjectproxy_imp.cpp
@@ -129,19 +129,19 @@ JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec, int mid, JSObjectProxy
 }
 
 JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec,
-				    int mid, const TTQCString &name, JSObjectProxy *parent )
+				    int mid, const TQCString &name, JSObjectProxy *parent )
     : JSProxyImp(exec), id(mid), slotname(name), proxy(parent), obj(parent->obj)
 {
 }
 
 JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec,
-				    int mid, int sid, const TTQCString &name, JSObjectProxy *parent )
+				    int mid, int sid, const TQCString &name, JSObjectProxy *parent )
     : JSProxyImp(exec), id(mid), sigid(sid), slotname(name), proxy(parent), obj(parent->obj)
 {
 }
 
 JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec,
-				    int mid, const char *ret, int sid, const TTQCString &name,
+				    int mid, const char *ret, int sid, const TQCString &name,
 				    JSObjectProxy *parent )
     : JSProxyImp(exec), id(mid), rettype(ret), sigid(sid), slotname(name), proxy(parent), obj(parent->obj)
 {
@@ -154,14 +154,14 @@ JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec,
 KJS::Value JSObjectProxyImp::children( KJS::ExecState *exec, KJS::Object &, const KJS::List & )
 {
     KJS::List items;
-    const TTQObjectList *kids = obj->children();
+    const TQObjectList *kids = obj->children();
     if ( kids ) {
-        TTQObjectList l( *kids );
+        TQObjectList l( *kids );
 
 	for ( uint i = 0 ; i < l.count() ; i++ ) {
-	    TTQObject *child = l.at( i );
-	    TTQCString nm = ( child ? child->name() : "" );
-	    items.append( KJS::String( TTQString(nm) ) );
+	    TQObject *child = l.at( i );
+	    TQCString nm = ( child ? child->name() : "" );
+	    items.append( KJS::String( TQString(nm) ) );
 	}
     }
 
@@ -171,15 +171,15 @@ KJS::Value JSObjectProxyImp::children( KJS::ExecState *exec, KJS::Object &, cons
 KJS::Value JSObjectProxyImp::properties( KJS::ExecState *exec, KJS::Object &, const KJS::List & )
 {
     KJS::List items;
-    TTQMetaObject *mo = obj->metaObject();
-    TTQStrList propList( mo->propertyNames( true ) );
+    TQMetaObject *mo = obj->metaObject();
+    TQStrList propList( mo->propertyNames( true ) );
 
-    for ( TTQStrListIterator iter(propList); iter.current(); ++iter ) {
+    for ( TQStrListIterator iter(propList); iter.current(); ++iter ) {
 
-	TTQCString name = iter.current();
+	TQCString name = iter.current();
 	int propid = mo->findProperty( name.data(), true );
 	if ( propid != -1 ) {
-	    items.append( KJS::String( TTQString(name) ) );
+	    items.append( KJS::String( TQString(name) ) );
 	}
     }
 
@@ -215,7 +215,7 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons
     switch( id ) {
 	case MethodParent:
 	{
-	    TTQObject *po = obj->parent();
+	    TQObject *po = obj->parent();
 	    if ( po && proxy->securityPolicy()->isObjectAllowed( proxy, po ) )
 		return proxy->part()->factory()->createProxy( exec, po, proxy );
 
@@ -224,7 +224,7 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons
 	break;
 	case MethodChildCount:
 	{
-	    const TTQObjectList *kids = obj->children();
+	    const TQObjectList *kids = obj->children();
 	    return kids ? KJS::Number( kids->count() )	: KJS::Number(0);
 	}
 	break;
@@ -295,13 +295,13 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons
 KJS::Value JSObjectProxyImp::signalz( KJS::ExecState *exec, KJS::Object &, const KJS::List & )
 {
     KJS::List items;
-    TTQMetaObject *mo = obj->metaObject();
-    TTQStrList signalList( mo->signalNames( true ) );
+    TQMetaObject *mo = obj->metaObject();
+    TQStrList signalList( mo->signalNames( true ) );
 
-    for ( TTQStrListIterator iter(signalList); iter.current(); ++iter ) {
+    for ( TQStrListIterator iter(signalList); iter.current(); ++iter ) {
 
-	TTQCString name = iter.current();
-	TTQString nm( name );
+	TQCString name = iter.current();
+	TQString nm( name );
 
 	int signalid = mo->findSignal( name.data(), true );
 	if ( (signalid != -1) && (mo->signal( signalid, true )->access == TQMetaData::Public) )
@@ -314,13 +314,13 @@ KJS::Value JSObjectProxyImp::signalz( KJS::ExecState *exec, KJS::Object &, const
 KJS::Value JSObjectProxyImp::slotz( KJS::ExecState *exec, KJS::Object &, const KJS::List & )
 {
     KJS::List items;
-    TTQMetaObject *mo = obj->metaObject();
-    TTQStrList slotList( mo->slotNames( true ) );
+    TQMetaObject *mo = obj->metaObject();
+    TQStrList slotList( mo->slotNames( true ) );
 
-    for ( TTQStrListIterator iter(slotList); iter.current(); ++iter ) {
+    for ( TQStrListIterator iter(slotList); iter.current(); ++iter ) {
 
-	TTQCString name = iter.current();
-	TTQString nm( name );
+	TQCString name = iter.current();
+	TQString nm( name );
 
 	int slotid = mo->findSlot( name.data(), true );
 	if ( (slotid != -1) && (mo->slot( slotid, true )->access == TQMetaData::Public) )
@@ -341,12 +341,12 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec,
 
     // Source object and signal
     JSObjectProxy *sendproxy = JSProxy::toObjectProxy( args[0].imp() );
-    TTQObject *sender = sendproxy ? sendproxy->object() : 0;
-    TTQString sig = args[1].toString(exec).qstring();
+    TQObject *sender = sendproxy ? sendproxy->object() : 0;
+    TQString sig = args[1].toString(exec).qstring();
     kdDebug( 80001 ) << "connecting C++ signal" << sig << endl;
     // Receiver and slot/signal
     KJS::Object recvObj;
-    TTQString dest;
+    TQString dest;
     if ( args.size() == 3 ) {
 	recvObj = self.toObject(exec);
 	dest = args[2].toString(exec).qstring();
@@ -359,7 +359,7 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec,
     // Try to connect to C++ slot
     JSObjectProxy *recvproxy = JSProxy::toObjectProxy( recvObj.imp() );
     if ( recvproxy ) {
-	TTQObject *recv = recvproxy ? recvproxy->object() : 0;
+	TQObject *recv = recvproxy ? recvproxy->object() : 0;
 	bool ok = JSSlotUtils::connect( sender, sig.ascii(), recv, dest.ascii() );
 	if ( ok )
 	    return KJS::Boolean(true);
@@ -368,8 +368,8 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec,
     return connect( sender, sig.ascii(), recvObj, dest );
 }
 
-KJS::Boolean JSObjectProxyImp::connect( TTQObject *sender, const char *sig,
-					const KJS::Object &recv, const TTQString &dest )
+KJS::Boolean JSObjectProxyImp::connect( TQObject *sender, const char *sig,
+					const KJS::Object &recv, const TQString &dest )
 {
     kdDebug(80001) << "Trying signature '" << sig << "'." << endl;
     // Try to connect to JS method
@@ -409,28 +409,28 @@ KJS::Boolean JSObjectProxyImp::connect( TTQObject *sender, const char *sig,
 	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_double(double)" );
 	    break;
 	case JSSlotUtils::SignatureString:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_string(const TTQString&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_string(const TQString&)" );
 	    break;
 	case JSSlotUtils::SignatureCString:
 	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_charstar(const char*)" );
 	    break;
 	case JSSlotUtils::SignatureColor:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_color(const TTQColor&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_color(const TQColor&)" );
 	    break;
 	case JSSlotUtils::SignatureFont:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_font(const TTQFont&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_font(const TQFont&)" );
 	    break;
 	case JSSlotUtils::SignaturePoint:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_point(const TTQPoint&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_point(const TQPoint&)" );
 	    break;
 	case JSSlotUtils::SignatureRect:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_rect(const TTQRect&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_rect(const TQRect&)" );
 	    break;
 	case JSSlotUtils::SignatureSize:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_size(const TTQSize&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_size(const TQSize&)" );
 	    break;
 	case JSSlotUtils::SignaturePixmap:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_pixmap(const TTQPixmap&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_pixmap(const TQPixmap&)" );
 	    break;
 	case JSSlotUtils::SignatureURL:
 	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_url(const KURL&)" );
@@ -446,29 +446,29 @@ KJS::Boolean JSObjectProxyImp::connect( TTQObject *sender, const char *sig,
 	    break;
 
 	case JSSlotUtils::SignatureDate:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_date(const TTQDate&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_date(const TQDate&)" );
 	    break;
 	case JSSlotUtils::SignatureTime:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_time(const TTQTime&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_time(const TQTime&)" );
 	    break;
 	case JSSlotUtils::SignatureDateTime:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datetime(const TTQDateTime&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datetime(const TQDateTime&)" );
 	    break;
 	case JSSlotUtils::SignatureImage:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_image(const TTQImage&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_image(const TQImage&)" );
 	    break;
 	case JSSlotUtils::SignatureTQWidget:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_widget(TTQWidget*)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_widget(TQWidget*)" );
 	    break;
 	case JSSlotUtils::SignatureDateDate:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datedate(const TTQDate&, const TTQDate& )" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datedate(const TQDate&, const TQDate& )" );
 	    break;
 	case JSSlotUtils::SignatureColorString:
-	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_colorstring(const TTQColor&, const TTQString&)" );
+	    ok = JSSlotUtils::connect( sender, sig, slotp, "slot_colorstring(const TQColor&, const TQString&)" );
 	    break;
 	case JSSlotUtils::SignatureCustom:
 	{
-		TTQString mangledSig = sig;
+		TQString mangledSig = sig;
 		mangledSig.remove(' ')
 			.remove("const")
 			.remove('&')
@@ -501,12 +501,12 @@ KJS::Boolean JSObjectProxyImp::disconnect( KJS::ExecState *exec, KJS::Object &se
 
     // Source object and signal
     JSObjectProxy *sendproxy = JSProxy::toObjectProxy( args[0].imp() );
-    TTQObject *sender = sendproxy ? sendproxy->object() : 0;
-    TTQString sig = args[1].toString(exec).qstring();
+    TQObject *sender = sendproxy ? sendproxy->object() : 0;
+    TQString sig = args[1].toString(exec).qstring();
 
     // Receiver and slot/signal
-    TTQObject *recv=0;
-    TTQString dest;
+    TQObject *recv=0;
+    TQString dest;
     if ( args.size() == 3 ) {
 	JSObjectProxy *recvproxy = JSProxy::toObjectProxy( self.imp() );
 	recv = recvproxy ? recvproxy->object() : 0;
@@ -530,7 +530,7 @@ KJS::Value JSObjectProxyImp::getParentNode( KJS::ExecState *exec, KJS::Object &,
     if ( args.size())
 	return KJS::Null();
 
-    TTQObject *parent = obj->parent();
+    TQObject *parent = obj->parent();
     if ( parent && proxy->securityPolicy()->isObjectAllowed( proxy, parent ) )
 	return proxy->part()->factory()->createProxy( exec, parent, proxy );
 
@@ -542,12 +542,12 @@ KJS::Value JSObjectProxyImp::getElementById( KJS::ExecState *exec, KJS::Object &
     if ( !args.size() )
 	return KJS::Null();
 
-    const TTQObjectList *kids = obj->children();
+    const TQObjectList *kids = obj->children();
     if ( !kids )
 	return KJS::Null();
 
-    TTQObjectList l( *kids );
-    TTQObject *child = 0;
+    TQObjectList l( *kids );
+    TQObject *child = 0;
 
     if ( args[0].isA( KJS::NumberType ) ) {
 	uint i = args[0].toUInt32( exec );
@@ -558,7 +558,7 @@ KJS::Value JSObjectProxyImp::getElementById( KJS::ExecState *exec, KJS::Object &
 	child = l.at( i );
     }
     else {
-	TTQString s = args[0].toString( exec ).qstring();
+	TQString s = args[0].toString( exec ).qstring();
 	child = obj->child( s.ascii() );
     }
 
@@ -580,8 +580,8 @@ KJS::Value JSObjectProxyImp::hasAttribute( KJS::ExecState *exec, KJS::Object &,
     if ( !args.size() )
 	return KJS::Null();
 
-    TTQMetaObject *meta = obj->metaObject();
-    TTQString s = args[0].toString(exec).qstring();
+    TQMetaObject *meta = obj->metaObject();
+    TQString s = args[0].toString(exec).qstring();
     if ( meta->findProperty( s.ascii(), true ) != -1 )
 	return KJS::Boolean(true);
     else
@@ -592,20 +592,20 @@ KJS::Value JSObjectProxyImp::getAttribute( KJS::ExecState *exec, KJS::Object &,
 {
     if ( !args.size() )
     {
-        TTQString msg = i18n( "No property was defined." );
+        TQString msg = i18n( "No property was defined." );
         return throwError(exec, msg);
     }
 
-    TTQMetaObject *meta = obj->metaObject();
-    TTQString s = args[0].toString(exec).qstring();
+    TQMetaObject *meta = obj->metaObject();
+    TQString s = args[0].toString(exec).qstring();
     kdDebug(80001) << "Get property " << s << " from " << obj->name() << endl;
     if ( meta->findProperty( s.ascii(), true ) == -1 )
     {
-        TTQString msg = i18n( "Property '%1' could not be found." ).arg( s );
+        TQString msg = i18n( "Property '%1' could not be found." ).arg( s );
         return throwError(exec, msg,KJS::ReferenceError);
     }
 
-    TTQVariant val = obj->property( s.ascii() );
+    TQVariant val = obj->property( s.ascii() );
     return convertToValue( exec, val );
 }
 
@@ -614,16 +614,16 @@ KJS::Value JSObjectProxyImp::setAttribute( KJS::ExecState *exec, KJS::Object &,
     if ( args.size() != 2 )
 	return KJS::Boolean(false);
 
-    TTQMetaObject *meta = obj->metaObject();
-    TTQString s = args[0].toString(exec).qstring();
+    TQMetaObject *meta = obj->metaObject();
+    TQString s = args[0].toString(exec).qstring();
 
     if ( meta->findProperty( s.ascii(), true ) == -1 )
     {
-        TTQString msg = i18n( "Property '%1' could not be found." ).arg( s );
+        TQString msg = i18n( "Property '%1' could not be found." ).arg( s );
         return throwError(exec, msg,KJS::GeneralError);
     }
     kdDebug(80001) << "Set property " << s << " from " << obj->name() << endl;
-    TTQVariant val = convertToVariant( exec, args[1] );
+    TQVariant val = convertToVariant( exec, args[1] );
     bool ok = obj->setProperty( s.ascii(), val );
 
     return KJS::Boolean(ok);
diff --git a/kjsembed/jsobjectproxy_imp.h b/kjsembed/jsobjectproxy_imp.h
index 5ecb0853..2c1cefb6 100644
--- a/kjsembed/jsobjectproxy_imp.h
+++ b/kjsembed/jsobjectproxy_imp.h
@@ -115,11 +115,11 @@ public:
     JSObjectProxyImp( KJS::ExecState *exec,
 		      int id, JSObjectProxy *parent );
     JSObjectProxyImp( KJS::ExecState *exec,
-		      int id, const TTQCString &name, JSObjectProxy *parent );
+		      int id, const TQCString &name, JSObjectProxy *parent );
     JSObjectProxyImp( KJS::ExecState *exec,
-		      int id, int sigid, const TTQCString &name, JSObjectProxy *parent );
+		      int id, int sigid, const TQCString &name, JSObjectProxy *parent );
     JSObjectProxyImp( KJS::ExecState *exec,
-		      int id, const char *ret, int sig, const TTQCString &name, JSObjectProxy *parent );
+		      int id, const char *ret, int sig, const TQCString &name, JSObjectProxy *parent );
     ~JSObjectProxyImp() {}
 
     /** Implements the object tree interface. */
@@ -153,7 +153,7 @@ public:
     KJS::Boolean connect( KJS::ExecState *exec, const KJS::Object &self, const KJS::List &args );
     KJS::Boolean disconnect( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
-    KJS::Boolean connect( TTQObject *sender, const char *sig, const KJS::Object &recv, const TTQString &dest );
+    KJS::Boolean connect( TQObject *sender, const char *sig, const KJS::Object &recv, const TQString &dest );
     /*}*/
 
     virtual bool implementsCall() const { return true; }
@@ -170,12 +170,12 @@ protected:
 
 private:
     int id;
-    TTQCString rettype; // return type
+    TQCString rettype; // return type
     int sigid; // signatureid
     int slotid;
-    TTQCString slotname;
+    TQCString slotname;
     JSObjectProxy *proxy;
-    TTQGuardedPtr obj;
+    TQGuardedPtr obj;
     class JSObjectProxyImpPrivate *d;
 };
 
diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp
index ad38efe1..5abd9558 100644
--- a/kjsembed/jsopaqueproxy.cpp
+++ b/kjsembed/jsopaqueproxy.cpp
@@ -43,13 +43,13 @@ JSOpaqueProxy::JSOpaqueProxy()
 {
 }
 
-JSOpaqueProxy::JSOpaqueProxy( TTQTextStream *ts )
+JSOpaqueProxy::JSOpaqueProxy( TQTextStream *ts )
     : JSProxy( JSProxy::OpaqueProxy ), ptr(0)
 {
     setValue( ts );
 }
 
-JSOpaqueProxy::JSOpaqueProxy( const TTQEvent *ev )
+JSOpaqueProxy::JSOpaqueProxy( const TQEvent *ev )
     : JSProxy( JSProxy::OpaqueProxy ), ptr(0)
 {
     setValue( ev );
@@ -66,7 +66,7 @@ JSOpaqueProxy::~JSOpaqueProxy()
     }
 }
 
-TTQString JSOpaqueProxy::typeName() const
+TQString JSOpaqueProxy::typeName() const
 {
     return ptrtype;
 }
@@ -76,34 +76,34 @@ bool JSOpaqueProxy::inherits( const char *clazz )
     return (ptrtype == clazz);
 }
 
-void JSOpaqueProxy::setValue( TTQTextStream *ts )
+void JSOpaqueProxy::setValue( TQTextStream *ts )
 {
   if( ptr ) {
     if(owner() == JavaScript) ptr->cleanup();
     delete ptr;
   }
-  ptr = new Pointer(ts);
-  ptrtype = "TTQTextStream";
+  ptr = new Pointer(ts);
+  ptrtype = "TQTextStream";
 }
 
-void JSOpaqueProxy::setValue( const TTQEvent *ev )
+void JSOpaqueProxy::setValue( const TQEvent *ev )
 {
   if( ptr ) {
     if(owner() == JavaScript) ptr->cleanup();
     delete ptr;
   }
-  ptr = new Pointer(ev);
-  ptrtype = "TTQEvent";
+  ptr = new Pointer(ev);
+  ptrtype = "TQEvent";
 }
 
-TTQTextStream *JSOpaqueProxy::toTextStream()
+TQTextStream *JSOpaqueProxy::toTextStream()
 {
-    return toNative();
+    return toNative();
 }
 
-const TTQEvent *JSOpaqueProxy::toEvent()
+const TQEvent *JSOpaqueProxy::toEvent()
 {
-    return toNative();
+    return toNative();
 }
 
 void JSOpaqueProxy::addBindings( KJS::ExecState *exec, KJS::Object &object )
@@ -124,7 +124,7 @@ void JSOpaqueProxy::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 KJS::UString JSOpaqueProxy::toString( KJS::ExecState */*exec*/ ) const
 {
-    TTQString s( "%1 (%2)" );
+    TQString s( "%1 (%2)" );
     return KJS::UString( s.arg("JSOpaqueProxy").arg(ptrtype) );
 }
 
diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h
index eb446169..73da0efc 100644
--- a/kjsembed/jsopaqueproxy.h
+++ b/kjsembed/jsopaqueproxy.h
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-class TTQTextStream;
+class TQTextStream;
 
 namespace KJSEmbed {
 
@@ -57,16 +57,16 @@ public:
     }
 
     /** Creates an opaque proxy. */
-    JSOpaqueProxy( TTQTextStream *ts );
+    JSOpaqueProxy( TQTextStream *ts );
 
     /** Creates an opaque proxy. */
-    JSOpaqueProxy( const TTQEvent *ev );
+    JSOpaqueProxy( const TQEvent *ev );
 
     /** Cleans up. */
     virtual ~JSOpaqueProxy();
 
     /** Returns the type of the wrapped object.*/
-    TTQString typeName() const;
+    TQString typeName() const;
 
     /** Sets the value of the proxy and its type. */
     template
@@ -79,11 +79,11 @@ public:
 	  ptrtype = ptype ? ptype : "void";
     }
 
-    /** Sets the value of the proxy to a TTQTextStream. */
-    void setValue( TTQTextStream *ts );
+    /** Sets the value of the proxy to a TQTextStream. */
+    void setValue( TQTextStream *ts );
 
-    /** Sets the value of the proxy to a TTQEvent. */
-    void setValue( const TTQEvent *ev );
+    /** Sets the value of the proxy to a TQEvent. */
+    void setValue( const TQEvent *ev );
 
     /** Returns the proxy value as a pointer. */
     template
@@ -98,12 +98,12 @@ public:
     bool inherits( const char *clazz );
 
     /**
-     * Returns the TTQTextStream stored in the proxy. If proxy does not contain
-     * a value of type TTQTextStream then 0 is returned.
+     * Returns the TQTextStream stored in the proxy. If proxy does not contain
+     * a value of type TQTextStream then 0 is returned.
      */
-    TTQTextStream *toTextStream();
+    TQTextStream *toTextStream();
 
-    const TTQEvent *toEvent();
+    const TQEvent *toEvent();
 
     /** Adds the bindings for the opaque proxy to the specified js object. */
     virtual void addBindings( KJS::ExecState *state, KJS::Object &object );
@@ -113,9 +113,9 @@ public:
 
 private:
 
-    TTQTextStream *textstream;
-    const TTQEvent *event;
-    TTQCString ptrtype;
+    TQTextStream *textstream;
+    const TQEvent *event;
+    TQCString ptrtype;
 
     class JSOpaqueProxyPrivate *d;
 
diff --git a/kjsembed/jsproxy.cpp b/kjsembed/jsproxy.cpp
index 011ef6f2..cbf3a5e3 100644
--- a/kjsembed/jsproxy.cpp
+++ b/kjsembed/jsproxy.cpp
@@ -67,7 +67,7 @@ void JSProxy::setOwner( Owner state )
 JSProxy::Owner JSProxy::owner( ) const
 { return ownership; }
 
-bool JSProxy::checkType( const KJS::Object &object, ProxyType prxyType, const TTQString & classname )
+bool JSProxy::checkType( const KJS::Object &object, ProxyType prxyType, const TQString & classname )
 {
     JSProxy *prxy = toProxy(object.imp());
     if( !prxy )
diff --git a/kjsembed/jsproxy.h b/kjsembed/jsproxy.h
index 048b3374..db22acf6 100644
--- a/kjsembed/jsproxy.h
+++ b/kjsembed/jsproxy.h
@@ -98,14 +98,14 @@ public:
      * @param classname - the name of the class you want.
      * @returns if the two above conditions are met.
      */
-    static bool checkType( const KJS::Object &object, ProxyType prxyType, const TTQString &classname);
+    static bool checkType( const KJS::Object &object, ProxyType prxyType, const TQString &classname);
 
     
     JSProxy( int type );
     virtual ~JSProxy();
 
     /** Returns the string value of the class name **/
-    virtual TTQString typeName() const = 0;
+    virtual TQString typeName() const = 0;
     /** Returns true iff the content of this proxy inherits the specified base-class. */
     virtual bool inherits( const char *clazz ) = 0;
     /** Returns the type of the proxy. */
diff --git a/kjsembed/jssecuritypolicy.cpp b/kjsembed/jssecuritypolicy.cpp
index bd0ba636..872fb00f 100644
--- a/kjsembed/jssecuritypolicy.cpp
+++ b/kjsembed/jssecuritypolicy.cpp
@@ -69,7 +69,7 @@ bool JSSecurityPolicy::isInterpreterAllowed( const JSObjectProxy *prx, const KJS
     return false;
 }
 
-bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const TTQObject *obj ) const
+bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const TQObject *obj ) const
 {
     if ( !obj )
 	return false;
@@ -83,13 +83,13 @@ bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const TTQObjec
 }
 
 bool JSSecurityPolicy::isPropertyAllowed( const JSObjectProxy *prx,
-				const TTQObject *obj, const char * /*prop*/ ) const
+				const TQObject *obj, const char * /*prop*/ ) const
 {
     return hasCapability( CapabilityGetProperties|CapabilitySetProperties ) && isObjectAllowed( prx, obj );
 }
 
-bool JSSecurityPolicy::isCreateAllowed( const JSObjectProxy *prx, const TTQObject *parent,
-				      const TTQString &/*clazz*/, const TTQString &/*name*/ ) const
+bool JSSecurityPolicy::isCreateAllowed( const JSObjectProxy *prx, const TQObject *parent,
+				      const TQString &/*clazz*/, const TQString &/*name*/ ) const
 {
     if ( hasCapability(CapabilityFactory) && isObjectAllowed( prx, parent ) )
 	return true;
diff --git a/kjsembed/jssecuritypolicy.h b/kjsembed/jssecuritypolicy.h
index df39117e..a14f099c 100644
--- a/kjsembed/jssecuritypolicy.h
+++ b/kjsembed/jssecuritypolicy.h
@@ -36,7 +36,7 @@ class JSObjectProxy;
  * A SecurityPolicy must define tests for the following situations:
  * 
        
  * 
      • Does this request come from the correct @ref KJS::Interpreter ?
- * 
      • Is the script allowed to access the specified TTQObject ?
+ * 
      • Is the script allowed to access the specified TQObject ?
  * 
      • Is the script allowed to access the specified property ?
  * 
      
  * The various isAllowed() methods are called automatically by @ref JSObjectProxy
@@ -107,20 +107,20 @@ public:
     virtual bool isInterpreterAllowed( const JSObjectProxy *prx, const KJS::Interpreter *interp ) const;
 
     /**
-     * Returns true if scripts are allowed to see the specified TTQObject.
+     * Returns true if scripts are allowed to see the specified TQObject.
      */
-    virtual bool isObjectAllowed( const JSObjectProxy *prx, const TTQObject *obj ) const;
+    virtual bool isObjectAllowed( const JSObjectProxy *prx, const TQObject *obj ) const;
 
     /**
      * Returns true if scripts are allowed to see the specified property.
      */
-    virtual bool isPropertyAllowed( const JSObjectProxy *prx, const TTQObject *obj, const char *prop ) const;
+    virtual bool isPropertyAllowed( const JSObjectProxy *prx, const TQObject *obj, const char *prop ) const;
 
     /**
      * Returns true if scripts are allowed to create the specified child object.
      */
-    virtual bool isCreateAllowed( const JSObjectProxy *prx, const TTQObject *parent,
-				  const TTQString &clazz, const TTQString &name ) const;
+    virtual bool isCreateAllowed( const JSObjectProxy *prx, const TQObject *parent,
+				  const TQString &clazz, const TQString &name ) const;
 
     /**
      * Returns the default SecurityPolicy.
diff --git a/kjsembed/jsvalueproxy.cpp b/kjsembed/jsvalueproxy.cpp
index a7af8247..cbc75b34 100644
--- a/kjsembed/jsvalueproxy.cpp
+++ b/kjsembed/jsvalueproxy.cpp
@@ -44,18 +44,18 @@ JSValueProxy::~JSValueProxy()
 {
 }
 
-TTQString JSValueProxy::typeName() const
+TQString JSValueProxy::typeName() const
 {
     return val.typeName();
 }
 
-void JSValueProxy::setValue( const TTQVariant &var )
+void JSValueProxy::setValue( const TQVariant &var )
 {
     kdDebug(80001) << "JSValueProxy::setValue() variant, type is " << var.typeName() << endl;
     val = var;
 }
 
-TTQVariant JSValueProxy::toVariant() const 
+TQVariant JSValueProxy::toVariant() const 
 { 
     kdDebug(80001) << "JSValueProxy::toVariant() variant, type is " << val.typeName() << endl;
     return val; 
@@ -78,7 +78,7 @@ void JSValueProxy::addBindings(  KJS::ExecState *exec, KJS::Object &object )
 
 KJS::UString JSValueProxy::toString( KJS::ExecState * /*exec*/ ) const
 {
-    TTQString s( "%1 (%2)" );
+    TQString s( "%1 (%2)" );
     return KJS::UString( s.arg("JSValueProxy").arg(val.typeName()) );
 }
 
diff --git a/kjsembed/jsvalueproxy.h b/kjsembed/jsvalueproxy.h
index ec100950..4500fe02 100644
--- a/kjsembed/jsvalueproxy.h
+++ b/kjsembed/jsvalueproxy.h
@@ -40,13 +40,13 @@ public:
     JSValueProxy();
     virtual ~JSValueProxy();
 
-    TTQString typeName() const;
+    TQString typeName() const;
     /** Returns true iff the content of this proxy inherits the specified base-class. */
     bool inherits( const char *clazz );
 
-    void setValue( const TTQVariant &var );
+    void setValue( const TQVariant &var );
 
-    TTQVariant toVariant() const;
+    TQVariant toVariant() const;
 
     virtual void addBindings( KJS::ExecState *state, KJS::Object &object );
 
@@ -54,7 +54,7 @@ public:
     virtual KJS::UString toString( KJS::ExecState *exec ) const;
 
 private:
-    TTQVariant val;
+    TQVariant val;
     class JSValueProxyPrivate *d;
 };
 
diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp
index 762d8715..4b6604cf 100644
--- a/kjsembed/kjscmd.cpp
+++ b/kjsembed/kjscmd.cpp
@@ -55,11 +55,11 @@ int main( int argc, char **argv )
 {
     bool nogui = false;
     bool doexec = false;
-    TTQCString appName = "kjscmd";
+    TQCString appName = "kjscmd";
 
     // Set the name of the instance
     for ( int i = 1 ; i < argc ; i++ ) {
-        TTQCString arg( argv[i] );
+        TQCString arg( argv[i] );
 	if ( arg[0] != '-' ) {
 	    appName = arg.mid( arg.findRev('/') );
 	    if ( !appName )
@@ -144,8 +144,8 @@ int main( int argc, char **argv )
 	bool ok = part->runFile( args->arg(0) );
 	KJS::Completion jsres = part->completion();
 	if ( jsres.complType() != KJS::Normal) {
-	    TTQTextStream err( stderr, IO_WriteOnly );
-	    TTQTextStream out( stdout, IO_WriteOnly );
+	    TQTextStream err( stderr, IO_WriteOnly );
+	    TQTextStream out( stdout, IO_WriteOnly );
 	    
 	    switch ( jsres.complType() ) {
 	    case KJS::Break:
@@ -162,8 +162,8 @@ int main( int argc, char **argv )
 	
           KJS::Object exception = jsres.value().toObject(exec);
         int line = exception.get(exec,KJS::Identifier("line")).toNumber(exec);
-        TTQString type = exception.get(exec,KJS::Identifier("name")).toString(exec).qstring();
-        TTQString message = exception.get(exec,KJS::Identifier("message")).toString(exec).qstring();
+        TQString type = exception.get(exec,KJS::Identifier("name")).toString(exec).qstring();
+        TQString message = exception.get(exec,KJS::Identifier("message")).toString(exec).qstring();
         
         err << "Uncaught " << type << " exception at: " << line << endl;
         err << message << endl;
@@ -183,7 +183,7 @@ int main( int argc, char **argv )
 	result = app->exec();
 
     if ( args->isSet( "interactive" ) ) {
-	part->execute( TTQString("include('cmdline.js');") );
+	part->execute( TQString("include('cmdline.js');") );
     }
 
     return result;
diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp
index 9e47bc3b..b39b8813 100644
--- a/kjsembed/kjsembedpart.cpp
+++ b/kjsembed/kjsembedpart.cpp
@@ -89,7 +89,7 @@ namespace KJSEmbed {
 // KPart
 //
 
-KJSEmbedPart::KJSEmbedPart( TTQObject *parent, const char *name )
+KJSEmbedPart::KJSEmbedPart( TQObject *parent, const char *name )
     : KParts::ReadOnlyPart( parent, name ? name : "kjsembed_part" ),
       jsConsole(0), jsfactory(0),
       widgetparent(0), widgetname(name ? name : "kjsembed_part"), deletejs(false)
@@ -99,7 +99,7 @@ KJSEmbedPart::KJSEmbedPart( TTQObject *parent, const char *name )
     createActionClient();
 }
 
-KJSEmbedPart::KJSEmbedPart( TTQWidget *wparent, const char *wname, TTQObject *parent, const char *name )
+KJSEmbedPart::KJSEmbedPart( TQWidget *wparent, const char *wname, TQObject *parent, const char *name )
     : KParts::ReadOnlyPart( parent, name ? name : (wname?wname:"jsembed_part") ),
       jsConsole(0), jsfactory(0),
       widgetparent(wparent), widgetname(wname), deletejs(false)
@@ -109,8 +109,8 @@ KJSEmbedPart::KJSEmbedPart( TTQWidget *wparent, const char *wname, TTQObject *pa
     createActionClient();
 }
 
-KJSEmbedPart::KJSEmbedPart( KJS::Interpreter *jsi, TTQWidget *wparent, const char *wname,
-			    TTQObject *parent, const char *name )
+KJSEmbedPart::KJSEmbedPart( KJS::Interpreter *jsi, TQWidget *wparent, const char *wname,
+			    TQObject *parent, const char *name )
     : KParts::ReadOnlyPart( parent, name ? name : (wname?wname:"jsembed_part") ),
       jsConsole(0), jsfactory(0), builtins(0),
       widgetparent(wparent), widgetname(wname), js(jsi), deletejs(false)
@@ -161,7 +161,7 @@ JSConsoleWidget *KJSEmbedPart::view()
 {
 #ifndef QT_ONLY    
     if ( !jsConsole ) {
-	TTQCString name = widgetname ? widgetname : TTQCString("jsembed_console");
+	TQCString name = widgetname ? widgetname : TQCString("jsembed_console");
 	jsConsole = new JSConsoleWidget( this, widgetparent, name );
 	setWidget( jsConsole );
 	jsfactory->addType( jsConsole->className() );
@@ -171,9 +171,9 @@ JSConsoleWidget *KJSEmbedPart::view()
 return 0L;
 }
 
-TTQStringList KJSEmbedPart::constructorNames() const
+TQStringList KJSEmbedPart::constructorNames() const
 {
-    TTQStringList classes;
+    TQStringList classes;
 
     KJS::List cons = constructorList();
     KJS::ListIterator it = cons.begin();
@@ -224,9 +224,9 @@ KJS::List KJSEmbedPart::constructorList() const
 // Version information
 //
 
-TTQCString KJSEmbedPart::versionString() const
+TQCString KJSEmbedPart::versionString() const
 {
-    return TTQCString(KJSEMBED_VERSION_STRING);
+    return TQCString(KJSEMBED_VERSION_STRING);
 }
 
 int KJSEmbedPart::versionMajor() const
@@ -243,7 +243,7 @@ int KJSEmbedPart::versionMinor() const
 // Execute a JS script.
 //
 
-KJS::Value KJSEmbedPart::evaluate( const TTQString &script, const KJS::Value &self )
+KJS::Value KJSEmbedPart::evaluate( const TQString &script, const KJS::Value &self )
 {
     if ( execute( res, script, self ) )
 	return res.value();
@@ -251,12 +251,12 @@ KJS::Value KJSEmbedPart::evaluate( const TTQString &script, const KJS::Value &se
     return KJS::Null();
 }
 
-bool KJSEmbedPart::execute( const TTQString &script, const KJS::Value &self )
+bool KJSEmbedPart::execute( const TQString &script, const KJS::Value &self )
 {
     return execute( res, script, self );
 }
 
-bool KJSEmbedPart::execute( KJS::Completion &result, const TTQString &script, const KJS::Value &self )
+bool KJSEmbedPart::execute( KJS::Completion &result, const TQString &script, const KJS::Value &self )
 {
     KJS::Value val( self );
     result = js->evaluate( script, self.isNull() ? partobj : val );
@@ -269,13 +269,13 @@ bool KJSEmbedPart::openURL( const KURL &url )
 //	kdDebug(80001) << "KJSEmbedPart: openURL '" << url.url() << "' is javascript" << endl;
 
 #ifndef QT_ONLY
-	TTQString cmd = url.url();
+	TQString cmd = url.url();
 #else
-	TTQString cmd = url.toString();
+	TQString cmd = url.toString();
 #endif
 
-	TTQString js( "javascript:" );
-	cmd = cmd.replace( 0, js.length(), TTQString("") );
+	TQString js( "javascript:" );
+	cmd = cmd.replace( 0, js.length(), TQString("") );
 
 //	kdDebug(80001) << "KJSEmbedPart: JS command is '" << cmd << "'" << endl;
 	return execute( cmd );
@@ -287,14 +287,14 @@ bool KJSEmbedPart::openURL( const KURL &url )
 // Invoke a script file.
 //
 
-bool KJSEmbedPart::runFile( const TTQString &name, const KJS::Value &self )
+bool KJSEmbedPart::runFile( const TQString &name, const KJS::Value &self )
 {
     kdDebug(80001) << "KJSEmbedPart::runFile(): file is '" << name << "'" << endl;
-    TTQString script = loadFile( name );
+    TQString script = loadFile( name );
     return execute( script, self );
 }
 
-bool KJSEmbedPart::loadActionSet( const TTQString &file )
+bool KJSEmbedPart::loadActionSet( const TQString &file )
 {
 #ifndef QT_ONLY
     return xmlclient->load( file );
@@ -304,23 +304,23 @@ bool KJSEmbedPart::loadActionSet( const TTQString &file )
 #endif // QT_ONLY
 }
 
-TTQString KJSEmbedPart::loadFile( const TTQString &src )
+TQString KJSEmbedPart::loadFile( const TQString &src )
 {
-    TTQString script;
+    TQString script;
 
     if ( src == "-" ) {
-	TTQTextStream ts( stdin, IO_ReadOnly );
+	TQTextStream ts( stdin, IO_ReadOnly );
 	script = ts.read();
     }
     else {
-	TTQFile file( src );
+	TQFile file( src );
 	if ( file.open( IO_ReadOnly ) ) {
-	    script = TTQString( file.readAll() );
+	    script = TQString( file.readAll() );
 	}
 	else {
 	    kdWarning() << "Could not open file '" << src << "', "
 			<< strerror( errno ) << endl;
-	    return TTQString::null;
+	    return TQString::null;
 	}
     }
 
@@ -337,14 +337,14 @@ TTQString KJSEmbedPart::loadFile( const TTQString &src )
 // Publishing objects.
 //
 
-KJS::Object KJSEmbedPart::bind( TTQObject *obj )
+KJS::Object KJSEmbedPart::bind( TQObject *obj )
 {
     KJS::Object jsobj = jsfactory->createProxy( js->globalExec(), obj );
     JSProxy::toObjectProxy(jsobj.imp() )->setOwner(JSProxy::Native);
     return jsobj;
 }
 
-KJS::Object KJSEmbedPart::addObject( TTQObject *obj, KJS::Object &parent, const char *name )
+KJS::Object KJSEmbedPart::addObject( TQObject *obj, KJS::Object &parent, const char *name )
 {
     KJS::Object jsobj = bind( obj );
     parent.put( js->globalExec(), name ? name : obj->name(), jsobj );
@@ -352,7 +352,7 @@ KJS::Object KJSEmbedPart::addObject( TTQObject *obj, KJS::Object &parent, const
     return jsobj;
 }
 
-KJS::Object KJSEmbedPart::addObject( TTQObject *obj, const char *name )
+KJS::Object KJSEmbedPart::addObject( TQObject *obj, const char *name )
 {
     return addObject( obj, js->globalObject(), name );
 }
@@ -362,10 +362,10 @@ void KJSEmbedPart::virtual_hook( int /*id*/, void * /*data*/ )
 
 }
 
-static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, const TTQString &objectString )
+static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, const TQString &objectString )
 {
   KJS::Object returnObject = root;
-  TTQStringList objects = TTQStringList::split(".", objectString);
+  TQStringList objects = TQStringList::split(".", objectString);
   for( uint idx = 0; idx < objects.count(); ++idx)
   {
     KJS::Identifier id = KJS::Identifier( KJS::UString( objects[idx] ));
@@ -376,7 +376,7 @@ static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, c
   return returnObject;
 }
 
-KJS::Value KJSEmbedPart::callMethod( const TTQString & methodName, const KJS::List & args ) const
+KJS::Value KJSEmbedPart::callMethod( const TQString & methodName, const KJS::List & args ) const
 {
   KJS::ExecState *exec = js->globalExec();
   KJS::Identifier id = KJS::Identifier( KJS::UString(methodName.latin1() ));
@@ -406,7 +406,7 @@ KJS::Value KJSEmbedPart::callMethod( const TTQString & methodName, const KJS::Li
   return retValue;
 }
 
-KJS::Value KJSEmbedPart::getValue( const TTQString & valueName ) const
+KJS::Value KJSEmbedPart::getValue( const TQString & valueName ) const
 {
   KJS::ExecState *exec = js->globalExec();
   KJS::Identifier id = KJS::Identifier( KJS::UString(valueName.latin1() ));
@@ -414,7 +414,7 @@ KJS::Value KJSEmbedPart::getValue( const TTQString & valueName ) const
   return obj.get(exec, id );
 }
 
-void KJSEmbedPart::putValue( const TTQString & valueName, const KJS::Value & value )
+void KJSEmbedPart::putValue( const TQString & valueName, const KJS::Value & value )
 {
   KJS::ExecState *exec = js->globalExec();
   KJS::Identifier id = KJS::Identifier( KJS::UString(valueName.latin1() ));
@@ -422,18 +422,18 @@ void KJSEmbedPart::putValue( const TTQString & valueName, const KJS::Value & val
   obj.put(exec, id, value);
 }
 
-void KJSEmbedPart::putVariant( const TTQString & valueName, const TTQVariant & value )
+void KJSEmbedPart::putVariant( const TQString & valueName, const TQVariant & value )
 {
 	KJS::Value val = convertToValue( js->globalExec(), value);
 	putValue( valueName, val );
 }
 
-TTQVariant KJSEmbedPart::getVariant( const TTQString & valueName ) const
+TQVariant KJSEmbedPart::getVariant( const TQString & valueName ) const
 {
 	return convertToVariant( js->globalExec(), getValue( valueName ) );
 } 
 
-bool KJSEmbedPart::hasMethod( const TTQString & methodName )
+bool KJSEmbedPart::hasMethod( const TQString & methodName )
 {
   KJS::ExecState *exec = js->globalExec();
   KJS::Identifier id = KJS::Identifier( KJS::UString(methodName.latin1() ));
diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h
index 6435d526..3b9e6c7f 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -40,7 +40,7 @@
 #include 
 #endif
 
-class TTQWidget;
+class TQWidget;
 
 #define KJSEMBED_VERSION_STRING "0.3"
 #define KJSEMBED_VERSION_MAJOR 0
@@ -63,25 +63,25 @@ class JSBuiltIn;
  * @author Richard Moore, rich@kde.org
  * This is the easiest class for interacting and embedding the interpreter.  To use KJSEmbed in yours
  * application you can simply create a new KJSEmbedPart.  Once you have this object you can expose your
- * TQObect based classes with a few simple methods.  The interface also allows for the manipulation of TTQVariant data
+ * TQObect based classes with a few simple methods.  The interface also allows for the manipulation of TQVariant data
  * structures between Javascript and C++.  Complex Javascript arrays are transparently converted to TQMaps and TQValueLists
- * depending on the type of the Array.  KJSEmbed also provides transparent access to most TTQVariant datatypes between
- * C++ and Javascript.  The easiest way to integrate KJSEmbed into your application is to create a TTQObject based class
+ * depending on the type of the Array.  KJSEmbed also provides transparent access to most TQVariant datatypes between
+ * C++ and Javascript.  The easiest way to integrate KJSEmbed into your application is to create a TQObject based class
  * that will be your interface between C++ and Javascript.  This object than can expose C++ methods via Qt slots, and
- * TTQVariant datatypes via Qt properties.  This class will also have an interface where C++ objects can call Javascript
+ * TQVariant datatypes via Qt properties.  This class will also have an interface where C++ objects can call Javascript
  * methods.
  */
 class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
-    Q_PROPERTY( TTQStringList constructorNames READ constructorNames )
-    Q_PROPERTY( TTQCString versionString READ versionString )
+    Q_PROPERTY( TQStringList constructorNames READ constructorNames )
+    Q_PROPERTY( TQCString versionString READ versionString )
     Q_PROPERTY( int versionMajor READ versionMajor )
     Q_PROPERTY( int versionMinor READ versionMinor )
 
 public:
     /** Create a KJSEmbedPart. */
-    KJSEmbedPart( TTQObject *parent=0, const char *name=0 );
+    KJSEmbedPart( TQObject *parent=0, const char *name=0 );
 
     /**
      * Creates a KJSEmbedPart for which the parents of the view and part are different.
@@ -92,15 +92,15 @@ public:
      * constructor.  This results in the widget trying to do GUI related things
      * after the TQPaint stuff is destroyed.
      */
-    KJSEmbedPart( TTQWidget *wparent, const char *wname=0, TTQObject *parent=0, const char *name=0 );
+    KJSEmbedPart( TQWidget *wparent, const char *wname=0, TQObject *parent=0, const char *name=0 );
 
     /**
      * Create a KJSEmbedPart with the specified interpreter.
      *
      * See warning above.
      */
-    KJSEmbedPart( KJS::Interpreter *js, TTQWidget *wparent, const char *wname=0,
-		  TTQObject *parent=0, const char *name=0 );
+    KJSEmbedPart( KJS::Interpreter *js, TQWidget *wparent, const char *wname=0,
+		  TQObject *parent=0, const char *name=0 );
 
     /** Cleans up. */
     virtual ~KJSEmbedPart();
@@ -110,7 +110,7 @@ public:
     //
 
     /** Returns the version of KJSEmbed. */
-    TTQCString versionString() const;
+    TQCString versionString() const;
 
     /** Returns the minor version number of KJSEmbed. */
     int versionMajor() const;
@@ -129,53 +129,53 @@ public:
     * else
     *   ... // function not present.
     */
-    bool hasMethod( const TTQString &methodName );
+    bool hasMethod( const TQString &methodName );
 
     /** Calls a method from Javascript starting from the global context.
     * @code
     * KJS::List args;
     * args.append(KJS::String("String Arg") );
     * args.append(KJS::Number(10) );
-    * args.append(KJSEmbed::convertToValue(js->globalExec(), TTQColor("blue" ) ) );
+    * args.append(KJSEmbed::convertToValue(js->globalExec(), TQColor("blue" ) ) );
     * KJS::Value val = js->callMethod("javascriptFunction", args );
-    * TTQString myString = val.toString().qstring();
+    * TQString myString = val.toString().qstring();
     * @endcode
     */
 
-    KJS::Value callMethod(const TTQString &methodName, const KJS::List &args) const;
+    KJS::Value callMethod(const TQString &methodName, const KJS::List &args) const;
     /** Gets a value from Javascript starting from the global context.
     * @code
     * KJS::Value val = js->getValue("someValue");
-    * TTQString myString = val.toString().qstring();
+    * TQString myString = val.toString().qstring();
     * @endcode
     */
-    KJS::Value getValue( const TTQString &valueName ) const;
+    KJS::Value getValue( const TQString &valueName ) const;
 
     /** Sets a value in a Javascript starting from the global context.
     * Note if this value is not present in the javascript context it will
     * become defined once this method is called.
     * @code
-    * KJS::Value val = KJSEmbed::convertToValue(js->globalExec(), TTQColor("blue"));
+    * KJS::Value val = KJSEmbed::convertToValue(js->globalExec(), TQColor("blue"));
     * js->putValue("myVar", val);
     * @endcode
     */
-    void putValue( const TTQString &valueName, const KJS::Value &value);
+    void putValue( const TQString &valueName, const KJS::Value &value);
 
     /** Convinence method that wraps around @ref putValue that only handles values
-    * that are supported by TTQVariant.
+    * that are supported by TQVariant.
     * @code
-    * js->putVariant( "myVar", TTQColor("blue") );
+    * js->putVariant( "myVar", TQColor("blue") );
     * @endcode
     */
-    void putVariant( const TTQString &valueName, const TTQVariant &value);
+    void putVariant( const TQString &valueName, const TQVariant &value);
 
     /** Convinence method that wraps around @ref getValue that only handles values
-    * that are supported by TTQVariant.
+    * that are supported by TQVariant.
     * @code
-    * TTQColor value = js->getVariant( "myVar").toColor();
+    * TQColor value = js->getVariant( "myVar").toColor();
     * @endcode
     */
-    TTQVariant getVariant( const TTQString &valueName ) const;
+    TQVariant getVariant( const TQString &valueName ) const;
 
     /** Returns the global object of the interpreter. */
     KJS::Object globalObject() const { return js->globalObject(); }
@@ -191,7 +191,7 @@ public:
      * not specified then the name property of 'obj' is used instead.
      * @code
      * // In C++
-     * TTQObject *myClass = new TQObjectBasedClass(this, "jsObject");
+     * TQObject *myClass = new TQObjectBasedClass(this, "jsObject");
      * js->addObject( myClass );
      * // In Javascript
      * jsObject.someProperty = "Test Property";
@@ -199,23 +199,23 @@ public:
      * kdDebug() << "New Value: " << myClass->someProperty() << endl;  // displays "Test Property"
      * @endcode
      */
-    KJS::Object addObject( TTQObject *obj, const char *name=0 );
+    KJS::Object addObject( TQObject *obj, const char *name=0 );
 
     /**
      * Publishes 'obj' as property 'name' of object 'parent'. The binding is defined
      * using @ref JSObjectProxy, and is subject to the current default SecurityPolicy.
      */
-    KJS::Object addObject( TTQObject *obj, KJS::Object &parent, const char *name=0 );
+    KJS::Object addObject( TQObject *obj, KJS::Object &parent, const char *name=0 );
 
-    /** Returns a JS::Object that provides a binding to the specified TTQObject. */
-    KJS::Object bind( TTQObject *obj );
+    /** Returns a JS::Object that provides a binding to the specified TQObject. */
+    KJS::Object bind( TQObject *obj );
 
     //
     // Query the supported types
     //
 
     /** Returns a list of the names of the constructors of this interpreter. */
-    TTQStringList constructorNames() const;
+    TQStringList constructorNames() const;
 
     /** Returns a JS Array of the constructors of this interpreter. */
     KJS::Value constructors() const;
@@ -242,7 +242,7 @@ public slots:
     KJSEmbed::XMLActionClient *actionClient() const { return xmlclient; }
 
     /** Loads the XML actions defined in the specified file to the default XMLActionClient. */
-    bool loadActionSet( const TTQString &file );
+    bool loadActionSet( const TQString &file );
 
     //
     // Script environemnt
@@ -258,26 +258,26 @@ public slots:
     JSFactory *factory() const { return jsfactory; }
 
     /** Evaluates the specified string, with the specified value as 'this'. */
-    virtual KJS::Value evaluate( const TTQString &script, const KJS::Value &self=KJS::Null() );
+    virtual KJS::Value evaluate( const TQString &script, const KJS::Value &self=KJS::Null() );
 
     /** Executes the specified string, with the specified value as 'this'. */
-    bool execute( const TTQString &script, const KJS::Value &self=KJS::Null() );
+    bool execute( const TQString &script, const KJS::Value &self=KJS::Null() );
 
     /**
      * Executes the specified string, with the specified value as 'this' and sets
      * result to the completion object returned by the interpreter.
      */
-    virtual bool execute( KJS::Completion &result, const TTQString &script, const KJS::Value &self );
+    virtual bool execute( KJS::Completion &result, const TQString &script, const KJS::Value &self );
 
     /** Loads and runs the specified file. */
-    virtual bool runFile( const TTQString &filename, const KJS::Value &self=KJS::Null() );
+    virtual bool runFile( const TQString &filename, const KJS::Value &self=KJS::Null() );
 
     /**
      * Loads but does not execute the specified script file. If the
      * first line of the file starts with the string '#!' then that
      * line will be omitted from the returned string.
      */
-    TTQString loadFile( const TTQString &file );
+    TQString loadFile( const TQString &file );
 
 protected:
     /** Creates the interpreter. */
@@ -306,8 +306,8 @@ private:
     JSConsoleWidget *jsConsole;
     JSFactory *jsfactory;
     JSBuiltIn *builtins;
-    TTQWidget *widgetparent;
-    TTQCString widgetname;
+    TQWidget *widgetparent;
+    TQCString widgetname;
 
     KJS::Object partobj;
     KJS::Completion res;
diff --git a/kjsembed/kjsembedpart_imp.cpp b/kjsembed/kjsembedpart_imp.cpp
index 599a3f04..abd28782 100644
--- a/kjsembed/kjsembedpart_imp.cpp
+++ b/kjsembed/kjsembedpart_imp.cpp
@@ -29,7 +29,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-KJSEmbedPartImp::KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *jsp, int mid, const TTQString &p )
+KJSEmbedPartImp::KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *jsp, int mid, const TQString &p )
     : JSProxyImp(exec), part(jsp), id(mid), param(p)
 {
 }
@@ -38,8 +38,8 @@ KJSEmbedPartImp::~KJSEmbedPartImp() {}
 
 KJS::Value KJSEmbedPartImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args )
 {
-    TTQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TTQString::null;
-//    TTQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TTQString::null;
+    TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null;
+//    TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null;
 
     if ( id == MethodCreate ) {
 	return part->factory()->create( exec, arg0.latin1(), args.copyTail() );
@@ -48,7 +48,7 @@ KJS::Value KJSEmbedPartImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, c
 	kdWarning() << "KJSEmbedPartImp has no method " << id << endl;
     }
 
-    TTQString msg = i18n( "KJSEmbedPartImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "KJSEmbedPartImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
diff --git a/kjsembed/kjsembedpart_imp.h b/kjsembed/kjsembedpart_imp.h
index a38b286f..ae743fed 100644
--- a/kjsembed/kjsembedpart_imp.h
+++ b/kjsembed/kjsembedpart_imp.h
@@ -47,10 +47,10 @@ public:
 	CustomMethod=0x1000
     };
 
-    KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *part, int id, const TTQString ¶m=TTQString::null );
+    KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *part, int id, const TQString ¶m=TQString::null );
     ~KJSEmbedPartImp();
 
-    TTQString parameter() const { return param; }
+    TQString parameter() const { return param; }
 
     /** Returns true iff this object implements the call function. */
     virtual bool implementsCall() const { return true; }
@@ -61,7 +61,7 @@ public:
 private:
     KJSEmbedPart *part;
     uint id;
-    TTQString param;
+    TQString param;
     class KJSEmbedPartImpPrivate *d;
 };
 
diff --git a/kjsembed/kscript/javascript.cpp b/kjsembed/kscript/javascript.cpp
index 51cc6b4d..22de1aef 100644
--- a/kjsembed/kscript/javascript.cpp
+++ b/kjsembed/kscript/javascript.cpp
@@ -31,7 +31,7 @@
 typedef KGenericFactory JavaScriptFactory;
 K_EXPORT_COMPONENT_FACTORY( libjavascript, JavaScriptFactory( "JavaScript" ) )
 
-JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const TTQStringList &args )
+JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args )
 {
 	ScriptClientInterface = parent;
 	m_jsembed = new KJSEmbed::KJSEmbedPart(this, "kjsembed_part");
@@ -45,25 +45,25 @@ JavaScript::~JavaScript()
 {
 }
 
-TTQString JavaScript::script() const
+TQString JavaScript::script() const
 {
 	return m_scriptLoc;
 }
 
-void JavaScript::setScript( const TTQString &scriptFile  )
+void JavaScript::setScript( const TQString &scriptFile  )
 {
 	m_scriptLoc = scriptFile;
 }
 
-void JavaScript::setScript( const TTQString &scriptFile, const TTQString &method )
+void JavaScript::setScript( const TQString &scriptFile, const TQString &method )
 {
 	m_scriptLoc = scriptFile;
 	m_method = method;
 }
 
-void JavaScript::run(TTQObject *context, const TTQVariant &arg)
+void JavaScript::run(TQObject *context, const TQVariant &arg)
 {
-	TTQVariant retVal;
+	TQVariant retVal;
 	if( context ) m_jsembed->addObject(context);
 
 	m_jsembed->runFile(m_scriptLoc, m_jsembed->globalObject() );
@@ -78,17 +78,17 @@ void JavaScript::run(TTQObject *context, const TTQVariant &arg)
 	ScriptClientInterface->done(KScriptClientInterface::ResultSuccess, retVal);
 }
 
-void JavaScript::writeLine( const TTQString &msg )
+void JavaScript::writeLine( const TQString &msg )
 {
 	ScriptClientInterface->output(msg);
 }
 
-void JavaScript::writeWarning( const TTQString &msg )
+void JavaScript::writeWarning( const TQString &msg )
 {
 	ScriptClientInterface->warning(msg);
 }
 
-void JavaScript::writeError( const TTQString &msg )
+void JavaScript::writeError( const TQString &msg )
 {
 	ScriptClientInterface->error(msg);
 }
@@ -98,7 +98,7 @@ void JavaScript::setProgress( int percent )
 	ScriptClientInterface->progress(percent);
 }
 
-TTQString JavaScript::appID() const
+TQString JavaScript::appID() const
 {
 	return kapp->dcopClient()->appId();
 }
diff --git a/kjsembed/kscript/javascript.h b/kjsembed/kscript/javascript.h
index 2fb07509..fa76a341 100644
--- a/kjsembed/kscript/javascript.h
+++ b/kjsembed/kscript/javascript.h
@@ -31,30 +31,30 @@ namespace KJSEmbed {
 class JavaScript :  public KScriptInterface
 {
 	Q_OBJECT
-	Q_PROPERTY( TTQString appID READ appID )
+	Q_PROPERTY( TQString appID READ appID )
 
 public:
-	JavaScript(KScriptClientInterface *parent, const char *name, const TTQStringList &args);
+	JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args);
 	virtual ~JavaScript();
-	TTQString script() const;
-	void setScript( const TTQString &scriptFile );
-	void setScript( const TTQString &scriptLibFile, const TTQString &method );
-	void run(TTQObject *context = 0, const TTQVariant &arg = 0);
+	TQString script() const;
+	void setScript( const TQString &scriptFile );
+	void setScript( const TQString &scriptLibFile, const TQString &method );
+	void run(TQObject *context = 0, const TQVariant &arg = 0);
 	void kill();
 
-	TTQString appID() const;
+	TQString appID() const;
 
 public slots:
-	void writeLine( const TTQString &msg );
-	void writeWarning( const TTQString &msg );
-	void writeError( const TTQString &msg );
+	void writeLine( const TQString &msg );
+	void writeWarning( const TQString &msg );
+	void writeError( const TQString &msg );
 	void setProgress( int percent );
 
 private:
 	KScriptClientInterface *ScriptClientInterface;
 	KJSEmbed::KJSEmbedPart *m_jsembed;
-	TTQString m_method;
-	TTQString m_scriptLoc;
+	TQString m_method;
+	TQString m_scriptLoc;
 };
 
 #endif
diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp
index 720bfa42..212566ec 100644
--- a/kjsembed/ksimpleprocess.cpp
+++ b/kjsembed/ksimpleprocess.cpp
@@ -21,19 +21,19 @@
 #include "ksimpleprocess.h"
 #include 
 #include 
-static TTQStringList  splitArgList( const TTQString &args)
+static TQStringList  splitArgList( const TQString &args)
 {
-	TTQStringList returnArgs = TTQStringList::split( ' ', args);
+	TQStringList returnArgs = TQStringList::split( ' ', args);
 	return returnArgs;
 }
 
-TTQString KSimpleProcess::exec( const TTQString &args, bool addStdErr )
+TQString KSimpleProcess::exec( const TQString &args, bool addStdErr )
 {
 	KSimpleProcess proc;
 	return proc.execInternal( args, addStdErr);
 }
 
-TTQString KSimpleProcess::execInternal( const TTQString &args, bool addStdError)
+TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError)
 {
 	m_proc->setArguments( splitArgList( args ));
 	connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited()));
@@ -47,11 +47,11 @@ TTQString KSimpleProcess::execInternal( const TTQString &args, bool addStdError)
 	return m_currBuffer;
 }
 
-KSimpleProcess::KSimpleProcess() : TTQObject(0,0)
+KSimpleProcess::KSimpleProcess() : TQObject(0,0)
 {
 	m_currBuffer = "";
 	m_stdErrOn = false;
-	m_proc = new TTQProcess(this);
+	m_proc = new TQProcess(this);
 }
 
 KSimpleProcess::~KSimpleProcess()
@@ -61,13 +61,13 @@ KSimpleProcess::~KSimpleProcess()
 
 
 // If a troll sees this, he kills david not me
-void qt_enter_modal( TTQWidget *widget );
-void qt_leave_modal( TTQWidget *widget );
+void qt_enter_modal( TQWidget *widget );
+void qt_leave_modal( TQWidget *widget );
 
 void KSimpleProcess::enter_loop()
 {
-  TTQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TTQWidget::NoFocus );
+  TQWidget dummy(0,0,WType_Dialog | WShowModal);
+  dummy.setFocusPolicy( TQWidget::NoFocus );
   qt_enter_modal(&dummy);
   qApp->enter_loop();
   qt_leave_modal(&dummy);
diff --git a/kjsembed/ksimpleprocess.h b/kjsembed/ksimpleprocess.h
index 0fd5745d..c066490e 100644
--- a/kjsembed/ksimpleprocess.h
+++ b/kjsembed/ksimpleprocess.h
@@ -43,21 +43,21 @@ public:
      * in value.
      * Example:
      *\code
-     * TTQString myProc = KSimpleProcess::exec( "ps -uh" );
+     * TQString myProc = KSimpleProcess::exec( "ps -uh" );
      * kdDebug() << "Running Processes\n" << myProc << endl;
      *\endcode
      */
-    static TTQString exec( const TTQString &args, bool addStdErr = false );
+    static TQString exec( const TQString &args, bool addStdErr = false );
 
 private:
     KSimpleProcess();
     ~KSimpleProcess();
     void enter_loop();
-    TTQString execInternal( const TTQString &args, bool addStdError);
+    TQString execInternal( const TQString &args, bool addStdError);
     
-    TTQString m_currBuffer;
+    TQString m_currBuffer;
     bool m_stdErrOn;
-    TTQProcess *m_proc;
+    TQProcess *m_proc;
 
 public slots:
     void slotProcessExited();
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index 469436bb..f53afc0c 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libjsconsoleplugin, JSConsolePluginFactory( "jsconso
 //
 namespace KJSEmbed {
 
-JSConsolePlugin::JSConsolePlugin( TTQObject *parent, const char *name, const TTQStringList & )
+JSConsolePlugin::JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & )
     : KParts::Plugin( parent, name )
 {
     js = 0;
diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h
index 85b3bef4..18a17ed9 100644
--- a/kjsembed/plugin/jsconsoleplugin.h
+++ b/kjsembed/plugin/jsconsoleplugin.h
@@ -39,7 +39,7 @@ class JSConsolePlugin : public KParts::Plugin
     Q_OBJECT
 
 public:
-    JSConsolePlugin( TTQObject *parent, const char *name, const TTQStringList & );
+    JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & );
     ~JSConsolePlugin();
 
 private slots:
diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp
index 13bf0526..b883ff66 100644
--- a/kjsembed/plugins/customobject_plugin.cpp
+++ b/kjsembed/plugins/customobject_plugin.cpp
@@ -39,10 +39,10 @@ class MyCustomObject
 	public:
 	enum Mode { On, Off };
 	Mode mode;
-	TTQString thing;
+	TQString thing;
 };
 
-MyCustomObjectLoader::MyCustomObjectLoader( TTQObject *parent, const char *name, const TTQStringList &args ) :
+MyCustomObjectLoader::MyCustomObjectLoader( TQObject *parent, const char *name, const TQStringList &args ) :
 	JSBindingPlugin(parent, name, args)
 {
 }
@@ -170,9 +170,9 @@ int MyCustomObjectImp::extractInt( KJS::ExecState *exec, const KJS::List &args,
 {
      return (args.size() > idx) ? args[idx].toInteger(exec) : 0;
 }
-TTQString MyCustomObjectImp::extractString(KJS::ExecState *exec, const KJS::List &args, int idx)
+TQString MyCustomObjectImp::extractString(KJS::ExecState *exec, const KJS::List &args, int idx)
 {
-     return (args.size() > idx) ? args[idx].toString(exec).qstring() : TTQString::null;
+     return (args.size() > idx) ? args[idx].toString(exec).qstring() : TQString::null;
 }
 
 } // namespace KJSEmbed::Bindings
diff --git a/kjsembed/plugins/customobject_plugin.h b/kjsembed/plugins/customobject_plugin.h
index aef20616..5f417e69 100644
--- a/kjsembed/plugins/customobject_plugin.h
+++ b/kjsembed/plugins/customobject_plugin.h
@@ -31,7 +31,7 @@ namespace Bindings {
 class KJSEMBED_EXPORT MyCustomObjectLoader : public JSBindingPlugin
 {
 public:
-    MyCustomObjectLoader( TTQObject *parent, const char *name, const TTQStringList &args );
+    MyCustomObjectLoader( TQObject *parent, const char *name, const TQStringList &args );
     KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
 };
 
@@ -58,7 +58,7 @@ public:
 
 private:
     int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx);
-    TTQString extractString(KJS::ExecState *exec, const KJS::List &args, int idx);
+    TQString extractString(KJS::ExecState *exec, const KJS::List &args, int idx);
     int mid;
 };
 
diff --git a/kjsembed/plugins/customqobject_plugin.cpp b/kjsembed/plugins/customqobject_plugin.cpp
index 8538dffc..74d39bc3 100644
--- a/kjsembed/plugins/customqobject_plugin.cpp
+++ b/kjsembed/plugins/customqobject_plugin.cpp
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-MyCustomTQObjectLoader::MyCustomTQObjectLoader( TTQObject *parent, const char *name, const TTQStringList &args ) :
+MyCustomTQObjectLoader::MyCustomTQObjectLoader( TQObject *parent, const char *name, const TQStringList &args ) :
 	JSBindingPlugin(parent, name, args)
 {
 }
@@ -41,7 +41,7 @@ KJS::Object MyCustomTQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::Exe
 {
 	kdDebug() << "Loading a custom object" << endl;
 
-	TTQObject *parent = 0L;
+	TQObject *parent = 0L;
 	JSObjectProxy *proxy = JSProxy::toObjectProxy( args[0].imp() );
 	if ( proxy )
 		parent = proxy->object();
@@ -54,8 +54,8 @@ KJS::Object MyCustomTQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::Exe
 	return proxyObj;
 }
 
-MyCustomTQObjectImp::MyCustomTQObjectImp(TTQObject *parent, const char *name )
-    : TTQObject(parent, name)
+MyCustomTQObjectImp::MyCustomTQObjectImp(TQObject *parent, const char *name )
+    : TQObject(parent, name)
 {
 	kdDebug() << "New MyCustomTQObjectImp " << endl;
 }
@@ -74,12 +74,12 @@ void MyCustomTQObjectImp::setMode( Mode md)
 	kdDebug() << "setMode() " << endl;
 	m_mode = md;
 }
-TTQString MyCustomTQObjectImp::thing() const
+TQString MyCustomTQObjectImp::thing() const
 {
 	kdDebug() << "thing()" << endl;
 	return m_thing;
 }
-void MyCustomTQObjectImp::setThing( const TTQString &t)
+void MyCustomTQObjectImp::setThing( const TQString &t)
 {
 	kdDebug() << "setThing() " << t << endl;
 	m_thing = t;
diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h
index 9af6aee6..42d7236b 100644
--- a/kjsembed/plugins/customqobject_plugin.h
+++ b/kjsembed/plugins/customqobject_plugin.h
@@ -32,33 +32,33 @@ namespace Bindings {
 class MyCustomTQObjectLoader : public JSBindingPlugin
 {
 public:
-    MyCustomTQObjectLoader( TTQObject *parent, const char *name, const TTQStringList &args );
+    MyCustomTQObjectLoader( TQObject *parent, const char *name, const TQStringList &args );
     virtual ~MyCustomTQObjectLoader(){;}
     KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
 };
 
 
-class MyCustomTQObjectImp : public TTQObject {
+class MyCustomTQObjectImp : public TQObject {
 
 Q_OBJECT
 	
     /** Identifiers for the methods provided by this class. */
     enum Mode { On, Off };
 	Q_PROPERTY(Mode mode READ mode WRITE setMode)
-	Q_PROPERTY(TTQString thing READ thing WRITE setThing)
+	Q_PROPERTY(TQString thing READ thing WRITE setThing)
 	Q_ENUMS(Mode)
 public:
-    MyCustomTQObjectImp( TTQObject *parent, const char *name);
+    MyCustomTQObjectImp( TQObject *parent, const char *name);
     virtual ~MyCustomTQObjectImp();
 
 public slots:
 	Mode mode() const;
 	void setMode( Mode md);
-	TTQString thing() const;
-	void setThing( const TTQString &t);
+	TQString thing() const;
+	void setThing( const TQString &t);
 private:
 	Mode m_mode;
-	TTQString m_thing;
+	TQString m_thing;
 	
 };
 
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index 7aa81b3c..ef3d0ed0 100644
--- a/kjsembed/plugins/imagefx_plugin.cpp
+++ b/kjsembed/plugins/imagefx_plugin.cpp
@@ -36,7 +36,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 
-ImageFXLoader::ImageFXLoader( TTQObject *parent, const char *name, const TTQStringList &args ) :
+ImageFXLoader::ImageFXLoader( TQObject *parent, const char *name, const TQStringList &args ) :
 	JSBindingPlugin(parent, name, args)
 {
 }
@@ -206,116 +206,116 @@ KJS::Value ImageFX::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
     KJS::Value retValue = KJS::Value();
     switch ( mid ) {
     case Methodgradient: {
-            TTQSize size = extractTQSize(exec, args, 0);
-            TTQColor ca = extractTQColor(exec, args, 1);
-            TTQColor cb = extractTQColor(exec, args, 2);
+            TQSize size = extractTQSize(exec, args, 0);
+            TQColor ca = extractTQColor(exec, args, 1);
+            TQColor cb = extractTQColor(exec, args, 2);
             int type = extractInt( exec, args, 3);
             int ncols = extractInt( exec, args, 4);
-	    TTQImage img = KImageEffect::gradient(size, ca, cb, (KImageEffect::GradientType)type, ncols);
+	    TQImage img = KImageEffect::gradient(size, ca, cb, (KImageEffect::GradientType)type, ncols);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodunbalancedGradient: {
-            TTQSize size = extractTQSize(exec, args, 0);
-            TTQColor ca = extractTQColor(exec, args, 1);
-            TTQColor cb = extractTQColor(exec, args, 2);
+            TQSize size = extractTQSize(exec, args, 0);
+            TQColor ca = extractTQColor(exec, args, 1);
+            TQColor cb = extractTQColor(exec, args, 2);
             int type = extractInt( exec, args, 3);
             int xfactor = extractInt( exec, args, 4);
             int yfactor = extractInt( exec, args, 5);
             int ncols = extractInt( exec, args, 6);
-            TTQImage img = KImageEffect::unbalancedGradient(size, ca, cb, (KImageEffect::GradientType)type, xfactor, yfactor, ncols);
+            TQImage img = KImageEffect::unbalancedGradient(size, ca, cb, (KImageEffect::GradientType)type, xfactor, yfactor, ncols);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodblendColor: {
-            TTQColor clr = extractTQColor(exec, args, 0);
-	    TTQImage dst = extractTQImage(exec, args, 1);
+            TQColor clr = extractTQColor(exec, args, 0);
+	    TQImage dst = extractTQImage(exec, args, 1);
             float opacity = (float)extractDouble(exec, args, 2);
-	    TTQImage img = KImageEffect::blend(clr, dst, opacity);
+	    TQImage img = KImageEffect::blend(clr, dst, opacity);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodblendImage: {
-            TTQImage src = extractTQImage(exec, args, 0);
-	    TTQImage dst = extractTQImage(exec, args, 1);
+            TQImage src = extractTQImage(exec, args, 0);
+	    TQImage dst = extractTQImage(exec, args, 1);
             float opacity = (float)extractDouble(exec, args, 2);
-	    TTQImage img = KImageEffect::blend(src, dst, opacity);
+	    TQImage img = KImageEffect::blend(src, dst, opacity);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodcomputeDestinationRect: {
-            TTQSize lowerSize = extractTQSize(exec, args, 0);
+            TQSize lowerSize = extractTQSize(exec, args, 0);
             int disposition = extractInt(exec, args, 1);
-	    TTQImage upper = extractTQImage(exec, args, 2);
-	    TTQRect rect = KImageEffect::computeDestinationRect(lowerSize,  (KImageEffect::Disposition) disposition, upper);
+	    TQImage upper = extractTQImage(exec, args, 2);
+	    TQRect rect = KImageEffect::computeDestinationRect(lowerSize,  (KImageEffect::Disposition) disposition, upper);
             retValue = convertToValue(exec, rect);
 	    break;
         }
     case MethodchannelIntensity: {
-    	    TTQImage image = extractTQImage(exec, args, 0);
+    	    TQImage image = extractTQImage(exec, args, 0);
             float percent = (float)extractDouble(exec, args, 1);
             int channel = extractInt(exec, args, 2);
-	    TTQImage img = KImageEffect::channelIntensity(image, percent, (KImageEffect::RGBComponent)channel);
+	    TQImage img = KImageEffect::channelIntensity(image, percent, (KImageEffect::RGBComponent)channel);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodfade: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             float val = (float)extractDouble(exec, args, 1);
-            TTQColor color = extractTQColor(exec, args, 2);
-	    TTQImage img = KImageEffect::fade(image, val, color);
+            TQColor color = extractTQColor(exec, args, 2);
+	    TQImage img = KImageEffect::fade(image, val, color);
             retValue = convertToValue(exec, img);
             break;
         }
     case Methodflatten: {
-            TTQImage image = extractTQImage(exec, args, 0);
-	    TTQColor ca = extractTQColor(exec, args, 1);
-            TTQColor cb = extractTQColor(exec, args, 2);
+            TQImage image = extractTQImage(exec, args, 0);
+	    TQColor ca = extractTQColor(exec, args, 1);
+            TQColor cb = extractTQColor(exec, args, 2);
             int ncols = extractInt(exec, args, 3);
-	    TTQImage img = KImageEffect::flatten(image, ca, cb, ncols);
+	    TQImage img = KImageEffect::flatten(image, ca, cb, ncols);
             retValue = convertToValue(exec, img);
             break;
         }
     case Methodhash: {
 
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    int lite  = extractInt(exec, args, 1);
             int spacing = extractInt(exec, args, 2);
-	    TTQImage img = KImageEffect::hash(image, (KImageEffect::Lighting)lite, spacing);
+	    TQImage img = KImageEffect::hash(image, (KImageEffect::Lighting)lite, spacing);
             retValue = convertToValue(exec, img);
             break;
         }
     case Methodintensity: {
 
-	    TTQImage image = extractTQImage(exec, args, 0);
+	    TQImage image = extractTQImage(exec, args, 0);
 	    float percent = (float)extractDouble(exec, args, 1);
-            TTQImage img = KImageEffect::intensity(image, percent);
+            TQImage img = KImageEffect::intensity(image, percent);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodmodulate: {
-            TTQImage image = extractTQImage(exec, args, 0);
-	    TTQImage modImage = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
+	    TQImage modImage = extractTQImage(exec, args, 0);
             bool reverse = extractBool(exec, args, 1);
             int type = extractInt(exec, args, 2);
             int factor = extractInt(exec, args, 3);
             int channel = extractInt(exec, args, 4);
-	    TTQImage img = KImageEffect::modulate(image, modImage, reverse, (KImageEffect::ModulationType)type, factor, (KImageEffect::RGBComponent)channel);
+	    TQImage img = KImageEffect::modulate(image, modImage, reverse, (KImageEffect::ModulationType)type, factor, (KImageEffect::RGBComponent)channel);
             retValue = convertToValue(exec, img);
             break;
         }
 
     case MethodtoGray: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    bool fast = extractBool(exec, args, 1);
-            TTQImage img = KImageEffect::toGray(image, fast);
+            TQImage img = KImageEffect::toGray(image, fast);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methoddesaturate: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    float desat = (float)extractDouble(exec, args, 1);
-            TTQImage img = KImageEffect::desaturate(image, desat);
+            TQImage img = KImageEffect::desaturate(image, desat);
 	    retValue = convertToValue(exec, img);
             break;
         }
@@ -326,193 +326,193 @@ KJS::Value ImageFX::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li
         }
     case MethodselectedImage: {
 
-            TTQImage image = extractTQImage(exec, args, 0);
-	    TTQColor col = extractTQColor(exec, args, 1);
-            TTQImage img = KImageEffect::selectedImage(image, col);
+            TQImage image = extractTQImage(exec, args, 0);
+	    TQColor col = extractTQColor(exec, args, 1);
+            TQImage img = KImageEffect::selectedImage(image, col);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodcontrastHSV: {
-	    TTQImage image = extractTQImage(exec, args, 0);
+	    TQImage image = extractTQImage(exec, args, 0);
 	    bool sharpen = extractBool(exec, args, 1);
             KImageEffect::contrastHSV(image, sharpen);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodnormalize: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             KImageEffect::normalize(image);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodequalize: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             KImageEffect::equalize(image);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodthreshold: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    uint value = extractUInt(exec, args, 1);
             KImageEffect::threshold(image, value);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodsolarize: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             double factor = extractDouble(exec, args, 1);
             KImageEffect::solarize(image, factor);
 	    retValue = convertToValue(exec, image);
             break;
         }
     case Methodemboss: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TTQImage img = KImageEffect::emboss(image, radius, sigma);
+            TQImage img = KImageEffect::emboss(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methoddespeckle: {
-            TTQImage image = extractTQImage(exec, args, 0);
-	    TTQImage img = KImageEffect::despeckle(image);
+            TQImage image = extractTQImage(exec, args, 0);
+	    TQImage img = KImageEffect::despeckle(image);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodcharcoal: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double factor = extractDouble(exec, args, 1);
-            TTQImage img = KImageEffect::charcoal( image, factor);
+            TQImage img = KImageEffect::charcoal( image, factor);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodcharcoal2: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TTQImage img = KImageEffect::charcoal(image, radius, sigma);
+            TQImage img = KImageEffect::charcoal(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodrotate: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    int r = extractInt(exec, args, 1);
-            TTQImage img = KImageEffect::rotate(image, (KImageEffect::RotateDirection) r);
+            TQImage img = KImageEffect::rotate(image, (KImageEffect::RotateDirection) r);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodsample: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             int width = extractInt(exec, args, 1);
             int height = extractInt(exec, args, 2);
-            TTQImage img = KImageEffect::sample(image, width, height);
+            TQImage img = KImageEffect::sample(image, width, height);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodaddNoise: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             int type = extractInt(exec, args, 1);
-            TTQImage img = KImageEffect::addNoise(image, (KImageEffect::NoiseType) type);
+            TQImage img = KImageEffect::addNoise(image, (KImageEffect::NoiseType) type);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodblur: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TTQImage img = KImageEffect::blur(image, radius, sigma);
+            TQImage img = KImageEffect::blur(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodedge: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
-            TTQImage img = KImageEffect::edge(image, radius);
+            TQImage img = KImageEffect::edge(image, radius);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodimplode: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double factor = extractDouble(exec, args, 1);
             uint background = extractUInt(exec, args, 2);
-            TTQImage img = KImageEffect::implode(image, factor, background);
+            TQImage img = KImageEffect::implode(image, factor, background);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case MethodoilPaintConvolve: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
-            TTQImage img = KImageEffect::oilPaintConvolve(image, radius);
+            TQImage img = KImageEffect::oilPaintConvolve(image, radius);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case MethodoilPaint: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
             int radius = extractInt(exec, args, 1);
-            TTQImage img = KImageEffect::oilPaint(image, radius);
+            TQImage img = KImageEffect::oilPaint(image, radius);
 	    retValue = convertToValue(exec, img);
             break;
         }
 
 
     case Methodsharpen: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double factor = extractDouble(exec, args, 1);
-            TTQImage img = KImageEffect::sharpen(image, factor);
+            TQImage img = KImageEffect::sharpen(image, factor);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodsharpen2: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double radius = extractDouble(exec, args, 1);
             double sigma = extractDouble(exec, args, 2);
-            TTQImage img = KImageEffect::sharpen(image, radius, sigma);
+            TQImage img = KImageEffect::sharpen(image, radius, sigma);
 	    retValue = convertToValue(exec, img);
             break;
         }
     case Methodspread: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    uint amount = extractUInt(exec, args, 1);
-            TTQImage img = KImageEffect::spread(image, amount);
+            TQImage img = KImageEffect::spread(image, amount);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodshade: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    bool color_shading = extractBool(exec, args, 1);
             double azimuth = extractDouble(exec, args, 2);
             double elevation = extractDouble(exec, args, 3);
-            TTQImage img = KImageEffect::shade(image, color_shading, azimuth, elevation);
+            TQImage img = KImageEffect::shade(image, color_shading, azimuth, elevation);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodswirl: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double degrees  = extractDouble(exec, args, 1);
             uint background = extractUInt(exec, args, 2);
-            TTQImage img = KImageEffect::swirl(image, degrees, background);
+            TQImage img = KImageEffect::swirl(image, degrees, background);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodwave: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    double amplitude  = extractDouble(exec, args, 1);
             double frequency  = extractDouble(exec, args, 2);
             uint background = extractUInt(exec, args, 3);
-            TTQImage img = KImageEffect::wave(image, amplitude, frequency, background);
+            TQImage img = KImageEffect::wave(image, amplitude, frequency, background);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case Methodcontrast: {
-            TTQImage image = extractTQImage(exec, args, 0);
+            TQImage image = extractTQImage(exec, args, 0);
 	    int c = extractInt(exec, args, 1);
-            TTQImage img = KImageEffect::contrast(image, c);
+            TQImage img = KImageEffect::contrast(image, c);
             retValue = convertToValue(exec, img);
 	    break;
         }
     case MethodbumpMap: {
-        TTQImage mask = extractTQImage(exec, args, 0);
-        TTQImage img = bumpmap(img,
+        TQImage mask = extractTQImage(exec, args, 0);
+        TQImage img = bumpmap(img,
 	                                        mask,
 						extractDouble(exec, args, 1),
 						extractDouble(exec, args, 2),
@@ -771,12 +771,12 @@ static void bumpmap_row( uint           *src,
  * @return The destination image (dst) containing the result.
  * @author Zack Rusin 
  */
-TTQImage ImageFX::bumpmap(TTQImage &img, TTQImage &map, double azimuth, double elevation,
+TQImage ImageFX::bumpmap(TQImage &img, TQImage &map, double azimuth, double elevation,
                int depth, int xofs, int yofs, int waterlevel,
                int ambient, bool compensate, bool invert,
                BumpmapType type, bool tiled)
 {
-    TTQImage dst;
+    TQImage dst;
 
     if ( img.depth() != 32 || img.depth() != 32 ) {
         qWarning( "Bump-mapping effect works only with 32 bit images");
diff --git a/kjsembed/plugins/imagefx_plugin.h b/kjsembed/plugins/imagefx_plugin.h
index 7e1f10d0..b4f4c6a6 100644
--- a/kjsembed/plugins/imagefx_plugin.h
+++ b/kjsembed/plugins/imagefx_plugin.h
@@ -34,7 +34,7 @@ namespace Bindings {
 class ImageFXLoader : public JSBindingPlugin
 {
 public:
-    ImageFXLoader( TTQObject *parent, const char *name, const TTQStringList &args );
+    ImageFXLoader( TQObject *parent, const char *name, const TQStringList &args );
     KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
 };
 enum BumpmapType {
@@ -76,23 +76,23 @@ class ImageFX : JSProxyImp
 	
 	private:
 		// Image effects
-		void gradient(const TTQSize &size, const TTQColor &ca, const TTQColor &cb, KImageEffect::GradientType type, int ncols);
-		void unbalancedGradient(const TTQSize &size, const TTQColor &ca,const TTQColor &cb, KImageEffect::GradientType type, int xfactor,int yfactor, int ncols);
-		void blendColor(const TTQColor& clr, float opacity);
-		void blendImage(TTQImage& blendImage, float opacity);
-		TTQRect computeDestinationRect(const TTQSize &lowerSize,KImageEffect::Disposition disposition);
+		void gradient(const TQSize &size, const TQColor &ca, const TQColor &cb, KImageEffect::GradientType type, int ncols);
+		void unbalancedGradient(const TQSize &size, const TQColor &ca,const TQColor &cb, KImageEffect::GradientType type, int xfactor,int yfactor, int ncols);
+		void blendColor(const TQColor& clr, float opacity);
+		void blendImage(TQImage& blendImage, float opacity);
+		TQRect computeDestinationRect(const TQSize &lowerSize,KImageEffect::Disposition disposition);
 		
 		void channelIntensity(float percent,KImageEffect::RGBComponent channel);
-		void fade(float val, const TTQColor &color);
-		void flatten(const TTQColor &ca,const TTQColor &cb, int ncols);
+		void fade(float val, const TQColor &color);
+		void flatten(const TQColor &ca,const TQColor &cb, int ncols);
 		void hash(KImageEffect::Lighting lite,uint spacing);
 		void intensity(float percent);
-		void modulate(TTQImage &modImage, bool reverse,KImageEffect::ModulationType type, int factor, KImageEffect::RGBComponent channel);
+		void modulate(TQImage &modImage, bool reverse,KImageEffect::ModulationType type, int factor, KImageEffect::RGBComponent channel);
 		void toGray(bool fast);
 		void desaturate(float desat);
 		void contrast(int c);
-		void dither(const TTQColor *palette, int size);
-		void selectedImage(  const TTQColor &col );
+		void dither(const TQColor *palette, int size);
+		void selectedImage(  const TQColor &col );
 		void contrastHSV( bool sharpen);
 		void normalize();
 		void equalize();
@@ -118,7 +118,7 @@ class ImageFX : JSProxyImp
 		void swirl(double degrees, uint background);
 		void wave(double amplitude, double frequency,uint background);
 		
-		TTQImage bumpmap(TTQImage &img, TTQImage &map, double azimuth=135.0, double elevation=45.0, int depth=3, int xofs=0, int yofs=0, int waterlevel=0, int ambient=0, bool compensate=false, bool invert=false, BumpmapType type=Linear, bool tiled=false);
+		TQImage bumpmap(TQImage &img, TQImage &map, double azimuth=135.0, double elevation=45.0, int depth=3, int xofs=0, int yofs=0, int waterlevel=0, int ambient=0, bool compensate=false, bool invert=false, BumpmapType type=Linear, bool tiled=false);
 			
 		int mid;
 };
diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/kfileitemloader.cpp
index d548e4bd..e3fcdb7f 100644
--- a/kjsembed/plugins/kfileitemloader.cpp
+++ b/kjsembed/plugins/kfileitemloader.cpp
@@ -31,7 +31,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-KFileItemLoader::KFileItemLoader(TTQObject *parent, const char *name, const TTQStringList &args)
+KFileItemLoader::KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args)
  : JSBindingPlugin(parent, name, args)
 {
 }
@@ -147,13 +147,13 @@ KJS::Value KJSEmbed::Bindings::KFileItemImp::call( KJS::ExecState * exec, KJS::O
 		break;
 	case Methodurl:
 	{
-		TTQString url = obj->url().url();
+		TQString url = obj->url().url();
 		retValue = KJS::String(url);
 		break;
 	}
 	case MethodsetUrl:
 	{
-		TTQString url = extractTQString(exec, args, 0);
+		TQString url = extractTQString(exec, args, 0);
 		obj->setURL(url);
 		break;
 	}
diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/kfileitemloader.h
index bfa0ad89..384379f3 100644
--- a/kjsembed/plugins/kfileitemloader.h
+++ b/kjsembed/plugins/kfileitemloader.h
@@ -34,7 +34,7 @@ namespace Bindings {
 class KFileItemLoader : public JSBindingPlugin
 {
 public:
-    KFileItemLoader(TTQObject *parent, const char *name, const TTQStringList &args);
+    KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args);
 
     ~KFileItemLoader();
 
diff --git a/kjsembed/plugins/qprocess_plugin.cpp b/kjsembed/plugins/qprocess_plugin.cpp
index 085334ef..3106fd8f 100644
--- a/kjsembed/plugins/qprocess_plugin.cpp
+++ b/kjsembed/plugins/qprocess_plugin.cpp
@@ -32,7 +32,7 @@
 namespace KJSEmbed {
 namespace Bindings {
 
-ProcessLoader::ProcessLoader( TTQObject *parent, const char *name, const TTQStringList &args ) :
+ProcessLoader::ProcessLoader( TQObject *parent, const char *name, const TQStringList &args ) :
 	JSBindingPlugin(parent, name, args)
 {
 }
@@ -41,7 +41,7 @@ KJS::Object ProcessLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *e
 {
 	kdDebug() << "Loading a process object" << endl;
 
-	TTQObject *parent = 0L;
+	TQObject *parent = 0L;
 	JSObjectProxy *proxy = JSProxy::toObjectProxy( args[0].imp() );
 	if ( proxy )
 		parent = proxy->object();
@@ -54,8 +54,8 @@ KJS::Object ProcessLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *e
 	return proxyObj;
 }
 
-ProcessImp::ProcessImp(TTQObject *parent, const char *name )
-    : TTQProcess(parent, name)
+ProcessImp::ProcessImp(TQObject *parent, const char *name )
+    : TQProcess(parent, name)
 {
 	kdDebug() << "New ProcessImp " << endl;
 }
@@ -64,73 +64,73 @@ ProcessImp::~ProcessImp()
 {
 }
 
-TTQStringList ProcessImp::arguments() const
+TQStringList ProcessImp::arguments() const
 {
-	return TTQProcess::arguments();
+	return TQProcess::arguments();
 }
-void ProcessImp::setArguments( const TTQStringList args)
+void ProcessImp::setArguments( const TQStringList args)
 {
-	TTQProcess::setArguments( args );
+	TQProcess::setArguments( args );
 }
 
 ProcessImp::Communication ProcessImp::communication() const
 {
-	return (ProcessImp::Communication)TTQProcess::communication();
+	return (ProcessImp::Communication)TQProcess::communication();
 }
 void ProcessImp::setCommunication( Communication comm)
 {
-	TTQProcess::setCommunication( comm );
+	TQProcess::setCommunication( comm );
 }
 
 bool ProcessImp::canReadLineStdout() const
 {
-	return TTQProcess::canReadLineStdout();
+	return TQProcess::canReadLineStdout();
 }
 bool ProcessImp::canReadLineStderr() const
 {
-	return TTQProcess::canReadLineStderr();
+	return TQProcess::canReadLineStderr();
 }
 bool ProcessImp::isRunning() const
 {
-	return TTQProcess::isRunning();
+	return TQProcess::isRunning();
 }
 bool ProcessImp::normalExit() const
 {
-	return TTQProcess::normalExit();
+	return TQProcess::normalExit();
 }
 int ProcessImp::exitStatus() const
 {
-	return TTQProcess::exitStatus();
+	return TQProcess::exitStatus();
 }
 
 bool ProcessImp::start()
 {
-	return TTQProcess::start( );
+	return TQProcess::start( );
 }
 
-TTQString ProcessImp::readLineStdout ()
+TQString ProcessImp::readLineStdout ()
 {
-	return TTQProcess::readLineStdout();
+	return TQProcess::readLineStdout();
 }
 
-TTQString ProcessImp::readLineStderr ()
+TQString ProcessImp::readLineStderr ()
 {
-	return TTQProcess::readLineStderr();
+	return TQProcess::readLineStderr();
 }
 
-TTQDir ProcessImp::workingDirectory () const
+TQDir ProcessImp::workingDirectory () const
 {
-	return TTQProcess::workingDirectory();
+	return TQProcess::workingDirectory();
 }
 
-void ProcessImp::setWorkingDirectory ( const TTQDir & dir )
+void ProcessImp::setWorkingDirectory ( const TQDir & dir )
 {
-	TTQProcess::setWorkingDirectory( dir );
+	TQProcess::setWorkingDirectory( dir );
 }
 
-void ProcessImp::addArgument ( const TTQString & arg )
+void ProcessImp::addArgument ( const TQString & arg )
 {
-	TTQProcess::addArgument( arg );
+	TQProcess::addArgument( arg );
 }
 
 } // namespace KJSEmbed::Bindings
diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h
index 66d79f99..c5ffe4a5 100644
--- a/kjsembed/plugins/qprocess_plugin.h
+++ b/kjsembed/plugins/qprocess_plugin.h
@@ -33,20 +33,20 @@ namespace Bindings {
 class ProcessLoader : public JSBindingPlugin
 {
 public:
-    ProcessLoader( TTQObject *parent, const char *name, const TTQStringList &args );
+    ProcessLoader( TQObject *parent, const char *name, const TQStringList &args );
     virtual ~ProcessLoader(){;}
     KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const;
 };
 
 
-class ProcessImp : public TTQProcess {
+class ProcessImp : public TQProcess {
 
 Q_OBJECT
 
     /** Identifiers for the methods provided by this class. */
 	enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 };
 
-	Q_PROPERTY(TTQStringList arguments READ arguments WRITE setArguments )
+	Q_PROPERTY(TQStringList arguments READ arguments WRITE setArguments )
 	Q_PROPERTY(Communication communication READ communication WRITE setCommunication)
 	Q_PROPERTY(bool canReadLineStdout READ canReadLineStdout )
 	Q_PROPERTY(bool canReadLineStderr READ canReadLineStderr )
@@ -56,11 +56,11 @@ Q_OBJECT
 	Q_ENUMS(Communication)
 
 public:
-    ProcessImp( TTQObject *parent = 0, const char *name = 0);
+    ProcessImp( TQObject *parent = 0, const char *name = 0);
     virtual ~ProcessImp();
 
-    TTQStringList arguments() const;
-    void setArguments( const TTQStringList args);
+    TQStringList arguments() const;
+    void setArguments( const TQStringList args);
 
     Communication communication() const;
     void setCommunication( Communication comm);
@@ -73,11 +73,11 @@ public:
 
 public slots:
 	bool start();
-	virtual TTQString readLineStdout ();
-	virtual TTQString readLineStderr ();
-	TTQDir workingDirectory () const;
-	void setWorkingDirectory ( const TTQDir & dir );
-	void addArgument ( const TTQString & arg );
+	virtual TQString readLineStdout ();
+	virtual TQString readLineStderr ();
+	TQDir workingDirectory () const;
+	void setWorkingDirectory ( const TQDir & dir );
+	void addArgument ( const TQString & arg );
 };
 
 } // namespace
diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp
index c985a6b3..18da9bec 100644
--- a/kjsembed/qjscmd.cpp
+++ b/kjsembed/qjscmd.cpp
@@ -41,8 +41,8 @@ int main( int argc, char **argv )
 #   endif
 #endif
     // Setup TQApplication
-    TTQApplication *app;
-    app = new TTQApplication( argc, argv );
+    TQApplication *app;
+    app = new TQApplication( argc, argv );
     app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) );
 
     // Setup Interpreter
@@ -73,7 +73,7 @@ int main( int argc, char **argv )
     }
 
     int result = 0;
-    part->execute( TTQString("include('cmdline.js');") );
+    part->execute( TQString("include('cmdline.js');") );
 
     return result;
 }
diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp
index d686d862..22e8c40b 100644
--- a/kjsembed/qtbindings/qcanvas_imp.cpp
+++ b/kjsembed/qtbindings/qcanvas_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasImp::TQCanvasImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasImp::TQCanvasImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasImp::~TQCanvasImp()
+TQCanvasImp::~TQCanvasImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -116,7 +116,7 @@ void TQCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -129,25 +129,25 @@ void TQCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvas pointer from an Object.
+ * Extract a TQCanvas pointer from an Object.
  */
-TTQCanvas *TQCanvasImp::toTQCanvas( KJS::Object &self )
+TQCanvas *TQCanvasImp::toTQCanvas( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvas" )
+    if ( op->typeName() != "TQCanvas" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -173,7 +173,7 @@ KJS::Object TQCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args
              break;
     }
 
-    TTQString msg = i18n("TQCanvasCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -181,21 +181,21 @@ KJS::Object TQCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args
 KJS::Object TQCanvasImp::TQCanvas_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQObject *
+    // Unsupported parameter TQObject *
 
-    TTQObject * arg0 = extractTQObject(exec,args,0);
+    TQObject * arg0 = extractTQObject(exec,args,0);
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an instance of the TTQCanvas object
+    // We should now create an instance of the TQCanvas object
 
-    TTQCanvas *ret = new TTQCanvas(
+    TQCanvas *ret = new TQCanvas(
 
           arg0,
           arg1 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
     return KJS::Object( prx );
 }
 
@@ -207,13 +207,13 @@ KJS::Object TQCanvasImp::TQCanvas_2( KJS::ExecState *exec, const KJS::List &args
     int arg1 = extractInt(exec, args, 1);
 
 
-    // We should now create an instance of the TTQCanvas object
+    // We should now create an instance of the TQCanvas object
 
-    TTQCanvas *ret = new TTQCanvas(
+    TQCanvas *ret = new TQCanvas(
 
           arg0,
           arg1 );
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
     return KJS::Object( prx );
 
 }
@@ -223,7 +223,7 @@ KJS::Object TQCanvasImp::TQCanvas_3( KJS::ExecState *exec, const KJS::List &args
 
     // Unsupported parameter TQPixmap
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -234,9 +234,9 @@ KJS::Object TQCanvasImp::TQCanvas_3( KJS::ExecState *exec, const KJS::List &args
     int arg4 = extractInt(exec, args, 4);
 
 
-    // We should now create an instance of the TTQCanvas object
+    // We should now create an instance of the TQCanvas object
 
-    TTQCanvas *ret = new TTQCanvas(
+    TQCanvas *ret = new TQCanvas(
 
           arg0,
           arg1,
@@ -244,7 +244,7 @@ KJS::Object TQCanvasImp::TQCanvas_3( KJS::ExecState *exec, const KJS::List &args
           arg3,
           arg4 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
     return KJS::Object( prx );
 }
 
@@ -450,7 +450,7 @@ KJS::Value TQCanvasImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -461,7 +461,7 @@ KJS::Value TQCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, cons
     // Unsupported parameter TQPixmap
     return KJS::Value();
 
-    TTQPixmap arg0; // Dummy
+    TQPixmap arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -484,7 +484,7 @@ KJS::Value TQCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value TQCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
       instance->setBackgroundPixmap(
        arg0 );
@@ -494,7 +494,7 @@ KJS::Value TQCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object
 
 KJS::Value TQCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQPixmap ret;
+    TQPixmap ret;
       ret = instance->backgroundPixmap(  );
 
        return convertToValue( exec, ret );
@@ -504,7 +504,7 @@ KJS::Value TQCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &o
 KJS::Value TQCanvasImp::setBackgroundColor_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQColor arg0 = extractTQColor(exec, args, 0);
+    TQColor arg0 = extractTQColor(exec, args, 0);
 
       instance->setBackgroundColor(
        arg0 );
@@ -622,7 +622,7 @@ KJS::Value TQCanvasImp::height_18( KJS::ExecState *exec, KJS::Object &obj, const
 
 KJS::Value TQCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQSize ret;
+    TQSize ret;
       ret = instance->size(  );
 
        return convertToValue( exec, ret );
@@ -631,7 +631,7 @@ KJS::Value TQCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const K
 
 KJS::Value TQCanvasImp::rect_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->rect(  );
 
        return convertToValue( exec, ret );
@@ -656,7 +656,7 @@ KJS::Value TQCanvasImp::onCanvas_21( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value TQCanvasImp::onCanvas_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPoint arg0 = extractTQPoint(exec, args, 0);
+    TQPoint arg0 = extractTQPoint(exec, args, 0);
 
       bool ret;
       ret = instance->onCanvas(
@@ -683,7 +683,7 @@ KJS::Value TQCanvasImp::validChunk_23( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::validChunk_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPoint arg0 = extractTQPoint(exec, args, 0);
+    TQPoint arg0 = extractTQPoint(exec, args, 0);
 
       bool ret;
       ret = instance->validChunk(
@@ -775,7 +775,7 @@ KJS::Value TQCanvasImp::setAllChanged_30( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQRect arg0 = extractTQRect(exec, args, 0);
+    TQRect arg0 = extractTQRect(exec, args, 0);
 
       instance->setChanged(
        arg0 );
@@ -786,7 +786,7 @@ KJS::Value TQCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQRect arg0 = extractTQRect(exec, args, 0);
+    TQRect arg0 = extractTQRect(exec, args, 0);
 
       instance->setUnchanged(
        arg0 );
@@ -797,10 +797,10 @@ KJS::Value TQCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -817,10 +817,10 @@ KJS::Value TQCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value TQCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -837,10 +837,10 @@ KJS::Value TQCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Objec
 KJS::Value TQCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -857,10 +857,10 @@ KJS::Value TQCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::
 KJS::Value TQCanvasImp::removeItemFromChunkContaining_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -885,7 +885,7 @@ KJS::Value TQCanvasImp::allItems_37( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value TQCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPoint arg0 = extractTQPoint(exec, args, 0);
+    TQPoint arg0 = extractTQPoint(exec, args, 0);
 
       instance->collisions(
        arg0 );
@@ -896,7 +896,7 @@ KJS::Value TQCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQRect arg0 = extractTQRect(exec, args, 0);
+    TQRect arg0 = extractTQRect(exec, args, 0);
 
       instance->collisions(
        arg0 );
@@ -907,12 +907,12 @@ KJS::Value TQCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPointArray arg0; // TODO (hack for qcanvas)
+    TQPointArray arg0; // TODO (hack for qcanvas)
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg1; // Dummy
+    const TQCanvasItem * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -927,12 +927,12 @@ KJS::Value TQCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQRect arg0 = extractTQRect(exec, args, 0);
+    TQRect arg0 = extractTQRect(exec, args, 0);
 
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg1; // Dummy
+    TQPainter * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -947,10 +947,10 @@ KJS::Value TQCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value TQCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasView *
+    // Unsupported parameter TQCanvasView *
     return KJS::Value();
 
-    TTQCanvasView * arg0; // Dummy
+    TQCanvasView * arg0; // Dummy
 
       instance->addView(
        arg0 );
@@ -961,10 +961,10 @@ KJS::Value TQCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value TQCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasView *
+    // Unsupported parameter TQCanvasView *
     return KJS::Value();
 
-    TTQCanvasView * arg0; // Dummy
+    TQCanvasView * arg0; // Dummy
 
       instance->removeView(
        arg0 );
@@ -975,12 +975,12 @@ KJS::Value TQCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQRect arg0 = extractTQRect(exec, args, 0);
+    TQRect arg0 = extractTQRect(exec, args, 0);
 
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg1; // Dummy
+    TQPainter * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -995,17 +995,17 @@ KJS::Value TQCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value TQCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasView *
+    // Unsupported parameter TQCanvasView *
     return KJS::Value();
 
-    TTQCanvasView * arg0; // Dummy
+    TQCanvasView * arg0; // Dummy
 
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg1; // Dummy
+    TQPainter * arg1; // Dummy
 
-    TTQRect arg2 = extractTQRect(exec, args, 2);
+    TQRect arg2 = extractTQRect(exec, args, 2);
 
     bool arg3 = extractBool(exec, args, 3);
 
@@ -1021,10 +1021,10 @@ KJS::Value TQCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->addItem(
        arg0 );
@@ -1035,10 +1035,10 @@ KJS::Value TQCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value TQCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->addAnimation(
        arg0 );
@@ -1049,10 +1049,10 @@ KJS::Value TQCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -1063,10 +1063,10 @@ KJS::Value TQCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasImp::removeAnimation_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    TTQCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->removeAnimation(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h
index fd91b3ba..8f4e6b21 100644
--- a/kjsembed/qtbindings/qcanvas_imp.h
+++ b/kjsembed/qtbindings/qcanvas_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvas;
+class TQCanvas;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvas;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvas methods.
+ * Wrapper class for TQCanvas methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -102,7 +102,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvas *toTQCanvas( KJS::Object &object );
+   static TQCanvas *toTQCanvas( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -182,7 +182,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvas *instance; // Temp
+   TQCanvas *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
index deab7241..3f4d53a5 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasEllipseImp::TQCanvasEllipseImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasEllipseImp::TQCanvasEllipseImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasEllipseImp::~TQCanvasEllipseImp()
+TQCanvasEllipseImp::~TQCanvasEllipseImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &o
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -77,7 +77,7 @@ void TQCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -90,25 +90,25 @@ void TQCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a TTQCanvasEllipse pointer from an Object.
+ * Extract a TQCanvasEllipse pointer from an Object.
  */
-TTQCanvasEllipse *TQCanvasEllipseImp::toTQCanvasEllipse( KJS::Object &self )
+TQCanvasEllipse *TQCanvasEllipseImp::toTQCanvasEllipse( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasEllipse" )
+    if ( op->typeName() != "TQCanvasEllipse" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -134,7 +134,7 @@ KJS::Object TQCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQCanvasEllipseCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasEllipseCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -142,15 +142,15 @@ KJS::Object TQCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQCanvasEllipseImp::TQCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasEllipse object
+    // We should now create an instance of the TQCanvasEllipse object
 
-    TTQCanvasEllipse *ret = new TTQCanvasEllipse(
+    TQCanvasEllipse *ret = new TQCanvasEllipse(
 
           arg0 );
 
@@ -164,15 +164,15 @@ KJS::Object TQCanvasEllipseImp::TQCanvasEllipse_2( KJS::ExecState *exec, const K
 
     int arg1 = extractInt(exec, args, 1);
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg2; // Dummy
+    TQCanvas * arg2; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasEllipse object
+    // We should now create an instance of the TQCanvasEllipse object
 
-    TTQCanvasEllipse *ret = new TTQCanvasEllipse(
+    TQCanvasEllipse *ret = new TQCanvasEllipse(
 
           arg0,
           arg1,
@@ -192,15 +192,15 @@ KJS::Object TQCanvasEllipseImp::TQCanvasEllipse_3( KJS::ExecState *exec, const K
 
     int arg3 = extractInt(exec, args, 3);
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg4; // Dummy
+    TQCanvas * arg4; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasEllipse object
+    // We should now create an instance of the TQCanvasEllipse object
 
-    TTQCanvasEllipse *ret = new TTQCanvasEllipse(
+    TQCanvasEllipse *ret = new TQCanvasEllipse(
 
           arg0,
           arg1,
@@ -257,7 +257,7 @@ KJS::Value TQCanvasEllipseImp::call( KJS::ExecState *exec, KJS::Object &self, co
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasEllipseImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasEllipseImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -337,10 +337,10 @@ KJS::Value TQCanvasEllipseImp::areaPoints_11( KJS::ExecState *exec, KJS::Object
 KJS::Value TQCanvasEllipseImp::collidesWith_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h
index a0a03c8a..5699f867 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.h
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasEllipse;
+class TQCanvasEllipse;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasEllipse;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasEllipse methods.
+ * Wrapper class for TQCanvasEllipse methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -63,7 +63,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasEllipse *toTQCanvasEllipse( KJS::Object &object );
+   static TQCanvasEllipse *toTQCanvasEllipse( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -104,7 +104,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasEllipse *instance; // Temp
+   TQCanvasEllipse *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index 9e009567..68c73667 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasItemImp::TQCanvasItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasItemImp::TQCanvasItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasItemImp::~TQCanvasItemImp()
+TQCanvasItemImp::~TQCanvasItemImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obje
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -66,15 +66,15 @@ void TQCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obje
     EnumValue enums[] = {
 
         // enum RttiValues
-        { "Rtti_Item", TTQCanvasItem::Rtti_Item },
-        { "Rtti_Sprite", TTQCanvasItem::Rtti_Sprite },
-        { "Rtti_PolygonalItem", TTQCanvasItem::Rtti_PolygonalItem },
-        { "Rtti_Text", TTQCanvasItem::Rtti_Text },
-        { "Rtti_Polygon", TTQCanvasItem::Rtti_Polygon },
-        { "Rtti_Rectangle", TTQCanvasItem::Rtti_Rectangle },
-        { "Rtti_Ellipse", TTQCanvasItem::Rtti_Ellipse },
-        { "Rtti_Line", TTQCanvasItem::Rtti_Line },
-        { "Rtti_Spline", TTQCanvasItem::Rtti_Spline },
+        { "Rtti_Item", TQCanvasItem::Rtti_Item },
+        { "Rtti_Sprite", TQCanvasItem::Rtti_Sprite },
+        { "Rtti_PolygonalItem", TQCanvasItem::Rtti_PolygonalItem },
+        { "Rtti_Text", TQCanvasItem::Rtti_Text },
+        { "Rtti_Polygon", TQCanvasItem::Rtti_Polygon },
+        { "Rtti_Rectangle", TQCanvasItem::Rtti_Rectangle },
+        { "Rtti_Ellipse", TQCanvasItem::Rtti_Ellipse },
+        { "Rtti_Line", TQCanvasItem::Rtti_Line },
+        { "Rtti_Spline", TQCanvasItem::Rtti_Spline },
 	{ 0, 0 }
     };
 
@@ -135,7 +135,7 @@ void TQCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -148,28 +148,28 @@ void TQCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasItem pointer from an Object.
+ * Extract a TQCanvasItem pointer from an Object.
  */
-TTQCanvasItem *TQCanvasItemImp::toTQCanvasItem( KJS::Object &self )
+TQCanvasItem *TQCanvasItemImp::toTQCanvasItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 /*
-    if ( !op->inherits(TTQCANVASITEM_OBJECT_NAME_STRING) ) {
+    if ( !op->inherits(TQCANVASITEM_OBJECT_NAME_STRING) ) {
 	kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl;
 	// Check superclasses
         return 0;
     }
 */
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -187,7 +187,7 @@ KJS::Object TQCanvasItemImp::construct( KJS::ExecState *exec, const KJS::List &a
              break;
     }
 
-    TTQString msg = i18n("TQCanvasItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -197,15 +197,15 @@ KJS::Object TQCanvasItemImp::TQCanvasItem_1( KJS::ExecState *exec, const KJS::Li
 
 #if 0 // This constructor has been disabled by the XSL template
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasItem object
+    // We should now create an instance of the TQCanvasItem object
 
-    TTQCanvasItem *ret = new TTQCanvasItem(
+    TQCanvasItem *ret = new TQCanvasItem(
 
           arg0 );
 
@@ -221,7 +221,7 @@ KJS::Value TQCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const
     /*
     if ( !instance )
     {
-       TTQString msg = i18n( "TQCanvasItemImp was not valid" );
+       TQString msg = i18n( "TQCanvasItemImp was not valid" );
     return throwError(exec, msg,KJS::ReferenceError);
     }
     */
@@ -384,7 +384,7 @@ KJS::Value TQCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -565,10 +565,10 @@ KJS::Value TQCanvasItemImp::advance_18( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCanvasItemImp::collidesWith_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -591,10 +591,10 @@ KJS::Value TQCanvasItemImp::collisions_20( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value TQCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Value();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
       instance->setCanvas(
        arg0 );
@@ -605,7 +605,7 @@ KJS::Value TQCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQCanvasItemImp::draw_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPainter arg0; // TODO (hack for qcanvas)
+    TQPainter arg0; // TODO (hack for qcanvas)
 
       instance->draw(
        arg0 );
@@ -756,7 +756,7 @@ KJS::Value TQCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, con
 
 KJS::Value TQCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
@@ -765,7 +765,7 @@ KJS::Value TQCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &
 
 KJS::Value TQCanvasItemImp::boundingRectAdvanced_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->boundingRectAdvanced(  );
 
        return convertToValue( exec, ret );
@@ -776,7 +776,7 @@ KJS::Value TQCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, c
 {
 
       instance->canvas(  );
-      return KJS::Value(); // Returns 'TTQCanvas *'
+      return KJS::Value(); // Returns 'TQCanvas *'
 
 }
 
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h
index 577bb7b1..a8970762 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.h
+++ b/kjsembed/qtbindings/qcanvasitem_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasItem;
+class TQCanvasItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasItem methods.
+ * Wrapper class for TQCanvasItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -90,7 +90,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasItem *toTQCanvasItem( KJS::Object &object );
+   static TQCanvasItem *toTQCanvasItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -158,7 +158,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasItem *instance; // Temp
+   TQCanvasItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
index 31f027fd..f92f0d33 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasItemListImp::TQCanvasItemListImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasItemListImp::TQCanvasItemListImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasItemListImp::~TQCanvasItemListImp()
+TQCanvasItemListImp::~TQCanvasItemListImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -70,7 +70,7 @@ void TQCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -83,25 +83,25 @@ void TQCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a TTQCanvasItemList pointer from an Object.
+ * Extract a TQCanvasItemList pointer from an Object.
  */
-TTQCanvasItemList *TQCanvasItemListImp::toTQCanvasItemList( KJS::Object &self )
+TQCanvasItemList *TQCanvasItemListImp::toTQCanvasItemList( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasItemList" )
+    if ( op->typeName() != "TQCanvasItemList" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -115,7 +115,7 @@ KJS::Object TQCanvasItemListImp::construct( KJS::ExecState *exec, const KJS::Lis
              break;
     }
 
-    TTQString msg = i18n("TQCanvasItemListCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasItemListCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -138,7 +138,7 @@ KJS::Value TQCanvasItemListImp::call( KJS::ExecState *exec, KJS::Object &self, c
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasItemListImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasItemListImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -154,7 +154,7 @@ KJS::Value TQCanvasItemListImp::sort_1( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPainter arg0; // TODO (hack for qcanvas)
+    TQPainter arg0; // TODO (hack for qcanvas)
 
       instance->drawUnique(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h
index 1ec604e0..7ff08639 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.h
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasItemList;
+class TQCanvasItemList;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasItemList;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasItemList methods.
+ * Wrapper class for TQCanvasItemList methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -53,7 +53,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasItemList *toTQCanvasItemList( KJS::Object &object );
+   static TQCanvasItemList *toTQCanvasItemList( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -84,7 +84,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasItemList *instance; // Temp
+   TQCanvasItemList *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp
index af6a7b53..907573f0 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasline_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasLineImp::TQCanvasLineImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasLineImp::TQCanvasLineImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasLineImp::~TQCanvasLineImp()
+TQCanvasLineImp::~TQCanvasLineImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obje
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -74,7 +74,7 @@ void TQCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -87,25 +87,25 @@ void TQCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasLine pointer from an Object.
+ * Extract a TQCanvasLine pointer from an Object.
  */
-TTQCanvasLine *TQCanvasLineImp::toTQCanvasLine( KJS::Object &self )
+TQCanvasLine *TQCanvasLineImp::toTQCanvasLine( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasLine" )
+    if ( op->typeName() != "TQCanvasLine" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -123,7 +123,7 @@ KJS::Object TQCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &a
              break;
     }
 
-    TTQString msg = i18n("TQCanvasLineCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasLineCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -131,15 +131,15 @@ KJS::Object TQCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &a
 KJS::Object TQCanvasLineImp::TQCanvasLine_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasLine object
+    // We should now create an instance of the TQCanvasLine object
 
-    TTQCanvasLine *ret = new TTQCanvasLine(
+    TQCanvasLine *ret = new TQCanvasLine(
 
           arg0 );
 
@@ -180,7 +180,7 @@ KJS::Value TQCanvasLineImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasLineImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasLineImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -207,7 +207,7 @@ KJS::Value TQCanvasLineImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj,
 
 KJS::Value TQCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQPoint ret;
+    TQPoint ret;
       ret = instance->startPoint(  );
 
        return convertToValue( exec, ret );
@@ -216,7 +216,7 @@ KJS::Value TQCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj
 
 KJS::Value TQCanvasLineImp::endPoint_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQPoint ret;
+    TQPoint ret;
       ret = instance->endPoint(  );
 
        return convertToValue( exec, ret );
@@ -238,7 +238,7 @@ KJS::Value TQCanvasLineImp::setPen_7( KJS::ExecState *exec, KJS::Object &obj, co
     // Unsupported parameter TQPen
     return KJS::Value();
 
-    TTQPen arg0; // Dummy
+    TQPen arg0; // Dummy
 
       instance->setPen(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h
index f876b8e1..330502c4 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.h
+++ b/kjsembed/qtbindings/qcanvasline_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasLine;
+class TQCanvasLine;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasLine;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasLine methods.
+ * Wrapper class for TQCanvasLine methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -58,7 +58,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasLine *toTQCanvasLine( KJS::Object &object );
+   static TQCanvasLine *toTQCanvasLine( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -94,7 +94,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasLine *instance; // Temp
+   TQCanvasLine *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
index bc11e8ce..9fcf2718 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasPixmapImp::TQCanvasPixmapImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasPixmapImp::TQCanvasPixmapImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasPixmapImp::~TQCanvasPixmapImp()
+TQCanvasPixmapImp::~TQCanvasPixmapImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -71,7 +71,7 @@ void TQCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -84,25 +84,25 @@ void TQCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasPixmap pointer from an Object.
+ * Extract a TQCanvasPixmap pointer from an Object.
  */
-TTQCanvasPixmap *TQCanvasPixmapImp::toTQCanvasPixmap( KJS::Object &self )
+TQCanvasPixmap *TQCanvasPixmapImp::toTQCanvasPixmap( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasPixmap" )
+    if ( op->typeName() != "TQCanvasPixmap" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -128,7 +128,7 @@ KJS::Object TQCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQCanvasPixmapCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasPixmapCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -136,12 +136,12 @@ KJS::Object TQCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
 
-    // We should now create an instance of the TTQCanvasPixmap object
+    // We should now create an instance of the TQCanvasPixmap object
 
-    TTQCanvasPixmap *ret = new TTQCanvasPixmap(
+    TQCanvasPixmap *ret = new TQCanvasPixmap(
 
           arg0 );
 
@@ -151,12 +151,12 @@ KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_1( KJS::ExecState *exec, const KJS
 KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQImage arg0 = extractTQImage(exec, args, 0);
+    TQImage arg0 = extractTQImage(exec, args, 0);
 
 
-    // We should now create an instance of the TTQCanvasPixmap object
+    // We should now create an instance of the TQCanvasPixmap object
 
-    TTQCanvasPixmap *ret = new TTQCanvasPixmap(
+    TQCanvasPixmap *ret = new TQCanvasPixmap(
 
           arg0 );
 
@@ -167,14 +167,14 @@ KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_2( KJS::ExecState *exec, const KJS
 KJS::Object TQCanvasPixmapImp::TQCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    TTQPoint arg1 = extractTQPoint(exec, args, 1);
+    TQPoint arg1 = extractTQPoint(exec, args, 1);
 
 
-    // We should now create an instance of the TTQCanvasPixmap object
+    // We should now create an instance of the TQCanvasPixmap object
 
-    TTQCanvasPixmap *ret = new TTQCanvasPixmap(
+    TQCanvasPixmap *ret = new TQCanvasPixmap(
 
           arg0,
           arg1 );
@@ -205,7 +205,7 @@ KJS::Value TQCanvasPixmapImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasPixmapImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasPixmapImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h
index 958c5dda..68ec582e 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasPixmap;
+class TQCanvasPixmap;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasPixmap;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasPixmap methods.
+ * Wrapper class for TQCanvasPixmap methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -57,7 +57,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasPixmap *toTQCanvasPixmap( KJS::Object &object );
+   static TQCanvasPixmap *toTQCanvasPixmap( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -92,7 +92,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasPixmap *instance; // Temp
+   TQCanvasPixmap *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
index 73a6f58b..8d5a8b79 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasPixmapArrayImp::TQCanvasPixmapArrayImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasPixmapArrayImp::TQCanvasPixmapArrayImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasPixmapArrayImp::~TQCanvasPixmapArrayImp()
+TQCanvasPixmapArrayImp::~TQCanvasPixmapArrayImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Objec
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -74,7 +74,7 @@ void TQCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -87,25 +87,25 @@ void TQCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obj
 }
 
 /**
- * Extract a TTQCanvasPixmapArray pointer from an Object.
+ * Extract a TQCanvasPixmapArray pointer from an Object.
  */
-TTQCanvasPixmapArray *TQCanvasPixmapArrayImp::toTQCanvasPixmapArray( KJS::Object &self )
+TQCanvasPixmapArray *TQCanvasPixmapArrayImp::toTQCanvasPixmapArray( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasPixmapArray" )
+    if ( op->typeName() != "TQCanvasPixmapArray" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -135,7 +135,7 @@ KJS::Object TQCanvasPixmapArrayImp::construct( KJS::ExecState *exec, const KJS::
              break;
     }
 
-    TTQString msg = i18n("TQCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -144,9 +144,9 @@ KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_1( KJS::ExecState *exec,
 {
 
 
-    // We should now create an instance of the TTQCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
         );
 
 	return KJS::Object();
@@ -155,14 +155,14 @@ KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_1( KJS::ExecState *exec,
 KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
 
-    // We should now create an instance of the TTQCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -173,20 +173,20 @@ KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_2( KJS::ExecState *exec,
 KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQPtrList< TTQPixmap >
+    // Unsupported parameter TQPtrList< TQPixmap >
     return KJS::Object();
 
-    TTQPtrList< TTQPixmap > arg0; // Dummy
+    TQPtrList< TQPixmap > arg0; // Dummy
 
-    // Unsupported parameter TTQPtrList< TTQPoint >
+    // Unsupported parameter TQPtrList< TQPoint >
     return KJS::Object();
 
-    TTQPtrList< TTQPoint > arg1; // Dummy
+    TQPtrList< TQPoint > arg1; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -197,20 +197,20 @@ KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_3( KJS::ExecState *exec,
 KJS::Object TQCanvasPixmapArrayImp::TQCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQValueList< TTQPixmap >
+    // Unsupported parameter TQValueList< TQPixmap >
     return KJS::Object();
 
-    TTQValueList< TTQPixmap > arg0; // Dummy
+    TQValueList< TQPixmap > arg0; // Dummy
 
     // Unsupported parameter TQPointArray
     return KJS::Object();
 
-    TTQPointArray arg1; // Dummy
+    TQPointArray arg1; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    TTQCanvasPixmapArray *ret = new TTQCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -252,7 +252,7 @@ KJS::Value TQCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasPixmapArrayImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasPixmapArrayImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -260,7 +260,7 @@ KJS::Value TQCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self
 KJS::Value TQCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -275,7 +275,7 @@ KJS::Value TQCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Obj
 KJS::Value TQCanvasPixmapArrayImp::readCollisionMasks_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
       bool ret;
       ret = instance->readCollisionMasks(
@@ -300,7 +300,7 @@ KJS::Value TQCanvasPixmapArrayImp::image_10( KJS::ExecState *exec, KJS::Object &
 
       instance->image(
        arg0 );
-      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -309,10 +309,10 @@ KJS::Value TQCanvasPixmapArrayImp::setImage_11( KJS::ExecState *exec, KJS::Objec
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter TTQCanvasPixmap *
+    // Unsupported parameter TQCanvasPixmap *
     return KJS::Value();
 
-    TTQCanvasPixmap * arg1; // Dummy
+    TQCanvasPixmap * arg1; // Dummy
 
       instance->setImage(
        arg0,
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
index 32fd3d96..d58ba012 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasPixmapArray;
+class TQCanvasPixmapArray;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasPixmapArray;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasPixmapArray methods.
+ * Wrapper class for TQCanvasPixmapArray methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -61,7 +61,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasPixmapArray *toTQCanvasPixmapArray( KJS::Object &object );
+   static TQCanvasPixmapArray *toTQCanvasPixmapArray( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -100,7 +100,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasPixmapArray *instance; // Temp
+   TQCanvasPixmapArray *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
index 37109043..9af85744 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasPolygonImp::TQCanvasPolygonImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasPolygonImp::TQCanvasPolygonImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasPolygonImp::~TQCanvasPolygonImp()
+TQCanvasPolygonImp::~TQCanvasPolygonImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &o
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -73,7 +73,7 @@ void TQCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -86,25 +86,25 @@ void TQCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a TTQCanvasPolygon pointer from an Object.
+ * Extract a TQCanvasPolygon pointer from an Object.
  */
-TTQCanvasPolygon *TQCanvasPolygonImp::toTQCanvasPolygon( KJS::Object &self )
+TQCanvasPolygon *TQCanvasPolygonImp::toTQCanvasPolygon( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasPolygon" )
+    if ( op->typeName() != "TQCanvasPolygon" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -122,7 +122,7 @@ KJS::Object TQCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQCanvasPolygonCons has no constructor with id '%1',").arg(id);
+    TQString msg = i18n("TQCanvasPolygonCons has no constructor with id '%1',").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -130,15 +130,15 @@ KJS::Object TQCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQCanvasPolygonImp::TQCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasPolygon object
+    // We should now create an instance of the TQCanvasPolygon object
 
-    TTQCanvasPolygon *ret = new TTQCanvasPolygon(
+    TQCanvasPolygon *ret = new TQCanvasPolygon(
 
           arg0 );
 
@@ -175,7 +175,7 @@ KJS::Value TQCanvasPolygonImp::call( KJS::ExecState *exec, KJS::Object &self, co
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasPolygonImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasPolygonImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -186,7 +186,7 @@ KJS::Value TQCanvasPolygonImp::setPoints_3( KJS::ExecState *exec, KJS::Object &o
     // Unsupported parameter TQPointArray
     return KJS::Value();
 
-    TTQPointArray arg0; // Dummy
+    TQPointArray arg0; // Dummy
 
       instance->setPoints(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h
index aadcdf7f..6cca713c 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasPolygon;
+class TQCanvasPolygon;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasPolygon;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasPolygon methods.
+ * Wrapper class for TQCanvasPolygon methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -57,7 +57,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasPolygon *toTQCanvasPolygon( KJS::Object &object );
+   static TQCanvasPolygon *toTQCanvasPolygon( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -92,7 +92,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasPolygon *instance; // Temp
+   TQCanvasPolygon *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
index 8dc06e3a..4f09509d 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasPolygonalItemImp::TQCanvasPolygonalItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasPolygonalItemImp::TQCanvasPolygonalItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasPolygonalItemImp::~TQCanvasPolygonalItemImp()
+TQCanvasPolygonalItemImp::~TQCanvasPolygonalItemImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Obj
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -77,7 +77,7 @@ void TQCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &o
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -90,25 +90,25 @@ void TQCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &o
 }
 
 /**
- * Extract a TTQCanvasPolygonalItem pointer from an Object.
+ * Extract a TQCanvasPolygonalItem pointer from an Object.
  */
-TTQCanvasPolygonalItem *TQCanvasPolygonalItemImp::toTQCanvasPolygonalItem( KJS::Object &self )
+TQCanvasPolygonalItem *TQCanvasPolygonalItemImp::toTQCanvasPolygonalItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasPolygonalItem" )
+    if ( op->typeName() != "TQCanvasPolygonalItem" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -126,7 +126,7 @@ KJS::Object TQCanvasPolygonalItemImp::construct( KJS::ExecState *exec, const KJS
              break;
     }
 
-    TTQString msg = i18n("TQCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -136,15 +136,15 @@ KJS::Object TQCanvasPolygonalItemImp::TQCanvasPolygonalItem_1( KJS::ExecState *e
 
 #if 0 // This constructor has been disabled by the XSL template
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasPolygonalItem object
+    // We should now create an instance of the TQCanvasPolygonalItem object
 
-    TTQCanvasPolygonalItem *ret = new TTQCanvasPolygonalItem(
+    TQCanvasPolygonalItem *ret = new TQCanvasPolygonalItem(
 
           arg0 );
 
@@ -199,7 +199,7 @@ KJS::Value TQCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &se
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasPolygonalItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasPolygonalItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -207,10 +207,10 @@ KJS::Value TQCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &se
 KJS::Value TQCanvasPolygonalItemImp::collidesWith_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -225,7 +225,7 @@ KJS::Value TQCanvasPolygonalItemImp::setPen_4( KJS::ExecState *exec, KJS::Object
     // Unsupported parameter TQPen
     return KJS::Value();
 
-    TTQPen arg0; // Dummy
+    TQPen arg0; // Dummy
 
       instance->setPen(
        arg0 );
@@ -239,7 +239,7 @@ KJS::Value TQCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Obje
     // Unsupported parameter TQBrush
     return KJS::Value();
 
-    TTQBrush arg0; // Dummy
+    TQBrush arg0; // Dummy
 
       instance->setBrush(
        arg0 );
@@ -249,7 +249,7 @@ KJS::Value TQCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Obje
 
 KJS::Value TQCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQPen ret;
+    TQPen ret;
       ret = instance->pen(  );
 
        return convertToValue( exec, ret );
@@ -258,7 +258,7 @@ KJS::Value TQCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &o
 
 KJS::Value TQCanvasPolygonalItemImp::brush_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQBrush ret;
+    TQBrush ret;
       ret = instance->brush(  );
 
        return convertToValue( exec, ret );
@@ -283,7 +283,7 @@ KJS::Value TQCanvasPolygonalItemImp::areaPointsAdvanced_9( KJS::ExecState *exec,
 
 KJS::Value TQCanvasPolygonalItemImp::boundingRect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
index 80ff4445..0d9e5a11 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasPolygonalItem;
+class TQCanvasPolygonalItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasPolygonalItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasPolygonalItem methods.
+ * Wrapper class for TQCanvasPolygonalItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -61,7 +61,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasPolygonalItem *toTQCanvasPolygonalItem( KJS::Object &object );
+   static TQCanvasPolygonalItem *toTQCanvasPolygonalItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -100,7 +100,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasPolygonalItem *instance; // Temp
+   TQCanvasPolygonalItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
index 19564e7b..55f1f14d 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasRectangleImp::TQCanvasRectangleImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasRectangleImp::TQCanvasRectangleImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasRectangleImp::~TQCanvasRectangleImp()
+TQCanvasRectangleImp::~TQCanvasRectangleImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -76,7 +76,7 @@ void TQCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -89,25 +89,25 @@ void TQCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &objec
 }
 
 /**
- * Extract a TTQCanvasRectangle pointer from an Object.
+ * Extract a TQCanvasRectangle pointer from an Object.
  */
-TTQCanvasRectangle *TQCanvasRectangleImp::toTQCanvasRectangle( KJS::Object &self )
+TQCanvasRectangle *TQCanvasRectangleImp::toTQCanvasRectangle( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasRectangle" )
+    if ( op->typeName() != "TQCanvasRectangle" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -133,7 +133,7 @@ KJS::Object TQCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::Li
              break;
     }
 
-    TTQString msg = i18n("TQCanvasRectangleCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasRectangleCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -141,15 +141,15 @@ KJS::Object TQCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::Li
 KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasRectangle object
+    // We should now create an instance of the TQCanvasRectangle object
 
-    TTQCanvasRectangle *ret = new TTQCanvasRectangle(
+    TQCanvasRectangle *ret = new TQCanvasRectangle(
 
           arg0 );
 
@@ -159,17 +159,17 @@ KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_1( KJS::ExecState *exec, con
 KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQRect arg0 = extractTQRect(exec, args, 0);
+    TQRect arg0 = extractTQRect(exec, args, 0);
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg1; // Dummy
+    TQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasRectangle object
+    // We should now create an instance of the TQCanvasRectangle object
 
-    TTQCanvasRectangle *ret = new TTQCanvasRectangle(
+    TQCanvasRectangle *ret = new TQCanvasRectangle(
 
           arg0,
           arg1 );
@@ -188,15 +188,15 @@ KJS::Object TQCanvasRectangleImp::TQCanvasRectangle_3( KJS::ExecState *exec, con
 
     int arg3 = extractInt(exec, args, 3);
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg4; // Dummy
+    TQCanvas * arg4; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasRectangle object
+    // We should now create an instance of the TQCanvasRectangle object
 
-    TTQCanvasRectangle *ret = new TTQCanvasRectangle(
+    TQCanvasRectangle *ret = new TQCanvasRectangle(
 
           arg0,
           arg1,
@@ -249,7 +249,7 @@ KJS::Value TQCanvasRectangleImp::call( KJS::ExecState *exec, KJS::Object &self,
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasRectangleImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasRectangleImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -288,7 +288,7 @@ KJS::Value TQCanvasRectangleImp::setSize_7( KJS::ExecState *exec, KJS::Object &o
 
 KJS::Value TQCanvasRectangleImp::size_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQSize ret;
+    TQSize ret;
       ret = instance->size(  );
 
        return convertToValue( exec, ret );
@@ -305,7 +305,7 @@ KJS::Value TQCanvasRectangleImp::areaPoints_9( KJS::ExecState *exec, KJS::Object
 
 KJS::Value TQCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->rect(  );
 
        return convertToValue( exec, ret );
@@ -315,10 +315,10 @@ KJS::Value TQCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQCanvasRectangleImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h
index 3daf243a..ee39af19 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.h
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasRectangle;
+class TQCanvasRectangle;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasRectangle;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasRectangle methods.
+ * Wrapper class for TQCanvasRectangle methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -62,7 +62,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasRectangle *toTQCanvasRectangle( KJS::Object &object );
+   static TQCanvasRectangle *toTQCanvasRectangle( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -102,7 +102,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasRectangle *instance; // Temp
+   TQCanvasRectangle *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp
index 26e4c4c7..7809002c 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasSplineImp::TQCanvasSplineImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasSplineImp::TQCanvasSplineImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasSplineImp::~TQCanvasSplineImp()
+TQCanvasSplineImp::~TQCanvasSplineImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -72,7 +72,7 @@ void TQCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -85,25 +85,25 @@ void TQCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasSpline pointer from an Object.
+ * Extract a TQCanvasSpline pointer from an Object.
  */
-TTQCanvasSpline *TQCanvasSplineImp::toTQCanvasSpline( KJS::Object &self )
+TQCanvasSpline *TQCanvasSplineImp::toTQCanvasSpline( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasSpline" )
+    if ( op->typeName() != "TQCanvasSpline" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -121,7 +121,7 @@ KJS::Object TQCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQCanvasSplineCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasSplineCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -129,15 +129,15 @@ KJS::Object TQCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQCanvasSplineImp::TQCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasSpline object
+    // We should now create an instance of the TQCanvasSpline object
 
-    TTQCanvasSpline *ret = new TTQCanvasSpline(
+    TQCanvasSpline *ret = new TQCanvasSpline(
 
           arg0 );
 
@@ -170,7 +170,7 @@ KJS::Value TQCanvasSplineImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasSplineImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasSplineImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -181,7 +181,7 @@ KJS::Value TQCanvasSplineImp::setControlPoints_3( KJS::ExecState *exec, KJS::Obj
     // Unsupported parameter TQPointArray
     return KJS::Value();
 
-    TTQPointArray arg0; // Dummy
+    TQPointArray arg0; // Dummy
 
     bool arg1 = extractBool(exec, args, 1);
 
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h
index be3a29ea..fbf9eac3 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.h
+++ b/kjsembed/qtbindings/qcanvasspline_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasSpline;
+class TQCanvasSpline;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasSpline;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasSpline methods.
+ * Wrapper class for TQCanvasSpline methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -56,7 +56,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasSpline *toTQCanvasSpline( KJS::Object &object );
+   static TQCanvasSpline *toTQCanvasSpline( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -90,7 +90,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasSpline *instance; // Temp
+   TQCanvasSpline *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp
index d4c8dc23..98a4a428 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.cpp
+++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasSpriteImp::TQCanvasSpriteImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasSpriteImp::TQCanvasSpriteImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasSpriteImp::~TQCanvasSpriteImp()
+TQCanvasSpriteImp::~TQCanvasSpriteImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -66,8 +66,8 @@ void TQCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     EnumValue enums[] = {
 
         // enum FrameAnimationType
-        { "Cycle", TTQCanvasSprite::Cycle },
-        { "Oscillate", TTQCanvasSprite::Oscillate },
+        { "Cycle", TQCanvasSprite::Cycle },
+        { "Oscillate", TQCanvasSprite::Oscillate },
 	{ 0, 0 }
     };
 
@@ -115,7 +115,7 @@ void TQCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -128,25 +128,25 @@ void TQCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasSprite pointer from an Object.
+ * Extract a TQCanvasSprite pointer from an Object.
  */
-TTQCanvasSprite *TQCanvasSpriteImp::toTQCanvasSprite( KJS::Object &self )
+TQCanvasSprite *TQCanvasSpriteImp::toTQCanvasSprite( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasSprite" )
+    if ( op->typeName() != "TQCanvasSprite" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -164,7 +164,7 @@ KJS::Object TQCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQCanvasSpriteCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasSpriteCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -172,20 +172,20 @@ KJS::Object TQCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQCanvasSpriteImp::TQCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasPixmapArray *
+    // Unsupported parameter TQCanvasPixmapArray *
     return KJS::Object();
 
-    TTQCanvasPixmapArray * arg0; // Dummy
+    TQCanvasPixmapArray * arg0; // Dummy
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg1; // Dummy
+    TQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasSprite object
+    // We should now create an instance of the TQCanvasSprite object
 
-    TTQCanvasSprite *ret = new TTQCanvasSprite(
+    TQCanvasSprite *ret = new TQCanvasSprite(
 
           arg0,
           arg1 );
@@ -303,7 +303,7 @@ KJS::Value TQCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasSpriteImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasSpriteImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -311,10 +311,10 @@ KJS::Value TQCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, con
 KJS::Value TQCanvasSpriteImp::setSequence_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvasPixmapArray *
+    // Unsupported parameter TQCanvasPixmapArray *
     return KJS::Value();
 
-    TTQCanvasPixmapArray * arg0; // Dummy
+    TQCanvasPixmapArray * arg0; // Dummy
 
       instance->setSequence(
        arg0 );
@@ -367,7 +367,7 @@ KJS::Value TQCanvasSpriteImp::setFrame_6( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQCanvasSpriteImp::setFrameAnimation_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQCanvasSprite::FrameAnimationType arg0 = TTQCanvasSprite::Cycle; // TODO (hack for TTQCanvasSprite)
+    TQCanvasSprite::FrameAnimationType arg0 = TQCanvasSprite::Cycle; // TODO (hack for TQCanvasSprite)
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -411,10 +411,10 @@ KJS::Value TQCanvasSpriteImp::rtti_10( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -425,7 +425,7 @@ KJS::Value TQCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object
 
 KJS::Value TQCanvasSpriteImp::boundingRect_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
@@ -538,7 +538,7 @@ KJS::Value TQCanvasSpriteImp::image_23( KJS::ExecState *exec, KJS::Object &obj,
 {
 
       instance->image(  );
-      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -546,7 +546,7 @@ KJS::Value TQCanvasSpriteImp::imageAdvanced_24( KJS::ExecState *exec, KJS::Objec
 {
 
       instance->imageAdvanced(  );
-      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -557,7 +557,7 @@ KJS::Value TQCanvasSpriteImp::image_25( KJS::ExecState *exec, KJS::Object &obj,
 
       instance->image(
        arg0 );
-      return KJS::Value(); // Returns 'TTQCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -575,7 +575,7 @@ KJS::Value TQCanvasSpriteImp::advance_26( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPainter arg0; // TODO (hack for qcanvas)
+    TQPainter arg0; // TODO (hack for qcanvas)
 
       instance->draw(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h
index 969cd9cf..15eef7b6 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.h
+++ b/kjsembed/qtbindings/qcanvassprite_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasSprite;
+class TQCanvasSprite;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasSprite;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasSprite methods.
+ * Wrapper class for TQCanvasSprite methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -77,7 +77,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasSprite *toTQCanvasSprite( KJS::Object &object );
+   static TQCanvasSprite *toTQCanvasSprite( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -132,7 +132,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasSprite *instance; // Temp
+   TQCanvasSprite *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp
index bb1c00ce..d0528647 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.cpp
+++ b/kjsembed/qtbindings/qcanvastext_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasTextImp::TQCanvasTextImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasTextImp::TQCanvasTextImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasTextImp::~TQCanvasTextImp()
+TQCanvasTextImp::~TQCanvasTextImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obje
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -80,7 +80,7 @@ void TQCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -93,25 +93,25 @@ void TQCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasText pointer from an Object.
+ * Extract a TQCanvasText pointer from an Object.
  */
-TTQCanvasText *TQCanvasTextImp::toTQCanvasText( KJS::Object &self )
+TQCanvasText *TQCanvasTextImp::toTQCanvasText( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasText" )
+    if ( op->typeName() != "TQCanvasText" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -137,7 +137,7 @@ KJS::Object TQCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &a
              break;
     }
 
-    TTQString msg = i18n("TQCanvasTextCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasTextCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -145,15 +145,15 @@ KJS::Object TQCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &a
 KJS::Object TQCanvasTextImp::TQCanvasText_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasText object
+    // We should now create an instance of the TQCanvasText object
 
-    TTQCanvasText *ret = new TTQCanvasText(
+    TQCanvasText *ret = new TQCanvasText(
 
           arg0 );
 
@@ -163,17 +163,17 @@ KJS::Object TQCanvasTextImp::TQCanvasText_1( KJS::ExecState *exec, const KJS::Li
 KJS::Object TQCanvasTextImp::TQCanvasText_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg1; // Dummy
+    TQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasText object
+    // We should now create an instance of the TQCanvasText object
 
-    TTQCanvasText *ret = new TTQCanvasText(
+    TQCanvasText *ret = new TQCanvasText(
 
           arg0,
           arg1 );
@@ -184,22 +184,22 @@ KJS::Object TQCanvasTextImp::TQCanvasText_2( KJS::ExecState *exec, const KJS::Li
 KJS::Object TQCanvasTextImp::TQCanvasText_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     // Unsupported parameter TQFont
     return KJS::Object();
 
-    TTQFont arg1; // Dummy
+    TQFont arg1; // Dummy
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    TTQCanvas * arg2; // Dummy
+    TQCanvas * arg2; // Dummy
 
 
-    // We should now create an instance of the TTQCanvasText object
+    // We should now create an instance of the TQCanvasText object
 
-    TTQCanvasText *ret = new TTQCanvasText(
+    TQCanvasText *ret = new TQCanvasText(
 
           arg0,
           arg1,
@@ -266,7 +266,7 @@ KJS::Value TQCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasTextImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasTextImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -274,7 +274,7 @@ KJS::Value TQCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const
 KJS::Value TQCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
       instance->setText(
        arg0 );
@@ -285,7 +285,7 @@ KJS::Value TQCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQFont arg0 = extractTQFont(exec, args, 0);
+    TQFont arg0 = extractTQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -296,7 +296,7 @@ KJS::Value TQCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQColor arg0 = extractTQColor(exec, args, 0);
+    TQColor arg0 = extractTQColor(exec, args, 0);
 
       instance->setColor(
        arg0 );
@@ -307,7 +307,7 @@ KJS::Value TQCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCanvasTextImp::text_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
@@ -365,7 +365,7 @@ KJS::Value TQCanvasTextImp::setTextFlags_13( KJS::ExecState *exec, KJS::Object &
 
 KJS::Value TQCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
@@ -375,10 +375,10 @@ KJS::Value TQCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQCanvasTextImp::collidesWith_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const TTQCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h
index e4e40590..2dcf157c 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.h
+++ b/kjsembed/qtbindings/qcanvastext_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasText;
+class TQCanvasText;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasText;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasText methods.
+ * Wrapper class for TQCanvasText methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -66,7 +66,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasText *toTQCanvasText( KJS::Object &object );
+   static TQCanvasText *toTQCanvasText( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -110,7 +110,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasText *instance; // Temp
+   TQCanvasText *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp
index bfa3229b..f32faef7 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasview_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQCanvasViewImp::TQCanvasViewImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCanvasViewImp::TQCanvasViewImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCanvasViewImp::~TQCanvasViewImp()
+TQCanvasViewImp::~TQCanvasViewImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obje
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -73,7 +73,7 @@ void TQCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -86,25 +86,25 @@ void TQCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQCanvasView pointer from an Object.
+ * Extract a TQCanvasView pointer from an Object.
  */
-TTQCanvasView *TQCanvasViewImp::toTQCanvasView( KJS::Object &self )
+TQCanvasView *TQCanvasViewImp::toTQCanvasView( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQCanvasView" )
+    if ( op->typeName() != "TQCanvasView" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -126,7 +126,7 @@ KJS::Object TQCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &a
              break;
     }
 
-    TTQString msg = i18n("TQCanvasViewCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCanvasViewCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -134,50 +134,50 @@ KJS::Object TQCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &a
 KJS::Object TQCanvasViewImp::TQCanvasView_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQWidget *arg0 = extractTQWidget(exec, args, 0);
+    TQWidget *arg0 = extractTQWidget(exec, args, 0);
 
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
-    TQt::WFlags arg2 = 0; // TODO (hack for TTQCanvasView)
+    TQt::WFlags arg2 = 0; // TODO (hack for TQCanvasView)
 
 
-    // We should now create an instance of the TTQCanvasView object
+    // We should now create an instance of the TQCanvasView object
 
-    TTQCanvasView *ret = new TTQCanvasView(
+    TQCanvasView *ret = new TQCanvasView(
 
           arg0,
           arg1,
           arg2 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvasView");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView");
     return KJS::Object( prx );
 }
 
 KJS::Object TQCanvasViewImp::TQCanvasView_2( KJS::ExecState *exec, const KJS::List &args )
 {
-    TTQCanvas * arg0 = 0L;;
+    TQCanvas * arg0 = 0L;;
 
     KJS::Object obj = args[0].toObject(exec);
     JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() );
-    if ( proxy ) arg0 = dynamic_cast( proxy->widget() );
+    if ( proxy ) arg0 = dynamic_cast( proxy->widget() );
 
-    TTQWidget * arg1 = extractTQWidget(exec, args, 1);
+    TQWidget * arg1 = extractTQWidget(exec, args, 1);
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
-    TQt::WFlags arg3 = 0; // TODO (hack for TTQCanvasView)
+    TQt::WFlags arg3 = 0; // TODO (hack for TQCanvasView)
 
 
-    // We should now create an instance of the TTQCanvasView object
+    // We should now create an instance of the TQCanvasView object
 
-    TTQCanvasView *ret = new TTQCanvasView(
+    TQCanvasView *ret = new TQCanvasView(
           arg0,
           arg1,
           arg2,
           arg3 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TTQCanvasView");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView");
     return KJS::Object( prx );
 }
 
@@ -211,7 +211,7 @@ KJS::Value TQCanvasViewImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TTQString msg = i18n( "TQCanvasViewImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCanvasViewImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -220,17 +220,17 @@ KJS::Value TQCanvasViewImp::canvas_4( KJS::ExecState *exec, KJS::Object &obj, co
 {
 
       instance->canvas(  );
-      return KJS::Value(); // Returns 'TTQCanvas *'
+      return KJS::Value(); // Returns 'TQCanvas *'
 
 }
 
 KJS::Value TQCanvasViewImp::setCanvas_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Value();
 
-    TTQCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
       instance->setCanvas(
        arg0 );
@@ -242,7 +242,7 @@ KJS::Value TQCanvasViewImp::worldMatrix_6( KJS::ExecState *exec, KJS::Object &ob
 {
 
       instance->worldMatrix(  );
-      return KJS::Value(); // Returns 'const TTQWMatrix &'
+      return KJS::Value(); // Returns 'const TQWMatrix &'
 
 }
 
@@ -250,14 +250,14 @@ KJS::Value TQCanvasViewImp::inverseWorldMatrix_7( KJS::ExecState *exec, KJS::Obj
 {
 
       instance->inverseWorldMatrix(  );
-      return KJS::Value(); // Returns 'const TTQWMatrix &'
+      return KJS::Value(); // Returns 'const TQWMatrix &'
 
 }
 
 KJS::Value TQCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQWMatrix arg0; // TODO (hack for qcanvasview)
+    TQWMatrix arg0; // TODO (hack for qcanvasview)
 
       bool ret;
       ret = instance->setWorldMatrix(
diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h
index 01a8b1e6..2625365e 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.h
+++ b/kjsembed/qtbindings/qcanvasview_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQCanvasView;
+class TQCanvasView;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQCanvasView;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQCanvasView methods.
+ * Wrapper class for TQCanvasView methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -58,7 +58,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCanvasView *toTQCanvasView( KJS::Object &object );
+   static TQCanvasView *toTQCanvasView( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -94,7 +94,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCanvasView *instance; // Temp
+   TQCanvasView *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp
index 7fe6d673..9aa28e41 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.cpp
+++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp
@@ -28,21 +28,21 @@ namespace Bindings {
                         // FALL THRU
         } else {
             JSOpaqueProxy * arg0 = JSProxy::toOpaqueProxy( args[ 0 ].imp() );
-            TTQString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : TTQString::null;
+            TQString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : TQString::null;
             JSOpaqueProxy *prx = 0;
 
             if ( arg0 ) {
-                if ( arg0->typeName() == "TTQListViewItem" ) {
-                    TTQListViewItem * parent = arg0->toNative();
-                    prx = new JSOpaqueProxy( new TTQCheckListItem( parent, arg1 ), "TTQCheckListItem" );
+                if ( arg0->typeName() == "TQListViewItem" ) {
+                    TQListViewItem * parent = arg0->toNative();
+                    prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" );
                 } else {
                     return KJS::Object();
                 }
             } else {
                 JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() );
                 if ( arg0 ) {
-                    TTQListView * parent = ( TTQListView * ) ( arg0->widget() );
-                    prx = new JSOpaqueProxy( new TTQCheckListItem( parent, arg1 ), "TTQCheckListItem" );
+                    TQListView * parent = ( TQListView * ) ( arg0->widget() );
+                    prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" );
                 } else {
                     return KJS::Object();
                 }
@@ -61,12 +61,12 @@ namespace Bindings {
     }
 
 }
-TTQCheckListItemImp::TQCheckListItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TQCheckListItemImp::TQCheckListItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQCheckListItemImp::~TQCheckListItemImp()
+TQCheckListItemImp::~TQCheckListItemImp()
 {
 }
 
@@ -92,7 +92,7 @@ void TQCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].id ) {
         if ( lastName != methods[idx].name ) {
@@ -115,15 +115,15 @@ void TQCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     EnumValue enums[] = {
 
         // enum Type
-        { "RadioButton", TTQCheckListItem::RadioButton },
-        { "CheckBox", TTQCheckListItem::CheckBox },
-        { "Controller", TTQCheckListItem::Controller },
-        { "RadioButtonController", TTQCheckListItem::RadioButtonController },
-        { "CheckBoxController", TTQCheckListItem::CheckBoxController },
+        { "RadioButton", TQCheckListItem::RadioButton },
+        { "CheckBox", TQCheckListItem::CheckBox },
+        { "Controller", TQCheckListItem::Controller },
+        { "RadioButtonController", TQCheckListItem::RadioButtonController },
+        { "CheckBoxController", TQCheckListItem::CheckBoxController },
         // enum ToggleState
-        { "Off", TTQCheckListItem::Off },
-        { "NoChange", TTQCheckListItem::NoChange },
-        { "On", TTQCheckListItem::On },
+        { "Off", TQCheckListItem::Off },
+        { "NoChange", TQCheckListItem::NoChange },
+        { "On", TQCheckListItem::On },
 	{ 0, 0 }
     };
 
@@ -135,19 +135,19 @@ void TQCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 
 }
 
-TTQCheckListItem *TQCheckListItemImp::toTQCheckListItem( KJS::Object &self )
+TQCheckListItem *TQCheckListItemImp::toTQCheckListItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
-    return op->toNative();
+    return op->toNative();
 }
 
 
@@ -191,7 +191,7 @@ KJS::Object TQCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQCheckListItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQCheckListItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -199,11 +199,11 @@ KJS::Object TQCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQCheckListItemImp::TQCheckListItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
-    TTQWidget *arg1 = extractTQWidget(exec,args,1);
+    TQWidget *arg1 = extractTQWidget(exec,args,1);
 
-    TTQWidget *arg2 = extractTQWidget(exec,args,2);
+    TQWidget *arg2 = extractTQWidget(exec,args,2);
 
     return KJS::Object(  );
 }
@@ -212,16 +212,16 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_2( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg3 = extractTQWidget(exec,args,0);
+    TQWidget *arg3 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -230,13 +230,13 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_3( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -245,16 +245,16 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_4( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg3 = extractTQWidget(exec,args,0);
+    TQWidget *arg3 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -263,13 +263,13 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_5( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -278,16 +278,16 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_6( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg3 = extractTQWidget(exec,args,0);
+    TQWidget *arg3 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -296,13 +296,13 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_7( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -311,13 +311,13 @@ KJS::Object TQCheckListItemImp::TQCheckListItem_8( KJS::ExecState *exec, const K
 {
 
     // TODO
-    TTQWidget *arg0 = extractTQWidget(exec,args,0);
+    TQWidget *arg0 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg1 = extractTQWidget(exec,args,0);
+    TQWidget *arg1 = extractTQWidget(exec,args,0);
 
     // TODO
-    TTQWidget *arg2 = extractTQWidget(exec,args,0);
+    TQWidget *arg2 = extractTQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -388,7 +388,7 @@ KJS::Value TQCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, co
         break;
     }
 
-    TTQString msg = i18n( "TQCheckListItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQCheckListItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -396,15 +396,15 @@ KJS::Value TQCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, co
 KJS::Value TQCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TTQColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 #if 0
-    const TTQColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -425,17 +425,17 @@ KJS::Value TQCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 #if 0
-    TTQPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TTQColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const TTQColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
-    TTQRect arg2 = extractTQRect(exec, args, 2);
+    TQRect arg2 = extractTQRect(exec, args, 2);
 
       instance->paintFocus(
        arg0,
@@ -448,15 +448,15 @@ KJS::Value TQCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object
 KJS::Value TQCheckListItemImp::width_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQFontMetrics &
+    // Unsupported parameter const TQFontMetrics &
     return KJS::Value();
 #if 0
-    const TTQFontMetrics & arg0; // Dummy
+    const TQFontMetrics & arg0; // Dummy
 
-    // Unsupported parameter const TTQListView *
+    // Unsupported parameter const TQListView *
     return KJS::Value();
 
-    const TTQListView * arg1; // Dummy
+    const TQListView * arg1; // Dummy
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -508,7 +508,7 @@ KJS::Value TQCheckListItemImp::type_16( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQCheckListItemImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
@@ -519,7 +519,7 @@ KJS::Value TQCheckListItemImp::text_18( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h
index a24c316f..f9dca63f 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.h
+++ b/kjsembed/qtbindings/qchecklistitem_imp.h
@@ -10,7 +10,7 @@
 #include 
 #include 
 
-class TTQCheckListItem;
+class TQCheckListItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -26,7 +26,7 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for TTQCheckListItem methods.
+ * Wrapper class for TQCheckListItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -72,7 +72,7 @@ public:
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQCheckListItem *toTQCheckListItem( KJS::Object &object );
+   static TQCheckListItem *toTQCheckListItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -123,7 +123,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQCheckListItem *instance; // Temp
+   TQCheckListItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp
index 28cf620c..6ee231b8 100644
--- a/kjsembed/qtbindings/qcombobox_imp.cpp
+++ b/kjsembed/qtbindings/qcombobox_imp.cpp
@@ -21,12 +21,12 @@
  */
 namespace KJSEmbed {
 
-TTQComboBoxImp::TQComboBoxImp( KJS::ExecState *exec, int mid, bool constructor )
+TQComboBoxImp::TQComboBoxImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQComboBoxImp::~TQComboBoxImp()
+TQComboBoxImp::~TQComboBoxImp()
 {
 }
 
@@ -41,7 +41,7 @@ void TQComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -64,12 +64,12 @@ void TQComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     EnumValue enums[] = {
 
         // enum Policy
-        { "NoInsertion", TTQComboBox::NoInsertion },
-        { "AtTop", TTQComboBox::AtTop },
-        { "AtCurrent", TTQComboBox::AtCurrent },
-        { "AtBottom", TTQComboBox::AtBottom },
-        { "AfterCurrent", TTQComboBox::AfterCurrent },
-        { "BeforeCurrent", TTQComboBox::BeforeCurrent },
+        { "NoInsertion", TQComboBox::NoInsertion },
+        { "AtTop", TQComboBox::AtTop },
+        { "AtCurrent", TQComboBox::AtCurrent },
+        { "AtBottom", TQComboBox::AtBottom },
+        { "AfterCurrent", TQComboBox::AfterCurrent },
+        { "BeforeCurrent", TQComboBox::BeforeCurrent },
 	{ 0, 0 }
     };
 
@@ -137,7 +137,7 @@ void TQComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -150,25 +150,25 @@ void TQComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQComboBox pointer from an Object.
+ * Extract a TQComboBox pointer from an Object.
  */
-TTQComboBox *TQComboBoxImp::toTQComboBox( KJS::Object &self )
+TQComboBox *TQComboBoxImp::toTQComboBox( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQComboBox" )
+    if ( op->typeName() != "TQComboBox" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -190,7 +190,7 @@ KJS::Object TQComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &arg
              break;
     }
 
-    TTQString msg = i18n("TQComboBoxCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQComboBoxCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -198,15 +198,15 @@ KJS::Object TQComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &arg
 KJS::Object TQComboBoxImp::TQComboBox_1( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Value();
 
-    TTQWidget * arg0; // Dummy
+    TQWidget * arg0; // Dummy
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an object of type TQComboBoxTQComboBox *ret = new TTQComboBox(
+    // We should now create an object of type TQComboBoxTQComboBox *ret = new TQComboBox(
 
           arg0,
           arg1 );
@@ -219,15 +219,15 @@ KJS::Object TQComboBoxImp::TQComboBox_2( KJS::ExecState *exec, const KJS::List &
 #if 0
     bool arg0 = extractBool(exec, args, 0);
 
-    // Unsupported parameter TTQWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Value();
 
-    TTQWidget * arg1; // Dummy
+    TQWidget * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
 
-    // We should now create an object of type TQComboBoxTQComboBox *ret = new TTQComboBox(
+    // We should now create an object of type TQComboBoxTQComboBox *ret = new TQComboBox(
 
           arg0,
           arg1,
@@ -427,7 +427,7 @@ KJS::Value TQComboBoxImp::call( KJS::ExecState *exec, KJS::Object &self, const K
         break;
     }
 
-    TTQString msg = i18n( "TQComboBoxImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQComboBoxImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -444,7 +444,7 @@ KJS::Value TQComboBoxImp::count_4( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value TQComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQStringList arg0 = extractTQStringList(exec, args, 0);
+    TQStringList arg0 = extractTQStringList(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -458,7 +458,7 @@ KJS::Value TQComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object
 KJS::Value TQComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQStrList arg0 = extractTQStrList(exec, args, 0);
+    TQStrList arg0 = extractTQStrList(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -472,10 +472,10 @@ KJS::Value TQComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value TQComboBoxImp::insertStrList_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQStrList *
+    // Unsupported parameter const TQStrList *
     return KJS::Value();
 
-    const TTQStrList * arg0; // Dummy
+    const TQStrList * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -509,7 +509,7 @@ KJS::Value TQComboBoxImp::insertStrList_8( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value TQComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -523,7 +523,7 @@ KJS::Value TQComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -537,9 +537,9 @@ KJS::Value TQComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQComboBoxImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -585,7 +585,7 @@ KJS::Value TQComboBoxImp::setCurrentItem_14( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQString ret;
+      TQString ret;
       ret = instance->currentText(  );
       return KJS::String( ret );
 
@@ -594,7 +594,7 @@ KJS::Value TQComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQComboBoxImp::setCurrentText_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
       instance->setCurrentText(
        arg0 );
@@ -607,7 +607,7 @@ KJS::Value TQComboBoxImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const
 
     int arg0 = extractInt(exec, args, 0);
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
@@ -621,14 +621,14 @@ KJS::Value TQComboBoxImp::pixmap_18( KJS::ExecState *exec, KJS::Object &obj, con
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'const TTQPixmap *'
+      return KJS::Value(); // Returns 'const TQPixmap *'
 
 }
 
 KJS::Value TQComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -642,7 +642,7 @@ KJS::Value TQComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -656,9 +656,9 @@ KJS::Value TQComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQComboBoxImp::changeItem_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -692,7 +692,7 @@ KJS::Value TQComboBoxImp::setAutoResize_23( KJS::ExecState *exec, KJS::Object &o
 
 KJS::Value TQComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQSize ret;
+    TQSize ret;
       ret = instance->sizeHint(  );
 
        return convertToValue( exec, ret );
@@ -702,7 +702,7 @@ KJS::Value TQComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPalette arg0 = extractTQPalette(exec, args, 0);
+    TQPalette arg0 = extractTQPalette(exec, args, 0);
 
       instance->setPalette(
        arg0 );
@@ -713,7 +713,7 @@ KJS::Value TQComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQComboBoxImp::setFont_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQFont arg0 = extractTQFont(exec, args, 0);
+    TQFont arg0 = extractTQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -775,7 +775,7 @@ KJS::Value TQComboBoxImp::maxCount_31( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQComboBoxImp::setInsertionPolicy_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQComboBox::Policy arg0 = TTQComboBox::AtBottom; // TODO (hack for combo box)
+    TQComboBox::Policy arg0 = TQComboBox::AtBottom; // TODO (hack for combo box)
 
       instance->setInsertionPolicy(
        arg0 );
@@ -794,10 +794,10 @@ KJS::Value TQComboBoxImp::insertionPolicy_33( KJS::ExecState *exec, KJS::Object
 KJS::Value TQComboBoxImp::setValidator_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQValidator *
+    // Unsupported parameter const TQValidator *
     return KJS::Value();
 
-    const TTQValidator * arg0; // Dummy
+    const TQValidator * arg0; // Dummy
 
       instance->setValidator(
        arg0 );
@@ -809,17 +809,17 @@ KJS::Value TQComboBoxImp::validator_35( KJS::ExecState *exec, KJS::Object &obj,
 {
 
       instance->validator(  );
-      return KJS::Value(); // Returns 'const TTQValidator *'
+      return KJS::Value(); // Returns 'const TQValidator *'
 
 }
 
 KJS::Value TQComboBoxImp::setListBox_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListBox *
+    // Unsupported parameter TQListBox *
     return KJS::Value();
 
-    TTQListBox * arg0; // Dummy
+    TQListBox * arg0; // Dummy
 
       instance->setListBox(
        arg0 );
@@ -831,17 +831,17 @@ KJS::Value TQComboBoxImp::listBox_37( KJS::ExecState *exec, KJS::Object &obj, co
 {
 
       instance->listBox(  );
-      return KJS::Value(); // Returns 'TTQListBox *'
+      return KJS::Value(); // Returns 'TQListBox *'
 
 }
 
 KJS::Value TQComboBoxImp::setLineEdit_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQLineEdit *
+    // Unsupported parameter TQLineEdit *
     return KJS::Value();
 
-    TTQLineEdit * arg0; // Dummy
+    TQLineEdit * arg0; // Dummy
 
       instance->setLineEdit(
        arg0 );
@@ -853,7 +853,7 @@ KJS::Value TQComboBoxImp::lineEdit_39( KJS::ExecState *exec, KJS::Object &obj, c
 {
 
       instance->lineEdit(  );
-      return KJS::Value(); // Returns 'TTQLineEdit *'
+      return KJS::Value(); // Returns 'TQLineEdit *'
 
 }
 
@@ -880,15 +880,15 @@ KJS::Value TQComboBoxImp::autoCompletion_41( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQComboBoxImp::eventFilter_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQObject *
+    // Unsupported parameter TQObject *
     return KJS::Value();
 
-    TTQObject * arg0; // Dummy
+    TQObject * arg0; // Dummy
 
-    // Unsupported parameter TTQEvent *
+    // Unsupported parameter TQEvent *
     return KJS::Value();
 
-    TTQEvent * arg1; // Dummy
+    TQEvent * arg1; // Dummy
 
       bool ret;
       ret = instance->eventFilter(
diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h
index f625e73b..56a43d5c 100644
--- a/kjsembed/qtbindings/qcombobox_imp.h
+++ b/kjsembed/qtbindings/qcombobox_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQComboBox;
+class TQComboBox;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQComboBox;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQComboBox methods.
+ * Wrapper class for TQComboBox methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -98,7 +98,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQComboBox *toTQComboBox( KJS::Object &object );
+   static TQComboBox *toTQComboBox( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -174,7 +174,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQComboBox *instance; // Temp
+   TQComboBox *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qframe_imp.cpp b/kjsembed/qtbindings/qframe_imp.cpp
index 806babee..767928a6 100644
--- a/kjsembed/qtbindings/qframe_imp.cpp
+++ b/kjsembed/qtbindings/qframe_imp.cpp
@@ -25,25 +25,25 @@ void TQFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum Shape
-        { "NoFrame", TTQFrame::NoFrame },
-        { "Box", TTQFrame::Box },
-        { "Panel", TTQFrame::Panel },
-        { "WinPanel", TTQFrame::WinPanel },
-        { "HLine", TTQFrame::HLine },
-        { "VLine", TTQFrame::VLine },
-        { "StyledPanel", TTQFrame::StyledPanel },
-        { "PopupPanel", TTQFrame::PopupPanel },
-        { "MenuBarPanel", TTQFrame::MenuBarPanel },
-        { "ToolBarPanel", TTQFrame::ToolBarPanel },
-        { "LineEditPanel", TTQFrame::LineEditPanel },
-        { "TabWidgetPanel", TTQFrame::TabWidgetPanel },
-        { "GroupBoxPanel", TTQFrame::GroupBoxPanel },
-        { "MShape", TTQFrame::MShape },
+        { "NoFrame", TQFrame::NoFrame },
+        { "Box", TQFrame::Box },
+        { "Panel", TQFrame::Panel },
+        { "WinPanel", TQFrame::WinPanel },
+        { "HLine", TQFrame::HLine },
+        { "VLine", TQFrame::VLine },
+        { "StyledPanel", TQFrame::StyledPanel },
+        { "PopupPanel", TQFrame::PopupPanel },
+        { "MenuBarPanel", TQFrame::MenuBarPanel },
+        { "ToolBarPanel", TQFrame::ToolBarPanel },
+        { "LineEditPanel", TQFrame::LineEditPanel },
+        { "TabWidgetPanel", TQFrame::TabWidgetPanel },
+        { "GroupBoxPanel", TQFrame::GroupBoxPanel },
+        { "MShape", TQFrame::MShape },
         // enum Shadow
-        { "Plain", TTQFrame::Plain },
-        { "Raised", TTQFrame::Raised },
-        { "Sunken", TTQFrame::Sunken },
-        { "MShadow", TTQFrame::MShadow },
+        { "Plain", TQFrame::Plain },
+        { "Raised", TQFrame::Raised },
+        { "Sunken", TQFrame::Sunken },
+        { "MShadow", TQFrame::MShadow },
 	{ 0, 0 }
     };
 
diff --git a/kjsembed/qtbindings/qframe_imp.h b/kjsembed/qtbindings/qframe_imp.h
index e6a255fe..a0ef9138 100644
--- a/kjsembed/qtbindings/qframe_imp.h
+++ b/kjsembed/qtbindings/qframe_imp.h
@@ -14,7 +14,7 @@
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQFrame enums.
+ * Wrapper class for TQFrame enums.
  *
  * @author Ian Reinhart Geiser, geiseri@kde.org
  */
diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp
index 610d5fc0..2536351c 100644
--- a/kjsembed/qtbindings/qlistview_imp.cpp
+++ b/kjsembed/qtbindings/qlistview_imp.cpp
@@ -22,12 +22,12 @@
  */
 namespace KJSEmbed {
 
-TTQListViewImp::TQListViewImp( KJS::ExecState *exec, int mid, bool constructor )
+TQListViewImp::TQListViewImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQListViewImp::~TQListViewImp()
+TQListViewImp::~TQListViewImp()
 {
 }
 
@@ -108,7 +108,7 @@ void TQListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].id ) {
         if ( lastName != methods[idx].name ) {
@@ -131,20 +131,20 @@ void TQListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum WidthMode
-        { "Manual", TTQListView::Manual },
-        { "Maximum", TTQListView::Maximum },
+        { "Manual", TQListView::Manual },
+        { "Maximum", TQListView::Maximum },
         // enum SelectionMode
-        { "Single", TTQListView::Single },
-        { "Multi", TTQListView::Multi },
-        { "Extended", TTQListView::Extended },
-        { "NoSelection", TTQListView::NoSelection },
+        { "Single", TQListView::Single },
+        { "Multi", TQListView::Multi },
+        { "Extended", TQListView::Extended },
+        { "NoSelection", TQListView::NoSelection },
         // enum ResizeMode
-        { "NoColumn", TTQListView::NoColumn },
-        { "AllColumns", TTQListView::AllColumns },
-        { "LastColumn", TTQListView::LastColumn },
+        { "NoColumn", TQListView::NoColumn },
+        { "AllColumns", TQListView::AllColumns },
+        { "LastColumn", TQListView::LastColumn },
         // enum RenameAction
-        { "Accept", TTQListView::Accept },
-        { "Reject", TTQListView::Reject },
+        { "Accept", TQListView::Accept },
+        { "Reject", TQListView::Reject },
 	{ 0, 0 }
     };
 
@@ -156,23 +156,23 @@ void TQListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 }
 
-TTQListView *TQListViewImp::toTQListView( KJS::Object &self )
+TQListView *TQListViewImp::toTQListView( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQListView" )
+    if ( op->typeName() != "TQListView" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 
@@ -188,7 +188,7 @@ KJS::Object TQListViewImp::construct( KJS::ExecState *exec, const KJS::List &arg
              break;
     }
 
-    TTQString msg = i18n("TQListViewCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQListViewCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -197,13 +197,13 @@ KJS::Object TQListViewImp::TQListView_1( KJS::ExecState *exec, const KJS::List &
 {
 
     // TODO
-    TTQWidget *arg0 = 0L;
+    TQWidget *arg0 = 0L;
 
     // TODO
-    TTQWidget *arg1 = 0L;
+    TQWidget *arg1 = 0L;
 
     // TODO
-    TTQWidget *arg2 = 0L;
+    TQWidget *arg2 = 0L;
 
 }
 
@@ -493,7 +493,7 @@ KJS::Value TQListViewImp::call( KJS::ExecState *exec, KJS::Object &self, const K
         break;
     }
 
-    TTQString msg = i18n( "TQListViewImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQListViewImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -521,10 +521,10 @@ KJS::Value TQListViewImp::setTreeStepSize_4( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->insertItem(
        arg0 );
@@ -535,10 +535,10 @@ KJS::Value TQListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->takeItem(
        arg0 );
@@ -549,10 +549,10 @@ KJS::Value TQListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value TQListViewImp::removeItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -564,14 +564,14 @@ KJS::Value TQListViewImp::header_8( KJS::ExecState *exec, KJS::Object &obj, cons
 {
 
       instance->header(  );
-      return KJS::Value(); // Returns 'TTQHeader *'
+      return KJS::Value(); // Returns 'TQHeader *'
 
 }
 
 KJS::Value TQListViewImp::addColumn_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
+    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -589,9 +589,9 @@ KJS::Value TQListViewImp::addColumn_10( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet  arg0; // Dummy
+    const TQIconSet  arg0; // Dummy
 
-    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
+    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -620,7 +620,7 @@ KJS::Value TQListViewImp::setColumnText_12( KJS::ExecState *exec, KJS::Object &o
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-    TTQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TTQString::null;
+    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
 
       instance->setColumnText(
        arg0,
@@ -637,9 +637,9 @@ KJS::Value TQListViewImp::setColumnText_13( KJS::ExecState *exec, KJS::Object &o
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet  arg1; // Dummy
+    const TQIconSet  arg1; // Dummy
 
-    TTQString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : TTQString::null;
+    TQString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : TQString::null;
 
       instance->setColumnText(
        arg0,
@@ -654,7 +654,7 @@ KJS::Value TQListViewImp::columnText_14( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-      TTQString ret;
+      TQString ret;
       ret = instance->columnText(
        arg0 );
       return KJS::String( ret );
@@ -761,24 +761,24 @@ KJS::Value TQListViewImp::show_22( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value TQListViewImp::itemAt_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQPoint &
+    // Unsupported parameter const TQPoint &
     return KJS::Value();
 
-    const TTQPoint & arg0; // Dummy
+    const TQPoint & arg0; // Dummy
 
       instance->itemAt(
        arg0 );
-      return KJS::Value(); // Returns 'TTQListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
 KJS::Value TQListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const TTQListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       instance->itemRect(
        arg0 );
@@ -789,10 +789,10 @@ KJS::Value TQListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const TTQListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       int ret;
       ret = instance->itemPos(
@@ -804,10 +804,10 @@ KJS::Value TQListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value TQListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const TTQListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       instance->ensureItemVisible(
        arg0 );
@@ -818,10 +818,10 @@ KJS::Value TQListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Objec
 KJS::Value TQListViewImp::repaintItem_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const TTQListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       instance->repaintItem(
        arg0 );
@@ -882,10 +882,10 @@ KJS::Value TQListViewImp::clearSelection_32( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -899,10 +899,10 @@ KJS::Value TQListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->setSelectionAnchor(
        arg0 );
@@ -913,10 +913,10 @@ KJS::Value TQListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Obje
 KJS::Value TQListViewImp::isSelected_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const TTQListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       bool ret;
       ret = instance->isSelected(
@@ -929,17 +929,17 @@ KJS::Value TQListViewImp::selectedItem_36( KJS::ExecState *exec, KJS::Object &ob
 {
 
       instance->selectedItem(  );
-      return KJS::Value(); // Returns 'TTQListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
 KJS::Value TQListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -953,10 +953,10 @@ KJS::Value TQListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value TQListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const TTQListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       bool ret;
       ret = instance->isOpen(
@@ -968,10 +968,10 @@ KJS::Value TQListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value TQListViewImp::setCurrentItem_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->setCurrentItem(
        arg0 );
@@ -983,7 +983,7 @@ KJS::Value TQListViewImp::currentItem_40( KJS::ExecState *exec, KJS::Object &obj
 {
 
       instance->currentItem(  );
-      return KJS::Value(); // Returns 'TTQListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
@@ -991,7 +991,7 @@ KJS::Value TQListViewImp::firstChild_41( KJS::ExecState *exec, KJS::Object &obj,
 {
 
       instance->firstChild(  );
-      return KJS::Value(); // Returns 'TTQListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
@@ -999,7 +999,7 @@ KJS::Value TQListViewImp::lastItem_42( KJS::ExecState *exec, KJS::Object &obj, c
 {
 
       instance->lastItem(  );
-      return KJS::Value(); // Returns 'TTQListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
@@ -1139,7 +1139,7 @@ KJS::Value TQListViewImp::sort_55( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value TQListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQFont arg0; // TODO
+    TQFont arg0; // TODO
 
       instance->setFont(
        arg0 );
@@ -1150,7 +1150,7 @@ KJS::Value TQListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value TQListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPalette arg0; // TODO
+    TQPalette arg0; // TODO
 
       instance->setPalette(
        arg0 );
@@ -1161,15 +1161,15 @@ KJS::Value TQListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQListViewImp::eventFilter_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQObject *
+    // Unsupported parameter TQObject *
     return KJS::Value();
 
-    TTQObject * arg0; // Dummy
+    TQObject * arg0; // Dummy
 
-    // Unsupported parameter TTQEvent *
+    // Unsupported parameter TQEvent *
     return KJS::Value();
 
-    TTQEvent * arg1; // Dummy
+    TQEvent * arg1; // Dummy
 
       bool ret;
       ret = instance->eventFilter(
@@ -1260,7 +1260,7 @@ KJS::Value TQListViewImp::resizeMode_66( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TTQString::null;
+    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -1273,7 +1273,7 @@ KJS::Value TQListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, c
        arg0,
        arg1,
        arg2 );
-      return KJS::Value(); // Returns 'TTQListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h
index f201c179..0ded4900 100644
--- a/kjsembed/qtbindings/qlistview_imp.h
+++ b/kjsembed/qtbindings/qlistview_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQListView;
+class TQListView;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQListView;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQListView methods.
+ * Wrapper class for TQListView methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -111,7 +111,7 @@ public:
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQListView *toTQListView( KJS::Object &object );
+   static TQListView *toTQListView( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -210,7 +210,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQListView *instance; // Temp
+   TQListView *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp
index 69d94009..f1ed55c2 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.cpp
+++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp
@@ -31,17 +31,17 @@ namespace Bindings {
             JSOpaqueProxy *prx = 0;
 
             if ( arg0 ) {
-                if ( arg0->typeName() == "TTQListViewItem" ) {
-                    TTQListViewItem * parent = arg0->toNative();
-                    prx = new JSOpaqueProxy( new TTQListViewItem( parent ), "TTQListViewItem" );
+                if ( arg0->typeName() == "TQListViewItem" ) {
+                    TQListViewItem * parent = arg0->toNative();
+                    prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" );
                 } else {
                     return KJS::Object();
                 }
             } else {
                 JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() );
                 if ( arg0 ) {
-                    TTQListView * parent = ( TTQListView * ) ( arg0->widget() );
-                    prx = new JSOpaqueProxy( new TTQListViewItem( parent ), "TTQListViewItem" );
+                    TQListView * parent = ( TQListView * ) ( arg0->widget() );
+                    prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" );
                 } else {
                     return KJS::Object();
                 }
@@ -60,12 +60,12 @@ namespace Bindings {
     }
 }
 
-TTQListViewItemImp::TQListViewItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TQListViewItemImp::TQListViewItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQListViewItemImp::~TQListViewItemImp()
+TQListViewItemImp::~TQListViewItemImp()
 {
 }
 
@@ -80,7 +80,7 @@ void TQListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -159,7 +159,7 @@ void TQListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -172,21 +172,21 @@ void TQListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQListViewItem pointer from an Object.
+ * Extract a TQListViewItem pointer from an Object.
  */
-TTQListViewItem *TQListViewItemImp::toTQListViewItem( KJS::Object &self )
+TQListViewItem *TQListViewItemImp::toTQListViewItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -232,7 +232,7 @@ KJS::Object TQListViewItemImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    TTQString msg = i18n("TQListViewItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("TQListViewItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -240,13 +240,13 @@ KJS::Object TQListViewItemImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object TQListViewItemImp::TQListViewItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    TTQListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0 );
 #endif
@@ -257,13 +257,13 @@ return KJS::Object();
 KJS::Object TQListViewItemImp::TQListViewItem_2( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0 );
 #endif
@@ -274,18 +274,18 @@ KJS::Object TQListViewItemImp::TQListViewItem_3( KJS::ExecState *exec, const KJS
 {
 #if 0
 
-    // Unsupported parameter TTQListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    TTQListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1 );
@@ -297,18 +297,18 @@ KJS::Object TQListViewItemImp::TQListViewItem_4( KJS::ExecState *exec, const KJS
 {
 #if 0
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1 );
@@ -321,29 +321,29 @@ KJS::Object TQListViewItemImp::TQListViewItem_5( KJS::ExecState *exec, const KJS
 {
 #if 0
 
-    // Unsupported parameter TTQListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    TTQListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
-    TTQString arg2 = extractTQString(exec, args, 2);
+    TQString arg2 = extractTQString(exec, args, 2);
 
-    TTQString arg3 = extractTQString(exec, args, 3);
+    TQString arg3 = extractTQString(exec, args, 3);
 
-    TTQString arg4 = extractTQString(exec, args, 4);
+    TQString arg4 = extractTQString(exec, args, 4);
 
-    TTQString arg5 = extractTQString(exec, args, 5);
+    TQString arg5 = extractTQString(exec, args, 5);
 
-    TTQString arg6 = extractTQString(exec, args, 6);
+    TQString arg6 = extractTQString(exec, args, 6);
 
-    TTQString arg7 = extractTQString(exec, args, 7);
+    TQString arg7 = extractTQString(exec, args, 7);
 
-    TTQString arg8 = extractTQString(exec, args, 8);
+    TQString arg8 = extractTQString(exec, args, 8);
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -363,29 +363,29 @@ KJS::Object TQListViewItemImp::TQListViewItem_6( KJS::ExecState *exec, const KJS
 {
 #if 0
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
-    TTQString arg2 = extractTQString(exec, args, 2);
+    TQString arg2 = extractTQString(exec, args, 2);
 
-    TTQString arg3 = extractTQString(exec, args, 3);
+    TQString arg3 = extractTQString(exec, args, 3);
 
-    TTQString arg4 = extractTQString(exec, args, 4);
+    TQString arg4 = extractTQString(exec, args, 4);
 
-    TTQString arg5 = extractTQString(exec, args, 5);
+    TQString arg5 = extractTQString(exec, args, 5);
 
-    TTQString arg6 = extractTQString(exec, args, 6);
+    TQString arg6 = extractTQString(exec, args, 6);
 
-    TTQString arg7 = extractTQString(exec, args, 7);
+    TQString arg7 = extractTQString(exec, args, 7);
 
-    TTQString arg8 = extractTQString(exec, args, 8);
+    TQString arg8 = extractTQString(exec, args, 8);
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -405,34 +405,34 @@ return KJS::Object();
 KJS::Object TQListViewItemImp::TQListViewItem_7( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    TTQListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
-    TTQString arg2 = extractTQString(exec, args, 2);
+    TQString arg2 = extractTQString(exec, args, 2);
 
-    TTQString arg3 = extractTQString(exec, args, 3);
+    TQString arg3 = extractTQString(exec, args, 3);
 
-    TTQString arg4 = extractTQString(exec, args, 4);
+    TQString arg4 = extractTQString(exec, args, 4);
 
-    TTQString arg5 = extractTQString(exec, args, 5);
+    TQString arg5 = extractTQString(exec, args, 5);
 
-    TTQString arg6 = extractTQString(exec, args, 6);
+    TQString arg6 = extractTQString(exec, args, 6);
 
-    TTQString arg7 = extractTQString(exec, args, 7);
+    TQString arg7 = extractTQString(exec, args, 7);
 
-    TTQString arg8 = extractTQString(exec, args, 8);
+    TQString arg8 = extractTQString(exec, args, 8);
 
-    TTQString arg9 = extractTQString(exec, args, 9);
+    TQString arg9 = extractTQString(exec, args, 9);
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -452,34 +452,34 @@ return KJS::Object();
 KJS::Object TQListViewItemImp::TQListViewItem_8( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
-    TTQString arg2 = extractTQString(exec, args, 2);
+    TQString arg2 = extractTQString(exec, args, 2);
 
-    TTQString arg3 = extractTQString(exec, args, 3);
+    TQString arg3 = extractTQString(exec, args, 3);
 
-    TTQString arg4 = extractTQString(exec, args, 4);
+    TQString arg4 = extractTQString(exec, args, 4);
 
-    TTQString arg5 = extractTQString(exec, args, 5);
+    TQString arg5 = extractTQString(exec, args, 5);
 
-    TTQString arg6 = extractTQString(exec, args, 6);
+    TQString arg6 = extractTQString(exec, args, 6);
 
-    TTQString arg7 = extractTQString(exec, args, 7);
+    TQString arg7 = extractTQString(exec, args, 7);
 
-    TTQString arg8 = extractTQString(exec, args, 8);
+    TQString arg8 = extractTQString(exec, args, 8);
 
-    TTQString arg9 = extractTQString(exec, args, 9);
+    TQString arg9 = extractTQString(exec, args, 9);
 
 
-    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TTQListViewItem(
+    // We should now create an object of type TQListViewItemTQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -722,7 +722,7 @@ KJS::Value TQListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    TTQString msg = i18n( "TQListViewItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "TQListViewItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -730,10 +730,10 @@ KJS::Value TQListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, con
 KJS::Value TQListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->insertItem(
        arg0 );
@@ -744,10 +744,10 @@ KJS::Value TQListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->takeItem(
        arg0 );
@@ -758,10 +758,10 @@ KJS::Value TQListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value TQListViewItemImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -798,15 +798,15 @@ KJS::Value TQListViewItemImp::totalHeight_15( KJS::ExecState *exec, KJS::Object
 KJS::Value TQListViewItemImp::width_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter const TTQFontMetrics &
+    // Unsupported parameter const TQFontMetrics &
     return KJS::Value();
 
-    const TTQFontMetrics & arg0; // Dummy
+    const TQFontMetrics & arg0; // Dummy
 
-    // Unsupported parameter const TTQListView *
+    // Unsupported parameter const TQListView *
     return KJS::Value();
 
-    const TTQListView * arg1; // Dummy
+    const TQListView * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -846,7 +846,7 @@ KJS::Value TQListViewItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj
 
     int arg0 = extractInt(exec, args, 0);
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
       instance->setText(
        arg0,
@@ -860,7 +860,7 @@ KJS::Value TQListViewItemImp::text_20( KJS::ExecState *exec, KJS::Object &obj, c
 
     int arg0 = extractInt(exec, args, 0);
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
@@ -872,7 +872,7 @@ KJS::Value TQListViewItemImp::setPixmap_21( KJS::ExecState *exec, KJS::Object &o
 
     int arg0 = extractInt(exec, args, 0);
 
-    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
       instance->setPixmap(
        arg0,
@@ -888,7 +888,7 @@ KJS::Value TQListViewItemImp::pixmap_22( KJS::ExecState *exec, KJS::Object &obj,
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'const TTQPixmap *'
+      return KJS::Value(); // Returns 'const TQPixmap *'
 
 }
 
@@ -899,7 +899,7 @@ KJS::Value TQListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, co
 
     bool arg1 = extractBool(exec, args, 1);
 
-      TTQString ret;
+      TQString ret;
       ret = instance->key(
        arg0,
        arg1 );
@@ -910,10 +910,10 @@ KJS::Value TQListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value TQListViewItemImp::compare_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1002,15 +1002,15 @@ KJS::Value TQListViewItemImp::isSelected_31( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQListViewItemImp::paintCell_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TTQColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const TTQColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1033,15 +1033,15 @@ return KJS::Object();
 KJS::Value TQListViewItemImp::paintBranches_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TTQColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const TTQColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1064,17 +1064,17 @@ return KJS::Object();
 KJS::Value TQListViewItemImp::paintFocus_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter TTQPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    TTQPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const TTQColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const TTQColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
-    TTQRect arg2 = extractTQRect(exec, args, 2);
+    TQRect arg2 = extractTQRect(exec, args, 2);
 
       instance->paintFocus(
        arg0,
@@ -1089,10 +1089,10 @@ return KJS::Object();
 KJS::Value TQListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQListViewItem *item = instance->firstChild(  );
+      TQListViewItem *item = instance->firstChild(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1106,10 +1106,10 @@ KJS::Value TQListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &
 KJS::Value TQListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQListViewItem *item = instance->nextSibling(  );
+      TQListViewItem *item = instance->nextSibling(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1123,10 +1123,10 @@ KJS::Value TQListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object
 KJS::Value TQListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQListViewItem *item = instance->parent(  );
+      TQListViewItem *item = instance->parent(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1140,10 +1140,10 @@ KJS::Value TQListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQListViewItem *item = instance->itemAbove(  );
+      TQListViewItem *item = instance->itemAbove(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1157,10 +1157,10 @@ KJS::Value TQListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &o
 KJS::Value TQListViewItemImp::itemBelow_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQListViewItem *item = instance->itemBelow(  );
+      TQListViewItem *item = instance->itemBelow(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TTQListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1184,7 +1184,7 @@ KJS::Value TQListViewItemImp::listView_41( KJS::ExecState *exec, KJS::Object &ob
 {
 
       instance->listView(  );
-      return KJS::Value(); // Returns 'TTQListView *'
+      return KJS::Value(); // Returns 'TQListView *'
 
 }
 
@@ -1247,10 +1247,10 @@ KJS::Value TQListViewItemImp::sort_47( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value TQListViewItemImp::moveItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    TTQListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->moveItem(
        arg0 );
@@ -1301,10 +1301,10 @@ KJS::Value TQListViewItemImp::dropEnabled_52( KJS::ExecState *exec, KJS::Object
 KJS::Value TQListViewItemImp::acceptDrop_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const TTQMimeSource *
+    // Unsupported parameter const TQMimeSource *
     return KJS::Value();
 
-    const TTQMimeSource * arg0; // Dummy
+    const TQMimeSource * arg0; // Dummy
 
       bool ret;
       ret = instance->acceptDrop(
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h
index b4c7caa8..72dfdd6e 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.h
+++ b/kjsembed/qtbindings/qlistviewitem_imp.h
@@ -10,7 +10,7 @@
 #include 
 #include 
 
-class TTQListViewItem;
+class TQListViewItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -26,7 +26,7 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for TTQListViewItem methods.
+ * Wrapper class for TQListViewItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -122,7 +122,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQListViewItem *toTQListViewItem( KJS::Object &object );
+   static TQListViewItem *toTQListViewItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -213,7 +213,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQListViewItem *instance; // Temp
+   TQListViewItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp
index 925e4125..22b16d3e 100644
--- a/kjsembed/qtbindings/qmenudata_imp.cpp
+++ b/kjsembed/qtbindings/qmenudata_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQMenuDataImp::TQMenuDataImp( KJS::ExecState *exec, int mid, bool constructor )
+TQMenuDataImp::TQMenuDataImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQMenuDataImp::~TQMenuDataImp()
+TQMenuDataImp::~TQMenuDataImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -121,7 +121,7 @@ void TQMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -134,25 +134,25 @@ void TQMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQMenuData pointer from an Object.
+ * Extract a TQMenuData pointer from an Object.
  */
-TTQMenuData *TQMenuDataImp::toTQMenuData( KJS::Object &self )
+TQMenuData *TQMenuDataImp::toTQMenuData( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQMenuData" )
+    if ( op->typeName() != "TQMenuData" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -170,7 +170,7 @@ KJS::Object TQMenuDataImp::construct( KJS::ExecState *exec, const KJS::List &arg
              break;
     }
 
-    TTQString msg = i18n("TQMenuDataCons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("TQMenuDataCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -179,9 +179,9 @@ KJS::Object TQMenuDataImp::TQMenuData_1( KJS::ExecState *exec, const KJS::List &
 {
 
 
-    // We should now create an instance of the TTQMenuData object
+    // We should now create an instance of the TQMenuData object
 
-    TTQMenuData *ret = new TTQMenuData(
+    TQMenuData *ret = new TQMenuData(
         );
 
     return KJS::Object();
@@ -409,7 +409,7 @@ KJS::Value TQMenuDataImp::call( KJS::ExecState *exec, KJS::Object &self, const K
         break;
     }
 
-    TTQString msg = i18n( "TQMenuDataImp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "TQMenuDataImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -426,19 +426,19 @@ KJS::Value TQMenuDataImp::count_3( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value TQMenuDataImp::insertItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter const TTQObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const TTQObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
     // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TTQKeySequence  arg3; // Dummy
+    const TQKeySequence  arg3; // Dummy
 
     int arg4 = extractInt(exec, args, 4);
 
@@ -462,21 +462,21 @@ KJS::Value TQMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
-    // Unsupported parameter const TTQObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const TTQObject * arg2; // Dummy
+    const TQObject * arg2; // Dummy
 
     const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0;
 
     // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TTQKeySequence arg4; // Dummy
+    const TQKeySequence arg4; // Dummy
 
     int arg5 = extractInt(exec, args, 5);
 
@@ -498,19 +498,19 @@ KJS::Value TQMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    // Unsupported parameter const TTQObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const TTQObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
     // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TTQKeySequence  arg3; // Dummy
+    const TQKeySequence  arg3; // Dummy
 
     int arg4 = extractInt(exec, args, 4);
 
@@ -534,21 +534,21 @@ KJS::Value TQMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
-    // Unsupported parameter const TTQObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const TTQObject * arg2; // Dummy
+    const TQObject * arg2; // Dummy
 
     const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0;
 
     // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TTQKeySequence arg4; // Dummy
+    const TQKeySequence arg4; // Dummy
 
     int arg5 = extractInt(exec, args, 5);
 
@@ -570,7 +570,7 @@ KJS::Value TQMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -591,9 +591,9 @@ KJS::Value TQMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -612,12 +612,12 @@ KJS::Value TQMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
-    // Unsupported parameter TTQPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    TTQPopupMenu * arg1; // Dummy
+    TQPopupMenu * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -639,14 +639,14 @@ KJS::Value TQMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
-    // Unsupported parameter TTQPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    TTQPopupMenu * arg2; // Dummy
+    TQPopupMenu * arg2; // Dummy
 
     int arg3 = extractInt(exec, args, 3);
 
@@ -666,7 +666,7 @@ KJS::Value TQMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -687,9 +687,9 @@ KJS::Value TQMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -708,12 +708,12 @@ KJS::Value TQMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
-    // Unsupported parameter TTQPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    TTQPopupMenu * arg1; // Dummy
+    TQPopupMenu * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -735,14 +735,14 @@ KJS::Value TQMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
-    // Unsupported parameter TTQPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    TTQPopupMenu * arg2; // Dummy
+    TQPopupMenu * arg2; // Dummy
 
     int arg3 = extractInt(exec, args, 3);
 
@@ -762,10 +762,10 @@ KJS::Value TQMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Value();
 
-    TTQWidget * arg0; // Dummy
+    TQWidget * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -786,12 +786,12 @@ KJS::Value TQMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    // Unsupported parameter TTQCustomMenuItem *
+    // Unsupported parameter TQCustomMenuItem *
     return KJS::Value();
 
-    TTQCustomMenuItem * arg1; // Dummy
+    TQCustomMenuItem * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -810,10 +810,10 @@ KJS::Value TQMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::insertItem_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQCustomMenuItem *
+    // Unsupported parameter TQCustomMenuItem *
     return KJS::Value();
 
-    TTQCustomMenuItem * arg0; // Dummy
+    TQCustomMenuItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -887,7 +887,7 @@ KJS::Value TQMenuDataImp::setAccel_24( KJS::ExecState *exec, KJS::Object &obj, c
     // Unsupported parameter const TQKeySequence
     return KJS::Value();
 
-    const TTQKeySequence  arg0; // Dummy
+    const TQKeySequence  arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -905,7 +905,7 @@ KJS::Value TQMenuDataImp::iconSet_25( KJS::ExecState *exec, KJS::Object &obj, co
 
       instance->iconSet(
        arg0 );
-      return KJS::Value(); // Returns 'TTQIconSet *'
+      return KJS::Value(); // Returns 'TQIconSet *'
 
 }
 
@@ -914,7 +914,7 @@ KJS::Value TQMenuDataImp::text_26( KJS::ExecState *exec, KJS::Object &obj, const
 
     int arg0 = extractInt(exec, args, 0);
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
@@ -928,7 +928,7 @@ KJS::Value TQMenuDataImp::pixmap_27( KJS::ExecState *exec, KJS::Object &obj, con
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'TTQPixmap *'
+      return KJS::Value(); // Returns 'TQPixmap *'
 
 }
 
@@ -937,7 +937,7 @@ KJS::Value TQMenuDataImp::setWhatsThis_28( KJS::ExecState *exec, KJS::Object &ob
 
     int arg0 = extractInt(exec, args, 0);
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
       instance->setWhatsThis(
        arg0,
@@ -951,7 +951,7 @@ KJS::Value TQMenuDataImp::whatsThis_29( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-      TTQString ret;
+      TQString ret;
       ret = instance->whatsThis(
        arg0 );
       return KJS::String( ret );
@@ -963,7 +963,7 @@ KJS::Value TQMenuDataImp::changeItem_30( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
       instance->changeItem(
        arg0,
@@ -977,7 +977,7 @@ KJS::Value TQMenuDataImp::changeItem_31( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-    TTQPixmap arg1 = extractTQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractTQPixmap(exec, args, 1);
 
       instance->changeItem(
        arg0,
@@ -994,9 +994,9 @@ KJS::Value TQMenuDataImp::changeItem_32( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet  arg1; // Dummy
+    const TQIconSet  arg1; // Dummy
 
-    TTQString arg2 = extractTQString(exec, args, 2);
+    TQString arg2 = extractTQString(exec, args, 2);
 
       instance->changeItem(
        arg0,
@@ -1014,9 +1014,9 @@ KJS::Value TQMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet  arg1; // Dummy
+    const TQIconSet  arg1; // Dummy
 
-    TTQPixmap arg2 = extractTQPixmap(exec, args, 2);
+    TQPixmap arg2 = extractTQPixmap(exec, args, 2);
 
       instance->changeItem(
        arg0,
@@ -1029,7 +1029,7 @@ KJS::Value TQMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1043,7 +1043,7 @@ KJS::Value TQMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuDataImp::changeItem_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPixmap arg0 = extractTQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractTQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1060,9 +1060,9 @@ KJS::Value TQMenuDataImp::changeItem_36( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const TQIconSet
     return KJS::Value();
 
-    const TTQIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    TTQString arg1 = extractTQString(exec, args, 1);
+    TQString arg1 = extractTQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1218,10 +1218,10 @@ KJS::Value TQMenuDataImp::connectItem_48( KJS::ExecState *exec, KJS::Object &obj
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const TTQObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const TTQObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
@@ -1239,10 +1239,10 @@ KJS::Value TQMenuDataImp::disconnectItem_49( KJS::ExecState *exec, KJS::Object &
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const TTQObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const TTQObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
@@ -1289,7 +1289,7 @@ KJS::Value TQMenuDataImp::findItem_52( KJS::ExecState *exec, KJS::Object &obj, c
 
       instance->findItem(
        arg0 );
-      return KJS::Value(); // Returns 'TTQMenuItem *'
+      return KJS::Value(); // Returns 'TQMenuItem *'
 
 }
 
@@ -1298,25 +1298,25 @@ KJS::Value TQMenuDataImp::findItem_53( KJS::ExecState *exec, KJS::Object &obj, c
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter TTQMenuData **
+    // Unsupported parameter TQMenuData **
     return KJS::Value();
 
-    TTQMenuData ** arg1; // Dummy
+    TQMenuData ** arg1; // Dummy
 
       instance->findItem(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'TTQMenuItem *'
+      return KJS::Value(); // Returns 'TQMenuItem *'
 
 }
 
 KJS::Value TQMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    TTQPopupMenu * arg0; // Dummy
+    TQPopupMenu * arg0; // Dummy
 
     // Unsupported parameter int *
     return KJS::Value();
@@ -1326,7 +1326,7 @@ KJS::Value TQMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj,
       instance->findPopup(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'TTQMenuItem *'
+      return KJS::Value(); // Returns 'TQMenuItem *'
 
 }
 
diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h
index 6409dca6..dfab42e8 100644
--- a/kjsembed/qtbindings/qmenudata_imp.h
+++ b/kjsembed/qtbindings/qmenudata_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQMenuData;
+class TQMenuData;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQMenuData;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQMenuData methods.
+ * Wrapper class for TQMenuData methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -105,7 +105,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQMenuData *toTQMenuData( KJS::Object &object );
+   static TQMenuData *toTQMenuData( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -188,7 +188,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQMenuData *instance; // Temp
+   TQMenuData *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp
index 75118e4e..f65fa910 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.cpp
+++ b/kjsembed/qtbindings/qmenuitem_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQMenuItemImp::TQMenuItemImp( KJS::ExecState *exec, int mid, bool constructor )
+TQMenuItemImp::TQMenuItemImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQMenuItemImp::~TQMenuItemImp()
+TQMenuItemImp::~TQMenuItemImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -91,24 +91,24 @@ void TQMenuItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQMenuItem pointer from an Object.
+ * Extract a TQMenuItem pointer from an Object.
  */
-TTQMenuItem *TQMenuItemImp::toTQMenuItem( KJS::Object &self )
+TQMenuItem *TQMenuItemImp::toTQMenuItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
     if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
-    if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "TTQMenuItem") ) {
-        TTQObject *obj = JSProxy::toObjectProxy( self.imp() )->object();
-        return dynamic_cast( obj );
+    if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "TQMenuItem") ) {
+        TQObject *obj = JSProxy::toObjectProxy( self.imp() )->object();
+        return dynamic_cast( obj );
     }
     
-    if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "TTQMenuItem") ) {
-        return JSProxy::toOpaqueProxy( self.imp() )->toNative();
+    if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "TQMenuItem") ) {
+        return JSProxy::toOpaqueProxy( self.imp() )->toNative();
     }
     return 0;
     
@@ -129,7 +129,7 @@ KJS::Object TQMenuItemImp::construct( KJS::ExecState *exec, const KJS::List &arg
              break;
     }
 
-    TTQString msg = i18n("TQMenuItemCons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("TQMenuItemCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -138,9 +138,9 @@ KJS::Object TQMenuItemImp::TQMenuItem_1( KJS::ExecState *exec, const KJS::List &
 {
 
 
-    // We should now create an instance of the TTQMenuItem object
+    // We should now create an instance of the TQMenuItem object
 
-    TTQMenuItem *ret = new TTQMenuItem(
+    TQMenuItem *ret = new TQMenuItem(
         );
 
     return KJS::Object();
@@ -236,7 +236,7 @@ KJS::Value TQMenuItemImp::call( KJS::ExecState *exec, KJS::Object &self, const K
         break;
     }
 
-    TTQString msg = i18n( "TQMenuItemImp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "TQMenuItemImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -254,14 +254,14 @@ KJS::Value TQMenuItemImp::iconSet_4( KJS::ExecState *exec, KJS::Object &obj, con
 {
 
       instance->iconSet(  );
-      return KJS::Value(); // Returns 'TTQIconSet *'
+      return KJS::Value(); // Returns 'TQIconSet *'
 
 }
 
 KJS::Value TQMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQString ret;
+      TQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
@@ -270,7 +270,7 @@ KJS::Value TQMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value TQMenuItemImp::whatsThis_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      TTQString ret;
+      TQString ret;
       ret = instance->whatsThis(  );
       return KJS::String( ret );
 
@@ -287,7 +287,7 @@ KJS::Value TQMenuItemImp::popup_8( KJS::ExecState *exec, KJS::Object &obj, const
 {
 
       instance->popup(  );
-      return KJS::Value(); // Returns 'TTQPopupMenu *'
+      return KJS::Value(); // Returns 'TQPopupMenu *'
 
 }
 
@@ -295,7 +295,7 @@ KJS::Value TQMenuItemImp::widget_9( KJS::ExecState *exec, KJS::Object &obj, cons
 {
 
       instance->widget(  );
-      return KJS::Value(); // Returns 'TTQWidget *'
+      return KJS::Value(); // Returns 'TQWidget *'
 
 }
 
@@ -303,7 +303,7 @@ KJS::Value TQMenuItemImp::custom_10( KJS::ExecState *exec, KJS::Object &obj, con
 {
 
       instance->custom(  );
-      return KJS::Value(); // Returns 'TTQCustomMenuItem *'
+      return KJS::Value(); // Returns 'TQCustomMenuItem *'
 
 }
 
@@ -318,7 +318,7 @@ KJS::Value TQMenuItemImp::signal_12( KJS::ExecState *exec, KJS::Object &obj, con
 {
 
       instance->signal(  );
-      return KJS::Value(); // Returns 'TTQSignal *'
+      return KJS::Value(); // Returns 'TQSignal *'
 
 }
 
@@ -379,7 +379,7 @@ KJS::Value TQMenuItemImp::isEnabledAndVisible_18( KJS::ExecState *exec, KJS::Obj
 KJS::Value TQMenuItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
       instance->setText(
        arg0 );
@@ -412,7 +412,7 @@ KJS::Value TQMenuItemImp::setVisible_21( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value TQMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQString arg0 = extractTQString(exec, args, 0);
+    TQString arg0 = extractTQString(exec, args, 0);
 
       instance->setWhatsThis(
        arg0 );
diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h
index ad1e480b..9739d078 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.h
+++ b/kjsembed/qtbindings/qmenuitem_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQMenuItem;
+class TQMenuItem;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQMenuItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQMenuItem methods.
+ * Wrapper class for TQMenuItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -72,7 +72,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQMenuItem *toTQMenuItem( KJS::Object &object );
+   static TQMenuItem *toTQMenuItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -122,7 +122,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQMenuItem *instance; // Temp
+   TQMenuItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp
index f11c9a3b..1c94776a 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.cpp
+++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp
@@ -23,12 +23,12 @@
  */
 namespace KJSEmbed {
 
-TTQPopupMenuImp::TQPopupMenuImp( KJS::ExecState *exec, int mid, bool constructor )
+TQPopupMenuImp::TQPopupMenuImp( KJS::ExecState *exec, int mid, bool constructor )
    : JSProxyImp(exec), id(mid), cons(constructor)
 {
 }
 
-TTQPopupMenuImp::~TQPopupMenuImp()
+TQPopupMenuImp::~TQPopupMenuImp()
 {
 }
 
@@ -43,7 +43,7 @@ void TQPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -85,7 +85,7 @@ void TQPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -98,25 +98,25 @@ void TQPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a TTQPopupMenu pointer from an Object.
+ * Extract a TQPopupMenu pointer from an Object.
  */
-TTQPopupMenu *TQPopupMenuImp::toTQPopupMenu( KJS::Object &self )
+TQPopupMenu *TQPopupMenuImp::toTQPopupMenu( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast( obj );
+           return dynamic_cast( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "TTQPopupMenu" )
+    if ( op->typeName() != "TQPopupMenu" )
         return 0;
 
-    return op->toNative();
+    return op->toNative();
 }
 
 /**
@@ -134,7 +134,7 @@ KJS::Object TQPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &ar
              break;
     }
 
-    TTQString msg = i18n("TQPopupMenuCons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("TQPopupMenuCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -142,17 +142,17 @@ KJS::Object TQPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &ar
 KJS::Object TQPopupMenuImp::TQPopupMenu_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter TTQWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Object();
 
-    TTQWidget * arg0; // Dummy
+    TQWidget * arg0; // Dummy
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an instance of the TTQPopupMenu object
+    // We should now create an instance of the TQPopupMenu object
 
-    TTQPopupMenu *ret = new TTQPopupMenu(
+    TQPopupMenu *ret = new TQPopupMenu(
 
           arg0,
           arg1 );
@@ -238,7 +238,7 @@ KJS::Value TQPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    TTQString msg = i18n( "TQPopupMenuImp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "TQPopupMenuImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -246,7 +246,7 @@ KJS::Value TQPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const
 KJS::Value TQPopupMenuImp::popup_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPoint arg0 = extractTQPoint(exec, args, 0);
+    TQPoint arg0 = extractTQPoint(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -291,7 +291,7 @@ KJS::Value TQPopupMenuImp::isCheckable_6( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value TQPopupMenuImp::setFont_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQFont arg0 = extractTQFont(exec, args, 0);
+    TQFont arg0 = extractTQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -327,7 +327,7 @@ KJS::Value TQPopupMenuImp::exec_10( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value TQPopupMenuImp::exec_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPoint arg0 = extractTQPoint(exec, args, 0);
+    TQPoint arg0 = extractTQPoint(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -352,7 +352,7 @@ KJS::Value TQPopupMenuImp::setActiveItem_12( KJS::ExecState *exec, KJS::Object &
 
 KJS::Value TQPopupMenuImp::sizeHint_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    TTQSize ret;
+    TQSize ret;
       ret = instance->sizeHint(  );
 
        return convertToValue( exec, ret );
@@ -374,7 +374,7 @@ KJS::Value TQPopupMenuImp::idAt_14( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value TQPopupMenuImp::idAt_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    TTQPoint arg0 = extractTQPoint(exec, args, 0);
+    TQPoint arg0 = extractTQPoint(exec, args, 0);
 
       int ret;
       ret = instance->idAt(
@@ -422,7 +422,7 @@ KJS::Value TQPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &o
 {
 
     int arg0 = extractInt(exec, args, 0);
-        TTQRect ret;
+        TQRect ret;
       ret = instance->itemGeometry(
        arg0 );
 
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h
index 38e1bdfc..f1d0a92f 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.h
+++ b/kjsembed/qtbindings/qpopupmenu_imp.h
@@ -9,7 +9,7 @@
 
 #include 
 
-class TTQPopupMenu;
+class TQPopupMenu;
 
 /**
  * Namespace containing the KJSEmbed library.
@@ -17,7 +17,7 @@ class TTQPopupMenu;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for TTQPopupMenu methods.
+ * Wrapper class for TQPopupMenu methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -69,7 +69,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static TTQPopupMenu *toTQPopupMenu( KJS::Object &object );
+   static TQPopupMenu *toTQPopupMenu( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -116,7 +116,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   TTQPopupMenu *instance; // Temp
+   TQPopupMenu *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp
index bd3fcf2f..0f6bf134 100644
--- a/kjsembed/qtbindings/qt_imp.cpp
+++ b/kjsembed/qtbindings/qt_imp.cpp
@@ -41,7 +41,7 @@ void QtImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -705,7 +705,7 @@ void QtImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    TTQCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -724,7 +724,7 @@ Qt *QtImp::toQt( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        TTQObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
            return dynamic_cast( obj );
     }
@@ -750,7 +750,7 @@ KJS::Object QtImp::construct( KJS::ExecState *exec, const KJS::List &args )
              break;
     }
 
-    TTQString msg = i18n("QtCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QtCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -765,7 +765,7 @@ KJS::Value QtImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List
         break;
     }
 
-    TTQString msg = i18n( "QtImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QtImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
diff --git a/kjsembed/qtstubs.cpp b/kjsembed/qtstubs.cpp
index fe6e1d0e..d925f0dd 100644
--- a/kjsembed/qtstubs.cpp
+++ b/kjsembed/qtstubs.cpp
@@ -28,8 +28,8 @@
 
 namespace KParts {
 
-ReadOnlyPart::ReadOnlyPart( TTQObject *parent, const char *name )
-  : TTQObject( parent, name ), m_widget(0)
+ReadOnlyPart::ReadOnlyPart( TQObject *parent, const char *name )
+  : TQObject( parent, name ), m_widget(0)
 {
 }
 
@@ -37,7 +37,7 @@ ReadOnlyPart::~ReadOnlyPart()
 {
 }
 
-ReadWritePart::ReadWritePart( TTQObject *parent, const char *name )
+ReadWritePart::ReadWritePart( TQObject *parent, const char *name )
   : ReadOnlyPart( parent, name )
 {
 }
diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h
index 322e0348..5a467705 100644
--- a/kjsembed/qtstubs.h
+++ b/kjsembed/qtstubs.h
@@ -27,9 +27,9 @@
 #include 
 #include 
 
-class TTQWidget;
+class TQWidget;
 
-typedef TTQUrl KURL;
+typedef TQUrl KURL;
 
 namespace KParts {
 
@@ -38,13 +38,13 @@ class KJSEMBED_EXPORT ReadOnlyPart : public TQObject
    Q_OBJECT
 
 public:
-   ReadOnlyPart( TTQObject *parent, const char *name=0 );
+   ReadOnlyPart( TQObject *parent, const char *name=0 );
    virtual ~ReadOnlyPart();
 
-   void setWidget( TTQWidget *w ) { m_widget = w; }
+   void setWidget( TQWidget *w ) { m_widget = w; }
 
 private:
-   TTQWidget *m_widget;
+   TQWidget *m_widget;
 };
 
 class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart
@@ -52,7 +52,7 @@ class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart
    Q_OBJECT
 
 public:
-   ReadWritePart( TTQObject *parent, const char *name=0 );
+   ReadWritePart( TQObject *parent, const char *name=0 );
    virtual ~ReadWritePart();
 };
 
diff --git a/kjsembed/slotproxy.cpp b/kjsembed/slotproxy.cpp
index addc7552..dc5d7c2b 100644
--- a/kjsembed/slotproxy.cpp
+++ b/kjsembed/slotproxy.cpp
@@ -40,14 +40,14 @@
 
 namespace KJSEmbed {
 
-JSSlotProxy::JSSlotProxy( TTQObject *parent, const char *name )
-    : TTQObject( parent, name ? name : "slot_proxy" ),
+JSSlotProxy::JSSlotProxy( TQObject *parent, const char *name )
+    : TQObject( parent, name ? name : "slot_proxy" ),
       proxy(0), js(0)
 {
 }
 
-JSSlotProxy::JSSlotProxy( TTQObject *parent, const char *name, JSObjectProxy *prx )
-    : TTQObject( parent, name ? name : "slot_proxy" ),
+JSSlotProxy::JSSlotProxy( TQObject *parent, const char *name, JSObjectProxy *prx )
+    : TQObject( parent, name ? name : "slot_proxy" ),
       proxy(prx), js( prx ? prx->interpreter() : 0 )
 {
 }
@@ -68,7 +68,7 @@ void JSSlotProxy::slot_bool( bool b )
     execute( args );
 }
 
-void JSSlotProxy::slot_string( const TTQString &s )
+void JSSlotProxy::slot_string( const TQString &s )
 {
     KJS::List args;
     args.append( KJS::String(s) );
@@ -110,14 +110,14 @@ void JSSlotProxy::slot_double( double d )
     execute( args );
 }
 
-void JSSlotProxy::slot_color( const TTQColor &color )
+void JSSlotProxy::slot_color( const TQColor &color )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), color) );
     execute( args );
 }
 
-void JSSlotProxy::slot_font( const TTQFont &font )
+void JSSlotProxy::slot_font( const TQFont &font )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), font) );
@@ -126,31 +126,31 @@ void JSSlotProxy::slot_font( const TTQFont &font )
 }// namespace KJSEmbed
 
 
-void KJSEmbed::JSSlotProxy::slot_point( const TTQPoint & point )
+void KJSEmbed::JSSlotProxy::slot_point( const TQPoint & point )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), point) );
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_rect( const TTQRect & rec )
+void KJSEmbed::JSSlotProxy::slot_rect( const TQRect & rec )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), rec) );
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_size( const TTQSize & size )
+void KJSEmbed::JSSlotProxy::slot_size( const TQSize & size )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), size) );
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_pixmap( const TTQPixmap & pix )
+void KJSEmbed::JSSlotProxy::slot_pixmap( const TQPixmap & pix )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TTQVariant( pix ) ) );
+    args.append( convertToValue(js->globalExec(), TQVariant( pix ) ) );
     execute( args );
 }
 
@@ -211,7 +211,7 @@ void KJSEmbed::JSSlotProxy::execute( const KJS::List &args )
     }
 }
 
-void KJSEmbed::JSSlotProxy::slot_widget( TTQWidget * widget )
+void KJSEmbed::JSSlotProxy::slot_widget( TQWidget * widget )
 {
     KJS::List args;
     if ( widget )
@@ -222,22 +222,22 @@ void KJSEmbed::JSSlotProxy::slot_widget( TTQWidget * widget )
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_datetime( const TTQDateTime & dateTime )
+void KJSEmbed::JSSlotProxy::slot_datetime( const TQDateTime & dateTime )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TTQVariant( dateTime ) ));
+    args.append( convertToValue(js->globalExec(), TQVariant( dateTime ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_datedate( const TTQDate & date1, const TTQDate & date2 )
+void KJSEmbed::JSSlotProxy::slot_datedate( const TQDate & date1, const TQDate & date2 )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TTQVariant( date1 ) ));
-    args.append( convertToValue(js->globalExec(), TTQVariant( date2 ) ));
+    args.append( convertToValue(js->globalExec(), TQVariant( date1 ) ));
+    args.append( convertToValue(js->globalExec(), TQVariant( date2 ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_colorstring( const TTQColor & color, const TTQString & string )
+void KJSEmbed::JSSlotProxy::slot_colorstring( const TQColor & color, const TQString & string )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), color ));
@@ -245,28 +245,28 @@ void KJSEmbed::JSSlotProxy::slot_colorstring( const TTQColor & color, const TTQS
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_image( const TTQImage & image )
+void KJSEmbed::JSSlotProxy::slot_image( const TQImage & image )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TTQVariant( image ) ));
+    args.append( convertToValue(js->globalExec(), TQVariant( image ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_date( const TTQDate & date )
+void KJSEmbed::JSSlotProxy::slot_date( const TQDate & date )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TTQVariant( date ) ));
+    args.append( convertToValue(js->globalExec(), TQVariant( date ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_time( const TTQTime &time )
+void KJSEmbed::JSSlotProxy::slot_time( const TQTime &time )
 {
     KJS::List args;
-    args.append( convertToValue(js->globalExec(), TTQVariant( time ) ));
+    args.append( convertToValue(js->globalExec(), TQVariant( time ) ));
     execute( args );
 }
 
-void KJSEmbed::JSSlotProxy::slot_variant( const TTQVariant & variant )
+void KJSEmbed::JSSlotProxy::slot_variant( const TQVariant & variant )
 {
     KJS::List args;
     args.append( convertToValue(js->globalExec(), variant ) );
diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h
index b0c4cb42..18f4a272 100644
--- a/kjsembed/slotproxy.h
+++ b/kjsembed/slotproxy.h
@@ -32,9 +32,9 @@
 #include 
 #endif // QT_ONLY
 
-class TTQDate;
-class TTQTime;
-class TTQDateTime;
+class TQDate;
+class TQTime;
+class TQDateTime;
 
 namespace KJS {
 class Interpreter;
@@ -54,53 +54,53 @@ class KJSEMBED_EXPORT JSSlotProxy : public TQObject
     Q_OBJECT
 
 public:
-    JSSlotProxy( TTQObject *parent, const char *name=0 );
-    JSSlotProxy( TTQObject *parent, const char *name, JSObjectProxy *prx );
+    JSSlotProxy( TQObject *parent, const char *name=0 );
+    JSSlotProxy( TQObject *parent, const char *name, JSObjectProxy *prx );
 
     virtual ~JSSlotProxy();
 
     void setInterpreter( KJS::Interpreter *js ) { this->js = js; }
     void setProxy( JSObjectProxy *proxy ) { this->proxy = proxy; }
     void setObject( const KJS::Object &obj ) { this->obj = obj; }
-    void setMethod( const TTQString &method ) { this->method = method; }
+    void setMethod( const TQString &method ) { this->method = method; }
 
 public slots:
     void slot_void();
     void slot_bool( bool b );
-    void slot_string( const TTQString &s );
+    void slot_string( const TQString &s );
     void slot_int( int i );
     void slot_uint( uint i );
     void slot_long( long i );
     void slot_ulong( ulong i );
     void slot_double( double d );
-    void slot_font( const TTQFont &font );
-    void slot_color( const TTQColor &color );
-    void slot_point( const TTQPoint &point );
-    void slot_rect( const TTQRect &rec );
-    void slot_size( const TTQSize &size );
-    void slot_pixmap( const TTQPixmap &pix );
+    void slot_font( const TQFont &font );
+    void slot_color( const TQColor &color );
+    void slot_point( const TQPoint &point );
+    void slot_rect( const TQRect &rec );
+    void slot_size( const TQSize &size );
+    void slot_pixmap( const TQPixmap &pix );
     void slot_url( const KURL &url );
     void slot_intint( int , int );
     void slot_intbool( int , bool );
     void slot_intintint( int , int , int );
 
-    void slot_date(const TTQDate& date);
-    void slot_time(const TTQTime& time);
-    void slot_datetime( const TTQDateTime &dateTime );
-    void slot_datedate( const TTQDate &date1, const TTQDate &date2 );
-    void slot_colorstring( const TTQColor &color, const TTQString &string);
-    void slot_image( const TTQImage &image );
+    void slot_date(const TQDate& date);
+    void slot_time(const TQTime& time);
+    void slot_datetime( const TQDateTime &dateTime );
+    void slot_datedate( const TQDate &date1, const TQDate &date2 );
+    void slot_colorstring( const TQColor &color, const TQString &string);
+    void slot_image( const TQImage &image );
 
-    void slot_variant( const TTQVariant &variant );
+    void slot_variant( const TQVariant &variant );
     
-    void slot_widget( TTQWidget *widget );
+    void slot_widget( TQWidget *widget );
 
 private:
     void execute( const KJS::List &args );
     JSObjectProxy *proxy;
     KJS::Interpreter *js;
     KJS::Object obj;
-    TTQString method;
+    TQString method;
     class SlotProxyPrivate *d;
 };
 
diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp
index 7f429ace..5d929fd2 100644
--- a/kjsembed/slotutils.cpp
+++ b/kjsembed/slotutils.cpp
@@ -69,33 +69,33 @@ JSSlotUtils::~JSSlotUtils()
 {
 }
 
-bool JSSlotUtils::connect( TTQObject *sender, const char *sig, TTQObject *recv, const char *dest )
+bool JSSlotUtils::connect( TQObject *sender, const char *sig, TQObject *recv, const char *dest )
 {
     if ( (!sender) || (!recv) )
 	return false;
 
     // Source
-    TTQString si = TTQString("2%1").arg(sig);
+    TQString si = TQString("2%1").arg(sig);
     const char *sigc = si.ascii();
 
     // Connect to slot
     if ( recv->metaObject()->findSlot(dest, true) >= 0 ) {
-	TTQString sl = TTQString("1%1").arg(dest);
+	TQString sl = TQString("1%1").arg(dest);
 	const char *slotc = sl.ascii();
 
 	//kdDebug(80001) << "connect: "<name()<<" "<name()<<" "<metaObject()->findSignal(dest, true) >= 0 ) {
-	TTQString si2 = TTQString("2%1").arg(dest);
+	TQString si2 = TQString("2%1").arg(dest);
 	const char *sig2c = si2.ascii();
 
 	kdDebug(80001) << "connect: "<name()<<" "<name()<<" "<metaObject()->findSlot(dest, true) >= 0 ) {
-	TTQString sl = TTQString("1%1").arg(dest);
+	TQString sl = TQString("1%1").arg(dest);
 	const char *slotc = sl.ascii();
 
 	//kdDebug(80001) << "disconnect: "<name()<<" "<name()<<" "<metaObject()->findSignal(dest, true) >= 0 ) {
-	TTQString si2("2");
+	TQString si2("2");
 	si2 = si2 + dest;
 	const char *sig2c = si2.ascii();
 
 	//kdDebug(80001)<< "disconnect: "<name()<<" "<name()<<" "<type->desc() );
+    TQCString typenm( uo->type->desc() );
     kdDebug(80001) << "JSSlotUtils:extractValue() " << typenm << endl;
 
     if ( typenm == "null" )
@@ -157,22 +157,22 @@ KJS::Value JSSlotUtils::extractValue( KJS::ExecState *exec, TQUObject *uo, JSObj
 	return KJS::Number( static_QUType_double.get(uo) );
     else if ( typenm == "charstar" )
 	return KJS::String( static_QUType_charstar.get(uo) );
-    else if ( typenm == "TTQString" )
+    else if ( typenm == "TQString" )
 	return KJS::String( static_QUType_TQString.get(uo) );
-    else if ( typenm == "TTQVariant" )
+    else if ( typenm == "TQVariant" )
 	return convertToValue( exec, static_QUType_TQVariant.get(uo) );
     else if ( typenm == "ptr" ) {
 	void *ptr = static_QUType_ptr.get(uo);
 
-	// If it's a TTQObject and we know the parent
+	// If it's a TQObject and we know the parent
 	if ( ptr && parent ) {
-	    TTQObject *qobj = (TTQObject *)(ptr); // Crash in kst
+	    TQObject *qobj = (TQObject *)(ptr); // Crash in kst
 	    return parent->part()->factory()->createProxy( exec, qobj, parent);
 	}
     }
 
     kdWarning(80001) << "JSSlotUtils:extractValue() Failed (" << typenm << ")" << endl;
-    TTQString msg = i18n( "Value of type (%1) is not supported." ).arg( typenm );
+    TQString msg = i18n( "Value of type (%1) is not supported." ).arg( typenm );
     throwError(exec, msg,KJS::TypeError);
     return KJS::Null();
 }
@@ -213,18 +213,18 @@ void JSSlotUtils::implantCString( KJS::ExecState *exec, TQUObject *uo, const KJS
 
 void JSSlotUtils::implantURL( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v,KURL *url )
 {
-    *url = TTQString( v.toString(exec).qstring() );
+    *url = TQString( v.toString(exec).qstring() );
     static_QUType_ptr.set( uo, url );
 }
 
-void JSSlotUtils::implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQColor *color )
+void JSSlotUtils::implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQColor *color )
 {
     bool ok;
-    TTQString s( v.toString(exec).qstring() );
+    TQString s( v.toString(exec).qstring() );
 
     if ( s.startsWith("#") ) {
 
-	TTQRegExp re("#([0-9a-f][0-9a-f]){3,4}");
+	TQRegExp re("#([0-9a-f][0-9a-f]){3,4}");
 	re.setCaseSensitive( false );
 
 	if ( re.search(s) != -1 ) {
@@ -233,7 +233,7 @@ void JSSlotUtils::implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::
 	    uint b = re.cap(3).toUInt(&ok, 16);
 
 	    if ( re.numCaptures() == 3 )
-		*color = TTQColor(r,g,b);
+		*color = TQColor(r,g,b);
 	    else if ( re.numCaptures() == 4 ) {
 		uint a = re.cap(4).toUInt(&ok, 16);
 		uint pix = r;
@@ -244,20 +244,20 @@ void JSSlotUtils::implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::
 		pix = pix << 8;
 		pix = pix | a;
 
-		*color = TTQColor( qRgba(r,g,b,a), pix );
+		*color = TQColor( qRgba(r,g,b,a), pix );
 	    }
 	}
 
     }
     else {
 	// Try for a named color
-	*color = TTQColor( s );
+	*color = TQColor( s );
     }
 
     static_QUType_ptr.set( uo, color );
 }
 
-void JSSlotUtils::implantPoint( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQPoint *point )
+void JSSlotUtils::implantPoint( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQPoint *point )
 {
     KJS::Object o = v.toObject( exec );
     if ( !o.isValid() )
@@ -277,11 +277,11 @@ void JSSlotUtils::implantPoint( KJS::ExecState *exec, TQUObject *uo, const KJS::
     else
 	return;
 
-    *point = TTQPoint( x, y );
+    *point = TQPoint( x, y );
     static_QUType_ptr.set( uo, point );
 }
 
-void JSSlotUtils::implantSize( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQSize *size )
+void JSSlotUtils::implantSize( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQSize *size )
 {
     KJS::Object o = v.toObject( exec );
     if ( !o.isValid() )
@@ -301,11 +301,11 @@ void JSSlotUtils::implantSize( KJS::ExecState *exec, TQUObject *uo, const KJS::V
     else
 	return;
 
-    *size = TTQSize( w, h );
+    *size = TQSize( w, h );
     static_QUType_ptr.set( uo, size );
 }
 
-void JSSlotUtils::implantRect( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQRect *rect )
+void JSSlotUtils::implantRect( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQRect *rect )
 {
     KJS::Object o = v.toObject( exec );
     if ( !o.isValid() )
@@ -332,39 +332,39 @@ void JSSlotUtils::implantRect( KJS::ExecState *exec, TQUObject *uo, const KJS::V
     else
 	return;
 
-    *rect = TTQRect( x, y, w, h );
+    *rect = TQRect( x, y, w, h );
     static_QUType_ptr.set( uo, rect );
 }
 
-void JSSlotUtils::implantDate(  KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQDate *date )
+void JSSlotUtils::implantDate(  KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQDate *date )
 {
-	TTQDateTime jsDate = convertDateToDateTime(exec, v);
+	TQDateTime jsDate = convertDateToDateTime(exec, v);
 	date->setYMD( jsDate.date().year(), jsDate.date().month(), jsDate.date().day() );
 	static_QUType_ptr.set( uo, date );
 }
 
-void JSSlotUtils::implantStringList(KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQStringList *lst )
+void JSSlotUtils::implantStringList(KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQStringList *lst )
 {
   *lst = convertArrayToStringList(exec,v);
   static_QUType_ptr.set(uo,lst);
 }
 
-void JSSlotUtils::implantTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQTime *time )
+void JSSlotUtils::implantTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQTime *time )
 {
-	TTQDateTime jsDate = convertDateToDateTime(exec, v);
+	TQDateTime jsDate = convertDateToDateTime(exec, v);
 	time->setHMS( jsDate.time().hour(), jsDate.time().minute(), jsDate.time().second() );
 	static_QUType_ptr.set( uo, time );
 }
 
-void JSSlotUtils::implantDateTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQDateTime *datetime  )
+void JSSlotUtils::implantDateTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQDateTime *datetime  )
 {
-	TTQDateTime jsDate = convertDateToDateTime(exec, v);
+	TQDateTime jsDate = convertDateToDateTime(exec, v);
 	datetime->setDate( jsDate.date() );
 	datetime->setTime( jsDate.time() );
 	static_QUType_ptr.set( uo, datetime );
 }
 
-void JSSlotUtils::implantPixmap( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQPixmap *pix )
+void JSSlotUtils::implantPixmap( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQPixmap *pix )
 {
     *pix = convertToVariant(exec, v).toPixmap() ;
     static_QUType_ptr.set( uo, pix );
@@ -382,7 +382,7 @@ bool JSSlotUtils::implantTQVariant( KJS::ExecState *, TQUObject *uo, const KJS::
 }
 
 bool JSSlotUtils::implantValueProxy( KJS::ExecState *, TQUObject *uo,
-				     const KJS::Value &val, const TTQString &clazz )
+				     const KJS::Value &val, const TQString &clazz )
 {
     JSValueProxy *prx = JSProxy::toValueProxy( val.imp() );
     if ( !prx )
@@ -391,14 +391,14 @@ bool JSSlotUtils::implantValueProxy( KJS::ExecState *, TQUObject *uo,
 	return false;
 
     kdDebug(80001) << "We got a " << prx->typeName() << " and is valid " << prx->toVariant().isValid() << endl;
-    TTQVariant var = prx->toVariant();
+    TQVariant var = prx->toVariant();
     kdDebug(80001) << "We got a " << var.typeName()<< " and is valid " << var.isValid() << endl;
     static_QUType_TQVariant.set( uo, var );
     return var.isValid();
 }
 
 bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, TQUObject *uo,
-				      const KJS::Value &v, const TTQString &clazz )
+				      const KJS::Value &v, const TQString &clazz )
 {
     JSOpaqueProxy *prx = JSProxy::toOpaqueProxy( v.imp() );
     if ( !prx )
@@ -411,7 +411,7 @@ bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, TQUObject *uo,
 }
 
 bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, TQUObject *uo,
-				      const KJS::Value &v, const TTQString &clazz )
+				      const KJS::Value &v, const TQString &clazz )
 {
     JSObjectProxy *prx = JSProxy::toObjectProxy( v.imp() );
     if ( !prx )
@@ -424,7 +424,7 @@ bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, TQUObject *uo,
     return true;
 }
 
-int JSSlotUtils::findSignature( const TTQString &sig )
+int JSSlotUtils::findSignature( const TQString &sig )
 {
     // No args
     if ( sig.contains("()") )
@@ -444,46 +444,46 @@ int JSSlotUtils::findSignature( const TTQString &sig )
     else if ( sig.contains("(double)") )
 	return SignatureDouble;
 
-    else if ( sig.contains("(const TTQString&)") )
+    else if ( sig.contains("(const TQString&)") )
 	return SignatureString;
-    else if ( sig.contains("(const TTQCString&)") )
+    else if ( sig.contains("(const TQCString&)") )
 	return SignatureCString;
     else if ( sig.contains("(const char*)") )
 	return SignatureCString;
     else if ( sig.contains("(const KURL&)") )
 	return SignatureURL;
-    else if ( sig.contains("(const TTQColor&)") )
+    else if ( sig.contains("(const TQColor&)") )
 	return SignatureColor;
-    else if ( sig.contains("(const TTQPoint&)") )
+    else if ( sig.contains("(const TQPoint&)") )
 	return SignaturePoint;
-    else if ( sig.contains("(const TTQRect&)") )
+    else if ( sig.contains("(const TQRect&)") )
 	return SignatureRect;
-    else if ( sig.contains("(const TTQSize&)") )
+    else if ( sig.contains("(const TQSize&)") )
 	return SignatureSize;
-    else if ( sig.contains("(const TTQPixmap&)") )
+    else if ( sig.contains("(const TQPixmap&)") )
 	return SignaturePixmap;
-    else if ( sig.contains("(const TTQFont&)") )
+    else if ( sig.contains("(const TQFont&)") )
 	return SignatureFont;
-    else if ( sig.contains("(const TTQDate&)") )
+    else if ( sig.contains("(const TQDate&)") )
 	return SignatureDate;
-    else if ( sig.contains("(const TTQTime&)") )
+    else if ( sig.contains("(const TQTime&)") )
 	return SignatureTime;
-    else if ( sig.contains("(const TTQDateTime&)") )
+    else if ( sig.contains("(const TQDateTime&)") )
 	return SignatureDateTime;
-    else if ( sig.contains("(const TTQImage&)") )
+    else if ( sig.contains("(const TQImage&)") )
 	return SignatureImage;
-    else if ( sig.contains("(TTQWidget*)") )
+    else if ( sig.contains("(TQWidget*)") )
 	return SignatureTQWidget;
     // Two args
-    else if ( sig.contains("(const TTQDate&, const TTQDate&)") )
+    else if ( sig.contains("(const TQDate&, const TQDate&)") )
 	return SignatureDateDate;
-    else if ( sig.contains("(const TTQColor&, const TTQString&)") )
+    else if ( sig.contains("(const TQColor&, const TQString&)") )
 	return SignatureColorString;
 
-    else if ( sig.contains("(const TTQString&,const TTQString&,const TTQString&)") )
+    else if ( sig.contains("(const TQString&,const TQString&,const TQString&)") )
 	return SignatureStringStringString;
 
-    else if ( sig.contains("(const TTQString&,const TTQString&)") )
+    else if ( sig.contains("(const TQString&,const TQString&)") )
 	return SignatureStringString;
     else if ( sig.contains("(int,int)") )
 	return SignatureIntInt;
@@ -494,57 +494,57 @@ int JSSlotUtils::findSignature( const TTQString &sig )
     else if ( sig.contains("(int,int,int,int,bool)") )
 	return SignatureIntIntIntIntBool;
 
-    else if ( sig.contains("(const TTQString&,int)") )
+    else if ( sig.contains("(const TQString&,int)") )
 	return SignatureStringInt;
-    else if ( sig.contains("(const TTQString&,uint)") )
+    else if ( sig.contains("(const TQString&,uint)") )
 	return SignatureStringInt;
 
     else if ( sig.contains("(const KURL&,const KURL&)") )
 	return SignatureURLURL;
-    else if ( sig.contains("(const KURL&,const TTQString&)") )
+    else if ( sig.contains("(const KURL&,const TQString&)") )
 	return SignatureURLString;
-    else if ( sig.contains("(const TTQString&,const KURL&)") )
+    else if ( sig.contains("(const TQString&,const KURL&)") )
 	return SignatureStringURL;
-    else if ( sig.contains("(const TTQRect&,bool)") )
+    else if ( sig.contains("(const TQRect&,bool)") )
 	return SignatureRectBool;
-    else if ( sig.contains("(const TTQString&,bool)") )
+    else if ( sig.contains("(const TQString&,bool)") )
 	return SignatureStringBool;
     else if ( sig.contains("(int,bool)") )
 	return SignatureIntBool;
     else if ( sig.contains("(int,int,bool)") )
 	return SignatureIntIntBool;
-    else if ( sig.contains("(int,int,const TTQString&)") )
+    else if ( sig.contains("(int,int,const TQString&)") )
 	return SignatureIntIntString;
-    else if ( sig.contains("(const TTQString&,bool,int)") )
+    else if ( sig.contains("(const TQString&,bool,int)") )
 	return SignatureStringBoolInt;
-    else if ( sig.contains("(const TTQString&,bool,bool)") )
+    else if ( sig.contains("(const TQString&,bool,bool)") )
 	return SignatureStringBoolBool;
-    else if ( sig.contains("(const TTQString&,int,int)") )
+    else if ( sig.contains("(const TQString&,int,int)") )
 	return SignatureStringIntInt;
-    else if ( sig.contains("(int,const TTQColor&,bool)") )
+    else if ( sig.contains("(int,const TQColor&,bool)") )
 	return SignatureIntColorBool;
-    else if ( sig.contains("(int,const TTQColor&)") )
+    else if ( sig.contains("(int,const TQColor&)") )
 	return SignatureIntColor;
 
     else if ( sig.contains("(int,int,float,float)") )
 	return SignatureIntIntFloatFloat;
-    else if ( sig.contains("(const TTQString&,bool,bool,bool)") )
+    else if ( sig.contains("(const TQString&,bool,bool,bool)") )
 	return SignatureStringBoolBoolBool;
     else if ( sig.contains("(int,int,int,int,int,int)") )
 	return SignatureIntIntIntIntIntInt;
 
     // Handle anything that falls through
-    if ( sig.contains("TTQString") || sig.contains("TTQColor") ||
+    if ( sig.contains("TQString") || sig.contains("TQColor") ||
 	sig.contains("int") || sig.contains("bool") ||
         sig.contains("float") || sig.contains("KURL") ||
-        sig.contains("TTQVariant") || sig.contains("TTQSize") ||
-        sig.contains("TTQRect") || sig.contains("TTQPixmap") ||
-        sig.contains("TTQCString") || sig.contains("TTQPoint") ||
-	sig.contains("double") || sig.contains("TTQFont") ||
-	sig.contains("TTQDate") || sig.contains("TTQTime") ||
-	sig.contains("TTQDateTime") || sig.contains("TTQStringList") ||
-	sig.contains("TTQWidget") || sig.contains("TTQObject") ||
-	sig.contains("TTQPen") || sig.contains("TTQImage") )
+        sig.contains("TQVariant") || sig.contains("TQSize") ||
+        sig.contains("TQRect") || sig.contains("TQPixmap") ||
+        sig.contains("TQCString") || sig.contains("TQPoint") ||
+	sig.contains("double") || sig.contains("TQFont") ||
+	sig.contains("TQDate") || sig.contains("TQTime") ||
+	sig.contains("TQDateTime") || sig.contains("TQStringList") ||
+	sig.contains("TQWidget") || sig.contains("TQObject") ||
+	sig.contains("TQPen") || sig.contains("TQImage") )
 	   return SignatureCustom;
 
     kdWarning(80001) << "findSignature: not supported type " << sig << endl;
@@ -563,34 +563,34 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 
     KJS::Value retValue;
     JSObjectProxy *proxy = proxyimp->objectProxy();
-    TTQCString slotname( proxyimp->slotName() );
+    TQCString slotname( proxyimp->slotName() );
     int sigid = proxyimp->signature();
-    TTQPtrList uintlist;
+    TQPtrList uintlist;
     uintlist.setAutoDelete(true);
-    TTQObject *obj = proxy->object();
+    TQObject *obj = proxy->object();
     int slotid = obj->metaObject()->findSlot( slotname, true );
     if ( slotid == -1 )
     {
-	TTQString msg = i18n( "Slot %1 was not found." ).arg( slotname );
+	TQString msg = i18n( "Slot %1 was not found." ).arg( slotname );
   return throwError(exec, msg,KJS::ReferenceError);
     }
 
     if ( args.size() > MAX_SUPPORTED_ARGS )
     {
-	TTQString msg = i18n( "Slots with more than %1 arguments are not supported." ).arg( MAX_SUPPORTED_ARGS );
+	TQString msg = i18n( "Slots with more than %1 arguments are not supported." ).arg( MAX_SUPPORTED_ARGS );
   return throwError(exec, msg,KJS::ReferenceError);
     }
     // Keep args in scope for duration of the method.
     KURL url[MAX_SUPPORTED_ARGS];
-    TTQColor color[MAX_SUPPORTED_ARGS];
-    TTQPoint point[MAX_SUPPORTED_ARGS];
-    TTQSize size[MAX_SUPPORTED_ARGS];
-    TTQRect rect[MAX_SUPPORTED_ARGS];
-    TTQDate date[MAX_SUPPORTED_ARGS];
-    TTQDateTime datetime[MAX_SUPPORTED_ARGS];
-    TTQTime time[MAX_SUPPORTED_ARGS];
-    TTQPixmap pix[MAX_SUPPORTED_ARGS];
-    TTQStringList slst[MAX_SUPPORTED_ARGS];
+    TQColor color[MAX_SUPPORTED_ARGS];
+    TQPoint point[MAX_SUPPORTED_ARGS];
+    TQSize size[MAX_SUPPORTED_ARGS];
+    TQRect rect[MAX_SUPPORTED_ARGS];
+    TQDate date[MAX_SUPPORTED_ARGS];
+    TQDateTime datetime[MAX_SUPPORTED_ARGS];
+    TQTime time[MAX_SUPPORTED_ARGS];
+    TQPixmap pix[MAX_SUPPORTED_ARGS];
+    TQStringList slst[MAX_SUPPORTED_ARGS];
     
     bool notsupported = true;
 
@@ -735,17 +735,17 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 	notsupported = false;
 	int argsStart = slotname.find('(');
 	int argsEnd = slotname.find(')');
-        TTQString fargs = slotname.mid( argsStart+1, argsEnd-argsStart-1 );
+        TQString fargs = slotname.mid( argsStart+1, argsEnd-argsStart-1 );
 
 	// Iterate over the parameters
-        TTQStringList argList = TTQStringList::split(',', fargs, true);
+        TQStringList argList = TQStringList::split(',', fargs, true);
 	uint count = TQMIN( argList.count(), MAX_SUPPORTED_ARGS );
 
 	kdDebug( 80001 ) << "======== arg count " << count << endl;
         for( uint idx = 0; idx < count; idx++ ) {
 	    kdDebug( 80001 ) << "======== Handling arg " << idx << endl;
 
-	    TTQString arg = argList[idx];
+	    TQString arg = argList[idx];
 	    arg = arg.replace("const", "");
 	    arg = arg.replace("&", "");
 	    arg = arg.simplifyWhiteSpace();
@@ -761,40 +761,40 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 		implantInt( exec, uo+1+idx, args[idx] );
 	    else if ( arg.contains("double") == 1 )
 		implantDouble(exec,  uo+1+idx, args[idx]);
-	    else if ( arg.contains("TTQStringList") == 1 )
+	    else if ( arg.contains("TQStringList") == 1 )
 		implantStringList( exec, uo+1+idx, args[idx], &slst[idx] );
-	    else if ( arg.contains("TTQString") == 1 )
+	    else if ( arg.contains("TQString") == 1 )
 		implantTQString(exec,  uo+1+idx, args[idx] );
-	    else if ( arg.contains("TTQCString") == 1 )
+	    else if ( arg.contains("TQCString") == 1 )
 		implantCString(exec,  uo+1+idx, args[idx] );
 	    else if ( arg.contains("bool") == 1 )
 		implantBool( exec, uo+1+idx, args[idx] );
 	    else if ( arg.contains("KURL") == 1 )
 		implantURL( exec, uo+1+idx, args[idx], &url[idx] );
-	    else if ( arg.contains("TTQColor") == 1 )
+	    else if ( arg.contains("TQColor") == 1 )
 	        implantColor( exec, uo+1+idx, args[idx], &color[idx] );
-	    else if ( arg.contains("TTQPoint") == 1 )
+	    else if ( arg.contains("TQPoint") == 1 )
 		implantPoint( exec, uo+1+idx, args[idx], &point[idx] );
-	   else if ( arg.contains("TTQSize") == 1 )
+	   else if ( arg.contains("TQSize") == 1 )
 		implantSize( exec, uo+1+idx, args[idx], &size[idx] );
-	   else if ( arg.contains("TTQRect") == 1 )
+	   else if ( arg.contains("TQRect") == 1 )
 		implantRect( exec, uo+1+idx, args[idx], &rect[idx] );
-	   else if ( arg.contains("TTQDate") == 1 )
+	   else if ( arg.contains("TQDate") == 1 )
 		implantDate( exec, uo+1+idx, args[idx], &date[idx] );
-	   else if ( arg.contains("TTQTime") == 1 )
+	   else if ( arg.contains("TQTime") == 1 )
 		implantTime( exec, uo+1+idx, args[idx], &time[idx] );
-	   else if ( arg.contains("TTQDateTime") == 1 )
+	   else if ( arg.contains("TQDateTime") == 1 )
 		implantDateTime( exec, uo+1+idx, args[idx], &datetime[idx] );
-	   else if ( arg.contains("TTQPixmap") == 1 )
+	   else if ( arg.contains("TQPixmap") == 1 )
 		implantPixmap( exec, uo+1+idx, args[idx], &pix[idx] );
 	   else if ( arg.contains("char") == 1)
 	        implantCharStar( exec, uo+1+idx, args[idx] );
-	    else if ( ( arg.contains("TTQObject") == 1 ) || ( arg.contains("TTQWidget") == 1 ) )
+	    else if ( ( arg.contains("TQObject") == 1 ) || ( arg.contains("TQWidget") == 1 ) )
 	   {
-	   	kdDebug( 80001 ) << "Doing a TTQObject" << endl;
-		notsupported = !implantObjectProxy( exec, uo+1+idx, args[idx], "TTQObject" );
+	   	kdDebug( 80001 ) << "Doing a TQObject" << endl;
+		notsupported = !implantObjectProxy( exec, uo+1+idx, args[idx], "TQObject" );
 	   }
-	    else if ( TTQVariant::nameToType(arg.latin1()) != TTQVariant::Invalid ) {
+	    else if ( TQVariant::nameToType(arg.latin1()) != TQVariant::Invalid ) {
 		bool ok = implantValueProxy( exec, uo+1+idx, args[idx], arg );
 		if ( !ok ) {
 		    notsupported = true;
@@ -805,15 +805,15 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 			kdDebug( 80001 ) << "Implanted the variant " << static_QUType_TQVariant.get(uo+1+idx).isValid() << endl;
 		}
 	    }
-	    /* else if ( ( arg.contains("TTQVariant") == 1 ) ||
-	        ( arg.contains("TTQPen") == 1 ) || (arg.contains("TTQFont") == 1 )  ||
-		( arg.contains("TTQBrush") == 1 ))
+	    /* else if ( ( arg.contains("TQVariant") == 1 ) ||
+	        ( arg.contains("TQPen") == 1 ) || (arg.contains("TQFont") == 1 )  ||
+		( arg.contains("TQBrush") == 1 ))
 		if(!implantTQVariant(exec,  uo+1+idx, args[idx] )){
 		    notsupported = true;
 		    break;
 		} */
 	    else if ( arg.contains("*") == 1 ) {
-		TTQRegExp re("(\\w+)\\*");
+		TQRegExp re("(\\w+)\\*");
 		if ( re.search(arg) >= 0 ) {
 		    bool ok = implantObjectProxy( exec, uo+1+idx, args[idx], re.cap(1) );
 		    if ( !ok ) {
@@ -844,7 +844,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
 	obj->qt_invoke( slotid, uo );
     }
     // Handle return types
-    TTQCString ret( proxyimp->returnType() );
+    TQCString ret( proxyimp->returnType() );
     if ( ret.isEmpty() ) {
 	// Basic type (void, int etc.)
 	return extractValue( exec, uo );
@@ -854,7 +854,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K
     kdDebug(80001) << "Handling a pointer return of type " << ret << endl;
 
     if ( proxy->part()->factory()->isTQObject(ret) ) {
-	kdDebug(80001) << "Return type is TTQObject " << ret << endl;
+	kdDebug(80001) << "Return type is TQObject " << ret << endl;
 	return extractValue( exec, uo, proxy );
     }
 
diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h
index 5119d35f..3c7b3bea 100644
--- a/kjsembed/slotutils.h
+++ b/kjsembed/slotutils.h
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-class TTQObject;
+class TQObject;
 
 namespace KJS { class Interpreter; }
 
@@ -82,13 +82,13 @@ public:
      * Returns the method id for the specified slot signature. If there is no match
      * then -1 is returned.
      */
-    static int findSignature( const TTQString &sig );
+    static int findSignature( const TQString &sig );
 
     /** Connects the specified signal to the specified slot. */
-    static bool connect( TTQObject *sender, const char *sig, TTQObject *recv, const char *dest );
+    static bool connect( TQObject *sender, const char *sig, TQObject *recv, const char *dest );
 
     static KJS::Boolean disconnect( KJS::ExecState *exec, KJS::Object &self,
-			     TTQObject *sender, const char *sig, TTQObject *recv, const char *dest );
+			     TQObject *sender, const char *sig, TQObject *recv, const char *dest );
 
     static KJS::Value invokeSlot( KJS::ExecState *exec, KJS::Object &self, const KJS::List&args,
 				  JSObjectProxyImp *proxyimp );
@@ -98,7 +98,7 @@ public:
 
     /** Implant an int into a TQUObject. */
     static void implantInt( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
-    /** Implant a TTQString into a TQUObject. */
+    /** Implant a TQString into a TQUObject. */
     static void implantTQString( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
     /** Implant a bool into a TQUObject. */
     static void implantBool( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
@@ -109,32 +109,32 @@ public:
 
     /** Implant a KURL into a TQUObject. */
     static void implantURL( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, KURL *url );
-    /** Implant a TTQColor into a TQUObject. */
-    static void implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQColor *color );
-    /** Implant a TTQPoint into a TQUObject. */
-    static void implantPoint( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQPoint *point );
-    /** Implant a TTQRect into a TQUObject. */
-    static void implantRect( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQRect *rect );
-    /** Implant a TTQSize into a TQUObject. */
-    static void implantSize( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQSize *size );
-
-    /** Implant a TTQDate into a TQUObject. */
-    static void implantDate( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQDate *date );
-    /** Implant a TTQTime into a TQUObject. */
-    static void implantTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQTime *time );
-    /** Implant a TTQDateTime into a TQUObject. */
-    static void implantDateTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQDateTime *datetime );
-    /** Implant a TTQPixmap into a TQUObject. */
-    static void implantPixmap( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TTQPixmap *pix );
+    /** Implant a TQColor into a TQUObject. */
+    static void implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQColor *color );
+    /** Implant a TQPoint into a TQUObject. */
+    static void implantPoint( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQPoint *point );
+    /** Implant a TQRect into a TQUObject. */
+    static void implantRect( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQRect *rect );
+    /** Implant a TQSize into a TQUObject. */
+    static void implantSize( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQSize *size );
+
+    /** Implant a TQDate into a TQUObject. */
+    static void implantDate( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQDate *date );
+    /** Implant a TQTime into a TQUObject. */
+    static void implantTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQTime *time );
+    /** Implant a TQDateTime into a TQUObject. */
+    static void implantDateTime( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQDateTime *datetime );
+    /** Implant a TQPixmap into a TQUObject. */
+    static void implantPixmap( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v, TQPixmap *pix );
 
     /**
      * Implant a value proxy into a TQUObject. The type specified in the clazz parameter
      * must match the type of the proxy'd value for the method to succeed.
      */
     static bool implantValueProxy( KJS::ExecState *exec, TQUObject *uo,
-				   const KJS::Value &v, const TTQString &clazz);
+				   const KJS::Value &v, const TQString &clazz);
 
-    /** Implant a TTQVariant into a TQUObject. */
+    /** Implant a TQVariant into a TQUObject. */
     static bool implantTQVariant( KJS::ExecState *exec, TQUObject *uo,const KJS::Value &v);
 
     /**
@@ -143,17 +143,17 @@ public:
      * to succeed.
      */
     static bool implantOpaqueProxy( KJS::ExecState *, TQUObject *uo,
-				    const KJS::Value &v, const TTQString &clazz );
+				    const KJS::Value &v, const TQString &clazz );
 
     /**
      * Implant an object proxy into a TQUObject. The object proxy'd by the specified value
      * must inherit the class specified for the converstion to succeed.
      */
     static bool implantObjectProxy( KJS::ExecState *exec, TQUObject *uo,
-				    const KJS::Value &v, const TTQString &clazz );
-    /** Implant a TTQString into a TQUObject. */ 
+				    const KJS::Value &v, const TQString &clazz );
+    /** Implant a TQString into a TQUObject. */ 
     static void implantStringList(KJS::ExecState *exec, TQUObject *uo, 
-				  const KJS::Value &v, TTQStringList *lst );
+				  const KJS::Value &v, TQStringList *lst );
     
     /** Implant a char* into a TQUObject. */ 
     static void implantCharStar( KJS::ExecState *exec, TQUObject *uo, const KJS::Value &v );
diff --git a/kjsembed/tools/Doxyfile b/kjsembed/tools/Doxyfile
index 38387502..549f6392 100644
--- a/kjsembed/tools/Doxyfile
+++ b/kjsembed/tools/Doxyfile
@@ -268,7 +268,7 @@ SHOW_USED_FILES        = YES
 # The TQUIET tag can be used to turn on/off the messages that are generated 
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
-TTQUIET                  = YES
+TQUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are 
 # generated by doxygen. Possible values are YES and NO. If left blank 
diff --git a/kjsembed/tools/coverage/allqobjects.txt b/kjsembed/tools/coverage/allqobjects.txt
index b394f402..107d7a34 100644
--- a/kjsembed/tools/coverage/allqobjects.txt
+++ b/kjsembed/tools/coverage/allqobjects.txt
@@ -1,145 +1,145 @@
-TTQAccel 
-TTQAccessibleObject 
-TTQAction 
-TTQActionGroup 
-TTQApplication 
-TTQAquaStyle 
-TTQAssistantClient 
-TTQAxObject 
-TTQAxWidget 
-TTQBoxLayout 
-TTQButton 
-TTQButtonGroup 
-TTQCDEStyle 
-TTQCanvas 
-TTQCanvasView 
-TTQCheckBox 
-TTQClipboard 
-TTQColorDialog 
-TTQColorDrag 
-TTQComboBox 
-TTQCommonStyle 
-TTQCopChannel 
-TTQDataBrowser 
-TTQDataPump 
-TTQDataTable 
-TTQDataView 
-TTQDateEdit 
-TTQDateTimeEdit 
-TTQDateTimeEditBase 
-TTQDesktopWidget 
-TTQDial 
-TTQDialog 
-TTQDns 
-TTQDockArea 
-TTQDockWindow 
-TTQDoubleValidator 
-TTQDragObject 
-TTQEditorFactory 
-TTQErrorMessage 
-TTQEventLoop 
-TTQFileDialog 
-TTQFileIconProvider 
-TTQFontDialog 
-TTQFrame 
-TTQFtp 
-TTQGLWidget 
-TTQGrid 
-TTQGridLayout 
-TTQGridView 
-TTQGroupBox 
-TTQHBox 
-TTQHBoxLayout 
-TTQHButtonGroup 
-TTQHGroupBox 
-TTQHeader 
-TTQHttp 
-TTQIconDrag 
-TTQIconView 
-TTQImageDrag 
-TTQInputDialog 
-TTQIntValidator 
-TTQLCDNumber 
-TTQLabel 
-TTQLayout 
-TTQLineEdit 
-TTQListBox 
-TTQListView 
-TTQLocalFs 
-TTQMacStyle 
-TTQMainWindow 
-TTQMenuBar 
-TTQMessageBox 
-TTQMotif 
-TTQMotifDialog 
-TTQMotifPlusStyle 
-TTQMotifStyle 
-TTQMotifWidget 
-TTQMultiLineEdit 
-TTQNPInstance 
-TTQNPWidget 
-TTQNetworkOperation 
-TTQNetworkProtocol 
-TTQObject 
-TTQObjectCleanupHandler 
-TTQPlatinumStyle 
-TTQPopupMenu 
-TTQProcess 
-TTQProgressBar 
-TTQProgressDialog 
-TTQPushButton 
-TTQRadioButton 
-TTQRegExpValidator 
-TTQSGIStyle 
-TTQScrollBar 
-TTQScrollView 
-TTQServerSocket 
-TTQSessionManager 
-TTQSignal 
-TTQSignalMapper 
-TTQSizeGrip 
-TTQSlider 
-TTQSocket 
-TTQSocketNotifier 
-TTQSound 
-TTQSpinBox 
-TTQSplashScreen 
-TTQSplitter 
-TTQSqlDatabase 
-TTQSqlDriver 
-TTQSqlEditorFactory 
-TTQSqlForm 
-TTQStatusBar 
-TTQStoredDrag 
-TTQStyle 
-TTQStyleSheet 
-TTQTabBar 
-TTQTabDialog 
-TTQTabWidget 
-TTQTable 
-TTQTextBrowser 
-TTQTextDrag 
-TTQTextEdit 
-TTQTextView 
-TTQTimeEdit 
-TTQTimer 
-TTQToolBar 
-TTQToolBox 
-TTQToolButton 
-TTQToolTipGroup 
-TTQTranslator 
-TTQUriDrag 
-TTQUrlOperator 
-TTQVBox 
-TTQVBoxLayout 
-TTQVButtonGroup 
-TTQVGroupBox 
-TTQValidator 
-TTQWSKeyboardHandler 
-TTQWidget 
-TTQWidgetStack 
-TTQWindowsStyle 
-TTQWindowsXPStyle 
-TTQWizard 
-TTQWorkspace 
-TTQXtWidget 
+TQAccel 
+TQAccessibleObject 
+TQAction 
+TQActionGroup 
+TQApplication 
+TQAquaStyle 
+TQAssistantClient 
+TQAxObject 
+TQAxWidget 
+TQBoxLayout 
+TQButton 
+TQButtonGroup 
+TQCDEStyle 
+TQCanvas 
+TQCanvasView 
+TQCheckBox 
+TQClipboard 
+TQColorDialog 
+TQColorDrag 
+TQComboBox 
+TQCommonStyle 
+TQCopChannel 
+TQDataBrowser 
+TQDataPump 
+TQDataTable 
+TQDataView 
+TQDateEdit 
+TQDateTimeEdit 
+TQDateTimeEditBase 
+TQDesktopWidget 
+TQDial 
+TQDialog 
+TQDns 
+TQDockArea 
+TQDockWindow 
+TQDoubleValidator 
+TQDragObject 
+TQEditorFactory 
+TQErrorMessage 
+TQEventLoop 
+TQFileDialog 
+TQFileIconProvider 
+TQFontDialog 
+TQFrame 
+TQFtp 
+TQGLWidget 
+TQGrid 
+TQGridLayout 
+TQGridView 
+TQGroupBox 
+TQHBox 
+TQHBoxLayout 
+TQHButtonGroup 
+TQHGroupBox 
+TQHeader 
+TQHttp 
+TQIconDrag 
+TQIconView 
+TQImageDrag 
+TQInputDialog 
+TQIntValidator 
+TQLCDNumber 
+TQLabel 
+TQLayout 
+TQLineEdit 
+TQListBox 
+TQListView 
+TQLocalFs 
+TQMacStyle 
+TQMainWindow 
+TQMenuBar 
+TQMessageBox 
+TQMotif 
+TQMotifDialog 
+TQMotifPlusStyle 
+TQMotifStyle 
+TQMotifWidget 
+TQMultiLineEdit 
+TQNPInstance 
+TQNPWidget 
+TQNetworkOperation 
+TQNetworkProtocol 
+TQObject 
+TQObjectCleanupHandler 
+TQPlatinumStyle 
+TQPopupMenu 
+TQProcess 
+TQProgressBar 
+TQProgressDialog 
+TQPushButton 
+TQRadioButton 
+TQRegExpValidator 
+TQSGIStyle 
+TQScrollBar 
+TQScrollView 
+TQServerSocket 
+TQSessionManager 
+TQSignal 
+TQSignalMapper 
+TQSizeGrip 
+TQSlider 
+TQSocket 
+TQSocketNotifier 
+TQSound 
+TQSpinBox 
+TQSplashScreen 
+TQSplitter 
+TQSqlDatabase 
+TQSqlDriver 
+TQSqlEditorFactory 
+TQSqlForm 
+TQStatusBar 
+TQStoredDrag 
+TQStyle 
+TQStyleSheet 
+TQTabBar 
+TQTabDialog 
+TQTabWidget 
+TQTable 
+TQTextBrowser 
+TQTextDrag 
+TQTextEdit 
+TQTextView 
+TQTimeEdit 
+TQTimer 
+TQToolBar 
+TQToolBox 
+TQToolButton 
+TQToolTipGroup 
+TQTranslator 
+TQUriDrag 
+TQUrlOperator 
+TQVBox 
+TQVBoxLayout 
+TQVButtonGroup 
+TQVGroupBox 
+TQValidator 
+TQWSKeyboardHandler 
+TQWidget 
+TQWidgetStack 
+TQWindowsStyle 
+TQWindowsXPStyle 
+TQWizard 
+TQWorkspace 
+TQXtWidget 
diff --git a/kjsembed/tools/coverage/supported.txt b/kjsembed/tools/coverage/supported.txt
index f17ad56d..3e490006 100644
--- a/kjsembed/tools/coverage/supported.txt
+++ b/kjsembed/tools/coverage/supported.txt
@@ -9,57 +9,57 @@ Painter
 Pen
 Pixmap
 PixmapLabel
-TTQBoxLayout
-TTQButtonGroup
-TTQCanvasView
-TTQCheckBox
-TTQComboBox
-TTQDataBrowser
-TTQDataTable
-TTQDataView
-TTQDateEdit
-TTQDateTimeEdit
-TTQDial
-TTQDialog
-TTQFrame
-TTQGrid
-TTQGroupBox
-TTQHBox
-TTQHBoxLayout
-TTQIconView
-TTQLCDNumber
-TTQLabel
-TTQLayout
-TTQLayoutWidget
-TTQLineEdit
-TTQListBox
-TTQListView
-TTQMainWindow
-TTQMultiLineEdit
-TTQObject
-TTQPopupMenu
-TTQProgressBar
-TTQPushButton
-TTQRadioButton
-TTQScrollBar
-TTQScrollView
-TTQSlider
-TTQSpinBox
-TTQSplitter
-TTQTabWidget
-TTQTable
-TTQTextBrowser
-TTQTextEdit
-TTQTextView
-TTQTimeEdit
-TTQTimer
-TTQToolBox
-TTQToolButton
-TTQVBox
-TTQVBoxLayout
-TTQWidget
-TTQWidgetStack
-TTQWizard
+TQBoxLayout
+TQButtonGroup
+TQCanvasView
+TQCheckBox
+TQComboBox
+TQDataBrowser
+TQDataTable
+TQDataView
+TQDateEdit
+TQDateTimeEdit
+TQDial
+TQDialog
+TQFrame
+TQGrid
+TQGroupBox
+TQHBox
+TQHBoxLayout
+TQIconView
+TQLCDNumber
+TQLabel
+TQLayout
+TQLayoutWidget
+TQLineEdit
+TQListBox
+TQListView
+TQMainWindow
+TQMultiLineEdit
+TQObject
+TQPopupMenu
+TQProgressBar
+TQPushButton
+TQRadioButton
+TQScrollBar
+TQScrollView
+TQSlider
+TQSpinBox
+TQSplitter
+TQTabWidget
+TQTable
+TQTextBrowser
+TQTextEdit
+TQTextView
+TQTimeEdit
+TQTimer
+TQToolBox
+TQToolButton
+TQVBox
+TQVBoxLayout
+TQWidget
+TQWidgetStack
+TQWizard
 RangeError
 ReferenceError
 SqlDatabase
diff --git a/kjsembed/tools/coverage/unsupported.txt b/kjsembed/tools/coverage/unsupported.txt
index 4e5f43ee..055ca045 100644
--- a/kjsembed/tools/coverage/unsupported.txt
+++ b/kjsembed/tools/coverage/unsupported.txt
@@ -1,95 +1,95 @@
-TTQAccel MISSING
-TTQAccessibleObject MISSING
-TTQAction MISSING
-TTQActionGroup MISSING
-TTQApplication MISSING
-TTQAquaStyle MISSING
-TTQAssistantClient MISSING
-TTQAxObject MISSING
-TTQAxWidget MISSING
-TTQButton MISSING
-TTQCDEStyle MISSING
-TTQCanvas MISSING
-TTQClipboard MISSING
-TTQColorDialog MISSING
-TTQColorDrag MISSING
-TTQCommonStyle MISSING
-TTQCopChannel MISSING
-TTQDataPump MISSING
-TTQDateTimeEditBase MISSING
-TTQDesktopWidget MISSING
-TTQDns MISSING
-TTQDockArea MISSING
-TTQDockWindow MISSING
-TTQDoubleValidator MISSING
-TTQDragObject MISSING
-TTQEditorFactory MISSING
-TTQErrorMessage MISSING
-TTQEventLoop MISSING
-TTQFileDialog MISSING
-TTQFileIconProvider MISSING
-TTQFontDialog MISSING
-TTQFtp MISSING
-TTQGLWidget MISSING
-TTQGridLayout MISSING
-TTQGridView MISSING
-TTQHButtonGroup MISSING
-TTQHGroupBox MISSING
-TTQHeader MISSING
-TTQHttp MISSING
-TTQIconDrag MISSING
-TTQImageDrag MISSING
-TTQInputDialog MISSING
-TTQIntValidator MISSING
-TTQLocalFs MISSING
-TTQMacStyle MISSING
-TTQMenuBar MISSING
-TTQMessageBox MISSING
-TTQMotif MISSING
-TTQMotifDialog MISSING
-TTQMotifPlusStyle MISSING
-TTQMotifStyle MISSING
-TTQMotifWidget MISSING
-TTQNPInstance MISSING
-TTQNPWidget MISSING
-TTQNetworkOperation MISSING
-TTQNetworkProtocol MISSING
-TTQObjectCleanupHandler MISSING
-TTQPlatinumStyle MISSING
-TTQProcess MISSING
-TTQProgressDialog MISSING
-TTQRegExpValidator MISSING
-TTQSGIStyle MISSING
-TTQServerSocket MISSING
-TTQSessionManager MISSING
-TTQSignal MISSING
-TTQSignalMapper MISSING
-TTQSizeGrip MISSING
-TTQSocket MISSING
-TTQSocketNotifier MISSING
-TTQSound MISSING
-TTQSplashScreen MISSING
-TTQSqlDatabase MISSING
-TTQSqlDriver MISSING
-TTQSqlEditorFactory MISSING
-TTQSqlForm MISSING
-TTQStatusBar MISSING
-TTQStoredDrag MISSING
-TTQStyle MISSING
-TTQStyleSheet MISSING
-TTQTabBar MISSING
-TTQTabDialog MISSING
-TTQTextDrag MISSING
-TTQToolBar MISSING
-TTQToolTipGroup MISSING
-TTQTranslator MISSING
-TTQUriDrag MISSING
-TTQUrlOperator MISSING
-TTQVButtonGroup MISSING
-TTQVGroupBox MISSING
-TTQValidator MISSING
-TTQWSKeyboardHandler MISSING
-TTQWindowsStyle MISSING
-TTQWindowsXPStyle MISSING
-TTQWorkspace MISSING
-TTQXtWidget MISSING
+TQAccel MISSING
+TQAccessibleObject MISSING
+TQAction MISSING
+TQActionGroup MISSING
+TQApplication MISSING
+TQAquaStyle MISSING
+TQAssistantClient MISSING
+TQAxObject MISSING
+TQAxWidget MISSING
+TQButton MISSING
+TQCDEStyle MISSING
+TQCanvas MISSING
+TQClipboard MISSING
+TQColorDialog MISSING
+TQColorDrag MISSING
+TQCommonStyle MISSING
+TQCopChannel MISSING
+TQDataPump MISSING
+TQDateTimeEditBase MISSING
+TQDesktopWidget MISSING
+TQDns MISSING
+TQDockArea MISSING
+TQDockWindow MISSING
+TQDoubleValidator MISSING
+TQDragObject MISSING
+TQEditorFactory MISSING
+TQErrorMessage MISSING
+TQEventLoop MISSING
+TQFileDialog MISSING
+TQFileIconProvider MISSING
+TQFontDialog MISSING
+TQFtp MISSING
+TQGLWidget MISSING
+TQGridLayout MISSING
+TQGridView MISSING
+TQHButtonGroup MISSING
+TQHGroupBox MISSING
+TQHeader MISSING
+TQHttp MISSING
+TQIconDrag MISSING
+TQImageDrag MISSING
+TQInputDialog MISSING
+TQIntValidator MISSING
+TQLocalFs MISSING
+TQMacStyle MISSING
+TQMenuBar MISSING
+TQMessageBox MISSING
+TQMotif MISSING
+TQMotifDialog MISSING
+TQMotifPlusStyle MISSING
+TQMotifStyle MISSING
+TQMotifWidget MISSING
+TQNPInstance MISSING
+TQNPWidget MISSING
+TQNetworkOperation MISSING
+TQNetworkProtocol MISSING
+TQObjectCleanupHandler MISSING
+TQPlatinumStyle MISSING
+TQProcess MISSING
+TQProgressDialog MISSING
+TQRegExpValidator MISSING
+TQSGIStyle MISSING
+TQServerSocket MISSING
+TQSessionManager MISSING
+TQSignal MISSING
+TQSignalMapper MISSING
+TQSizeGrip MISSING
+TQSocket MISSING
+TQSocketNotifier MISSING
+TQSound MISSING
+TQSplashScreen MISSING
+TQSqlDatabase MISSING
+TQSqlDriver MISSING
+TQSqlEditorFactory MISSING
+TQSqlForm MISSING
+TQStatusBar MISSING
+TQStoredDrag MISSING
+TQStyle MISSING
+TQStyleSheet MISSING
+TQTabBar MISSING
+TQTabDialog MISSING
+TQTextDrag MISSING
+TQToolBar MISSING
+TQToolTipGroup MISSING
+TQTranslator MISSING
+TQUriDrag MISSING
+TQUrlOperator MISSING
+TQVButtonGroup MISSING
+TQVGroupBox MISSING
+TQValidator MISSING
+TQWSKeyboardHandler MISSING
+TQWindowsStyle MISSING
+TQWindowsXPStyle MISSING
+TQWorkspace MISSING
+TQXtWidget MISSING
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index 93f17e28..038e7699 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TTQBrush class
+** Definition of TQBrush class
 **
 ** Created : 940112
 **
@@ -44,33 +44,33 @@
 #endif // QT_H
 
 
-class Q_EXPORT TTQBrush: public Qt
+class Q_EXPORT TQBrush: public Qt
 {
-friend class TTQPainter;
+friend class TQPainter;
 public:
-    TTQBrush();
-    TTQBrush( BrushStyle );
-    TTQBrush( const TTQColor &, BrushStyle=SolidPattern );
-    TTQBrush( const TTQColor &, const TTQPixmap & );
-    TTQBrush( const TTQBrush & );
-   ~TTQBrush();
-    TTQBrush &operator=( const TTQBrush & );
+    TQBrush();
+    TQBrush( BrushStyle );
+    TQBrush( const TQColor &, BrushStyle=SolidPattern );
+    TQBrush( const TQColor &, const TQPixmap & );
+    TQBrush( const TQBrush & );
+   ~TQBrush();
+    TQBrush &operator=( const TQBrush & );
 
     BrushStyle	style()	 const		{ return data->style; }
     void	setStyle( BrushStyle );
-    const TTQColor &color()const		{ return data->color; }
-    void	setColor( const TTQColor & );
-    TTQPixmap    *pixmap() const		{ return data->pixmap; }
-    void	setPixmap( const TTQPixmap & );
+    const TQColor &color()const		{ return data->color; }
+    void	setColor( const TQColor & );
+    TQPixmap    *pixmap() const		{ return data->pixmap; }
+    void	setPixmap( const TQPixmap & );
 
-    bool	operator==( const TTQBrush &p ) const;
-    bool	operator!=( const TTQBrush &b ) const
+    bool	operator==( const TQBrush &p ) const;
+    bool	operator!=( const TQBrush &b ) const
 					{ return !(operator==(b)); }
 
 private:
     TQBrush	copy()	const;
     void	detach();
-    void	init( const TTQColor &, BrushStyle );
+    void	init( const TQColor &, BrushStyle );
     struct TQBrushData : public TQShared {	// brush data
 	BrushStyle style;
 	TQColor	  color;
@@ -80,12 +80,12 @@ private:
 
 
 /*****************************************************************************
-  TTQBrush stream functions
+  TQBrush stream functions
  *****************************************************************************/
 
 #ifndef QT_NO_DATASTREAM
-Q_EXPORT TTQDataStream &operator<<( TTQDataStream &, const TTQBrush & );
-Q_EXPORT TTQDataStream &operator>>( TTQDataStream &, TTQBrush & );
+Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
+Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
 #endif
 
 #endif // TQBRUSH_H
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index b89fd795..bdf46d83 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 
 **
-** Definition of TTQCanvas classes
+** Definition of TQCanvas classes
 **
 ** Created : 991211
 **
@@ -59,34 +59,34 @@
 #ifndef QT_NO_CANVAS
 
 
-class TTQCanvasSprite;
-class TTQCanvasPolygonalItem;
-class TTQCanvasRectangle;
-class TTQCanvasPolygon;
-class TTQCanvasEllipse;
-class TTQCanvasText;
-class TTQCanvasLine;
-class TTQCanvasChunk;
-class TTQCanvas;
-class TTQCanvasItem;
-class TTQCanvasView;
-class TTQCanvasPixmap;
+class TQCanvasSprite;
+class TQCanvasPolygonalItem;
+class TQCanvasRectangle;
+class TQCanvasPolygon;
+class TQCanvasEllipse;
+class TQCanvasText;
+class TQCanvasLine;
+class TQCanvasChunk;
+class TQCanvas;
+class TQCanvasItem;
+class TQCanvasView;
+class TQCanvasPixmap;
 
 
-class TQM_EXPORT_CANVAS TTQCanvasItemList : public TTQValueList {
+class TQM_EXPORT_CANVAS TQCanvasItemList : public TQValueList {
 public:
     void sort();
-    void drawUnique( TTQPainter& painter );
+    void drawUnique( TQPainter& painter );
 };
 
 
-class TTQCanvasItemExtra;
+class TQCanvasItemExtra;
 
-class TQM_EXPORT_CANVAS TTQCanvasItem : public Qt
+class TQM_EXPORT_CANVAS TQCanvasItem : public Qt
 {
 public:
-    TTQCanvasItem(TTQCanvas* canvas);
-    virtual ~TTQCanvasItem();
+    TQCanvasItem(TQCanvas* canvas);
+    virtual ~TQCanvasItem();
 
     double x() const
 	{ return myx; }
@@ -110,13 +110,13 @@ public:
     double yVelocity() const;
     virtual void advance(int stage);
 
-    virtual bool collidesWith( const TTQCanvasItem* ) const=0;
+    virtual bool collidesWith( const TQCanvasItem* ) const=0;
 
-    TTQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const;
+    TQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const;
 
-    virtual void setCanvas(TTQCanvas*);
+    virtual void setCanvas(TQCanvas*);
 
-    virtual void draw(TTQPainter&)=0;
+    virtual void draw(TQPainter&)=0;
 
     void show();
     void hide();
@@ -159,10 +159,10 @@ public:
     virtual int rtti() const;
     static int RTTI;
 
-    virtual TTQRect boundingRect() const=0;
-    virtual TTQRect boundingRectAdvanced() const;
+    virtual TQRect boundingRect() const=0;
+    virtual TQRect boundingRectAdvanced() const;
 
-    TTQCanvas* canvas() const
+    TQCanvas* canvas() const
 	{ return cnv; }
 
 protected:
@@ -171,30 +171,30 @@ protected:
 private:
     // For friendly subclasses...
 
-    friend class TTQCanvasPolygonalItem;
-    friend class TTQCanvasSprite;
-    friend class TTQCanvasRectangle;
-    friend class TTQCanvasPolygon;
-    friend class TTQCanvasEllipse;
-    friend class TTQCanvasText;
-    friend class TTQCanvasLine;
+    friend class TQCanvasPolygonalItem;
+    friend class TQCanvasSprite;
+    friend class TQCanvasRectangle;
+    friend class TQCanvasPolygon;
+    friend class TQCanvasEllipse;
+    friend class TQCanvasText;
+    friend class TQCanvasLine;
 
-    virtual TTQPointArray chunks() const;
+    virtual TQPointArray chunks() const;
     virtual void addToChunks();
     virtual void removeFromChunks();
     virtual void changeChunks();
-    virtual bool collidesWith( const TTQCanvasSprite*,
-			       const TTQCanvasPolygonalItem*,
-			       const TTQCanvasRectangle*,
-			       const TTQCanvasEllipse*,
-			       const TTQCanvasText* ) const = 0;
+    virtual bool collidesWith( const TQCanvasSprite*,
+			       const TQCanvasPolygonalItem*,
+			       const TQCanvasRectangle*,
+			       const TQCanvasEllipse*,
+			       const TQCanvasText* ) const = 0;
     // End of friend stuff
 
-    TTQCanvas* cnv;
-    static TTQCanvas* current_canvas;
+    TQCanvas* cnv;
+    static TQCanvas* current_canvas;
     double myx,myy,myz;
-    TTQCanvasItemExtra *ext;
-    TTQCanvasItemExtra& extra();
+    TQCanvasItemExtra *ext;
+    TQCanvasItemExtra& extra();
     uint ani:1;
     uint vis:1;
     uint val:1;
@@ -204,25 +204,25 @@ private:
 };
 
 
-class TTQCanvasData;
+class TQCanvasData;
 
-class TQM_EXPORT_CANVAS TTQCanvas : public TQObject
+class TQM_EXPORT_CANVAS TQCanvas : public TQObject
 {
     Q_OBJECT
 public:
-    TTQCanvas( TTQObject* parent = 0, const char* name = 0 );
-    TTQCanvas(int w, int h);
-    TTQCanvas( TTQPixmap p, int h, int v, int tilewidth, int tileheight );
+    TQCanvas( TQObject* parent = 0, const char* name = 0 );
+    TQCanvas(int w, int h);
+    TQCanvas( TQPixmap p, int h, int v, int tilewidth, int tileheight );
 
-    virtual ~TTQCanvas();
+    virtual ~TQCanvas();
 
-    virtual void setTiles( TTQPixmap tiles, int h, int v,
+    virtual void setTiles( TQPixmap tiles, int h, int v,
 			   int tilewidth, int tileheight );
-    virtual void setBackgroundPixmap( const TTQPixmap& p );
-    TTQPixmap backgroundPixmap() const;
+    virtual void setBackgroundPixmap( const TQPixmap& p );
+    TQPixmap backgroundPixmap() const;
 
-    virtual void setBackgroundColor( const TTQColor& c );
-    TTQColor backgroundColor() const;
+    virtual void setBackgroundColor( const TQColor& c );
+    TQColor backgroundColor() const;
 
     virtual void setTile( int x, int y, int tilenum );
     int tile( int x, int y ) const
@@ -243,17 +243,17 @@ public:
 	{ return awidth; }
     int height() const
 	{ return aheight; }
-    TTQSize size() const
-	{ return TTQSize(awidth,aheight); }
-    TTQRect rect() const
-	{ return TTQRect( 0, 0, awidth, aheight ); }
+    TQSize size() const
+	{ return TQSize(awidth,aheight); }
+    TQRect rect() const
+	{ return TQRect( 0, 0, awidth, aheight ); }
     bool onCanvas( int x, int y ) const
 	{ return x>=0 && y>=0 && x=0 && y>=0 && x, TTQPtrList hotspots);
+    TQCanvasPixmapArray(TQPtrList, TQPtrList hotspots);
 
-    TTQCanvasPixmapArray(TTQValueList, TTQPointArray hotspots = TTQPointArray() );
-    ~TTQCanvasPixmapArray();
+    TQCanvasPixmapArray(TQValueList, TQPointArray hotspots = TQPointArray() );
+    ~TQCanvasPixmapArray();
 
 #ifndef QT_NO_IMAGEIO
-    bool readPixmaps(const TTQString& datafilenamepattern, int framecount=0);
-    bool readCollisionMasks(const TTQString& filenamepattern);
+    bool readPixmaps(const TQString& datafilenamepattern, int framecount=0);
+    bool readCollisionMasks(const TQString& filenamepattern);
 #endif
 
     // deprecated
     bool operator!(); // Failure check.
     bool isValid() const;
 
-    TTQCanvasPixmap* image(int i) const
+    TQCanvasPixmap* image(int i) const
 	{ return img ? img[i] : 0; }
-    void setImage(int i, TTQCanvasPixmap* p);
+    void setImage(int i, TQCanvasPixmap* p);
     uint count() const
 	{ return (uint)framecount; }
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TTQCanvasPixmapArray( const TTQCanvasPixmapArray & );
-    TTQCanvasPixmapArray &operator=( const TTQCanvasPixmapArray & );
+    TQCanvasPixmapArray( const TQCanvasPixmapArray & );
+    TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
 #endif
 #ifndef QT_NO_IMAGEIO
-    bool readPixmaps(const TTQString& datafilenamepattern, int framecount, bool maskonly);
+    bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly);
 #endif
 
     void reset();
     int framecount;
-    TTQCanvasPixmap** img;
+    TQCanvasPixmap** img;
 };
 
 
-class TQM_EXPORT_CANVAS TTQCanvasSprite : public TQCanvasItem
+class TQM_EXPORT_CANVAS TQCanvasSprite : public TQCanvasItem
 {
 public:
-    TTQCanvasSprite(TTQCanvasPixmapArray* array, TTQCanvas* canvas);
+    TQCanvasSprite(TQCanvasPixmapArray* array, TQCanvas* canvas);
 
-    void setSequence(TTQCanvasPixmapArray* seq);
+    void setSequence(TQCanvasPixmapArray* seq);
 
-    virtual ~TTQCanvasSprite();
+    virtual ~TQCanvasSprite();
 
     void move(double x, double y);
     virtual void move(double x, double y, int frame);
@@ -490,9 +490,9 @@ public:
     int rtti() const;
     static int RTTI;
 
-    bool collidesWith( const TTQCanvasItem* ) const;
+    bool collidesWith( const TQCanvasItem* ) const;
 
-    TTQRect boundingRect() const;
+    TQRect boundingRect() const;
 
     // is there a reason for these to be protected? Lars
 //protected:
@@ -509,20 +509,20 @@ public:
     int topEdge(int ny) const;
     int rightEdge(int nx) const;
     int bottomEdge(int ny) const;
-    TTQCanvasPixmap* image() const
+    TQCanvasPixmap* image() const
 	{ return images->image(frm); }
-    virtual TTQCanvasPixmap* imageAdvanced() const;
-    TTQCanvasPixmap* image(int f) const
+    virtual TQCanvasPixmap* imageAdvanced() const;
+    TQCanvasPixmap* image(int f) const
 	{ return images->image(f); }
     virtual void advance(int stage);
 
 public:
-    void draw(TTQPainter& painter);
+    void draw(TQPainter& painter);
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TTQCanvasSprite( const TTQCanvasSprite & );
-    TTQCanvasSprite &operator=( const TTQCanvasSprite & );
+    TQCanvasSprite( const TQCanvasSprite & );
+    TQCanvasSprite &operator=( const TQCanvasSprite & );
 #endif
     void addToChunks();
     void removeFromChunks();
@@ -532,46 +532,46 @@ private:
     ushort anim_val;
     uint anim_state:2;
     uint anim_type:14;
-    bool collidesWith( const TTQCanvasSprite*,
-		       const TTQCanvasPolygonalItem*,
-		       const TTQCanvasRectangle*,
-		       const TTQCanvasEllipse*,
-		       const TTQCanvasText* ) const;
+    bool collidesWith( const TQCanvasSprite*,
+		       const TQCanvasPolygonalItem*,
+		       const TQCanvasRectangle*,
+		       const TQCanvasEllipse*,
+		       const TQCanvasText* ) const;
 
-    friend bool qt_testCollision( const TTQCanvasSprite* s1,
-				  const TTQCanvasSprite* s2 );
+    friend bool qt_testCollision( const TQCanvasSprite* s1,
+				  const TQCanvasSprite* s2 );
 
-    TTQCanvasPixmapArray* images;
+    TQCanvasPixmapArray* images;
 };
 
-class TTQPolygonalProcessor;
+class TQPolygonalProcessor;
 
-class TQM_EXPORT_CANVAS TTQCanvasPolygonalItem : public TQCanvasItem
+class TQM_EXPORT_CANVAS TQCanvasPolygonalItem : public TQCanvasItem
 {
 public:
-    TTQCanvasPolygonalItem(TTQCanvas* canvas);
-    virtual ~TTQCanvasPolygonalItem();
+    TQCanvasPolygonalItem(TQCanvas* canvas);
+    virtual ~TQCanvasPolygonalItem();
 
-    bool collidesWith( const TTQCanvasItem* ) const;
+    bool collidesWith( const TQCanvasItem* ) const;
 
-    virtual void setPen(TTQPen p);
-    virtual void setBrush(TTQBrush b);
+    virtual void setPen(TQPen p);
+    virtual void setBrush(TQBrush b);
 
-    TTQPen pen() const
+    TQPen pen() const
 	{ return pn; }
-    TTQBrush brush() const
+    TQBrush brush() const
 	{ return br; }
 
-    virtual TTQPointArray areaPoints() const=0;
-    virtual TTQPointArray areaPointsAdvanced() const;
-    TTQRect boundingRect() const;
+    virtual TQPointArray areaPoints() const=0;
+    virtual TQPointArray areaPointsAdvanced() const;
+    TQRect boundingRect() const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void draw(TTQPainter &);
-    virtual void drawShape(TTQPainter &) = 0;
+    void draw(TQPainter &);
+    virtual void drawShape(TQPainter &) = 0;
 
     bool winding() const;
     void setWinding(bool);
@@ -581,88 +581,88 @@ protected:
 	{ return (bool)val; }
 
 private:
-    void scanPolygon( const TTQPointArray& pa, int winding,
-		      TTQPolygonalProcessor& process ) const;
-    TTQPointArray chunks() const;
-
-    bool collidesWith( const TTQCanvasSprite*,
-		       const TTQCanvasPolygonalItem*,
-		       const TTQCanvasRectangle*,
-		       const TTQCanvasEllipse*,
-		       const TTQCanvasText* ) const;
-
-    TTQBrush br;
-    TTQPen pn;
+    void scanPolygon( const TQPointArray& pa, int winding,
+		      TQPolygonalProcessor& process ) const;
+    TQPointArray chunks() const;
+
+    bool collidesWith( const TQCanvasSprite*,
+		       const TQCanvasPolygonalItem*,
+		       const TQCanvasRectangle*,
+		       const TQCanvasEllipse*,
+		       const TQCanvasText* ) const;
+
+    TQBrush br;
+    TQPen pn;
     uint wind:1;
 };
 
 
-class TQM_EXPORT_CANVAS TTQCanvasRectangle : public TQCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TQCanvasRectangle : public TQCanvasPolygonalItem
 {
 public:
-    TTQCanvasRectangle(TTQCanvas* canvas);
-    TTQCanvasRectangle(const TTQRect&, TTQCanvas* canvas);
-    TTQCanvasRectangle(int x, int y, int width, int height, TTQCanvas* canvas);
+    TQCanvasRectangle(TQCanvas* canvas);
+    TQCanvasRectangle(const TQRect&, TQCanvas* canvas);
+    TQCanvasRectangle(int x, int y, int width, int height, TQCanvas* canvas);
 
-    ~TTQCanvasRectangle();
+    ~TQCanvasRectangle();
 
     int width() const;
     int height() const;
     void setSize(int w, int h);
-    TTQSize size() const
-	{ return TTQSize(w,h); }
-    TTQPointArray areaPoints() const;
-    TTQRect rect() const
-	{ return TTQRect(int(x()),int(y()),w,h); }
+    TQSize size() const
+	{ return TQSize(w,h); }
+    TQPointArray areaPoints() const;
+    TQRect rect() const
+	{ return TQRect(int(x()),int(y()),w,h); }
 
-    bool collidesWith( const TTQCanvasItem* ) const;
+    bool collidesWith( const TQCanvasItem* ) const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void drawShape(TTQPainter &);
-    TTQPointArray chunks() const;
+    void drawShape(TQPainter &);
+    TQPointArray chunks() const;
 
 private:
-    bool collidesWith(   const TTQCanvasSprite*,
-			 const TTQCanvasPolygonalItem*,
-			 const TTQCanvasRectangle*,
-			 const TTQCanvasEllipse*,
-			 const TTQCanvasText* ) const;
+    bool collidesWith(   const TQCanvasSprite*,
+			 const TQCanvasPolygonalItem*,
+			 const TQCanvasRectangle*,
+			 const TQCanvasEllipse*,
+			 const TQCanvasText* ) const;
 
     int w, h;
 };
 
 
-class TQM_EXPORT_CANVAS TTQCanvasPolygon : public TQCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TQCanvasPolygon : public TQCanvasPolygonalItem
 {
 public:
-    TTQCanvasPolygon(TTQCanvas* canvas);
-    ~TTQCanvasPolygon();
-    void setPoints(TTQPointArray);
-    TTQPointArray points() const;
+    TQCanvasPolygon(TQCanvas* canvas);
+    ~TQCanvasPolygon();
+    void setPoints(TQPointArray);
+    TQPointArray points() const;
     void moveBy(double dx, double dy);
 
-    TTQPointArray areaPoints() const;
+    TQPointArray areaPoints() const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void drawShape(TTQPainter &);
-    TTQPointArray poly;
+    void drawShape(TQPainter &);
+    TQPointArray poly;
 };
 
 
-class TQM_EXPORT_CANVAS TTQCanvasSpline : public TQCanvasPolygon
+class TQM_EXPORT_CANVAS TQCanvasSpline : public TQCanvasPolygon
 {
 public:
-    TTQCanvasSpline(TTQCanvas* canvas);
-    ~TTQCanvasSpline();
+    TQCanvasSpline(TQCanvas* canvas);
+    ~TQCanvasSpline();
 
-    void setControlPoints(TTQPointArray, bool closed=TRUE);
-    TTQPointArray controlPoints() const;
+    void setControlPoints(TQPointArray, bool closed=TRUE);
+    TQPointArray controlPoints() const;
     bool closed() const;
 
     int rtti() const;
@@ -670,47 +670,47 @@ public:
 
 private:
     void recalcPoly();
-    TTQPointArray bez;
+    TQPointArray bez;
     bool cl;
 };
 
 
-class TQM_EXPORT_CANVAS TTQCanvasLine : public TQCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TQCanvasLine : public TQCanvasPolygonalItem
 {
 public:
-    TTQCanvasLine(TTQCanvas* canvas);
-    ~TTQCanvasLine();
+    TQCanvasLine(TQCanvas* canvas);
+    ~TQCanvasLine();
     void setPoints(int x1, int y1, int x2, int y2);
 
-    TTQPoint startPoint() const
-	{ return TTQPoint(x1,y1); }
-    TTQPoint endPoint() const
-	{ return TTQPoint(x2,y2); }
+    TQPoint startPoint() const
+	{ return TQPoint(x1,y1); }
+    TQPoint endPoint() const
+	{ return TQPoint(x2,y2); }
 
     int rtti() const;
     static int RTTI;
 
-    void setPen(TTQPen p);
+    void setPen(TQPen p);
 
 protected:
-    void drawShape(TTQPainter &);
-    TTQPointArray areaPoints() const;
+    void drawShape(TQPainter &);
+    TQPointArray areaPoints() const;
 
 private:
     int x1,y1,x2,y2;
 };
 
 
-class TQM_EXPORT_CANVAS TTQCanvasEllipse : public TQCanvasPolygonalItem
+class TQM_EXPORT_CANVAS TQCanvasEllipse : public TQCanvasPolygonalItem
 {
 
 public:
-    TTQCanvasEllipse( TTQCanvas* canvas );
-    TTQCanvasEllipse( int width, int height, TTQCanvas* canvas );
-    TTQCanvasEllipse( int width, int height, int startangle, int angle,
-		    TTQCanvas* canvas );
+    TQCanvasEllipse( TQCanvas* canvas );
+    TQCanvasEllipse( int width, int height, TQCanvas* canvas );
+    TQCanvasEllipse( int width, int height, int startangle, int angle,
+		    TQCanvas* canvas );
 
-    ~TTQCanvasEllipse();
+    ~TQCanvasEllipse();
 
     int width() const;
     int height() const;
@@ -720,44 +720,44 @@ public:
 	{ return a1; }
     int angleLength() const
 	{ return a2; }
-    TTQPointArray areaPoints() const;
+    TQPointArray areaPoints() const;
 
-    bool collidesWith( const TTQCanvasItem* ) const;
+    bool collidesWith( const TQCanvasItem* ) const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    void drawShape(TTQPainter &);
+    void drawShape(TQPainter &);
 
 private:
-    bool collidesWith( const TTQCanvasSprite*,
-		       const TTQCanvasPolygonalItem*,
-		       const TTQCanvasRectangle*,
-		       const TTQCanvasEllipse*,
-		       const TTQCanvasText* ) const;
+    bool collidesWith( const TQCanvasSprite*,
+		       const TQCanvasPolygonalItem*,
+		       const TQCanvasRectangle*,
+		       const TQCanvasEllipse*,
+		       const TQCanvasText* ) const;
     int w, h;
     int a1, a2;
 };
 
 
-class TTQCanvasTextExtra;
+class TQCanvasTextExtra;
 
-class TQM_EXPORT_CANVAS TTQCanvasText : public TQCanvasItem
+class TQM_EXPORT_CANVAS TQCanvasText : public TQCanvasItem
 {
 public:
-    TTQCanvasText(TTQCanvas* canvas);
-    TTQCanvasText(const TTQString&, TTQCanvas* canvas);
-    TTQCanvasText(const TTQString&, TTQFont, TTQCanvas* canvas);
+    TQCanvasText(TQCanvas* canvas);
+    TQCanvasText(const TQString&, TQCanvas* canvas);
+    TQCanvasText(const TQString&, TQFont, TQCanvas* canvas);
 
-    virtual ~TTQCanvasText();
+    virtual ~TQCanvasText();
 
-    void setText( const TTQString& );
-    void setFont( const TTQFont& );
-    void setColor( const TTQColor& );
-    TTQString text() const;
-    TTQFont font() const;
-    TTQColor color() const;
+    void setText( const TQString& );
+    void setFont( const TQFont& );
+    void setColor( const TQColor& );
+    TQString text() const;
+    TQFont font() const;
+    TQColor color() const;
 
     void moveBy(double dx, double dy);
 
@@ -765,38 +765,38 @@ public:
 	{ return flags; }
     void setTextFlags(int);
 
-    TTQRect boundingRect() const;
+    TQRect boundingRect() const;
 
-    bool collidesWith( const TTQCanvasItem* ) const;
+    bool collidesWith( const TQCanvasItem* ) const;
 
     int rtti() const;
     static int RTTI;
 
 protected:
-    virtual void draw(TTQPainter&);
+    virtual void draw(TQPainter&);
 
 private:
 #if defined(Q_DISABLE_COPY)
-    TTQCanvasText( const TTQCanvasText & );
-    TTQCanvasText &operator=( const TTQCanvasText & );
+    TQCanvasText( const TQCanvasText & );
+    TQCanvasText &operator=( const TQCanvasText & );
 #endif
     void addToChunks();
     void removeFromChunks();
     void changeChunks();
 
     void setRect();
-    TTQRect brect;
-    TTQString txt;
+    TQRect brect;
+    TQString txt;
     int flags;
-    TTQFont fnt;
-    TTQColor col;
-    TTQCanvasTextExtra* extra;
-
-    bool collidesWith(   const TTQCanvasSprite*,
-			 const TTQCanvasPolygonalItem*,
-			 const TTQCanvasRectangle*,
-			 const TTQCanvasEllipse*,
-			 const TTQCanvasText* ) const;
+    TQFont fnt;
+    TQColor col;
+    TQCanvasTextExtra* extra;
+
+    bool collidesWith(   const TQCanvasSprite*,
+			 const TQCanvasPolygonalItem*,
+			 const TQCanvasRectangle*,
+			 const TQCanvasEllipse*,
+			 const TQCanvasText* ) const;
 };
 
 #define Q_DEFINED_QCANVAS
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 4db56e03..34d064b1 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TTQDir class
+** Definition of TQDir class
 **
 ** Created : 950427
 **
@@ -46,10 +46,10 @@
 
 
 #ifndef QT_NO_DIR
-typedef TTQPtrList TQFileInfoList;
-typedef TTQPtrListIterator TQFileInfoListIterator;
-class TTQStringList;
-template  class TTQDeepCopy;
+typedef TQPtrList TQFileInfoList;
+typedef TQPtrListIterator TQFileInfoListIterator;
+class TQStringList;
+template  class TQDeepCopy;
 
 
 class Q_EXPORT TQDir
@@ -85,34 +85,34 @@ public:
 		      IgnoreCase    = 0x10,
 		      DefaultSort   = -1 };
 
-    TTQDir();
-    TTQDir( const TTQString &path, const TTQString &nameFilter = TTQString::null,
+    TQDir();
+    TQDir( const TQString &path, const TQString &nameFilter = TQString::null,
 	  int sortSpec = Name | IgnoreCase, int filterSpec = All );
-    TTQDir( const TTQDir & );
+    TQDir( const TQDir & );
 
-    virtual ~TTQDir();
+    virtual ~TQDir();
 
-    TTQDir       &operator=( const TTQDir & );
-    TTQDir       &operator=( const TTQString &path );
+    TQDir       &operator=( const TQDir & );
+    TQDir       &operator=( const TQString &path );
 
-    virtual void setPath( const TTQString &path );
-    virtual TTQString path()		const;
-    virtual TTQString absPath()	const;
-    virtual TTQString canonicalPath()	const;
+    virtual void setPath( const TQString &path );
+    virtual TQString path()		const;
+    virtual TQString absPath()	const;
+    virtual TQString canonicalPath()	const;
 
-    virtual TTQString dirName() const;
-    virtual TTQString filePath( const TTQString &fileName,
+    virtual TQString dirName() const;
+    virtual TQString filePath( const TQString &fileName,
 			      bool acceptAbsPath = TRUE ) const;
-    virtual TTQString absFilePath( const TTQString &fileName,
+    virtual TQString absFilePath( const TQString &fileName,
 				 bool acceptAbsPath = TRUE ) const;
 
-    static TTQString convertSeparators( const TTQString &pathName );
+    static TQString convertSeparators( const TQString &pathName );
 
-    virtual bool cd( const TTQString &dirName, bool acceptAbsPath = TRUE );
+    virtual bool cd( const TQString &dirName, bool acceptAbsPath = TRUE );
     virtual bool cdUp();
 
     TQString	nameFilter() const;
-    virtual void setNameFilter( const TTQString &nameFilter );
+    virtual void setNameFilter( const TQString &nameFilter );
     FilterSpec filter() const;
     virtual void setFilter( int filterSpec );
     SortSpec sorting() const;
@@ -124,28 +124,28 @@ public:
     uint count() const;
     TQString	operator[]( int ) const;
 
-    virtual TTQStrList encodedEntryList( int filterSpec = DefaultFilter,
+    virtual TQStrList encodedEntryList( int filterSpec = DefaultFilter,
 				       int sortSpec   = DefaultSort  ) const;
-    virtual TTQStrList encodedEntryList( const TTQString &nameFilter,
+    virtual TQStrList encodedEntryList( const TQString &nameFilter,
 				       int filterSpec = DefaultFilter,
 				       int sortSpec   = DefaultSort   ) const;
-    virtual TTQStringList entryList( int filterSpec = DefaultFilter,
+    virtual TQStringList entryList( int filterSpec = DefaultFilter,
 				   int sortSpec   = DefaultSort  ) const;
-    virtual TTQStringList entryList( const TTQString &nameFilter,
+    virtual TQStringList entryList( const TQString &nameFilter,
 				   int filterSpec = DefaultFilter,
 				   int sortSpec   = DefaultSort   ) const;
 
     virtual const TQFileInfoList *entryInfoList( int filterSpec = DefaultFilter,
 						int sortSpec = DefaultSort ) const;
-    virtual const TQFileInfoList *entryInfoList( const TTQString &nameFilter,
+    virtual const TQFileInfoList *entryInfoList( const TQString &nameFilter,
 						int filterSpec = DefaultFilter,
 						int sortSpec = DefaultSort ) const;
 
     static const TQFileInfoList *drives();
 
-    virtual bool mkdir( const TTQString &dirName,
+    virtual bool mkdir( const TQString &dirName,
 			bool acceptAbsPath = TRUE ) const;
-    virtual bool rmdir( const TTQString &dirName,
+    virtual bool rmdir( const TQString &dirName,
 			bool acceptAbsPath = TRUE ) const;
 
     virtual bool isReadable() const;
@@ -155,45 +155,45 @@ public:
     virtual bool isRelative() const;
     virtual void convertToAbs();
 
-    virtual bool operator==( const TTQDir & ) const;
-    virtual bool operator!=( const TTQDir & ) const;
+    virtual bool operator==( const TQDir & ) const;
+    virtual bool operator!=( const TQDir & ) const;
 
-    virtual bool remove( const TTQString &fileName,
+    virtual bool remove( const TQString &fileName,
 			 bool acceptAbsPath = TRUE );
-    virtual bool rename( const TTQString &name, const TTQString &newName,
+    virtual bool rename( const TQString &name, const TQString &newName,
 			 bool acceptAbsPaths = TRUE  );
-    virtual bool exists( const TTQString &name,
+    virtual bool exists( const TQString &name,
 			 bool acceptAbsPath = TRUE );
 
     static char separator();
 
-    static bool setCurrent( const TTQString &path );
-    static TTQDir current();
-    static TTQDir home();
-    static TTQDir root();
-    static TTQString currentDirPath();
-    static TTQString homeDirPath();
-    static TTQString rootDirPath();
-
-    static bool match( const TTQStringList &filters, const TTQString &fileName );
-    static bool match( const TTQString &filter, const TTQString &fileName );
-    static TTQString cleanDirPath( const TTQString &dirPath );
-    static bool isRelativePath( const TTQString &path );
+    static bool setCurrent( const TQString &path );
+    static TQDir current();
+    static TQDir home();
+    static TQDir root();
+    static TQString currentDirPath();
+    static TQString homeDirPath();
+    static TQString rootDirPath();
+
+    static bool match( const TQStringList &filters, const TQString &fileName );
+    static bool match( const TQString &filter, const TQString &fileName );
+    static TQString cleanDirPath( const TQString &dirPath );
+    static bool isRelativePath( const TQString &path );
     void refresh() const;
 
 private:
 #ifdef Q_OS_MAC
     typedef struct FSSpec FSSpec;
-    static FSSpec *make_spec(const TTQString &);
+    static FSSpec *make_spec(const TQString &);
 #endif
     void init();
-    virtual bool readDirEntries( const TTQString &nameFilter,
+    virtual bool readDirEntries( const TQString &nameFilter,
 				 int FilterSpec, int SortSpec  );
 
-    static void slashify( TTQString & );
+    static void slashify( TQString & );
 
     TQString	dPath;
-    TTQStringList   *fList;
+    TQStringList   *fList;
     TQFileInfoList *fiList;
     TQString	nameFilt;
     FilterSpec	filtS;
@@ -202,44 +202,44 @@ private:
     uint	allDirs : 1;
 
     void detach();
-    friend class TTQDeepCopy< TTQDir >;
+    friend class TQDeepCopy< TQDir >;
 };
 
 
-inline TTQString TTQDir::path() const
+inline TQString TQDir::path() const
 {
     return dPath;
 }
 
-inline TTQString TTQDir::nameFilter() const
+inline TQString TQDir::nameFilter() const
 {
     return nameFilt;
 }
 
-inline TTQDir::FilterSpec TTQDir::filter() const
+inline TQDir::FilterSpec TQDir::filter() const
 {
     return filtS;
 }
 
-inline TTQDir::SortSpec TTQDir::sorting() const
+inline TQDir::SortSpec TQDir::sorting() const
 {
     return sortS;
 }
 
-inline bool TTQDir::matchAllDirs() const
+inline bool TQDir::matchAllDirs() const
 {
     return allDirs;
 }
 
-inline bool TTQDir::operator!=( const TTQDir &d ) const
+inline bool TQDir::operator!=( const TQDir &d ) const
 {
     return !(*this == d);
 }
 
 
 struct TQDirSortItem {
-    TTQString filename_cache;
-    TTQFileInfo* item;
+    TQString filename_cache;
+    TQFileInfo* item;
 };
 
 #endif // QT_NO_DIR
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index e1a5c582..ef631a87 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TTQPen class
+** Definition of TQPen class
 **
 ** Created : 940112
 **
@@ -44,41 +44,41 @@
 #endif // QT_H
 
 
-class Q_EXPORT TTQPen: public Qt
+class Q_EXPORT TQPen: public Qt
 {
 public:
-    TTQPen();
-    TTQPen( PenStyle );
-    TTQPen( const TTQColor &color, uint width=0, PenStyle style=SolidLine );
-    TTQPen( const TTQColor &cl, uint w, PenStyle s, PenCapStyle c, PenJoinStyle j);
-    TTQPen( const TTQPen & );
-   ~TTQPen();
-    TTQPen &operator=( const TTQPen & );
+    TQPen();
+    TQPen( PenStyle );
+    TQPen( const TQColor &color, uint width=0, PenStyle style=SolidLine );
+    TQPen( const TQColor &cl, uint w, PenStyle s, PenCapStyle c, PenJoinStyle j);
+    TQPen( const TQPen & );
+   ~TQPen();
+    TQPen &operator=( const TQPen & );
 
     PenStyle	style() const		{ return data->style; }
     void	setStyle( PenStyle );
     uint	width() const		{ return data->width; }
     void	setWidth( uint );
-    const TTQColor &color() const		{ return data->color; }
-    void	setColor( const TTQColor & );
+    const TQColor &color() const		{ return data->color; }
+    void	setColor( const TQColor & );
     PenCapStyle	capStyle() const;
     void	setCapStyle( PenCapStyle );
     PenJoinStyle joinStyle() const;
     void	setJoinStyle( PenJoinStyle );
 
-    bool	operator==( const TTQPen &p ) const;
-    bool	operator!=( const TTQPen &p ) const
+    bool	operator==( const TQPen &p ) const;
+    bool	operator!=( const TQPen &p ) const
 					{ return !(operator==(p)); }
 
 private:
-    friend class TTQPainter;
+    friend class TQPainter;
 #ifdef Q_WS_WIN
     friend class TQFontEngineWin;
 #endif
 
     TQPen	copy()	const;
     void	detach();
-    void	init( const TTQColor &, uint, uint );
+    void	init( const TQColor &, uint, uint );
     struct TQPenData : public TQShared {		// pen data
 	PenStyle  style;
 	uint	  width;
@@ -89,11 +89,11 @@ private:
 
 
 /*****************************************************************************
-  TTQPen stream functions
+  TQPen stream functions
  *****************************************************************************/
 #ifndef QT_NO_DATASTREAM
-Q_EXPORT TTQDataStream &operator<<( TTQDataStream &, const TTQPen & );
-Q_EXPORT TTQDataStream &operator>>( TTQDataStream &, TTQPen & );
+Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
+Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
 #endif
 
 #endif // TQPEN_H
diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h
index e61b4124..20bfe9da 100644
--- a/kjsembed/tools/headers/qtimer.h
+++ b/kjsembed/tools/headers/qtimer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** 
 **
-** Definition of TTQTimer class
+** Definition of TQTimer class
 **
 ** Created : 931111
 **
@@ -43,12 +43,12 @@
 #endif // QT_H
 
 
-class Q_EXPORT TTQTimer : public TQObject
+class Q_EXPORT TQTimer : public TQObject
 {
     Q_OBJECT
 public:
-    TTQTimer( TTQObject *parent=0, const char *name=0 );
-   ~TTQTimer();
+    TQTimer( TQObject *parent=0, const char *name=0 );
+   ~TQTimer();
 
     bool	isActive() const;
 
@@ -56,7 +56,7 @@ public:
     void	changeInterval( int msec );
     void	stop();
 
-    static void singleShot( int msec, TTQObject *receiver, const char *member );
+    static void singleShot( int msec, TQObject *receiver, const char *member );
 
     int		timerId() const	{ return id; }
 
@@ -64,7 +64,7 @@ signals:
     void	timeout();
 
 protected:
-    bool	event( TTQEvent * );
+    bool	event( TQEvent * );
 
 private:
     int id;
@@ -73,13 +73,13 @@ private:
 
 private:	// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
-    TTQTimer( const TTQTimer & );
-    TTQTimer &operator=( const TTQTimer & );
+    TQTimer( const TQTimer & );
+    TQTimer &operator=( const TQTimer & );
 #endif
 };
 
 
-inline bool TTQTimer::isActive() const
+inline bool TQTimer::isActive() const
 {
     return id >= 0;
 }
diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp
index d2394a92..390d5fd2 100644
--- a/kjsembed/xmlactionclient.cpp
+++ b/kjsembed/xmlactionclient.cpp
@@ -31,27 +31,27 @@ namespace KJSEmbed {
 // XML Tags and Attributes
 //
 
-TTQString tag_header("header");
-TTQString tag_action("action");
-TTQString tag_type( "type" );
-TTQString tag_label( "label" );
-TTQString tag_icons( "icons" );
-TTQString tag_shortcut( "shortcut" );
-TTQString tag_name( "name" );
-TTQString tag_group( "group" );
-TTQString tag_text( "text" );
-TTQString tag_statustext( "statustext" );
-TTQString tag_whatsthis( "whatsthis" );
-TTQString tag_script( "script" );
-TTQString tag_data( "data" );
-TTQString tag_item( "item" );
-
-TTQString attr_type( "type" );
-TTQString attr_src( "src" );
-TTQString attr_exclusive( "exclusive" );
-
-TTQString type_include( "include" );
-TTQString type_debug( "debug" );
+TQString tag_header("header");
+TQString tag_action("action");
+TQString tag_type( "type" );
+TQString tag_label( "label" );
+TQString tag_icons( "icons" );
+TQString tag_shortcut( "shortcut" );
+TQString tag_name( "name" );
+TQString tag_group( "group" );
+TQString tag_text( "text" );
+TQString tag_statustext( "statustext" );
+TQString tag_whatsthis( "whatsthis" );
+TQString tag_script( "script" );
+TQString tag_data( "data" );
+TQString tag_item( "item" );
+
+TQString attr_type( "type" );
+TQString attr_src( "src" );
+TQString attr_exclusive( "exclusive" );
+
+TQString type_include( "include" );
+TQString type_debug( "debug" );
 
 //
 // Default Runner
@@ -77,8 +77,8 @@ bool XMLActionRunner::run( XMLActionClient *client, const XMLActionClient::XMLAc
 // Main Client Class
 //
 
-XMLActionClient::XMLActionClient( TTQObject *parent, const char *name )
-    : TTQObject( parent, name ? name : "XMLActionClient" ),
+XMLActionClient::XMLActionClient( TQObject *parent, const char *name )
+    : TQObject( parent, name ? name : "XMLActionClient" ),
       ac(0), actrun(0)
 {
 }
@@ -87,18 +87,18 @@ XMLActionClient::~XMLActionClient()
 {
 }
 
-bool XMLActionClient::load( const TTQString &filename )
+bool XMLActionClient::load( const TQString &filename )
 {
     XMLActionHandler h( this );
     return load( &h, filename );
 }
 
-bool XMLActionClient::load( XMLActionHandler *hand, const TTQString &filename )
+bool XMLActionClient::load( XMLActionHandler *hand, const TQString &filename )
 {
-    TTQFile f( filename );
-    TTQXmlInputSource src( &f );
+    TQFile f( filename );
+    TQXmlInputSource src( &f );
 
-    TTQXmlSimpleReader reader;
+    TQXmlSimpleReader reader;
     reader.setContentHandler( hand );
     bool ok = reader.parse( src );
     if ( !ok ) {
@@ -108,7 +108,7 @@ bool XMLActionClient::load( XMLActionHandler *hand, const TTQString &filename )
     return ok;
 }
 
-bool XMLActionClient::bind( const TTQString &name, const XMLActionScript &s )
+bool XMLActionClient::bind( const TQString &name, const XMLActionScript &s )
 {
 //    kdWarning() << "Runner:bind called, name=" << name << " type=" << s.type
 //		<< " text=" << s.text << " src=" << s.src << endl;
@@ -129,7 +129,7 @@ bool XMLActionClient::bind( KAction *act, const XMLActionScript &s )
     return bind( act->name(), s );
 }
 
-bool XMLActionClient::run( const TTQString &name )
+bool XMLActionClient::run( const TQString &name )
 {
     if ( scripts.contains( name ) )
 	return run( scripts[name] );
@@ -149,7 +149,7 @@ bool XMLActionClient::run( const XMLActionScript &s )
 
 void XMLActionClient::action_activated()
 {
-    const TTQObject *sender = TTQObject::sender();
+    const TQObject *sender = TQObject::sender();
     if ( !sender )
 	return;
 
@@ -161,29 +161,29 @@ void XMLActionClient::action_activated()
 //
 
 XMLActionHandler::XMLActionHandler( XMLActionClient *client )
-    : TTQXmlDefaultHandler(), actclient( client )
+    : TQXmlDefaultHandler(), actclient( client )
 {
 }
 
-bool XMLActionHandler::characters( const TTQString &chars )
+bool XMLActionHandler::characters( const TQString &chars )
 {
     cdata = cdata + chars;
     return true;
 }
 
 
-bool XMLActionHandler::startElement( const TTQString &, const TTQString &, const TTQString &qn,
-				     const TTQXmlAttributes &attrs )
+bool XMLActionHandler::startElement( const TQString &, const TQString &, const TQString &qn,
+				     const TQXmlAttributes &attrs )
 {
-    cdata = TTQString::null;
+    cdata = TQString::null;
 
     if ( qn == tag_script ) {
 	ad.script.type = attrs.value( attr_type );
 	ad.script.src = attrs.value( attr_src );
     }
     else if ( qn == tag_group ) {
-	TTQString ex = attrs.value( attr_exclusive );
-	if ( ex == TTQString("true") )
+	TQString ex = attrs.value( attr_exclusive );
+	if ( ex == TQString("true") )
 	    ad.exclusive = true;
     }
     else if ( qn == tag_action )
@@ -192,7 +192,7 @@ bool XMLActionHandler::startElement( const TTQString &, const TTQString &, const
     return true;
 }
 
-bool XMLActionHandler::endElement( const TTQString &, const TTQString &, const TTQString &qn )
+bool XMLActionHandler::endElement( const TQString &, const TQString &, const TQString &qn )
 {
     if ( qn == tag_action ) {
 	defineAction();
@@ -200,49 +200,49 @@ bool XMLActionHandler::endElement( const TTQString &, const TTQString &, const T
     }
     else if ( qn == tag_type ) {
 	ad.type = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_label ) {
 	ad.text = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_text ) {
 	// Nothing
     }
     else if ( qn == tag_icons ) {
 	ad.icons = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_shortcut ) {
 	ad.keys = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_name ) {
 	ad.name = cdata.latin1();
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_group ) {
 	ad.group = cdata.latin1();
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_whatsthis ) {
 	ad.whatsthis = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_statustext ) {
 	ad.status = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
     else if ( qn == tag_script ) {
 	ad.script.text = cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
 
 	if ( !inAction && ad.script.isValid() )
 	    actclient->run( ad.script );
     }
     else if ( qn == tag_item ) {
 	ad.items += cdata;
-	cdata = TTQString::null;
+	cdata = TQString::null;
     }
 
     return true;
@@ -263,7 +263,7 @@ void XMLActionHandler::defineAction()
 	actclient->bind( act, ad.script );
 
     ad.clear();
-    cdata = TTQString::null;
+    cdata = TQString::null;
 }
 
 KAction *XMLActionHandler::createAction( KActionCollection *parent )
@@ -307,7 +307,7 @@ KAction *XMLActionHandler::createAction( KActionCollection *parent )
     else if ( ad.type == "KActionMenu" ) {
 	KActionMenu *am = new KActionMenu( ad.text, ad.icons, parent, ad.name.latin1() );
 
-	for ( TTQStringList::Iterator it = ad.items.begin() ; it != ad.items.end() ; ++it ) {
+	for ( TQStringList::Iterator it = ad.items.begin() ; it != ad.items.end() ; ++it ) {
 	    KAction *a = parent->action( (*it).latin1() );
 	    if ( a )
 		am->insert( a );
@@ -331,7 +331,7 @@ KAction *XMLActionHandler::createAction( KActionCollection *parent )
     act->setStatusText( ad.status );
     act->setWhatsThis( ad.whatsthis );
 
-    TTQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) );
+    TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) );
 
     return act;
 }
diff --git a/kjsembed/xmlactionclient.h b/kjsembed/xmlactionclient.h
index 3f78fa3f..0dcabfe2 100644
--- a/kjsembed/xmlactionclient.h
+++ b/kjsembed/xmlactionclient.h
@@ -62,15 +62,15 @@ public:
 	 * Clears this script object. After this method has been called,
 	 * isValid() will return false.
 	 */
-	void clear() { src = type = text = TTQString::null; }
+	void clear() { src = type = text = TQString::null; }
 
-	TTQString src;
-	TTQString type;
-	TTQString text;
+	TQString src;
+	TQString type;
+	TQString text;
     };
 
     /** Creates an XMLActionClient. */
-    XMLActionClient( TTQObject *parent=0, const char *name=0 );
+    XMLActionClient( TQObject *parent=0, const char *name=0 );
 
     /** 
      * Cleans up. When the object is deleted, any actions it has created will
@@ -91,22 +91,22 @@ public:
     void setRunner( XMLActionRunner *r ) { actrun = r; }
 
     /** Loads actions from the named XML file. Returns true on success. */
-    bool load( const TTQString &filename );
+    bool load( const TQString &filename );
 
     /** Loads actions from the named XML file. Returns true on success. */
-    bool load( XMLActionHandler *handler, const TTQString &filename );
+    bool load( XMLActionHandler *handler, const TQString &filename );
 
     /** Runs the named script. */
-    bool run( const TTQString &name );
+    bool run( const TQString &name );
 
     /** Returns the named script. */
-    XMLActionScript script( const TTQString &name ) const { return scripts[name]; }
+    XMLActionScript script( const TQString &name ) const { return scripts[name]; }
 
     /** Calls XMLActionRunner::run(). */
     bool run( const XMLActionScript &script );
 
     /** Binds a name to a script. */
-    virtual bool bind( const TTQString &name, const XMLActionScript &script );
+    virtual bool bind( const TQString &name, const XMLActionScript &script );
 
     /** Binds an action to a script. */
     virtual bool bind( KAction *act, const XMLActionScript &script );
@@ -121,7 +121,7 @@ protected slots:
 private:
     KActionCollection *ac;
     XMLActionRunner *actrun;
-    TTQMap scripts;
+    TQMap scripts;
     class XMLActionClientPrivate *d;
 };
 
@@ -177,10 +177,10 @@ class XMLActionHandler : public TQXmlDefaultHandler
 public:
     XMLActionHandler( XMLActionClient *actclient );
 
-    virtual bool startElement( const TTQString &ns, const TTQString &ln, const TTQString &qn,
-			       const TTQXmlAttributes &attrs );
-    virtual bool endElement( const TTQString &ns, const TTQString &ln, const TTQString &qn );
-    virtual bool characters( const TTQString &chars );
+    virtual bool startElement( const TQString &ns, const TQString &ln, const TQString &qn,
+			       const TQXmlAttributes &attrs );
+    virtual bool endElement( const TQString &ns, const TQString &ln, const TQString &qn );
+    virtual bool characters( const TQString &chars );
 
     /** Called when an action tag is closed. */
     void defineAction();
@@ -198,29 +198,29 @@ private:
 	XMLActionData() { clear(); }
 
 	void clear() {
-	    text = icons = keys = name = group = whatsthis = status = TTQString::null;
+	    text = icons = keys = name = group = whatsthis = status = TQString::null;
 	    exclusive = false;
 	    script.clear();
 	}
 
-	TTQString type;
-	TTQString text;
-	TTQString icons;
-	TTQString keys;
-	TTQString name;
-	TTQString group;
+	TQString type;
+	TQString text;
+	TQString icons;
+	TQString keys;
+	TQString name;
+	TQString group;
 	bool exclusive;
-	TTQString status;
-	TTQString whatsthis;
+	TQString status;
+	TQString whatsthis;
 	XMLActionClient::XMLActionScript script;
-	TTQStringList items;
+	TQStringList items;
     };
 
     XMLActionData *actionData() { return &ad; }
 
 private:
     XMLActionClient *actclient;
-    TTQString cdata;
+    TQString cdata;
     bool inAction;
     XMLActionData ad;
     class XMLActionHandlerPrivate *d;
-- 
cgit v1.2.3
      %1%2
      %1%2
      %1%2
      %1%2
      void%1
      void%1